move notifications files to their own folder

wesnoth · Jun 27, 2014 · d2edec5 · d2edec5
1 parent 14fc744
commit d2edec5
Show file tree

Hide file tree

Showing 13 changed files with 17 additions and 17 deletions.
diff --git a/projectfiles/CodeBlocks/wesnoth.cbp b/projectfiles/CodeBlocks/wesnoth.cbp
@@ -862,8 +862,8 @@
 		<Unit filename="..\..\src\network_asio.hpp" />
 		<Unit filename="..\..\src\network_worker.cpp" />
 		<Unit filename="..\..\src\network_worker.hpp" />
-		<Unit filename="..\..\src\notifications.cpp" />
-		<Unit filename="..\..\src\notifications.hpp" />
+		<Unit filename="..\..\src\notifications\notifications.cpp" />
+		<Unit filename="..\..\src\notifications\notifications.hpp" />
 		<Unit filename="..\..\src\overlay.hpp" />
 		<Unit filename="..\..\src\pathfind\astarsearch.cpp" />
 		<Unit filename="..\..\src\pathfind\pathfind.cpp" />
@@ -1121,8 +1121,8 @@
 		<Unit filename="..\..\src\widgets\textbox.hpp" />
 		<Unit filename="..\..\src\widgets\widget.cpp" />
 		<Unit filename="..\..\src\widgets\widget.hpp" />
-		<Unit filename="..\..\src\windows_tray_notification.cpp" />
-		<Unit filename="..\..\src\windows_tray_notification.hpp" />
+		<Unit filename="..\..\src\notifications\windows_tray_notification.cpp" />
+		<Unit filename="..\..\src\notifications\windows_tray_notification.hpp" />
 		<Unit filename="..\..\src\wml_exception.cpp" />
 		<Unit filename="..\..\src\wml_exception.hpp" />
 		<Unit filename="..\..\src\wml_separators.hpp" />

diff --git a/projectfiles/VC9/wesnoth.vcproj b/projectfiles/VC9/wesnoth.vcproj
@@ -20705,11 +20705,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\notifications.cpp"
+			RelativePath="..\..\src\notifications\notifications.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\notifications.hpp"
+			RelativePath="..\..\src\notifications\notifications.hpp"
 			>
 		</File>
 		<File
@@ -21281,11 +21281,11 @@
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\windows_tray_notification.cpp"
+			RelativePath="..\..\src\notifications\windows_tray_notification.cpp"
 			>
 		</File>
 		<File
-			RelativePath="..\..\src\windows_tray_notification.hpp"
+			RelativePath="..\..\src\notifications\windows_tray_notification.hpp"
 			>
 		</File>
 		<File

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

diff --git a/src/SConscript b/src/SConscript
@@ -478,7 +478,7 @@ wesnoth_sources = Split("""
     multiplayer_ui.cpp
     multiplayer_wait.cpp
     network_asio.cpp
-    notifications.cpp
+    notifications/notifications.cpp
     pathfind/pathfind.cpp
     pathfind/teleport.cpp
     persist_context.cpp
@@ -556,7 +556,7 @@ wesnoth_sources = Split("""
     """)
 
 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))
 

diff --git a/src/display_chat_manager.cpp b/src/display_chat_manager.cpp
@@ -21,7 +21,7 @@
 #include "game_preferences.hpp"
 #include "log.hpp"
 #include "marked-up_text.hpp"
-#include "notifications.hpp"
+#include "notifications/notifications.hpp"
 #include "sound.hpp"
 #include "serialization/string_utils.hpp"
 

diff --git a/src/game_display.cpp b/src/game_display.cpp
@@ -34,7 +34,7 @@
 #include "map.hpp"
 #include "map_label.hpp"
 #include "marked-up_text.hpp"
-#include "notifications.hpp"
+#include "notifications/notifications.hpp"
 #include "reports.hpp"
 #include "resources.hpp"
 #include "tod_manager.hpp"

diff --git a/src/multiplayer_connect.cpp b/src/multiplayer_connect.cpp
@@ -26,7 +26,7 @@
 #include "gettext.hpp"
 #include "log.hpp"
 #include "map.hpp"
-#include "notifications.hpp"
+#include "notifications/notifications.hpp"
 #include "wml_separators.hpp"
 #include "sound.hpp"
 

diff --git a/src/multiplayer_wait.cpp b/src/multiplayer_wait.cpp
@@ -24,7 +24,7 @@
 #include "marked-up_text.hpp"
 #include "mp_game_utils.hpp"
 #include "multiplayer_wait.hpp"
-#include "notifications.hpp"
+#include "notifications/notifications.hpp"
 #include "resources.hpp"
 #include "statistics.hpp"
 #include "saved_game.hpp"

diff --git a/src/notifications.cpp → src/notifications/notifications.cpp b/src/notifications.cpp → src/notifications/notifications.cpp
diff --git a/src/notifications.hpp → src/notifications/notifications.hpp b/src/notifications.hpp → src/notifications/notifications.hpp
diff --git a/src/windows_tray_notification.cpp → ...tifications/windows_tray_notification.cpp b/src/windows_tray_notification.cpp → ...tifications/windows_tray_notification.cpp
diff --git a/src/windows_tray_notification.hpp → ...tifications/windows_tray_notification.hpp b/src/windows_tray_notification.hpp → ...tifications/windows_tray_notification.hpp
diff --git a/src/playmp_controller.cpp b/src/playmp_controller.cpp
@@ -22,7 +22,7 @@
 #include "game_end_exceptions.hpp"
 #include "gettext.hpp"
 #include "log.hpp"
-#include "notifications.hpp"
+#include "notifications/notifications.hpp"
 #include "playturn.hpp"
 #include "preferences.hpp"
 #include "resources.hpp"