diff options
Diffstat (limited to 'src/sdk/installerbase.cpp')
| -rw-r--r-- | src/sdk/installerbase.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index 82a08411b..66503b334 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -41,7 +41,7 @@ #include <copydirectoryoperation.h> #include <errors.h> #include <init.h> -#include <kdupdaterupdateoperations.h> +#include <updateoperations.h> #include <messageboxhandler.h> #include <packagemanagercore.h> #include <packagemanagerproxyfactory.h> @@ -52,8 +52,8 @@ #include <utils.h> #include <globals.h> -#include <kdrunoncechecker.h> -#include <kdupdaterfiledownloaderfactory.h> +#include <runoncechecker.h> +#include <filedownloaderfactory.h> #include <QDirIterator> #include <QTemporaryFile> @@ -75,13 +75,13 @@ InstallerBase::~InstallerBase() int InstallerBase::run() { - KDRunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp1234865.lock")); - if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::Lockfile)) { + RunOnceChecker runCheck(qApp->applicationDirPath() + QLatin1String("/lockmyApp1234865.lock")); + if (runCheck.isRunning(RunOnceChecker::ConditionFlag::Lockfile)) { // It is possible to install an application and thus the maintenance tool into a // directory that requires elevated permission to create a lock file. Since this // cannot be done without requesting credentials from the user, we silently ignore // the fact that we could not create the lock file and check the running processes. - if (runCheck.isRunning(KDRunOnceChecker::ConditionFlag::ProcessList)) { + if (runCheck.isRunning(RunOnceChecker::ConditionFlag::ProcessList)) { QInstaller::MessageBoxHandler::information(0, QLatin1String("AlreadyRunning"), QString::fromLatin1("Waiting for %1").arg(qAppName()), QString::fromLatin1("Another %1 instance is already running. Wait " @@ -128,7 +128,7 @@ int InstallerBase::run() qCDebug(QInstaller::lcTranslations) << "Language:" << QLocale().uiLanguages() .value(0, QLatin1String("No UI language set")).toUtf8().constData(); - qDebug() << "Arguments: " << arguments().join(QLatin1String(", ")).toUtf8().constData(); + qDebug().noquote() << "Arguments:" << arguments().join(QLatin1String(", ")); SDKApp::registerMetaResources(manager.collectionByName("QResources")); if (parser.isSet(QLatin1String(CommandLineOptions::StartClient))) { @@ -314,6 +314,6 @@ QStringList InstallerBase::repositories(const QString &list) const { const QStringList items = list.split(QLatin1Char(','), QString::SkipEmptyParts); foreach (const QString &item, items) - qDebug() << "Adding custom repository:" << item.toUtf8().constData(); + qDebug().noquote() << "Adding custom repository:" << item; return items; } |