summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-06-04 12:00:47 (GMT)
committerCatalin Badea <catalin.badea392@gmail.com>2012-06-19 20:21:54 (GMT)
commit8e90fc4fb400b925dfb7897b47ecb1ffd0d13538 (patch)
treea6814b14391badfc5b85d8645a112e64bc731968 /Swift/Controllers/HistoryController.h
parent250ba9152e6b09e1654e18040cffa0d1c31434ec (diff)
downloadswift-contrib-8e90fc4fb400b925dfb7897b47ecb1ffd0d13538.zip
swift-contrib-8e90fc4fb400b925dfb7897b47ecb1ffd0d13538.tar.bz2
Disconnect history controller from the event stream. Fixed coding style
Diffstat (limited to 'Swift/Controllers/HistoryController.h')
-rw-r--r--Swift/Controllers/HistoryController.h9
1 files changed, 5 insertions, 4 deletions
diff --git a/Swift/Controllers/HistoryController.h b/Swift/Controllers/HistoryController.h
index 465b037..47ae361 100644
--- a/Swift/Controllers/HistoryController.h
+++ b/Swift/Controllers/HistoryController.h
@@ -1,16 +1,16 @@
/*
* Copyright (c) 2012 Catalin Badea
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Licensed under the simplified BSD license.
+ * See Documentation/Licenses/BSD-simplified.txt for more information.
*/
#pragma once
-#include "Swiften/Base/boost_bsignals.h"
+#include <Swiften/Base/boost_bsignals.h>
#include <boost/bind.hpp>
#include <boost/shared_ptr.hpp>
-#include "Swift/Controllers/UIEvents/UIEventStream.h"
+#include <Swift/Controllers/UIEvents/UIEventStream.h>
namespace Swift {
class HistoryWindowFactory;
@@ -25,6 +25,7 @@ namespace Swift {
void handleUIEvent(boost::shared_ptr<UIEvent> event);
private:
+ UIEventStream* uiEventStream_;
HistoryWindowFactory* historyWindowFactory_;
HistoryWindow* historyWindow_;
};