From 311045065e4080ed24ef3c3811da9c9ea4711845 Mon Sep 17 00:00:00 2001 From: kh1 Date: Mon, 19 Nov 2012 16:44:52 +0100 Subject: Some changes to start compile with Qt5. Change-Id: Ie6a3ba7b3c0b24fc292d0d7444ae920dfa866a54 Reviewed-by: Tim Jenssen --- .../installer/addqtcreatorarrayvalueoperation.cpp | 4 +- src/libs/installer/binaryformat.cpp | 6 ++- src/libs/installer/binaryformatengine.h | 2 - src/libs/installer/binaryformatenginehandler.cpp | 1 - src/libs/installer/component.cpp | 2 +- src/libs/installer/component_p.cpp | 2 +- .../installer/createlocalrepositoryoperation.cpp | 2 +- src/libs/installer/fileutils.h | 2 +- src/libs/installer/getrepositorymetainfojob.cpp | 2 +- src/libs/installer/installiconsoperation.cpp | 2 +- src/libs/installer/lib7z_facade.h | 6 +-- src/libs/installer/licenseoperation.cpp | 2 +- src/libs/installer/messageboxhandler.cpp | 6 +-- src/libs/installer/messageboxhandler.h | 10 ++--- src/libs/installer/packagemanagercore.cpp | 4 +- src/libs/installer/packagemanagercore_p.cpp | 8 ++-- src/libs/installer/packagemanagergui.cpp | 46 +++++++++++----------- src/libs/installer/packagemanagergui.h | 4 +- src/libs/installer/performinstallationform.cpp | 10 ++--- src/libs/installer/qtpatchoperation.cpp | 4 +- .../installer/registerdefaultdebuggeroperation.cpp | 4 +- src/libs/installer/registerfiletypeoperation.cpp | 4 +- src/libs/installer/registerqtoperation.cpp | 4 +- src/libs/installer/registerqtv23operation.cpp | 4 +- src/libs/installer/registerqtv2operation.cpp | 4 +- src/libs/installer/registerqtvqnxoperation.cpp | 4 +- src/libs/installer/registertoolchainoperation.cpp | 4 +- src/libs/installer/selfrestartoperation.cpp | 2 +- src/libs/installer/setqtcreatorvalueoperation.cpp | 6 +-- src/libs/installer/settings.cpp | 6 +-- .../updatecreatorsettingsfrom21to22operation.cpp | 2 +- src/libs/installer/utils.cpp | 4 +- src/libs/kdtools/kdrunoncechecker.cpp | 2 +- src/libs/kdtools/kdupdaterupdateoperation.cpp | 3 +- src/libs/kdtools/kdupdaterupdatesinfo.cpp | 2 +- src/sdk/installerbase.cpp | 2 +- src/sdk/installerbase_p.cpp | 2 +- src/sdk/installerbase_p.h | 4 +- src/sdk/installerbasecommons.cpp | 10 ++--- src/sdk/settingsdialog.cpp | 6 +-- src/sdk/settingsdialog.h | 6 +-- 41 files changed, 104 insertions(+), 106 deletions(-) diff --git a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp index 43520b7b3..7072d97be 100644 --- a/src/libs/installer/addqtcreatorarrayvalueoperation.cpp +++ b/src/libs/installer/addqtcreatorarrayvalueoperation.cpp @@ -65,7 +65,7 @@ bool AddQtCreatorArrayValueOperation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name())); @@ -123,7 +123,7 @@ bool AddQtCreatorArrayValueOperation::undoOperation() return true; const QStringList args = arguments(); - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name())); diff --git a/src/libs/installer/binaryformat.cpp b/src/libs/installer/binaryformat.cpp index b3cecc7fb..8410f8ca1 100644 --- a/src/libs/installer/binaryformat.cpp +++ b/src/libs/installer/binaryformat.cpp @@ -40,8 +40,10 @@ #include -#include -#include +#include +#include +#include +#include #include diff --git a/src/libs/installer/binaryformatengine.h b/src/libs/installer/binaryformatengine.h index d5ac18a45..f7a9c0863 100644 --- a/src/libs/installer/binaryformatengine.h +++ b/src/libs/installer/binaryformatengine.h @@ -33,8 +33,6 @@ #ifndef BINARYFORMATENGINE_H #define BINARYFORMATENGINE_H -#include - #include "binaryformat.h" namespace QInstallerCreator { diff --git a/src/libs/installer/binaryformatenginehandler.cpp b/src/libs/installer/binaryformatenginehandler.cpp index 2b1bbcad4..62279b9db 100644 --- a/src/libs/installer/binaryformatenginehandler.cpp +++ b/src/libs/installer/binaryformatenginehandler.cpp @@ -36,7 +36,6 @@ #include #include -#include using namespace QInstallerCreator; diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index 9b583690c..8a2094df4 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include diff --git a/src/libs/installer/component_p.cpp b/src/libs/installer/component_p.cpp index e010bf308..fad26a1f4 100644 --- a/src/libs/installer/component_p.cpp +++ b/src/libs/installer/component_p.cpp @@ -36,7 +36,7 @@ #include "messageboxhandler.h" #include "packagemanagercore.h" -#include +#include #include diff --git a/src/libs/installer/createlocalrepositoryoperation.cpp b/src/libs/installer/createlocalrepositoryoperation.cpp index e74536b0c..068bee6b6 100644 --- a/src/libs/installer/createlocalrepositoryoperation.cpp +++ b/src/libs/installer/createlocalrepositoryoperation.cpp @@ -159,7 +159,7 @@ bool CreateLocalRepositoryOperation::performOperation() const QString repoPath = QFileInfo(args.at(1)).absoluteFilePath() + QLatin1Char('/'); // check if this is an offline version, otherwise there will be no binary data - PackageManagerCore *core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (core && !core->isOfflineOnly()) { throw QInstaller::Error(tr("Installer needs to be an offline version: %1.") .arg(QDir::toNativeSeparators(binaryPath))); diff --git a/src/libs/installer/fileutils.h b/src/libs/installer/fileutils.h index 22b7dc584..4df533dd2 100644 --- a/src/libs/installer/fileutils.h +++ b/src/libs/installer/fileutils.h @@ -105,7 +105,7 @@ private: void INSTALLER_EXPORT mkdir(const QString &path); void INSTALLER_EXPORT mkpath(const QString &path); -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN /*! Sets the .ico file at \a icon as application icon for \a application. */ diff --git a/src/libs/installer/getrepositorymetainfojob.cpp b/src/libs/installer/getrepositorymetainfojob.cpp index e538ead01..b50ea50da 100644 --- a/src/libs/installer/getrepositorymetainfojob.cpp +++ b/src/libs/installer/getrepositorymetainfojob.cpp @@ -45,7 +45,7 @@ #include #include -#include +#include #include diff --git a/src/libs/installer/installiconsoperation.cpp b/src/libs/installer/installiconsoperation.cpp index c2fee33eb..deb7bb7bd 100644 --- a/src/libs/installer/installiconsoperation.cpp +++ b/src/libs/installer/installiconsoperation.cpp @@ -147,7 +147,7 @@ bool InstallIconsOperation::performOperation() QStringList backupFiles; QStringList createdDirectories; - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); // iterate a second time to get the actual work done QDirIterator it(sourceDir.path(), QDir::Dirs | QDir::Files | QDir::Hidden | QDir::NoDotAndDotDot, diff --git a/src/libs/installer/lib7z_facade.h b/src/libs/installer/lib7z_facade.h index afdc85cfc..e61cce6ac 100644 --- a/src/libs/installer/lib7z_facade.h +++ b/src/libs/installer/lib7z_facade.h @@ -3,10 +3,8 @@ #include "installer_global.h" -#include "Common/MyWindows.h" - +#include #include -#include #include #include #include @@ -14,6 +12,8 @@ #include #include +#include "Common/MyWindows.h" + #include #include diff --git a/src/libs/installer/licenseoperation.cpp b/src/libs/installer/licenseoperation.cpp index d002afdb4..e90de2bdc 100644 --- a/src/libs/installer/licenseoperation.cpp +++ b/src/libs/installer/licenseoperation.cpp @@ -59,7 +59,7 @@ bool LicenseOperation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError( UserDefinedError ); setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name())); diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp index 30b21a0ec..3c3a70ee9 100644 --- a/src/libs/installer/messageboxhandler.cpp +++ b/src/libs/installer/messageboxhandler.cpp @@ -34,9 +34,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/libs/installer/messageboxhandler.h b/src/libs/installer/messageboxhandler.h index 367459b6f..e38853d9e 100644 --- a/src/libs/installer/messageboxhandler.h +++ b/src/libs/installer/messageboxhandler.h @@ -35,12 +35,10 @@ #include -#include -#include - -#include - -#include +#include +#include +#include +#include namespace QInstaller { diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 2aac6569c..6f1eda6e1 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -57,8 +57,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 561553fb4..4c12a3721 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -51,7 +51,7 @@ #include "kdupdaterupdateoperationfactory.h" #include "kdupdaterupdatefinder.h" -#include +#include #include #include #include @@ -59,8 +59,8 @@ #include #include -#include -#include +#include +#include #include @@ -966,7 +966,7 @@ void PackageManagerCorePrivate::writeUninstallerBinary(QFile *const input, qint6 appendData(&out, input, size); if (writeBinaryLayout) { -#ifdef Q_WS_MAC +#ifdef Q_OS_MAC QDir resourcePath(QFileInfo(uninstallerRenamedName).dir()); if (!resourcePath.path().endsWith(QLatin1String("Contents/MacOS"))) throw Error(tr("Uninstaller is not a bundle")); diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 7650951e6..4716f5e3f 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -53,28 +53,28 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include @@ -944,7 +944,7 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core) rejectLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum); rejectLabel->setText(hash.value(QLatin1String("RejectLicenseLabel"), tr("I do not accept the licenses.")).toString()); -#if defined(Q_WS_X11) || defined(Q_OS_MAC) +#if defined(Q_OS_X11) || defined(Q_OS_MAC) QFont labelFont(font()); labelFont.setPixelSize(9); acceptLabel->setFont(labelFont); diff --git a/src/libs/installer/packagemanagergui.h b/src/libs/installer/packagemanagergui.h index 2654501b9..0b1d828f3 100644 --- a/src/libs/installer/packagemanagergui.h +++ b/src/libs/installer/packagemanagergui.h @@ -38,8 +38,8 @@ #include #include -#include -#include +#include +#include // FIXME: move to private classes QT_BEGIN_NAMESPACE diff --git a/src/libs/installer/performinstallationform.cpp b/src/libs/installer/performinstallationform.cpp index 9b3c82533..7202a75d7 100644 --- a/src/libs/installer/performinstallationform.cpp +++ b/src/libs/installer/performinstallationform.cpp @@ -36,11 +36,11 @@ #include "progresscoordinator.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include diff --git a/src/libs/installer/qtpatchoperation.cpp b/src/libs/installer/qtpatchoperation.cpp index 270bd9853..eea1df2b2 100644 --- a/src/libs/installer/qtpatchoperation.cpp +++ b/src/libs/installer/qtpatchoperation.cpp @@ -51,7 +51,7 @@ static QHash generatePatchValueHash(const QByteArray &ne const QHash &qmakeValueHash) { QHash replaceHash; //first == searchstring: second == replace string - char nativeSeperator = QDir::separator().toAscii(); + char nativeSeperator = QDir::separator().toLatin1(); QByteArray oldValue; oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_PREFIX")); @@ -95,7 +95,7 @@ static QHash generatePatchValueHash(const QByteArray &ne // replaceMap.insert( QByteArray("qt_stngpath=%1").replace("%1", oldValue), // QByteArray("qt_stngpath=%1").replace("%1", newQtPath)); - //examples and demoes can patched outside separately, + //examples and demos can patched outside separately, //but for cosmetic reasons - if the qt version gets no examples later. oldValue = qmakeValueHash.value(QLatin1String("QT_INSTALL_EXAMPLES")); replaceHash.insert( QByteArray("qt_xmplpath=%1").replace("%1", oldValue), diff --git a/src/libs/installer/registerdefaultdebuggeroperation.cpp b/src/libs/installer/registerdefaultdebuggeroperation.cpp index 3b8c97250..40f14d2b2 100644 --- a/src/libs/installer/registerdefaultdebuggeroperation.cpp +++ b/src/libs/installer/registerdefaultdebuggeroperation.cpp @@ -88,7 +88,7 @@ bool RegisterDefaultDebuggerOperation::performOperation() QString toolChainsXmlFilePath; - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -130,7 +130,7 @@ bool RegisterDefaultDebuggerOperation::undoOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/registerfiletypeoperation.cpp b/src/libs/installer/registerfiletypeoperation.cpp index e7f76be01..ebed21061 100644 --- a/src/libs/installer/registerfiletypeoperation.cpp +++ b/src/libs/installer/registerfiletypeoperation.cpp @@ -99,7 +99,7 @@ bool RegisterFileTypeOperation::performOperation() } bool allUsers = false; - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (core && core->value(QLatin1String("AllUsers")) == QLatin1String("true")) allUsers = true; @@ -163,7 +163,7 @@ bool RegisterFileTypeOperation::undoOperation() } bool allUsers = false; - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (core && core->value(QLatin1String("AllUsers")) == QLatin1String("true")) allUsers = true; diff --git a/src/libs/installer/registerqtoperation.cpp b/src/libs/installer/registerqtoperation.cpp index ba5083be6..13c926c19 100644 --- a/src/libs/installer/registerqtoperation.cpp +++ b/src/libs/installer/registerqtoperation.cpp @@ -84,7 +84,7 @@ bool RegisterQtInCreatorOperation::performOperation() QString sbsPath = args.value(8); //this is for creator 2.2 - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -209,7 +209,7 @@ bool RegisterQtInCreatorOperation::performOperation() //works with creator 2.1 and 2.2 bool RegisterQtInCreatorOperation::undoOperation() { - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/registerqtv23operation.cpp b/src/libs/installer/registerqtv23operation.cpp index fc3720c2c..1faf9431f 100644 --- a/src/libs/installer/registerqtv23operation.cpp +++ b/src/libs/installer/registerqtv23operation.cpp @@ -97,7 +97,7 @@ bool RegisterQtInCreatorV23Operation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -175,7 +175,7 @@ bool RegisterQtInCreatorV23Operation::undoOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/registerqtv2operation.cpp b/src/libs/installer/registerqtv2operation.cpp index 63d484a9a..2b00e50aa 100644 --- a/src/libs/installer/registerqtv2operation.cpp +++ b/src/libs/installer/registerqtv2operation.cpp @@ -64,7 +64,7 @@ bool RegisterQtInCreatorV2Operation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -139,7 +139,7 @@ bool RegisterQtInCreatorV2Operation::undoOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/registerqtvqnxoperation.cpp b/src/libs/installer/registerqtvqnxoperation.cpp index 1d4d468f1..bff982aef 100644 --- a/src/libs/installer/registerqtvqnxoperation.cpp +++ b/src/libs/installer/registerqtvqnxoperation.cpp @@ -97,7 +97,7 @@ bool RegisterQtInCreatorQNXOperation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -178,7 +178,7 @@ bool RegisterQtInCreatorQNXOperation::undoOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/registertoolchainoperation.cpp b/src/libs/installer/registertoolchainoperation.cpp index 414f8ba14..76bad1229 100644 --- a/src/libs/installer/registertoolchainoperation.cpp +++ b/src/libs/installer/registertoolchainoperation.cpp @@ -69,7 +69,7 @@ bool RegisterToolChainOperation::performOperation() QString toolChainsXmlFilePath; - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -127,7 +127,7 @@ bool RegisterToolChainOperation::undoOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/selfrestartoperation.cpp b/src/libs/installer/selfrestartoperation.cpp index a9df116b8..2e1e6aff7 100644 --- a/src/libs/installer/selfrestartoperation.cpp +++ b/src/libs/installer/selfrestartoperation.cpp @@ -49,7 +49,7 @@ void SelfRestartOperation::backup() bool SelfRestartOperation::performOperation() { - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/setqtcreatorvalueoperation.cpp b/src/libs/installer/setqtcreatorvalueoperation.cpp index d1fb074d1..c7cfc62ca 100644 --- a/src/libs/installer/setqtcreatorvalueoperation.cpp +++ b/src/libs/installer/setqtcreatorvalueoperation.cpp @@ -66,7 +66,7 @@ bool SetQtCreatorValueOperation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); @@ -106,7 +106,7 @@ bool SetQtCreatorValueOperation::performOperation() } //destruct QSettings if (group == QLatin1String("GdbBinaries21")) { - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name())); @@ -137,7 +137,7 @@ bool SetQtCreatorValueOperation::undoOperation() const QString &group = groupName(args.at(1)); const QString &key = args.at(2); - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in \"%1\" operation is empty.").arg(name())); diff --git a/src/libs/installer/settings.cpp b/src/libs/installer/settings.cpp index e222c06f0..368b73701 100644 --- a/src/libs/installer/settings.cpp +++ b/src/libs/installer/settings.cpp @@ -38,7 +38,7 @@ #include #include -#include +#include using namespace QInstaller; @@ -289,9 +289,9 @@ QString Settings::background() const QString Settings::icon() const { const QString icon = d->makeAbsolutePath(d->m_data.value(scIcon).toString()); -#if defined(Q_WS_MAC) +#if defined(Q_OS_MAC) return icon + QLatin1String(".icns"); -#elif defined(Q_WS_WIN) +#elif defined(Q_OS_WIN) return icon + QLatin1String(".ico"); #endif return icon + QLatin1String(".png"); diff --git a/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp b/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp index 289ef404e..d04339c74 100644 --- a/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp +++ b/src/libs/installer/updatecreatorsettingsfrom21to22operation.cpp @@ -281,7 +281,7 @@ bool UpdateCreatorSettingsFrom21To22Operation::performOperation() return false; } - PackageManagerCore *const core = qVariantValue(value(QLatin1String("installer"))); + PackageManagerCore *const core = value(QLatin1String("installer")).value(); if (!core) { setError(UserDefinedError); setErrorString(tr("Needed installer object in %1 operation is empty.").arg(name())); diff --git a/src/libs/installer/utils.cpp b/src/libs/installer/utils.cpp index ffe705ba4..65d64f1c2 100644 --- a/src/libs/installer/utils.cpp +++ b/src/libs/installer/utils.cpp @@ -57,7 +57,7 @@ bool QInstaller::isVerbose() return verb; } -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN void qWinMsgHandler(QtMsgType t, const char *str); class debugstream : public std::ostream @@ -88,7 +88,7 @@ private: std::ostream &QInstaller::stdverbose() { static std::fstream null; -#ifdef Q_WS_WIN +#ifdef Q_OS_WIN static debugstream stream; #else static std::ostream& stream = std::cout; diff --git a/src/libs/kdtools/kdrunoncechecker.cpp b/src/libs/kdtools/kdrunoncechecker.cpp index 8e0af3ddc..702016d71 100644 --- a/src/libs/kdtools/kdrunoncechecker.cpp +++ b/src/libs/kdtools/kdrunoncechecker.cpp @@ -63,7 +63,7 @@ public: bool operator()(const ProcessInfo &info) { -#ifndef Q_WS_WIN +#ifndef Q_OS_WIN if (info.name == m_name) return true; const QFileInfo fi(info.name); diff --git a/src/libs/kdtools/kdupdaterupdateoperation.cpp b/src/libs/kdtools/kdupdaterupdateoperation.cpp index 2c4af4b03..40d2e5ada 100644 --- a/src/libs/kdtools/kdupdaterupdateoperation.cpp +++ b/src/libs/kdtools/kdupdaterupdateoperation.cpp @@ -312,7 +312,8 @@ QDomDocument UpdateOperation::toXml() const value.setAttribute(QLatin1String("name"), it.key()); value.setAttribute(QLatin1String("type"), QLatin1String( QVariant::typeToName( variant.type()))); - if (variant.type() != QVariant::List && variant.type() != QVariant::StringList && qVariantCanConvert(variant)) { + if (variant.type() != QVariant::List && variant.type() != QVariant::StringList + && variant.canConvert(QVariant::String)) { // it can convert to string? great! value.appendChild( doc.createTextNode(variant.toString())); } else { diff --git a/src/libs/kdtools/kdupdaterupdatesinfo.cpp b/src/libs/kdtools/kdupdaterupdatesinfo.cpp index 756fcbf9a..c06449828 100644 --- a/src/libs/kdtools/kdupdaterupdatesinfo.cpp +++ b/src/libs/kdtools/kdupdaterupdatesinfo.cpp @@ -154,7 +154,7 @@ bool UpdatesInfo::UpdatesInfoData::parsePackageUpdateElement(const QDomElement & UpdateFileInfo ufInfo; ufInfo.compressedSize = childE.attribute(QLatin1String("CompressedSize")).toLongLong(); ufInfo.uncompressedSize = childE.attribute(QLatin1String("UncompressedSize")).toLongLong(); - ufInfo.sha1sum = QByteArray::fromHex(childE.attribute(QLatin1String("sha1sum")).toAscii()); + ufInfo.sha1sum = QByteArray::fromHex(childE.attribute(QLatin1String("sha1sum")).toLatin1()); ufInfo.fileName = childE.text(); info.updateFiles.append(ufInfo); } else if (childE.tagName() == QLatin1String("Licenses")) { diff --git a/src/sdk/installerbase.cpp b/src/sdk/installerbase.cpp index b5aa6f5e4..19cb18140 100644 --- a/src/sdk/installerbase.cpp +++ b/src/sdk/installerbase.cpp @@ -53,7 +53,7 @@ #include #include -#include +#include #include diff --git a/src/sdk/installerbase_p.cpp b/src/sdk/installerbase_p.cpp index e296c7e3b..512b383eb 100644 --- a/src/sdk/installerbase_p.cpp +++ b/src/sdk/installerbase_p.cpp @@ -47,7 +47,7 @@ #include #include -#include +#include #include #include diff --git a/src/sdk/installerbase_p.h b/src/sdk/installerbase_p.h index 5071d6c05..390f3b812 100644 --- a/src/sdk/installerbase_p.h +++ b/src/sdk/installerbase_p.h @@ -30,8 +30,8 @@ ** **************************************************************************/ -#include -#include +#include +#include namespace KDUpdater { class FileDownloader; diff --git a/src/sdk/installerbasecommons.cpp b/src/sdk/installerbasecommons.cpp index 214b6e54b..bebcfb5c1 100644 --- a/src/sdk/installerbasecommons.cpp +++ b/src/sdk/installerbasecommons.cpp @@ -40,11 +40,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include using namespace QInstaller; diff --git a/src/sdk/settingsdialog.cpp b/src/sdk/settingsdialog.cpp index 0e237165c..58b7e4d23 100644 --- a/src/sdk/settingsdialog.cpp +++ b/src/sdk/settingsdialog.cpp @@ -39,9 +39,9 @@ #include -#include -#include -#include +#include +#include +#include #include diff --git a/src/sdk/settingsdialog.h b/src/sdk/settingsdialog.h index 85fa2f26a..660ccba73 100644 --- a/src/sdk/settingsdialog.h +++ b/src/sdk/settingsdialog.h @@ -37,9 +37,9 @@ #include -#include -#include -#include +#include +#include +#include QT_BEGIN_NAMESPACE class QAuthenticator; -- cgit v1.2.3