summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2012-06-23 08:47:32 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-06-23 08:47:44 (GMT)
commitd1c7372f3d944ded9daf01a3ffa28da7d41fab24 (patch)
treef052f07b080043c1cc438c1d80cf7ad360467f82 /Swift/QtUI/QtSwift.cpp
parentc4f1c078ca0d6a9d6fe93655da5fb6010cc6e050 (diff)
downloadswift-contrib-d1c7372f3d944ded9daf01a3ffa28da7d41fab24.zip
swift-contrib-d1c7372f3d944ded9daf01a3ffa28da7d41fab24.tar.bz2
Fix warning
Diffstat (limited to 'Swift/QtUI/QtSwift.cpp')
-rw-r--r--Swift/QtUI/QtSwift.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index ca609de..13b2175 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -144,19 +144,19 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa
} catch (...) {
/* This seems to fail on a Mac when the .app is launched directly (the usual path).*/
numberOfAccounts = 1;
}
if (options.count("debug")) {
Swift::logging = true;
}
- tabs_ = options.count("no-tabs") && !(splitter_ > 0) ? NULL : new QtChatTabs();
+ tabs_ = options.count("no-tabs") && !splitter_ ? NULL : new QtChatTabs();
bool startMinimized = options.count("start-minimized") > 0;
applicationPathProvider_ = new PlatformApplicationPathProvider(SWIFT_APPLICATION_NAME);
storagesFactory_ = new FileStoragesFactory(applicationPathProvider_->getDataDir());
certificateStorageFactory_ = new CertificateFileStorageFactory(applicationPathProvider_->getDataDir(), tlsFactories_.getCertificateFactory());
chatWindowFactory_ = new QtChatWindowFactory(splitter_, settingsHierachy_, qtSettings_, tabs_, "", emoticons);
soundPlayer_ = new QtSoundPlayer(applicationPathProvider_);
// Ugly, because the dock depends on the tray, but the temporary
// multi-account hack creates one tray per account.