Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2016-03-29 17:27:10 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2016-03-30 11:24:00 (GMT) |
| commit | 5de19b60ae5593adbc3d913f9c64162e21bc702a (patch) | |
| tree | 07d3e7a9e6105609858931154ee7fbfc599bd34a /Swiften/History | |
| parent | 74e51310d27e9d9a66d2d790360549c48abec8d1 (diff) | |
| download | swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.zip swift-5de19b60ae5593adbc3d913f9c64162e21bc702a.tar.bz2 | |
Apply consistent #include grouping and sorting style
Changed "" style includes to <> style.
Test-Information:
Build with Clang 3.9.0 and ran all tests on OS X 10.11.4.
Change-Id: Ic05e53f2e5dba39cc1307b116fc5f17b62ab9eb8
Diffstat (limited to 'Swiften/History')
| -rw-r--r-- | Swiften/History/HistoryMessage.h | 7 | ||||
| -rw-r--r-- | Swiften/History/HistoryStorage.h | 10 | ||||
| -rw-r--r-- | Swiften/History/SQLiteHistoryStorage.cpp | 9 | ||||
| -rw-r--r-- | Swiften/History/SQLiteHistoryStorage.h | 6 | ||||
| -rw-r--r-- | Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp | 5 |
5 files changed, 22 insertions, 15 deletions
diff --git a/Swiften/History/HistoryMessage.h b/Swiften/History/HistoryMessage.h index cf33b0c..e07ef60 100644 --- a/Swiften/History/HistoryMessage.h +++ b/Swiften/History/HistoryMessage.h @@ -1,15 +1,16 @@ /* - * 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 <Swiften/JID/JID.h> -#include <Swiften/Base/API.h> #include <boost/date_time/posix_time/posix_time_types.hpp> +#include <Swiften/Base/API.h> +#include <Swiften/JID/JID.h> + namespace Swift { class SWIFTEN_API HistoryMessage { public: diff --git a/Swiften/History/HistoryStorage.h b/Swiften/History/HistoryStorage.h index 99ade51..ee8f15b 100644 --- a/Swiften/History/HistoryStorage.h +++ b/Swiften/History/HistoryStorage.h @@ -1,18 +1,20 @@ /* - * 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 <set> #include <map> +#include <set> #include <vector> + +#include <boost/date_time/gregorian/gregorian_types.hpp> + #include <Swiften/Base/API.h> -#include <Swiften/JID/JID.h> #include <Swiften/History/HistoryMessage.h> -#include <boost/date_time/gregorian/gregorian_types.hpp> +#include <Swiften/JID/JID.h> namespace Swift { typedef std::map<JID, std::set<boost::gregorian::date> > ContactsMap; diff --git a/Swiften/History/SQLiteHistoryStorage.cpp b/Swiften/History/SQLiteHistoryStorage.cpp index feb90d2..8306803 100644 --- a/Swiften/History/SQLiteHistoryStorage.cpp +++ b/Swiften/History/SQLiteHistoryStorage.cpp @@ -1,16 +1,19 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <Swiften/History/SQLiteHistoryStorage.h> + #include <iostream> + +#include <boost/date_time/gregorian/gregorian.hpp> #include <boost/lexical_cast.hpp> #include <boost/numeric/conversion/cast.hpp> #include <sqlite3.h> -#include <Swiften/History/SQLiteHistoryStorage.h> -#include <boost/date_time/gregorian/gregorian.hpp> + #include <Swiften/Base/Path.h> inline std::string getEscapedString(const std::string& s) { diff --git a/Swiften/History/SQLiteHistoryStorage.h b/Swiften/History/SQLiteHistoryStorage.h index 73352b1..95b13b9 100644 --- a/Swiften/History/SQLiteHistoryStorage.h +++ b/Swiften/History/SQLiteHistoryStorage.h @@ -1,17 +1,17 @@ /* - * 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 <boost/filesystem/path.hpp> #include <boost/optional.hpp> +#include <boost/thread.hpp> #include <Swiften/Base/API.h> #include <Swiften/History/HistoryStorage.h> -#include <boost/thread.hpp> -#include <boost/filesystem/path.hpp> struct sqlite3; diff --git a/Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp b/Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp index 02c9c69..560c992 100644 --- a/Swiften/History/UnitTest/SQLiteHistoryManagerTest.cpp +++ b/Swiften/History/UnitTest/SQLiteHistoryManagerTest.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 <boost/date_time/posix_time/posix_time.hpp> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/date_time/posix_time/posix_time.hpp> #include <Swiften/History/SQLiteHistoryManager.h> |