diff options
Diffstat (limited to 'src/libs/kdtools')
-rw-r--r-- | src/libs/kdtools/kdupdaterapplication.h | 2 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterpackagesinfo.cpp | 8 | ||||
-rw-r--r-- | src/libs/kdtools/kdupdaterupdatefinder.cpp | 4 |
3 files changed, 8 insertions, 6 deletions
diff --git a/src/libs/kdtools/kdupdaterapplication.h b/src/libs/kdtools/kdupdaterapplication.h index b2079fe7c..f1ca9d612 100644 --- a/src/libs/kdtools/kdupdaterapplication.h +++ b/src/libs/kdtools/kdupdaterapplication.h @@ -25,7 +25,6 @@ #include "kdupdater.h" #include <QObject> -#include <QRegExp> QT_BEGIN_NAMESPACE class QUrl; @@ -36,7 +35,6 @@ 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 9ac2b8eac..142cf67b0 100644 --- a/src/libs/kdtools/kdupdaterpackagesinfo.cpp +++ b/src/libs/kdtools/kdupdaterpackagesinfo.cpp @@ -21,6 +21,7 @@ **********************************************************************/ #include "kdupdaterpackagesinfo.h" #include "kdupdaterapplication.h" +#include "globals.h" #include <QFileInfo> #include <QtXml/QDomDocument> @@ -511,9 +512,10 @@ void PackagesInfo::PackagesInfoData::addPackageFrom(const QDomElement &packageE) info.virtualComp = childNodeE.text().toLower() == QLatin1String("true") ? true : false; else if (childNodeE.tagName() == QLatin1String("Size")) info.uncompressedSize = childNodeE.text().toULongLong(); - else if (childNodeE.tagName() == QLatin1String("Dependencies")) - info.dependencies = childNodeE.text().split(scCommaRegExp, QString::SkipEmptyParts); - else if (childNodeE.tagName() == QLatin1String("ForcedInstallation")) + else if (childNodeE.tagName() == QLatin1String("Dependencies")) { + info.dependencies = childNodeE.text().split(QInstaller::commaRegExp(), + QString::SkipEmptyParts); + } else if (childNodeE.tagName() == QLatin1String("ForcedInstallation")) info.forcedInstallation = childNodeE.text().toLower() == QLatin1String( "true" ) ? true : false; else if (childNodeE.tagName() == QLatin1String("LastUpdateDate")) info.lastUpdateDate = QDate::fromString(childNodeE.text(), Qt::ISODate); diff --git a/src/libs/kdtools/kdupdaterupdatefinder.cpp b/src/libs/kdtools/kdupdaterupdatefinder.cpp index caa66982e..0262dfc50 100644 --- a/src/libs/kdtools/kdupdaterupdatefinder.cpp +++ b/src/libs/kdtools/kdupdaterupdatefinder.cpp @@ -29,6 +29,8 @@ #include "kdupdaterfiledownloaderfactory.h" #include "kdupdaterupdatesinfo_p.h" +#include "globals.h" + #include <QCoreApplication> #include <QDebug> @@ -471,7 +473,7 @@ QList<UpdateInfo> UpdateFinder::Private::applicableUpdates(UpdatesInfo *updatesI appName = appName.replace(QLatin1String( " ," ), QLatin1String( "," )); // Catch hold of app names contained updatesInfo->applicationName() - QStringList apps = appName.split(scCommaRegExp, QString::SkipEmptyParts); + QStringList apps = appName.split(QInstaller::commaRegExp(), QString::SkipEmptyParts); appNameIndex = apps.indexOf(this->application->applicationName()); // If the application appName isn't one of the app names, then |