diff options
| author | Andrei Karas <akaras@inbox.ru> | 2013-11-01 17:41:07 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2013-11-01 21:33:37 +0300 |
| commit | 93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f (patch) | |
| tree | 7501c33d86faee4450558989519b721bef1b414c /src/gui | |
| parent | 748b2dc257650d9ff6e740496802cb977227bc21 (diff) | |
| download | manaplus-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.gz manaplus-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.bz2 manaplus-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.tar.xz manaplus-93c9e4f6c0a4f4a4ecc78a6b540984937bbb195f.zip | |
Move timers from client into timers file.
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/palette.cpp | 2 | ||||
| -rw-r--r-- | src/gui/sdlfont.cpp | 3 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 5 | ||||
| -rw-r--r-- | src/gui/widgets/textfield.cpp | 1 | ||||
| -rw-r--r-- | src/gui/windows/debugwindow.cpp | 3 |
5 files changed, 9 insertions, 5 deletions
diff --git a/src/gui/palette.cpp b/src/gui/palette.cpp index 0f7d76e85..b47203f8f 100644 --- a/src/gui/palette.cpp +++ b/src/gui/palette.cpp @@ -23,7 +23,7 @@ #include "gui/palette.h" -#include "client.h" +#include "utils/timer.h" #include <cmath> diff --git a/src/gui/sdlfont.cpp b/src/gui/sdlfont.cpp index 985ddf69b..b0596418d 100644 --- a/src/gui/sdlfont.cpp +++ b/src/gui/sdlfont.cpp @@ -23,7 +23,6 @@ #include "gui/sdlfont.h" -#include "client.h" #include "logger.h" #include "main.h" @@ -39,6 +38,8 @@ #include "utils/paths.h" #include "utils/physfsrwops.h" #include "utils/sdlcheckutils.h" +#include "utils/stringutils.h" +#include "utils/timer.h" #include <guichan/exception.hpp> diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 5cd9b54f7..8d1550f43 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -23,8 +23,6 @@ #include "gui/widgets/browserbox.h" -#include "client.h" - #include "input/inputmanager.h" #include "gui/gui.h" @@ -36,6 +34,9 @@ #include "resources/imageset.h" #include "resources/resourcemanager.h" +#include "utils/stringutils.h" +#include "utils/timer.h" + #include <guichan/graphics.hpp> #include <guichan/font.hpp> #include <guichan/cliprectangle.hpp> diff --git a/src/gui/widgets/textfield.cpp b/src/gui/widgets/textfield.cpp index 04527e1ae..a361e1a12 100644 --- a/src/gui/widgets/textfield.cpp +++ b/src/gui/widgets/textfield.cpp @@ -39,6 +39,7 @@ #include "resources/image.h" #include "utils/copynpaste.h" +#include "utils/timer.h" #include <guichan/font.hpp> diff --git a/src/gui/windows/debugwindow.cpp b/src/gui/windows/debugwindow.cpp index 7fec86369..cb5e06c3d 100644 --- a/src/gui/windows/debugwindow.cpp +++ b/src/gui/windows/debugwindow.cpp @@ -22,7 +22,6 @@ #include "gui/windows/debugwindow.h" -#include "client.h" #include "game.h" #include "main.h" @@ -43,6 +42,8 @@ #include "net/packetcounters.h" #include "utils/gettext.h" +#include "utils/stringutils.h" +#include "utils/timer.h" #include "debug.h" |