BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

Move hex.h to util/

Browse Source
This commit is contained in:
Loic Blot 2015-02-21 14:17:36 +01:00
parent c09d026f05
commit 5a5854ea9d
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/clientmedia.cpp
View File

@ -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()
{

7
src/guiFormSpecMenu.cpp
View File

@ -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) { \

2
src/keycode.cpp
View File

@ -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
{

6
src/server.cpp
View File

@ -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
{

0
src/hex.h → src/util/hex.h
View File

4
src/util/string.cpp
View File

@ -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>