Swiftdiff options
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 2 | ||||
| -rw-r--r-- | Swift/Controllers/SConscript | 2 | ||||
| -rw-r--r-- | Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp (renamed from Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp) | 2 | ||||
| -rw-r--r-- | Swiften/Roster/XMPPRosterController.cpp (renamed from Swift/Controllers/XMPPRosterController.cpp) | 2 | ||||
| -rw-r--r-- | Swiften/Roster/XMPPRosterController.h (renamed from Swift/Controllers/XMPPRosterController.h) | 4 | ||||
| -rw-r--r-- | Swiften/SConscript | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index 6221f21..4cd9be4 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -35,7 +35,7 @@ #include "Swift/Controllers/SystemTray.h" #include "Swift/Controllers/SystemTrayController.h" #include "Swift/Controllers/XMLConsoleController.h" -#include "Swift/Controllers/XMPPRosterController.h" +#include "Swiften/Roster/XMPPRosterController.h" #include "Swift/Controllers/UIEvents/UIEventStream.h" #include "Swift/Controllers/PresenceNotifier.h" #include "SwifTools/Dock/Dock.h" diff --git a/Swift/Controllers/SConscript b/Swift/Controllers/SConscript index 30c9590..41461bd 100644 --- a/Swift/Controllers/SConscript +++ b/Swift/Controllers/SConscript @@ -29,7 +29,6 @@ if env["SCONS_STAGE"] == "build" : "MainController.cpp", "NickResolver.cpp", "RosterController.cpp", - "XMPPRosterController.cpp", "EventController.cpp", "EventWindowController.cpp", "SoundEventController.cpp", @@ -46,7 +45,6 @@ if env["SCONS_STAGE"] == "build" : env.Append(UNITTEST_SOURCES = [ File("UnitTest/NickResolverTest.cpp"), File("UnitTest/RosterControllerTest.cpp"), - File("UnitTest/XMPPRosterControllerTest.cpp"), File("UnitTest/PreviousStatusStoreTest.cpp"), File("UnitTest/PresenceNotifierTest.cpp"), File("Chat/UnitTest/ChatsManagerTest.cpp"), diff --git a/Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp index 6787528..7e76d3a 100644 --- a/Swift/Controllers/UnitTest/XMPPRosterControllerTest.cpp +++ b/Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp @@ -7,7 +7,7 @@ #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include "Swift/Controllers/XMPPRosterController.h" +#include "Swiften/Roster/XMPPRosterController.h" #include "Swiften/Elements/Payload.h" #include "Swiften/Elements/RosterItemPayload.h" #include "Swiften/Elements/RosterPayload.h" diff --git a/Swift/Controllers/XMPPRosterController.cpp b/Swiften/Roster/XMPPRosterController.cpp index c3144b7..dca74c0 100644 --- a/Swift/Controllers/XMPPRosterController.cpp +++ b/Swiften/Roster/XMPPRosterController.cpp @@ -4,7 +4,7 @@ * See Documentation/Licenses/GPLv3.txt for more information. */ -#include "Swift/Controllers/XMPPRosterController.h" +#include "Swiften/Roster/XMPPRosterController.h" #include <boost/bind.hpp> diff --git a/Swift/Controllers/XMPPRosterController.h b/Swiften/Roster/XMPPRosterController.h index 14159c7..3ef7795 100644 --- a/Swift/Controllers/XMPPRosterController.h +++ b/Swiften/Roster/XMPPRosterController.h @@ -6,14 +6,14 @@ #pragma once +#include <boost/shared_ptr.hpp> + #include "Swiften/JID/JID.h" #include "Swiften/Base/String.h" #include "Swiften/Elements/IQ.h" #include "Swiften/Elements/RosterPayload.h" #include "Swiften/Queries/Responders/RosterPushResponder.h" - #include "Swiften/Base/boost_bsignals.h" -#include <boost/shared_ptr.hpp> namespace Swift { class IQRouter; diff --git a/Swiften/SConscript b/Swiften/SConscript index 11c976e..83306b7 100644 --- a/Swiften/SConscript +++ b/Swiften/SConscript @@ -56,6 +56,7 @@ if env["SCONS_STAGE"] == "build" : "Roster/RosterItem.cpp", "Roster/Roster.cpp", "Roster/XMPPRoster.cpp", + "Roster/XMPPRosterController.cpp", "Serializer/AuthRequestSerializer.cpp", "Serializer/AuthSuccessSerializer.cpp", "Serializer/AuthChallengeSerializer.cpp", @@ -204,6 +205,7 @@ if env["SCONS_STAGE"] == "build" : File("Roster/UnitTest/OfflineRosterFilterTest.cpp"), File("Roster/UnitTest/RosterTest.cpp"), File("Roster/UnitTest/XMPPRosterTest.cpp"), + File("Roster/UnitTest/XMPPRosterControllerTest.cpp"), File("Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.cpp"), File("Serializer/PayloadSerializers/UnitTest/CapsInfoSerializerTest.cpp"), File("Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp"), |