3 files changed, 7 insertions, 5 deletions
diff --git a/Swift/Controllers/UIInterfaces/ChatWindow.h b/Swift/Controllers/UIInterfaces/ChatWindow.h
index 0463508..33133f3 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindow.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindow.h
@@ -19,6 +19,7 @@
 namespace Swift {
 	class AvatarManager;
 	class TreeWidget;
+	class Roster;
 
 	class ChatWindow {
 		public:
@@ -38,10 +39,11 @@ namespace Swift {
 			virtual void setSecurityLabelsEnabled(bool enabled) = 0;
 			virtual void setUnreadMessageCount(int count) = 0;
 			virtual void convertToMUC() = 0;
-			virtual TreeWidget *getTreeWidget() = 0;
+//			virtual TreeWidget *getTreeWidget() = 0;
 			virtual void setSecurityLabelsError() = 0;
 			virtual SecurityLabel getSelectedSecurityLabel() = 0;
 			virtual void setInputEnabled(bool enabled) = 0;
+			virtual void setRosterModel(Roster* model) = 0;
 
 			boost::signal<void ()> onClosed;
 			boost::signal<void ()> onAllMessagesRead;
diff --git a/Swift/Controllers/UIInterfaces/ChatWindowFactory.h b/Swift/Controllers/UIInterfaces/ChatWindowFactory.h
index 3ea2416..b7b4479 100644
--- a/Swift/Controllers/UIInterfaces/ChatWindowFactory.h
+++ b/Swift/Controllers/UIInterfaces/ChatWindowFactory.h
@@ -11,14 +11,14 @@
 
 namespace Swift {
 	class ChatWindow;
-
+	class UIEventStream;
 	class ChatWindowFactory {
 		public:
 			virtual ~ChatWindowFactory() {};
 			/**
 			 * Transfers ownership of result.
 			 */
-			virtual ChatWindow* createChatWindow(const JID &contact) = 0;
+			virtual ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream) = 0;
 
 	};
 }
diff --git a/Swift/Controllers/UIInterfaces/MainWindow.h b/Swift/Controllers/UIInterfaces/MainWindow.h
index ce8b877..6d6e980 100644
--- a/Swift/Controllers/UIInterfaces/MainWindow.h
+++ b/Swift/Controllers/UIInterfaces/MainWindow.h
@@ -15,16 +15,16 @@
 #include <boost/shared_ptr.hpp>
 
 namespace Swift {
-	class TreeWidget;
+	class Roster;
 
 	class MainWindow {
 		public:
 			virtual ~MainWindow() {};
-			virtual TreeWidget* getTreeWidget() = 0;
 			virtual void setMyName(const String& name) = 0;
 			virtual void setMyAvatarPath(const String& path) = 0;
 			virtual void setMyStatusText(const String& status) = 0;
 			virtual void setMyStatusType(StatusShow::Type type) = 0;
+			virtual void setRosterModel(Roster* roster) = 0;
 			
 			boost::signal<void (const JID&)> onStartChatRequest;
 			boost::signal<void (StatusShow::Type, const String&)> onChangeStatusRequest;