Move sha1.hpp and base64.hpp to util/

src/CMakeLists.txt

@@ -362,7 +362,6 @@ set (unittests_SRCS
 
 set(common_SRCS
 	ban.cpp
-	base64.cpp
 	cavegen.cpp
 	clientiface.cpp
 	collision.cpp
@@ -422,7 +421,6 @@ set(common_SRCS
 	serverlist.cpp
 	serverobject.cpp
 	settings.cpp
-	sha1.cpp
 	socket.cpp
 	sound.cpp
 	staticobject.cpp

src/clientmedia.cpp

@@ -19,6 +19,7 @@ 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"
@@ -26,7 +27,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "filecache.h"
 #include "filesys.h"
 #include "hex.h"
-#include "sha1.h"
 #include "debug.h"
 #include "log.h"
 #include "porting.h"

src/network/packethandlers/client.cpp

@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "client.h"
 
-#include "base64.h"
+#include "util/base64.h"
 #include "clientmedia.h"
 #include "log.h"
 #include "map.h"

src/network/packethandlers/server.cpp

@@ -20,7 +20,6 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "server.h"
 #include "log.h"
 
-#include "base64.h"
 #include "content_abm.h"
 #include "content_sao.h"
 #include "emerge.h"
@@ -34,6 +33,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "version.h"
 #include "network/networkprotocol.h"
 #include "network/serveropcodes.h"
+#include "util/base64.h"
 #include "util/pointedthing.h"
 #include "util/serialize.h"
 

src/server.cpp

@@ -51,8 +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 "sha1.h"
+#include "util/sha1.h"
-#include "base64.h"
+#include "util/base64.h"
 #include "sound.h" // dummySoundManager
 #include "event_manager.h"
 #include "hex.h"

src/util/CMakeLists.txt

@@ -1,8 +1,10 @@
 set(UTIL_SRCS
+	${CMAKE_CURRENT_SOURCE_DIR}/base64.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/directiontables.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/numeric.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/pointedthing.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/serialize.cpp
+	${CMAKE_CURRENT_SOURCE_DIR}/sha1.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/string.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/timetaker.cpp
 	PARENT_SCOPE)

src/util/string.cpp

@@ -22,8 +22,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include "numeric.h"
 #include "log.h"
 
-#include "../sha1.h"
+#include "sha1.h"
-#include "../base64.h"
+#include "base64.h"
 #include "../hex.h"
 #include "../porting.h"