14 files changed, 33 insertions, 32 deletions
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index 955171bea..976a8dfd8 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -43,7 +43,7 @@
 #include "gui/viewport.h"
 
 #include "gui/windows/emotewindow.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 #include "gui/windows/whoisonline.h"
 
 #include "gui/widgets/tabs/battletab.h"
diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp
index 02a79d0de..b4d14e404 100644
--- a/src/gui/windows/debugwindow.cpp
+++ b/src/gui/windows/debugwindow.cpp
@@ -31,7 +31,7 @@
 
 #include "gui/viewport.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/label.h"
 #include "gui/widgets/layout.h"
diff --git a/src/gui/windows/didyouknowwindow.cpp b/src/gui/windows/didyouknowwindow.cpp
index 37c970562..93166e6fa 100644
--- a/src/gui/windows/didyouknowwindow.cpp
+++ b/src/gui/windows/didyouknowwindow.cpp
@@ -26,7 +26,7 @@
 
 #include "gui/sdlfont.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index dcc4c9d77..3b97e12d7 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -36,7 +36,7 @@
 
 #include "gui/popups/itempopup.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/playerbox.h"
diff --git a/src/gui/windows/helpwindow.cpp b/src/gui/windows/helpwindow.cpp
index 854ac8cbd..eb2300e0e 100644
--- a/src/gui/windows/helpwindow.cpp
+++ b/src/gui/windows/helpwindow.cpp
@@ -27,7 +27,7 @@
 #include "gui/sdlfont.h"
 
 #include "gui/windows/didyouknowwindow.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/browserbox.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index 02b30aed7..6fd2ab95b 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -38,7 +38,7 @@
 #include "gui/windows/equipmentwindow.h"
 #include "gui/windows/itemamountwindow.h"
 #include "gui/windows/outfitwindow.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 #include "gui/windows/shopwindow.h"
 #include "gui/windows/tradewindow.h"
 
diff --git a/src/gui/windows/minimap.cpp b/src/gui/windows/minimap.cpp
index 177be8a74..02be64a13 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -33,7 +33,7 @@
 
 #include "gui/popups/textpopup.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "resources/image.h"
 #include "resources/imagehelper.h"
diff --git a/src/gui/windows/setup.cpp b/src/gui/windows/setupwindow.cpp
index d0ecc2d6d..e17b8f432 100644
--- a/src/gui/windows/setup.cpp
+++ b/src/gui/windows/setupwindow.cpp
@@ -20,7 +20,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "configuration.h"
 #include "game.h"
@@ -52,9 +52,9 @@
 #include "debug.h"
 
 extern Window *statusWindow;
-Setup *setupWindow = nullptr;
+SetupWindow *setupWindow = nullptr;
 
-Setup::Setup() :
+SetupWindow::SetupWindow() :
     // TRANSLATORS: setup window name
     Window(_("Setup"), false, nullptr, "setup.xml"),
     gcn::ActionListener(),
@@ -72,7 +72,7 @@ Setup::Setup() :
     setStickyButtonLock(true);
 }
 
-void Setup::postInit()
+void SetupWindow::postInit()
 {
     int width = 620;
     const int height = 450;
@@ -153,13 +153,13 @@ void Setup::postInit()
     enableVisibleSound(true);
 }
 
-Setup::~Setup()
+SetupWindow::~SetupWindow()
 {
     delete_all(mTabs);
     mButtons.clear();
 }
 
-void Setup::action(const gcn::ActionEvent &event)
+void SetupWindow::action(const gcn::ActionEvent &event)
 {
     if (Game::instance())
         Game::instance()->resetAdjustLevel();
@@ -196,12 +196,12 @@ void Setup::action(const gcn::ActionEvent &event)
     }
 }
 
-void Setup::setInGame(const bool inGame)
+void SetupWindow::setInGame(const bool inGame)
 {
     mResetWindows->setEnabled(inGame);
 }
 
-void Setup::externalUpdate()
+void SetupWindow::externalUpdate()
 {
     unloadModTab();
     mModsTab = new Setup_Mods(this);
@@ -214,7 +214,7 @@ void Setup::externalUpdate()
     }
 }
 
-void Setup::unloadModTab()
+void SetupWindow::unloadModTab()
 {
     if (mModsTab)
     {
@@ -226,7 +226,7 @@ void Setup::unloadModTab()
     }
 }
 
-void Setup::externalUnload()
+void SetupWindow::externalUnload()
 {
     FOR_EACH (std::list<SetupTab*>::const_iterator, it, mTabs)
     {
@@ -236,30 +236,30 @@ void Setup::externalUnload()
     unloadModTab();
 }
 
-void Setup::registerWindowForReset(Window *const window)
+void SetupWindow::registerWindowForReset(Window *const window)
 {
     mWindowsToReset.push_back(window);
 }
 
-void Setup::doCancel()
+void SetupWindow::doCancel()
 {
     setVisible(false);
     for_each(mTabs.begin(), mTabs.end(), std::mem_fun(&SetupTab::cancel));
 }
 
-void Setup::activateTab(const std::string &name)
+void SetupWindow::activateTab(const std::string &name)
 {
     std::string tmp = gettext(name.c_str());
     mPanel->setSelectedTabByName(tmp);
 }
 
-void Setup::setVisible(bool visible)
+void SetupWindow::setVisible(bool visible)
 {
     touchManager.setTempHide(visible);
     Window::setVisible(visible);
 }
 
-void Setup::widgetResized(const gcn::Event &event)
+void SetupWindow::widgetResized(const gcn::Event &event)
 {
     Window::widgetResized(event);
 
diff --git a/src/gui/windows/setup.h b/src/gui/windows/setupwindow.h
index 4c9ab2fb7..65dcf23e5 100644
--- a/src/gui/windows/setup.h
+++ b/src/gui/windows/setupwindow.h
@@ -40,14 +40,15 @@ class SetupTab;
  *
  * \ingroup GUI
  */
-class Setup final : public Window, public gcn::ActionListener
+class SetupWindow final : public Window,
+                          public gcn::ActionListener
 {
     public:
-        Setup();
+        SetupWindow();
 
-        A_DELETE_COPY(Setup)
+        A_DELETE_COPY(SetupWindow)
 
-        ~Setup();
+        ~SetupWindow();
 
         void postInit() override final;
 
@@ -84,6 +85,6 @@ class Setup final : public Window, public gcn::ActionListener
         Label *mVersion;
 };
 
-extern Setup* setupWindow;
+extern SetupWindow* setupWindow;
 
 #endif  // GUI_WINDOWS_SETUP_H
diff --git a/src/gui/windows/shortcutwindow.cpp b/src/gui/windows/shortcutwindow.cpp
index 5cf2ad7df..6a7a176a2 100644
--- a/src/gui/windows/shortcutwindow.cpp
+++ b/src/gui/windows/shortcutwindow.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/windows/shortcutwindow.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/layout.h"
 #include "gui/widgets/scrollarea.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 197c60a90..04baad26a 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -33,7 +33,7 @@
 
 #include "gui/popups/textpopup.h"
 
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 #include "gui/windows/shortcutwindow.h"
 
 #include "gui/widgets/button.h"
diff --git a/src/gui/windows/socialwindow.cpp b/src/gui/windows/socialwindow.cpp
index ec7fce182..8e5f4c312 100644
--- a/src/gui/windows/socialwindow.cpp
+++ b/src/gui/windows/socialwindow.cpp
@@ -35,7 +35,7 @@
 
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/okdialog.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 #include "gui/windows/textdialog.h"
 #include "gui/windows/whoisonline.h"
 
diff --git a/src/gui/windows/statuswindow.cpp b/src/gui/windows/statuswindow.cpp
index 8d78447a7..62c5c38ba 100644
--- a/src/gui/windows/statuswindow.cpp
+++ b/src/gui/windows/statuswindow.cpp
@@ -36,7 +36,7 @@
 #include "gui/viewport.h"
 
 #include "gui/windows/equipmentwindow.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp
index dfdc53a5c..a379f0f28 100644
--- a/src/gui/windows/tradewindow.cpp
+++ b/src/gui/windows/tradewindow.cpp
@@ -35,7 +35,7 @@
 
 #include "gui/windows/inventorywindow.h"
 #include "gui/windows/itemamountwindow.h"
-#include "gui/windows/setup.h"
+#include "gui/windows/setupwindow.h"
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/itemcontainer.h"