Use Q_GLOBAL_STATIC{_WITH_ARGS} following Qt coding conventions.

Move the regexp into its own compilation unit, so we get it only
once and use a accessor to fetch the value. I guess we should do
the same with the constants file, as all strings get compiled in
the file including it. At least Ossi wasn't satisfied currently.

Change-Id: Ic495a82f4b3cfe7810523b12cd3ef255eb15f149
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>

1 files changed, 5 insertions, 3 deletions

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);