Swiftdiff options
| author | Peter Burgess <pete.burgess@isode.com> | 2018-05-15 16:55:13 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2018-05-18 10:41:14 (GMT) |
| commit | ccb69544950110bc1d738162ed008444340ee0aa (patch) | |
| tree | 07edbfdcff6791cd3796174ba3b000c15d5c22fb /Swift/QtUI/QtUIFactory.h | |
| parent | df3255320efe3a178bb8f7d58544962031242758 (diff) | |
| download | swift-ccb69544950110bc1d738162ed008444340ee0aa.zip swift-ccb69544950110bc1d738162ed008444340ee0aa.tar.bz2 | |
Remove remants of non-netbook mode related code
This includes removing the class QtChatTabsShortcutOnlySubstitute,
passing around QtChatTabs instead of QtChatTabsBase, removing checks
and casts relating to the possible use of either QtChatTabs or
QtChatTabsShortcutOnlySubstitute, checks to see if the splitter
exists as the splitter should now always exist.
Test-Information:
Program still builds and runs fine. Both login and main windows open
and work correctly. Chat tabs open and close without fault. Unit tests
still pass. Removing loginWindowGeometry from the config file causes
no issues.
Change-Id: Iab58ab7fd23571f4aeeb7c8a9a988bdb1500ba5b
Diffstat (limited to 'Swift/QtUI/QtUIFactory.h')
| -rw-r--r-- | Swift/QtUI/QtUIFactory.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/Swift/QtUI/QtUIFactory.h b/Swift/QtUI/QtUIFactory.h index 0b9ee3c..4013668 100644 --- a/Swift/QtUI/QtUIFactory.h +++ b/Swift/QtUI/QtUIFactory.h @@ -19,7 +19,6 @@ namespace Swift { class AutoUpdater; class Chattables; class QtChatTabs; - class QtChatTabsBase; class QtChatTheme; class QtChatWindow; class QtChatWindowFactory; @@ -36,7 +35,7 @@ namespace Swift { class QtUIFactory : public QObject, public UIFactory { Q_OBJECT public: - QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabsBase* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID); + QtUIFactory(SettingsProviderHierachy* settings, QtSettingsProvider* qtOnlySettings, QtChatTabs* tabs, QtSingleWindow* netbookSplitter, QtSystemTray* systemTray, QtChatWindowFactory* chatWindowFactory, TimerFactory* timerFactory, StatusCache* statusCache, AutoUpdater* autoUpdater, bool startMinimized, bool emoticonsExist, bool enableAdHocCommandOnJID); ~QtUIFactory(); virtual XMLConsoleWidget* createXMLConsoleWidget(); virtual HistoryWindow* createHistoryWindow(UIEventStream*); @@ -66,7 +65,6 @@ namespace Swift { private: SettingsProviderHierachy* settings_; QtSettingsProvider* qtOnlySettings_; - QtChatTabsBase* tabsBase_; QtChatTabs* tabs_; QtSingleWindow* netbookSplitter_; QtSystemTray* systemTray_; |