Swiftdiff options
Diffstat (limited to 'SwifTools')
36 files changed, 168 insertions, 85 deletions
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; |