1 files changed, 37 insertions, 28 deletions
diff --git a/Swift/QtUI/QtChatWindowFactory.h b/Swift/QtUI/QtChatWindowFactory.h
index 63da514..3e4dca3 100644
--- a/Swift/QtUI/QtChatWindowFactory.h
+++ b/Swift/QtUI/QtChatWindowFactory.h
@@ -1,42 +1,51 @@
 /*
- * Copyright (c) 2010 Kevin Smith
- * Licensed under the GNU General Public License v3.
- * See Documentation/Licenses/GPLv3.txt for more information.
+ * Copyright (c) 2010-2018 Isode Limited.
+ * All rights reserved.
+ * See the COPYING file for more information.
  */
 
 #pragma once
 
-#include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
+#include <map>
+#include <string>
 
+#include <QMenu>
 #include <QObject>
 #include <QSplitter>
+#include <QVBoxLayout>
 
 #include <Swiften/JID/JID.h>
+
+#include <Swift/Controllers/UIInterfaces/ChatWindowFactory.h>
+
+#include <SwifTools/EmojiMapper.h>
+
+#include <Swift/QtUI/QtEmojisSelector.h>
 #include <Swift/QtUI/QtSettingsProvider.h>
 
 namespace Swift {
-	class QtChatTabs;
-	class QtChatTheme;
-	class UIEventStream;
-	class QtUIPreferences;
-	class QtSingleWindow;
-	class QtChatWindowFactory : public QObject, public ChatWindowFactory {
-		Q_OBJECT
-		public:
-			QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath);
-			~QtChatWindowFactory();
-			ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream);
-		signals:
-			void changeSplitterState(QByteArray);
-		private slots:
-			void handleWindowGeometryChanged();
-			void handleSplitterMoved();
-		private:
-			QString themePath_;
-			SettingsProvider* settings_;
-			QtSettingsProvider* qtOnlySettings_;
-			QtChatTabs* tabs_;
-			QtChatTheme* theme_;
-	};
+    class QtChatTabs;
+    class QtChatTheme;
+    class UIEventStream;
+    class QtUIPreferences;
+    class QtSingleWindow;
+    class QtChatWindowFactory : public QObject, public ChatWindowFactory {
+        Q_OBJECT
+        public:
+            QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticonsMap);
+            ~QtChatWindowFactory();
+            ChatWindow* createChatWindow(const JID &contact, UIEventStream* eventStream);
+        signals:
+            void changeSplitterState(QByteArray);
+        private slots:
+            void handleWindowGeometryChanged();
+            void handleSplitterMoved();
+        private:
+            QString themePath_;
+            SettingsProvider* settings_;
+            QtSettingsProvider* qtOnlySettings_;
+            QtChatTabs* tabs_;
+            QtChatTheme* theme_;
+            std::map<std::string, std::string> emoticonsMap_;
+    };
 }
-