summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Voicu <vladvoic@gmail.com>2011-05-23 19:57:30 (GMT)
committerVlad Voicu <vladvoic@gmail.com>2011-05-31 18:34:03 (GMT)
commit12646034589e653027b2b2e82ecf2589586da129 (patch)
tree8d2631c66e088d1c68b072a36cc3f7fa3c73251c
parent494fbd58cfde0ed3cfe0304ce40ceb363378caf2 (diff)
downloadswift-contrib-12646034589e653027b2b2e82ecf2589586da129.zip
swift-contrib-12646034589e653027b2b2e82ecf2589586da129.tar.bz2
Roster Controller deletion from HistoryController
-rw-r--r--Swift/Controllers/ViewHistoryController.cpp2
-rw-r--r--Swift/Controllers/ViewHistoryController.h2
2 files changed, 1 insertions, 3 deletions
diff --git a/Swift/Controllers/ViewHistoryController.cpp b/Swift/Controllers/ViewHistoryController.cpp
index 19b4abb..4b285ec 100644
--- a/Swift/Controllers/ViewHistoryController.cpp
+++ b/Swift/Controllers/ViewHistoryController.cpp
@@ -15,7 +15,7 @@
namespace Swift {
-ViewHistoryController::ViewHistoryController(ViewHistoryWindowFactory* viewHistoryWindowFactory, UIEventStream* uiEventStream): rosterController(rosterController), viewHistoryWindowFactory(viewHistoryWindowFactory), uiEventStream(uiEventStream), viewHistoryWindow(NULL) {
+ViewHistoryController::ViewHistoryController(ViewHistoryWindowFactory* viewHistoryWindowFactory, UIEventStream* uiEventStream): viewHistoryWindowFactory(viewHistoryWindowFactory), uiEventStream(uiEventStream), viewHistoryWindow(NULL) {
uiEventStream->onUIEvent.connect(boost::bind(&ViewHistoryController::handleUIEvent, this, _1));
}
diff --git a/Swift/Controllers/ViewHistoryController.h b/Swift/Controllers/ViewHistoryController.h
index 1e806f9..39f23be 100644
--- a/Swift/Controllers/ViewHistoryController.h
+++ b/Swift/Controllers/ViewHistoryController.h
@@ -12,7 +12,6 @@ namespace Swift {
class UIEventStream;
class ViewHistoryWindowFactory;
class ViewHistoryWindow;
- class RosterController;
class ViewHistoryController {
public:
ViewHistoryController(ViewHistoryWindowFactory* viewHistoryWindowFactory, UIEventStream* uiEventStream);
@@ -21,7 +20,6 @@ namespace Swift {
private:
void handleUIEvent(UIEvent::ref event);
- RosterController* rosterController;
ViewHistoryWindowFactory* viewHistoryWindowFactory;
UIEventStream* uiEventStream;
ViewHistoryWindow* viewHistoryWindow;