Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Swift/Controllers/Chat/ChatController.cpp (renamed from Swift/Controllers/ChatController.cpp)2
-rw-r--r--Swift/Controllers/Chat/ChatController.h (renamed from Swift/Controllers/ChatController.h)2
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.cpp (renamed from Swift/Controllers/ChatControllerBase.cpp)2
-rw-r--r--Swift/Controllers/Chat/ChatControllerBase.h (renamed from Swift/Controllers/ChatControllerBase.h)0
-rw-r--r--Swift/Controllers/Chat/ChatsManager.cpp (renamed from Swift/Controllers/ChatsManager.cpp)6
-rw-r--r--Swift/Controllers/Chat/ChatsManager.h (renamed from Swift/Controllers/ChatsManager.h)0
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp (renamed from Swift/Controllers/MUCController.cpp)2
-rw-r--r--Swift/Controllers/Chat/MUCController.h (renamed from Swift/Controllers/MUCController.h)2
-rw-r--r--Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp (renamed from Swift/Controllers/UnitTest/ChatsManagerTest.cpp)6
-rw-r--r--Swift/Controllers/MainController.cpp6
-rw-r--r--Swift/Controllers/SConscript10
-rw-r--r--Swift/QtUI/QtSwift.cpp1
12 files changed, 19 insertions, 20 deletions
diff --git a/Swift/Controllers/ChatController.cpp b/Swift/Controllers/Chat/ChatController.cpp
index c4f45d8..e4031f2 100644
--- a/Swift/Controllers/ChatController.cpp
+++ b/Swift/Controllers/Chat/ChatController.cpp
@@ -1,4 +1,4 @@
-#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/Chat/ChatController.h"
#include <boost/bind.hpp>
diff --git a/Swift/Controllers/ChatController.h b/Swift/Controllers/Chat/ChatController.h
index ea844ad..58ea797 100644
--- a/Swift/Controllers/ChatController.h
+++ b/Swift/Controllers/Chat/ChatController.h
@@ -1,7 +1,7 @@
#ifndef SWIFTEN_ChatController_H
#define SWIFTEN_ChatController_H
-#include "Swift/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/Chat/ChatControllerBase.h"
namespace Swift {
class AvatarManager;
diff --git a/Swift/Controllers/ChatControllerBase.cpp b/Swift/Controllers/Chat/ChatControllerBase.cpp
index 3e1ce5e..5f78795 100644
--- a/Swift/Controllers/ChatControllerBase.cpp
+++ b/Swift/Controllers/Chat/ChatControllerBase.cpp
@@ -1,4 +1,4 @@
-#include "Swift/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/Chat/ChatControllerBase.h"
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/Swift/Controllers/ChatControllerBase.h b/Swift/Controllers/Chat/ChatControllerBase.h
index abf0116..abf0116 100644
--- a/Swift/Controllers/ChatControllerBase.h
+++ b/Swift/Controllers/Chat/ChatControllerBase.h
diff --git a/Swift/Controllers/ChatsManager.cpp b/Swift/Controllers/Chat/ChatsManager.cpp
index a805802..0efd3e1 100644
--- a/Swift/Controllers/ChatsManager.cpp
+++ b/Swift/Controllers/Chat/ChatsManager.cpp
@@ -1,12 +1,12 @@
-#include "Swift/Controllers/ChatsManager.h"
+#include "Swift/Controllers/Chat/ChatsManager.h"
#include <boost/bind.hpp>
#include "Swiften/Client/Client.h"
-#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/EventController.h"
-#include "Swift/Controllers/MUCController.h"
+#include "Swift/Controllers/Chat/MUCController.h"
#include "Swiften/Presence/PresenceSender.h"
namespace Swift {
diff --git a/Swift/Controllers/ChatsManager.h b/Swift/Controllers/Chat/ChatsManager.h
index dd80d95..dd80d95 100644
--- a/Swift/Controllers/ChatsManager.h
+++ b/Swift/Controllers/Chat/ChatsManager.h
diff --git a/Swift/Controllers/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index c85fffa..7736aec 100644
--- a/Swift/Controllers/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -1,4 +1,4 @@
-#include "Swift/Controllers/MUCController.h"
+#include "Swift/Controllers/Chat/MUCController.h"
#include <boost/bind.hpp>
diff --git a/Swift/Controllers/MUCController.h b/Swift/Controllers/Chat/MUCController.h
index aa5a274..bafe3db 100644
--- a/Swift/Controllers/MUCController.h
+++ b/Swift/Controllers/Chat/MUCController.h
@@ -4,7 +4,7 @@
#include <boost/shared_ptr.hpp>
#include "Swiften/Base/String.h"
-#include "Swift/Controllers/ChatControllerBase.h"
+#include "Swift/Controllers/Chat/ChatControllerBase.h"
#include "Swiften/Elements/Message.h"
#include "Swiften/Elements/DiscoInfo.h"
#include "Swiften/JID/JID.h"
diff --git a/Swift/Controllers/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
index 219b9b0..ab1c03b 100644
--- a/Swift/Controllers/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
@@ -2,15 +2,15 @@
#include <cppunit/extensions/TestFactoryRegistry.h>
#include "3rdParty/hippomocks.h"
-#include "Swift/Controllers/ChatsManager.h"
+#include "Swift/Controllers/Chat/ChatsManager.h"
#include "Swift/Controllers/UIInterfaces/ChatWindow.h"
#include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h"
#include "Swiften/Roster/TreeWidgetFactory.h"
#include "Swiften/Client/Client.h"
-#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/EventController.h"
-#include "Swift/Controllers/MUCController.h"
+#include "Swift/Controllers/Chat/MUCController.h"
#include "Swiften/Presence/PresenceSender.h"
#include "Swiften/Avatars/UnitTest/MockAvatarManager.h"
#include "Swift/Controllers/NickResolver.h"
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 3fd0764..074369e 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -7,15 +7,15 @@
#include "Swiften/Application/Application.h"
#include "Swiften/Application/ApplicationMessageDisplay.h"
-#include "Swift/Controllers/ChatController.h"
+#include "Swift/Controllers/Chat/ChatController.h"
#include "Swift/Controllers/UIInterfaces/ChatWindowFactory.h"
-#include "Swift/Controllers/ChatsManager.h"
+#include "Swift/Controllers/Chat/ChatsManager.h"
#include "Swift/Controllers/EventController.h"
#include "Swift/Controllers/UIInterfaces/LoginWindow.h"
#include "Swift/Controllers/UIInterfaces/LoginWindowFactory.h"
#include "Swift/Controllers/MainWindow.h"
#include "Swift/Controllers/MainWindowFactory.h"
-#include "Swift/Controllers/MUCController.h"
+#include "Swift/Controllers/Chat/MUCController.h"
#include "Swift/Controllers/NickResolver.h"
#include "Swift/Controllers/ProfileSettingsProvider.h"
#include "Swift/Controllers/RosterController.h"
diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript
index 82bacaa..6bd742b 100644
--- a/Swift/Controllers/SConscript
+++ b/Swift/Controllers/SConscript
@@ -8,14 +8,14 @@ env["SWIFT_CONTROLLERS_FLAGS"] = {
myenv = env.Clone()
myenv.MergeFlags(env["BOOST_FLAGS"])
myenv.StaticLibrary("SwiftControllers", [
- "ChatController.cpp",
- "ChatControllerBase.cpp",
- "ChatsManager.cpp",
+ "Chat/ChatController.cpp",
+ "Chat/ChatControllerBase.cpp",
+ "Chat/ChatsManager.cpp",
"MainController.cpp",
"NickResolver.cpp",
"RosterController.cpp",
"XMPPRosterController.cpp",
- "MUCController.cpp",
+ "Chat/MUCController.cpp",
"EventController.cpp",
"SoundEventController.cpp",
"SystemTrayController.cpp",
@@ -30,6 +30,6 @@ env.Append(UNITTEST_SOURCES = [
File("UnitTest/RosterControllerTest.cpp"),
File("UnitTest/XMPPRosterControllerTest.cpp"),
File("UnitTest/PreviousStatusStoreTest.cpp"),
- File("UnitTest/ChatsManagerTest.cpp"),
+ File("Chat/UnitTest/ChatsManagerTest.cpp"),
File("UnitTest/MockChatWindow.cpp"),
])
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 5802e48..be2d291 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -18,7 +18,6 @@
#include "Swiften/Base/Platform.h"
#include "Swiften/Elements/Presence.h"
#include "Swiften/Client/Client.h"
-#include "Swift/Controllers/ChatController.h"
#include "Swift/Controllers/MainController.h"
#include "Swift/QtUI/BuildVersion.h"
#include "SwifTools/AutoUpdater/AutoUpdater.h"