Swift
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2013-11-18 22:58:12 (GMT)
committerSwift Review <review@swift.im>2013-12-08 20:34:24 (GMT)
commita0aab4b82562d58b0f1d97d42d85ba7043615f55 (patch)
tree2d5c289d501a5f933fcf53a3edb492286f521b90
parent2b6b227ef4ae0e68709d8ad327260cb8f609909c (diff)
downloadswift-a0aab4b82562d58b0f1d97d42d85ba7043615f55.zip
swift-a0aab4b82562d58b0f1d97d42d85ba7043615f55.tar.bz2
Move all RosterItemOperations to Swift/Controllers/Roster/ItemOperations and cleanup related includes.
Change-Id: I20b8c347dd6f250f7ca426f8eb4e0093e226de5f License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
Diffstat
-rw-r--r--Swift/Controllers/Chat/MUCController.cpp51
-rw-r--r--Swift/Controllers/HistoryViewController.cpp17
-rw-r--r--Swift/Controllers/Roster/ItemOperations/AppearOffline.h (renamed from Swift/Controllers/Roster/AppearOffline.h)2
-rw-r--r--Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h (renamed from Swift/Controllers/Roster/RosterItemOperation.h)0
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h (renamed from Swift/Controllers/Roster/SetAvailableFeatures.h)2
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetAvatar.h (renamed from Swift/Controllers/Roster/SetAvatar.h)10
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetBlockingState.h (renamed from Swift/Controllers/Roster/SetBlockingState.h)2
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetName.h (renamed from Swift/Controllers/Roster/SetName.h)7
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetPresence.h (renamed from Swift/Controllers/Roster/SetPresence.h)9
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetVCard.h (renamed from Swift/Controllers/Roster/SetVCard.h)2
-rw-r--r--Swift/Controllers/Roster/Roster.cpp2
-rw-r--r--Swift/Controllers/Roster/Roster.h2
-rw-r--r--Swift/Controllers/Roster/RosterController.cpp14
-rw-r--r--Swift/Controllers/Roster/RosterVCardProvider.cpp2
-rw-r--r--Swift/Controllers/Roster/UnitTest/RosterTest.cpp7
-rw-r--r--Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp3
16 files changed, 70 insertions, 62 deletions
diff --git a/Swift/Controllers/Chat/MUCController.cpp b/Swift/Controllers/Chat/MUCController.cpp
index ed3ed5f..afcb782 100644
--- a/Swift/Controllers/Chat/MUCController.cpp
+++ b/Swift/Controllers/Chat/MUCController.cpp
@@ -10,38 +10,39 @@
#include <boost/regex.hpp>
#include <boost/algorithm/string.hpp>
-#include <Swift/Controllers/Intl.h>
+#include <Swiften/Avatars/AvatarManager.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/foreach.h>
#include <Swiften/Base/format.h>
+#include <Swiften/Base/Log.h>
+#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/Disco/EntityCapsProvider.h>
+#include <Swiften/Elements/Delay.h>
+#include <Swiften/MUC/MUC.h>
#include <Swiften/Network/Timer.h>
#include <Swiften/Network/TimerFactory.h>
-#include <Swiften/Base/foreach.h>
+#include <Swiften/Roster/XMPPRoster.h>
+
#include <SwifTools/TabComplete.h>
-#include <Swiften/Base/foreach.h>
-#include <Swift/Controllers/XMPPEvents/EventController.h>
-#include <Swift/Controllers/UIInterfaces/ChatWindow.h>
-#include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
-#include <Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h>
-#include <Swift/Controllers/UIEvents/ShowProfileForRosterItemUIEvent.h>
-#include <Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h>
-#include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
-#include <Swift/Controllers/Roster/GroupRosterItem.h>
+
+#include <Swift/Controllers/Chat/ChatMessageParser.h>
+#include <Swift/Controllers/Highlighter.h>
+#include <Swift/Controllers/Intl.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
-#include <Swiften/Avatars/AvatarManager.h>
-#include <Swiften/Elements/Delay.h>
-#include <Swiften/MUC/MUC.h>
-#include <Swiften/Client/StanzaChannel.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetAvatar.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
#include <Swift/Controllers/Roster/Roster.h>
#include <Swift/Controllers/Roster/RosterVCardProvider.h>
-#include <Swift/Controllers/Roster/SetAvatar.h>
-#include <Swift/Controllers/Roster/SetPresence.h>
-#include <Swiften/Disco/EntityCapsProvider.h>
-#include <Swiften/Roster/XMPPRoster.h>
-#include <Swift/Controllers/Highlighter.h>
-#include <Swift/Controllers/Chat/ChatMessageParser.h>
-
-#include <Swiften/Base/Log.h>
+#include <Swift/Controllers/UIEvents/InviteToMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestChatUIEvent.h>
+#include <Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h>
+#include <Swift/Controllers/UIEvents/ShowProfileForRosterItemUIEvent.h>
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swift/Controllers/UIInterfaces/ChatWindow.h>
+#include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
+#include <Swift/Controllers/XMPPEvents/EventController.h>
#define MUC_JOIN_WARNING_TIMEOUT_MILLISECONDS 60000
diff --git a/Swift/Controllers/HistoryViewController.cpp b/Swift/Controllers/HistoryViewController.cpp
index cfa2482..c24be50 100644
--- a/Swift/Controllers/HistoryViewController.cpp
+++ b/Swift/Controllers/HistoryViewController.cpp
@@ -12,16 +12,17 @@
#include <Swift/Controllers/HistoryViewController.h>
-#include <Swift/Controllers/UIInterfaces/HistoryWindowFactory.h>
-#include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
-#include <Swift/Controllers/HistoryController.h>
-#include <Swiften/History/HistoryMessage.h>
-#include <Swiften/Base/foreach.h>
-#include <Swiften/Client/NickResolver.h>
#include <Swiften/Avatars/AvatarManager.h>
-#include <Swift/Controllers/Roster/SetPresence.h>
-#include <Swift/Controllers/Roster/SetAvatar.h>
#include <Swiften/Base/Path.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/History/HistoryMessage.h>
+
+#include <Swift/Controllers/HistoryController.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetAvatar.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
+#include <Swift/Controllers/UIEvents/RequestHistoryUIEvent.h>
+#include <Swift/Controllers/UIInterfaces/HistoryWindowFactory.h>
namespace Swift {
static const std::string category[] = { "Contacts", "MUC", "Contacts" };
diff --git a/Swift/Controllers/Roster/AppearOffline.h b/Swift/Controllers/Roster/ItemOperations/AppearOffline.h
index 8bd53d7..14beaa3 100644
--- a/Swift/Controllers/Roster/AppearOffline.h
+++ b/Swift/Controllers/Roster/ItemOperations/AppearOffline.h
@@ -6,7 +6,7 @@
#pragma once
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/RosterItemOperation.h b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
index f1dff8d..f1dff8d 100644
--- a/Swift/Controllers/Roster/RosterItemOperation.h
+++ b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
diff --git a/Swift/Controllers/Roster/SetAvailableFeatures.h b/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h
index f7e00d0..620a1ae 100644
--- a/Swift/Controllers/Roster/SetAvailableFeatures.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h
@@ -8,7 +8,7 @@
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/SetAvatar.h b/Swift/Controllers/Roster/ItemOperations/SetAvatar.h
index 424f0b3..b3ec5f3 100644
--- a/Swift/Controllers/Roster/SetAvatar.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetAvatar.h
@@ -6,12 +6,14 @@
#pragma once
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/JID/JID.h"
-#include "Swift/Controllers/Roster/RosterItemOperation.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
#include <boost/filesystem/path.hpp>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+
namespace Swift {
class RosterItem;
diff --git a/Swift/Controllers/Roster/SetBlockingState.h b/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h
index 72fd2e5..a8eea09 100644
--- a/Swift/Controllers/Roster/SetBlockingState.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h
@@ -8,7 +8,7 @@
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/SetName.h b/Swift/Controllers/Roster/ItemOperations/SetName.h
index aefb0dc..b21e4f2 100644
--- a/Swift/Controllers/Roster/SetName.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetName.h
@@ -6,9 +6,10 @@
#pragma once
-#include "Swiften/JID/JID.h"
-#include "Swift/Controllers/Roster/RosterItemOperation.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/SetPresence.h b/Swift/Controllers/Roster/ItemOperations/SetPresence.h
index 06adfa4..b298a88 100644
--- a/Swift/Controllers/Roster/SetPresence.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetPresence.h
@@ -6,10 +6,11 @@
#pragma once
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/JID/JID.h"
-#include "Swift/Controllers/Roster/RosterItemOperation.h"
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/SetVCard.h b/Swift/Controllers/Roster/ItemOperations/SetVCard.h
index 4a238ff..8ee73f9 100644
--- a/Swift/Controllers/Roster/SetVCard.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetVCard.h
@@ -9,7 +9,7 @@
#include <Swiften/Elements/VCard.h>
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/Roster.cpp b/Swift/Controllers/Roster/Roster.cpp
index 51e888f..44cf03d 100644
--- a/Swift/Controllers/Roster/Roster.cpp
+++ b/Swift/Controllers/Roster/Roster.cpp
@@ -19,7 +19,7 @@
#include <Swift/Controllers/Roster/ContactRosterItem.h>
#include <Swift/Controllers/Roster/RosterItem.h>
#include <Swift/Controllers/Roster/GroupRosterItem.h>
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/Roster.h b/Swift/Controllers/Roster/Roster.h
index 9a1dfa3..b60eafa 100644
--- a/Swift/Controllers/Roster/Roster.h
+++ b/Swift/Controllers/Roster/Roster.h
@@ -15,7 +15,7 @@
#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/RosterItemOperation.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/RosterFilter.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
diff --git a/Swift/Controllers/Roster/RosterController.cpp b/Swift/Controllers/Roster/RosterController.cpp
index cb6d4d2..4016f81 100644
--- a/Swift/Controllers/Roster/RosterController.cpp
+++ b/Swift/Controllers/Roster/RosterController.cpp
@@ -29,17 +29,17 @@
#include <Swiften/Roster/XMPPRosterItem.h>
#include <Swift/Controllers/Intl.h>
-#include <Swift/Controllers/Roster/AppearOffline.h>
#include <Swift/Controllers/Roster/GroupRosterItem.h>
#include <Swift/Controllers/Roster/OfflineRosterFilter.h>
#include <Swift/Controllers/Roster/Roster.h>
#include <Swift/Controllers/Roster/RosterVCardProvider.h>
-#include <Swift/Controllers/Roster/SetAvatar.h>
-#include <Swift/Controllers/Roster/SetAvailableFeatures.h>
-#include <Swift/Controllers/Roster/SetBlockingState.h>
-#include <Swift/Controllers/Roster/SetName.h>
-#include <Swift/Controllers/Roster/SetPresence.h>
-#include <Swift/Controllers/Roster/SetVCard.h>
+#include <Swift/Controllers/Roster/ItemOperations/AppearOffline.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetAvatar.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetBlockingState.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetName.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetVCard.h>
#include <Swift/Controllers/SettingConstants.h>
#include <Swift/Controllers/UIEvents/AddContactUIEvent.h>
#include <Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h>
diff --git a/Swift/Controllers/Roster/RosterVCardProvider.cpp b/Swift/Controllers/Roster/RosterVCardProvider.cpp
index 26c9a81..954ac68 100644
--- a/Swift/Controllers/Roster/RosterVCardProvider.cpp
+++ b/Swift/Controllers/Roster/RosterVCardProvider.cpp
@@ -9,7 +9,7 @@
#include <Swiften/VCards/VCardManager.h>
#include <Swift/Controllers/Roster/Roster.h>
-#include <Swift/Controllers/Roster/SetVCard.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetVCard.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index 0c3e769..7d86aaf 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -6,11 +6,12 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/Roster/Roster.h"
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
-#include "Swift/Controllers/Roster/SetPresence.h"
+#include <Swift/Controllers/Roster/Roster.h>
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
using namespace Swift;
diff --git a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
index db8a2fd..f8e6a63 100644
--- a/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/TableRosterTest.cpp
@@ -15,13 +15,14 @@ std::ostream& operator<<(std::ostream& os, const Swift::TableRoster::Index& i) {
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <boost/shared_ptr.hpp>
#include <boost/variant.hpp>
#include <Swiften/Network/DummyTimerFactory.h>
#include <Swift/Controllers/Roster/Roster.h>
#include <Swift/Controllers/Roster/GroupRosterItem.h>
-#include <Swift/Controllers/Roster/SetPresence.h>
+#include <Swift/Controllers/Roster/ItemOperations/SetPresence.h>
using namespace Swift;