diff options
| author | hjk <qtc-committer@nokia.com> | 2012-01-24 15:36:40 +0100 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-01-24 18:48:47 +0100 |
| commit | 4a21f0c3c8b30cd0bc5957110506e304c629a99b (patch) | |
| tree | 3d2477e3f1485ccaa319557bb2229e3f34324867 /src/plugins/updateinfo | |
| parent | c14a4756a92586424f0f1a00c6134e441db50afd (diff) | |
Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Diffstat (limited to 'src/plugins/updateinfo')
| -rw-r--r-- | src/plugins/updateinfo/updateinfoplugin.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/updateinfo/updateinfoplugin.cpp b/src/plugins/updateinfo/updateinfoplugin.cpp index 306dff690d4..6a2c336e4ef 100644 --- a/src/plugins/updateinfo/updateinfoplugin.cpp +++ b/src/plugins/updateinfo/updateinfoplugin.cpp @@ -125,7 +125,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString * d->checkUpdateInfoWatcher = new QFutureWatcher<QDomDocument>(this); connect(d->checkUpdateInfoWatcher, SIGNAL(finished()), this, SLOT(reactOnUpdaterOutput())); - QSettings *settings = Core::ICore::instance()->settings(); + QSettings *settings = Core::ICore::settings(); d->updaterProgram = settings->value(QLatin1String("Updater/Application")).toString(); d->updaterCheckOnlyArgument = settings->value(QLatin1String("Updater/CheckOnlyArgument")).toString(); d->updaterRunUiArgument = settings->value(QLatin1String("Updater/RunUiArgument")).toString(); @@ -142,9 +142,7 @@ bool UpdateInfoPlugin::initialize(const QStringList & /* arguments */, QString * return false; } - Core::ICore* const core = Core::ICore::instance(); - Core::ActionManager* const actionManager = core->actionManager(); - Core::ActionContainer* const helpActionContainer = actionManager->actionContainer(Core::Constants::M_HELP); + Core::ActionContainer* const helpActionContainer = Core::ICore::actionManager()->actionContainer(Core::Constants::M_HELP); helpActionContainer->menu()->addAction(tr("Start Updater"), this, SLOT(startUpdaterUiApplication())); //wait some time before we want to have the first check @@ -189,7 +187,7 @@ void UpdateInfoPlugin::reactOnUpdaterOutput() startCheckTimer(60 * OneMinute); } else { //added the current almost finished task to the progressmanager - d->updateInfoProgress = Core::ICore::instance()->progressManager()->addTask( + d->updateInfoProgress = Core::ICore::progressManager()->addTask( d->lastCheckUpdateInfoTask, tr("Update"), QLatin1String("Update.GetInfo"), Core::ProgressManager::KeepOnFinish); d->updateInfoProgress->setKeepOnFinish(Core::FutureProgress::KeepOnFinish); |