1 files changed, 55 insertions, 49 deletions
diff --git a/Swiften/VCards/VCardManager.h b/Swiften/VCards/VCardManager.h
index b7e3c32..e28e8e6 100644
--- a/Swiften/VCards/VCardManager.h
+++ b/Swiften/VCards/VCardManager.h
@@ -1,62 +1,68 @@
 /*
- * Copyright (c) 2010 Remko Tronçon
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2017 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
 #include <set>
 
+#include <boost/date_time/posix_time/posix_time.hpp>
+#include <boost/signals2.hpp>
+
 #include <Swiften/Base/API.h>
-#include <Swiften/JID/JID.h>
-#include <Swiften/Elements/VCard.h>
 #include <Swiften/Elements/ErrorPayload.h>
+#include <Swiften/Elements/VCard.h>
+#include <Swiften/JID/JID.h>
 #include <Swiften/VCards/SetVCardRequest.h>
-#include <Swiften/Base/boost_bsignals.h>
 
 namespace Swift {
-	class JID;
-	class VCardStorage;
-	class IQRouter;
-
-	class SWIFTEN_API VCardManager : public boost::bsignals::trackable {
-		public:
-			VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage);
-			~VCardManager();
-
-			VCard::ref getVCard(const JID& jid) const;
-			VCard::ref getVCardAndRequestWhenNeeded(const JID& jid);
-			void requestVCard(const JID& jid);
-			void requestOwnVCard();
-
-			std::string getPhotoHash(const JID& jid) const;
-
-
-			SetVCardRequest::ref createSetVCardRequest(VCard::ref);
-
-		public:
-			/**
-			 * The JID will always be bare.
-			 */
-			boost::signal<void (const JID&, VCard::ref)> onVCardChanged;
-
-			/**
-			 * Emitted when our own vcard changes.
-			 *
-			 * onVCardChanged will also be emitted.
-			 */
-			boost::signal<void (VCard::ref)> onOwnVCardChanged;
-
-		private:
-			void handleVCardReceived(const JID& from, VCard::ref, ErrorPayload::ref);
-			void handleSetVCardResponse(VCard::ref, ErrorPayload::ref);
-			void setVCard(const JID& jid, VCard::ref vcard);
-
-		private:
-			JID ownJID;
-			IQRouter* iqRouter;
-			VCardStorage* storage;
-			std::set<JID> requestedVCards;
-	};
+    class IQRouter;
+    class VCardStorage;
+
+    class SWIFTEN_API VCardManager : public boost::signals2::trackable {
+        public:
+            VCardManager(const JID& ownJID, IQRouter* iqRouter, VCardStorage* vcardStorage);
+            ~VCardManager();
+
+            VCard::ref getVCard(const JID& jid) const;
+            VCard::ref getVCardAndRequestWhenNeeded(const JID& jid, const boost::posix_time::time_duration& allowedAge = boost::posix_time::time_duration(boost::date_time::pos_infin));
+            void requestVCard(const JID& jid);
+            void requestOwnVCard();
+
+            std::string getPhotoHash(const JID& jid) const;
+
+
+            SetVCardRequest::ref createSetVCardRequest(VCard::ref);
+
+        public:
+            /**
+             * The JID will always be bare.
+             */
+            boost::signals2::signal<void (const JID&, VCard::ref)> onVCardChanged;
+
+            /**
+             * Emitted when we received an error on looking up a vCard.
+             */
+            boost::signals2::signal<void (const JID&, ErrorPayload::ref)> onVCardRetrievalError;
+
+            /**
+             * Emitted when our own vcard changes.
+             *
+             * onVCardChanged will also be emitted.
+             */
+            boost::signals2::signal<void (VCard::ref)> onOwnVCardChanged;
+
+        private:
+            void handleVCardReceived(const JID& from, VCard::ref, ErrorPayload::ref);
+            void handleSetVCardResponse(VCard::ref, ErrorPayload::ref);
+            void setVCard(const JID& jid, VCard::ref vcard);
+
+        private:
+            JID ownJID;
+            IQRouter* iqRouter;
+            VCardStorage* storage;
+            std::set<JID> requestedVCards;
+    };
 }