summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-15 18:07:17 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-15 18:38:03 +0300
commitcde42202d69e178da73c698065deca54b24054fd (patch)
treed636965ecde85db8de36fa65735920826e8e191b /src/gui/popups
parent21e63bbf54679ec236d1f09ed435959ff6a04db2 (diff)
downloadmanaplus-cde42202d69e178da73c698065deca54b24054fd.tar.gz
manaplus-cde42202d69e178da73c698065deca54b24054fd.tar.bz2
manaplus-cde42202d69e178da73c698065deca54b24054fd.tar.xz
manaplus-cde42202d69e178da73c698065deca54b24054fd.zip
move exguichan files into gui/base/
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/beingpopup.cpp2
-rw-r--r--src/gui/popups/itempopup.cpp2
-rw-r--r--src/gui/popups/popupmenu.cpp2
-rw-r--r--src/gui/popups/popupmenu.h4
-rw-r--r--src/gui/popups/speechbubble.cpp2
-rw-r--r--src/gui/popups/statuspopup.cpp2
-rw-r--r--src/gui/popups/textpopup.cpp2
7 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 6d3077130..623b19d00 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -31,7 +31,7 @@
#include "utils/gettext.h"
#include "utils/stringutils.h"
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
#include "debug.h"
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 1fd496dec..07c950706 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -38,7 +38,7 @@
#include "resources/image.h"
#include "resources/resourcemanager.h"
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
#include "debug.h"
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp
index 52cf1d5d6..4d12e835e 100644
--- a/src/gui/popups/popupmenu.cpp
+++ b/src/gui/popups/popupmenu.cpp
@@ -79,7 +79,7 @@
#include "utils/gettext.h"
#include "utils/process.h"
-#include <guichan/listmodel.hpp>
+#include "gui/base/listmodel.hpp"
#include "debug.h"
diff --git a/src/gui/popups/popupmenu.h b/src/gui/popups/popupmenu.h
index 0970f34b6..498132ded 100644
--- a/src/gui/popups/popupmenu.h
+++ b/src/gui/popups/popupmenu.h
@@ -28,8 +28,8 @@
#include "being/actorsprite.h"
-#include <guichan/actionlistener.hpp>
-#include <guichan/listmodel.hpp>
+#include "gui/base/actionlistener.hpp"
+#include "gui/base/listmodel.hpp"
#include "localconsts.h"
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index e32a6bb4d..dd8f9ada9 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -30,7 +30,7 @@
#include "gui/widgets/label.h"
#include "gui/widgets/textbox.h"
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
#include "debug.h"
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 1d696fe82..2332e20a9 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -33,7 +33,7 @@
#include "utils/stringutils.h"
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
#include "debug.h"
diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp
index 9a7f1d3e4..14f31f84f 100644
--- a/src/gui/popups/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -25,7 +25,7 @@
#include "gui/widgets/label.h"
-#include <guichan/font.hpp>
+#include "gui/base/font.hpp"
#include "debug.h"