0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move notifications files to their own folder

Browse source
This commit is contained in:
Chris Beck 2014-06-27 18:14:45 -04:00
parent 14fc744d9e
commit d2edec5921
13 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
projectfiles/CodeBlocks/wesnoth.cbp
View file

@ -862,8 +862,8 @@
<Unit filename="..\..\src\network_asio.hpp" /> <Unit filename="..\..\src\network_asio.hpp" />
<Unit filename="..\..\src\network_worker.cpp" /> <Unit filename="..\..\src\network_worker.cpp" />
<Unit filename="..\..\src\network_worker.hpp" /> <Unit filename="..\..\src\network_worker.hpp" />
<Unit filename="..\..\src\notifications.cpp" /> <Unit filename="..\..\src\notifications\notifications.cpp" />
<Unit filename="..\..\src\notifications.hpp" /> <Unit filename="..\..\src\notifications\notifications.hpp" />
<Unit filename="..\..\src\overlay.hpp" /> <Unit filename="..\..\src\overlay.hpp" />
<Unit filename="..\..\src\pathfind\astarsearch.cpp" /> <Unit filename="..\..\src\pathfind\astarsearch.cpp" />
<Unit filename="..\..\src\pathfind\pathfind.cpp" /> <Unit filename="..\..\src\pathfind\pathfind.cpp" />
@ -1121,8 +1121,8 @@
<Unit filename="..\..\src\widgets\textbox.hpp" /> <Unit filename="..\..\src\widgets\textbox.hpp" />
<Unit filename="..\..\src\widgets\widget.cpp" /> <Unit filename="..\..\src\widgets\widget.cpp" />
<Unit filename="..\..\src\widgets\widget.hpp" /> <Unit filename="..\..\src\widgets\widget.hpp" />
<Unit filename="..\..\src\windows_tray_notification.cpp" /> <Unit filename="..\..\src\notifications\windows_tray_notification.cpp" />
<Unit filename="..\..\src\windows_tray_notification.hpp" /> <Unit filename="..\..\src\notifications\windows_tray_notification.hpp" />
<Unit filename="..\..\src\wml_exception.cpp" /> <Unit filename="..\..\src\wml_exception.cpp" />
<Unit filename="..\..\src\wml_exception.hpp" /> <Unit filename="..\..\src\wml_exception.hpp" />
<Unit filename="..\..\src\wml_separators.hpp" /> <Unit filename="..\..\src\wml_separators.hpp" />

8
projectfiles/VC9/wesnoth.vcproj
View file

@ -20705,11 +20705,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\notifications.cpp" RelativePath="..\..\src\notifications\notifications.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\notifications.hpp" RelativePath="..\..\src\notifications\notifications.hpp"
> >
</File> </File>
<File <File
@ -21281,11 +21281,11 @@
> >
</File> </File>
<File <File
RelativePath="..\..\src\windows_tray_notification.cpp" RelativePath="..\..\src\notifications\windows_tray_notification.cpp"
> >
</File> </File>
<File <File
RelativePath="..\..\src\windows_tray_notification.hpp" RelativePath="..\..\src\notifications\windows_tray_notification.hpp"
> >
</File> </File>
<File <File

4
src/CMakeLists.txt
View file

@ -844,7 +844,7 @@ set(wesnoth-main_SRC
multiplayer_ui.cpp multiplayer_ui.cpp
multiplayer_wait.cpp multiplayer_wait.cpp
network_asio.cpp network_asio.cpp
notifications.cpp notifications/notifications.cpp
pathfind/pathfind.cpp pathfind/pathfind.cpp
pathfind/teleport.cpp pathfind/teleport.cpp
persist_context.cpp persist_context.cpp
@ -992,7 +992,7 @@ set(libwesnoth-game_STAT_SRC
if(MSVC) if(MSVC)
set(libwesnoth-game_STAT_SRC set(libwesnoth-game_STAT_SRC
${libwesnoth-game_STAT_SRC} ${libwesnoth-game_STAT_SRC}
windows_tray_notification.cpp notifications/windows_tray_notification.cpp
) )
endif(MSVC) endif(MSVC)

4
src/SConscript
View file

@ -478,7 +478,7 @@ wesnoth_sources = Split("""
multiplayer_ui.cpp multiplayer_ui.cpp
multiplayer_wait.cpp multiplayer_wait.cpp
network_asio.cpp network_asio.cpp
notifications.cpp notifications/notifications.cpp
pathfind/pathfind.cpp pathfind/pathfind.cpp
pathfind/teleport.cpp pathfind/teleport.cpp
persist_context.cpp persist_context.cpp
@ -556,7 +556,7 @@ wesnoth_sources = Split("""
""") """)
if env["PLATFORM"] == "win32": if env["PLATFORM"] == "win32":
wesnoth_sources.append("windows_tray_notification.cpp") wesnoth_sources.append("notifications/windows_tray_notification.cpp")
wesnoth_sources.extend(client_env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None)) wesnoth_sources.extend(client_env.Object("game_preferences_display.cpp", EXTRA_DEFINE = env["PLATFORM"] != "win32" and "WESNOTH_PREFIX='\"$prefix\"'" or None))

2
src/display_chat_manager.cpp
View file

@ -21,7 +21,7 @@
#include "game_preferences.hpp" #include "game_preferences.hpp"
#include "log.hpp" #include "log.hpp"
#include "marked-up_text.hpp" #include "marked-up_text.hpp"
#include "notifications.hpp" #include "notifications/notifications.hpp"
#include "sound.hpp" #include "sound.hpp"
#include "serialization/string_utils.hpp" #include "serialization/string_utils.hpp"

2
src/game_display.cpp
View file

@ -34,7 +34,7 @@
#include "map.hpp" #include "map.hpp"
#include "map_label.hpp" #include "map_label.hpp"
#include "marked-up_text.hpp" #include "marked-up_text.hpp"
#include "notifications.hpp" #include "notifications/notifications.hpp"
#include "reports.hpp" #include "reports.hpp"
#include "resources.hpp" #include "resources.hpp"
#include "tod_manager.hpp" #include "tod_manager.hpp"

2
src/multiplayer_connect.cpp
View file

@ -26,7 +26,7 @@
#include "gettext.hpp" #include "gettext.hpp"
#include "log.hpp" #include "log.hpp"
#include "map.hpp" #include "map.hpp"
#include "notifications.hpp" #include "notifications/notifications.hpp"
#include "wml_separators.hpp" #include "wml_separators.hpp"
#include "sound.hpp" #include "sound.hpp"

2
src/multiplayer_wait.cpp
View file

@ -24,7 +24,7 @@
#include "marked-up_text.hpp" #include "marked-up_text.hpp"
#include "mp_game_utils.hpp" #include "mp_game_utils.hpp"
#include "multiplayer_wait.hpp" #include "multiplayer_wait.hpp"
#include "notifications.hpp" #include "notifications/notifications.hpp"
#include "resources.hpp" #include "resources.hpp"
#include "statistics.hpp" #include "statistics.hpp"
#include "saved_game.hpp" #include "saved_game.hpp"

0
src/notifications.cpp → src/notifications/notifications.cpp
View file

0
src/notifications.hpp → src/notifications/notifications.hpp
View file

0
src/windows_tray_notification.cpp → src/notifications/windows_tray_notification.cpp
View file

0
src/windows_tray_notification.hpp → src/notifications/windows_tray_notification.hpp
View file

2
src/playmp_controller.cpp
View file

@ -22,7 +22,7 @@
#include "game_end_exceptions.hpp" #include "game_end_exceptions.hpp"
#include "gettext.hpp" #include "gettext.hpp"
#include "log.hpp" #include "log.hpp"
#include "notifications.hpp" #include "notifications/notifications.hpp"
#include "playturn.hpp" #include "playturn.hpp"
#include "preferences.hpp" #include "preferences.hpp"
#include "resources.hpp" #include "resources.hpp"