diff options
| -rw-r--r-- | src/clientmedia.cpp | 10 | ||||
| -rw-r--r-- | src/guiFormSpecMenu.cpp | 7 | ||||
| -rw-r--r-- | src/keycode.cpp | 2 | ||||
| -rw-r--r-- | src/server.cpp | 6 | ||||
| -rw-r--r-- | src/util/hex.h (renamed from src/hex.h) | 0 | ||||
| -rw-r--r-- | src/util/string.cpp | 4 |
6 files changed, 14 insertions, 15 deletions
diff --git a/src/clientmedia.cpp b/src/clientmedia.cpp index 2ccf04678..7eb505314 100644 --- a/src/clientmedia.cpp +++ b/src/clientmedia.cpp @@ -18,20 +18,20 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #include "clientmedia.h" -#include "util/serialize.h" -#include "util/sha1.h" -#include "util/string.h" #include "httpfetch.h" #include "client.h" -#include "network/networkprotocol.h" #include "filecache.h" #include "filesys.h" -#include "hex.h" #include "debug.h" #include "log.h" #include "porting.h" #include "settings.h" #include "main.h" +#include "network/networkprotocol.h" +#include "util/hex.h" +#include "util/serialize.h" +#include "util/sha1.h" +#include "util/string.h" static std::string getMediaCacheDir() { diff --git a/src/guiFormSpecMenu.cpp b/src/guiFormSpecMenu.cpp index 3f285fa5e..a3cc03131 100644 --- a/src/guiFormSpecMenu.cpp +++ b/src/guiFormSpecMenu.cpp @@ -39,9 +39,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "log.h" #include "tile.h" // ITextureSource #include "hud.h" // drawItemStack -#include "hex.h" -#include "util/string.h" -#include "util/numeric.h" #include "filesys.h" #include "gettime.h" #include "gettext.h" @@ -50,8 +47,10 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "main.h" #include "settings.h" #include "client.h" -#include "util/string.h" // for parseColorString() #include "fontengine.h" +#include "util/hex.h" +#include "util/numeric.h" +#include "util/string.h" // for parseColorString() #define MY_CHECKPOS(a,b) \ if (v_pos.size() != 2) { \ diff --git a/src/keycode.cpp b/src/keycode.cpp index c5f102b44..27d0b6d50 100644 --- a/src/keycode.cpp +++ b/src/keycode.cpp @@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "exceptions.h" #include "settings.h" #include "log.h" -#include "hex.h" #include "debug.h" +#include "util/hex.h" class UnknownKeycode : public BaseException { diff --git a/src/server.cpp b/src/server.cpp index 0d52863d2..6c51aec4b 100644 --- a/src/server.cpp +++ b/src/server.cpp @@ -51,11 +51,8 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "content_abm.h" #include "content_sao.h" #include "mods.h" -#include "util/sha1.h" -#include "util/base64.h" #include "sound.h" // dummySoundManager #include "event_manager.h" -#include "hex.h" #include "serverlist.h" #include "util/string.h" #include "util/mathconstants.h" @@ -63,6 +60,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "util/serialize.h" #include "util/thread.h" #include "defaultsettings.h" +#include "util/base64.h" +#include "util/sha1.h" +#include "util/hex.h" class ClientNotFoundException : public BaseException { diff --git a/src/hex.h b/src/util/hex.h index 6f00a79bf..6f00a79bf 100644 --- a/src/hex.h +++ b/src/util/hex.h diff --git a/src/util/string.cpp b/src/util/string.cpp index babf7e62b..8861981b2 100644 --- a/src/util/string.cpp +++ b/src/util/string.cpp @@ -22,9 +22,9 @@ with this program; if not, write to the Free Software Foundation, Inc., #include "numeric.h" #include "log.h" -#include "sha1.h" #include "base64.h" -#include "../hex.h" +#include "hex.h" +#include "sha1.h" #include "../porting.h" #include <algorithm> |