Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--3rdParty/Snarl/SnarlInterface.cpp2
-rw-r--r--Swift/Controllers/Chat/MUCSearchController.cpp4
-rw-r--r--Swift/Controllers/MainController.cpp6
-rw-r--r--Swift/Controllers/RosterController.cpp4
-rw-r--r--Swiften/Avatars/VCardUpdateAvatarManager.cpp2
-rw-r--r--Swiften/Disco/CapsManager.cpp2
-rw-r--r--Swiften/Disco/DiscoInfoResponder.cpp (renamed from Swiften/Queries/Responders/DiscoInfoResponder.cpp)2
-rw-r--r--Swiften/Disco/DiscoInfoResponder.h (renamed from Swiften/Queries/Responders/DiscoInfoResponder.h)0
-rw-r--r--Swiften/Disco/GetDiscoInfoRequest.h (renamed from Swiften/Queries/Requests/GetDiscoInfoRequest.h)0
-rw-r--r--Swiften/Disco/GetDiscoItemsRequest.h (renamed from Swiften/Queries/Requests/GetDiscoItemsRequest.h)0
-rw-r--r--Swiften/Disco/SConscript1
-rw-r--r--Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp (renamed from Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp)2
-rw-r--r--Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp2
-rw-r--r--Swiften/QA/ClientTest/ClientTest.cpp2
-rw-r--r--Swiften/QA/ReconnectTest/ReconnectTest.cpp2
-rw-r--r--Swiften/Roster/GetRosterRequest.h (renamed from Swiften/Queries/Requests/GetRosterRequest.h)0
-rw-r--r--Swiften/Roster/RosterPushResponder.h (renamed from Swiften/Queries/Responders/RosterPushResponder.h)0
-rw-r--r--Swiften/Roster/SetRosterRequest.h (renamed from Swiften/Queries/Requests/SetRosterRequest.h)0
-rw-r--r--Swiften/Roster/XMPPRosterController.cpp2
-rw-r--r--Swiften/Roster/XMPPRosterController.h2
-rw-r--r--Swiften/SConscript5
-rw-r--r--Swiften/VCards/GetVCardRequest.h (renamed from Swiften/Queries/Requests/GetVCardRequest.h)0
-rw-r--r--Swiften/VCards/VCardManager.cpp2
-rw-r--r--Swiften/VCards/VCardMemoryStorageFactory.h2
24 files changed, 22 insertions, 22 deletions
diff --git a/3rdParty/Snarl/SnarlInterface.cpp b/3rdParty/Snarl/SnarlInterface.cpp
index f287b8e..b780140 100644
--- a/3rdParty/Snarl/SnarlInterface.cpp
+++ b/3rdParty/Snarl/SnarlInterface.cpp
@@ -809,4 +809,4 @@ LPSTR SnarlInterface::WideToUTF8(LPCWSTR szWideStr)
WideCharToMultiByte(CP_UTF8, 0, szWideStr, -1, szUTF8, nSize, NULL, NULL);
return szUTF8;
-} \ No newline at end of file
+}
diff --git a/Swift/Controllers/Chat/MUCSearchController.cpp b/Swift/Controllers/Chat/MUCSearchController.cpp
index dc81031..0cf02c7 100644
--- a/Swift/Controllers/Chat/MUCSearchController.cpp
+++ b/Swift/Controllers/Chat/MUCSearchController.cpp
@@ -11,8 +11,8 @@
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
-#include "Swiften/Queries/Requests/GetDiscoItemsRequest.h"
+#include "Swiften/Disco/GetDiscoInfoRequest.h"
+#include "Swiften/Disco/GetDiscoItemsRequest.h"
#include "Swift/Controllers/UIEvents/UIEventStream.h"
#include "Swift/Controllers/UIEvents/RequestMUCSearchUIEvent.h"
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 6b9c447..837e576 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -48,10 +48,10 @@
#include "Swiften/Elements/VCardUpdate.h"
#include "Swift/Controllers/Settings/SettingsProvider.h"
#include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Queries/Responders/DiscoInfoResponder.h"
+#include "Swiften/Disco/DiscoInfoResponder.h"
#include "Swiften/Disco/CapsInfoGenerator.h"
-#include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
-#include "Swiften/Queries/Requests/GetVCardRequest.h"
+#include "Swiften/Disco/GetDiscoInfoRequest.h"
+#include "Swiften/VCards/GetVCardRequest.h"
#include "Swiften/Avatars/AvatarStorage.h"
#include "Swiften/Avatars/AvatarManagerImpl.h"
#include "Swiften/Disco/CapsFileStorage.h"
diff --git a/Swift/Controllers/RosterController.cpp b/Swift/Controllers/RosterController.cpp
index e79fad1..defd1c6 100644
--- a/Swift/Controllers/RosterController.cpp
+++ b/Swift/Controllers/RosterController.cpp
@@ -12,8 +12,8 @@
#include "Swift/Controllers/UIInterfaces/MainWindow.h"
#include "Swift/Controllers/UIInterfaces/MainWindowFactory.h"
#include "Swift/Controllers/NickResolver.h"
-#include "Swiften/Queries/Requests/GetRosterRequest.h"
-#include "Swiften/Queries/Requests/SetRosterRequest.h"
+#include "Swiften/Roster/GetRosterRequest.h"
+#include "Swiften/Roster/SetRosterRequest.h"
#include "Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h"
#include "Swift/Controllers/XMPPEvents/ErrorEvent.h"
#include "Swiften/Presence/PresenceOracle.h"
diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
index c830b54..b2b4635 100644
--- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp
+++ b/Swiften/Avatars/VCardUpdateAvatarManager.cpp
@@ -10,7 +10,7 @@
#include "Swiften/Client/StanzaChannel.h"
#include "Swiften/Elements/VCardUpdate.h"
-#include "Swiften/Queries/Requests/GetVCardRequest.h"
+#include "Swiften/VCards/GetVCardRequest.h"
#include "Swiften/StringCodecs/SHA1.h"
#include "Swiften/StringCodecs/Hexify.h"
#include "Swiften/Avatars/AvatarStorage.h"
diff --git a/Swiften/Disco/CapsManager.cpp b/Swiften/Disco/CapsManager.cpp
index a9920a2..43c2805 100644
--- a/Swiften/Disco/CapsManager.cpp
+++ b/Swiften/Disco/CapsManager.cpp
@@ -12,7 +12,7 @@
#include "Swiften/Disco/CapsStorage.h"
#include "Swiften/Disco/CapsInfoGenerator.h"
#include "Swiften/Elements/CapsInfo.h"
-#include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
+#include "Swiften/Disco/GetDiscoInfoRequest.h"
namespace Swift {
diff --git a/Swiften/Queries/Responders/DiscoInfoResponder.cpp b/Swiften/Disco/DiscoInfoResponder.cpp
index 63014c7..154eded 100644
--- a/Swiften/Queries/Responders/DiscoInfoResponder.cpp
+++ b/Swiften/Disco/DiscoInfoResponder.cpp
@@ -4,7 +4,7 @@
* See Documentation/Licenses/GPLv3.txt for more information.
*/
-#include "Swiften/Queries/Responders/DiscoInfoResponder.h"
+#include "Swiften/Disco/DiscoInfoResponder.h"
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Elements/DiscoInfo.h"
diff --git a/Swiften/Queries/Responders/DiscoInfoResponder.h b/Swiften/Disco/DiscoInfoResponder.h
index 4a7d271..4a7d271 100644
--- a/Swiften/Queries/Responders/DiscoInfoResponder.h
+++ b/Swiften/Disco/DiscoInfoResponder.h
diff --git a/Swiften/Queries/Requests/GetDiscoInfoRequest.h b/Swiften/Disco/GetDiscoInfoRequest.h
index d1ed279..d1ed279 100644
--- a/Swiften/Queries/Requests/GetDiscoInfoRequest.h
+++ b/Swiften/Disco/GetDiscoInfoRequest.h
diff --git a/Swiften/Queries/Requests/GetDiscoItemsRequest.h b/Swiften/Disco/GetDiscoItemsRequest.h
index ed565ac..ed565ac 100644
--- a/Swiften/Queries/Requests/GetDiscoItemsRequest.h
+++ b/Swiften/Disco/GetDiscoItemsRequest.h
diff --git a/Swiften/Disco/SConscript b/Swiften/Disco/SConscript
index 9da3fb3..d07d490 100644
--- a/Swiften/Disco/SConscript
+++ b/Swiften/Disco/SConscript
@@ -6,5 +6,6 @@ objects = swiften_env.StaticObject([
"EntityCapsManager.cpp",
"CapsStorage.cpp",
"CapsFileStorage.cpp",
+ "DiscoInfoResponder.cpp",
])
swiften_env.Append(SWIFTEN_OBJECTS = [objects])
diff --git a/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
index 20fa9ff..a9e85c0 100644
--- a/Swiften/Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp
+++ b/Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp
@@ -8,7 +8,7 @@
#include <cppunit/extensions/TestFactoryRegistry.h>
#include <typeinfo>
-#include "Swiften/Queries/Responders/DiscoInfoResponder.h"
+#include "Swiften/Disco/DiscoInfoResponder.h"
#include "Swiften/Queries/IQRouter.h"
#include "Swiften/Queries/DummyIQChannel.h"
diff --git a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
index 3d814a8..e796e66 100644
--- a/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
+++ b/Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp
@@ -14,7 +14,7 @@
#include "Swiften/EventLoop/SimpleEventLoop.h"
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/MainBoostIOServiceThread.h"
-#include "Swiften/Queries/Requests/GetDiscoInfoRequest.h"
+#include "Swiften/Disco/GetDiscoInfoRequest.h"
using namespace Swift;
diff --git a/Swiften/QA/ClientTest/ClientTest.cpp b/Swiften/QA/ClientTest/ClientTest.cpp
index 7b2c7f4..f504d2c 100644
--- a/Swiften/QA/ClientTest/ClientTest.cpp
+++ b/Swiften/QA/ClientTest/ClientTest.cpp
@@ -11,7 +11,7 @@
#include "Swiften/Network/BoostTimer.h"
#include "Swiften/EventLoop/MainEventLoop.h"
#include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/Queries/Requests/GetRosterRequest.h"
+#include "Swiften/Roster/GetRosterRequest.h"
#include "Swiften/Client/ClientXMLTracer.h"
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/MainBoostIOServiceThread.h"
diff --git a/Swiften/QA/ReconnectTest/ReconnectTest.cpp b/Swiften/QA/ReconnectTest/ReconnectTest.cpp
index 24be849..c4e34ac 100644
--- a/Swiften/QA/ReconnectTest/ReconnectTest.cpp
+++ b/Swiften/QA/ReconnectTest/ReconnectTest.cpp
@@ -11,7 +11,7 @@
#include "Swiften/Network/BoostTimer.h"
#include "Swiften/EventLoop/MainEventLoop.h"
#include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/Queries/Requests/GetRosterRequest.h"
+#include "Swiften/Roster/GetRosterRequest.h"
#include "Swiften/Client/ClientXMLTracer.h"
#include "Swiften/Network/BoostIOServiceThread.h"
#include "Swiften/Network/MainBoostIOServiceThread.h"
diff --git a/Swiften/Queries/Requests/GetRosterRequest.h b/Swiften/Roster/GetRosterRequest.h
index 271b2fb..271b2fb 100644
--- a/Swiften/Queries/Requests/GetRosterRequest.h
+++ b/Swiften/Roster/GetRosterRequest.h
diff --git a/Swiften/Queries/Responders/RosterPushResponder.h b/Swiften/Roster/RosterPushResponder.h
index 48111a7..48111a7 100644
--- a/Swiften/Queries/Responders/RosterPushResponder.h
+++ b/Swiften/Roster/RosterPushResponder.h
diff --git a/Swiften/Queries/Requests/SetRosterRequest.h b/Swiften/Roster/SetRosterRequest.h
index 7b1bf8c..7b1bf8c 100644
--- a/Swiften/Queries/Requests/SetRosterRequest.h
+++ b/Swiften/Roster/SetRosterRequest.h
diff --git a/Swiften/Roster/XMPPRosterController.cpp b/Swiften/Roster/XMPPRosterController.cpp
index feaa7d4..024cb1d 100644
--- a/Swiften/Roster/XMPPRosterController.cpp
+++ b/Swiften/Roster/XMPPRosterController.cpp
@@ -11,7 +11,7 @@
#include "Swiften/Base/foreach.h"
#include "Swiften/Elements/RosterItemPayload.h"
#include "Swiften/Queries/IQRouter.h"
-#include "Swiften/Queries/Requests/GetRosterRequest.h"
+#include "Swiften/Roster/GetRosterRequest.h"
#include "Swiften/EventLoop/MainEventLoop.h"
#include "Swiften/Roster/Roster.h"
#include "Swiften/Roster/SetPresence.h"
diff --git a/Swiften/Roster/XMPPRosterController.h b/Swiften/Roster/XMPPRosterController.h
index 22a63ad..d846b86 100644
--- a/Swiften/Roster/XMPPRosterController.h
+++ b/Swiften/Roster/XMPPRosterController.h
@@ -12,7 +12,7 @@
#include "Swiften/Base/String.h"
#include "Swiften/Elements/IQ.h"
#include "Swiften/Elements/RosterPayload.h"
-#include "Swiften/Queries/Responders/RosterPushResponder.h"
+#include "Swiften/Roster/RosterPushResponder.h"
#include "Swiften/Base/boost_bsignals.h"
namespace Swift {
diff --git a/Swiften/SConscript b/Swiften/SConscript
index b371826..e96a868 100644
--- a/Swiften/SConscript
+++ b/Swiften/SConscript
@@ -54,7 +54,6 @@ if env["SCONS_STAGE"] == "build" :
"Queries/IQHandler.cpp",
"Queries/IQRouter.cpp",
"Queries/Request.cpp",
- "Queries/Responders/DiscoInfoResponder.cpp",
"Queries/Responders/SoftwareVersionResponder.cpp",
"Roster/ContactRosterItem.cpp",
"Roster/GroupRosterItem.cpp",
@@ -217,7 +216,7 @@ if env["SCONS_STAGE"] == "build" :
File("Presence/UnitTest/PresenceOracleTest.cpp"),
File("Presence/UnitTest/PresenceSenderTest.cpp"),
File("Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp"),
- File("Queries/Responders/UnitTest/DiscoInfoResponderTest.cpp"),
+ File("Disco/UnitTest/DiscoInfoResponderTest.cpp"),
File("Queries/UnitTest/IQRouterTest.cpp"),
File("Queries/UnitTest/RequestTest.cpp"),
File("Queries/UnitTest/ResponderTest.cpp"),
@@ -266,7 +265,7 @@ if env["SCONS_STAGE"] == "build" :
# Generate the Swiften header
swiften_header = "#pragma once\n"
top_path = env.Dir("..").abspath
- public_dirs = ["Queries", "Client", "Component", "Elements"]
+ public_dirs = ["Queries", "Client", "Component", "Elements", "Roster"]
for public_dir in public_dirs :
for root, dirs, files in os.walk(env.Dir(public_dir).abspath) :
if root.endswith("UnitTest") :
diff --git a/Swiften/Queries/Requests/GetVCardRequest.h b/Swiften/VCards/GetVCardRequest.h
index 2c40cd1..2c40cd1 100644
--- a/Swiften/Queries/Requests/GetVCardRequest.h
+++ b/Swiften/VCards/GetVCardRequest.h
diff --git a/Swiften/VCards/VCardManager.cpp b/Swiften/VCards/VCardManager.cpp
index c189717..5c26635 100644
--- a/Swiften/VCards/VCardManager.cpp
+++ b/Swiften/VCards/VCardManager.cpp
@@ -10,7 +10,7 @@
#include "Swiften/JID/JID.h"
#include "Swiften/VCards/VCardStorage.h"
-#include "Swiften/Queries/Requests/GetVCardRequest.h"
+#include "Swiften/VCards/GetVCardRequest.h"
namespace Swift {
diff --git a/Swiften/VCards/VCardMemoryStorageFactory.h b/Swiften/VCards/VCardMemoryStorageFactory.h
index 4b4d2c0..d48794d 100644
--- a/Swiften/VCards/VCardMemoryStorageFactory.h
+++ b/Swiften/VCards/VCardMemoryStorageFactory.h
@@ -21,4 +21,4 @@ namespace Swift {
return new VCardMemoryStorage();
}
};
-} \ No newline at end of file
+}