Changeset 39184 in vbox for trunk/src/VBox/Frontends

Timestamp:

Nov 3, 2011 9:58:30 AM (13 years ago)

Author:

vboxsync

Message:

FE/Qt: handle the edition attribute more general

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsExtension.cpp

@@ -51 +51 @@
 
         /* Version, Revision, Edition: */
-        QString strVersion(m_data.m_strVersion);
-        QString strEdition;
-
-        if (strVersion.endsWith("-ENTERPRISE"))
-        {
-            strEdition = "-ENTERPRISE";
-            strVersion.chop(strEdition.size());
-        }
-
-        setText(2, QString("%1r%2%3").arg(strVersion).arg(m_data.m_strRevision).arg(strEdition));
+        QString strVersion(m_data.m_strVersion.section(QRegExp("[-_]"), 0, 0));
+        QString strAppend(m_data.m_strVersion.section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep));
+        setText(2, QString("%1r%2%3").arg(strVersion).arg(m_data.m_strRevision).arg(strAppend));
 
         /* Tool-tip: */
@@ -144 +137 @@
     QString strPackName = extPackFile.GetName();
     QString strPackDescription = extPackFile.GetDescription();
-    QString strVersion(extPackFile.GetVersion());
-    QString strEdition;
-    if (strVersion.endsWith("-ENTERPRISE"))
-    {
-        strEdition = "-ENTERPRISE";
-        strVersion.chop(strEdition.size());
-    }
-    QString strPackVersion = QString("%1r%2%3").arg(strVersion).arg(extPackFile.GetRevision()).arg(strEdition);
+    QString strVersion(extPackFile.GetVersion().section(QRegExp("[-_]"), 0, 0));
+    QString strAppend(extPackFile.GetVersion().section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep));
+    QString strPackVersion = QString("%1r%2%3").arg(strVersion).arg(extPackFile.GetRevision()).arg(strAppend);
 
     /*
@@ -162 +150 @@
     if (fReplaceIt)
     {
-        QString strVersionCur(extPackCur.GetVersion());
-        QString strEditionCur;
-        if (strVersionCur.endsWith("-ENTERPRISE"))
-        {
-            strEditionCur = "-ENTERPRISE";
-            strVersionCur.chop(strEditionCur.size());
-        }
-        QString strPackVersionCur = QString("%1r%2%3").arg(strVersionCur).arg(extPackCur.GetRevision()).arg(strEditionCur);
+        QString strVersionCur(extPackCur.GetVersion().section(QRegExp("[-_]"), 0, 0));
+        QString strAppendCur(extPackCur.GetVersion().section(QRegExp("[-_]"), 1, -1, QString::SectionIncludeLeadingSep));
+        QString strPackVersionCur = QString("%1r%2%3").arg(strVersionCur).arg(extPackCur.GetRevision()).arg(strAppendCur);
         if (!msgCenter().confirmReplacePackage(strPackName, strPackVersion, strPackVersionCur, strPackDescription, pParent))
             return;