From 9f3eddda4befaf04c0c1a08983f210ee7c77b8ea Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 17 May 2014 18:31:23 +0300 Subject: Move font.cpp/h into fonts directory. --- src/gui/windows/confirmdialog.cpp | 4 ++-- src/gui/windows/equipmentwindow.cpp | 3 ++- src/gui/windows/inventorywindow.cpp | 3 ++- src/gui/windows/npcdialog.cpp | 3 ++- src/gui/windows/okdialog.cpp | 4 ++-- src/gui/windows/questswindow.cpp | 3 ++- src/gui/windows/serverdialog.cpp | 3 ++- src/gui/windows/skilldialog.cpp | 3 ++- src/gui/windows/textdialog.cpp | 2 +- src/gui/windows/tradewindow.cpp | 3 ++- 10 files changed, 19 insertions(+), 12 deletions(-) (limited to 'src/gui/windows') diff --git a/src/gui/windows/confirmdialog.cpp b/src/gui/windows/confirmdialog.cpp index 6eb21622d..f71d4e551 100644 --- a/src/gui/windows/confirmdialog.cpp +++ b/src/gui/windows/confirmdialog.cpp @@ -24,13 +24,13 @@ #include "soundmanager.h" +#include "gui/fonts/font.h" + #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" #include "utils/gettext.h" -#include "gui/font.h" - #include "debug.h" ConfirmDialog::ConfirmDialog(const std::string &restrict title, diff --git a/src/gui/windows/equipmentwindow.cpp b/src/gui/windows/equipmentwindow.cpp index ebe5a81b9..25cb5f629 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/font.h" #include "gui/viewport.h" +#include "gui/fonts/font.h" + #include "gui/popups/itempopup.h" #include "gui/windows/setupwindow.h" diff --git a/src/gui/windows/inventorywindow.cpp b/src/gui/windows/inventorywindow.cpp index 90ce6eca4..14226ee38 100644 --- a/src/gui/windows/inventorywindow.cpp +++ b/src/gui/windows/inventorywindow.cpp @@ -33,10 +33,11 @@ #include "input/inputmanager.h" -#include "gui/font.h" #include "gui/gui.h" #include "gui/viewport.h" +#include "gui/fonts/font.h" + #include "gui/models/sortlistmodelinv.h" #include "gui/popups/textpopup.h" diff --git a/src/gui/windows/npcdialog.cpp b/src/gui/windows/npcdialog.cpp index 5de307963..a2ac10073 100644 --- a/src/gui/windows/npcdialog.cpp +++ b/src/gui/windows/npcdialog.cpp @@ -32,10 +32,11 @@ #include "being/being.h" -#include "gui/font.h" #include "gui/gui.h" #include "gui/viewport.h" +#include "gui/fonts/font.h" + #include "gui/windows/inventorywindow.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/windows/okdialog.cpp b/src/gui/windows/okdialog.cpp index 5ab5356ca..bf8a64026 100644 --- a/src/gui/windows/okdialog.cpp +++ b/src/gui/windows/okdialog.cpp @@ -28,9 +28,9 @@ #include "gui/widgets/button.h" #include "gui/widgets/textbox.h" -#include "utils/gettext.h" +#include "gui/fonts/font.h" -#include "gui/font.h" +#include "utils/gettext.h" #include "debug.h" diff --git a/src/gui/windows/questswindow.cpp b/src/gui/windows/questswindow.cpp index f07d6f6b2..2e4ce2693 100644 --- a/src/gui/windows/questswindow.cpp +++ b/src/gui/windows/questswindow.cpp @@ -26,9 +26,10 @@ #include "being/localplayer.h" -#include "gui/font.h" #include "gui/gui.h" +#include "gui/fonts/font.h" + #include "gui/models/questsmodel.h" #include "gui/widgets/browserbox.h" diff --git a/src/gui/windows/serverdialog.cpp b/src/gui/windows/serverdialog.cpp index f63a3d5ba..25dfff02e 100644 --- a/src/gui/windows/serverdialog.cpp +++ b/src/gui/windows/serverdialog.cpp @@ -31,9 +31,10 @@ #include "input/keydata.h" -#include "gui/font.h" #include "gui/gui.h" +#include "gui/fonts/font.h" + #include "gui/models/serverslistmodel.h" #include "gui/widgets/checkbox.h" diff --git a/src/gui/windows/skilldialog.cpp b/src/gui/windows/skilldialog.cpp index 76296cfe4..f9351f29a 100644 --- a/src/gui/windows/skilldialog.cpp +++ b/src/gui/windows/skilldialog.cpp @@ -30,10 +30,11 @@ #include "being/attributes.h" #include "being/localplayer.h" -#include "gui/font.h" #include "gui/skin.h" #include "gui/viewport.h" +#include "gui/fonts/font.h" + #include "gui/popups/textpopup.h" #include "gui/models/skillmodel.h" diff --git a/src/gui/windows/textdialog.cpp b/src/gui/windows/textdialog.cpp index 9b7bb3eb1..3aa3211ad 100644 --- a/src/gui/windows/textdialog.cpp +++ b/src/gui/windows/textdialog.cpp @@ -30,7 +30,7 @@ #include "utils/gettext.h" -#include "gui/font.h" +#include "gui/fonts/font.h" #include "debug.h" diff --git a/src/gui/windows/tradewindow.cpp b/src/gui/windows/tradewindow.cpp index a6300d060..5827ca8a0 100644 --- a/src/gui/windows/tradewindow.cpp +++ b/src/gui/windows/tradewindow.cpp @@ -32,9 +32,10 @@ #include "being/playerinfo.h" #include "being/playerrelations.h" -#include "gui/font.h" #include "gui/gui.h" +#include "gui/fonts/font.h" + #include "gui/windows/inventorywindow.h" #include "gui/windows/itemamountwindow.h" #include "gui/windows/setupwindow.h" -- cgit v1.2.3-60-g2f50