Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-11-09 22:13:00 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-12-23 11:46:07 (GMT) |
| commit | b417643f363c3bc8c555d9eacd186f3eece089ce (patch) | |
| tree | 0d74cbc414db675afe068aa592fb4544ed719c25 /Swift/QtUI/QtSwift.cpp | |
| parent | 6dd8736e93c6881677c4132307289cccb663fe00 (diff) | |
| download | swift-b417643f363c3bc8c555d9eacd186f3eece089ce.zip swift-b417643f363c3bc8c555d9eacd186f3eece089ce.tar.bz2 | |
Make the splitter into a class
Change-Id: I26e4e979ce0af2bc922f1b3f740ed58b0c9d9d53
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index e2f2f8d..c11c3fe 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -1,36 +1,36 @@ /* * Copyright (c) 2010-2012 Kevin Smith * Licensed under the GNU General Public License v3. * See Documentation/Licenses/GPLv3.txt for more information. */ #include "QtSwift.h" #include <string> -#include <QSplitter> #include <QFile> #include <boost/bind.hpp> #include <QMessageBox> #include <QApplication> #include <QMap> #include <qdebug.h> #include <QtLoginWindow.h> #include <QtChatTabs.h> #include <QtSystemTray.h> #include <QtSoundPlayer.h> #include <QtSwiftUtil.h> #include <QtUIFactory.h> #include <QtChatWindowFactory.h> +#include <QtSingleWindow.h> #include <Swiften/Base/Log.h> #include <Swift/Controllers/Storages/CertificateFileStorageFactory.h> #include <Swift/Controllers/Storages/FileStoragesFactory.h> #include <SwifTools/Application/PlatformApplicationPathProvider.h> #include <string> #include <Swiften/Base/Platform.h> #include <Swiften/Elements/Presence.h> #include <Swiften/Client/Client.h> #include <Swift/Controllers/Settings/XMLSettingsProvider.h> #include <Swift/Controllers/Settings/SettingsProviderHierachy.h> #include <Swift/Controllers/MainController.h> #include <Swift/Controllers/ApplicationInfo.h> @@ -116,25 +116,25 @@ QMap<QString, QString> QtSwift::loadEmoticonsFile(const QString& fileName) { if (tokens.size() == 2) { emoticons[tokens[0]] = "file://" + tokens[1]; qDebug() << "Adding mapping from " << tokens[0] << " to " << tokens[1]; } } } return emoticons; } QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL), idleDetector_(&idleQuerier_, networkFactories_.getTimerFactory(), 1000) { if (options.count("netbook-mode")) { - splitter_ = new QSplitter(); + splitter_ = new QtSingleWindow(); } else { splitter_ = NULL; } QCoreApplication::setApplicationName(SWIFT_APPLICATION_NAME); QCoreApplication::setOrganizationName(SWIFT_ORGANIZATION_NAME); QCoreApplication::setOrganizationDomain(SWIFT_ORGANIZATION_DOMAIN); QCoreApplication::setApplicationVersion(buildVersion); qtSettings_ = new QtSettingsProvider(); xmlSettings_ = loadSettingsFile(P2QSTRING((Paths::getExecutablePath() / "system-settings.xml").string())); settingsHierachy_ = new SettingsProviderHierachy(); settingsHierachy_->addProviderToTopOfStack(xmlSettings_); |