1 files changed, 8 insertions, 14 deletions
diff --git a/Swift/QtUI/QtChatWindowFactory.cpp b/Swift/QtUI/QtChatWindowFactory.cpp
index 49cfe4d..33c8b94 100644
--- a/Swift/QtUI/QtChatWindowFactory.cpp
+++ b/Swift/QtUI/QtChatWindowFactory.cpp
@@ -1,3 +1,3 @@
 /*
- * Copyright (c) 2010-2017 Isode Limited.
+ * Copyright (c) 2010-2018 Isode Limited.
  * All rights reserved.
@@ -13,3 +13,2 @@
 #include <Swift/QtUI/QtChatTabs.h>
-#include <Swift/QtUI/QtChatTabsBase.h>
 #include <Swift/QtUI/QtChatTheme.h>
@@ -25,3 +24,3 @@ static const QString CHAT_TABS_GEOMETRY = "chatTabsGeometry";
 
-QtChatWindowFactory::QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabsBase* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticonsMap) : themePath_(themePath), emoticonsMap_(emoticonsMap) {
+QtChatWindowFactory::QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvider* settings, QtSettingsProvider* qtSettings, QtChatTabs* tabs, const QString& themePath, const std::map<std::string, std::string>& emoticonsMap) : themePath_(themePath), emoticonsMap_(emoticonsMap) {
     qtOnlySettings_ = qtSettings;
@@ -30,13 +29,8 @@ QtChatWindowFactory::QtChatWindowFactory(QtSingleWindow* splitter, SettingsProvi
     theme_ = nullptr;
-    QtChatTabs* fullTabs = dynamic_cast<QtChatTabs*>(tabs_);
-    if (splitter) {
-        assert(fullTabs && "Netbook mode and no-tabs interface is not supported!");
-        splitter->addWidget(fullTabs);
-    } else if (fullTabs) {
-        QVariant chatTabsGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
-        if (chatTabsGeometryVariant.isValid()) {
-            fullTabs->restoreGeometry(chatTabsGeometryVariant.toByteArray());
-        }
-        connect(fullTabs, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
+    splitter->addWidget(tabs_);
+    QVariant chatTabsGeometryVariant = qtOnlySettings_->getQSettings()->value(CHAT_TABS_GEOMETRY);
+    if (chatTabsGeometryVariant.isValid()) {
+        tabs_->restoreGeometry(chatTabsGeometryVariant.toByteArray());
     }
+    connect(tabs_, SIGNAL(geometryChanged()), this, SLOT(handleWindowGeometryChanged()));
 }
@@ -62,3 +56,3 @@ ChatWindow* QtChatWindowFactory::createChatWindow(const JID &contact,UIEventStre
     QVariant splitterState = qtOnlySettings_->getQSettings()->value(SPLITTER_STATE);
-    if(splitterState.isValid()) {
+    if (splitterState.isValid()) {
         chatWindow->handleChangeSplitterState(splitterState.toByteArray());