Swiftdiff options
Diffstat (limited to 'Swiften/Avatars')
| -rw-r--r-- | Swiften/Avatars/AvatarManager.h | 4 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarManagerImpl.cpp | 6 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarMemoryStorage.h | 6 | ||||
| -rw-r--r-- | Swiften/Avatars/AvatarStorage.h | 5 | ||||
| -rw-r--r-- | Swiften/Avatars/CombinedAvatarProvider.cpp | 3 | ||||
| -rw-r--r-- | Swiften/Avatars/CombinedAvatarProvider.h | 6 | ||||
| -rw-r--r-- | Swiften/Avatars/DummyAvatarManager.h | 4 | ||||
| -rw-r--r-- | Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp | 24 | ||||
| -rw-r--r-- | Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp | 22 | ||||
| -rw-r--r-- | Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp | 19 | ||||
| -rw-r--r-- | Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp | 21 | ||||
| -rw-r--r-- | Swiften/Avatars/VCardAvatarManager.cpp | 10 | ||||
| -rw-r--r-- | Swiften/Avatars/VCardAvatarManager.h | 4 | ||||
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.cpp | 12 | ||||
| -rw-r--r-- | Swiften/Avatars/VCardUpdateAvatarManager.h | 11 |
15 files changed, 83 insertions, 74 deletions
diff --git a/Swiften/Avatars/AvatarManager.h b/Swiften/Avatars/AvatarManager.h index b717959..20b4725 100644 --- a/Swiften/Avatars/AvatarManager.h +++ b/Swiften/Avatars/AvatarManager.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. */ @@ -9,8 +9,8 @@ #include <boost/filesystem/path.hpp> #include <Swiften/Base/API.h> -#include <Swiften/Base/boost_bsignals.h> #include <Swiften/Base/ByteArray.h> +#include <Swiften/Base/boost_bsignals.h> namespace Swift { class JID; diff --git a/Swiften/Avatars/AvatarManagerImpl.cpp b/Swiften/Avatars/AvatarManagerImpl.cpp index fb924c6..f15c16c 100644 --- a/Swiften/Avatars/AvatarManagerImpl.cpp +++ b/Swiften/Avatars/AvatarManagerImpl.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. */ @@ -8,10 +8,10 @@ #include <boost/bind.hpp> -#include <Swiften/Avatars/VCardUpdateAvatarManager.h> -#include <Swiften/Avatars/VCardAvatarManager.h> #include <Swiften/Avatars/AvatarStorage.h> #include <Swiften/Avatars/OfflineAvatarManager.h> +#include <Swiften/Avatars/VCardAvatarManager.h> +#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/Base/ByteArray.h> namespace Swift { diff --git a/Swiften/Avatars/AvatarMemoryStorage.h b/Swiften/Avatars/AvatarMemoryStorage.h index bd67e74..7a4bdd3 100644 --- a/Swiften/Avatars/AvatarMemoryStorage.h +++ b/Swiften/Avatars/AvatarMemoryStorage.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. */ @@ -9,10 +9,10 @@ #include <map> #include <string> -#include <Swiften/Base/ByteArray.h> #include <Swiften/Avatars/AvatarStorage.h> -#include <Swiften/JID/JID.h> #include <Swiften/Base/API.h> +#include <Swiften/Base/ByteArray.h> +#include <Swiften/JID/JID.h> namespace Swift { class SWIFTEN_API AvatarMemoryStorage : public AvatarStorage { diff --git a/Swiften/Avatars/AvatarStorage.h b/Swiften/Avatars/AvatarStorage.h index 01151c2..2885dd0 100644 --- a/Swiften/Avatars/AvatarStorage.h +++ b/Swiften/Avatars/AvatarStorage.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 <boost/filesystem/path.hpp> #include <string> +#include <boost/filesystem/path.hpp> + #include <Swiften/Base/API.h> #include <Swiften/Base/ByteArray.h> diff --git a/Swiften/Avatars/CombinedAvatarProvider.cpp b/Swiften/Avatars/CombinedAvatarProvider.cpp index 4fa4c2b..896346f 100644 --- a/Swiften/Avatars/CombinedAvatarProvider.cpp +++ b/Swiften/Avatars/CombinedAvatarProvider.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 <Swiften/Avatars/CombinedAvatarProvider.h> #include <algorithm> + #include <boost/bind.hpp> #include <Swiften/Base/Log.h> diff --git a/Swiften/Avatars/CombinedAvatarProvider.h b/Swiften/Avatars/CombinedAvatarProvider.h index d8c045c..c458514 100644 --- a/Swiften/Avatars/CombinedAvatarProvider.h +++ b/Swiften/Avatars/CombinedAvatarProvider.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 <vector> #include <map> +#include <vector> -#include <Swiften/Base/API.h> #include <Swiften/Avatars/AvatarProvider.h> +#include <Swiften/Base/API.h> #include <Swiften/JID/JID.h> namespace Swift { diff --git a/Swiften/Avatars/DummyAvatarManager.h b/Swiften/Avatars/DummyAvatarManager.h index f6f075f..7d0793c 100644 --- a/Swiften/Avatars/DummyAvatarManager.h +++ b/Swiften/Avatars/DummyAvatarManager.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 <map> -#include <Swiften/JID/JID.h> #include <Swiften/Avatars/AvatarManager.h> +#include <Swiften/JID/JID.h> namespace Swift { class DummyAvatarManager : public AvatarManager { diff --git a/Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp b/Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp index 146676a..d3004cd 100644 --- a/Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp +++ b/Swiften/Avatars/UnitTest/AvatarManagerImplTest.cpp @@ -1,30 +1,32 @@ /* - * Copyright (c) 2014 Isode Limited. + * Copyright (c) 2014-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ +#include <string> + +#include <boost/bind.hpp> + #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/bind.hpp> -#include <Swiften/JID/JID.h> -#include <string> #include <Swiften/Avatars/AvatarManagerImpl.h> +#include <Swiften/Avatars/AvatarMemoryStorage.h> #include <Swiften/Avatars/CombinedAvatarProvider.h> -#include <Swiften/Avatars/VCardAvatarManager.h> #include <Swiften/Avatars/OfflineAvatarManager.h> -#include <Swiften/Elements/VCardUpdate.h> -#include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/Avatars/VCardAvatarManager.h> +#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/Client/DummyStanzaChannel.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/Elements/VCardUpdate.h> +#include <Swiften/JID/JID.h> +#include <Swiften/MUC/MUCRegistry.h> #include <Swiften/Queries/IQRouter.h> -#include <Swiften/Avatars/AvatarMemoryStorage.h> -#include <Swiften/VCards/VCardMemoryStorage.h> -#include <Swiften/VCards/VCardManager.h> -#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/VCards/VCardManager.h> +#include <Swiften/VCards/VCardMemoryStorage.h> using namespace Swift; diff --git a/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp b/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp index 58bf6fd..1a18585 100644 --- a/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp +++ b/Swiften/Avatars/UnitTest/CombinedAvatarProviderTest.cpp @@ -1,28 +1,30 @@ /* - * Copyright (c) 2010 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 <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/bind.hpp> -#include <Swiften/JID/JID.h> -#include <string> +#include <Swiften/Avatars/AvatarMemoryStorage.h> #include <Swiften/Avatars/CombinedAvatarProvider.h> -#include <Swiften/Avatars/VCardAvatarManager.h> #include <Swiften/Avatars/OfflineAvatarManager.h> -#include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/Avatars/VCardAvatarManager.h> +#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/Client/DummyStanzaChannel.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/JID/JID.h> +#include <Swiften/MUC/MUCRegistry.h> #include <Swiften/Queries/IQRouter.h> -#include <Swiften/Avatars/AvatarMemoryStorage.h> -#include <Swiften/VCards/VCardMemoryStorage.h> -#include <Swiften/VCards/VCardManager.h> -#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/VCards/VCardManager.h> +#include <Swiften/VCards/VCardMemoryStorage.h> using namespace Swift; diff --git a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp index 0ac0b70..2f585aa 100644 --- a/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp +++ b/Swiften/Avatars/UnitTest/VCardAvatarManagerTest.cpp @@ -1,27 +1,28 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include <Swiften/Base/ByteArray.h> +#include <boost/bind.hpp> + #include <QA/Checker/IO.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/bind.hpp> -#include <Swiften/Elements/VCard.h> -#include <Swiften/Avatars/VCardAvatarManager.h> -#include <Swiften/VCards/VCardMemoryStorage.h> #include <Swiften/Avatars/AvatarMemoryStorage.h> -#include <Swiften/VCards/VCardManager.h> -#include <Swiften/MUC/MUCRegistry.h> -#include <Swiften/Queries/IQRouter.h> +#include <Swiften/Avatars/VCardAvatarManager.h> +#include <Swiften/Base/ByteArray.h> #include <Swiften/Client/DummyStanzaChannel.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/Elements/VCard.h> +#include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/Queries/IQRouter.h> #include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/VCards/VCardManager.h> +#include <Swiften/VCards/VCardMemoryStorage.h> using namespace Swift; diff --git a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp index 80b5718..f9747a1 100644 --- a/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp +++ b/Swiften/Avatars/UnitTest/VCardUpdateAvatarManagerTest.cpp @@ -1,27 +1,28 @@ /* - * Copyright (c) 2010-2013 Isode Limited. + * Copyright (c) 2010-2016 Isode Limited. * All rights reserved. * See the COPYING file for more information. */ -#include <Swiften/Base/ByteArray.h> +#include <boost/bind.hpp> + #include <QA/Checker/IO.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/extensions/TestFactoryRegistry.h> -#include <boost/bind.hpp> -#include <Swiften/Elements/VCardUpdate.h> -#include <Swiften/Avatars/VCardUpdateAvatarManager.h> #include <Swiften/Avatars/AvatarMemoryStorage.h> -#include <Swiften/VCards/VCardMemoryStorage.h> -#include <Swiften/VCards/VCardManager.h> -#include <Swiften/MUC/MUCRegistry.h> -#include <Swiften/Queries/IQRouter.h> +#include <Swiften/Avatars/VCardUpdateAvatarManager.h> +#include <Swiften/Base/ByteArray.h> #include <Swiften/Client/DummyStanzaChannel.h> -#include <Swiften/StringCodecs/Hexify.h> #include <Swiften/Crypto/CryptoProvider.h> #include <Swiften/Crypto/PlatformCryptoProvider.h> +#include <Swiften/Elements/VCardUpdate.h> +#include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/Queries/IQRouter.h> +#include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/VCards/VCardManager.h> +#include <Swiften/VCards/VCardMemoryStorage.h> using namespace Swift; diff --git a/Swiften/Avatars/VCardAvatarManager.cpp b/Swiften/Avatars/VCardAvatarManager.cpp index 4960900..675cd00 100644 --- a/Swiften/Avatars/VCardAvatarManager.cpp +++ b/Swiften/Avatars/VCardAvatarManager.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. */ @@ -8,13 +8,13 @@ #include <boost/bind.hpp> -#include <Swiften/Elements/VCard.h> -#include <Swiften/Crypto/CryptoProvider.h> -#include <Swiften/StringCodecs/Hexify.h> #include <Swiften/Avatars/AvatarStorage.h> +#include <Swiften/Base/Log.h> +#include <Swiften/Crypto/CryptoProvider.h> +#include <Swiften/Elements/VCard.h> #include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/StringCodecs/Hexify.h> #include <Swiften/VCards/VCardManager.h> -#include <Swiften/Base/Log.h> namespace Swift { diff --git a/Swiften/Avatars/VCardAvatarManager.h b/Swiften/Avatars/VCardAvatarManager.h index 74f36a1..d914da3 100644 --- a/Swiften/Avatars/VCardAvatarManager.h +++ b/Swiften/Avatars/VCardAvatarManager.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 <Swiften/Base/API.h> #include <Swiften/Avatars/AvatarProvider.h> +#include <Swiften/Base/API.h> #include <Swiften/JID/JID.h> namespace Swift { diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.cpp b/Swiften/Avatars/VCardUpdateAvatarManager.cpp index a21cd41..42c210d 100644 --- a/Swiften/Avatars/VCardUpdateAvatarManager.cpp +++ b/Swiften/Avatars/VCardUpdateAvatarManager.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. */ @@ -8,15 +8,15 @@ #include <boost/bind.hpp> +#include <Swiften/Avatars/AvatarStorage.h> +#include <Swiften/Base/Log.h> #include <Swiften/Client/StanzaChannel.h> -#include <Swiften/Elements/VCardUpdate.h> -#include <Swiften/VCards/GetVCardRequest.h> #include <Swiften/Crypto/CryptoProvider.h> -#include <Swiften/StringCodecs/Hexify.h> -#include <Swiften/Avatars/AvatarStorage.h> +#include <Swiften/Elements/VCardUpdate.h> #include <Swiften/MUC/MUCRegistry.h> +#include <Swiften/StringCodecs/Hexify.h> +#include <Swiften/VCards/GetVCardRequest.h> #include <Swiften/VCards/VCardManager.h> -#include <Swiften/Base/Log.h> namespace Swift { diff --git a/Swiften/Avatars/VCardUpdateAvatarManager.h b/Swiften/Avatars/VCardUpdateAvatarManager.h index 3d6d73a..ffc615e 100644 --- a/Swiften/Avatars/VCardUpdateAvatarManager.h +++ b/Swiften/Avatars/VCardUpdateAvatarManager.h @@ -1,20 +1,21 @@ /* - * 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/shared_ptr.hpp> #include <map> -#include <Swiften/Base/API.h> +#include <boost/shared_ptr.hpp> + #include <Swiften/Avatars/AvatarProvider.h> -#include <Swiften/JID/JID.h> +#include <Swiften/Base/API.h> +#include <Swiften/Elements/ErrorPayload.h> #include <Swiften/Elements/Presence.h> #include <Swiften/Elements/VCard.h> -#include <Swiften/Elements/ErrorPayload.h> +#include <Swiften/JID/JID.h> namespace Swift { class MUCRegistry; |