summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot6.cpp3
-rw-r--r--Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp3
-rw-r--r--Limber/Server/ServerFromClientSession.cpp31
-rw-r--r--Limber/Server/ServerFromClientSession.h11
-rw-r--r--Limber/Server/ServerSession.cpp4
-rw-r--r--Limber/Server/ServerStanzaRouter.cpp10
-rw-r--r--Limber/Server/ServerStanzaRouter.h7
-rw-r--r--Limber/Server/SimpleUserRegistry.cpp4
-rw-r--r--Limber/Server/SimpleUserRegistry.h7
-rw-r--r--Limber/Server/UnitTest/ServerStanzaRouterTest.cpp9
-rw-r--r--Limber/Server/UserRegistry.cpp4
-rw-r--r--Limber/Server/UserRegistry.h3
-rw-r--r--Limber/main.cpp38
-rw-r--r--QA/Checker/checker.cpp13
-rw-r--r--Slimber/CLI/DummyMenulet.cpp5
-rw-r--r--Slimber/CLI/DummyMenulet.h4
-rw-r--r--Slimber/CLI/main.cpp7
-rw-r--r--Slimber/Cocoa/CocoaController.mm4
-rw-r--r--Slimber/Cocoa/CocoaMenulet.h3
-rw-r--r--Slimber/Cocoa/main.mm9
-rw-r--r--Slimber/FileVCardCollection.cpp8
-rw-r--r--Slimber/FileVCardCollection.h6
-rw-r--r--Slimber/LinkLocalPresenceManager.cpp8
-rw-r--r--Slimber/LinkLocalPresenceManager.h7
-rw-r--r--Slimber/MainController.cpp21
-rw-r--r--Slimber/MainController.h6
-rw-r--r--Slimber/Menulet.cpp4
-rw-r--r--Slimber/Menulet.h3
-rw-r--r--Slimber/MenuletController.cpp11
-rw-r--r--Slimber/MenuletController.h6
-rw-r--r--Slimber/Qt/QtAboutDialog.cpp6
-rw-r--r--Slimber/Qt/QtMenulet.cpp5
-rw-r--r--Slimber/Qt/QtMenulet.h10
-rw-r--r--Slimber/Qt/SConscript2
-rw-r--r--Slimber/Qt/main.cpp9
-rw-r--r--Slimber/Server.cpp47
-rw-r--r--Slimber/Server.h31
-rw-r--r--Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp21
-rw-r--r--Slimber/UnitTest/MenuletControllerTest.cpp6
-rw-r--r--Slimber/VCardCollection.cpp4
-rw-r--r--Sluift/Console.cpp18
-rw-r--r--Sluift/Console.h7
-rw-r--r--Sluift/EditlineTerminal.cpp15
-rw-r--r--Sluift/EditlineTerminal.h3
-rw-r--r--Sluift/ElementConvertors/BodyConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/BodyConvertor.h4
-rw-r--r--Sluift/ElementConvertors/CommandConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/CommandConvertor.h4
-rw-r--r--Sluift/ElementConvertors/DOMElementConvertor.cpp19
-rw-r--r--Sluift/ElementConvertors/DOMElementConvertor.h6
-rw-r--r--Sluift/ElementConvertors/DefaultElementConvertor.cpp4
-rw-r--r--Sluift/ElementConvertors/DelayConvertor.cpp11
-rw-r--r--Sluift/ElementConvertors/DelayConvertor.h4
-rw-r--r--Sluift/ElementConvertors/DiscoInfoConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/DiscoInfoConvertor.h4
-rw-r--r--Sluift/ElementConvertors/DiscoItemsConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/DiscoItemsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/FormConvertor.cpp16
-rw-r--r--Sluift/ElementConvertors/FormConvertor.h4
-rw-r--r--Sluift/ElementConvertors/ForwardedConvertor.h5
-rw-r--r--Sluift/ElementConvertors/IQConvertor.h5
-rw-r--r--Sluift/ElementConvertors/IsodeIQDelegationConvertor.h4
-rw-r--r--Sluift/ElementConvertors/MAMFinConvertor.h5
-rw-r--r--Sluift/ElementConvertors/MAMQueryConvertor.h5
-rw-r--r--Sluift/ElementConvertors/MAMResultConvertor.h5
-rw-r--r--Sluift/ElementConvertors/MessageConvertor.h5
-rw-r--r--Sluift/ElementConvertors/PresenceConvertor.h5
-rw-r--r--Sluift/ElementConvertors/PubSubAffiliationsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubConfigureConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubCreateConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventCollectionConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventDeleteConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventItemConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubEventItemsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubItemConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubItemsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOptionsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubPublishConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubRetractConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubSubscribeConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubSubscriptionConvertor.h4
-rw-r--r--Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h4
-rw-r--r--Sluift/ElementConvertors/RawXMLElementConvertor.cpp5
-rw-r--r--Sluift/ElementConvertors/RawXMLElementConvertor.h4
-rw-r--r--Sluift/ElementConvertors/SoftwareVersionConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/SoftwareVersionConvertor.h4
-rw-r--r--Sluift/ElementConvertors/StanzaConvertor.h13
-rw-r--r--Sluift/ElementConvertors/StatusConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/StatusConvertor.h4
-rw-r--r--Sluift/ElementConvertors/StatusShowConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/StatusShowConvertor.h4
-rw-r--r--Sluift/ElementConvertors/SubjectConvertor.cpp6
-rw-r--r--Sluift/ElementConvertors/SubjectConvertor.h4
-rw-r--r--Sluift/ElementConvertors/VCardConvertor.cpp11
-rw-r--r--Sluift/ElementConvertors/VCardConvertor.h4
-rw-r--r--Sluift/ElementConvertors/VCardUpdateConvertor.cpp8
-rw-r--r--Sluift/ElementConvertors/VCardUpdateConvertor.h4
-rw-r--r--Sluift/GenericLuaElementConvertor.h8
-rw-r--r--Sluift/Helpers.h8
-rw-r--r--Sluift/ITunesInterface.h8
-rw-r--r--Sluift/Lua/Check.cpp9
-rw-r--r--Sluift/Lua/Debug.h5
-rw-r--r--Sluift/Lua/Exception.h3
-rw-r--r--Sluift/Lua/FunctionRegistration.h11
-rw-r--r--Sluift/Lua/FunctionRegistry.cpp5
-rw-r--r--Sluift/Lua/FunctionRegistry.h8
-rw-r--r--Sluift/Lua/LuaUtils.cpp16
-rw-r--r--Sluift/Lua/Value.cpp10
-rw-r--r--Sluift/Lua/Value.h5
-rw-r--r--Sluift/LuaElementConvertor.h9
-rw-r--r--Sluift/LuaElementConvertors.h9
-rw-r--r--Sluift/Response.cpp5
-rw-r--r--Sluift/Response.h6
-rw-r--r--Sluift/SluiftClient.cpp11
-rw-r--r--Sluift/SluiftClient.h16
-rw-r--r--Sluift/SluiftComponent.cpp13
-rw-r--r--Sluift/SluiftComponent.h16
-rw-r--r--Sluift/StandardTerminal.cpp5
-rw-r--r--Sluift/StandardTerminal.h3
-rw-r--r--Sluift/Terminal.h3
-rw-r--r--Sluift/client.cpp46
-rw-r--r--Sluift/component.cpp28
-rw-r--r--Sluift/sluift.cpp48
-rw-r--r--Sluift/tokenize.cpp5
-rw-r--r--Sluift/tokenize.h4
-rw-r--r--SwifTools/Application/ApplicationPathProvider.cpp10
-rw-r--r--SwifTools/Application/MacOSXApplicationPathProvider.cpp3
-rw-r--r--SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp9
-rw-r--r--SwifTools/Application/UnixApplicationPathProvider.cpp9
-rw-r--r--SwifTools/Application/WindowsApplicationPathProvider.cpp6
-rw-r--r--SwifTools/AutoUpdater/SparkleAutoUpdater.h3
-rw-r--r--SwifTools/Cocoa/CocoaAction.h5
-rw-r--r--SwifTools/CrashReporter.h7
-rw-r--r--SwifTools/Dock/MacOSXDock.mm5
-rw-r--r--SwifTools/Dock/WindowsDock.h5
-rw-r--r--SwifTools/HunspellChecker.cpp9
-rw-r--r--SwifTools/HunspellChecker.h12
-rw-r--r--SwifTools/Idle/ActualIdleDetector.cpp1
-rw-r--r--SwifTools/Idle/IdleDetector.h5
-rw-r--r--SwifTools/Idle/IdleQuerierTest/IdleQuerierTest.cpp7
-rw-r--r--SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp12
-rw-r--r--SwifTools/LastLineTracker.cpp8
-rw-r--r--SwifTools/Linkify.cpp7
-rw-r--r--SwifTools/Linkify.h4
-rw-r--r--SwifTools/MacOSXChecker.h8
-rw-r--r--SwifTools/MacOSXChecker.mm3
-rw-r--r--SwifTools/Notifier/GNTPNotifier.cpp7
-rw-r--r--SwifTools/Notifier/GNTPNotifier.h5
-rw-r--r--SwifTools/Notifier/LoggingNotifier.h5
-rw-r--r--SwifTools/Notifier/Notifier.h7
-rw-r--r--SwifTools/Notifier/SnarlNotifier.h5
-rw-r--r--SwifTools/SpellChecker.h13
-rw-r--r--SwifTools/SpellParser.cpp14
-rw-r--r--SwifTools/SpellParser.h11
-rw-r--r--SwifTools/TabComplete.cpp3
-rw-r--r--SwifTools/TabComplete.h5
-rw-r--r--SwifTools/URIHandler/MacOSXURIHandler.mm5
-rw-r--r--SwifTools/URIHandler/URIHandler.h3
-rw-r--r--SwifTools/URIHandler/XMPPURI.cpp18
-rw-r--r--SwifTools/URIHandler/XMPPURI.h4
-rw-r--r--SwifTools/UnitTest/SpellParserTest.cpp10
-rw-r--r--Swift/Controllers/AdHocController.cpp6
-rw-r--r--Swift/Controllers/AdHocController.h3
-rw-r--r--Swift/Controllers/AdHocManager.cpp11
-rw-r--r--Swift/Controllers/BlockListController.cpp10
-rw-r--r--Swift/Controllers/BlockListController.h7
-rw-r--r--Swift/Controllers/CertificateMemoryStorageFactory.h4
-rw-r--r--Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h7
-rw-r--r--Swift/Controllers/Chat/MUCSearchController.cpp13
-rw-r--r--Swift/Controllers/Chat/MUCSearchController.h20
-rw-r--r--Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp2
-rw-r--r--Swift/Controllers/Chat/UnitTest/MockChatListWindow.h4
-rw-r--r--Swift/Controllers/ChatMessageSummarizer.cpp5
-rw-r--r--Swift/Controllers/ChatMessageSummarizer.h6
-rw-r--r--Swift/Controllers/Contact.cpp9
-rw-r--r--Swift/Controllers/ContactEditController.cpp10
-rw-r--r--Swift/Controllers/ContactEditController.h12
-rw-r--r--Swift/Controllers/ContactSuggester.cpp12
-rw-r--r--Swift/Controllers/DummySystemTray.h4
-rw-r--r--Swift/Controllers/EventNotifier.cpp6
-rw-r--r--Swift/Controllers/EventNotifier.h12
-rw-r--r--Swift/Controllers/EventWindowController.cpp5
-rw-r--r--Swift/Controllers/EventWindowController.h9
-rw-r--r--Swift/Controllers/FileTransfer/FileTransferOverview.cpp4
-rw-r--r--Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp8
-rw-r--r--Swift/Controllers/FileTransfer/FileTransferProgressInfo.h9
-rw-r--r--Swift/Controllers/FileTransferListController.cpp12
-rw-r--r--Swift/Controllers/FileTransferListController.h8
-rw-r--r--Swift/Controllers/HighlightEditorController.cpp9
-rw-r--r--Swift/Controllers/HighlightManager.h5
-rw-r--r--Swift/Controllers/HighlightRule.h8
-rw-r--r--Swift/Controllers/HistoryViewController.h16
-rw-r--r--Swift/Controllers/Intl.h3
-rw-r--r--Swift/Controllers/MainController.h19
-rw-r--r--Swift/Controllers/PresenceNotifier.cpp19
-rw-r--r--Swift/Controllers/PresenceNotifier.h18
-rw-r--r--Swift/Controllers/PreviousStatusStore.cpp6
-rw-r--r--Swift/Controllers/PreviousStatusStore.h6
-rw-r--r--Swift/Controllers/ProfileSettingsProvider.cpp4
-rw-r--r--Swift/Controllers/Roster/FuzzyRosterFilter.h8
-rw-r--r--Swift/Controllers/Roster/GroupRosterItem.cpp5
-rw-r--r--Swift/Controllers/Roster/GroupRosterItem.h8
-rw-r--r--Swift/Controllers/Roster/ItemOperations/AppearOffline.h4
-rw-r--r--Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h4
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h8
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetAvatar.h4
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetBlockingState.h8
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetMUC.h4
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetName.h4
-rw-r--r--Swift/Controllers/Roster/ItemOperations/SetVCard.h8
-rw-r--r--Swift/Controllers/Roster/LeastCommonSubsequence.h3
-rw-r--r--Swift/Controllers/Roster/OfflineRosterFilter.h11
-rw-r--r--Swift/Controllers/Roster/RosterFilter.h4
-rw-r--r--Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp8
-rw-r--r--Swift/Controllers/Roster/RosterGroupExpandinessPersister.h7
-rw-r--r--Swift/Controllers/Roster/RosterItem.cpp6
-rw-r--r--Swift/Controllers/Roster/RosterItem.h7
-rw-r--r--Swift/Controllers/Roster/RosterVCardProvider.cpp8
-rw-r--r--Swift/Controllers/Roster/TableRoster.cpp14
-rw-r--r--Swift/Controllers/Roster/TableRoster.h9
-rw-r--r--Swift/Controllers/Roster/UnitTest/LeastCommonSubsequenceTest.cpp7
-rw-r--r--Swift/Controllers/Roster/UnitTest/RosterTest.cpp8
-rw-r--r--Swift/Controllers/Settings/DummySettingsProvider.h6
-rw-r--r--Swift/Controllers/Settings/SettingsProvider.h6
-rw-r--r--Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp4
-rw-r--r--Swift/Controllers/Settings/XMLSettingsProvider.cpp6
-rw-r--r--Swift/Controllers/Settings/XMLSettingsProvider.h9
-rw-r--r--Swift/Controllers/ShowProfileController.cpp4
-rw-r--r--Swift/Controllers/ShowProfileController.h8
-rw-r--r--Swift/Controllers/SoundEventController.h6
-rw-r--r--Swift/Controllers/StatusCache.cpp9
-rw-r--r--Swift/Controllers/StatusCache.h6
-rw-r--r--Swift/Controllers/StatusTracker.cpp4
-rw-r--r--Swift/Controllers/StatusTracker.h7
-rw-r--r--Swift/Controllers/StatusUtil.cpp3
-rw-r--r--Swift/Controllers/Storages/AvatarFileStorage.cpp9
-rw-r--r--Swift/Controllers/Storages/AvatarFileStorage.h7
-rw-r--r--Swift/Controllers/Storages/CapsFileStorage.cpp12
-rw-r--r--Swift/Controllers/Storages/CapsFileStorage.h7
-rw-r--r--Swift/Controllers/Storages/CertificateFileStorage.cpp7
-rw-r--r--Swift/Controllers/Storages/CertificateFileStorage.h4
-rw-r--r--Swift/Controllers/Storages/CertificateFileStorageFactory.h4
-rw-r--r--Swift/Controllers/Storages/CertificateStorage.cpp4
-rw-r--r--Swift/Controllers/Storages/CertificateStorageTrustChecker.h3
-rw-r--r--Swift/Controllers/Storages/FileStorages.cpp16
-rw-r--r--Swift/Controllers/Storages/FileStoragesFactory.h6
-rw-r--r--Swift/Controllers/Storages/MemoryStoragesFactory.h7
-rw-r--r--Swift/Controllers/Storages/RosterFileStorage.cpp4
-rw-r--r--Swift/Controllers/Storages/VCardFileStorage.cpp25
-rw-r--r--Swift/Controllers/Storages/VCardFileStorage.h11
-rw-r--r--Swift/Controllers/SystemTray.h4
-rw-r--r--Swift/Controllers/SystemTrayController.cpp8
-rw-r--r--Swift/Controllers/SystemTrayController.h4
-rw-r--r--Swift/Controllers/UIEvents/AddContactUIEvent.h6
-rw-r--r--Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/InviteToMUCUIEvent.h12
-rw-r--r--Swift/Controllers/UIEvents/JoinMUCUIEvent.h5
-rw-r--r--Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/RenameGroupUIEvent.h5
-rw-r--r--Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/RequestAdHocUIEvent.h5
-rw-r--r--Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h4
-rw-r--r--Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h5
-rw-r--r--Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h10
-rw-r--r--Swift/Controllers/UIEvents/RequestChatUIEvent.h6
-rw-r--r--Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h4
-rw-r--r--Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h3
-rw-r--r--Swift/Controllers/UIEvents/RequestInviteToMUCUIEvent.h8
-rw-r--r--Swift/Controllers/UIEvents/RequestJoinMUCUIEvent.h8
-rw-r--r--Swift/Controllers/UIEvents/RequestProfileEditorUIEvent.h4
-rw-r--r--Swift/Controllers/UIEvents/RequestWhiteboardUIEvent.h10
-rw-r--r--Swift/Controllers/UIEvents/RequestXMLConsoleUIEvent.h4
-rw-r--r--Swift/Controllers/UIEvents/SendFileUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/ShowProfileForRosterItemUIEvent.h7
-rw-r--r--Swift/Controllers/UIEvents/ShowWhiteboardUIEvent.h10
-rw-r--r--Swift/Controllers/UIEvents/UIEvent.cpp4
-rw-r--r--Swift/Controllers/UIEvents/UIEventStream.h7
-rw-r--r--Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h5
-rw-r--r--Swift/Controllers/UIInterfaces/BlockListEditorWidget.h4
-rw-r--r--Swift/Controllers/UIInterfaces/ChatListWindow.cpp4
-rw-r--r--Swift/Controllers/UIInterfaces/ChatListWindow.h14
-rw-r--r--Swift/Controllers/UIInterfaces/ChatListWindowFactory.h4
-rw-r--r--Swift/Controllers/UIInterfaces/ContactEditWindow.h9
-rw-r--r--Swift/Controllers/UIInterfaces/EventWindow.h4
-rw-r--r--Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h8
-rw-r--r--Swift/Controllers/UIInterfaces/JoinMUCWindow.h4
-rw-r--r--Swift/Controllers/UIInterfaces/LoginWindow.h9
-rw-r--r--Swift/Controllers/UIInterfaces/MUCSearchWindow.h11
-rw-r--r--Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h4
-rw-r--r--Swift/Controllers/UIInterfaces/MainWindow.h9
-rw-r--r--Swift/Controllers/UIInterfaces/ProfileWindow.h4
-rw-r--r--Swift/Controllers/UIInterfaces/UIFactory.h22
-rw-r--r--Swift/Controllers/UIInterfaces/UserSearchWindow.h8
-rw-r--r--Swift/Controllers/UIInterfaces/UserSearchWindowFactory.h4
-rw-r--r--Swift/Controllers/UIInterfaces/WhiteboardWindow.h10
-rw-r--r--Swift/Controllers/UIInterfaces/XMLConsoleWidget.cpp4
-rw-r--r--Swift/Controllers/UIInterfaces/XMLConsoleWidgetFactory.h4
-rw-r--r--Swift/Controllers/UnitTest/ChatMessageSummarizerTest.cpp4
-rw-r--r--Swift/Controllers/UnitTest/ContactSuggesterTest.cpp11
-rw-r--r--Swift/Controllers/UnitTest/HighlightRuleTest.cpp4
-rw-r--r--Swift/Controllers/UnitTest/MockChatWindow.cpp4
-rw-r--r--Swift/Controllers/UnitTest/MockMainWindowFactory.h6
-rw-r--r--Swift/Controllers/UnitTest/PreviousStatusStoreTest.cpp4
-rw-r--r--Swift/Controllers/WhiteboardManager.cpp15
-rw-r--r--Swift/Controllers/WhiteboardManager.h12
-rw-r--r--Swift/Controllers/XMLConsoleController.cpp8
-rw-r--r--Swift/Controllers/XMLConsoleController.h7
-rw-r--r--Swift/Controllers/XMPPEvents/ErrorEvent.h11
-rw-r--r--Swift/Controllers/XMPPEvents/StanzaEvent.h6
-rw-r--r--Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h11
-rw-r--r--Swift/Controllers/XMPPURIController.cpp9
-rw-r--r--Swift/Controllers/XMPPURIController.h3
-rw-r--r--Swift/QtUI/ApplicationTest/main.cpp15
-rw-r--r--Swift/QtUI/ChatList/ChatListDelegate.h4
-rw-r--r--Swift/QtUI/ChatList/ChatListGroupItem.h4
-rw-r--r--Swift/QtUI/ChatList/ChatListItem.h3
-rw-r--r--Swift/QtUI/ChatList/ChatListMUCItem.cpp6
-rw-r--r--Swift/QtUI/ChatList/ChatListMUCItem.h10
-rw-r--r--Swift/QtUI/ChatList/ChatListRecentItem.cpp5
-rw-r--r--Swift/QtUI/ChatList/ChatListRecentItem.h9
-rw-r--r--Swift/QtUI/ChatList/ChatListWhiteboardItem.cpp7
-rw-r--r--Swift/QtUI/ChatList/ChatListWhiteboardItem.h9
-rw-r--r--Swift/QtUI/ChatView/main.cpp26
-rw-r--r--Swift/QtUI/CocoaApplicationActivateHelper.mm8
-rw-r--r--Swift/QtUI/CocoaUIHelpers.h9
-rw-r--r--Swift/QtUI/EventViewer/EventModel.h6
-rw-r--r--Swift/QtUI/EventViewer/EventView.cpp4
-rw-r--r--Swift/QtUI/EventViewer/QtEvent.cpp2
-rw-r--r--Swift/QtUI/EventViewer/QtEvent.h4
-rw-r--r--Swift/QtUI/EventViewer/QtEventWindow.h13
-rw-r--r--Swift/QtUI/EventViewer/TwoLineDelegate.cpp8
-rw-r--r--Swift/QtUI/EventViewer/TwoLineDelegate.h6
-rw-r--r--Swift/QtUI/EventViewer/main.cpp16
-rw-r--r--Swift/QtUI/FreeDesktopNotifier.h7
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchDelegate.cpp15
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchDelegate.h4
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchEmptyItem.cpp7
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchModel.cpp7
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchModel.h4
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchRoomItem.cpp6
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchRoomItem.h4
-rw-r--r--Swift/QtUI/MUCSearch/MUCSearchServiceItem.h4
-rw-r--r--Swift/QtUI/MUCSearch/QtMUCSearchWindow.cpp22
-rw-r--r--Swift/QtUI/MUCSearch/QtMUCSearchWindow.h6
-rw-r--r--Swift/QtUI/MessageSnippet.h4
-rw-r--r--Swift/QtUI/NotifierTest/NotifierTest.cpp10
-rw-r--r--Swift/QtUI/QtAddBookmarkWindow.cpp4
-rw-r--r--Swift/QtUI/QtAddBookmarkWindow.h8
-rw-r--r--Swift/QtUI/QtAffiliationEditor.cpp9
-rw-r--r--Swift/QtUI/QtAffiliationEditor.h9
-rw-r--r--Swift/QtUI/QtAvatarWidget.cpp19
-rw-r--r--Swift/QtUI/QtAvatarWidget.h5
-rw-r--r--Swift/QtUI/QtBlockListEditorWindow.cpp11
-rw-r--r--Swift/QtUI/QtBlockListEditorWindow.h9
-rw-r--r--Swift/QtUI/QtBookmarkDetailWindow.cpp8
-rw-r--r--Swift/QtUI/QtBookmarkDetailWindow.h8
-rw-r--r--Swift/QtUI/QtCachedImageScaler.cpp9
-rw-r--r--Swift/QtUI/QtCertificateViewerDialog.cpp11
-rw-r--r--Swift/QtUI/QtChatTabs.cpp25
-rw-r--r--Swift/QtUI/QtChatTabs.h4
-rw-r--r--Swift/QtUI/QtChatTabsShortcutOnlySubstitute.h4
-rw-r--r--Swift/QtUI/QtChatTheme.h4
-rw-r--r--Swift/QtUI/QtChatView.cpp3
-rw-r--r--Swift/QtUI/QtChatWindowFactory.cpp8
-rw-r--r--Swift/QtUI/QtChatWindowJSBridge.cpp8
-rw-r--r--Swift/QtUI/QtChatWindowJSBridge.h10
-rw-r--r--Swift/QtUI/QtClickableLabel.cpp4
-rw-r--r--Swift/QtUI/QtColorToolButton.cpp10
-rw-r--r--Swift/QtUI/QtConnectionSettingsWindow.cpp12
-rw-r--r--Swift/QtUI/QtConnectionSettingsWindow.h6
-rw-r--r--Swift/QtUI/QtContactEditWidget.cpp8
-rw-r--r--Swift/QtUI/QtContactEditWidget.h8
-rw-r--r--Swift/QtUI/QtContactEditWindow.cpp12
-rw-r--r--Swift/QtUI/QtContactEditWindow.h10
-rw-r--r--Swift/QtUI/QtDBUSURIHandler.cpp6
-rw-r--r--Swift/QtUI/QtDBUSURIHandler.h3
-rw-r--r--Swift/QtUI/QtEditBookmarkWindow.cpp6
-rw-r--r--Swift/QtUI/QtEditBookmarkWindow.h9
-rw-r--r--Swift/QtUI/QtEmoticonCell.cpp8
-rw-r--r--Swift/QtUI/QtEmoticonsGrid.cpp8
-rw-r--r--Swift/QtUI/QtFormResultItemModel.cpp7
-rw-r--r--Swift/QtUI/QtFormWidget.cpp17
-rw-r--r--Swift/QtUI/QtFormWidget.h5
-rw-r--r--Swift/QtUI/QtHighlightEditor.h6
-rw-r--r--Swift/QtUI/QtHistoryWindow.cpp18
-rw-r--r--Swift/QtUI/QtHistoryWindow.h3
-rw-r--r--Swift/QtUI/QtJoinMUCWindow.h5
-rw-r--r--Swift/QtUI/QtLineEdit.cpp4
-rw-r--r--Swift/QtUI/QtLoginWindow.h13
-rw-r--r--Swift/QtUI/QtMUCConfigurationWindow.cpp4
-rw-r--r--Swift/QtUI/QtMUCConfigurationWindow.h6
-rw-r--r--Swift/QtUI/QtMainWindow.h10
-rw-r--r--Swift/QtUI/QtNameWidget.cpp4
-rw-r--r--Swift/QtUI/QtProfileWindow.cpp4
-rw-r--r--Swift/QtUI/QtRosterHeader.cpp13
-rw-r--r--Swift/QtUI/QtRosterHeader.h10
-rw-r--r--Swift/QtUI/QtScaledAvatarCache.cpp11
-rw-r--r--Swift/QtUI/QtScaledAvatarCache.h3
-rw-r--r--Swift/QtUI/QtSettingsProvider.cpp6
-rw-r--r--Swift/QtUI/QtSettingsProvider.h6
-rw-r--r--Swift/QtUI/QtSingleWindow.cpp6
-rw-r--r--Swift/QtUI/QtSoundPlayer.cpp13
-rw-r--r--Swift/QtUI/QtSoundPlayer.h6
-rw-r--r--Swift/QtUI/QtSpellCheckHighlighter.h6
-rw-r--r--Swift/QtUI/QtSpellCheckerWindow.cpp19
-rw-r--r--Swift/QtUI/QtSpellCheckerWindow.h10
-rw-r--r--Swift/QtUI/QtStatusWidget.cpp29
-rw-r--r--Swift/QtUI/QtStatusWidget.h10
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.cpp8
-rw-r--r--Swift/QtUI/QtSubscriptionRequestWindow.h8
-rw-r--r--Swift/QtUI/QtSystemTray.cpp4
-rw-r--r--Swift/QtUI/QtSystemTray.h8
-rw-r--r--Swift/QtUI/QtTabWidget.cpp4
-rw-r--r--Swift/QtUI/QtTabbable.cpp4
-rw-r--r--Swift/QtUI/QtUIFactory.cpp37
-rw-r--r--Swift/QtUI/QtURIHandler.cpp6
-rw-r--r--Swift/QtUI/QtURIHandler.h3
-rw-r--r--Swift/QtUI/QtURLValidator.cpp3
-rw-r--r--Swift/QtUI/QtVCardWidget/QtCloseButton.cpp8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtRemovableItemDelegate.cpp8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtResizableLineEdit.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtTagComboBox.cpp4
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardBirthdayField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardDescriptionField.cpp9
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardHomeWork.cpp8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardHomeWork.h8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardInternetEMailField.cpp9
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardJIDField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardPhotoAndNameFields.cpp6
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardRoleField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardTelephoneField.cpp8
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardTitleField.cpp11
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardURLField.cpp12
-rw-r--r--Swift/QtUI/QtVCardWidget/QtVCardWidget.cpp4
-rw-r--r--Swift/QtUI/QtWebView.cpp10
-rw-r--r--Swift/QtUI/QtWebView.h5
-rw-r--r--Swift/QtUI/QtWin32NotifierWindow.h4
-rw-r--r--Swift/QtUI/QtXMLConsoleWidget.cpp10
-rw-r--r--Swift/QtUI/QtXMLConsoleWidget.h7
-rw-r--r--Swift/QtUI/Roster/DelegateCommons.cpp7
-rw-r--r--Swift/QtUI/Roster/DelegateCommons.h4
-rw-r--r--Swift/QtUI/Roster/GroupItemDelegate.cpp4
-rw-r--r--Swift/QtUI/Roster/GroupItemDelegate.h6
-rw-r--r--Swift/QtUI/Roster/QtFilterWidget.cpp6
-rw-r--r--Swift/QtUI/Roster/QtFilterWidget.h8
-rw-r--r--Swift/QtUI/Roster/QtOccupantListWidget.cpp6
-rw-r--r--Swift/QtUI/Roster/QtOccupantListWidget.h6
-rw-r--r--Swift/QtUI/Roster/QtRosterWidget.cpp19
-rw-r--r--Swift/QtUI/Roster/QtRosterWidget.h4
-rw-r--r--Swift/QtUI/Roster/QtTreeWidget.cpp16
-rw-r--r--Swift/QtUI/Roster/QtTreeWidget.h10
-rw-r--r--Swift/QtUI/Roster/RosterDelegate.cpp20
-rw-r--r--Swift/QtUI/Roster/RosterDelegate.h8
-rw-r--r--Swift/QtUI/Roster/RosterModel.cpp9
-rw-r--r--Swift/QtUI/Roster/RosterTooltip.cpp12
-rw-r--r--Swift/QtUI/Roster/main.cpp9
-rw-r--r--Swift/QtUI/SConscript2
-rw-r--r--Swift/QtUI/UserSearch/ContactListDelegate.cpp6
-rw-r--r--Swift/QtUI/UserSearch/ContactListModel.cpp4
-rw-r--r--Swift/QtUI/UserSearch/ContactListModel.h9
-rw-r--r--Swift/QtUI/UserSearch/QtContactListWidget.cpp13
-rw-r--r--Swift/QtUI/UserSearch/QtContactListWidget.h10
-rw-r--r--Swift/QtUI/UserSearch/QtSuggestingJIDInput.cpp17
-rw-r--r--Swift/QtUI/UserSearch/QtSuggestingJIDInput.h4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchDetailsPage.cpp10
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchDetailsPage.h7
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFieldsPage.cpp4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFieldsPage.h3
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.cpp7
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstMultiJIDPage.h5
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstPage.cpp8
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchFirstPage.h4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchResultsPage.cpp4
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchResultsPage.h2
-rw-r--r--Swift/QtUI/UserSearch/QtUserSearchWindow.h8
-rw-r--r--Swift/QtUI/UserSearch/UserSearchModel.cpp6
-rw-r--r--Swift/QtUI/UserSearch/UserSearchModel.h4
-rw-r--r--Swift/QtUI/Whiteboard/ColorWidget.cpp11
-rw-r--r--Swift/QtUI/Whiteboard/FreehandLineItem.cpp7
-rw-r--r--Swift/QtUI/Whiteboard/FreehandLineItem.h9
-rw-r--r--Swift/QtUI/Whiteboard/GView.cpp11
-rw-r--r--Swift/QtUI/Whiteboard/GView.h16
-rw-r--r--Swift/QtUI/Whiteboard/QtWhiteboardWindow.cpp4
-rw-r--r--Swift/QtUI/Whiteboard/QtWhiteboardWindow.h33
-rw-r--r--Swift/QtUI/Whiteboard/TextDialog.cpp8
-rw-r--r--Swift/QtUI/Whiteboard/TextDialog.h16
-rw-r--r--Swift/QtUI/Whiteboard/WhiteboardElementDrawingVisitor.h13
-rw-r--r--Swift/QtUI/WinUIHelpers.cpp8
-rw-r--r--Swift/QtUI/WinUIHelpers.h9
-rw-r--r--Swift/QtUI/WindowsNotifier.cpp12
-rw-r--r--Swift/QtUI/WindowsNotifier.h3
-rw-r--r--Swift/QtUI/main.cpp27
-rw-r--r--Swift/QtUI/swift-open-uri.cpp5
-rw-r--r--Swiften/AdHoc/OutgoingAdHocCommandSession.cpp4
-rw-r--r--Swiften/AdHoc/OutgoingAdHocCommandSession.h10
-rw-r--r--Swiften/Avatars/AvatarManager.h4
-rw-r--r--Swiften/Avatars/AvatarManagerImpl.cpp6
-rw-r--r--Swiften/Avatars/AvatarMemoryStorage.h6
-rw-r--r--Swiften/Avatars/AvatarStorage.h5
-rw-r--r--Swiften/Avatars/CombinedAvatarProvider.cpp3
-rw-r--r--Swiften/Avatars/CombinedAvatarProvider.h6
-rw-r--r--Swiften/Avatars/DummyAvatarManager.h4
-rw-r--r--Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp24
-rw-r--r--Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp22
-rw-r--r--Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp19
-rw-r--r--Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp21
-rw-r--r--Swiften/Avatars/VCardAvatarManager.cpp10
-rw-r--r--Swiften/Avatars/VCardAvatarManager.h4
-rw-r--r--Swiften/Avatars/VCardUpdateAvatarManager.cpp12
-rw-r--r--Swiften/Avatars/VCardUpdateAvatarManager.h11
-rw-r--r--Swiften/Base/BoostRandomGenerator.cpp5
-rw-r--r--Swiften/Base/BoostRandomGenerator.h10
-rw-r--r--Swiften/Base/ByteArray.cpp4
-rw-r--r--Swiften/Base/ByteArray.h7
-rw-r--r--Swiften/Base/DateTime.cpp9
-rw-r--r--Swiften/Base/DateTime.h5
-rw-r--r--Swiften/Base/FileSize.cpp3
-rw-r--r--Swiften/Base/FileSize.h8
-rw-r--r--Swiften/Base/IDGenerator.cpp6
-rw-r--r--Swiften/Base/Path.h8
-rw-r--r--Swiften/Base/RandomGenerator.h5
-rw-r--r--Swiften/Base/SafeAllocator.h4
-rw-r--r--Swiften/Base/SafeByteArray.h7
-rw-r--r--Swiften/Base/SafeString.h4
-rw-r--r--Swiften/Base/SimpleIDGenerator.cpp4
-rw-r--r--Swiften/Base/String.h5
-rw-r--r--Swiften/Base/URL.h4
-rw-r--r--Swiften/Base/UnitTest/ByteArrayTest.cpp5
-rw-r--r--Swiften/Base/UnitTest/DateTimeTest.cpp8
-rw-r--r--Swiften/Base/UnitTest/IDGeneratorTest.cpp5
-rw-r--r--Swiften/Base/UnitTest/SimpleIDGeneratorTest.cpp7
-rw-r--r--Swiften/Base/UnitTest/StringTest.cpp7
-rw-r--r--Swiften/Base/UnitTest/URLTest.cpp5
-rw-r--r--Swiften/Base/format.h5
-rw-r--r--Swiften/Chat/ChatStateNotifier.cpp6
-rw-r--r--Swiften/Chat/ChatStateNotifier.h6
-rw-r--r--Swiften/Chat/ChatStateTracker.h8
-rw-r--r--Swiften/Chat/UnitTest/ChatStateNotifierTest.cpp5
-rw-r--r--Swiften/Client/BlockList.h6
-rw-r--r--Swiften/Client/Client.h3
-rw-r--r--Swiften/Client/ClientBlockListManager.cpp5
-rw-r--r--Swiften/Client/ClientBlockListManager.h12
-rw-r--r--Swiften/Client/ClientOptions.h5
-rw-r--r--Swiften/Client/ClientSession.h13
-rw-r--r--Swiften/Client/ClientXMLTracer.cpp3
-rw-r--r--Swiften/Client/ClientXMLTracer.h4
-rw-r--r--Swiften/Client/NickManager.h5
-rw-r--r--Swiften/Client/NickResolver.cpp4
-rw-r--r--Swiften/Client/NickResolver.h7
-rw-r--r--Swiften/Client/StanzaChannel.h6
-rw-r--r--Swiften/Client/UnitTest/ClientBlockListManagerTest.cpp17
-rw-r--r--Swiften/Client/UnitTest/ClientSessionTest.cpp40
-rw-r--r--Swiften/Client/UnitTest/NickResolverTest.cpp10
-rw-r--r--Swiften/Client/XMLBeautifier.cpp7
-rw-r--r--Swiften/Client/XMLBeautifier.h8
-rw-r--r--Swiften/Component/Component.h3
-rw-r--r--Swiften/Component/ComponentConnector.cpp7
-rw-r--r--Swiften/Component/ComponentConnector.h11
-rw-r--r--Swiften/Component/ComponentHandshakeGenerator.cpp5
-rw-r--r--Swiften/Component/ComponentSession.cpp6
-rw-r--r--Swiften/Component/ComponentSession.h13
-rw-r--r--Swiften/Component/ComponentSessionStanzaChannel.cpp5
-rw-r--r--Swiften/Component/ComponentSessionStanzaChannel.h6
-rw-r--r--Swiften/Component/ComponentXMLTracer.cpp3
-rw-r--r--Swiften/Component/CoreComponent.cpp6
-rw-r--r--Swiften/Component/UnitTest/ComponentSessionTest.cpp14
-rw-r--r--Swiften/Compress/UnitTest/ZLibCompressorTest.cpp4
-rw-r--r--Swiften/Compress/UnitTest/ZLibDecompressorTest.cpp6
-rw-r--r--Swiften/Compress/ZLibCodecompressor.cpp11
-rw-r--r--Swiften/Compress/ZLibCodecompressor_Private.h6
-rw-r--r--Swiften/Compress/ZLibException.h3
-rw-r--r--Swiften/Config/swiften-config.cpp16
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.cpp10
-rw-r--r--Swiften/Crypto/CommonCryptoCryptoProvider.h4
-rw-r--r--Swiften/Crypto/OpenSSLCryptoProvider.h4
-rw-r--r--Swiften/Disco/CapsInfoGenerator.cpp4
-rw-r--r--Swiften/Disco/CapsInfoGenerator.h3
-rw-r--r--Swiften/Disco/CapsManager.cpp9
-rw-r--r--Swiften/Disco/CapsManager.h10
-rw-r--r--Swiften/Disco/CapsMemoryStorage.h7
-rw-r--r--Swiften/Disco/CapsProvider.h6
-rw-r--r--Swiften/Disco/CapsStorage.h4
-rw-r--r--Swiften/Disco/ClientDiscoManager.cpp4
-rw-r--r--Swiften/Disco/DiscoInfoResponder.cpp7
-rw-r--r--Swiften/Disco/DiscoInfoResponder.h4
-rw-r--r--Swiften/Disco/DiscoServiceWalker.h15
-rw-r--r--Swiften/Disco/EntityCapsManager.cpp4
-rw-r--r--Swiften/Disco/EntityCapsManager.h6
-rw-r--r--Swiften/Disco/EntityCapsProvider.h4
-rw-r--r--Swiften/Disco/GetDiscoInfoRequest.h4
-rw-r--r--Swiften/Disco/GetDiscoItemsRequest.h4
-rw-r--r--Swiften/Disco/JIDDiscoInfoResponder.cpp7
-rw-r--r--Swiften/Disco/JIDDiscoInfoResponder.h4
-rw-r--r--Swiften/Disco/UnitTest/CapsInfoGeneratorTest.cpp6
-rw-r--r--Swiften/Disco/UnitTest/CapsManagerTest.cpp18
-rw-r--r--Swiften/Disco/UnitTest/DiscoInfoResponderTest.cpp7
-rw-r--r--Swiften/Disco/UnitTest/EntityCapsManagerTest.cpp16
-rw-r--r--Swiften/Disco/UnitTest/JIDDiscoInfoResponderTest.cpp7
-rw-r--r--Swiften/Elements/AuthChallenge.h5
-rw-r--r--Swiften/Elements/AuthRequest.h7
-rw-r--r--Swiften/Elements/AuthResponse.h5
-rw-r--r--Swiften/Elements/AuthSuccess.h3
-rw-r--r--Swiften/Elements/BlockListPayload.h4
-rw-r--r--Swiften/Elements/BlockPayload.h4
-rw-r--r--Swiften/Elements/Bytestreams.h7
-rw-r--r--Swiften/Elements/CapsInfo.h5
-rw-r--r--Swiften/Elements/Command.h7
-rw-r--r--Swiften/Elements/ComponentHandshake.h5
-rw-r--r--Swiften/Elements/ContainerPayload.h10
-rw-r--r--Swiften/Elements/DiscoInfo.h6
-rw-r--r--Swiften/Elements/DiscoItems.h4
-rw-r--r--Swiften/Elements/EnableStreamManagement.h4
-rw-r--r--Swiften/Elements/ErrorPayload.h5
-rw-r--r--Swiften/Elements/Form.cpp3
-rw-r--r--Swiften/Elements/Form.h8
-rw-r--r--Swiften/Elements/FormField.cpp6
-rw-r--r--Swiften/Elements/FormField.h5
-rw-r--r--Swiften/Elements/FormPage.h4
-rw-r--r--Swiften/Elements/FormSection.h4
-rw-r--r--Swiften/Elements/FormText.h4
-rw-r--r--Swiften/Elements/Forwarded.h5
-rw-r--r--Swiften/Elements/IBB.h3
-rw-r--r--Swiften/Elements/IQ.h4
-rw-r--r--Swiften/Elements/Idle.h4
-rw-r--r--Swiften/Elements/InBandRegistrationPayload.h9
-rw-r--r--Swiften/Elements/IsodeIQDelegation.h8
-rw-r--r--Swiften/Elements/JingleContentPayload.h9
-rw-r--r--Swiften/Elements/JingleFileTransferDescription.h5
-rw-r--r--Swiften/Elements/JingleFileTransferFileInfo.h6
-rw-r--r--Swiften/Elements/JingleFileTransferHash.h5
-rw-r--r--Swiften/Elements/JingleIBBTransportPayload.h7
-rw-r--r--Swiften/Elements/JinglePayload.h11
-rw-r--r--Swiften/Elements/JingleS5BTransportPayload.h5
-rw-r--r--Swiften/Elements/MAMFin.h4
-rw-r--r--Swiften/Elements/MAMQuery.h4
-rw-r--r--Swiften/Elements/MUCAdminPayload.h13
-rw-r--r--Swiften/Elements/MUCOccupant.h5
-rw-r--r--Swiften/Elements/MUCOwnerPayload.h4
-rw-r--r--Swiften/Elements/MUCPayload.h9
-rw-r--r--Swiften/Elements/MUCUserPayload.h13
-rw-r--r--Swiften/Elements/Nickname.h5
-rw-r--r--Swiften/Elements/Presence.h3
-rw-r--r--Swiften/Elements/PubSub.h5
-rw-r--r--Swiften/Elements/PubSubAffiliation.h9
-rw-r--r--Swiften/Elements/PubSubAffiliations.h13
-rw-r--r--Swiften/Elements/PubSubConfigure.h8
-rw-r--r--Swiften/Elements/PubSubCreate.h11
-rw-r--r--Swiften/Elements/PubSubDefault.h11
-rw-r--r--Swiften/Elements/PubSubEvent.h8
-rw-r--r--Swiften/Elements/PubSubEventAssociate.h9
-rw-r--r--Swiften/Elements/PubSubEventCollection.h11
-rw-r--r--Swiften/Elements/PubSubEventConfiguration.h11
-rw-r--r--Swiften/Elements/PubSubEventDelete.h11
-rw-r--r--Swiften/Elements/PubSubEventDisassociate.h9
-rw-r--r--Swiften/Elements/PubSubEventItem.h12
-rw-r--r--Swiften/Elements/PubSubEventItems.h11
-rw-r--r--Swiften/Elements/PubSubEventPurge.h8
-rw-r--r--Swiften/Elements/PubSubEventRedirect.h9
-rw-r--r--Swiften/Elements/PubSubEventRetract.h9
-rw-r--r--Swiften/Elements/PubSubEventSubscription.h11
-rw-r--r--Swiften/Elements/PubSubItem.h10
-rw-r--r--Swiften/Elements/PubSubItems.h13
-rw-r--r--Swiften/Elements/PubSubOptions.h11
-rw-r--r--Swiften/Elements/PubSubOwnerAffiliation.h6
-rw-r--r--Swiften/Elements/PubSubOwnerAffiliations.h11
-rw-r--r--Swiften/Elements/PubSubOwnerConfigure.h11
-rw-r--r--Swiften/Elements/PubSubOwnerDefault.h8
-rw-r--r--Swiften/Elements/PubSubOwnerDelete.h11
-rw-r--r--Swiften/Elements/PubSubOwnerPubSub.h5
-rw-r--r--Swiften/Elements/PubSubOwnerPurge.h8
-rw-r--r--Swiften/Elements/PubSubOwnerRedirect.h9
-rw-r--r--Swiften/Elements/PubSubOwnerSubscription.h6
-rw-r--r--Swiften/Elements/PubSubOwnerSubscriptions.h11
-rw-r--r--Swiften/Elements/PubSubPublish.h11
-rw-r--r--Swiften/Elements/PubSubRetract.h11
-rw-r--r--Swiften/Elements/PubSubSubscribe.h11
-rw-r--r--Swiften/Elements/PubSubSubscribeOptions.h7
-rw-r--r--Swiften/Elements/PubSubSubscription.h11
-rw-r--r--Swiften/Elements/PubSubSubscriptions.h13
-rw-r--r--Swiften/Elements/PubSubUnsubscribe.h11
-rw-r--r--Swiften/Elements/Replace.h5
-rw-r--r--Swiften/Elements/ResultSet.h3
-rw-r--r--Swiften/Elements/RosterItemExchangePayload.cpp7
-rw-r--r--Swiften/Elements/RosterItemExchangePayload.h9
-rw-r--r--Swiften/Elements/RosterItemPayload.h4
-rw-r--r--Swiften/Elements/RosterPayload.cpp3
-rw-r--r--Swiften/Elements/RosterPayload.h6
-rw-r--r--Swiften/Elements/SearchPayload.h9
-rw-r--r--Swiften/Elements/SecurityLabel.h9
-rw-r--r--Swiften/Elements/SecurityLabelsCatalog.h7
-rw-r--r--Swiften/Elements/SoftwareVersion.h3
-rw-r--r--Swiften/Elements/StartSession.h3
-rw-r--r--Swiften/Elements/Status.h5
-rw-r--r--Swiften/Elements/StatusShow.h5
-rw-r--r--Swiften/Elements/Storage.h8
-rw-r--r--Swiften/Elements/StreamError.h5
-rw-r--r--Swiften/Elements/StreamFeatures.h5
-rw-r--r--Swiften/Elements/StreamInitiation.h5
-rw-r--r--Swiften/Elements/StreamInitiationFileInfo.h11
-rw-r--r--Swiften/Elements/StreamResume.h3
-rw-r--r--Swiften/Elements/StreamResumed.h3
-rw-r--r--Swiften/Elements/Subject.h5
-rw-r--r--Swiften/Elements/UnblockPayload.h4
-rw-r--r--Swiften/Elements/UnitTest/FormTest.cpp7
-rw-r--r--Swiften/Elements/UnitTest/IQTest.cpp5
-rw-r--r--Swiften/Elements/UnitTest/StanzaTest.cpp13
-rw-r--r--Swiften/Elements/UserLocation.h12
-rw-r--r--Swiften/Elements/UserTune.h10
-rw-r--r--Swiften/Elements/VCard.h9
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardColor.cpp12
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardDeleteOperation.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardElement.h7
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardEllipseElement.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardFreehandPathElement.h10
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardInsertOperation.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardLineElement.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardOperation.h12
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardRectElement.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardTextElement.h4
-rw-r--r--Swiften/Elements/Whiteboard/WhiteboardUpdateOperation.h4
-rw-r--r--Swiften/Entity/Entity.cpp3
-rw-r--r--Swiften/Entity/PayloadPersister.cpp9
-rw-r--r--Swiften/Entity/PayloadPersister.h4
-rw-r--r--Swiften/EventLoop/Cocoa/CocoaEvent.mm3
-rw-r--r--Swiften/EventLoop/Event.cpp4
-rw-r--r--Swiften/EventLoop/Event.h4
-rw-r--r--Swiften/EventLoop/SimpleEventLoop.h4
-rw-r--r--Swiften/EventLoop/SingleThreadedEventLoop.cpp12
-rw-r--r--Swiften/EventLoop/SingleThreadedEventLoop.h11
-rw-r--r--Swiften/EventLoop/UnitTest/EventLoopTest.cpp11
-rw-r--r--Swiften/EventLoop/UnitTest/SimpleEventLoopTest.cpp9
-rw-r--r--Swiften/Examples/BenchTool/BenchTool.cpp13
-rw-r--r--Swiften/Examples/ConnectivityTest/ConnectivityTest.cpp15
-rw-r--r--Swiften/Examples/LinkLocalTool/main.cpp6
-rw-r--r--Swiften/Examples/NetworkTool/main.cpp7
-rw-r--r--Swiften/Examples/ParserTester/ParserTester.cpp11
-rw-r--r--Swiften/Examples/SendFile/ReceiveFile.cpp19
-rw-r--r--Swiften/Examples/SendMessage/SendMessage.cpp11
-rw-r--r--Swiften/FileTransfer/ByteArrayReadBytestream.cpp4
-rw-r--r--Swiften/FileTransfer/ByteArrayReadBytestream.h4
-rw-r--r--Swiften/FileTransfer/BytestreamsRequest.h4
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporter.h6
-rw-r--r--Swiften/FileTransfer/DefaultFileTransferTransporterFactory.h4
-rw-r--r--Swiften/FileTransfer/FileTransferManager.h9
-rw-r--r--Swiften/FileTransfer/FileTransferManagerImpl.cpp4
-rw-r--r--Swiften/FileTransfer/FileTransferOptions.h4
-rw-r--r--Swiften/FileTransfer/FileTransferTransporter.h4
-rw-r--r--Swiften/FileTransfer/IBBReceiveSession.cpp10
-rw-r--r--Swiften/FileTransfer/IBBReceiveSession.h8
-rw-r--r--Swiften/FileTransfer/IBBReceiveTransportSession.cpp6
-rw-r--r--Swiften/FileTransfer/IBBReceiveTransportSession.h4
-rw-r--r--Swiften/FileTransfer/IBBRequest.h5
-rw-r--r--Swiften/FileTransfer/IBBSendTransportSession.cpp6
-rw-r--r--Swiften/FileTransfer/IBBSendTransportSession.h4
-rw-r--r--Swiften/FileTransfer/IncomingJingleFileTransfer.h15
-rw-r--r--Swiften/FileTransfer/IncrementalBytestreamHashCalculator.cpp4
-rw-r--r--Swiften/FileTransfer/IncrementalBytestreamHashCalculator.h5
-rw-r--r--Swiften/FileTransfer/LocalJingleTransportCandidateGenerator.h6
-rw-r--r--Swiften/FileTransfer/OutgoingFileTransferManager.cpp10
-rw-r--r--Swiften/FileTransfer/ReadBytestream.h5
-rw-r--r--Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.cpp6
-rw-r--r--Swiften/FileTransfer/RemoteJingleTransportCandidateSelector.h12
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamClientSession.cpp2
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamRegistry.h4
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServer.cpp6
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServer.h11
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerManager.h3
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerPortForwardingUser.cpp6
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.cpp6
-rw-r--r--Swiften/FileTransfer/SOCKS5BytestreamServerResourceUser.h4
-rw-r--r--Swiften/FileTransfer/StreamInitiationRequest.h5
-rw-r--r--Swiften/FileTransfer/TransportSession.h6
-rw-r--r--Swiften/FileTransfer/UnitTest/DummyFileTransferManager.h9
-rw-r--r--Swiften/FileTransfer/UnitTest/IBBReceiveSessionTest.cpp12
-rw-r--r--Swiften/FileTransfer/UnitTest/IBBSendSessionTest.cpp12
-rw-r--r--Swiften/FileTransfer/UnitTest/SOCKS5BytestreamServerSessionTest.cpp12
-rw-r--r--Swiften/History/HistoryMessage.h7
-rw-r--r--Swiften/History/HistoryStorage.h10
-rw-r--r--Swiften/History/SQLiteHistoryStorage.cpp9
-rw-r--r--Swiften/History/SQLiteHistoryStorage.h6
-rw-r--r--Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp5
-rw-r--r--Swiften/IDN/ICUConverter.h3
-rw-r--r--Swiften/IDN/IDNConverter.h6
-rw-r--r--Swiften/IDN/LibIDNConverter.h3
-rw-r--r--Swiften/IDN/UnitTest/IDNConverterTest.cpp5
-rw-r--r--Swiften/JID/JID.h5
-rw-r--r--Swiften/Jingle/FakeJingleSession.cpp5
-rw-r--r--Swiften/Jingle/FakeJingleSession.h11
-rw-r--r--Swiften/Jingle/JingleResponder.cpp7
-rw-r--r--Swiften/Jingle/JingleResponder.h4
-rw-r--r--Swiften/Jingle/JingleSession.cpp5
-rw-r--r--Swiften/Jingle/JingleSession.h7
-rw-r--r--Swiften/Jingle/JingleSessionImpl.cpp17
-rw-r--r--Swiften/Jingle/JingleSessionImpl.h5
-rw-r--r--Swiften/Jingle/JingleSessionManager.cpp9
-rw-r--r--Swiften/Jingle/JingleSessionManager.h5
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.cpp5
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiBrowseQuery.h4
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.cpp6
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiQuerier.h11
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.cpp3
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiQuery.h4
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.cpp3
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiRegisterQuery.h6
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.cpp3
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveHostnameQuery.h9
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.cpp5
-rw-r--r--Swiften/LinkLocal/DNSSD/Avahi/AvahiResolveServiceQuery.h6
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourBrowseQuery.h7
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.cpp12
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuerier.h13
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.cpp3
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourQuery.h7
-rw-r--r--Swiften/LinkLocal/DNSSD/Bonjour/BonjourResolveServiceQuery.h6
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDBrowseQuery.h3
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDRegisterQuery.h6
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDResolveHostnameQuery.h4
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h6
-rw-r--r--Swiften/LinkLocal/DNSSD/DNSSDServiceID.h5
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDBrowseQuery.h4
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.cpp11
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h9
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuery.cpp3
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuery.h4
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDRegisterQuery.h9
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDResolveHostnameQuery.h5
-rw-r--r--Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDResolveServiceQuery.h4
-rw-r--r--Swiften/LinkLocal/IncomingLinkLocalSession.cpp8
-rw-r--r--Swiften/LinkLocal/IncomingLinkLocalSession.h6
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.cpp6
-rw-r--r--Swiften/LinkLocal/LinkLocalConnector.h11
-rw-r--r--Swiften/LinkLocal/LinkLocalService.h5
-rw-r--r--Swiften/LinkLocal/LinkLocalServiceBrowser.cpp8
-rw-r--r--Swiften/LinkLocal/LinkLocalServiceBrowser.h13
-rw-r--r--Swiften/LinkLocal/LinkLocalServiceInfo.h5
-rw-r--r--Swiften/LinkLocal/OutgoingLinkLocalSession.cpp6
-rw-r--r--Swiften/LinkLocal/OutgoingLinkLocalSession.h11
-rw-r--r--Swiften/LinkLocal/UnitTest/LinkLocalConnectorTest.cpp14
-rw-r--r--Swiften/LinkLocal/UnitTest/LinkLocalServiceBrowserTest.cpp18
-rw-r--r--Swiften/LinkLocal/UnitTest/LinkLocalServiceInfoTest.cpp4
-rw-r--r--Swiften/MUC/MUC.h24
-rw-r--r--Swiften/MUC/MUCBookmark.h7
-rw-r--r--Swiften/MUC/MUCBookmarkManager.cpp8
-rw-r--r--Swiften/MUC/MUCBookmarkManager.h10
-rw-r--r--Swiften/MUC/MUCImpl.cpp12
-rw-r--r--Swiften/MUC/MUCImpl.h26
-rw-r--r--Swiften/MUC/MUCManager.cpp3
-rw-r--r--Swiften/MUC/UnitTest/MUCTest.cpp22
-rw-r--r--Swiften/MUC/UnitTest/MockMUC.h30
-rw-r--r--Swiften/Network/BoostConnectionFactory.cpp3
-rw-r--r--Swiften/Network/BoostConnectionFactory.h4
-rw-r--r--Swiften/Network/BoostConnectionServer.h8
-rw-r--r--Swiften/Network/BoostConnectionServerFactory.cpp7
-rw-r--r--Swiften/Network/BoostConnectionServerFactory.h4
-rw-r--r--Swiften/Network/BoostIOServiceThread.h4
-rw-r--r--Swiften/Network/BoostTimerFactory.cpp3
-rw-r--r--Swiften/Network/BoostTimerFactory.h4
-rw-r--r--Swiften/Network/ConnectionServer.h4
-rw-r--r--Swiften/Network/ConnectionServerFactory.h3
-rw-r--r--Swiften/Network/Connector.h16
-rw-r--r--Swiften/Network/DomainNameAddressQuery.h4
-rw-r--r--Swiften/Network/DomainNameResolver.h5
-rw-r--r--Swiften/Network/DomainNameServiceQuery.cpp11
-rw-r--r--Swiften/Network/DomainNameServiceQuery.h9
-rw-r--r--Swiften/Network/DummyConnection.cpp5
-rw-r--r--Swiften/Network/DummyConnectionServer.h6
-rw-r--r--Swiften/Network/EnvironmentProxyProvider.cpp10
-rw-r--r--Swiften/Network/GConfProxyProvider.cpp10
-rw-r--r--Swiften/Network/HTTPConnectProxiedConnectionFactory.h4
-rw-r--r--Swiften/Network/HostAddress.cpp9
-rw-r--r--Swiften/Network/HostAddress.h3
-rw-r--r--Swiften/Network/HostNameOrAddress.h6
-rw-r--r--Swiften/Network/MacOSXProxyProvider.h10
-rw-r--r--Swiften/Network/MiniUPnPInterface.cpp7
-rw-r--r--Swiften/Network/NATPMPInterface.cpp10
-rw-r--r--Swiften/Network/NATTraversalForwardPortRequest.h9
-rw-r--r--Swiften/Network/NATTraversalInterface.cpp3
-rw-r--r--Swiften/Network/NetworkEnvironment.cpp6
-rw-r--r--Swiften/Network/NullNATTraverser.cpp8
-rw-r--r--Swiften/Network/ProxyProvider.cpp8
-rw-r--r--Swiften/Network/ProxyProvider.h7
-rw-r--r--Swiften/Network/SOCKS5ProxiedConnection.cpp7
-rw-r--r--Swiften/Network/SolarisNetworkEnvironment.cpp24
-rw-r--r--Swiften/Network/SolarisNetworkEnvironment.h9
-rw-r--r--Swiften/Network/StaticDomainNameResolver.cpp7
-rw-r--r--Swiften/Network/Timer.h4
-rwxr-xr-xSwiften/Network/UnboundDomainNameResolver.cpp19
-rwxr-xr-xSwiften/Network/UnboundDomainNameResolver.h16
-rw-r--r--Swiften/Network/UnitTest/DomainNameServiceQueryTest.cpp4
-rw-r--r--Swiften/Network/UnitTest/HostAddressTest.cpp5
-rw-r--r--Swiften/Network/UnixNetworkEnvironment.h7
-rw-r--r--Swiften/Network/WindowsNetworkEnvironment.cpp20
-rw-r--r--Swiften/Network/WindowsProxyProvider.cpp21
-rw-r--r--Swiften/Parser/AttributeMap.cpp7
-rw-r--r--Swiften/Parser/AttributeMap.h7
-rw-r--r--Swiften/Parser/AuthChallengeParser.cpp3
-rw-r--r--Swiften/Parser/AuthChallengeParser.h7
-rw-r--r--Swiften/Parser/AuthFailureParser.h4
-rw-r--r--Swiften/Parser/AuthRequestParser.cpp3
-rw-r--r--Swiften/Parser/AuthRequestParser.h7
-rw-r--r--Swiften/Parser/AuthResponseParser.cpp3
-rw-r--r--Swiften/Parser/AuthResponseParser.h7
-rw-r--r--Swiften/Parser/AuthSuccessParser.cpp3
-rw-r--r--Swiften/Parser/AuthSuccessParser.h7
-rw-r--r--Swiften/Parser/BOSHBodyExtractor.cpp6
-rw-r--r--Swiften/Parser/ComponentHandshakeParser.cpp3
-rw-r--r--Swiften/Parser/ComponentHandshakeParser.h7
-rw-r--r--Swiften/Parser/CompressFailureParser.h4
-rw-r--r--Swiften/Parser/CompressParser.h5
-rw-r--r--Swiften/Parser/CompressedParser.h4
-rw-r--r--Swiften/Parser/ElementParser.h5
-rw-r--r--Swiften/Parser/EnableStreamManagementParser.h4
-rw-r--r--Swiften/Parser/EnumParser.h9
-rw-r--r--Swiften/Parser/GenericPayloadParserFactory.h5
-rw-r--r--Swiften/Parser/GenericPayloadParserFactory2.h5
-rw-r--r--Swiften/Parser/IQParser.cpp7
-rw-r--r--Swiften/Parser/IQParser.h4
-rw-r--r--Swiften/Parser/LibXMLParser.cpp10
-rw-r--r--Swiften/Parser/MessageParser.h4
-rw-r--r--Swiften/Parser/PayloadParser.h5
-rw-r--r--Swiften/Parser/PayloadParserFactoryCollection.cpp8
-rw-r--r--Swiften/Parser/PayloadParserFactoryCollection.h4
-rw-r--r--Swiften/Parser/PayloadParsers/CommandParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/DiscoInfoParser.cpp3
-rw-r--r--Swiften/Parser/PayloadParsers/ErrorParser.cpp5
-rw-r--r--Swiften/Parser/PayloadParsers/FormParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/ForwardedParser.cpp7
-rw-r--r--Swiften/Parser/PayloadParsers/ForwardedParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.cpp5
-rw-r--r--Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h7
-rw-r--r--Swiften/Parser/PayloadParsers/IdleParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/InBandRegistrationPayloadParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/IsodeIQDelegationParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/JingleContentPayloadParser.cpp14
-rw-r--r--Swiften/Parser/PayloadParsers/JingleFileTransferDescriptionParser.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/JingleFileTransferFileInfoParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/JingleFileTransferHashParser.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/JingleIBBTransportMethodPayloadParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/JingleParser.cpp11
-rw-r--r--Swiften/Parser/PayloadParsers/JingleReasonParser.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/JingleS5BTransportMethodPayloadParser.cpp12
-rw-r--r--Swiften/Parser/PayloadParsers/MAMFinParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/MAMFinParser.h6
-rw-r--r--Swiften/Parser/PayloadParsers/MAMQueryParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/MAMQueryParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/MAMResultParser.cpp5
-rw-r--r--Swiften/Parser/PayloadParsers/MAMResultParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/MUCInvitationPayloadParser.cpp3
-rw-r--r--Swiften/Parser/PayloadParsers/MUCItemParser.cpp8
-rw-r--r--Swiften/Parser/PayloadParsers/MUCOwnerPayloadParser.cpp5
-rw-r--r--Swiften/Parser/PayloadParsers/MUCUserPayloadParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/PrivateStorageParser.cpp5
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubAffiliationParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubAffiliationsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubConfigureParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubCreateParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubDefaultParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubErrorParser.h6
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventAssociateParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventCollectionParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventConfigurationParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventDeleteParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventDisassociateParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventItemParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventItemsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventPurgeParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventRedirectParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventRetractParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubEventSubscriptionParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubItemParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubItemsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOptionsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerAffiliationsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerConfigureParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerDefaultParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerDeleteParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerPubSubParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerPurgeParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerRedirectParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubOwnerSubscriptionsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubPublishParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubRetractParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubSubscribeOptionsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubSubscribeParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubSubscriptionParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubSubscriptionsParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/PubSubUnsubscribeParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/RawXMLPayloadParser.cpp3
-rw-r--r--Swiften/Parser/PayloadParsers/RawXMLPayloadParserFactory.h5
-rw-r--r--Swiften/Parser/PayloadParsers/ResultSetParser.cpp6
-rw-r--r--Swiften/Parser/PayloadParsers/ResultSetParser.h4
-rw-r--r--Swiften/Parser/PayloadParsers/RosterItemExchangeParser.cpp7
-rw-r--r--Swiften/Parser/PayloadParsers/S5BProxyRequestParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/SearchPayloadParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/SecurityLabelParser.cpp3
-rw-r--r--Swiften/Parser/PayloadParsers/SecurityLabelsCatalogParser.cpp7
-rw-r--r--Swiften/Parser/PayloadParsers/StreamInitiationFileInfoParser.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/BlockParserTest.cpp13
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/CarbonsParserTest.cpp12
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/CommandParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/ErrorParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/FormParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/IBBParserTest.cpp7
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/IdleParserTest.cpp12
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/InBandRegistrationPayloadParserTest.cpp10
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/MUCUserPayloadParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h8
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/PrivateStorageParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/SearchPayloadParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/StreamInitiationParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/UserLocationParserTest.cpp12
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/UserTuneParserTest.cpp12
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/VCardParserTest.cpp10
-rw-r--r--Swiften/Parser/PayloadParsers/UnitTest/VCardUpdateParserTest.cpp4
-rw-r--r--Swiften/Parser/PayloadParsers/UserLocationParser.h9
-rw-r--r--Swiften/Parser/PayloadParsers/UserTuneParser.h9
-rw-r--r--Swiften/Parser/PayloadParsers/VCardParser.cpp7
-rw-r--r--Swiften/Parser/PayloadParsers/VCardParser.h5
-rw-r--r--Swiften/Parser/PayloadParsers/WhiteboardParser.cpp26
-rw-r--r--Swiften/Parser/PayloadParsers/WhiteboardParser.h6
-rw-r--r--Swiften/Parser/PlatformXMLParserFactory.h4
-rw-r--r--Swiften/Parser/PresenceParser.cpp7
-rw-r--r--Swiften/Parser/PresenceParser.h4
-rw-r--r--Swiften/Parser/SerializingParser.cpp4
-rw-r--r--Swiften/Parser/SerializingParser.h3
-rw-r--r--Swiften/Parser/StanzaAckParser.h4
-rw-r--r--Swiften/Parser/StanzaAckRequestParser.h4
-rw-r--r--Swiften/Parser/StanzaParser.cpp5
-rw-r--r--Swiften/Parser/StanzaParser.h7
-rw-r--r--Swiften/Parser/StartTLSFailureParser.h4
-rw-r--r--Swiften/Parser/StartTLSParser.h4
-rw-r--r--Swiften/Parser/StreamFeaturesParser.h5
-rw-r--r--Swiften/Parser/StreamManagementEnabledParser.h6
-rw-r--r--Swiften/Parser/StreamManagementFailedParser.h4
-rw-r--r--Swiften/Parser/StreamResumeParser.h4
-rw-r--r--Swiften/Parser/StreamResumedParser.h4
-rw-r--r--Swiften/Parser/TLSProceedParser.h4
-rw-r--r--Swiften/Parser/Tree/NullParserElement.h3
-rw-r--r--Swiften/Parser/Tree/ParserElement.cpp8
-rw-r--r--Swiften/Parser/Tree/ParserElement.h8
-rw-r--r--Swiften/Parser/Tree/TreeReparser.cpp13
-rw-r--r--Swiften/Parser/UnitTest/BOSHBodyExtractorTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/ElementParserTester.h3
-rw-r--r--Swiften/Parser/UnitTest/GenericPayloadTreeParserTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/ParserTester.h5
-rw-r--r--Swiften/Parser/UnitTest/PayloadParserFactoryCollectionTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/PresenceParserTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/StanzaAckParserTest.cpp4
-rw-r--r--Swiften/Parser/UnitTest/StanzaParserTest.cpp8
-rw-r--r--Swiften/Parser/UnitTest/XMPPParserTest.cpp21
-rw-r--r--Swiften/Parser/UnknownElementParser.h4
-rw-r--r--Swiften/Parser/XMPPParser.cpp45
-rw-r--r--Swiften/Presence/DirectedPresenceSender.cpp3
-rw-r--r--Swiften/Presence/DirectedPresenceSender.h4
-rw-r--r--Swiften/Presence/PayloadAddingPresenceSender.h4
-rw-r--r--Swiften/Presence/StanzaChannelPresenceSender.cpp3
-rw-r--r--Swiften/Presence/SubscriptionManager.h8
-rw-r--r--Swiften/Presence/UnitTest/PayloadAddingPresenceSenderTest.cpp12
-rw-r--r--Swiften/PubSub/PubSubManager.h29
-rw-r--r--Swiften/PubSub/PubSubManagerImpl.h5
-rw-r--r--Swiften/PubSub/PubSubUtil.h3
-rw-r--r--Swiften/QA/ClientTest/ClientTest.cpp11
-rw-r--r--Swiften/QA/ConcurrentFileTransferTest/ConcurrentFileTransferTest.cpp30
-rw-r--r--Swiften/QA/ProxyProviderTest/ProxyProviderTest.cpp8
-rw-r--r--Swiften/QA/ReconnectTest/ReconnectTest.cpp8
-rw-r--r--Swiften/QA/StorageTest/VCardFileStorageTest.cpp15
-rw-r--r--Swiften/QA/TLSTest/CertificateTest.cpp9
-rw-r--r--Swiften/Queries/IQChannel.h7
-rw-r--r--Swiften/Queries/IQHandler.cpp3
-rw-r--r--Swiften/Queries/IQRouter.cpp6
-rw-r--r--Swiften/Queries/IQRouter.h7
-rw-r--r--Swiften/Queries/PubSubRequest.h22
-rw-r--r--Swiften/Queries/RawRequest.h9
-rw-r--r--Swiften/Queries/Request.cpp7
-rw-r--r--Swiften/Queries/Request.h13
-rw-r--r--Swiften/Queries/Requests/GetInBandRegistrationFormRequest.h4
-rw-r--r--Swiften/Queries/Requests/GetPrivateStorageRequest.h8
-rw-r--r--Swiften/Queries/Requests/GetSecurityLabelsCatalogRequest.h5
-rw-r--r--Swiften/Queries/Requests/GetSoftwareVersionRequest.h8
-rw-r--r--Swiften/Queries/Requests/SetPrivateStorageRequest.h8
-rw-r--r--Swiften/Queries/Requests/SubmitInBandRegistrationFormRequest.h7
-rw-r--r--Swiften/Queries/Requests/UnitTest/GetPrivateStorageRequestTest.cpp13
-rw-r--r--Swiften/Queries/Responder.h4
-rw-r--r--Swiften/Queries/Responders/SoftwareVersionResponder.cpp5
-rw-r--r--Swiften/Queries/Responders/SoftwareVersionResponder.h4
-rw-r--r--Swiften/Queries/UnitTest/IQRouterTest.cpp11
-rw-r--r--Swiften/Queries/UnitTest/RequestTest.cpp15
-rw-r--r--Swiften/Queries/UnitTest/ResponderTest.cpp15
-rw-r--r--Swiften/Roster/GetRosterRequest.h5
-rw-r--r--Swiften/Roster/RosterPushResponder.h6
-rw-r--r--Swiften/Roster/SetRosterRequest.h7
-rw-r--r--Swiften/Roster/UnitTest/XMPPRosterControllerTest.cpp13
-rw-r--r--Swiften/Roster/UnitTest/XMPPRosterImplTest.cpp8
-rw-r--r--Swiften/Roster/UnitTest/XMPPRosterSignalHandler.cpp5
-rw-r--r--Swiften/Roster/UnitTest/XMPPRosterSignalHandler.h5
-rw-r--r--Swiften/Roster/XMPPRoster.h13
-rw-r--r--Swiften/Roster/XMPPRosterController.cpp7
-rw-r--r--Swiften/Roster/XMPPRosterController.h9
-rw-r--r--Swiften/Roster/XMPPRosterItem.h7
-rw-r--r--Swiften/SASL/ClientAuthenticator.h7
-rw-r--r--Swiften/SASL/DIGESTMD5ClientAuthenticator.cpp6
-rw-r--r--Swiften/SASL/DIGESTMD5ClientAuthenticator.h6
-rw-r--r--Swiften/SASL/DIGESTMD5Properties.cpp3
-rw-r--r--Swiften/SASL/DIGESTMD5Properties.h5
-rw-r--r--Swiften/SASL/EXTERNALClientAuthenticator.h4
-rw-r--r--Swiften/SASL/PLAINClientAuthenticator.cpp3
-rw-r--r--Swiften/SASL/PLAINClientAuthenticator.h4
-rw-r--r--Swiften/SASL/PLAINMessage.cpp3
-rw-r--r--Swiften/SASL/SCRAMSHA1ClientAuthenticator.cpp7
-rw-r--r--Swiften/SASL/SCRAMSHA1ClientAuthenticator.h7
-rw-r--r--Swiften/SASL/UnitTest/DIGESTMD5ClientAuthenticatorTest.cpp5
-rw-r--r--Swiften/SASL/UnitTest/PLAINClientAuthenticatorTest.cpp7
-rw-r--r--Swiften/SASL/UnitTest/PLAINMessageTest.cpp4
-rw-r--r--Swiften/SASL/UnitTest/SCRAMSHA1ClientAuthenticatorTest.cpp8
-rw-r--r--Swiften/Serializer/AuthChallengeSerializer.cpp4
-rw-r--r--Swiften/Serializer/AuthRequestSerializer.cpp6
-rw-r--r--Swiften/Serializer/AuthResponseSerializer.cpp6
-rw-r--r--Swiften/Serializer/AuthSuccessSerializer.cpp4
-rw-r--r--Swiften/Serializer/ElementSerializer.h4
-rw-r--r--Swiften/Serializer/IQSerializer.h8
-rw-r--r--Swiften/Serializer/MessageSerializer.cpp3
-rw-r--r--Swiften/Serializer/MessageSerializer.h8
-rw-r--r--Swiften/Serializer/PayloadSerializer.h3
-rw-r--r--Swiften/Serializer/PayloadSerializerCollection.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializerCollection.h3
-rw-r--r--Swiften/Serializer/PayloadSerializers/BodySerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/BytestreamsSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/CapsInfoSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/CarbonsReceivedSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/CarbonsSentSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ChatStateSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/CommandSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/CommandSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/DelaySerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/DelaySerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/DeliveryReceiptRequestSerializer.h10
-rw-r--r--Swiften/Serializer/PayloadSerializers/DeliveryReceiptSerializer.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/DeliveryReceiptSerializer.h8
-rw-r--r--Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/DiscoItemsSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ErrorSerializer.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/ErrorSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/FormSerializer.cpp11
-rw-r--r--Swiften/Serializer/PayloadSerializers/FormSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ForwardedSerializer.cpp13
-rw-r--r--Swiften/Serializer/PayloadSerializers/ForwardedSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/IBBSerializer.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/IBBSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/IdleSerializer.h6
-rw-r--r--Swiften/Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/InBandRegistrationPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/IsodeIQDelegationSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.cpp18
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleContentPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.cpp14
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferDescriptionSerializer.h8
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferFileInfoSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleFileTransferHashSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleIBBTransportPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.cpp24
-rw-r--r--Swiften/Serializer/PayloadSerializers/JinglePayloadSerializer.h8
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/JingleS5BTransportPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/LastSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMFinSerializer.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMFinSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMQuerySerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMResultSerializer.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/MAMResultSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCAdminPayloadSerializer.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCAdminPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCDestroyPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCInvitationPayloadSerializer.h6
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCItemSerializer.h7
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCOwnerPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/MUCUserPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/NicknameSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/PrioritySerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/PrivateStorageSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/PrivateStorageSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubAffiliationSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubAffiliationsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubConfigureSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubCreateSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubDefaultSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubErrorSerializer.h6
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventAssociateSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventCollectionSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventConfigurationSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventDeleteSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventDisassociateSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventItemSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventItemsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventPurgeSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventRedirectSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventRetractSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventSerializer.h12
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubEventSubscriptionSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubItemSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubItemsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOptionsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerAffiliationsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerConfigureSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerDefaultSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerDeleteSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerPubSubSerializer.h12
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerPurgeSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerRedirectSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubOwnerSubscriptionsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubPublishSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubRetractSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubSubscribeOptionsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubSubscribeSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubSubscriptionSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubSubscriptionsSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/PubSubUnsubscribeSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/RawXMLPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ReplaceSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ResourceBindSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ResultSetSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/ResultSetSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/RosterItemExchangeSerializer.h8
-rw-r--r--Swiften/Serializer/PayloadSerializers/RosterSerializer.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/RosterSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SearchPayloadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/SecurityLabelSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/SecurityLabelsCatalogSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SoftwareVersionSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/StatusSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/StatusShowSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/StorageSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.cpp12
-rw-r--r--Swiften/Serializer/PayloadSerializers/StreamInitiationFileInfoSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/StreamInitiationSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/SubjectSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/ThreadSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/BlockSerializerTest.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/CarbonsSerializerTest.cpp16
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/DeliveryReceiptSerializerTest.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/ErrorSerializerTest.cpp7
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/FormSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/IBBSerializerTest.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/IdleSerializerTest.cpp10
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/InBandRegistrationPayloadSerializerTest.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/IsodeIQDelegationSerializerTest.cpp14
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/JingleSerializersTest.cpp16
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MAMFinSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MAMQuerySerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MAMResultSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/MUCAdminPayloadSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/PayloadsSerializer.h5
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/PrivateStorageSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/PubSubItemsSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/ResultSetSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/SearchPayloadSerializerTest.cpp5
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/StorageSerializerTest.cpp4
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/UserLocationSerializerTest.cpp15
-rw-r--r--Swiften/Serializer/PayloadSerializers/UnitTest/UserTuneSerializerTest.cpp15
-rw-r--r--Swiften/Serializer/PayloadSerializers/UserLocationSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/UserTuneSerializer.h9
-rw-r--r--Swiften/Serializer/PayloadSerializers/VCardSerializer.cpp8
-rw-r--r--Swiften/Serializer/PayloadSerializers/VCardSerializer.h7
-rw-r--r--Swiften/Serializer/PayloadSerializers/VCardUpdateSerializer.h4
-rw-r--r--Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.cpp14
-rw-r--r--Swiften/Serializer/PayloadSerializers/WhiteboardSerializer.h12
-rw-r--r--Swiften/Serializer/PresenceSerializer.cpp8
-rw-r--r--Swiften/Serializer/PresenceSerializer.h8
-rw-r--r--Swiften/Serializer/StanzaAckSerializer.h4
-rw-r--r--Swiften/Serializer/StanzaSerializer.cpp10
-rw-r--r--Swiften/Serializer/StanzaSerializer.h9
-rw-r--r--Swiften/Serializer/StreamErrorSerializer.h4
-rw-r--r--Swiften/Serializer/StreamFeaturesSerializer.cpp4
-rw-r--r--Swiften/Serializer/StreamResumeSerializer.cpp4
-rw-r--r--Swiften/Serializer/StreamResumedSerializer.cpp4
-rw-r--r--Swiften/Serializer/UnitTest/AuthChallengeSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/UnitTest/AuthRequestSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/UnitTest/AuthResponseSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/UnitTest/AuthSuccessSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/UnitTest/StreamFeaturesSerializerTest.cpp5
-rw-r--r--Swiften/Serializer/UnitTest/XMPPSerializerTest.cpp6
-rw-r--r--Swiften/Serializer/XML/UnitTest/XMLElementTest.cpp6
-rw-r--r--Swiften/Serializer/XML/XMLElement.h8
-rw-r--r--Swiften/Serializer/XMPPSerializer.cpp41
-rw-r--r--Swiften/Serializer/XMPPSerializer.h9
-rw-r--r--Swiften/Session/BasicSessionStream.cpp12
-rw-r--r--Swiften/Session/Session.cpp4
-rw-r--r--Swiften/Session/Session.h12
-rw-r--r--Swiften/Session/SessionStream.h12
-rw-r--r--Swiften/Session/SessionTracer.cpp3
-rw-r--r--Swiften/Session/SessionTracer.h4
-rw-r--r--Swiften/StreamManagement/StanzaAckRequester.cpp5
-rw-r--r--Swiften/StreamManagement/StanzaAckRequester.h7
-rw-r--r--Swiften/StreamManagement/StanzaAckResponder.h4
-rw-r--r--Swiften/StreamManagement/UnitTest/StanzaAckRequesterTest.cpp11
-rw-r--r--Swiften/StreamManagement/UnitTest/StanzaAckResponderTest.cpp9
-rw-r--r--Swiften/StreamStack/CompressionLayer.h8
-rw-r--r--Swiften/StreamStack/StreamLayer.h4
-rw-r--r--Swiften/StreamStack/StreamStack.cpp4
-rw-r--r--Swiften/StreamStack/StreamStack.h7
-rw-r--r--Swiften/StreamStack/TLSLayer.cpp4
-rw-r--r--Swiften/StreamStack/UnitTest/StreamStackTest.cpp19
-rw-r--r--Swiften/StreamStack/UnitTest/XMPPLayerTest.cpp14
-rw-r--r--Swiften/StreamStack/XMPPLayer.cpp5
-rw-r--r--Swiften/StringCodecs/Base64.h4
-rw-r--r--Swiften/StringCodecs/PBKDF2.h4
-rw-r--r--Swiften/StringCodecs/UnitTest/Base64Test.cpp4
-rw-r--r--Swiften/StringCodecs/UnitTest/HexifyTest.cpp7
-rw-r--r--Swiften/StringCodecs/UnitTest/PBKDF2Test.cpp5
-rw-r--r--Swiften/TLS/CAPICertificate.cpp11
-rw-r--r--Swiften/TLS/CertificateTrustChecker.h5
-rw-r--r--Swiften/TLS/CertificateVerificationError.h3
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLCertificate.h6
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLContextFactory.cpp5
-rw-r--r--Swiften/TLS/OpenSSL/OpenSSLContextFactory.h6
-rw-r--r--Swiften/TLS/PKCS12Certificate.h5
-rw-r--r--Swiften/TLS/PlatformTLSFactories.cpp3
-rw-r--r--Swiften/TLS/Schannel/SchannelCertificate.h12
-rw-r--r--Swiften/TLS/Schannel/SchannelContextFactory.cpp7
-rw-r--r--Swiften/TLS/ServerIdentityVerifier.h5
-rw-r--r--Swiften/TLS/SimpleCertificate.h3
-rw-r--r--Swiften/TLS/TLSContext.h6
-rw-r--r--Swiften/TLS/TLSError.h5
-rw-r--r--Swiften/TLS/UnitTest/CertificateTest.cpp10
-rw-r--r--Swiften/TLS/UnitTest/ServerIdentityVerifierTest.cpp10
-rw-r--r--Swiften/VCards/GetVCardRequest.h4
-rw-r--r--Swiften/VCards/SetVCardRequest.h4
-rw-r--r--Swiften/VCards/VCardMemoryStorage.h6
-rw-r--r--Swiften/VCards/VCardStorage.cpp4
-rw-r--r--Swiften/VCards/VCardStorage.h4
-rw-r--r--Swiften/Whiteboard/IncomingWhiteboardSession.cpp11
-rw-r--r--Swiften/Whiteboard/IncomingWhiteboardSession.h11
-rw-r--r--Swiften/Whiteboard/OutgoingWhiteboardSession.cpp12
-rw-r--r--Swiften/Whiteboard/OutgoingWhiteboardSession.h13
-rw-r--r--Swiften/Whiteboard/UnitTest/WhiteboardClientTest.cpp15
-rw-r--r--Swiften/Whiteboard/UnitTest/WhiteboardServerTest.cpp15
-rw-r--r--Swiften/Whiteboard/WhiteboardClient.cpp13
-rw-r--r--Swiften/Whiteboard/WhiteboardClient.h11
-rw-r--r--Swiften/Whiteboard/WhiteboardResponder.cpp11
-rw-r--r--Swiften/Whiteboard/WhiteboardResponder.h4
-rw-r--r--Swiften/Whiteboard/WhiteboardServer.cpp10
-rw-r--r--Swiften/Whiteboard/WhiteboardServer.h10
-rw-r--r--Swiften/Whiteboard/WhiteboardSession.cpp15
-rw-r--r--Swiften/Whiteboard/WhiteboardSession.h12
-rw-r--r--Swiften/Whiteboard/WhiteboardSessionManager.cpp15
-rw-r--r--Swiften/Whiteboard/WhiteboardSessionManager.h14
-rw-r--r--Swiften/Whiteboard/WhiteboardTransformer.cpp7
-rw-r--r--Swiften/Whiteboard/WhiteboardTransformer.h11
1386 files changed, 5944 insertions, 4436 deletions
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
index 356a115..1cec06c 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot2.cpp
@@ -1,10 +1,11 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <iostream>
+
#include <boost/bind.hpp>
#include <Swiften/Swiften.h>
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
index 8334b2f..4cba31f 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot3.cpp
@@ -1,10 +1,11 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <iostream>
+
#include <boost/bind.hpp>
#include <Swiften/Swiften.h>
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
index 1432677..b5537c9 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot4.cpp
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
//...
#include <iostream>
+
#include <boost/bind.hpp>
#include <Swiften/Swiften.h>
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
index ace3b7f..811887e 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot5.cpp
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
//...
#include <iostream>
+
#include <boost/bind.hpp>
#include <Swiften/Swiften.h>
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot6.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot6.cpp
index 609b005..b3239c8 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot6.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoBot6.cpp
@@ -1,11 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
//...
#include <iostream>
+
#include <boost/bind.hpp>
#include <boost/smart_ptr/make_shared.hpp>
diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
index ad51eb9..c827b94 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/EchoComponent.cpp
@@ -1,10 +1,11 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <iostream>
+
#include <boost/bind.hpp>
#include <Swiften/Swiften.h>
diff --git a/Limber/Server/ServerFromClientSession.cpp b/Limber/Server/ServerFromClientSession.cpp
index 052ea9b..ab596a1 100644
--- a/Limber/Server/ServerFromClientSession.cpp
+++ b/Limber/Server/ServerFromClientSession.cpp
@@ -1,26 +1,27 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Limber/Server/ServerFromClientSession.h"
+#include <Limber/Server/ServerFromClientSession.h>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/bind.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <Swiften/Elements/AuthFailure.h>
+#include <Swiften/Elements/AuthRequest.h>
+#include <Swiften/Elements/AuthSuccess.h>
+#include <Swiften/Elements/IQ.h>
+#include <Swiften/Elements/ProtocolHeader.h>
+#include <Swiften/Elements/ResourceBind.h>
+#include <Swiften/Elements/StartSession.h>
+#include <Swiften/Elements/StreamFeatures.h>
+#include <Swiften/Network/Connection.h>
+#include <Swiften/SASL/PLAINMessage.h>
+#include <Swiften/StreamStack/XMPPLayer.h>
-#include "Swiften/Elements/ProtocolHeader.h"
-#include "Limber/Server/UserRegistry.h"
-#include "Swiften/Network/Connection.h"
-#include "Swiften/StreamStack/XMPPLayer.h"
-#include "Swiften/Elements/StreamFeatures.h"
-#include "Swiften/Elements/ResourceBind.h"
-#include "Swiften/Elements/StartSession.h"
-#include "Swiften/Elements/IQ.h"
-#include "Swiften/Elements/AuthSuccess.h"
-#include "Swiften/Elements/AuthFailure.h"
-#include "Swiften/Elements/AuthRequest.h"
-#include "Swiften/SASL/PLAINMessage.h"
+#include <Limber/Server/UserRegistry.h>
namespace Swift {
diff --git a/Limber/Server/ServerFromClientSession.h b/Limber/Server/ServerFromClientSession.h
index 8b03569..7d6907c 100644
--- a/Limber/Server/ServerFromClientSession.h
+++ b/Limber/Server/ServerFromClientSession.h
@@ -1,20 +1,21 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
-#include <boost/enable_shared_from_this.hpp>
#include <string>
+#include <boost/enable_shared_from_this.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/ByteArray.h>
#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Session/Session.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Network/Connection.h>
-#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Session/Session.h>
namespace Swift {
class ProtocolHeader;
diff --git a/Limber/Server/ServerSession.cpp b/Limber/Server/ServerSession.cpp
index 5f07619..a18a60f 100644
--- a/Limber/Server/ServerSession.cpp
+++ b/Limber/Server/ServerSession.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Limber/Server/ServerSession.h"
+#include <Limber/Server/ServerSession.h>
namespace Swift {
diff --git a/Limber/Server/ServerStanzaRouter.cpp b/Limber/Server/ServerStanzaRouter.cpp
index 02ddb4d..d0896a0 100644
--- a/Limber/Server/ServerStanzaRouter.cpp
+++ b/Limber/Server/ServerStanzaRouter.cpp
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Limber/Server/ServerStanzaRouter.h"
-#include "Limber/Server/ServerSession.h"
+#include <Limber/Server/ServerStanzaRouter.h>
-#include <cassert>
#include <algorithm>
+#include <cassert>
+
#include <Swiften/Base/Algorithm.h>
+#include <Limber/Server/ServerSession.h>
+
namespace Swift {
namespace {
diff --git a/Limber/Server/ServerStanzaRouter.h b/Limber/Server/ServerStanzaRouter.h
index 5f0ad31..a9cc494 100644
--- a/Limber/Server/ServerStanzaRouter.h
+++ b/Limber/Server/ServerStanzaRouter.h
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
#include <map>
-#include <Swiften/JID/JID.h>
+#include <boost/shared_ptr.hpp>
+
#include <Swiften/Elements/Stanza.h>
+#include <Swiften/JID/JID.h>
namespace Swift {
class ServerSession;
diff --git a/Limber/Server/SimpleUserRegistry.cpp b/Limber/Server/SimpleUserRegistry.cpp
index 2fb2d9e..dd6c112 100644
--- a/Limber/Server/SimpleUserRegistry.cpp
+++ b/Limber/Server/SimpleUserRegistry.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Limber/Server/SimpleUserRegistry.h"
+#include <Limber/Server/SimpleUserRegistry.h>
namespace Swift {
diff --git a/Limber/Server/SimpleUserRegistry.h b/Limber/Server/SimpleUserRegistry.h
index bcf194d..8287a14 100644
--- a/Limber/Server/SimpleUserRegistry.h
+++ b/Limber/Server/SimpleUserRegistry.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,10 +7,11 @@
#pragma once
#include <map>
+#include <string>
#include <Swiften/JID/JID.h>
-#include <string>
-#include "Limber/Server/UserRegistry.h"
+
+#include <Limber/Server/UserRegistry.h>
namespace Swift {
diff --git a/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
index a300b85..2e7293b 100644
--- a/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
+++ b/Limber/Server/UnitTest/ServerStanzaRouterTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,10 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include "Swiften/Elements/Message.h"
-#include "Limber/Server/ServerStanzaRouter.h"
-#include "Limber/Server/ServerSession.h"
+#include <Swiften/Elements/Message.h>
+
+#include <Limber/Server/ServerSession.h>
+#include <Limber/Server/ServerStanzaRouter.h>
using namespace Swift;
diff --git a/Limber/Server/UserRegistry.cpp b/Limber/Server/UserRegistry.cpp
index 51e5129..bd5d189 100644
--- a/Limber/Server/UserRegistry.cpp
+++ b/Limber/Server/UserRegistry.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Limber/Server/UserRegistry.h"
+#include <Limber/Server/UserRegistry.h>
namespace Swift {
diff --git a/Limber/Server/UserRegistry.h b/Limber/Server/UserRegistry.h
index d7da38b..812b218 100644
--- a/Limber/Server/UserRegistry.h
+++ b/Limber/Server/UserRegistry.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <string>
+
#include <Swiften/Base/SafeByteArray.h>
namespace Swift {
diff --git a/Limber/main.cpp b/Limber/main.cpp
index 9c060ad..e4bac77 100644
--- a/Limber/main.cpp
+++ b/Limber/main.cpp
@@ -1,30 +1,32 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <string>
+
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Elements/IQ.h"
-#include "Swiften/Elements/RosterPayload.h"
-#include "Swiften/Elements/VCard.h"
-#include "Swiften/Base/IDGenerator.h"
-#include "Swiften/EventLoop/EventLoop.h"
-#include "Swiften/EventLoop/SimpleEventLoop.h"
-#include "Swiften/EventLoop/EventOwner.h"
-#include "Swiften/Elements/Stanza.h"
-#include "Swiften/Network/ConnectionServer.h"
-#include "Swiften/Network/BoostConnection.h"
-#include "Swiften/Network/BoostIOServiceThread.h"
-#include "Swiften/Network/BoostConnectionServer.h"
-#include "Limber/Server/SimpleUserRegistry.h"
-#include "Limber/Server/ServerFromClientSession.h"
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
-#include "Swiften/Parser/PlatformXMLParserFactory.h"
-#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
+#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Elements/IQ.h>
+#include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/Elements/Stanza.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/EventLoop/EventLoop.h>
+#include <Swiften/EventLoop/EventOwner.h>
+#include <Swiften/EventLoop/SimpleEventLoop.h>
+#include <Swiften/Network/BoostConnection.h>
+#include <Swiften/Network/BoostConnectionServer.h>
+#include <Swiften/Network/BoostIOServiceThread.h>
+#include <Swiften/Network/ConnectionServer.h>
+#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
+
+#include <Limber/Server/ServerFromClientSession.h>
+#include <Limber/Server/SimpleUserRegistry.h>
using namespace Swift;
diff --git a/QA/Checker/checker.cpp b/QA/Checker/checker.cpp
index 2cb00d3..9cae75a 100644
--- a/QA/Checker/checker.cpp
+++ b/QA/Checker/checker.cpp
@@ -1,17 +1,18 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <string>
-#include <cppunit/ui/text/TestRunner.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <cppunit/XmlOutputter.h>
-#include <cppunit/TextTestResult.h>
+
#include <cppunit/BriefTestProgressListener.h>
-#include <cppunit/TextTestProgressListener.h>
#include <cppunit/TextOutputter.h>
+#include <cppunit/TextTestProgressListener.h>
+#include <cppunit/TextTestResult.h>
+#include <cppunit/XmlOutputter.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+#include <cppunit/ui/text/TestRunner.h>
#include <Swiften/Base/Log.h>
diff --git a/Slimber/CLI/DummyMenulet.cpp b/Slimber/CLI/DummyMenulet.cpp
index 25f28e5..78c6ddf 100644
--- a/Slimber/CLI/DummyMenulet.cpp
+++ b/Slimber/CLI/DummyMenulet.cpp
@@ -1,8 +1,7 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/CLI/DummyMenulet.h"
-
+#include <Slimber/CLI/DummyMenulet.h>
diff --git a/Slimber/CLI/DummyMenulet.h b/Slimber/CLI/DummyMenulet.h
index ec1c7ca..22d4b36 100644
--- a/Slimber/CLI/DummyMenulet.h
+++ b/Slimber/CLI/DummyMenulet.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Slimber/Menulet.h"
+#include <Slimber/Menulet.h>
class DummyMenulet : public Menulet {
public:
diff --git a/Slimber/CLI/main.cpp b/Slimber/CLI/main.cpp
index 6f55301..9084a60 100644
--- a/Slimber/CLI/main.cpp
+++ b/Slimber/CLI/main.cpp
@@ -1,12 +1,13 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swiften/EventLoop/SimpleEventLoop.h>
-#include "Slimber/CLI/DummyMenulet.h"
-#include "Slimber/MainController.h"
+
+#include <Slimber/CLI/DummyMenulet.h>
+#include <Slimber/MainController.h>
using namespace Swift;
diff --git a/Slimber/Cocoa/CocoaController.mm b/Slimber/Cocoa/CocoaController.mm
index da1df98..1d2ef5c 100644
--- a/Slimber/Cocoa/CocoaController.mm
+++ b/Slimber/Cocoa/CocoaController.mm
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Slimber/Cocoa/CocoaController.h>
-#include <Slimber/MainController.h>
#include <Slimber/Cocoa/CocoaMenulet.h>
#include <Slimber/Cocoa/main.h>
+#include <Slimber/MainController.h>
@implementation CocoaController {
CocoaMenulet* menulet;
diff --git a/Slimber/Cocoa/CocoaMenulet.h b/Slimber/Cocoa/CocoaMenulet.h
index 887fdf9..c31f15c 100644
--- a/Slimber/Cocoa/CocoaMenulet.h
+++ b/Slimber/Cocoa/CocoaMenulet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <Cocoa/Cocoa.h>
+
#include <Slimber/Menulet.h>
#include <SwifTools/Cocoa/CocoaAction.h>
diff --git a/Slimber/Cocoa/main.mm b/Slimber/Cocoa/main.mm
index 167c1ab..41678f1 100644
--- a/Slimber/Cocoa/main.mm
+++ b/Slimber/Cocoa/main.mm
@@ -1,6 +1,13 @@
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Slimber/Cocoa/main.h>
+
#include <Cocoa/Cocoa.h>
-#include "Slimber/Cocoa/main.h"
#include <Swiften/EventLoop/Cocoa/CocoaEventLoop.h>
Swift::CocoaEventLoop* eventLoop;
diff --git a/Slimber/FileVCardCollection.cpp b/Slimber/FileVCardCollection.cpp
index f3a6aa3..33e20c9 100644
--- a/Slimber/FileVCardCollection.cpp
+++ b/Slimber/FileVCardCollection.cpp
@@ -1,19 +1,19 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/FileVCardCollection.h"
+#include <Slimber/FileVCardCollection.h>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/filesystem/fstream.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
#include <Swiften/Base/ByteArray.h>
#include <Swiften/Elements/VCard.h>
-#include <Swiften/Serializer/PayloadSerializers/VCardSerializer.h>
#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h>
#include <Swiften/Parser/PayloadParsers/VCardParser.h>
+#include <Swiften/Serializer/PayloadSerializers/VCardSerializer.h>
namespace Swift {
diff --git a/Slimber/FileVCardCollection.h b/Slimber/FileVCardCollection.h
index 6d8f5e9..40f3e53 100644
--- a/Slimber/FileVCardCollection.h
+++ b/Slimber/FileVCardCollection.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
#include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
-#include "Slimber/VCardCollection.h"
+#include <Slimber/VCardCollection.h>
namespace Swift {
class FileVCardCollection : public VCardCollection {
diff --git a/Slimber/LinkLocalPresenceManager.cpp b/Slimber/LinkLocalPresenceManager.cpp
index 7e75a05..786f3a8 100644
--- a/Slimber/LinkLocalPresenceManager.cpp
+++ b/Slimber/LinkLocalPresenceManager.cpp
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/LinkLocalPresenceManager.h"
+#include <Slimber/LinkLocalPresenceManager.h>
#include <boost/bind.hpp>
#include <Swiften/Base/foreach.h>
-#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
-#include <Swiften/Elements/RosterPayload.h>
#include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
namespace Swift {
diff --git a/Slimber/LinkLocalPresenceManager.h b/Slimber/LinkLocalPresenceManager.h
index 3738319..1f27e50 100644
--- a/Slimber/LinkLocalPresenceManager.h
+++ b/Slimber/LinkLocalPresenceManager.h
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <string>
+
#include <boost/shared_ptr.hpp>
-#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Base/boost_bsignals.h>
#include <Swiften/Elements/RosterItemPayload.h>
-#include <string>
#include <Swiften/JID/JID.h>
namespace Swift {
diff --git a/Slimber/MainController.cpp b/Slimber/MainController.cpp
index 54ad222..85c8f4b 100644
--- a/Slimber/MainController.cpp
+++ b/Slimber/MainController.cpp
@@ -1,24 +1,27 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/MainController.h"
+#include <Slimber/MainController.h>
+
+#include <iostream>
#include <boost/bind.hpp>
#include <boost/lexical_cast.hpp>
-#include <iostream>
#include <Swiften/Base/foreach.h>
-#include <SwifTools/Application/PlatformApplicationPathProvider.h>
+#include <Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h>
#include <Swiften/LinkLocal/LinkLocalService.h>
#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
-#include <Swiften/LinkLocal/DNSSD/PlatformDNSSDQuerierFactory.h>
-#include "Slimber/Server.h"
-#include "Slimber/FileVCardCollection.h"
-#include "Slimber/MenuletController.h"
-#include "Slimber/Menulet.h"
+
+#include <Slimber/FileVCardCollection.h>
+#include <Slimber/Menulet.h>
+#include <Slimber/MenuletController.h>
+#include <Slimber/Server.h>
+
+#include <SwifTools/Application/PlatformApplicationPathProvider.h>
using namespace Swift;
diff --git a/Slimber/MainController.h b/Slimber/MainController.h
index ecb81ba..5f28c31 100644
--- a/Slimber/MainController.h
+++ b/Slimber/MainController.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
-#include "Slimber/ServerError.h"
+#include <Slimber/ServerError.h>
namespace Swift {
class DNSSDQuerier;
diff --git a/Slimber/Menulet.cpp b/Slimber/Menulet.cpp
index 5ab4273..3e449f8 100644
--- a/Slimber/Menulet.cpp
+++ b/Slimber/Menulet.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/Menulet.h"
+#include <Slimber/Menulet.h>
Menulet::~Menulet() {
}
diff --git a/Slimber/Menulet.h b/Slimber/Menulet.h
index a5c7bde..cd4b4d9 100644
--- a/Slimber/Menulet.h
+++ b/Slimber/Menulet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <string>
+
#include <Swiften/Base/boost_bsignals.h>
class Menulet {
diff --git a/Slimber/MenuletController.cpp b/Slimber/MenuletController.cpp
index 078275b..c09d35f 100644
--- a/Slimber/MenuletController.cpp
+++ b/Slimber/MenuletController.cpp
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/MenuletController.h"
+#include <Slimber/MenuletController.h>
-#include <Swiften/Base/foreach.h>
+#include <iostream>
#include <string>
-#include "Slimber/Menulet.h"
-#include <iostream>
+#include <Swiften/Base/foreach.h>
+
+#include <Slimber/Menulet.h>
MenuletController::MenuletController(Menulet* menulet) :
menulet(menulet), xmppStatus(Offline) {
diff --git a/Slimber/MenuletController.h b/Slimber/MenuletController.h
index 7885ad1..46dc41f 100644
--- a/Slimber/MenuletController.h
+++ b/Slimber/MenuletController.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <string>
#include <vector>
-#include <boost/signal.hpp>
-#include <string>
+#include <boost/signal.hpp>
class Menulet;
diff --git a/Slimber/Qt/QtAboutDialog.cpp b/Slimber/Qt/QtAboutDialog.cpp
index 27fc803..7fcd2ca 100644
--- a/Slimber/Qt/QtAboutDialog.cpp
+++ b/Slimber/Qt/QtAboutDialog.cpp
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/Qt/QtAboutDialog.h"
+#include <Slimber/Qt/QtAboutDialog.h>
#include <QCoreApplication>
-#include <QVBoxLayout>
#include <QLabel>
#include <QPixmap>
+#include <QVBoxLayout>
QtAboutDialog::QtAboutDialog() {
setAttribute(Qt::WA_DeleteOnClose);
diff --git a/Slimber/Qt/QtMenulet.cpp b/Slimber/Qt/QtMenulet.cpp
index ba3d004..5d0d276 100644
--- a/Slimber/Qt/QtMenulet.cpp
+++ b/Slimber/Qt/QtMenulet.cpp
@@ -1,8 +1,7 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/Qt/QtMenulet.h"
-
+#include <Slimber/Qt/QtMenulet.h>
diff --git a/Slimber/Qt/QtMenulet.h b/Slimber/Qt/QtMenulet.h
index d6a7a4d..1aed329 100644
--- a/Slimber/Qt/QtMenulet.h
+++ b/Slimber/Qt/QtMenulet.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,14 +8,14 @@
#include <QCoreApplication>
#include <QMenu>
-#include <QString>
-#include <QSystemTrayIcon>
#include <QObject>
#include <QPixmap>
#include <QPointer>
+#include <QString>
+#include <QSystemTrayIcon>
-#include "Slimber/Menulet.h"
-#include "Slimber/Qt/QtAboutDialog.h"
+#include <Slimber/Menulet.h>
+#include <Slimber/Qt/QtAboutDialog.h>
class QtMenulet : public QObject, public Menulet {
Q_OBJECT
diff --git a/Slimber/Qt/SConscript b/Slimber/Qt/SConscript
index 0e7bdea..9d965cc 100644
--- a/Slimber/Qt/SConscript
+++ b/Slimber/Qt/SConscript
@@ -33,8 +33,6 @@ else :
qt_version = '4'
myenv.EnableQt4Modules(qt4modules, debug = False, version = qt_version)
-myenv.Append(CPPPATH = ["."])
-
if env["PLATFORM"] == "win32" :
myenv.Append(LINKFLAGS = ["/SUBSYSTEM:WINDOWS"])
myenv.Append(LIBS = "qtmain")
diff --git a/Slimber/Qt/main.cpp b/Slimber/Qt/main.cpp
index 5415d05..69a8b6e 100644
--- a/Slimber/Qt/main.cpp
+++ b/Slimber/Qt/main.cpp
@@ -1,18 +1,19 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <QApplication>
#include <QCoreApplication>
-#include <QSystemTrayIcon>
#include <QMessageBox>
+#include <QSystemTrayIcon>
-#include "QtMenulet.h"
-#include "Slimber/MainController.h"
#include <Swiften/EventLoop/Qt/QtEventLoop.h>
+
+#include <Slimber/MainController.h>
#include <Slimber/Qt/BuildVersion.h>
+#include <Slimber/Qt/QtMenulet.h>
int main(int argc, char* argv[]) {
QApplication app(argc, argv);
diff --git a/Slimber/Server.cpp b/Slimber/Server.cpp
index b78e701..79dc22d 100644
--- a/Slimber/Server.cpp
+++ b/Slimber/Server.cpp
@@ -1,39 +1,40 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/Server.h"
+#include <Slimber/Server.h>
+#include <iostream>
#include <string>
+
#include <boost/bind.hpp>
-#include <iostream>
-#include "Swiften/Base/String.h"
-#include "Swiften/LinkLocal/LinkLocalConnector.h"
-#include "Swiften/Network/Connection.h"
-#include "Swiften/Session/SessionTracer.h"
-#include "Swiften/Elements/ToplevelElement.h"
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/Elements/RosterPayload.h"
-#include "Swiften/Network/BoostConnection.h"
-#include "Swiften/Network/BoostConnectionServer.h"
-#include "Swiften/Session/SessionTracer.h"
-#include "Swiften/Elements/IQ.h"
-#include "Swiften/Elements/VCard.h"
-#include "Limber/Server/UserRegistry.h"
-#include "Swiften/Session/Session.h"
+#include <Swiften/Base/String.h>
#include <Swiften/Base/foreach.h>
-#include <string>
-#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
-#include <Swiften/LinkLocal/OutgoingLinkLocalSession.h>
+#include <Swiften/Elements/IQ.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/Elements/ToplevelElement.h>
+#include <Swiften/Elements/VCard.h>
#include <Swiften/LinkLocal/IncomingLinkLocalSession.h>
+#include <Swiften/LinkLocal/LinkLocalConnector.h>
#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
+#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
+#include <Swiften/LinkLocal/OutgoingLinkLocalSession.h>
+#include <Swiften/Network/BoostConnection.h>
+#include <Swiften/Network/BoostConnectionServer.h>
+#include <Swiften/Network/Connection.h>
#include <Swiften/Network/ConnectionServer.h>
-#include "Slimber/VCardCollection.h"
-#include "Slimber/LinkLocalPresenceManager.h"
-#include "Limber/Server/ServerFromClientSession.h"
+#include <Swiften/Session/Session.h>
+#include <Swiften/Session/SessionTracer.h>
+
+#include <Limber/Server/ServerFromClientSession.h>
+#include <Limber/Server/UserRegistry.h>
+
+#include <Slimber/LinkLocalPresenceManager.h>
+#include <Slimber/VCardCollection.h>
namespace Swift {
diff --git a/Slimber/Server.h b/Slimber/Server.h
index ef3b298..a87381c 100644
--- a/Slimber/Server.h
+++ b/Slimber/Server.h
@@ -1,26 +1,29 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
-#include <boost/optional.hpp>
#include <vector>
-#include "Swiften/Network/BoostIOServiceThread.h"
-#include "Swiften/Network/BoostConnectionServer.h"
-#include "Limber/Server/UserRegistry.h"
-#include "Swiften/Base/IDGenerator.h"
-#include "Swiften/Parser/PlatformXMLParserFactory.h"
-#include "Limber/Server/ServerFromClientSession.h"
-#include "Swiften/JID/JID.h"
-#include "Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h"
-#include "Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h"
-#include "Swiften/LinkLocal/LinkLocalServiceInfo.h"
-#include "Slimber/ServerError.h"
+#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
+#include <Swiften/Network/BoostConnectionServer.h>
+#include <Swiften/Network/BoostIOServiceThread.h>
+#include <Swiften/Parser/PayloadParsers/FullPayloadParserFactoryCollection.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
+
+#include <Limber/Server/ServerFromClientSession.h>
+#include <Limber/Server/UserRegistry.h>
+
+#include <Slimber/ServerError.h>
namespace Swift {
class DNSSDServiceID;
diff --git a/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp b/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
index 9a7adf0..2681c1a 100644
--- a/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
+++ b/Slimber/UnitTest/LinkLocalPresenceManagerTest.cpp
@@ -1,24 +1,27 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
+#include <map>
+
+#include <boost/bind.hpp>
+
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/bind.hpp>
-#include <map>
#include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/RosterPayload.h>
#include <Swiften/Elements/RosterItemPayload.h>
-#include "Slimber/LinkLocalPresenceManager.h"
-#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
-#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
-#include <Swiften/LinkLocal/DNSSD/DNSSDServiceID.h>
+#include <Swiften/Elements/RosterPayload.h>
+#include <Swiften/EventLoop/DummyEventLoop.h>
#include <Swiften/LinkLocal/DNSSD/DNSSDResolveServiceQuery.h>
+#include <Swiften/LinkLocal/DNSSD/DNSSDServiceID.h>
#include <Swiften/LinkLocal/DNSSD/Fake/FakeDNSSDQuerier.h>
-#include <Swiften/EventLoop/DummyEventLoop.h>
+#include <Swiften/LinkLocal/LinkLocalServiceBrowser.h>
+#include <Swiften/LinkLocal/LinkLocalServiceInfo.h>
+
+#include <Slimber/LinkLocalPresenceManager.h>
using namespace Swift;
diff --git a/Slimber/UnitTest/MenuletControllerTest.cpp b/Slimber/UnitTest/MenuletControllerTest.cpp
index 39e4c07..c379b8b 100644
--- a/Slimber/UnitTest/MenuletControllerTest.cpp
+++ b/Slimber/UnitTest/MenuletControllerTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include "Slimber/Menulet.h"
-#include "Slimber/MenuletController.h"
+#include <Slimber/Menulet.h>
+#include <Slimber/MenuletController.h>
class MenuletControllerTest : public CppUnit::TestFixture {
CPPUNIT_TEST_SUITE(MenuletControllerTest);
diff --git a/Slimber/VCardCollection.cpp b/Slimber/VCardCollection.cpp
index 15c27b6..b2de6c5 100644
--- a/Slimber/VCardCollection.cpp
+++ b/Slimber/VCardCollection.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Slimber/VCardCollection.h"
+#include <Slimber/VCardCollection.h>
namespace Swift {
diff --git a/Sluift/Console.cpp b/Sluift/Console.cpp
index 113e07b..623a38f 100644
--- a/Sluift/Console.cpp
+++ b/Sluift/Console.cpp
@@ -1,21 +1,25 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/Console.h>
-#include <lua.hpp>
-#include <stdexcept>
+
+#include <cctype>
#include <iostream>
-#include <boost/optional.hpp>
-#include <boost/lexical_cast.hpp>
+#include <stdexcept>
+
#include <boost/algorithm/string/predicate.hpp>
+#include <boost/lexical_cast.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/optional.hpp>
+
+#include <lua.hpp>
+
+#include <Sluift/Lua/LuaUtils.h>
#include <Sluift/Terminal.h>
#include <Sluift/tokenize.h>
-#include <Sluift/Lua/LuaUtils.h>
-#include <cctype>
using namespace Swift;
diff --git a/Sluift/Console.h b/Sluift/Console.h
index 8c93b2d..4f444fe 100644
--- a/Sluift/Console.h
+++ b/Sluift/Console.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,10 +7,13 @@
#pragma once
#include <string>
+
#include <boost/optional/optional_fwd.hpp>
-#include <Sluift/Completer.h>
+
#include <Swiften/Base/Override.h>
+#include <Sluift/Completer.h>
+
struct lua_State;
namespace Swift {
diff --git a/Sluift/EditlineTerminal.cpp b/Sluift/EditlineTerminal.cpp
index 8d1aac8..4d48bd7 100644
--- a/Sluift/EditlineTerminal.cpp
+++ b/Sluift/EditlineTerminal.cpp
@@ -1,20 +1,23 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/EditlineTerminal.h>
-#include <boost/optional.hpp>
-#include <iostream>
-#include <editline/readline.h>
-#include <boost/numeric/conversion/cast.hpp>
#include <cassert>
-#include <vector>
#include <cstring>
+#include <iostream>
+#include <vector>
+
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/optional.hpp>
+
+#include <editline/readline.h>
#include <Swiften/Base/Platform.h>
+
#include <Sluift/Completer.h>
using namespace Swift;
diff --git a/Sluift/EditlineTerminal.h b/Sluift/EditlineTerminal.h
index 3608096..3919c46 100644
--- a/Sluift/EditlineTerminal.h
+++ b/Sluift/EditlineTerminal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <Swiften/Base/Override.h>
+
#include <Sluift/Terminal.h>
namespace Swift {
diff --git a/Sluift/ElementConvertors/BodyConvertor.cpp b/Sluift/ElementConvertors/BodyConvertor.cpp
index 35f1a72..8c1a6cd 100644
--- a/Sluift/ElementConvertors/BodyConvertor.cpp
+++ b/Sluift/ElementConvertors/BodyConvertor.cpp
@@ -1,13 +1,15 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/BodyConvertor.h>
-#include <lua.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/BodyConvertor.h b/Sluift/ElementConvertors/BodyConvertor.h
index c9d922b..6b7b3c7 100644
--- a/Sluift/ElementConvertors/BodyConvertor.h
+++ b/Sluift/ElementConvertors/BodyConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Body.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Body.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/CommandConvertor.cpp b/Sluift/ElementConvertors/CommandConvertor.cpp
index c9fc952..d3a8739 100644
--- a/Sluift/ElementConvertors/CommandConvertor.cpp
+++ b/Sluift/ElementConvertors/CommandConvertor.cpp
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/CommandConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
#include <Swiften/Base/foreach.h>
+
#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/Value.h>
#include <Sluift/LuaElementConvertors.h>
diff --git a/Sluift/ElementConvertors/CommandConvertor.h b/Sluift/ElementConvertors/CommandConvertor.h
index 868fe5e..e129fd9 100644
--- a/Sluift/ElementConvertors/CommandConvertor.h
+++ b/Sluift/ElementConvertors/CommandConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Command.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Command.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.cpp b/Sluift/ElementConvertors/DOMElementConvertor.cpp
index 6ed214d..347bbfd 100644
--- a/Sluift/ElementConvertors/DOMElementConvertor.cpp
+++ b/Sluift/ElementConvertors/DOMElementConvertor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,22 +7,25 @@
#include <Sluift/ElementConvertors/DOMElementConvertor.h>
#include <iostream>
+
#include <boost/smart_ptr/make_shared.hpp>
+
#include <lua.hpp>
#include <Swiften/Base/foreach.h>
#include <Swiften/Elements/RawXMLPayload.h>
-#include <Swiften/Serializer/PayloadSerializer.h>
-#include <Sluift/Lua/Check.h>
-#include <Sluift/Lua/LuaUtils.h>
-#include <Swiften/Parser/XMLParserClient.h>
-#include <Swiften/Parser/XMLParser.h>
-#include <Swiften/Parser/AttributeMap.h>
#include <Swiften/Parser/Attribute.h>
+#include <Swiften/Parser/AttributeMap.h>
+#include <Swiften/Parser/XMLParser.h>
+#include <Swiften/Parser/XMLParserClient.h>
+#include <Swiften/Serializer/PayloadSerializer.h>
#include <Swiften/Serializer/XML/XMLElement.h>
-#include <Swiften/Serializer/XML/XMLTextNode.h>
#include <Swiften/Serializer/XML/XMLRawTextNode.h>
+#include <Swiften/Serializer/XML/XMLTextNode.h>
+
+#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/Debug.h>
+#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/DOMElementConvertor.h b/Sluift/ElementConvertors/DOMElementConvertor.h
index 610dbff..550bc3b 100644
--- a/Sluift/ElementConvertors/DOMElementConvertor.h
+++ b/Sluift/ElementConvertors/DOMElementConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,10 +7,10 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Parser/PlatformXMLParserFactory.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
#include <Sluift/LuaElementConvertor.h>
-#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
-#include <Swiften/Parser/PlatformXMLParserFactory.h>
namespace Swift {
class DOMElementConvertor : public LuaElementConvertor {
diff --git a/Sluift/ElementConvertors/DefaultElementConvertor.cpp b/Sluift/ElementConvertors/DefaultElementConvertor.cpp
index c95da93..a1e27fa 100644
--- a/Sluift/ElementConvertors/DefaultElementConvertor.cpp
+++ b/Sluift/ElementConvertors/DefaultElementConvertor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,8 @@
#include <Sluift/ElementConvertors/DefaultElementConvertor.h>
#include <iostream>
-#include <typeinfo>
#include <string>
+#include <typeinfo>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/DelayConvertor.cpp b/Sluift/ElementConvertors/DelayConvertor.cpp
index a17e114..a2ea132 100644
--- a/Sluift/ElementConvertors/DelayConvertor.cpp
+++ b/Sluift/ElementConvertors/DelayConvertor.cpp
@@ -1,17 +1,20 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/DelayConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
-#include <Sluift/Lua/Check.h>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Swiften/Base/DateTime.h>
+#include <Sluift/Lua/Check.h>
+
using namespace Swift;
DelayConvertor::DelayConvertor() : GenericLuaElementConvertor<Delay>("delay") {
diff --git a/Sluift/ElementConvertors/DelayConvertor.h b/Sluift/ElementConvertors/DelayConvertor.h
index 6cee7de..fed032f 100644
--- a/Sluift/ElementConvertors/DelayConvertor.h
+++ b/Sluift/ElementConvertors/DelayConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Delay.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Delay.h>
namespace Swift {
class DelayConvertor : public GenericLuaElementConvertor<Delay> {
diff --git a/Sluift/ElementConvertors/DiscoInfoConvertor.cpp b/Sluift/ElementConvertors/DiscoInfoConvertor.cpp
index d9a408e..4ebd6a3 100644
--- a/Sluift/ElementConvertors/DiscoInfoConvertor.cpp
+++ b/Sluift/ElementConvertors/DiscoInfoConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/DiscoInfoConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/DiscoInfoConvertor.h b/Sluift/ElementConvertors/DiscoInfoConvertor.h
index 7c5009f..4f397b0 100644
--- a/Sluift/ElementConvertors/DiscoInfoConvertor.h
+++ b/Sluift/ElementConvertors/DiscoInfoConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/DiscoInfo.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/DiscoInfo.h>
namespace Swift {
class DiscoInfoConvertor : public GenericLuaElementConvertor<DiscoInfo> {
diff --git a/Sluift/ElementConvertors/DiscoItemsConvertor.cpp b/Sluift/ElementConvertors/DiscoItemsConvertor.cpp
index 6ec944a..a01fa7e 100644
--- a/Sluift/ElementConvertors/DiscoItemsConvertor.cpp
+++ b/Sluift/ElementConvertors/DiscoItemsConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/DiscoItemsConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/DiscoItemsConvertor.h b/Sluift/ElementConvertors/DiscoItemsConvertor.h
index 5e3a86c..a1261a4 100644
--- a/Sluift/ElementConvertors/DiscoItemsConvertor.h
+++ b/Sluift/ElementConvertors/DiscoItemsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/DiscoItems.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/DiscoItems.h>
namespace Swift {
class DiscoItemsConvertor : public GenericLuaElementConvertor<DiscoItems> {
diff --git a/Sluift/ElementConvertors/FormConvertor.cpp b/Sluift/ElementConvertors/FormConvertor.cpp
index be1015c..d1617b6 100644
--- a/Sluift/ElementConvertors/FormConvertor.cpp
+++ b/Sluift/ElementConvertors/FormConvertor.cpp
@@ -1,19 +1,23 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/FormConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
+#include <sstream>
+
+#include <boost/assign/list_of.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
+#include <Swiften/Base/foreach.h>
+
#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/Value.h>
-#include <Swiften/Base/foreach.h>
-#include <boost/assign/list_of.hpp>
-#include <sstream>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/FormConvertor.h b/Sluift/ElementConvertors/FormConvertor.h
index 3c1542f..af9020d 100644
--- a/Sluift/ElementConvertors/FormConvertor.h
+++ b/Sluift/ElementConvertors/FormConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Form.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Form.h>
namespace Swift {
class FormConvertor : public GenericLuaElementConvertor<Form> {
diff --git a/Sluift/ElementConvertors/ForwardedConvertor.h b/Sluift/ElementConvertors/ForwardedConvertor.h
index a7d2586..6c4848a 100644
--- a/Sluift/ElementConvertors/ForwardedConvertor.h
+++ b/Sluift/ElementConvertors/ForwardedConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/GenericLuaElementConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/Forwarded.h>
+#include <Sluift/GenericLuaElementConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/IQConvertor.h b/Sluift/ElementConvertors/IQConvertor.h
index b5351b7..68bda38 100644
--- a/Sluift/ElementConvertors/IQConvertor.h
+++ b/Sluift/ElementConvertors/IQConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/ElementConvertors/StanzaConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/IQ.h>
+#include <Sluift/ElementConvertors/StanzaConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
index 5af4944..bcbeb40 100644
--- a/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
+++ b/Sluift/ElementConvertors/IsodeIQDelegationConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/IsodeIQDelegation.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/IsodeIQDelegation.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/MAMFinConvertor.h b/Sluift/ElementConvertors/MAMFinConvertor.h
index 4021c00..1727403 100644
--- a/Sluift/ElementConvertors/MAMFinConvertor.h
+++ b/Sluift/ElementConvertors/MAMFinConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/GenericLuaElementConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/MAMFin.h>
+#include <Sluift/GenericLuaElementConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/MAMQueryConvertor.h b/Sluift/ElementConvertors/MAMQueryConvertor.h
index 5169607..e839a24 100644
--- a/Sluift/ElementConvertors/MAMQueryConvertor.h
+++ b/Sluift/ElementConvertors/MAMQueryConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/GenericLuaElementConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/MAMQuery.h>
+#include <Sluift/GenericLuaElementConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/MAMResultConvertor.h b/Sluift/ElementConvertors/MAMResultConvertor.h
index 65d430a..49b14e2 100644
--- a/Sluift/ElementConvertors/MAMResultConvertor.h
+++ b/Sluift/ElementConvertors/MAMResultConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/GenericLuaElementConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/MAMResult.h>
+#include <Sluift/GenericLuaElementConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/MessageConvertor.h b/Sluift/ElementConvertors/MessageConvertor.h
index f0da885..92efea3 100644
--- a/Sluift/ElementConvertors/MessageConvertor.h
+++ b/Sluift/ElementConvertors/MessageConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/ElementConvertors/StanzaConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/Message.h>
+#include <Sluift/ElementConvertors/StanzaConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PresenceConvertor.h b/Sluift/ElementConvertors/PresenceConvertor.h
index fc4326e..c919f3a 100644
--- a/Sluift/ElementConvertors/PresenceConvertor.h
+++ b/Sluift/ElementConvertors/PresenceConvertor.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Sluift/ElementConvertors/StanzaConvertor.h>
#include <Swiften/Base/Override.h>
#include <Swiften/Elements/Presence.h>
+#include <Sluift/ElementConvertors/StanzaConvertor.h>
+
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
index f398436..b98ff4c 100644
--- a/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubAffiliationsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubAffiliations.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubAffiliations.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubConfigureConvertor.h b/Sluift/ElementConvertors/PubSubConfigureConvertor.h
index 4fc57b2..27aa906 100644
--- a/Sluift/ElementConvertors/PubSubConfigureConvertor.h
+++ b/Sluift/ElementConvertors/PubSubConfigureConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubConfigure.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubConfigure.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubCreateConvertor.h b/Sluift/ElementConvertors/PubSubCreateConvertor.h
index a4bf149..bcf06af 100644
--- a/Sluift/ElementConvertors/PubSubCreateConvertor.h
+++ b/Sluift/ElementConvertors/PubSubCreateConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubCreate.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubCreate.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
index 4226619..38ffd64 100644
--- a/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventCollectionConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEventCollection.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEventCollection.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
index ce76da4..7e8ea02 100644
--- a/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventConfigurationConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEventConfiguration.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEventConfiguration.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventConvertor.h b/Sluift/ElementConvertors/PubSubEventConvertor.h
index 3bb4594..ab19c8f 100644
--- a/Sluift/ElementConvertors/PubSubEventConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEvent.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEvent.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
index e229781..c8ff8cd 100644
--- a/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventDeleteConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEventDelete.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEventDelete.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventItemConvertor.h b/Sluift/ElementConvertors/PubSubEventItemConvertor.h
index c7dac83..7dfeef6 100644
--- a/Sluift/ElementConvertors/PubSubEventItemConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventItemConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEventItem.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEventItem.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h b/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
index c409a3c..347200e 100644
--- a/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubEventItemsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubEventItems.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubEventItems.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubItemConvertor.h b/Sluift/ElementConvertors/PubSubItemConvertor.h
index 334c15c..7f4adbf 100644
--- a/Sluift/ElementConvertors/PubSubItemConvertor.h
+++ b/Sluift/ElementConvertors/PubSubItemConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubItem.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubItem.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubItemsConvertor.h b/Sluift/ElementConvertors/PubSubItemsConvertor.h
index 801c2d8..04943ac 100644
--- a/Sluift/ElementConvertors/PubSubItemsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubItemsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubItems.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubItems.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOptionsConvertor.h b/Sluift/ElementConvertors/PubSubOptionsConvertor.h
index 8aacdbd..a0ec68e 100644
--- a/Sluift/ElementConvertors/PubSubOptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOptionsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOptions.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOptions.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
index 63ed4a7..f64426a 100644
--- a/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerAffiliationsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOwnerAffiliations.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOwnerAffiliations.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
index d02336d..7555922 100644
--- a/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerConfigureConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOwnerConfigure.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOwnerConfigure.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
index 932c3ae..d51223a 100644
--- a/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerDefaultConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOwnerDefault.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOwnerDefault.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
index a48dcf9..4673b92 100644
--- a/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerDeleteConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOwnerDelete.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOwnerDelete.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
index dbdff67..b1793e3 100644
--- a/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubOwnerSubscriptionsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubOwnerSubscriptions.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubOwnerSubscriptions.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubPublishConvertor.h b/Sluift/ElementConvertors/PubSubPublishConvertor.h
index 6deda0e..d886368 100644
--- a/Sluift/ElementConvertors/PubSubPublishConvertor.h
+++ b/Sluift/ElementConvertors/PubSubPublishConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubPublish.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubPublish.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubRetractConvertor.h b/Sluift/ElementConvertors/PubSubRetractConvertor.h
index 46aa71b..6b27ac7 100644
--- a/Sluift/ElementConvertors/PubSubRetractConvertor.h
+++ b/Sluift/ElementConvertors/PubSubRetractConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubRetract.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubRetract.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h b/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
index 5a7aefe..a7eac09 100644
--- a/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscribeConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubSubscribe.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubSubscribe.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
index 6d09ddf..7c1b213 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscriptionConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubSubscription.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubSubscription.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
index 70fc159..de5e9f4 100644
--- a/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
+++ b/Sluift/ElementConvertors/PubSubSubscriptionsConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/PubSubSubscriptions.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/PubSubSubscriptions.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
index e859079..1b26e74 100644
--- a/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
+++ b/Sluift/ElementConvertors/RawXMLElementConvertor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,11 +7,14 @@
#include <Sluift/ElementConvertors/RawXMLElementConvertor.h>
#include <iostream>
+
#include <boost/smart_ptr/make_shared.hpp>
+
#include <lua.hpp>
#include <Swiften/Elements/RawXMLPayload.h>
#include <Swiften/Serializer/PayloadSerializer.h>
+
#include <Sluift/Lua/Check.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/RawXMLElementConvertor.h b/Sluift/ElementConvertors/RawXMLElementConvertor.h
index 98be763..0a3b463 100644
--- a/Sluift/ElementConvertors/RawXMLElementConvertor.h
+++ b/Sluift/ElementConvertors/RawXMLElementConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
#include <Sluift/LuaElementConvertor.h>
-#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
namespace Swift {
class RawXMLElementConvertor : public LuaElementConvertor {
diff --git a/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp b/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp
index d621593..9ac1679 100644
--- a/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp
+++ b/Sluift/ElementConvertors/SoftwareVersionConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/SoftwareVersionConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/Check.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/SoftwareVersionConvertor.h b/Sluift/ElementConvertors/SoftwareVersionConvertor.h
index aded40a..77b2ad6 100644
--- a/Sluift/ElementConvertors/SoftwareVersionConvertor.h
+++ b/Sluift/ElementConvertors/SoftwareVersionConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/SoftwareVersion.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/SoftwareVersion.h>
namespace Swift {
class SoftwareVersionConvertor : public GenericLuaElementConvertor<SoftwareVersion> {
diff --git a/Sluift/ElementConvertors/StanzaConvertor.h b/Sluift/ElementConvertors/StanzaConvertor.h
index b3e75cf..420232a 100644
--- a/Sluift/ElementConvertors/StanzaConvertor.h
+++ b/Sluift/ElementConvertors/StanzaConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,14 +8,15 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <Sluift/GenericLuaElementConvertor.h>
-#include <Sluift/LuaElementConvertors.h>
-#include <Sluift/Lua/Exception.h>
#include <Swiften/Base/foreach.h>
-#include <Swiften/Elements/Payload.h>
#include <Swiften/Elements/IQ.h>
-#include <Swiften/Elements/Presence.h>
#include <Swiften/Elements/Message.h>
+#include <Swiften/Elements/Payload.h>
+#include <Swiften/Elements/Presence.h>
+
+#include <Sluift/GenericLuaElementConvertor.h>
+#include <Sluift/Lua/Exception.h>
+#include <Sluift/LuaElementConvertors.h>
namespace Swift {
template <typename T> class StanzaConvertor : public GenericLuaElementConvertor<T> {
diff --git a/Sluift/ElementConvertors/StatusConvertor.cpp b/Sluift/ElementConvertors/StatusConvertor.cpp
index 9dc3585..575a4ea 100644
--- a/Sluift/ElementConvertors/StatusConvertor.cpp
+++ b/Sluift/ElementConvertors/StatusConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/StatusConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/Check.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/StatusConvertor.h b/Sluift/ElementConvertors/StatusConvertor.h
index 2e39f27..33fe861 100644
--- a/Sluift/ElementConvertors/StatusConvertor.h
+++ b/Sluift/ElementConvertors/StatusConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Status.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Status.h>
namespace Swift {
class StatusConvertor : public GenericLuaElementConvertor<Status> {
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.cpp b/Sluift/ElementConvertors/StatusShowConvertor.cpp
index 43098ef..faae289 100644
--- a/Sluift/ElementConvertors/StatusShowConvertor.cpp
+++ b/Sluift/ElementConvertors/StatusShowConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/StatusShowConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/Exception.h>
diff --git a/Sluift/ElementConvertors/StatusShowConvertor.h b/Sluift/ElementConvertors/StatusShowConvertor.h
index 6447c4e..d71493d 100644
--- a/Sluift/ElementConvertors/StatusShowConvertor.h
+++ b/Sluift/ElementConvertors/StatusShowConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/StatusShow.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/StatusShow.h>
namespace Swift {
class StatusShowConvertor : public GenericLuaElementConvertor<StatusShow> {
diff --git a/Sluift/ElementConvertors/SubjectConvertor.cpp b/Sluift/ElementConvertors/SubjectConvertor.cpp
index 893073f..8f15515 100644
--- a/Sluift/ElementConvertors/SubjectConvertor.cpp
+++ b/Sluift/ElementConvertors/SubjectConvertor.cpp
@@ -1,13 +1,15 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/SubjectConvertor.h>
-#include <lua.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/SubjectConvertor.h b/Sluift/ElementConvertors/SubjectConvertor.h
index d517b1e..5969293 100644
--- a/Sluift/ElementConvertors/SubjectConvertor.h
+++ b/Sluift/ElementConvertors/SubjectConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/Subject.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/Subject.h>
namespace Swift {
class LuaElementConvertors;
diff --git a/Sluift/ElementConvertors/VCardConvertor.cpp b/Sluift/ElementConvertors/VCardConvertor.cpp
index 451e0ab..f704083 100644
--- a/Sluift/ElementConvertors/VCardConvertor.cpp
+++ b/Sluift/ElementConvertors/VCardConvertor.cpp
@@ -1,18 +1,21 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/VCardConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
-#include <Sluift/Lua/LuaUtils.h>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Swiften/Base/ByteArray.h>
#include <Swiften/Base/DateTime.h>
+#include <Sluift/Lua/LuaUtils.h>
+
using namespace Swift;
VCardConvertor::VCardConvertor() : GenericLuaElementConvertor<VCard>("vcard") {
diff --git a/Sluift/ElementConvertors/VCardConvertor.h b/Sluift/ElementConvertors/VCardConvertor.h
index 135eff0..39e9dda 100644
--- a/Sluift/ElementConvertors/VCardConvertor.h
+++ b/Sluift/ElementConvertors/VCardConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/VCard.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/VCard.h>
namespace Swift {
class VCardConvertor : public GenericLuaElementConvertor<VCard> {
diff --git a/Sluift/ElementConvertors/VCardUpdateConvertor.cpp b/Sluift/ElementConvertors/VCardUpdateConvertor.cpp
index 579f064..b13443d 100644
--- a/Sluift/ElementConvertors/VCardUpdateConvertor.cpp
+++ b/Sluift/ElementConvertors/VCardUpdateConvertor.cpp
@@ -1,14 +1,16 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/ElementConvertors/VCardUpdateConvertor.h>
-#include <lua.hpp>
-#include <boost/smart_ptr/make_shared.hpp>
#include <boost/numeric/conversion/cast.hpp>
+#include <boost/smart_ptr/make_shared.hpp>
+
+#include <lua.hpp>
+
#include <Sluift/Lua/LuaUtils.h>
using namespace Swift;
diff --git a/Sluift/ElementConvertors/VCardUpdateConvertor.h b/Sluift/ElementConvertors/VCardUpdateConvertor.h
index b6ffac7..48c1be8 100644
--- a/Sluift/ElementConvertors/VCardUpdateConvertor.h
+++ b/Sluift/ElementConvertors/VCardUpdateConvertor.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,9 +7,9 @@
#pragma once
#include <Swiften/Base/Override.h>
+#include <Swiften/Elements/VCardUpdate.h>
#include <Sluift/GenericLuaElementConvertor.h>
-#include <Swiften/Elements/VCardUpdate.h>
namespace Swift {
class VCardUpdateConvertor : public GenericLuaElementConvertor<VCardUpdate> {
diff --git a/Sluift/GenericLuaElementConvertor.h b/Sluift/GenericLuaElementConvertor.h
index 430e2b5..8574f14 100644
--- a/Sluift/GenericLuaElementConvertor.h
+++ b/Sluift/GenericLuaElementConvertor.h
@@ -1,18 +1,20 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <lua.hpp>
#include <string>
+#include <lua.hpp>
+
#include <Swiften/Base/Override.h>
-#include <Sluift/LuaElementConvertor.h>
+
#include <Sluift/Lua/Check.h>
#include <Sluift/Lua/LuaUtils.h>
+#include <Sluift/LuaElementConvertor.h>
namespace Swift {
template<typename T>
diff --git a/Sluift/Helpers.h b/Sluift/Helpers.h
index 290508a..ebf50f1 100644
--- a/Sluift/Helpers.h
+++ b/Sluift/Helpers.h
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/Override.h>
-#include <Swiften/Base/API.h>
-
#include <string>
+#include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+
namespace Swift {
class ClientError;
class ComponentError;
diff --git a/Sluift/ITunesInterface.h b/Sluift/ITunesInterface.h
index e854da4..8862966 100644
--- a/Sluift/ITunesInterface.h
+++ b/Sluift/ITunesInterface.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/API.h>
-
-#include <boost/shared_ptr.hpp>
#include <boost/optional/optional_fwd.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/API.h>
namespace Swift {
class SWIFTEN_API ITunesInterface {
diff --git a/Sluift/Lua/Check.cpp b/Sluift/Lua/Check.cpp
index 9a4951e..4eebf4f 100644
--- a/Sluift/Lua/Check.cpp
+++ b/Sluift/Lua/Check.cpp
@@ -1,19 +1,22 @@
/*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/Lua/Check.h>
-#include <boost/numeric/conversion/cast.hpp>
#include <iostream>
#include <sstream>
+
+#include <boost/numeric/conversion/cast.hpp>
+
#include <lua.hpp>
-#include <Sluift/Lua/Exception.h>
#include <Swiften/Base/ByteArray.h>
+#include <Sluift/Lua/Exception.h>
+
using namespace Swift;
diff --git a/Sluift/Lua/Debug.h b/Sluift/Lua/Debug.h
index 368672d..32addd6 100644
--- a/Sluift/Lua/Debug.h
+++ b/Sluift/Lua/Debug.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <lua.hpp>
#include <iostream>
+#include <lua.hpp>
+
namespace Swift {
namespace Lua {
inline void dumpStack(lua_State *L) {
diff --git a/Sluift/Lua/Exception.h b/Sluift/Lua/Exception.h
index a681b9c..0d327e0 100644
--- a/Sluift/Lua/Exception.h
+++ b/Sluift/Lua/Exception.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <stdexcept>
+
#include <Swiften/Base/API.h>
namespace Swift {
diff --git a/Sluift/Lua/FunctionRegistration.h b/Sluift/Lua/FunctionRegistration.h
index cc43d35..3f0afbb 100644
--- a/Sluift/Lua/FunctionRegistration.h
+++ b/Sluift/Lua/FunctionRegistration.h
@@ -1,16 +1,19 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/Override.h>
+#include <string>
+
+#include <lua.hpp>
+
#include <Swiften/Base/API.h>
+#include <Swiften/Base/Override.h>
+
#include <Sluift/Lua/FunctionRegistry.h>
-#include <lua.hpp>
-#include <string>
namespace Swift {
namespace Lua {
diff --git a/Sluift/Lua/FunctionRegistry.cpp b/Sluift/Lua/FunctionRegistry.cpp
index 99a1722..e1fac09 100644
--- a/Sluift/Lua/FunctionRegistry.cpp
+++ b/Sluift/Lua/FunctionRegistry.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,9 @@
#include <Sluift/Lua/FunctionRegistry.h>
#include <Swiften/Base/foreach.h>
-#include <Sluift/Lua/LuaUtils.h>
+
#include <Sluift/Lua/Exception.h>
+#include <Sluift/Lua/LuaUtils.h>
#include <Sluift/globals.h>
using namespace Swift::Lua;
diff --git a/Sluift/Lua/FunctionRegistry.h b/Sluift/Lua/FunctionRegistry.h
index 800cf05..b6260e0 100644
--- a/Sluift/Lua/FunctionRegistry.h
+++ b/Sluift/Lua/FunctionRegistry.h
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/Override.h>
-#include <lua.hpp>
#include <string>
#include <vector>
+#include <lua.hpp>
+
+#include <Swiften/Base/Override.h>
+
namespace Swift {
namespace Lua {
class FunctionRegistry {
diff --git a/Sluift/Lua/LuaUtils.cpp b/Sluift/Lua/LuaUtils.cpp
index 78951d8..df1afce 100644
--- a/Sluift/Lua/LuaUtils.cpp
+++ b/Sluift/Lua/LuaUtils.cpp
@@ -1,20 +1,22 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/Lua/LuaUtils.h>
-#include <lua.hpp>
-
-#include <boost/scope_exit.hpp>
-#include <Sluift/Lua/Exception.h>
-#include <iostream>
#include <cassert>
+#include <iostream>
#include <sstream>
-#include <boost/numeric/conversion/cast.hpp>
+
#include <boost/algorithm/string/trim.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/scope_exit.hpp>
+
+#include <lua.hpp>
+
+#include <Sluift/Lua/Exception.h>
#include <Sluift/globals.h>
using namespace Swift::Lua;
diff --git a/Sluift/Lua/Value.cpp b/Sluift/Lua/Value.cpp
index 4ce3de8..b5c459a 100644
--- a/Sluift/Lua/Value.cpp
+++ b/Sluift/Lua/Value.cpp
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Value.h"
+#include <Sluift/Lua/Value.h>
+
+#include <boost/numeric/conversion/cast.hpp>
+#include <boost/variant/apply_visitor.hpp>
extern "C" {
#include <lualib.h>
}
-#include <boost/variant/apply_visitor.hpp>
-#include <boost/numeric/conversion/cast.hpp>
+
#include <Swiften/Base/foreach.h>
using namespace Swift;
diff --git a/Sluift/Lua/Value.h b/Sluift/Lua/Value.h
index 9dd870f..537d764 100644
--- a/Sluift/Lua/Value.h
+++ b/Sluift/Lua/Value.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -9,9 +9,10 @@
#include <map>
#include <string>
#include <vector>
-#include <boost/variant.hpp>
+
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+#include <boost/variant.hpp>
struct lua_State;
diff --git a/Sluift/LuaElementConvertor.h b/Sluift/LuaElementConvertor.h
index b463980..9587628 100644
--- a/Sluift/LuaElementConvertor.h
+++ b/Sluift/LuaElementConvertor.h
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/Override.h>
-
#include <string>
-#include <boost/shared_ptr.hpp>
+
#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
struct lua_State;
diff --git a/Sluift/LuaElementConvertors.h b/Sluift/LuaElementConvertors.h
index 49acdf7..1e9dc97 100644
--- a/Sluift/LuaElementConvertors.h
+++ b/Sluift/LuaElementConvertors.h
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/Override.h>
-
#include <vector>
-#include <boost/shared_ptr.hpp>
+
#include <boost/optional.hpp>
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Base/Override.h>
struct lua_State;
diff --git a/Sluift/Response.cpp b/Sluift/Response.cpp
index a785f01..ff643f2 100644
--- a/Sluift/Response.cpp
+++ b/Sluift/Response.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,9 +8,10 @@
#include <lua.hpp>
-#include <Sluift/globals.h>
#include <Swiften/Elements/ErrorPayload.h>
+
#include <Sluift/Lua/LuaUtils.h>
+#include <Sluift/globals.h>
using namespace Swift;
using namespace Swift::Sluift;
diff --git a/Sluift/Response.h b/Sluift/Response.h
index 591e54d..9830dcc 100644
--- a/Sluift/Response.h
+++ b/Sluift/Response.h
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Elements/Payload.h>
-#include <Swiften/Elements/ErrorPayload.h>
#include <Swiften/Base/API.h>
+#include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/Payload.h>
struct lua_State;
diff --git a/Sluift/SluiftClient.cpp b/Sluift/SluiftClient.cpp
index d2b1beb..1de317c 100644
--- a/Sluift/SluiftClient.cpp
+++ b/Sluift/SluiftClient.cpp
@@ -8,16 +8,17 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <Swiften/Client/ClientXMLTracer.h>
#include <Swiften/Client/Client.h>
-#include <Swiften/Roster/XMPPRoster.h>
-#include <Sluift/SluiftGlobals.h>
-#include <Sluift/Lua/Exception.h>
+#include <Swiften/Client/ClientXMLTracer.h>
#include <Swiften/Elements/Message.h>
+#include <Swiften/Elements/Presence.h>
#include <Swiften/Elements/PubSubEvent.h>
#include <Swiften/Queries/RawRequest.h>
+#include <Swiften/Roster/XMPPRoster.h>
+
#include <Sluift/Helpers.h>
-#include <Swiften/Elements/Presence.h>
+#include <Sluift/Lua/Exception.h>
+#include <Sluift/SluiftGlobals.h>
using namespace Swift;
diff --git a/Sluift/SluiftClient.h b/Sluift/SluiftClient.h
index 68c4b61..07073ce 100644
--- a/Sluift/SluiftClient.h
+++ b/Sluift/SluiftClient.h
@@ -7,23 +7,25 @@
#pragma once
#include <deque>
-#include <boost/optional.hpp>
+
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#include <boost/optional.hpp>
+#include <Swiften/Client/Client.h>
+#include <Swiften/Client/ClientError.h>
#include <Swiften/Client/ClientOptions.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/Presence.h>
-#include <Swiften/Queries/GenericRequest.h>
-#include <Swiften/Roster/XMPPRosterItem.h>
-#include <Swiften/Client/ClientError.h>
-#include <Swiften/Network/NetworkFactories.h>
-#include <Swiften/Client/Client.h>
#include <Swiften/EventLoop/SimpleEventLoop.h>
-#include <Sluift/Watchdog.h>
+#include <Swiften/Network/NetworkFactories.h>
#include <Swiften/PubSub/PubSubManager.h>
+#include <Swiften/Queries/GenericRequest.h>
+#include <Swiften/Roster/XMPPRosterItem.h>
+
#include <Sluift/Response.h>
+#include <Sluift/Watchdog.h>
namespace Swift {
struct SluiftGlobals;
diff --git a/Sluift/SluiftComponent.cpp b/Sluift/SluiftComponent.cpp
index af3c33b..9d0a92e 100644
--- a/Sluift/SluiftComponent.cpp
+++ b/Sluift/SluiftComponent.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,15 +8,16 @@
#include <boost/numeric/conversion/cast.hpp>
-#include <Swiften/Component/ComponentXMLTracer.h>
#include <Swiften/Component/Component.h>
-#include <Swiften/Roster/XMPPRoster.h>
-#include <Sluift/SluiftGlobals.h>
-#include <Sluift/Lua/Exception.h>
+#include <Swiften/Component/ComponentXMLTracer.h>
#include <Swiften/Elements/Message.h>
+#include <Swiften/Elements/Presence.h>
#include <Swiften/Queries/RawRequest.h>
+#include <Swiften/Roster/XMPPRoster.h>
+
#include <Sluift/Helpers.h>
-#include <Swiften/Elements/Presence.h>
+#include <Sluift/Lua/Exception.h>
+#include <Sluift/SluiftGlobals.h>
using namespace Swift;
diff --git a/Sluift/SluiftComponent.h b/Sluift/SluiftComponent.h
index 4e5e763..7a8254c 100644
--- a/Sluift/SluiftComponent.h
+++ b/Sluift/SluiftComponent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,22 +7,24 @@
#pragma once
#include <deque>
-#include <boost/optional.hpp>
+
#include <boost/bind.hpp>
#include <boost/function.hpp>
+#include <boost/optional.hpp>
#include <Swiften/Client/ClientOptions.h>
+#include <Swiften/Component/Component.h>
+#include <Swiften/Component/ComponentError.h>
#include <Swiften/Elements/IQ.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/Presence.h>
+#include <Swiften/EventLoop/SimpleEventLoop.h>
+#include <Swiften/Network/NetworkFactories.h>
#include <Swiften/Queries/GenericRequest.h>
#include <Swiften/Roster/XMPPRosterItem.h>
-#include <Swiften/Component/ComponentError.h>
-#include <Swiften/Network/NetworkFactories.h>
-#include <Swiften/Component/Component.h>
-#include <Swiften/EventLoop/SimpleEventLoop.h>
-#include <Sluift/Watchdog.h>
+
#include <Sluift/Response.h>
+#include <Sluift/Watchdog.h>
namespace Swift {
struct SluiftGlobals;
diff --git a/Sluift/StandardTerminal.cpp b/Sluift/StandardTerminal.cpp
index 6e4767d..8dad2b0 100644
--- a/Sluift/StandardTerminal.cpp
+++ b/Sluift/StandardTerminal.cpp
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/StandardTerminal.h>
-#include <boost/optional.hpp>
#include <iostream>
#include <stdexcept>
+#include <boost/optional.hpp>
+
using namespace Swift;
StandardTerminal::StandardTerminal() {
diff --git a/Sluift/StandardTerminal.h b/Sluift/StandardTerminal.h
index 6c0eed8..ca71672 100644
--- a/Sluift/StandardTerminal.h
+++ b/Sluift/StandardTerminal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <Swiften/Base/Override.h>
+
#include <Sluift/Terminal.h>
namespace Swift {
diff --git a/Sluift/Terminal.h b/Sluift/Terminal.h
index 60bb060..72ca3d8 100644
--- a/Sluift/Terminal.h
+++ b/Sluift/Terminal.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <string>
+
#include <boost/optional/optional_fwd.hpp>
namespace Swift {
diff --git a/Sluift/client.cpp b/Sluift/client.cpp
index 6373a20..3a8b137 100644
--- a/Sluift/client.cpp
+++ b/Sluift/client.cpp
@@ -4,44 +4,46 @@
* See the COPYING file for more information.
*/
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
-#include <boost/assign/list_of.hpp>
#include <iostream>
-#include <Sluift/SluiftClient.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/SoftwareVersion.h>
+#include <boost/assign/list_of.hpp>
+#include <boost/lambda/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+
+#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Disco/ClientDiscoManager.h>
+#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Elements/MAMQuery.h>
#include <Swiften/Elements/Message.h>
#include <Swiften/Elements/Presence.h>
#include <Swiften/Elements/RawXMLPayload.h>
#include <Swiften/Elements/RosterItemPayload.h>
#include <Swiften/Elements/RosterPayload.h>
-#include <Swiften/Elements/DiscoInfo.h>
-#include <Swiften/Elements/MAMQuery.h>
-#include <Swiften/Disco/ClientDiscoManager.h>
-#include <Swiften/Queries/GenericRequest.h>
+#include <Swiften/Elements/SoftwareVersion.h>
+#include <Swiften/JID/JID.h>
#include <Swiften/Presence/PresenceSender.h>
-#include <Swiften/Roster/XMPPRoster.h>
-#include <Swiften/Roster/SetRosterRequest.h>
#include <Swiften/Presence/SubscriptionManager.h>
-#include <Swiften/Roster/XMPPRosterItem.h>
+#include <Swiften/Queries/GenericRequest.h>
#include <Swiften/Queries/IQRouter.h>
#include <Swiften/Queries/Requests/GetSoftwareVersionRequest.h>
+#include <Swiften/Roster/SetRosterRequest.h>
+#include <Swiften/Roster/XMPPRoster.h>
+#include <Swiften/Roster/XMPPRosterItem.h>
#include <Swiften/TLS/PKCS12Certificate.h>
-#include <Sluift/Lua/FunctionRegistration.h>
-#include <Swiften/Base/foreach.h>
-#include <Swiften/Base/IDGenerator.h>
+
+#include <Sluift/ElementConvertors/IQConvertor.h>
+#include <Sluift/ElementConvertors/MessageConvertor.h>
+#include <Sluift/ElementConvertors/PresenceConvertor.h>
+#include <Sluift/ElementConvertors/StanzaConvertor.h>
+#include <Sluift/ElementConvertors/StatusShowConvertor.h>
#include <Sluift/Lua/Check.h>
-#include <Sluift/Lua/Value.h>
#include <Sluift/Lua/Exception.h>
+#include <Sluift/Lua/FunctionRegistration.h>
#include <Sluift/Lua/LuaUtils.h>
+#include <Sluift/Lua/Value.h>
+#include <Sluift/SluiftClient.h>
#include <Sluift/globals.h>
-#include <Sluift/ElementConvertors/StanzaConvertor.h>
-#include <Sluift/ElementConvertors/IQConvertor.h>
-#include <Sluift/ElementConvertors/PresenceConvertor.h>
-#include <Sluift/ElementConvertors/MessageConvertor.h>
-#include <Sluift/ElementConvertors/StatusShowConvertor.h>
using namespace Swift;
namespace lambda = boost::lambda;
diff --git a/Sluift/component.cpp b/Sluift/component.cpp
index a9ac2d9..af0b66e 100644
--- a/Sluift/component.cpp
+++ b/Sluift/component.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2014-2015 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,19 +10,6 @@
#include <boost/lambda/bind.hpp>
#include <boost/lambda/lambda.hpp>
-#include <Sluift/ElementConvertors/IQConvertor.h>
-#include <Sluift/ElementConvertors/MessageConvertor.h>
-#include <Sluift/ElementConvertors/PresenceConvertor.h>
-#include <Sluift/ElementConvertors/StanzaConvertor.h>
-#include <Sluift/ElementConvertors/StatusShowConvertor.h>
-#include <Sluift/Lua/Check.h>
-#include <Sluift/Lua/Exception.h>
-#include <Sluift/Lua/FunctionRegistration.h>
-#include <Sluift/Lua/LuaUtils.h>
-#include <Sluift/Lua/Value.h>
-#include <Sluift/SluiftComponent.h>
-#include <Sluift/globals.h>
-
#include <Swiften/Base/IDGenerator.h>
#include <Swiften/Base/foreach.h>
#include <Swiften/Elements/DiscoInfo.h>
@@ -43,6 +30,19 @@
#include <Swiften/Roster/XMPPRoster.h>
#include <Swiften/Roster/XMPPRosterItem.h>
+#include <Sluift/ElementConvertors/IQConvertor.h>
+#include <Sluift/ElementConvertors/MessageConvertor.h>
+#include <Sluift/ElementConvertors/PresenceConvertor.h>
+#include <Sluift/ElementConvertors/StanzaConvertor.h>
+#include <Sluift/ElementConvertors/StatusShowConvertor.h>
+#include <Sluift/Lua/Check.h>
+#include <Sluift/Lua/Exception.h>
+#include <Sluift/Lua/FunctionRegistration.h>
+#include <Sluift/Lua/LuaUtils.h>
+#include <Sluift/Lua/Value.h>
+#include <Sluift/SluiftComponent.h>
+#include <Sluift/globals.h>
+
using namespace Swift;
namespace lambda = boost::lambda;
diff --git a/Sluift/sluift.cpp b/Sluift/sluift.cpp
index 7a40270..9b82602 100644
--- a/Sluift/sluift.cpp
+++ b/Sluift/sluift.cpp
@@ -1,43 +1,45 @@
/*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/sluift.h>
-#include <lua.hpp>
-
#include <string>
-#include <boost/bind.hpp>
-#include <boost/numeric/conversion/cast.hpp>
+
#include <boost/assign/list_of.hpp>
+#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
+#include <boost/numeric/conversion/cast.hpp>
+
+#include <lua.hpp>
-#include "Watchdog.h"
-#include <Sluift/Lua/Check.h>
-#include <Sluift/SluiftClient.h>
-#include <Sluift/SluiftComponent.h>
-#include <Sluift/globals.h>
-#include <Sluift/Lua/Exception.h>
-#include <Sluift/Lua/LuaUtils.h>
-#include <Sluift/Lua/FunctionRegistration.h>
-#include <Swiften/Base/sleep.h>
-#include <Swiften/Base/foreach.h>
#include <Swiften/Base/IDGenerator.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Base/sleep.h>
+#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/Crypto/PlatformCryptoProvider.h>
+#include <Swiften/IDN/IDNConverter.h>
#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadsParserTester.h>
-#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
#include <Swiften/Serializer/PayloadSerializer.h>
-#include <Swiften/TLS/Certificate.h>
-#include <Swiften/TLS/CertificateFactory.h>
-#include <Sluift/LuaElementConvertor.h>
-#include <Sluift/Lua/Debug.h>
+#include <Swiften/Serializer/PayloadSerializers/FullPayloadSerializerCollection.h>
#include <Swiften/StringCodecs/Base64.h>
#include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/IDN/IDNConverter.h>
-#include <Swiften/Crypto/CryptoProvider.h>
-#include <Swiften/Crypto/PlatformCryptoProvider.h>
+#include <Swiften/TLS/Certificate.h>
+#include <Swiften/TLS/CertificateFactory.h>
+
#include <Sluift/ITunesInterface.h>
+#include <Sluift/Lua/Check.h>
+#include <Sluift/Lua/Debug.h>
+#include <Sluift/Lua/Exception.h>
+#include <Sluift/Lua/FunctionRegistration.h>
+#include <Sluift/Lua/LuaUtils.h>
+#include <Sluift/LuaElementConvertor.h>
+#include <Sluift/SluiftClient.h>
+#include <Sluift/SluiftComponent.h>
+#include <Sluift/Watchdog.h>
+#include <Sluift/globals.h>
using namespace Swift;
diff --git a/Sluift/tokenize.cpp b/Sluift/tokenize.cpp
index 55ab744..e0252f7 100644
--- a/Sluift/tokenize.cpp
+++ b/Sluift/tokenize.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Sluift/tokenize.h>
-#include <boost/tokenizer.hpp>
#include <cctype>
+#include <boost/tokenizer.hpp>
+
using namespace Swift;
namespace {
diff --git a/Sluift/tokenize.h b/Sluift/tokenize.h
index 9a65b07..842f1d3 100644
--- a/Sluift/tokenize.h
+++ b/Sluift/tokenize.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2013 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <string>
+#include <vector>
namespace Swift {
namespace Lua {
diff --git a/SwifTools/Application/ApplicationPathProvider.cpp b/SwifTools/Application/ApplicationPathProvider.cpp
index 358a5fc..ebe9654 100644
--- a/SwifTools/Application/ApplicationPathProvider.cpp
+++ b/SwifTools/Application/ApplicationPathProvider.cpp
@@ -1,15 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <boost/filesystem.hpp>
+#include <SwifTools/Application/ApplicationPathProvider.h>
+
#include <iostream>
-#include <SwifTools/Application/ApplicationPathProvider.h>
-#include <Swiften/Base/foreach.h>
+#include <boost/filesystem.hpp>
+
#include <Swiften/Base/Paths.h>
+#include <Swiften/Base/foreach.h>
namespace Swift {
diff --git a/SwifTools/Application/MacOSXApplicationPathProvider.cpp b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
index 4d6c0c0..2c35cbe 100644
--- a/SwifTools/Application/MacOSXApplicationPathProvider.cpp
+++ b/SwifTools/Application/MacOSXApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#include <SwifTools/Application/MacOSXApplicationPathProvider.h>
#include <iostream>
+
#include <mach-o/dyld.h>
namespace Swift {
diff --git a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
index 46b259d..df59505 100644
--- a/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
+++ b/SwifTools/Application/UnitTest/ApplicationPathProviderTest.cpp
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
#include <string>
+
#include <boost/algorithm/string.hpp>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <Swiften/Base/Path.h>
+
#include <SwifTools/Application/PlatformApplicationPathProvider.h>
using namespace Swift;
diff --git a/SwifTools/Application/UnixApplicationPathProvider.cpp b/SwifTools/Application/UnixApplicationPathProvider.cpp
index f159821..0708bb2 100644
--- a/SwifTools/Application/UnixApplicationPathProvider.cpp
+++ b/SwifTools/Application/UnixApplicationPathProvider.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,10 +7,13 @@
#include <SwifTools/Application/UnixApplicationPathProvider.h>
#include <stdlib.h>
-#include <unistd.h>
-#include <boost/algorithm/string.hpp>
+
#include <iostream>
+#include <boost/algorithm/string.hpp>
+
+#include <unistd.h>
+
#include <Swiften/Base/String.h>
#include <Swiften/Base/foreach.h>
diff --git a/SwifTools/Application/WindowsApplicationPathProvider.cpp b/SwifTools/Application/WindowsApplicationPathProvider.cpp
index ee4b16e..0b0c9cf 100644
--- a/SwifTools/Application/WindowsApplicationPathProvider.cpp
+++ b/SwifTools/Application/WindowsApplicationPathProvider.cpp
@@ -1,13 +1,15 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Application/WindowsApplicationPathProvider.h>
-#include <windows.h>
#include <cassert>
+
+#include <windows.h>
+
#include <Swiften/Base/String.h>
namespace Swift {
diff --git a/SwifTools/AutoUpdater/SparkleAutoUpdater.h b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
index 4951342..351d075 100644
--- a/SwifTools/AutoUpdater/SparkleAutoUpdater.h
+++ b/SwifTools/AutoUpdater/SparkleAutoUpdater.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <string>
+
#include <SwifTools/AutoUpdater/AutoUpdater.h>
namespace Swift {
diff --git a/SwifTools/Cocoa/CocoaAction.h b/SwifTools/Cocoa/CocoaAction.h
index 73ac209..8807f08 100644
--- a/SwifTools/Cocoa/CocoaAction.h
+++ b/SwifTools/Cocoa/CocoaAction.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Cocoa/Cocoa.h>
#include <boost/function.hpp>
+#include <Cocoa/Cocoa.h>
+
@interface CocoaAction : NSObject
/**
diff --git a/SwifTools/CrashReporter.h b/SwifTools/CrashReporter.h
index 73eadb3..cce6c43 100644
--- a/SwifTools/CrashReporter.h
+++ b/SwifTools/CrashReporter.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem.hpp>
#include <string>
+#include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
+
namespace Swift {
class CrashReporter {
public:
diff --git a/SwifTools/Dock/MacOSXDock.mm b/SwifTools/Dock/MacOSXDock.mm
index 8c196d8..f231e9a 100644
--- a/SwifTools/Dock/MacOSXDock.mm
+++ b/SwifTools/Dock/MacOSXDock.mm
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Dock/MacOSXDock.h>
+#include <boost/lexical_cast.hpp>
+
#include <AppKit/AppKit.h>
#include <Cocoa/Cocoa.h>
-#include <boost/lexical_cast.hpp>
#include <Swiften/Base/String.h>
diff --git a/SwifTools/Dock/WindowsDock.h b/SwifTools/Dock/WindowsDock.h
index 3fceb3f..07b0eff 100644
--- a/SwifTools/Dock/WindowsDock.h
+++ b/SwifTools/Dock/WindowsDock.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <QSystemTrayIcon>
#include <boost/lexical_cast.hpp>
+#include <QSystemTrayIcon>
+
#include <SwifTools/Dock/Dock.h>
#include <SwifTools/Notifier/Notifier.h>
diff --git a/SwifTools/HunspellChecker.cpp b/SwifTools/HunspellChecker.cpp
index 4c3f634..2fe7a21 100644
--- a/SwifTools/HunspellChecker.cpp
+++ b/SwifTools/HunspellChecker.cpp
@@ -4,12 +4,19 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#include <SwifTools/HunspellChecker.h>
#include <algorithm>
-#include <hunspell/hunspell.hxx>
+
#include <boost/algorithm/string.hpp>
+#include <hunspell/hunspell.hxx>
namespace Swift {
diff --git a/SwifTools/HunspellChecker.h b/SwifTools/HunspellChecker.h
index 12c0485..689e0e7 100644
--- a/SwifTools/HunspellChecker.h
+++ b/SwifTools/HunspellChecker.h
@@ -4,12 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
#include <vector>
+
#include <boost/algorithm/string.hpp>
#include <boost/tuple/tuple.hpp>
-#include <SwifTools/SpellChecker.h>
-#pragma once
+#include <SwifTools/SpellChecker.h>
class Hunspell;
diff --git a/SwifTools/Idle/ActualIdleDetector.cpp b/SwifTools/Idle/ActualIdleDetector.cpp
index 2e2f1f1..dac4a5e 100644
--- a/SwifTools/Idle/ActualIdleDetector.cpp
+++ b/SwifTools/Idle/ActualIdleDetector.cpp
@@ -6,7 +6,6 @@
#include <SwifTools/Idle/ActualIdleDetector.h>
-
#include <boost/bind.hpp>
#include <Swiften/Network/Timer.h>
diff --git a/SwifTools/Idle/IdleDetector.h b/SwifTools/Idle/IdleDetector.h
index 1f98c3e..7819f54 100644
--- a/SwifTools/Idle/IdleDetector.h
+++ b/SwifTools/Idle/IdleDetector.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/boost_bsignals.h>
#include <boost/shared_ptr.hpp>
+#include <Swiften/Base/boost_bsignals.h>
+
namespace Swift {
class IdleDetector {
public:
diff --git a/SwifTools/Idle/IdleQuerierTest/IdleQuerierTest.cpp b/SwifTools/Idle/IdleQuerierTest/IdleQuerierTest.cpp
index 24d15b3..365ed1a 100644
--- a/SwifTools/Idle/IdleQuerierTest/IdleQuerierTest.cpp
+++ b/SwifTools/Idle/IdleQuerierTest/IdleQuerierTest.cpp
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <iostream>
#include <cassert>
+#include <iostream>
-#include <SwifTools/Idle/PlatformIdleQuerier.h>
#include <Swiften/Base/sleep.h>
+#include <SwifTools/Idle/PlatformIdleQuerier.h>
+
using namespace Swift;
int main() {
diff --git a/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp b/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
index 5ed5762..c97705e 100644
--- a/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
+++ b/SwifTools/Idle/UnitTest/ActualIdleDetectorTest.cpp
@@ -1,18 +1,20 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
+#include <boost/bind.hpp>
+
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <boost/bind.hpp>
-#include <SwifTools/Idle/ActualIdleDetector.h>
-#include <SwifTools/Idle/IdleQuerier.h>
#include <Swiften/Base/foreach.h>
-#include <Swiften/Network/TimerFactory.h>
#include <Swiften/Network/Timer.h>
+#include <Swiften/Network/TimerFactory.h>
+
+#include <SwifTools/Idle/ActualIdleDetector.h>
+#include <SwifTools/Idle/IdleQuerier.h>
using namespace Swift;
diff --git a/SwifTools/LastLineTracker.cpp b/SwifTools/LastLineTracker.cpp
index a7360a8..9428ff4 100644
--- a/SwifTools/LastLineTracker.cpp
+++ b/SwifTools/LastLineTracker.cpp
@@ -4,7 +4,13 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include "LastLineTracker.h"
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <SwifTools/LastLineTracker.h>
using namespace Swift;
diff --git a/SwifTools/Linkify.cpp b/SwifTools/Linkify.cpp
index 71deddd..324d145 100644
--- a/SwifTools/Linkify.cpp
+++ b/SwifTools/Linkify.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/Linkify.h>
-#include <boost/regex.hpp>
-#include <sstream>
#include <iostream>
+#include <sstream>
+
+#include <boost/regex.hpp>
namespace Swift {
diff --git a/SwifTools/Linkify.h b/SwifTools/Linkify.h
index 7fd110d..98d55d6 100644
--- a/SwifTools/Linkify.h
+++ b/SwifTools/Linkify.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <string>
+#include <vector>
namespace Swift {
namespace Linkify {
diff --git a/SwifTools/MacOSXChecker.h b/SwifTools/MacOSXChecker.h
index f2f8ebc..0bc7356 100644
--- a/SwifTools/MacOSXChecker.h
+++ b/SwifTools/MacOSXChecker.h
@@ -4,10 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <vector>
+
#include <boost/tuple/tuple.hpp>
+
#include <SwifTools/SpellChecker.h>
namespace Swift {
diff --git a/SwifTools/MacOSXChecker.mm b/SwifTools/MacOSXChecker.mm
index 0c73427..eefea97 100644
--- a/SwifTools/MacOSXChecker.mm
+++ b/SwifTools/MacOSXChecker.mm
@@ -5,7 +5,7 @@
*/
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -13,6 +13,7 @@
#include <SwifTools/MacOSXChecker.h>
#include <algorithm>
+
#include <boost/algorithm/string.hpp>
#include <AppKit/AppKit.h>
diff --git a/SwifTools/Notifier/GNTPNotifier.cpp b/SwifTools/Notifier/GNTPNotifier.cpp
index e7cf838..01e8726 100644
--- a/SwifTools/Notifier/GNTPNotifier.cpp
+++ b/SwifTools/Notifier/GNTPNotifier.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,11 +10,12 @@
#include <cassert>
#include <iostream>
-#include <boost/bind.hpp>
#include <sstream>
-#include <Swiften/Base/foreach.h>
+#include <boost/bind.hpp>
+
#include <Swiften/Base/Path.h>
+#include <Swiften/Base/foreach.h>
#include <Swiften/Network/ConnectionFactory.h>
namespace Swift {
diff --git a/SwifTools/Notifier/GNTPNotifier.h b/SwifTools/Notifier/GNTPNotifier.h
index 574ab67..92ff5a3 100644
--- a/SwifTools/Notifier/GNTPNotifier.h
+++ b/SwifTools/Notifier/GNTPNotifier.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,9 +8,10 @@
#include <boost/filesystem.hpp>
-#include <SwifTools/Notifier/Notifier.h>
#include <Swiften/Network/Connection.h>
+#include <SwifTools/Notifier/Notifier.h>
+
namespace Swift {
class ConnectionFactory;
diff --git a/SwifTools/Notifier/LoggingNotifier.h b/SwifTools/Notifier/LoggingNotifier.h
index e06b784..d50cb2d 100644
--- a/SwifTools/Notifier/LoggingNotifier.h
+++ b/SwifTools/Notifier/LoggingNotifier.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <SwifTools/Notifier/Notifier.h>
#include <Swiften/Base/ByteArray.h>
+#include <SwifTools/Notifier/Notifier.h>
+
namespace Swift {
class LoggingNotifier : public Notifier {
public:
diff --git a/SwifTools/Notifier/Notifier.h b/SwifTools/Notifier/Notifier.h
index ddb9a09..b099701 100644
--- a/SwifTools/Notifier/Notifier.h
+++ b/SwifTools/Notifier/Notifier.h
@@ -1,16 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/function.hpp>
-#include <boost/filesystem/path.hpp>
#include <string>
#include <vector>
+#include <boost/filesystem/path.hpp>
+#include <boost/function.hpp>
+
namespace Swift {
class Notifier {
public:
diff --git a/SwifTools/Notifier/SnarlNotifier.h b/SwifTools/Notifier/SnarlNotifier.h
index 6d4c16e..b8b9a48 100644
--- a/SwifTools/Notifier/SnarlNotifier.h
+++ b/SwifTools/Notifier/SnarlNotifier.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,9 +8,10 @@
#include <map>
-#include <SwifTools/Notifier/Notifier.h>
#include <SnarlInterface.h>
+#include <SwifTools/Notifier/Notifier.h>
+
namespace Swift {
class Win32NotifierWindow;
diff --git a/SwifTools/SpellChecker.h b/SwifTools/SpellChecker.h
index fd38418..e161d20 100644
--- a/SwifTools/SpellChecker.h
+++ b/SwifTools/SpellChecker.h
@@ -4,13 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include <SwifTools/SpellParser.h>
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#pragma once
+
+#include <vector>
#include <boost/algorithm/string.hpp>
#include <boost/tuple/tuple.hpp>
-#include <vector>
-#pragma once
+#include <SwifTools/SpellParser.h>
namespace Swift {
class SpellChecker {
diff --git a/SwifTools/SpellParser.cpp b/SwifTools/SpellParser.cpp
index 8cb42e4..e60486f 100644
--- a/SwifTools/SpellParser.cpp
+++ b/SwifTools/SpellParser.cpp
@@ -4,14 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#include <SwifTools/SpellParser.h>
-#include <boost/spirit/include/lex_lexertl.hpp>
+#include <string>
+
#include <boost/bind.hpp>
-#include <boost/ref.hpp>
#include <boost/numeric/conversion/cast.hpp>
-
-#include <string>
+#include <boost/ref.hpp>
+#include <boost/spirit/include/lex_lexertl.hpp>
namespace lex = boost::spirit::lex;
diff --git a/SwifTools/SpellParser.h b/SwifTools/SpellParser.h
index b64565c..b37cb48 100644
--- a/SwifTools/SpellParser.h
+++ b/SwifTools/SpellParser.h
@@ -4,13 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
+#include <vector>
+
#include <boost/algorithm/string.hpp>
#include <boost/tuple/tuple.hpp>
-#include <boost/algorithm/string.hpp>
-
-#include <vector>
namespace Swift {
enum token_ids
diff --git a/SwifTools/TabComplete.cpp b/SwifTools/TabComplete.cpp
index bfab2aa..4796f1b 100644
--- a/SwifTools/TabComplete.cpp
+++ b/SwifTools/TabComplete.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#include <SwifTools/TabComplete.h>
#include <algorithm>
+
#include <boost/algorithm/string.hpp>
#include <Swiften/Base/foreach.h>
diff --git a/SwifTools/TabComplete.h b/SwifTools/TabComplete.h
index feb1ffc..a1bdc40 100644
--- a/SwifTools/TabComplete.h
+++ b/SwifTools/TabComplete.h
@@ -1,14 +1,13 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
-
#include <string>
+#include <vector>
namespace Swift {
class TabComplete {
diff --git a/SwifTools/URIHandler/MacOSXURIHandler.mm b/SwifTools/URIHandler/MacOSXURIHandler.mm
index d542408..482be8f 100644
--- a/SwifTools/URIHandler/MacOSXURIHandler.mm
+++ b/SwifTools/URIHandler/MacOSXURIHandler.mm
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2011-2013 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/URIHandler/MacOSXURIHandler.h>
-#include <Cocoa/Cocoa.h>
#include <iostream>
+#include <Cocoa/Cocoa.h>
+
using namespace Swift;
@interface MacOSXURIEventHandler : NSObject {
diff --git a/SwifTools/URIHandler/URIHandler.h b/SwifTools/URIHandler/URIHandler.h
index 14bab5b..84bb368 100644
--- a/SwifTools/URIHandler/URIHandler.h
+++ b/SwifTools/URIHandler/URIHandler.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <string>
+
#include <Swiften/Base/boost_bsignals.h>
namespace Swift {
diff --git a/SwifTools/URIHandler/XMPPURI.cpp b/SwifTools/URIHandler/XMPPURI.cpp
index 2fe45c0..38fc72d 100644
--- a/SwifTools/URIHandler/XMPPURI.cpp
+++ b/SwifTools/URIHandler/XMPPURI.cpp
@@ -1,22 +1,24 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <SwifTools/URIHandler/XMPPURI.h>
-#include <Swiften/Base/URL.h>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/algorithm/string/find_format.hpp>
-#include <boost/algorithm/string/formatter.hpp>
-#include <boost/algorithm/string/find_iterator.hpp>
-#include <boost/algorithm/string/split.hpp>
-#include <boost/algorithm/string/classification.hpp>
#include <sstream>
#include <stdexcept>
#include <vector>
+#include <boost/algorithm/string/classification.hpp>
+#include <boost/algorithm/string/find_format.hpp>
+#include <boost/algorithm/string/find_iterator.hpp>
+#include <boost/algorithm/string/formatter.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/algorithm/string/split.hpp>
+
+#include <Swiften/Base/URL.h>
+
using namespace Swift;
diff --git a/SwifTools/URIHandler/XMPPURI.h b/SwifTools/URIHandler/XMPPURI.h
index 91375ff..275f99a 100644
--- a/SwifTools/URIHandler/XMPPURI.h
+++ b/SwifTools/URIHandler/XMPPURI.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <string>
#include <map>
+#include <string>
#include <Swiften/JID/JID.h>
diff --git a/SwifTools/UnitTest/SpellParserTest.cpp b/SwifTools/UnitTest/SpellParserTest.cpp
index 09e686c..3747eb1 100644
--- a/SwifTools/UnitTest/SpellParserTest.cpp
+++ b/SwifTools/UnitTest/SpellParserTest.cpp
@@ -4,11 +4,17 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include <cppunit/extensions/HelperMacros.h>
-#include <cppunit/extensions/TestFactoryRegistry.h>
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
#include <boost/algorithm/string.hpp>
+#include <cppunit/extensions/HelperMacros.h>
+#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <SwifTools/SpellParser.h>
using namespace Swift;
diff --git a/Swift/Controllers/AdHocController.cpp b/Swift/Controllers/AdHocController.cpp
index b48b832..38b0fc5 100644
--- a/Swift/Controllers/AdHocController.cpp
+++ b/Swift/Controllers/AdHocController.cpp
@@ -1,11 +1,13 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <boost/bind.hpp>
#include <Swift/Controllers/AdHocController.h>
+
+#include <boost/bind.hpp>
+
#include <Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h>
namespace Swift {
diff --git a/Swift/Controllers/AdHocController.h b/Swift/Controllers/AdHocController.h
index 1ac148c..e2b93df 100644
--- a/Swift/Controllers/AdHocController.h
+++ b/Swift/Controllers/AdHocController.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <boost/shared_ptr.hpp>
+
#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
namespace Swift {
diff --git a/Swift/Controllers/AdHocManager.cpp b/Swift/Controllers/AdHocManager.cpp
index a572846..4733b57 100644
--- a/Swift/Controllers/AdHocManager.cpp
+++ b/Swift/Controllers/AdHocManager.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,14 +10,15 @@
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
#include <Swiften/Base/foreach.h>
#include <Swiften/Queries/IQRouter.h>
-#include <Swiften/AdHoc/OutgoingAdHocCommandSession.h>
-#include <Swift/Controllers/UIInterfaces/MainWindow.h>
-#include <Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h>
+
+#include <Swift/Controllers/UIEvents/RequestAdHocUIEvent.h>
#include <Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h>
#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/RequestAdHocUIEvent.h>
+#include <Swift/Controllers/UIInterfaces/AdHocCommandWindowFactory.h>
+#include <Swift/Controllers/UIInterfaces/MainWindow.h>
namespace Swift {
diff --git a/Swift/Controllers/BlockListController.cpp b/Swift/Controllers/BlockListController.cpp
index be70946..2c8d401 100644
--- a/Swift/Controllers/BlockListController.cpp
+++ b/Swift/Controllers/BlockListController.cpp
@@ -5,7 +5,7 @@
*/
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -14,15 +14,15 @@
#include <boost/bind.hpp>
-#include <Swiften/Client/ClientBlockListManager.h>
-
#include <Swiften/Base/foreach.h>
#include <Swiften/Base/format.h>
+#include <Swiften/Client/ClientBlockListManager.h>
+
#include <Swift/Controllers/Intl.h>
-#include <Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h>
#include <Swift/Controllers/UIEvents/RequestBlockListDialogUIEvent.h>
-#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
+#include <Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h>
#include <Swift/Controllers/UIInterfaces/BlockListEditorWidget.h>
+#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
#include <Swift/Controllers/XMPPEvents/EventController.h>
namespace Swift {
diff --git a/Swift/Controllers/BlockListController.h b/Swift/Controllers/BlockListController.h
index 99c143c..c911344 100644
--- a/Swift/Controllers/BlockListController.h
+++ b/Swift/Controllers/BlockListController.h
@@ -4,11 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <boost/shared_ptr.hpp>
#include <Swiften/Queries/GenericRequest.h>
+
#include <Swift/Controllers/UIEvents/UIEventStream.h>
#include <Swift/Controllers/UIInterfaces/BlockListEditorWidgetFactory.h>
diff --git a/Swift/Controllers/CertificateMemoryStorageFactory.h b/Swift/Controllers/CertificateMemoryStorageFactory.h
index 656c8ed..de9f3fe 100644
--- a/Swift/Controllers/CertificateMemoryStorageFactory.h
+++ b/Swift/Controllers/CertificateMemoryStorageFactory.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
#include <Swift/Controllers/Storages/CertificateMemoryStorage.h>
+#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
namespace Swift {
class CertificateFactory;
diff --git a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
index e49e378..8ea6dff 100644
--- a/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
+++ b/Swift/Controllers/Chat/AutoAcceptMUCInviteDecider.h
@@ -5,17 +5,18 @@
*/
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Roster/XMPPRoster.h>
#include <Swiften/Elements/MUCInvitationPayload.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swiften/Roster/XMPPRoster.h>
+
#include <Swift/Controllers/SettingConstants.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
namespace Swift {
class AutoAcceptMUCInviteDecider {
diff --git a/Swift/Controllers/Chat/MUCSearchController.cpp b/Swift/Controllers/Chat/MUCSearchController.cpp
index d40f427..702a366 100644
--- a/Swift/Controllers/Chat/MUCSearchController.cpp
+++ b/Swift/Controllers/Chat/MUCSearchController.cpp
@@ -1,24 +1,25 @@
/*
- * Copyright (c) 2010-2011 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Chat/MUCSearchController.h"
+#include <Swift/Controllers/Chat/MUCSearchController.h>
#include <iostream>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
-#include <Swiften/Base/foreach.h>
-#include <Swiften/Disco/GetDiscoItemsRequest.h>
#include <Swiften/Base/Log.h>
#include <Swiften/Base/String.h>
+#include <Swiften/Base/foreach.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/Disco/DiscoServiceWalker.h>
+#include <Swiften/Disco/GetDiscoItemsRequest.h>
+
#include <Swift/Controllers/UIEvents/UIEventStream.h>
#include <Swift/Controllers/UIInterfaces/MUCSearchWindowFactory.h>
-#include <Swiften/Disco/DiscoServiceWalker.h>
-#include <Swiften/Client/NickResolver.h>
namespace Swift {
diff --git a/Swift/Controllers/Chat/MUCSearchController.h b/Swift/Controllers/Chat/MUCSearchController.h
index 068c930..01bcf74 100644
--- a/Swift/Controllers/Chat/MUCSearchController.h
+++ b/Swift/Controllers/Chat/MUCSearchController.h
@@ -1,25 +1,25 @@
/*
- * Copyright (c) 2010-2011 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <map>
+#include <string>
+#include <vector>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Base/boost_bsignals.h"
-#include <string>
-#include "Swiften/JID/JID.h"
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/DiscoInfo.h>
+#include <Swiften/Elements/DiscoItems.h>
+#include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/JID/JID.h>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swift/Controllers/ProfileSettingsProvider.h"
-#include "Swiften/Elements/DiscoInfo.h"
-#include "Swiften/Elements/DiscoItems.h"
-#include "Swiften/Elements/ErrorPayload.h"
+#include <Swift/Controllers/ProfileSettingsProvider.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class UIEventStream;
diff --git a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
index 31d54db..d29337d 100644
--- a/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
+++ b/Swift/Controllers/Chat/UnitTest/ChatsManagerTest.cpp
@@ -4,8 +4,8 @@
* See the COPYING file for more information.
*/
-#include <set>
#include <map>
+#include <set>
#include <boost/bind.hpp>
diff --git a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
index c1410f3..0754749 100644
--- a/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
+++ b/Swift/Controllers/Chat/UnitTest/MockChatListWindow.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2011-2014 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/UIInterfaces/ChatListWindow.h"
+#include <Swift/Controllers/UIInterfaces/ChatListWindow.h>
namespace Swift {
diff --git a/Swift/Controllers/ChatMessageSummarizer.cpp b/Swift/Controllers/ChatMessageSummarizer.cpp
index 34524ac..a0ae6d1 100644
--- a/Swift/Controllers/ChatMessageSummarizer.cpp
+++ b/Swift/Controllers/ChatMessageSummarizer.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2011-2013 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/ChatMessageSummarizer.h>
+#include <Swiften/Base/foreach.h>
#include <Swiften/Base/format.h>
+
#include <Swift/Controllers/Intl.h>
-#include <Swiften/Base/foreach.h>
using namespace Swift;
using namespace std;
diff --git a/Swift/Controllers/ChatMessageSummarizer.h b/Swift/Controllers/ChatMessageSummarizer.h
index aab7bc6..9ed867d 100644
--- a/Swift/Controllers/ChatMessageSummarizer.h
+++ b/Swift/Controllers/ChatMessageSummarizer.h
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
-#include <utility>
#include <string>
+#include <utility>
+#include <vector>
namespace Swift {
typedef std::pair<std::string, int> UnreadPair;
diff --git a/Swift/Controllers/Contact.cpp b/Swift/Controllers/Contact.cpp
index b3e27f1..bda1239 100644
--- a/Swift/Controllers/Contact.cpp
+++ b/Swift/Controllers/Contact.cpp
@@ -4,9 +4,16 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swift/Controllers/Contact.h>
+
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/find.hpp>
-#include <Swift/Controllers/Contact.h>
namespace Swift {
diff --git a/Swift/Controllers/ContactEditController.cpp b/Swift/Controllers/ContactEditController.cpp
index 1163735..704e3bc 100644
--- a/Swift/Controllers/ContactEditController.cpp
+++ b/Swift/Controllers/ContactEditController.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -10,13 +10,13 @@
#include <boost/bind.hpp>
#include <boost/smart_ptr/make_shared.hpp>
+#include <Swiften/VCards/VCardManager.h>
+
+#include <Swift/Controllers/Roster/RosterController.h>
+#include <Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h>
#include <Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h>
#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h>
#include <Swift/Controllers/UIInterfaces/ContactEditWindowFactory.h>
-#include <Swift/Controllers/Roster/RosterController.h>
-#include <Swiften/VCards/VCardManager.h>
-
namespace Swift {
diff --git a/Swift/Controllers/ContactEditController.h b/Swift/Controllers/ContactEditController.h
index 800da27..671fe38 100644
--- a/Swift/Controllers/ContactEditController.h
+++ b/Swift/Controllers/ContactEditController.h
@@ -1,21 +1,23 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <set>
+#include <string>
+#include <vector>
+
#include <boost/optional.hpp>
-#include <Swiften/JID/JID.h>
-#include <string>
#include <Swiften/Elements/VCard.h>
-#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swiften/JID/JID.h>
#include <Swiften/Roster/XMPPRosterItem.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
namespace Swift {
class UIEventStream;
class ContactEditWindowFactory;
diff --git a/Swift/Controllers/ContactSuggester.cpp b/Swift/Controllers/ContactSuggester.cpp
index 1f61286..a2b605a 100644
--- a/Swift/Controllers/ContactSuggester.cpp
+++ b/Swift/Controllers/ContactSuggester.cpp
@@ -5,18 +5,22 @@
*/
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/ContactSuggester.h>
+#include <algorithm>
+#include <set>
+#include <vector>
+
#include <boost/algorithm/string.hpp>
#include <boost/algorithm/string/find.hpp>
#include <boost/bind.hpp>
-#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#include <boost/lambda/lambda.hpp>
#include <Swiften/Base/Algorithm.h>
#include <Swiften/Base/foreach.h>
@@ -24,10 +28,6 @@
#include <Swift/Controllers/ContactProvider.h>
-#include <algorithm>
-#include <vector>
-#include <set>
-
namespace lambda = boost::lambda;
namespace Swift {
diff --git a/Swift/Controllers/DummySystemTray.h b/Swift/Controllers/DummySystemTray.h
index 10b7c33..b413737 100644
--- a/Swift/Controllers/DummySystemTray.h
+++ b/Swift/Controllers/DummySystemTray.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/SystemTray.h"
+#include <Swift/Controllers/SystemTray.h>
namespace Swift {
class DummySystemTray : public SystemTray {
diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp
index 626fd40..6615448 100644
--- a/Swift/Controllers/EventNotifier.cpp
+++ b/Swift/Controllers/EventNotifier.cpp
@@ -10,18 +10,18 @@
#include <boost/bind.hpp>
#include <Swiften/Avatars/AvatarManager.h>
-#include <Swiften/Client/NickResolver.h>
-#include <Swiften/JID/JID.h>
#include <Swiften/Base/String.h>
#include <Swiften/Base/format.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/JID/JID.h>
+#include <Swift/Controllers/Intl.h>
#include <Swift/Controllers/Settings/SettingsProvider.h>
#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
#include <Swift/Controllers/XMPPEvents/EventController.h>
#include <Swift/Controllers/XMPPEvents/MUCInviteEvent.h>
#include <Swift/Controllers/XMPPEvents/MessageEvent.h>
#include <Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h>
-#include <Swift/Controllers/Intl.h>
#include <SwifTools/Notifier/Notifier.h>
diff --git a/Swift/Controllers/EventNotifier.h b/Swift/Controllers/EventNotifier.h
index 4f7c430..2ecff6a 100644
--- a/Swift/Controllers/EventNotifier.h
+++ b/Swift/Controllers/EventNotifier.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,10 +8,12 @@
#include <boost/shared_ptr.hpp>
-#include "SwifTools/Notifier/Notifier.h"
-#include "Swiften/Base/boost_bsignals.h"
-#include "Swift/Controllers/XMPPEvents/StanzaEvent.h"
-#include "Swiften/JID/JID.h"
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
+
+#include <SwifTools/Notifier/Notifier.h>
namespace Swift {
class EventController;
diff --git a/Swift/Controllers/EventWindowController.cpp b/Swift/Controllers/EventWindowController.cpp
index 3acd7a5..91fedd2 100644
--- a/Swift/Controllers/EventWindowController.cpp
+++ b/Swift/Controllers/EventWindowController.cpp
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/EventWindowController.h>
+#include <boost/bind.hpp>
+
#include <Swift/Controllers/XMPPEvents/MessageEvent.h>
#include <Swift/Controllers/XMPPEvents/SubscriptionRequestEvent.h>
-#include <boost/bind.hpp>
namespace Swift {
diff --git a/Swift/Controllers/EventWindowController.h b/Swift/Controllers/EventWindowController.h
index f9477c5..1c50830 100644
--- a/Swift/Controllers/EventWindowController.h
+++ b/Swift/Controllers/EventWindowController.h
@@ -1,15 +1,14 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/UIInterfaces/EventWindowFactory.h"
-#include "Swift/Controllers/UIInterfaces/EventWindow.h"
-#include "Swift/Controllers/XMPPEvents/EventController.h"
-
+#include <Swift/Controllers/UIInterfaces/EventWindow.h>
+#include <Swift/Controllers/UIInterfaces/EventWindowFactory.h>
+#include <Swift/Controllers/XMPPEvents/EventController.h>
namespace Swift {
diff --git a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
index b2afea9..8616c1e 100644
--- a/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferOverview.cpp
@@ -5,12 +5,12 @@
*/
/*
- * Copyright (c) 2015 Isode Limited.
+ * Copyright (c) 2015-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "FileTransferOverview.h"
+#include <Swift/Controllers/FileTransfer/FileTransferOverview.h>
#include <boost/bind.hpp>
#include <boost/filesystem.hpp>
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
index 3081f71..a2fff03 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.cpp
@@ -4,7 +4,13 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include "FileTransferProgressInfo.h"
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swift/Controllers/FileTransfer/FileTransferProgressInfo.h>
#include <boost/numeric/conversion/cast.hpp>
diff --git a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
index e324e33..ea88657 100644
--- a/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
+++ b/Swift/Controllers/FileTransfer/FileTransferProgressInfo.h
@@ -4,11 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
-#include <Swiften/Base/boost_bsignals.h>
#include <boost/cstdint.hpp>
+#include <Swiften/Base/boost_bsignals.h>
+
namespace Swift {
class FileTransferProgressInfo {
diff --git a/Swift/Controllers/FileTransferListController.cpp b/Swift/Controllers/FileTransferListController.cpp
index 093a3c4..6e84435 100644
--- a/Swift/Controllers/FileTransferListController.cpp
+++ b/Swift/Controllers/FileTransferListController.cpp
@@ -4,12 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#include "Swift/Controllers/FileTransferListController.h"
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
+#include <Swift/Controllers/FileTransferListController.h>
#include <boost/bind.hpp>
-#include "Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h"
-#include "Swift/Controllers/UIEvents/RequestFileTransferListUIEvent.h"
+#include <Swift/Controllers/UIEvents/RequestFileTransferListUIEvent.h>
+#include <Swift/Controllers/UIInterfaces/FileTransferListWidgetFactory.h>
namespace Swift {
diff --git a/Swift/Controllers/FileTransferListController.h b/Swift/Controllers/FileTransferListController.h
index c5c8893..079cd35 100644
--- a/Swift/Controllers/FileTransferListController.h
+++ b/Swift/Controllers/FileTransferListController.h
@@ -4,11 +4,17 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEventStream.h"
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
namespace Swift {
diff --git a/Swift/Controllers/HighlightEditorController.cpp b/Swift/Controllers/HighlightEditorController.cpp
index 35eb404..ebda81c 100644
--- a/Swift/Controllers/HighlightEditorController.cpp
+++ b/Swift/Controllers/HighlightEditorController.cpp
@@ -5,19 +5,20 @@
*/
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
+#include <Swift/Controllers/HighlightEditorController.h>
+
#include <boost/bind.hpp>
-#include <Swift/Controllers/HighlightEditorController.h>
+#include <Swift/Controllers/ContactSuggester.h>
#include <Swift/Controllers/UIEvents/RequestHighlightEditorUIEvent.h>
#include <Swift/Controllers/UIEvents/UIEventStream.h>
-#include <Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h>
#include <Swift/Controllers/UIInterfaces/HighlightEditorWindow.h>
-#include <Swift/Controllers/ContactSuggester.h>
+#include <Swift/Controllers/UIInterfaces/HighlightEditorWindowFactory.h>
namespace Swift {
diff --git a/Swift/Controllers/HighlightManager.h b/Swift/Controllers/HighlightManager.h
index c55990b..180f7a3 100644
--- a/Swift/Controllers/HighlightManager.h
+++ b/Swift/Controllers/HighlightManager.h
@@ -5,17 +5,18 @@
*/
/*
- * Copyright (c) 2014-2015 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <string>
+#include <vector>
#include <Swiften/Base/boost_bsignals.h>
+
#include <Swift/Controllers/HighlightRule.h>
namespace Swift {
diff --git a/Swift/Controllers/HighlightRule.h b/Swift/Controllers/HighlightRule.h
index 02b4864..caacaee 100644
--- a/Swift/Controllers/HighlightRule.h
+++ b/Swift/Controllers/HighlightRule.h
@@ -5,19 +5,19 @@
*/
/*
- * Copyright (c) 2014-2015 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <string>
+#include <vector>
-#include <boost/regex.hpp>
-#include <boost/archive/text_oarchive.hpp>
#include <boost/archive/text_iarchive.hpp>
+#include <boost/archive/text_oarchive.hpp>
+#include <boost/regex.hpp>
#include <Swift/Controllers/HighlightAction.h>
diff --git a/Swift/Controllers/HistoryViewController.h b/Swift/Controllers/HistoryViewController.h
index f44c968..b388160 100644
--- a/Swift/Controllers/HistoryViewController.h
+++ b/Swift/Controllers/HistoryViewController.h
@@ -4,17 +4,25 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
-#include <Swiften/Base/boost_bsignals.h>
+#include <set>
+
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
-#include <Swift/Controllers/UIEvents/UIEventStream.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/History/HistoryStorage.h>
#include <Swiften/JID/JID.h>
#include <Swiften/Presence/PresenceOracle.h>
-#include <Swiften/History/HistoryStorage.h>
-#include <set>
+
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
namespace Swift {
class HistoryWindowFactory;
diff --git a/Swift/Controllers/Intl.h b/Swift/Controllers/Intl.h
index 1c8204a..386696a 100644
--- a/Swift/Controllers/Intl.h
+++ b/Swift/Controllers/Intl.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,5 @@
#pragma once
#include <Swift/Controllers/Translator.h>
-
#define QT_TRANSLATE_NOOP(context, text) \
Swift::Translator::getInstance()->translate(text, context)
diff --git a/Swift/Controllers/MainController.h b/Swift/Controllers/MainController.h
index cdf9436..e8a915e 100644
--- a/Swift/Controllers/MainController.h
+++ b/Swift/Controllers/MainController.h
@@ -1,33 +1,32 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <vector>
#include <map>
#include <string>
+#include <vector>
#include <boost/shared_ptr.hpp>
#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/Network/Timer.h>
#include <Swiften/Client/ClientError.h>
-#include <Swiften/JID/JID.h>
+#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Elements/CapsInfo.h>
#include <Swiften/Elements/DiscoInfo.h>
-#include <Swiften/Elements/VCard.h>
#include <Swiften/Elements/ErrorPayload.h>
#include <Swiften/Elements/Presence.h>
-#include <Swiften/Elements/CapsInfo.h>
-#include <Swiften/Client/ClientXMLTracer.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Network/Timer.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
#include <Swift/Controllers/ProfileSettingsProvider.h>
-#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
#include <Swift/Controllers/UIEvents/UIEvent.h>
-
+#include <Swift/Controllers/XMPPEvents/ErrorEvent.h>
namespace Swift {
class IdleDetector;
diff --git a/Swift/Controllers/PresenceNotifier.cpp b/Swift/Controllers/PresenceNotifier.cpp
index 0073720..b579187 100644
--- a/Swift/Controllers/PresenceNotifier.cpp
+++ b/Swift/Controllers/PresenceNotifier.cpp
@@ -1,20 +1,21 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/PresenceNotifier.h"
+#include <Swift/Controllers/PresenceNotifier.h>
#include <boost/bind.hpp>
-#include "Swiften/Client/StanzaChannel.h"
-#include "Swiften/Base/ByteArray.h"
-#include "Swiften/MUC/MUCRegistry.h"
-#include "Swiften/Roster/XMPPRoster.h"
-#include "Swiften/Presence/PresenceOracle.h"
-#include "Swiften/Network/TimerFactory.h"
-#include "Swiften/Client/NickResolver.h"
+#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Client/NickResolver.h>
+#include <Swiften/Client/StanzaChannel.h>
+#include <Swiften/MUC/MUCRegistry.h>
+#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Presence/PresenceOracle.h>
+#include <Swiften/Roster/XMPPRoster.h>
+
#include <Swift/Controllers/StatusUtil.h>
namespace Swift {
diff --git a/Swift/Controllers/PresenceNotifier.h b/Swift/Controllers/PresenceNotifier.h
index a1e1461..b02f8a2 100644
--- a/Swift/Controllers/PresenceNotifier.h
+++ b/Swift/Controllers/PresenceNotifier.h
@@ -1,20 +1,22 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
#include <set>
-#include "Swiften/Base/boost_bsignals.h"
-#include "Swiften/Elements/Presence.h"
-#include "Swiften/JID/JID.h"
-#include "SwifTools/Notifier/Notifier.h"
-#include "Swiften/Avatars/AvatarManager.h"
-#include "Swiften/Network/Timer.h"
+#include <boost/shared_ptr.hpp>
+
+#include <Swiften/Avatars/AvatarManager.h>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/Presence.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Network/Timer.h>
+
+#include <SwifTools/Notifier/Notifier.h>
namespace Swift {
class TimerFactory;
diff --git a/Swift/Controllers/PreviousStatusStore.cpp b/Swift/Controllers/PreviousStatusStore.cpp
index 5886bdf..6564ab5 100644
--- a/Swift/Controllers/PreviousStatusStore.cpp
+++ b/Swift/Controllers/PreviousStatusStore.cpp
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "PreviousStatusStore.h"
+#include <Swift/Controllers/PreviousStatusStore.h>
-#include "Swiften/Base/foreach.h"
+#include <Swiften/Base/foreach.h>
namespace Swift {
diff --git a/Swift/Controllers/PreviousStatusStore.h b/Swift/Controllers/PreviousStatusStore.h
index 69531a5..51c2dd9 100644
--- a/Swift/Controllers/PreviousStatusStore.h
+++ b/Swift/Controllers/PreviousStatusStore.h
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <string>
#include <utility> /* std::pair */
#include <vector>
-#include <string>
-#include "Swiften/Elements/StatusShow.h"
+#include <Swiften/Elements/StatusShow.h>
namespace Swift {
typedef std::pair<StatusShow::Type, std::string> TypeStringPair;
diff --git a/Swift/Controllers/ProfileSettingsProvider.cpp b/Swift/Controllers/ProfileSettingsProvider.cpp
index 180ffba..86f4c99 100644
--- a/Swift/Controllers/ProfileSettingsProvider.cpp
+++ b/Swift/Controllers/ProfileSettingsProvider.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/ProfileSettingsProvider.h"
+#include <Swift/Controllers/ProfileSettingsProvider.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/FuzzyRosterFilter.h b/Swift/Controllers/Roster/FuzzyRosterFilter.h
index 6710084..14e0f62 100644
--- a/Swift/Controllers/Roster/FuzzyRosterFilter.h
+++ b/Swift/Controllers/Roster/FuzzyRosterFilter.h
@@ -4,14 +4,20 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <string>
#include <Swift/Controllers/ContactSuggester.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
-#include <Swift/Controllers/Roster/RosterItem.h>
#include <Swift/Controllers/Roster/RosterFilter.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/GroupRosterItem.cpp b/Swift/Controllers/Roster/GroupRosterItem.cpp
index a241dec..6c68851 100644
--- a/Swift/Controllers/Roster/GroupRosterItem.cpp
+++ b/Swift/Controllers/Roster/GroupRosterItem.cpp
@@ -1,11 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
-
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
#include <boost/bind.hpp>
//#include <boost/algorithm.hpp>
#include <iostream>
diff --git a/Swift/Controllers/Roster/GroupRosterItem.h b/Swift/Controllers/Roster/GroupRosterItem.h
index 90ba471..9b4024f 100644
--- a/Swift/Controllers/Roster/GroupRosterItem.h
+++ b/Swift/Controllers/Roster/GroupRosterItem.h
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Roster/RosterItem.h"
#include <string>
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-
#include <vector>
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
+
namespace Swift {
class GroupRosterItem : public RosterItem {
diff --git a/Swift/Controllers/Roster/ItemOperations/AppearOffline.h b/Swift/Controllers/Roster/ItemOperations/AppearOffline.h
index 6438a8e..e59e01b 100644
--- a/Swift/Controllers/Roster/ItemOperations/AppearOffline.h
+++ b/Swift/Controllers/Roster/ItemOperations/AppearOffline.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
index da81d2b..833c863 100644
--- a/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
+++ b/Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Roster/RosterItem.h"
+#include <Swift/Controllers/Roster/RosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h b/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h
index 620a1ae..b19b95a 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetAvailableFeatures.h
@@ -4,12 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetAvatar.h b/Swift/Controllers/Roster/ItemOperations/SetAvatar.h
index 910a651..211321e 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetAvatar.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetAvatar.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -11,8 +11,8 @@
#include <Swiften/Elements/Presence.h>
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h b/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h
index ddb2c7a..098eeb5 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetBlockingState.h
@@ -4,12 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetMUC.h b/Swift/Controllers/Roster/ItemOperations/SetMUC.h
index 5919144..8a4a0c6 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetMUC.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetMUC.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2013-2014 Isode Limited.
+ * Copyright (c) 2013-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,8 @@
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetName.h b/Swift/Controllers/Roster/ItemOperations/SetName.h
index 5708740..9f8a0b9 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetName.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetName.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,8 @@
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/ItemOperations/SetVCard.h b/Swift/Controllers/Roster/ItemOperations/SetVCard.h
index 8ee73f9..e1744b9 100644
--- a/Swift/Controllers/Roster/ItemOperations/SetVCard.h
+++ b/Swift/Controllers/Roster/ItemOperations/SetVCard.h
@@ -4,13 +4,19 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
#include <Swiften/Elements/VCard.h>
#include <Swiften/JID/JID.h>
-#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/ItemOperations/RosterItemOperation.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/LeastCommonSubsequence.h b/Swift/Controllers/Roster/LeastCommonSubsequence.h
index 0b5aa0a..e7b9370 100644
--- a/Swift/Controllers/Roster/LeastCommonSubsequence.h
+++ b/Swift/Controllers/Roster/LeastCommonSubsequence.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011-2013 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <vector>
+
#include <boost/numeric/conversion/cast.hpp>
namespace Swift {
diff --git a/Swift/Controllers/Roster/OfflineRosterFilter.h b/Swift/Controllers/Roster/OfflineRosterFilter.h
index 61ac3f4..d25d073 100644
--- a/Swift/Controllers/Roster/OfflineRosterFilter.h
+++ b/Swift/Controllers/Roster/OfflineRosterFilter.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Roster/ContactRosterItem.h"
-#include "Swift/Controllers/Roster/RosterItem.h"
-#include "Swift/Controllers/Roster/RosterFilter.h"
-#include "Swiften/Elements/StatusShow.h"
+#include <Swiften/Elements/StatusShow.h>
+
+#include <Swift/Controllers/Roster/ContactRosterItem.h>
+#include <Swift/Controllers/Roster/RosterFilter.h>
+#include <Swift/Controllers/Roster/RosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/RosterFilter.h b/Swift/Controllers/Roster/RosterFilter.h
index 8712569..e68ab57 100644
--- a/Swift/Controllers/Roster/RosterFilter.h
+++ b/Swift/Controllers/Roster/RosterFilter.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Roster/RosterItem.h"
+#include <Swift/Controllers/Roster/RosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
index 79ad812..a39667c 100644
--- a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
+++ b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.cpp
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/Roster/RosterGroupExpandinessPersister.h>
-#include <boost/bind.hpp>
#include <vector>
-#include <Swiften/Base/foreach.h>
+#include <boost/bind.hpp>
+
#include <Swiften/Base/String.h>
+#include <Swiften/Base/foreach.h>
+
#include <Swift/Controllers/Roster/GroupRosterItem.h>
#include <Swift/Controllers/SettingConstants.h>
diff --git a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h
index 6addc81..c3d5c12 100644
--- a/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h
+++ b/Swift/Controllers/Roster/RosterGroupExpandinessPersister.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,9 @@
#pragma once
#include <set>
-#include "Swift/Controllers/Roster/Roster.h"
-#include "Swift/Controllers/Settings/SettingsProvider.h"
+
+#include <Swift/Controllers/Roster/Roster.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
namespace Swift {
class RosterGroupExpandinessPersister {
diff --git a/Swift/Controllers/Roster/RosterItem.cpp b/Swift/Controllers/Roster/RosterItem.cpp
index 7864fd9..51478c3 100644
--- a/Swift/Controllers/Roster/RosterItem.cpp
+++ b/Swift/Controllers/Roster/RosterItem.cpp
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Roster/RosterItem.h"
+#include <Swift/Controllers/Roster/RosterItem.h>
#include <boost/algorithm/string.hpp>
-#include "Swift/Controllers/Roster/GroupRosterItem.h"
+#include <Swift/Controllers/Roster/GroupRosterItem.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/RosterItem.h b/Swift/Controllers/Roster/RosterItem.h
index 84cba2c..736c6af 100644
--- a/Swift/Controllers/Roster/RosterItem.h
+++ b/Swift/Controllers/Roster/RosterItem.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swiften/Base/boost_bsignals.h"
+#include <string>
+
#include <boost/shared_ptr.hpp>
-#include <string>
+#include <Swiften/Base/boost_bsignals.h>
namespace Swift {
class GroupRosterItem;
diff --git a/Swift/Controllers/Roster/RosterVCardProvider.cpp b/Swift/Controllers/Roster/RosterVCardProvider.cpp
index 954ac68..d00d318 100644
--- a/Swift/Controllers/Roster/RosterVCardProvider.cpp
+++ b/Swift/Controllers/Roster/RosterVCardProvider.cpp
@@ -4,12 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#include <Swift/Controllers/Roster/RosterVCardProvider.h>
#include <Swiften/VCards/VCardManager.h>
-#include <Swift/Controllers/Roster/Roster.h>
#include <Swift/Controllers/Roster/ItemOperations/SetVCard.h>
+#include <Swift/Controllers/Roster/Roster.h>
namespace Swift {
diff --git a/Swift/Controllers/Roster/TableRoster.cpp b/Swift/Controllers/Roster/TableRoster.cpp
index 9f3cd54..fde3304 100644
--- a/Swift/Controllers/Roster/TableRoster.cpp
+++ b/Swift/Controllers/Roster/TableRoster.cpp
@@ -1,22 +1,24 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/Roster/TableRoster.h>
-#include <boost/cast.hpp>
-#include <cassert>
#include <algorithm>
+#include <cassert>
+
+#include <boost/cast.hpp>
#include <boost/numeric/conversion/cast.hpp>
-#include <Swiften/Base/foreach.h>
-#include <Swiften/Network/TimerFactory.h>
+#include <Swiften/Base/foreach.h>
#include <Swiften/Network/Timer.h>
-#include <Swift/Controllers/Roster/Roster.h>
+#include <Swiften/Network/TimerFactory.h>
+
#include <Swift/Controllers/Roster/GroupRosterItem.h>
#include <Swift/Controllers/Roster/LeastCommonSubsequence.h>
+#include <Swift/Controllers/Roster/Roster.h>
namespace Swift {
struct SectionNameEquals {
diff --git a/Swift/Controllers/Roster/TableRoster.h b/Swift/Controllers/Roster/TableRoster.h
index f0010f5..87f9e75 100644
--- a/Swift/Controllers/Roster/TableRoster.h
+++ b/Swift/Controllers/Roster/TableRoster.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,12 +8,13 @@
#include <string>
#include <vector>
-#include <Swiften/Base/boost_bsignals.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/StatusShow.h>
#include <boost/filesystem/path.hpp>
+#include <Swiften/Base/boost_bsignals.h>
+#include <Swiften/Elements/StatusShow.h>
+#include <Swiften/JID/JID.h>
+
namespace Swift {
class Roster;
class TimerFactory;
diff --git a/Swift/Controllers/Roster/UnitTest/LeastCommonSubsequenceTest.cpp b/Swift/Controllers/Roster/UnitTest/LeastCommonSubsequenceTest.cpp
index 996b460..144de77 100644
--- a/Swift/Controllers/Roster/UnitTest/LeastCommonSubsequenceTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/LeastCommonSubsequenceTest.cpp
@@ -1,15 +1,18 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include <boost/assign/list_of.hpp>
#include <functional>
+#include <boost/assign/list_of.hpp>
+
#include <QA/Checker/IO.h>
+
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
+
#include <Swift/Controllers/Roster/LeastCommonSubsequence.h>
using namespace Swift;
diff --git a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
index d905d9f..314b5c6 100644
--- a/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
+++ b/Swift/Controllers/Roster/UnitTest/RosterTest.cpp
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
+#include <boost/shared_ptr.hpp>
+
#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/ItemOperations/SetPresence.h>
+#include <Swift/Controllers/Roster/Roster.h>
using namespace Swift;
diff --git a/Swift/Controllers/Settings/DummySettingsProvider.h b/Swift/Controllers/Settings/DummySettingsProvider.h
index 340855a..605153e 100644
--- a/Swift/Controllers/Settings/DummySettingsProvider.h
+++ b/Swift/Controllers/Settings/DummySettingsProvider.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/Settings/SettingsProvider.h>
-
#include <map>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+
namespace Swift {
class DummySettingsProvider : public SettingsProvider {
diff --git a/Swift/Controllers/Settings/SettingsProvider.h b/Swift/Controllers/Settings/SettingsProvider.h
index 1e62d2e..29e26b5 100644
--- a/Swift/Controllers/Settings/SettingsProvider.h
+++ b/Swift/Controllers/Settings/SettingsProvider.h
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swiften/Base/boost_bsignals.h>
-
#include <string>
#include <vector>
+#include <Swiften/Base/boost_bsignals.h>
+
namespace Swift {
class SettingsProvider {
diff --git a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
index dc9a92d..11d5c11 100644
--- a/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
+++ b/Swift/Controllers/Settings/UnitTest/SettingsProviderHierachyTest.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,8 @@
#include <cppunit/extensions/HelperMacros.h>
#include <cppunit/extensions/TestFactoryRegistry.h>
-#include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
#include <Swift/Controllers/Settings/DummySettingsProvider.h>
+#include <Swift/Controllers/Settings/SettingsProviderHierachy.h>
#include <Swift/Controllers/Settings/XMLSettingsProvider.h>
using namespace Swift;
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.cpp b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
index d28947f..548f36f 100644
--- a/Swift/Controllers/Settings/XMLSettingsProvider.cpp
+++ b/Swift/Controllers/Settings/XMLSettingsProvider.cpp
@@ -1,17 +1,17 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#include <Swift/Controllers/Settings/XMLSettingsProvider.h>
-#include <boost/lexical_cast.hpp>
#include <boost/algorithm/string.hpp>
+#include <boost/lexical_cast.hpp>
+#include <Swiften/Base/Log.h>
#include <Swiften/Parser/PlatformXMLParserFactory.h>
#include <Swiften/Parser/XMLParser.h>
-#include <Swiften/Base/Log.h>
namespace Swift {
diff --git a/Swift/Controllers/Settings/XMLSettingsProvider.h b/Swift/Controllers/Settings/XMLSettingsProvider.h
index 24689b7..2dbb23c 100644
--- a/Swift/Controllers/Settings/XMLSettingsProvider.h
+++ b/Swift/Controllers/Settings/XMLSettingsProvider.h
@@ -1,17 +1,18 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/Settings/SettingsProvider.h>
-#include <Swiften/Parser/XMLParserClient.h>
-
#include <map>
#include <set>
+#include <Swiften/Parser/XMLParserClient.h>
+
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+
namespace Swift {
class XMLSettingsProvider : public SettingsProvider, public XMLParserClient {
diff --git a/Swift/Controllers/ShowProfileController.cpp b/Swift/Controllers/ShowProfileController.cpp
index 88d6e69..9e94392 100644
--- a/Swift/Controllers/ShowProfileController.cpp
+++ b/Swift/Controllers/ShowProfileController.cpp
@@ -5,12 +5,12 @@
*/
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "ShowProfileController.h"
+#include <Swift/Controllers/ShowProfileController.h>
#include <boost/bind.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
diff --git a/Swift/Controllers/ShowProfileController.h b/Swift/Controllers/ShowProfileController.h
index 27a0cf4..37fb615 100644
--- a/Swift/Controllers/ShowProfileController.h
+++ b/Swift/Controllers/ShowProfileController.h
@@ -4,10 +4,16 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
-#include <Swiften/JID/JID.h>
#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
#include <Swift/Controllers/UIEvents/UIEvent.h>
diff --git a/Swift/Controllers/SoundEventController.h b/Swift/Controllers/SoundEventController.h
index 17924cd..88c7b00 100644
--- a/Swift/Controllers/SoundEventController.h
+++ b/Swift/Controllers/SoundEventController.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,9 +8,9 @@
#include <boost/shared_ptr.hpp>
-#include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
-#include <Swift/Controllers/Settings/SettingsProvider.h>
#include <Swift/Controllers/HighlightAction.h>
+#include <Swift/Controllers/Settings/SettingsProvider.h>
+#include <Swift/Controllers/XMPPEvents/StanzaEvent.h>
namespace Swift {
class EventController;
diff --git a/Swift/Controllers/StatusCache.cpp b/Swift/Controllers/StatusCache.cpp
index e40ac7f..d00d7f6 100644
--- a/Swift/Controllers/StatusCache.cpp
+++ b/Swift/Controllers/StatusCache.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,13 +7,14 @@
#include <Swift/Controllers/StatusCache.h>
#include <boost/algorithm/string.hpp>
-#include <boost/lexical_cast.hpp>
#include <boost/filesystem/fstream.hpp>
-#include <boost/lambda/lambda.hpp>
#include <boost/lambda/bind.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/lexical_cast.hpp>
-#include <Swiften/Base/foreach.h>
#include <Swiften/Base/ByteArray.h>
+#include <Swiften/Base/foreach.h>
+
#include <SwifTools/Application/ApplicationPathProvider.h>
namespace lambda = boost::lambda;
diff --git a/Swift/Controllers/StatusCache.h b/Swift/Controllers/StatusCache.h
index 94c8efc..0ed85d6 100644
--- a/Swift/Controllers/StatusCache.h
+++ b/Swift/Controllers/StatusCache.h
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2012 Isode Limited.
+ * Copyright (c) 2012-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <iostream>
+#include <list>
#include <string>
#include <utility>
#include <vector>
-#include <list>
-#include <iostream>
#include <boost/filesystem/path.hpp>
diff --git a/Swift/Controllers/StatusTracker.cpp b/Swift/Controllers/StatusTracker.cpp
index 1f4f783..e42b99e 100644
--- a/Swift/Controllers/StatusTracker.cpp
+++ b/Swift/Controllers/StatusTracker.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/StatusTracker.h"
+#include <Swift/Controllers/StatusTracker.h>
#include <boost/smart_ptr/make_shared.hpp>
diff --git a/Swift/Controllers/StatusTracker.h b/Swift/Controllers/StatusTracker.h
index 472f30c..092ce43 100644
--- a/Swift/Controllers/StatusTracker.h
+++ b/Swift/Controllers/StatusTracker.h
@@ -1,16 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/shared_ptr.hpp>
-#include "Swiften/Elements/Presence.h"
-
-#include <boost/date_time/posix_time/posix_time_types.hpp>
+#include <Swiften/Elements/Presence.h>
namespace Swift {
diff --git a/Swift/Controllers/StatusUtil.cpp b/Swift/Controllers/StatusUtil.cpp
index 6c049a2..0c5bc21 100644
--- a/Swift/Controllers/StatusUtil.cpp
+++ b/Swift/Controllers/StatusUtil.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#include <Swift/Controllers/StatusUtil.h>
#include <cassert>
+
#include <Swift/Controllers/Intl.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/AvatarFileStorage.cpp b/Swift/Controllers/Storages/AvatarFileStorage.cpp
index 39c3468..56e27e1 100644
--- a/Swift/Controllers/Storages/AvatarFileStorage.cpp
+++ b/Swift/Controllers/Storages/AvatarFileStorage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,13 +7,14 @@
#include <Swift/Controllers/Storages/AvatarFileStorage.h>
#include <iostream>
-#include <boost/filesystem/fstream.hpp>
+
#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
-#include <Swiften/Base/foreach.h>
#include <Swiften/Base/String.h>
-#include <Swiften/StringCodecs/Hexify.h>
+#include <Swiften/Base/foreach.h>
#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/StringCodecs/Hexify.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/AvatarFileStorage.h b/Swift/Controllers/Storages/AvatarFileStorage.h
index ecb9370..9c6f617 100644
--- a/Swift/Controllers/Storages/AvatarFileStorage.h
+++ b/Swift/Controllers/Storages/AvatarFileStorage.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,11 +8,12 @@
#include <map>
#include <string>
+
#include <boost/filesystem/path.hpp>
+#include <Swiften/Avatars/AvatarStorage.h>
+#include <Swiften/Base/ByteArray.h>
#include <Swiften/JID/JID.h>
-#include "Swiften/Base/ByteArray.h"
-#include "Swiften/Avatars/AvatarStorage.h"
namespace Swift {
class CryptoProvider;
diff --git a/Swift/Controllers/Storages/CapsFileStorage.cpp b/Swift/Controllers/Storages/CapsFileStorage.cpp
index f5d3a2e..7b99fe0 100644
--- a/Swift/Controllers/Storages/CapsFileStorage.cpp
+++ b/Swift/Controllers/Storages/CapsFileStorage.cpp
@@ -1,16 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Storages/CapsFileStorage.h"
+#include <Swift/Controllers/Storages/CapsFileStorage.h>
#include <Swiften/Entity/GenericPayloadPersister.h>
-#include "Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h"
-#include "Swiften/Parser/PayloadParsers/DiscoInfoParser.h"
-#include "Swiften/StringCodecs/Hexify.h"
-#include "Swiften/StringCodecs/Base64.h"
+#include <Swiften/Parser/PayloadParsers/DiscoInfoParser.h>
+#include <Swiften/Serializer/PayloadSerializers/DiscoInfoSerializer.h>
+#include <Swiften/StringCodecs/Base64.h>
+#include <Swiften/StringCodecs/Hexify.h>
using namespace Swift;
diff --git a/Swift/Controllers/Storages/CapsFileStorage.h b/Swift/Controllers/Storages/CapsFileStorage.h
index b8aaac2..06dfd91 100644
--- a/Swift/Controllers/Storages/CapsFileStorage.h
+++ b/Swift/Controllers/Storages/CapsFileStorage.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <string>
+
#include <boost/filesystem/path.hpp>
-#include "Swiften/Disco/CapsStorage.h"
-#include <string>
+#include <Swiften/Disco/CapsStorage.h>
namespace Swift {
class CapsFileStorage : public CapsStorage {
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.cpp b/Swift/Controllers/Storages/CertificateFileStorage.cpp
index 52f4013..a549165 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateFileStorage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,13 +7,14 @@
#include <Swift/Controllers/Storages/CertificateFileStorage.h>
#include <iostream>
+
#include <boost/filesystem/fstream.hpp>
#include <boost/numeric/conversion/cast.hpp>
-#include <Swiften/StringCodecs/Hexify.h>
-#include <Swiften/TLS/CertificateFactory.h>
#include <Swiften/Base/Log.h>
#include <Swiften/Crypto/CryptoProvider.h>
+#include <Swiften/StringCodecs/Hexify.h>
+#include <Swiften/TLS/CertificateFactory.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/CertificateFileStorage.h b/Swift/Controllers/Storages/CertificateFileStorage.h
index e8d0fda..f7d3cb3 100644
--- a/Swift/Controllers/Storages/CertificateFileStorage.h
+++ b/Swift/Controllers/Storages/CertificateFileStorage.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,7 +8,7 @@
#include <boost/filesystem.hpp>
-#include "Swift/Controllers/Storages/CertificateStorage.h"
+#include <Swift/Controllers/Storages/CertificateStorage.h>
namespace Swift {
class CertificateFactory;
diff --git a/Swift/Controllers/Storages/CertificateFileStorageFactory.h b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
index 43f0866..da8e66e 100644
--- a/Swift/Controllers/Storages/CertificateFileStorageFactory.h
+++ b/Swift/Controllers/Storages/CertificateFileStorageFactory.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
#include <Swift/Controllers/Storages/CertificateFileStorage.h>
+#include <Swift/Controllers/Storages/CertificateStorageFactory.h>
namespace Swift {
class CertificateFactory;
diff --git a/Swift/Controllers/Storages/CertificateStorage.cpp b/Swift/Controllers/Storages/CertificateStorage.cpp
index 041c5a1..38ed564 100644
--- a/Swift/Controllers/Storages/CertificateStorage.cpp
+++ b/Swift/Controllers/Storages/CertificateStorage.cpp
@@ -1,10 +1,10 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Storages/CertificateStorage.h"
+#include <Swift/Controllers/Storages/CertificateStorage.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/CertificateStorageTrustChecker.h b/Swift/Controllers/Storages/CertificateStorageTrustChecker.h
index caf4d1f..7f2f43e 100644
--- a/Swift/Controllers/Storages/CertificateStorageTrustChecker.h
+++ b/Swift/Controllers/Storages/CertificateStorageTrustChecker.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,6 +7,7 @@
#pragma once
#include <Swiften/TLS/CertificateTrustChecker.h>
+
#include <Swift/Controllers/Storages/CertificateStorage.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/FileStorages.cpp b/Swift/Controllers/Storages/FileStorages.cpp
index 4fb2034..7e564bf 100644
--- a/Swift/Controllers/Storages/FileStorages.cpp
+++ b/Swift/Controllers/Storages/FileStorages.cpp
@@ -1,16 +1,18 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Storages/FileStorages.h"
-#include "Swift/Controllers/Storages/VCardFileStorage.h"
-#include "Swift/Controllers/Storages/AvatarFileStorage.h"
-#include "Swift/Controllers/Storages/CapsFileStorage.h"
-#include "Swift/Controllers/Storages/RosterFileStorage.h"
-#include <Swiften/History/SQLiteHistoryStorage.h>
+#include <Swift/Controllers/Storages/FileStorages.h>
+
#include <Swiften/Base/Path.h>
+#include <Swiften/History/SQLiteHistoryStorage.h>
+
+#include <Swift/Controllers/Storages/AvatarFileStorage.h>
+#include <Swift/Controllers/Storages/CapsFileStorage.h>
+#include <Swift/Controllers/Storages/RosterFileStorage.h>
+#include <Swift/Controllers/Storages/VCardFileStorage.h>
namespace Swift {
diff --git a/Swift/Controllers/Storages/FileStoragesFactory.h b/Swift/Controllers/Storages/FileStoragesFactory.h
index 7269810..66b3841 100644
--- a/Swift/Controllers/Storages/FileStoragesFactory.h
+++ b/Swift/Controllers/Storages/FileStoragesFactory.h
@@ -1,13 +1,13 @@
/*
- * Copyright (c) 2010-2013 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Storages/StoragesFactory.h"
-#include "Swift/Controllers/Storages/FileStorages.h"
+#include <Swift/Controllers/Storages/FileStorages.h>
+#include <Swift/Controllers/Storages/StoragesFactory.h>
namespace Swift {
class CryptoProvider;
diff --git a/Swift/Controllers/Storages/MemoryStoragesFactory.h b/Swift/Controllers/Storages/MemoryStoragesFactory.h
index 8c68f19..6f6523c 100644
--- a/Swift/Controllers/Storages/MemoryStoragesFactory.h
+++ b/Swift/Controllers/Storages/MemoryStoragesFactory.h
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2010-2015 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/Storages/StoragesFactory.h"
-#include "Swiften/Client/MemoryStorages.h"
+#include <Swiften/Client/MemoryStorages.h>
+
+#include <Swift/Controllers/Storages/StoragesFactory.h>
namespace Swift {
class JID;
diff --git a/Swift/Controllers/Storages/RosterFileStorage.cpp b/Swift/Controllers/Storages/RosterFileStorage.cpp
index a7f6810..c55bcf1 100644
--- a/Swift/Controllers/Storages/RosterFileStorage.cpp
+++ b/Swift/Controllers/Storages/RosterFileStorage.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2011 Isode Limited.
+ * Copyright (c) 2011-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -7,8 +7,8 @@
#include <Swift/Controllers/Storages/RosterFileStorage.h>
#include <Swiften/Entity/GenericPayloadPersister.h>
-#include <Swiften/Serializer/PayloadSerializers/RosterSerializer.h>
#include <Swiften/Parser/PayloadParsers/RosterParser.h>
+#include <Swiften/Serializer/PayloadSerializers/RosterSerializer.h>
using namespace Swift;
diff --git a/Swift/Controllers/Storages/VCardFileStorage.cpp b/Swift/Controllers/Storages/VCardFileStorage.cpp
index 95f2575..a93e286 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.cpp
+++ b/Swift/Controllers/Storages/VCardFileStorage.cpp
@@ -1,26 +1,27 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/Storages/VCardFileStorage.h"
+#include <Swift/Controllers/Storages/VCardFileStorage.h>
-#include <boost/filesystem/fstream.hpp>
-#include <boost/filesystem.hpp>
#include <iostream>
-#include <Swiften/Entity/GenericPayloadPersister.h>
+#include <boost/filesystem.hpp>
+#include <boost/filesystem/fstream.hpp>
+
+#include <Swiften/Base/Path.h>
#include <Swiften/Base/String.h>
-#include <Swiften/StringCodecs/Hexify.h>
#include <Swiften/Base/foreach.h>
-#include <Swiften/Base/Path.h>
#include <Swiften/Crypto/CryptoProvider.h>
-#include "Swiften/JID/JID.h"
-#include "Swiften/Elements/VCard.h"
-#include "Swiften/Serializer/PayloadSerializers/VCardSerializer.h"
-#include "Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h"
-#include "Swiften/Parser/PayloadParsers/VCardParser.h"
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/Entity/GenericPayloadPersister.h>
+#include <Swiften/JID/JID.h>
+#include <Swiften/Parser/PayloadParsers/UnitTest/PayloadParserTester.h>
+#include <Swiften/Parser/PayloadParsers/VCardParser.h>
+#include <Swiften/Serializer/PayloadSerializers/VCardSerializer.h>
+#include <Swiften/StringCodecs/Hexify.h>
using namespace Swift;
diff --git a/Swift/Controllers/Storages/VCardFileStorage.h b/Swift/Controllers/Storages/VCardFileStorage.h
index 85cf3fe..56e06f2 100644
--- a/Swift/Controllers/Storages/VCardFileStorage.h
+++ b/Swift/Controllers/Storages/VCardFileStorage.h
@@ -1,17 +1,18 @@
/*
- * Copyright (c) 2010-2014 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <boost/shared_ptr.hpp>
-#include <boost/filesystem/path.hpp>
-#include <string>
#include <map>
+#include <string>
+
+#include <boost/filesystem/path.hpp>
+#include <boost/shared_ptr.hpp>
-#include "Swiften/VCards/VCardStorage.h"
+#include <Swiften/VCards/VCardStorage.h>
namespace Swift {
class CryptoProvider;
diff --git a/Swift/Controllers/SystemTray.h b/Swift/Controllers/SystemTray.h
index b85de99..fd8fe01 100644
--- a/Swift/Controllers/SystemTray.h
+++ b/Swift/Controllers/SystemTray.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swiften/Elements/StatusShow.h"
+#include <Swiften/Elements/StatusShow.h>
namespace Swift {
class SystemTray {
diff --git a/Swift/Controllers/SystemTrayController.cpp b/Swift/Controllers/SystemTrayController.cpp
index aa87537..e4029e0 100644
--- a/Swift/Controllers/SystemTrayController.cpp
+++ b/Swift/Controllers/SystemTrayController.cpp
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
-#include "Swift/Controllers/SystemTrayController.h"
+#include <Swift/Controllers/SystemTrayController.h>
#include <boost/bind.hpp>
-#include "Swift/Controllers/XMPPEvents/EventController.h"
-#include "Swift/Controllers/SystemTray.h"
+#include <Swift/Controllers/SystemTray.h>
+#include <Swift/Controllers/XMPPEvents/EventController.h>
namespace Swift {
diff --git a/Swift/Controllers/SystemTrayController.h b/Swift/Controllers/SystemTrayController.h
index 202e0ec..f19b127 100644
--- a/Swift/Controllers/SystemTrayController.h
+++ b/Swift/Controllers/SystemTrayController.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swiften/Elements/StatusShow.h"
+#include <Swiften/Elements/StatusShow.h>
namespace Swift {
class EventController;
diff --git a/Swift/Controllers/UIEvents/AddContactUIEvent.h b/Swift/Controllers/UIEvents/AddContactUIEvent.h
index 50a8761..127dba2 100644
--- a/Swift/Controllers/UIEvents/AddContactUIEvent.h
+++ b/Swift/Controllers/UIEvents/AddContactUIEvent.h
@@ -1,15 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <string>
#include <set>
+#include <string>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class AddContactUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h b/Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h
index 8523a78..d19a402 100644
--- a/Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h
+++ b/Swift/Controllers/UIEvents/AddMUCBookmarkUIEvent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,9 @@
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/MUC/MUCBookmark.h"
+#include <Swiften/MUC/MUCBookmark.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class AddMUCBookmarkUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h b/Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h
index 01c59a3..602f45e 100644
--- a/Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h
+++ b/Swift/Controllers/UIEvents/EditMUCBookmarkUIEvent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,9 @@
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/MUC/MUCBookmark.h"
+#include <Swiften/MUC/MUCBookmark.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class EditMUCBookmarkUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h b/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h
index cb9d20b..70c46b0 100644
--- a/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/InviteToMUCUIEvent.h
@@ -4,14 +4,22 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
+
#pragma once
-#include <boost/shared_ptr.hpp>
#include <vector>
-#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <boost/shared_ptr.hpp>
+
#include <Swiften/JID/JID.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
namespace Swift {
class InviteToMUCUIEvent : public UIEvent {
public:
diff --git a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
index a1f91f6..8d74858 100644
--- a/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
+++ b/Swift/Controllers/UIEvents/JoinMUCUIEvent.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
+#include <string>
+
#include <boost/optional.hpp>
#include <boost/shared_ptr.hpp>
-#include <string>
#include <Swiften/JID/JID.h>
diff --git a/Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h b/Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h
index f253c2a..f6655e4 100644
--- a/Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h
+++ b/Swift/Controllers/UIEvents/RemoveMUCBookmarkUIEvent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,9 @@
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/MUC/MUCBookmark.h"
+#include <Swiften/MUC/MUCBookmark.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RemoveMUCBookmarkUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h b/Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h
index 30c2c39..95b59b1 100644
--- a/Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h
+++ b/Swift/Controllers/UIEvents/RemoveRosterItemUIEvent.h
@@ -1,13 +1,14 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swiften/JID/JID.h"
-#include "Swift/Controllers/UIEvents/UIEvent.h"
+#include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
diff --git a/Swift/Controllers/UIEvents/RenameGroupUIEvent.h b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h
index 13d2516..cea1afc 100644
--- a/Swift/Controllers/UIEvents/RenameGroupUIEvent.h
+++ b/Swift/Controllers/UIEvents/RenameGroupUIEvent.h
@@ -1,14 +1,15 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/UIEvents/UIEvent.h>
#include <string>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
namespace Swift {
class RenameGroupUIEvent : public UIEvent {
public:
diff --git a/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h b/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h
index b47575a..fbf3814 100644
--- a/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h
+++ b/Swift/Controllers/UIEvents/RenameRosterItemUIEvent.h
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
@@ -8,8 +8,9 @@
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
-#include "Swiften/MUC/MUCBookmark.h"
+#include <Swiften/MUC/MUCBookmark.h>
+
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RenameRosterItemUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h b/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h
index 284a1bd..afc0a34 100644
--- a/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestAdHocUIEvent.h
@@ -1,14 +1,13 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include <Swift/Controllers/UIInterfaces/MainWindow.h>
-
#include <Swift/Controllers/UIEvents/UIEvent.h>
+#include <Swift/Controllers/UIInterfaces/MainWindow.h>
namespace Swift {
class RequestAdHocUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h b/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
index 2a01d47..5c7e97a 100644
--- a/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestAdHocWithJIDUIEvent.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/UIEvents/UIEvent.h"
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RequestAdHocWithJIDUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h b/Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h
index ba821a7..73ad20e 100644
--- a/Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestAddUserDialogUIEvent.h
@@ -1,15 +1,16 @@
/*
- * Copyright (c) 2010-2012 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/UIEvents/UIEvent.h"
#include <string>
+
#include <Swiften/JID/JID.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RequestAddUserDialogUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h b/Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h
index 9b7abcb..6594897 100644
--- a/Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestChangeBlockStateUIEvent.h
@@ -4,12 +4,18 @@
* See Documentation/Licenses/BSD-simplified.txt for more information.
*/
-#pragma once
+/*
+ * Copyright (c) 2016 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
-#include <Swift/Controllers/UIEvents/UIEvent.h>
+#pragma once
#include <Swiften/JID/JID.h>
+#include <Swift/Controllers/UIEvents/UIEvent.h>
+
namespace Swift {
class RequestChangeBlockStateUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestChatUIEvent.h b/Swift/Controllers/UIEvents/RequestChatUIEvent.h
index 9ed9863..95d6075 100644
--- a/Swift/Controllers/UIEvents/RequestChatUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestChatUIEvent.h
@@ -1,14 +1,14 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swiften/JID/JID.h"
+#include <Swiften/JID/JID.h>
-#include "Swift/Controllers/UIEvents/UIEvent.h"
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RequestChatUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h b/Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h
index 758dabc..76aa1f7 100644
--- a/Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h
+++ b/Swift/Controllers/UIEvents/RequestChatWithUserDialogUIEvent.h
@@ -1,12 +1,12 @@
/*
- * Copyright (c) 2010 Isode Limited.
+ * Copyright (c) 2010-2016 Isode Limited.
* All rights reserved.
* See the COPYING file for more information.
*/
#pragma once
-#include "Swift/Controllers/UIEvents/UIEvent.h"
+#include <Swift/Controllers/UIEvents/UIEvent.h>
namespace Swift {
class RequestChatWithUserDialogUIEvent : public UIEvent {
diff --git a/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h b/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h
index ff67774..61ddbe9 100644
--- a/Swift/Controllers/UIEvents/RequestContactEditorUIEvent.h
+++ b/