Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-07-11 11:37:43 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-07-11 11:37:43 (GMT) |
| commit | 127355ccda505bbfcfa93d1f1304e6027c55516c (patch) | |
| tree | 6236bcc102cdffd7cf88d639ef4daeae618dfd64 /Swift/QtUI | |
| parent | 1a88be2c3755de25464e403049a95ddd7fca327c (diff) | |
| download | swift-contrib-127355ccda505bbfcfa93d1f1304e6027c55516c.zip swift-contrib-127355ccda505bbfcfa93d1f1304e6027c55516c.tar.bz2 | |
Make IdleDetector a parameter of MainController.
Diffstat (limited to 'Swift/QtUI')
| -rw-r--r-- | Swift/QtUI/QtSwift.cpp | 3 | ||||
| -rw-r--r-- | Swift/QtUI/QtSwift.h | 4 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp index 1d820b1..398150e 100644 --- a/Swift/QtUI/QtSwift.cpp +++ b/Swift/QtUI/QtSwift.cpp @@ -80,7 +80,7 @@ po::options_description QtSwift::getOptionsDescription() { } -QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL) { +QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMainThreadCaller_), autoUpdater_(NULL), idleDetector_(&idleQuerier_, networkFactories_->getTimerFactory(), 1000) { if (options.count("netbook-mode")) { splitter_ = new QSplitter(); } else { @@ -165,6 +165,7 @@ QtSwift::QtSwift(const po::variables_map& options) : networkFactories_(&clientMa dock_, notifier_, uriHandler_, + &idleDetector_, options.count("latency-debug") > 0, eagleMode); mainControllers_.push_back(mainController); diff --git a/Swift/QtUI/QtSwift.h b/Swift/QtUI/QtSwift.h index 4bf5c97..7f33475 100644 --- a/Swift/QtUI/QtSwift.h +++ b/Swift/QtUI/QtSwift.h @@ -21,6 +21,8 @@ #if defined(SWIFTEN_PLATFORM_WINDOWS) #include "WindowsNotifier.h" #endif +#include "SwifTools/Idle/PlatformIdleQuerier.h" +#include "SwifTools/Idle/ActualIdleDetector.h" namespace po = boost::program_options; @@ -71,6 +73,8 @@ namespace Swift { CertificateStorageFactory* certificateStorageFactory_; AutoUpdater* autoUpdater_; Notifier* notifier_; + PlatformIdleQuerier idleQuerier_; + ActualIdleDetector idleDetector_; #if defined(SWIFTEN_PLATFORM_MACOSX) CocoaApplication cocoaApplication_; #endif |