summaryrefslogtreecommitdiff
path: root/src/gui/popups
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
committerAndrei Karas <akaras@inbox.ru>2014-02-16 22:17:22 +0300
commit6e6c5b2ba399e0ed364ada843c4c759ee54de219 (patch)
tree562e6a840c856ba8c4d35c6806020289c65d54d2 /src/gui/popups
parent82ac4641828ec7387863bb18cf4493190c4cc68f (diff)
downloadmv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.gz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.bz2
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.tar.xz
mv-6e6c5b2ba399e0ed364ada843c4c759ee54de219.zip
combine font classes in one.
Diffstat (limited to 'src/gui/popups')
-rw-r--r--src/gui/popups/beingpopup.cpp4
-rw-r--r--src/gui/popups/itempopup.cpp4
-rw-r--r--src/gui/popups/speechbubble.cpp4
-rw-r--r--src/gui/popups/spellpopup.cpp2
-rw-r--r--src/gui/popups/statuspopup.cpp2
-rw-r--r--src/gui/popups/textpopup.cpp2
6 files changed, 6 insertions, 12 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp
index 623b19d00..32aa11454 100644
--- a/src/gui/popups/beingpopup.cpp
+++ b/src/gui/popups/beingpopup.cpp
@@ -24,15 +24,13 @@
#include "being/being.h"
#include "being/playerrelations.h"
-#include "gui/sdlfont.h"
+#include "gui/font.h"
#include "gui/widgets/label.h"
#include "utils/gettext.h"
#include "utils/stringutils.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
BeingPopup::BeingPopup() :
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index f7939b666..d6ea5a48a 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -27,7 +27,7 @@
#include "item.h"
#include "units.h"
-#include "gui/sdlfont.h"
+#include "gui/font.h"
#include "gui/widgets/icon.h"
#include "gui/widgets/label.h"
@@ -38,8 +38,6 @@
#include "resources/image.h"
#include "resources/resourcemanager.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
extern int serverVersion;
diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp
index dd8f9ada9..c74f3f5e6 100644
--- a/src/gui/popups/speechbubble.cpp
+++ b/src/gui/popups/speechbubble.cpp
@@ -23,15 +23,13 @@
#include "gui/popups/speechbubble.h"
-#include "gui/sdlfont.h"
+#include "gui/font.h"
#include "gui/viewport.h"
#include "gui/widgets/browserbox.h"
#include "gui/widgets/label.h"
#include "gui/widgets/textbox.h"
-#include "gui/base/font.hpp"
-
#include "debug.h"
SpeechBubble::SpeechBubble() :
diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp
index cc55fef57..141879da4 100644
--- a/src/gui/popups/spellpopup.cpp
+++ b/src/gui/popups/spellpopup.cpp
@@ -23,7 +23,7 @@
#include "gui/popups/spellpopup.h"
-#include "gui/sdlfont.h"
+#include "gui/font.h"
#include "gui/widgets/label.h"
diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp
index 2332e20a9..7dd3c3634 100644
--- a/src/gui/popups/statuspopup.cpp
+++ b/src/gui/popups/statuspopup.cpp
@@ -33,7 +33,7 @@
#include "utils/stringutils.h"
-#include "gui/base/font.hpp"
+#include "gui/font.h"
#include "debug.h"
diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp
index 245bf58b0..0ae53ac1f 100644
--- a/src/gui/popups/textpopup.cpp
+++ b/src/gui/popups/textpopup.cpp
@@ -25,7 +25,7 @@
#include "gui/widgets/label.h"
-#include "gui/base/font.hpp"
+#include "gui/font.h"
#include "debug.h"