summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-07-25 18:19:42 +0300
committerAndrei Karas <akaras@inbox.ru>2016-07-25 18:19:42 +0300
commitf9da6e607bb75b74099b536e0bd4db83dc0a2ced (patch)
tree29dc5b1cfae69aa7186b982032ede6e65e3e2cd1
parentd6bbfaaf473f369b3bd893aa5e52403ea575e5c7 (diff)
downloadmv-f9da6e607bb75b74099b536e0bd4db83dc0a2ced.tar.gz
mv-f9da6e607bb75b74099b536e0bd4db83dc0a2ced.tar.bz2
mv-f9da6e607bb75b74099b536e0bd4db83dc0a2ced.tar.xz
mv-f9da6e607bb75b74099b536e0bd4db83dc0a2ced.zip
Move derdisplay class into separate file.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/Makefile.am2
-rw-r--r--src/gui/widgets/attrs/derdisplay.cpp40
-rw-r--r--src/gui/widgets/attrs/derdisplay.h44
-rw-r--r--src/gui/widgets/statuswindowattrs.h14
-rw-r--r--src/gui/windows/statuswindow.cpp13
6 files changed, 89 insertions, 26 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b6eb88a56..a6bb6c907 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -137,6 +137,8 @@ SET(SRCS
gui/widgets/characterviewsmall.h
gui/widgets/attrs/attrdisplay.cpp
gui/widgets/attrs/attrdisplay.h
+ gui/widgets/attrs/derdisplay.cpp
+ gui/widgets/attrs/derdisplay.h
gui/widgets/tabs/debugwindowtabs.cpp
gui/widgets/tabs/debugwindowtabs.h
gui/widgets/tabs/chat/chattab.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 87f5f8773..4cd3c3509 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -945,6 +945,8 @@ manaplus_SOURCES += main.cpp \
gui/widgets/tabs/chat/channeltab.h \
gui/widgets/attrs/attrdisplay.cpp \
gui/widgets/attrs/attrdisplay.h \
+ gui/widgets/attrs/derdisplay.cpp \
+ gui/widgets/attrs/derdisplay.h \
gui/widgets/tabs/debugwindowtabs.cpp \
gui/widgets/tabs/debugwindowtabs.h \
gui/widgets/tabs/chat/chattab.cpp \
diff --git a/src/gui/widgets/attrs/derdisplay.cpp b/src/gui/widgets/attrs/derdisplay.cpp
new file mode 100644
index 000000000..f8a8b2f69
--- /dev/null
+++ b/src/gui/widgets/attrs/derdisplay.cpp
@@ -0,0 +1,40 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * 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/>.
+ */
+
+#include "gui/widgets/attrs/derdisplay.h"
+
+#include "gui/widgets/containerplacer.h"
+#include "gui/widgets/layouthelper.h"
+
+#include "debug.h"
+
+DerDisplay::DerDisplay(const Widget2 *const widget,
+ const AttributesT id,
+ const std::string &restrict name,
+ const std::string &restrict shortName) :
+ AttrDisplay(widget, id, name, shortName)
+{
+ ContainerPlacer place = mLayout->getPlacer(0, 0);
+
+ place(0, 0, mLabel, 3);
+ place(3, 0, mValue, 2);
+}
diff --git a/src/gui/widgets/attrs/derdisplay.h b/src/gui/widgets/attrs/derdisplay.h
new file mode 100644
index 000000000..e835253d3
--- /dev/null
+++ b/src/gui/widgets/attrs/derdisplay.h
@@ -0,0 +1,44 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2004-2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * 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/>.
+ */
+
+#ifndef GUI_WIDGETS_ATTRS_DERDISPLAY_H
+#define GUI_WIDGETS_ATTRS_DERDISPLAY_H
+
+#include "gui/widgets/attrs/attrdisplay.h"
+
+#include "localconsts.h"
+
+class DerDisplay final : public AttrDisplay
+{
+ public:
+ DerDisplay(const Widget2 *const widget,
+ const AttributesT id,
+ const std::string &restrict name,
+ const std::string &restrict shortName);
+
+ A_DELETE_COPY(DerDisplay)
+
+ Type getType() const override final
+ { return DERIVED; }
+};
+
+#endif // GUI_WIDGETS_ATTRS_DERDISPLAY_H
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/statuswindowattrs.h
index 3a84889f7..340995709 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/statuswindowattrs.h
@@ -32,20 +32,6 @@
class Button;
class LayoutHelper;
-class DerDisplay final : public AttrDisplay
-{
- public:
- DerDisplay(const Widget2 *const widget,
- const AttributesT id,
- const std::string &restrict name,
- const std::string &restrict shortName);
-
- A_DELETE_COPY(DerDisplay)
-
- Type getType() const override final
- { return DERIVED; }
-};
-
class ChangeDisplay final : public AttrDisplay,
public ActionListener
{
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 4cc02794c..676e7bfc2 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -46,6 +46,7 @@
#include "gui/widgets/windowcontainer.h"
#include "gui/widgets/attrs/attrdisplay.h"
+#include "gui/widgets/attrs/derdisplay.h"
#include "net/inventoryhandler.h"
#include "net/playerhandler.h"
@@ -714,18 +715,6 @@ void StatusWindow::action(const ActionEvent &event)
}
}
-DerDisplay::DerDisplay(const Widget2 *const widget,
- const AttributesT id,
- const std::string &restrict name,
- const std::string &restrict shortName) :
- AttrDisplay(widget, id, name, shortName)
-{
- ContainerPlacer place = mLayout->getPlacer(0, 0);
-
- place(0, 0, mLabel, 3);
- place(3, 0, mValue, 2);
-}
-
ChangeDisplay::ChangeDisplay(const Widget2 *const widget,
const AttributesT id,
const std::string &restrict name,