Move changedisplay class into separate file.

5 files changed, 128 insertions, 87 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a6bb6c907..1f4ff6cd9 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/changedisplay.cpp
+    gui/widgets/attrs/changedisplay.h
     gui/widgets/attrs/derdisplay.cpp
     gui/widgets/attrs/derdisplay.h
     gui/widgets/tabs/debugwindowtabs.cpp
@@ -202,7 +204,6 @@ SET(SRCS
     gui/widgets/itemshortcutcontainer.h
     gui/widgets/spellshortcutcontainer.cpp
     gui/widgets/spellshortcutcontainer.h
-    gui/widgets/statuswindowattrs.h
     gui/widgets/label.cpp
     gui/widgets/label.h
     gui/widgets/tabs/chat/langtab.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 4cd3c3509..1bef647eb 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/changedisplay.cpp \
+	      gui/widgets/attrs/changedisplay.h \
 	      gui/widgets/attrs/derdisplay.cpp \
 	      gui/widgets/attrs/derdisplay.h \
 	      gui/widgets/tabs/debugwindowtabs.cpp \
@@ -984,7 +986,6 @@ manaplus_SOURCES += main.cpp \
 	      gui/widgets/itemshortcutcontainer.h \
 	      gui/widgets/spellshortcutcontainer.cpp \
 	      gui/widgets/spellshortcutcontainer.h \
-	      gui/widgets/statuswindowattrs.h \
 	      gui/widgets/selldialog.cpp \
 	      gui/widgets/selldialog.h \
 	      gui/widgets/tabs/setup_audio.cpp \
diff --git a/src/gui/widgets/attrs/changedisplay.cpp b/src/gui/widgets/attrs/changedisplay.cpp
new file mode 100644
index 000000000..cd5398c50
--- /dev/null
+++ b/src/gui/widgets/attrs/changedisplay.cpp
@@ -0,0 +1,120 @@
+/*
+ *  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/changedisplay.h"
+
+#include "configuration.h"
+
+#include "being/playerinfo.h"
+
+#include "gui/widgets/button.h"
+#include "gui/widgets/containerplacer.h"
+#include "gui/widgets/layouthelper.h"
+
+#include "net/playerhandler.h"
+#include "net/serverfeatures.h"
+
+#include "utils/gettext.h"
+#include "utils/stringutils.h"
+
+#include "debug.h"
+
+ChangeDisplay::ChangeDisplay(const Widget2 *const widget,
+                             const AttributesT id,
+                             const std::string &restrict name,
+                             const std::string &restrict shortName) :
+    AttrDisplay(widget, id, name, shortName),
+    ActionListener(),
+    mNeeded(1),
+    // TRANSLATORS: status window label
+    mPoints(new Label(this, _("Max"))),
+    // TRANSLATORS: status window label (plus sign)
+    mInc(new Button(this, _("+"), "inc", this))
+{
+    // Do the layout
+    ContainerPlacer place = mLayout->getPlacer(0, 0);
+
+    place(0, 0, mLabel, 3);
+    place(4, 0, mValue, 2);
+    place(6, 0, mInc);
+    place(7, 0, mPoints);
+}
+
+std::string ChangeDisplay::update()
+{
+    if (mNeeded > 0)
+    {
+        mPoints->setCaption(toString(mNeeded));
+    }
+    else
+    {
+        // TRANSLATORS: status bar label
+        mPoints->setCaption(_("Max"));
+    }
+
+    mInc->setEnabled(PlayerInfo::getAttribute(Attributes::PLAYER_CHAR_POINTS)
+        >= mNeeded && mNeeded > 0);
+
+    return AttrDisplay::update();
+}
+
+void ChangeDisplay::setPointsNeeded(const int needed)
+{
+    mNeeded = needed;
+    update();
+}
+
+void ChangeDisplay::action(const ActionEvent &event)
+{
+    if (event.getSource() == mInc)
+    {
+        int cnt = 1;
+        if (config.getBoolValue("quickStats"))
+        {
+            cnt = mInc->getClickCount();
+            if (cnt > 10)
+                cnt = 10;
+        }
+
+        const int newpoints = PlayerInfo::getAttribute(
+            Attributes::PLAYER_CHAR_POINTS) - cnt;
+        PlayerInfo::setAttribute(Attributes::PLAYER_CHAR_POINTS,
+            newpoints);
+
+        const int newbase = PlayerInfo::getStatBase(mId) + cnt;
+        PlayerInfo::setStatBase(mId, newbase);
+
+        if (serverFeatures->haveMultyStatusUp())
+        {
+            playerHandler->increaseAttribute(mId, cnt);
+        }
+        else
+        {
+            for (int f = 0; f < cnt; f ++)
+            {
+                playerHandler->increaseAttribute(mId, 1);
+                if (cnt != 1)
+                    SDL_Delay(100);
+            }
+        }
+    }
+}
diff --git a/src/gui/widgets/statuswindowattrs.h b/src/gui/widgets/attrs/changedisplay.h
index 340995709..92e5cb203 100644
--- a/src/gui/widgets/statuswindowattrs.h
+++ b/src/gui/widgets/attrs/changedisplay.h
@@ -20,8 +20,8 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef GUI_WIDGETS_STATUSWINDOWATTRS_H
-#define GUI_WIDGETS_STATUSWINDOWATTRS_H
+#ifndef GUI_WIDGETS_ATTRS_CHANGEDISPLAY_H
+#define GUI_WIDGETS_ATTRS_CHANGEDISPLAY_H
 
 #include "gui/widgets/attrs/attrdisplay.h"
 
@@ -59,4 +59,4 @@ class ChangeDisplay final : public AttrDisplay,
         Button *mInc;
 };
 
-#endif  // GUI_WIDGETS_STATUSWINDOWATTRS_H
+#endif  // GUI_WIDGETS_ATTRS_CHANGEDISPLAY_H
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 676e7bfc2..c756f474a 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -41,11 +41,11 @@
 #include "gui/widgets/layouttype.h"
 #include "gui/widgets/progressbar.h"
 #include "gui/widgets/scrollarea.h"
-#include "gui/widgets/statuswindowattrs.h"
 #include "gui/widgets/vertcontainer.h"
 #include "gui/widgets/windowcontainer.h"
 
 #include "gui/widgets/attrs/attrdisplay.h"
+#include "gui/widgets/attrs/changedisplay.h"
 #include "gui/widgets/attrs/derdisplay.h"
 
 #include "net/inventoryhandler.h"
@@ -714,84 +714,3 @@ void StatusWindow::action(const ActionEvent &event)
         chatWindow->addInputText(str);
     }
 }
-
-ChangeDisplay::ChangeDisplay(const Widget2 *const widget,
-                             const AttributesT id,
-                             const std::string &restrict name,
-                             const std::string &restrict shortName) :
-    AttrDisplay(widget, id, name, shortName),
-    ActionListener(),
-    mNeeded(1),
-    // TRANSLATORS: status window label
-    mPoints(new Label(this, _("Max"))),
-    // TRANSLATORS: status window label (plus sign)
-    mInc(new Button(this, _("+"), "inc", this))
-{
-    // Do the layout
-    ContainerPlacer place = mLayout->getPlacer(0, 0);
-
-    place(0, 0, mLabel, 3);
-    place(4, 0, mValue, 2);
-    place(6, 0, mInc);
-    place(7, 0, mPoints);
-}
-
-std::string ChangeDisplay::update()
-{
-    if (mNeeded > 0)
-    {
-        mPoints->setCaption(toString(mNeeded));
-    }
-    else
-    {
-        // TRANSLATORS: status bar label
-        mPoints->setCaption(_("Max"));
-    }
-
-    mInc->setEnabled(PlayerInfo::getAttribute(Attributes::PLAYER_CHAR_POINTS)
-        >= mNeeded && mNeeded > 0);
-
-    return AttrDisplay::update();
-}
-
-void ChangeDisplay::setPointsNeeded(const int needed)
-{
-    mNeeded = needed;
-    update();
-}
-
-void ChangeDisplay::action(const ActionEvent &event)
-{
-    if (event.getSource() == mInc)
-    {
-        int cnt = 1;
-        if (config.getBoolValue("quickStats"))
-        {
-            cnt = mInc->getClickCount();
-            if (cnt > 10)
-                cnt = 10;
-        }
-
-        const int newpoints = PlayerInfo::getAttribute(
-            Attributes::PLAYER_CHAR_POINTS) - cnt;
-        PlayerInfo::setAttribute(Attributes::PLAYER_CHAR_POINTS,
-            newpoints);
-
-        const int newbase = PlayerInfo::getStatBase(mId) + cnt;
-        PlayerInfo::setStatBase(mId, newbase);
-
-        if (serverFeatures->haveMultyStatusUp())
-        {
-            playerHandler->increaseAttribute(mId, cnt);
-        }
-        else
-        {
-            for (int f = 0; f < cnt; f ++)
-            {
-                playerHandler->increaseAttribute(mId, 1);
-                if (cnt != 1)
-                    SDL_Delay(100);
-            }
-        }
-    }
-}