diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-05-17 18:31:23 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-05-17 18:31:23 +0300 |
| commit | 9f3eddda4befaf04c0c1a08983f210ee7c77b8ea (patch) | |
| tree | e08d509274b9bb7cdef72ac6a320028013e8b270 /src/gui/popups | |
| parent | ffdf217e5b11b95ca9feb126b1a2e210f553370f (diff) | |
| download | plus-9f3eddda4befaf04c0c1a08983f210ee7c77b8ea.tar.gz plus-9f3eddda4befaf04c0c1a08983f210ee7c77b8ea.tar.bz2 plus-9f3eddda4befaf04c0c1a08983f210ee7c77b8ea.tar.xz plus-9f3eddda4befaf04c0c1a08983f210ee7c77b8ea.zip | |
Move font.cpp/h into fonts directory.
Diffstat (limited to 'src/gui/popups')
| -rw-r--r-- | src/gui/popups/beingpopup.cpp | 3 | ||||
| -rw-r--r-- | src/gui/popups/itempopup.cpp | 3 | ||||
| -rw-r--r-- | src/gui/popups/speechbubble.cpp | 3 | ||||
| -rw-r--r-- | src/gui/popups/statuspopup.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/textpopup.cpp | 2 |
5 files changed, 8 insertions, 5 deletions
diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index dd1aaf028..b15ccc7ae 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -24,9 +24,10 @@ #include "being/being.h" #include "being/playerrelations.h" -#include "gui/font.h" #include "gui/gui.h" +#include "gui/fonts/font.h" + #include "gui/widgets/label.h" #include "utils/gettext.h" diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 0a65ce3bc..9b0870261 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -27,9 +27,10 @@ #include "item.h" #include "units.h" -#include "gui/font.h" #include "gui/gui.h" +#include "gui/fonts/font.h" + #include "gui/widgets/icon.h" #include "gui/widgets/label.h" #include "gui/widgets/textbox.h" diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index 44699499f..3f01651d8 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -23,11 +23,12 @@ #include "gui/popups/speechbubble.h" -#include "gui/font.h" #include "gui/gui.h" #include "gui/skin.h" #include "gui/viewport.h" +#include "gui/fonts/font.h" + #include "gui/widgets/browserbox.h" #include "gui/widgets/label.h" diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index 7dd3c3634..2c149f755 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -33,7 +33,7 @@ #include "utils/stringutils.h" -#include "gui/font.h" +#include "gui/fonts/font.h" #include "debug.h" diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp index d5cc918d3..c16c188ef 100644 --- a/src/gui/popups/textpopup.cpp +++ b/src/gui/popups/textpopup.cpp @@ -25,7 +25,7 @@ #include "gui/widgets/label.h" -#include "gui/font.h" +#include "gui/fonts/font.h" #include "debug.h" |