diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/cliprect.cpp | 86 | ||||
| -rw-r--r-- | src/gui/cliprect.h | 16 |
4 files changed, 13 insertions, 91 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 4df84708d..f67fb94b3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1416,7 +1416,6 @@ SET(SRCS listeners/wrongdatanoticelistener.h gui/widgets/basiccontainer2.h gui/widgets/basiccontainer.cpp - gui/cliprect.cpp gui/dialogsmanager.cpp gui/dialogsmanager.h input/key.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 763b89ea6..bd5515604 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -177,7 +177,6 @@ SRC += events/actionevent.h \ listeners/wrongdatanoticelistener.h \ gui/widgets/basiccontainer2.h \ gui/widgets/basiccontainer.cpp \ - gui/cliprect.cpp \ gui/colorpair.h \ gui/dialogsmanager.cpp \ gui/dialogsmanager.h \ diff --git a/src/gui/cliprect.cpp b/src/gui/cliprect.cpp deleted file mode 100644 index 76d09a79c..000000000 --- a/src/gui/cliprect.cpp +++ /dev/null @@ -1,86 +0,0 @@ -/* - * The ManaPlus Client - * Copyright (C) 2011-2016 The ManaPlus Developers - * - * This file is part of The ManaPlus Client. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -/* _______ __ __ __ ______ __ __ _______ __ __ - * / _____/\ / /\ / /\ / /\ / ____/\ / /\ / /\ / ___ /\ / |\/ /\ - * / /\____\// / // / // / // /\___\// /_// / // /\_/ / // , |/ / / - * / / /__ / / // / // / // / / / ___ / // ___ / // /| ' / / - * / /_// /\ / /_// / // / // /_/_ / / // / // /\_/ / // / | / / - * /______/ //______/ //_/ //_____/\ /_/ //_/ //_/ //_/ //_/ /|_/ / - * \______\/ \______\/ \_\/ \_____\/ \_\/ \_\/ \_\/ \_\/ \_\/ \_\/ - * - * Copyright (c) 2004 - 2008 Olof Naessén and Per Larsson - * - * - * Per Larsson a.k.a finalman - * Olof Naessén a.k.a jansem/yakslem - * - * Visit: http://guichan.sourceforge.net - * - * License: (BSD) - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in - * the documentation and/or other materials provided with the - * distribution. - * 3. Neither the name of Guichan nor the names of its contributors may - * be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED - * TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -/* - * For comments regarding functions please see the header file. - */ - -#include "gui/cliprect.h" - -#include "debug.h" - -ClipRect::ClipRect() : - Rect(0, 0, 0, 0), - xOffset(0), - yOffset(0) -{ -} - -ClipRect::ClipRect(const int x0, const int y0, - const int width0, const int height0, - const int xOffset0, const int yOffset0) : - Rect(x0, y0, width0, height0), - xOffset(xOffset0), - yOffset(yOffset0) -{ -} diff --git a/src/gui/cliprect.h b/src/gui/cliprect.h index 6642dec22..f4e4b3c10 100644 --- a/src/gui/cliprect.h +++ b/src/gui/cliprect.h @@ -80,7 +80,12 @@ class ClipRect final : public Rect /** * Constructor. */ - ClipRect(); + constexpr ClipRect() : + Rect(0, 0, 0, 0), + xOffset(0), + yOffset(0) + { + } /** * Constructor. @@ -96,12 +101,17 @@ class ClipRect final : public Rect * calculating the actual screen coordinate from * the relative screen coordinate. */ - ClipRect(const int x0, + constexpr ClipRect(const int x0, const int y0, const int width0, const int height0, const int xOffset0, - const int yOffset0); + const int yOffset0) : + Rect(x0, y0, width0, height0), + xOffset(xOffset0), + yOffset(yOffset0) + { + } A_DELETE_COPY(ClipRect) |