summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCatalin Badea <catalin.badea392@gmail.com>2012-06-04 12:00:47 (GMT)
committerCătălin Badea <catalin.badea392@gmail.com>2012-08-11 15:45:27 (GMT)
commitab658eccab4955e338db8f42accd847fd6a9c106 (patch)
treeb9f796c517c6187925aeaf1b20901ee4f9ed401f /Swift/Controllers/HistoryController.h
parentc09901d69a0b606d8f16a3496c0c4f24c3c7aa1b (diff)
downloadswift-contrib-ab658eccab4955e338db8f42accd847fd6a9c106.zip
swift-contrib-ab658eccab4955e338db8f42accd847fd6a9c106.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_;
};