summaryrefslogtreecommitdiff
path: root/src/gui/windows
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-09-30 15:01:42 +0300
committerAndrei Karas <akaras@inbox.ru>2013-09-30 15:01:42 +0300
commit64781090e80fa93a43ce37f0705bbb1cf22ed8bf (patch)
tree6932ff7f29b4a1e1fe2f3834592587c33d7c4651 /src/gui/windows
parent25d77892d72d455f8a89372687db45aefbc61cec (diff)
downloadmanaverse-64781090e80fa93a43ce37f0705bbb1cf22ed8bf.tar.gz
manaverse-64781090e80fa93a43ce37f0705bbb1cf22ed8bf.tar.bz2
manaverse-64781090e80fa93a43ce37f0705bbb1cf22ed8bf.tar.xz
manaverse-64781090e80fa93a43ce37f0705bbb1cf22ed8bf.zip
move popups into popups directory.
Diffstat (limited to 'src/gui/windows')
-rw-r--r--src/gui/windows/equipmentwindow.cpp3
-rw-r--r--src/gui/windows/inventorywindow.cpp3
-rw-r--r--src/gui/windows/itemamountwindow.cpp3
-rw-r--r--src/gui/windows/minimap.cpp3
-rw-r--r--src/gui/windows/ministatuswindow.cpp6
-rw-r--r--src/gui/windows/skilldialog.cpp3
6 files changed, 14 insertions, 7 deletions
diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp
index 0402115df..8cfb3b28e 100644
--- a/src/gui/windows/equipmentwindow.cpp
+++ b/src/gui/windows/equipmentwindow.cpp
@@ -32,9 +32,10 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
-#include "gui/itempopup.h"
#include "gui/viewport.h"
+#include "gui/popups/itempopup.h"
+
#include "gui/windows/setup.h"
#include "gui/widgets/button.h"
diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp
index b57a7ea21..5c0b71edc 100644
--- a/src/gui/windows/inventorywindow.cpp
+++ b/src/gui/windows/inventorywindow.cpp
@@ -32,9 +32,10 @@
#include "input/keyevent.h"
#include "gui/gui.h"
-#include "gui/textpopup.h"
#include "gui/viewport.h"
+#include "gui/popups/textpopup.h"
+
#include "gui/windows/equipmentwindow.h"
#include "gui/windows/itemamountwindow.h"
#include "gui/windows/outfitwindow.h"
diff --git a/src/gui/windows/itemamountwindow.cpp b/src/gui/windows/itemamountwindow.cpp
index 7c67fb976..1eba131c1 100644
--- a/src/gui/windows/itemamountwindow.cpp
+++ b/src/gui/windows/itemamountwindow.cpp
@@ -28,10 +28,11 @@
#include "input/keyboardconfig.h"
#include "net/inventoryhandler.h"
-#include "gui/itempopup.h"
#include "net/net.h"
#include "gui/viewport.h"
+#include "gui/popups/itempopup.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 9adadd1e0..a02e02f5d 100644
--- a/src/gui/windows/minimap.cpp
+++ b/src/gui/windows/minimap.cpp
@@ -30,7 +30,8 @@
#include "being/localplayer.h"
#include "gui/viewport.h"
-#include "gui/textpopup.h"
+
+#include "gui/popups/textpopup.h"
#include "gui/windows/setup.h"
diff --git a/src/gui/windows/ministatuswindow.cpp b/src/gui/windows/ministatuswindow.cpp
index 21697b83f..2d64e9ffd 100644
--- a/src/gui/windows/ministatuswindow.cpp
+++ b/src/gui/windows/ministatuswindow.cpp
@@ -28,10 +28,12 @@
#include "being/localplayer.h"
#include "being/playerinfo.h"
-#include "gui/statuspopup.h"
-#include "gui/textpopup.h"
#include "gui/viewport.h"
+#include "gui/popups/textpopup.h"
+
+#include "gui/popups/statuspopup.h"
+
#include "gui/windows/statuswindow.h"
#include "gui/widgets/progressbar.h"
diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp
index 39cdc5d2f..29232e240 100644
--- a/src/gui/windows/skilldialog.cpp
+++ b/src/gui/windows/skilldialog.cpp
@@ -29,9 +29,10 @@
#include "being/localplayer.h"
-#include "gui/textpopup.h"
#include "gui/viewport.h"
+#include "gui/popups/textpopup.h"
+
#include "gui/windows/setup.h"
#include "gui/windows/shortcutwindow.h"