Move hex.h to util/

nerzhul · nerzhul · commit 5a5854ea9d0b · 2015-02-21T14:32:35.000+01:00
diff --git 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
@@ -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
@@ -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
@@ -51,18 +51,18 @@ 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"
 #include "rollback.h"
 #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/util/hex.h b/src/util/hex.h
diff --git 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>

Original file line number	Diff line number	Diff line change
`@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,`
`22`	`22`	`#include "exceptions.h"`
`23`	`23`	`#include "settings.h"`
`24`	`24`	`#include "log.h"`
`25`		`-#include "hex.h"`
`26`	`25`	`#include "debug.h"`
	`26`	`+#include "util/hex.h"`
`27`	`27`
`28`	`28`	`class UnknownKeycode : public BaseException`
`29`	`29`	`{`