Swiftdiff options
Diffstat (limited to 'Slimber')
26 files changed, 136 insertions, 117 deletions
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 { |