2 files changed, 16 insertions, 8 deletions
diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp
index cce139b..f439429 100644
--- a/Swift/Controllers/HistoryController.cpp
+++ b/Swift/Controllers/HistoryController.cpp
@@ -3,24 +3,27 @@
 * Licensed under the simplified BSD license.
 * See Documentation/Licenses/BSD-simplified.txt for more information.
 */
 /*
- * Copyright (c) 2014 Isode Limited.
+ * Copyright (c) 2014-2015 Isode Limited.
 * All rights reserved.
 * See the COPYING file for more information.
 */
 #include <Swift/Controllers/HistoryController.h>
-#include <Swiften/History/HistoryStorage.h>
-#include <Swiften/History/HistoryMessage.h>
 #include <boost/date_time/c_local_time_adjustor.hpp>
+#include <Swiften/History/HistoryMessage.h>
+#include <Swiften/History/HistoryStorage.h>
+#include <Swiften/JID/JID.h>
 namespace Swift {
-HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage), remoteArchiveSupported_(false) {
+HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage) {
 }
 HistoryController::~HistoryController() {
 }
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h
index 8c86409..0bdbb35 100644
--- a/Swift/Controllers/HistoryController.h
+++ b/Swift/Controllers/HistoryController.h
@@ -2,16 +2,22 @@
 * Copyright (c) 2012 Catalin Badea
 * Licensed under the simplified BSD license.
 * See Documentation/Licenses/BSD-simplified.txt for more information.
 */
+/*
+ * Copyright (c) 2015 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
+ */
 #pragma once
-#include <Swiften/JID/JID.h>
-#include <boost/date_time/posix_time/posix_time.hpp>
 #include <vector>
-#include <set>
+#include <boost/date_time/posix_time/posix_time.hpp>
 #include <Swiften/Base/boost_bsignals.h>
 #include <Swiften/History/HistoryMessage.h>
 #include <Swiften/History/HistoryStorage.h>
 namespace Swift {
@@ -33,8 +39,7 @@ namespace Swift {
                        boost::signal<void (const HistoryMessage&)> onNewMessage;
                private:
                        HistoryStorage* localHistory_;
-                        bool remoteArchiveSupported_;
        };
 }

diff --git a/Swift/Controllers/HistoryController.cpp b/Swift/Controllers/HistoryController.cpp index cce139b..f439429 100644 --- a/Swift/Controllers/HistoryController.cpp +++ b/Swift/Controllers/HistoryController.cpp
@@ -3,24 +3,27 @@
3	* Licensed under the simplified BSD license.	3	* Licensed under the simplified BSD license.
4	* See Documentation/Licenses/BSD-simplified.txt for more information.	4	* See Documentation/Licenses/BSD-simplified.txt for more information.
5	*/	5	*/
6		6
7	/*	7	/*
8	* Copyright (c) 2014 Isode Limited.	8	* Copyright (c) 2014-2015 Isode Limited.
9	* All rights reserved.	9	* All rights reserved.
10	* See the COPYING file for more information.	10	* See the COPYING file for more information.
11	*/	11	*/
12		12
13		13
14	#include <Swift/Controllers/HistoryController.h>	14	#include <Swift/Controllers/HistoryController.h>
15	#include <Swiften/History/HistoryStorage.h>	15
16	#include <Swiften/History/HistoryMessage.h>
17	#include <boost/date_time/c_local_time_adjustor.hpp>	16	#include <boost/date_time/c_local_time_adjustor.hpp>
18		17
		18	#include <Swiften/History/HistoryMessage.h>
		19	#include <Swiften/History/HistoryStorage.h>
		20	#include <Swiften/JID/JID.h>
		21
19	namespace Swift {	22	namespace Swift {
20		23
21	HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage), remoteArchiveSupported_(false) {	24	HistoryController::HistoryController(HistoryStorage* localHistoryStorage) : localHistory_(localHistoryStorage) {
22	}	25	}
23		26
24	HistoryController::~HistoryController() {	27	HistoryController::~HistoryController() {
25	}	28	}
26		29


diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h index 8c86409..0bdbb35 100644 --- a/Swift/Controllers/HistoryController.h +++ b/Swift/Controllers/HistoryController.h
@@ -2,16 +2,22 @@
2	* Copyright (c) 2012 Catalin Badea	2	* Copyright (c) 2012 Catalin Badea
3	* Licensed under the simplified BSD license.	3	* Licensed under the simplified BSD license.
4	* See Documentation/Licenses/BSD-simplified.txt for more information.	4	* See Documentation/Licenses/BSD-simplified.txt for more information.
5	*/	5	*/
6		6
		7	/*
		8	* Copyright (c) 2015 Isode Limited.
		9	* All rights reserved.
		10	* See the COPYING file for more information.
		11	*/
		12
7	#pragma once	13	#pragma once
8		14
9	#include <Swiften/JID/JID.h>
10	#include <boost/date_time/posix_time/posix_time.hpp>
11	#include <vector>	15	#include <vector>
12	#include <set>	16
		17	#include <boost/date_time/posix_time/posix_time.hpp>
		18
13	#include <Swiften/Base/boost_bsignals.h>	19	#include <Swiften/Base/boost_bsignals.h>
14	#include <Swiften/History/HistoryMessage.h>	20	#include <Swiften/History/HistoryMessage.h>
15	#include <Swiften/History/HistoryStorage.h>	21	#include <Swiften/History/HistoryStorage.h>
16		22
17	namespace Swift {	23	namespace Swift {
@@ -33,8 +39,7 @@ namespace Swift {
33		39
34	boost::signal<void (const HistoryMessage&)> onNewMessage;	40	boost::signal<void (const HistoryMessage&)> onNewMessage;
35		41
36	private:	42	private:
37	HistoryStorage* localHistory_;	43	HistoryStorage* localHistory_;
38	bool remoteArchiveSupported_;
39	};	44	};
40	}	45	}