move some utility files to utils folder

This commit is contained in:
Chris Beck 2014-06-27 19:06:18 -04:00
parent 10a6f4bf38
commit ed3453f742
10 changed files with 11 additions and 10 deletions

View file

@ -965,9 +965,9 @@
<Unit filename="..\..\src\serialization\validator.hpp" /> <Unit filename="..\..\src\serialization\validator.hpp" />
<Unit filename="..\..\src\settings.cpp" /> <Unit filename="..\..\src\settings.cpp" />
<Unit filename="..\..\src\settings.hpp" /> <Unit filename="..\..\src\settings.hpp" />
<Unit filename="..\..\src\sha1.cpp" /> <Unit filename="..\..\src\utils\sha1.cpp" />
<Unit filename="..\..\src\sha1.hpp" /> <Unit filename="..\..\src\utils\sha1.hpp" />
<Unit filename="..\..\src\shared_object.hpp" /> <Unit filename="..\..\src\utils\shared_object.hpp" />
<Unit filename="..\..\src\show_dialog.cpp" /> <Unit filename="..\..\src\show_dialog.cpp" />
<Unit filename="..\..\src\show_dialog.hpp" /> <Unit filename="..\..\src\show_dialog.hpp" />
<Unit filename="..\..\src\side_filter.cpp" /> <Unit filename="..\..\src\side_filter.cpp" />

View file

@ -20953,15 +20953,15 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\sha1.cpp" RelativePath="..\..\src\utils\sha1.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\sha1.hpp" RelativePath="..\..\src\utils\sha1.hpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\shared_object.hpp" RelativePath="..\..\src\utils\shared_object.hpp"
> >
</File> </File>
<File <File

View file

@ -874,7 +874,7 @@ set(wesnoth-main_SRC
scripting/lua_api.cpp scripting/lua_api.cpp
scripting/lua_types.cpp scripting/lua_types.cpp
settings.cpp settings.cpp
sha1.cpp utils/sha1.cpp
side_filter.cpp side_filter.cpp
statistics.cpp statistics.cpp
statistics_dialog.cpp statistics_dialog.cpp

View file

@ -508,7 +508,6 @@ wesnoth_sources = Split("""
scripting/lua_api.cpp scripting/lua_api.cpp
scripting/lua_types.cpp scripting/lua_types.cpp
settings.cpp settings.cpp
sha1.cpp
side_filter.cpp side_filter.cpp
statistics.cpp statistics.cpp
statistics_dialog.cpp statistics_dialog.cpp
@ -536,6 +535,7 @@ wesnoth_sources = Split("""
unit_id.cpp unit_id.cpp
unit_map.cpp unit_map.cpp
unit_types.cpp unit_types.cpp
utils/sha1.cpp
variable.cpp variable.cpp
variant.cpp variant.cpp
whiteboard/action.cpp whiteboard/action.cpp

View file

@ -22,7 +22,7 @@
#include "log.hpp" #include "log.hpp"
#include "marked-up_text.hpp" #include "marked-up_text.hpp"
#include "show_dialog.hpp" #include "show_dialog.hpp"
#include "sha1.hpp" #include "utils/sha1.hpp"
#include "serialization/binary_or_text.hpp" #include "serialization/binary_or_text.hpp"
#include "serialization/parser.hpp" #include "serialization/parser.hpp"
#include "version.hpp" #include "version.hpp"

View file

@ -26,6 +26,7 @@
#include "tstring.hpp" #include "tstring.hpp"
#include "gettext.hpp" #include "gettext.hpp"
#include "log.hpp" #include "log.hpp"
#include "utils/shared_object.hpp"
#include <boost/functional/hash.hpp> #include <boost/functional/hash.hpp>
#include <boost/multi_index_container.hpp> #include <boost/multi_index_container.hpp>

View file

@ -15,7 +15,7 @@
#ifndef TSTRING_H_INCLUDED #ifndef TSTRING_H_INCLUDED
#define TSTRING_H_INCLUDED #define TSTRING_H_INCLUDED
#include "shared_object.hpp" #include "utils/shared_object.hpp"
#include <string> #include <string>