Skip to content
Permalink
Browse files

Move hex.h to util/

  • Loading branch information
nerzhul committed Feb 21, 2015
1 parent c09d026 commit 5a5854ea9d0bc346b00f48f40b538b7a8d68b37a
Showing with 14 additions and 15 deletions.
  1. +5 −5 src/clientmedia.cpp
  2. +3 −4 src/guiFormSpecMenu.cpp
  3. +1 −1 src/keycode.cpp
  4. +3 −3 src/server.cpp
  5. 0 src/{ → util}/hex.h
  6. +2 −2 src/util/string.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()
{
@@ -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) { \
@@ -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
{
@@ -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
{
File renamed without changes.
@@ -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>

0 comments on commit 5a5854e

Please sign in to comment.
You can’t perform that action at this time.