From c862c2820e08435fa2c50611394e2c7e3be9052c Mon Sep 17 00:00:00 2001 From: Tim Jenssen Date: Fri, 27 Apr 2012 14:12:41 +0200 Subject: use scCommaRegExp where ever we can Change-Id: I484e20fd53c2710595c5d4eb28878932eebafe35 Reviewed-by: Karsten Heimrich --- src/libs/installer/component.cpp | 2 -- src/libs/installer/packagemanagercore.cpp | 7 +++---- src/libs/installer/packagemanagercore_p.cpp | 3 +-- src/libs/installer/qinstallerglobal.h | 2 ++ src/libs/kdtools/kdupdaterapplication.h | 2 ++ src/libs/kdtools/kdupdaterpackagesinfo.cpp | 3 +-- src/libs/kdtools/kdupdaterupdatefinder.cpp | 2 +- 7 files changed, 10 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/libs/installer/component.cpp b/src/libs/installer/component.cpp index af71f2278..75a41ea31 100644 --- a/src/libs/installer/component.cpp +++ b/src/libs/installer/component.cpp @@ -63,8 +63,6 @@ static const QLatin1String scUninstalled("Uninstalled"); static const QLatin1String scCurrentState("CurrentState"); static const QLatin1String scForcedInstallation("ForcedInstallation"); -static QRegExp scCommaRegExp(QLatin1String("\\b(,|, )\\b")); - /*! \class QInstaller::Component Component describes a component within the installer. diff --git a/src/libs/installer/packagemanagercore.cpp b/src/libs/installer/packagemanagercore.cpp index 8d4c92d31..bb1549fe7 100644 --- a/src/libs/installer/packagemanagercore.cpp +++ b/src/libs/installer/packagemanagercore.cpp @@ -1602,7 +1602,7 @@ bool PackageManagerCore::updateComponentData(struct Data &data, Component *compo // add downloadable archive from xml const QStringList downloadableArchives = data.package->data(scDownloadableArchives).toString() - .split(QRegExp(QLatin1String("\\b(,|, )\\b")), QString::SkipEmptyParts); + .split(scCommaRegExp, QString::SkipEmptyParts); if (component->isFromOnlineRepository()) { foreach (const QString downloadableArchive, downloadableArchives) @@ -1610,7 +1610,7 @@ bool PackageManagerCore::updateComponentData(struct Data &data, Component *compo } const QStringList componentsToReplace = data.package->data(scReplaces).toString() - .split(QRegExp(QLatin1String("\\b(,|, )\\b")), QString::SkipEmptyParts); + .split(scCommaRegExp, QString::SkipEmptyParts); if (!componentsToReplace.isEmpty()) { // Store the component (this is a component that replaces others) and all components that @@ -1760,8 +1760,7 @@ bool PackageManagerCore::fetchUpdaterPackages(const PackagesList &remotes, const bool isValidUpdate = locals.contains(name); if (!isValidUpdate && !replaces.isEmpty()) { - const QStringList possibleNames = replaces.split(QRegExp(QLatin1String("\\b(,|, )\\b")), - QString::SkipEmptyParts); + const QStringList possibleNames = replaces.split(scCommaRegExp, QString::SkipEmptyParts); foreach (const QString &possibleName, possibleNames) { if (locals.contains(possibleName)) { isValidUpdate = true; diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 313ad3ba5..d983ba4a5 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -2290,8 +2290,7 @@ bool PackageManagerCorePrivate::appendComponentsToUninstall(const QListvalue(scReplaces); - QStringList possibleNames = replaces.split(QRegExp(QLatin1String("\\b(,|, )\\b")), - QString::SkipEmptyParts); + QStringList possibleNames = replaces.split(scCommaRegExp, QString::SkipEmptyParts); possibleNames.append(c->name()); foreach (const QString &possibleName, possibleNames) autoDependencies.removeAll(possibleName); diff --git a/src/libs/installer/qinstallerglobal.h b/src/libs/installer/qinstallerglobal.h index 57e4a0bb9..2c9b8e401 100644 --- a/src/libs/installer/qinstallerglobal.h +++ b/src/libs/installer/qinstallerglobal.h @@ -53,6 +53,8 @@ namespace QInstaller { #define IFW_VERSION_CHECK(major, minor, patch) \ ((major << 16)|(minor << 8)|(patch)) +static QRegExp scCommaRegExp(QLatin1String("\\b(,|, )\\b")); + enum INSTALLER_EXPORT RunMode { AllMode, diff --git a/src/libs/kdtools/kdupdaterapplication.h b/src/libs/kdtools/kdupdaterapplication.h index f1ca9d612..b2079fe7c 100644 --- a/src/libs/kdtools/kdupdaterapplication.h +++ b/src/libs/kdtools/kdupdaterapplication.h @@ -25,6 +25,7 @@ #include "kdupdater.h" #include +#include QT_BEGIN_NAMESPACE class QUrl; @@ -35,6 +36,7 @@ namespace KDUpdater { class PackagesInfo; class UpdateSourcesInfo; +static QRegExp scCommaRegExp(QLatin1String("\\b(,|, )\\b")); class ConfigurationInterface { public: diff --git a/src/libs/kdtools/kdupdaterpackagesinfo.cpp b/src/libs/kdtools/kdupdaterpackagesinfo.cpp index 24668b578..9ac2b8eac 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.cpp +++ b/src/libs/kdtools/kdupdaterpackagesinfo.cpp @@ -19,7 +19,6 @@ ** clear to you. ** **********************************************************************/ - #include "kdupdaterpackagesinfo.h" #include "kdupdaterapplication.h" @@ -513,7 +512,7 @@ void PackagesInfo::PackagesInfoData::addPackageFrom(const QDomElement &packageE) else if (childNodeE.tagName() == QLatin1String("Size")) info.uncompressedSize = childNodeE.text().toULongLong(); else if (childNodeE.tagName() == QLatin1String("Dependencies")) - info.dependencies = childNodeE.text().split(QRegExp(QLatin1String("\\b(,|, )\\b")), QString::SkipEmptyParts); + info.dependencies = childNodeE.text().split(scCommaRegExp, QString::SkipEmptyParts); else if (childNodeE.tagName() == QLatin1String("ForcedInstallation")) info.forcedInstallation = childNodeE.text().toLower() == QLatin1String( "true" ) ? true : false; else if (childNodeE.tagName() == QLatin1String("LastUpdateDate")) diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index 41c72cd87..d3bc5ba40 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -476,7 +476,7 @@ QList UpdateFinder::Private::applicableUpdates(UpdatesInfo *updatesI appName = appName.replace(QLatin1String( " ," ), QLatin1String( "," )); // Catch hold of app names contained updatesInfo->applicationName() - QStringList apps = appName.split(QRegExp(QLatin1String("\\b(,|, )\\b")), QString::SkipEmptyParts); + QStringList apps = appName.split(scCommaRegExp, QString::SkipEmptyParts); appNameIndex = apps.indexOf(this->application->applicationName()); // If the application appName isn't one of the app names, then -- cgit v1.2.3