Changeset 26390 in vbox

Timestamp:

Feb 9, 2010 4:33:04 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

57485

Message:

FE/Qt4: optimize regexs

File:

• trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UINewVMWzd.cpp

@@ -69 +69 @@
 
     /* Code names for Linux distributions */
-    { QRegExp("edgy.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("edgy", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("feisty.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("feisty", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("gutsy.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("gutsy", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("hardy.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("hardy", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("intrepid.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("intrepid", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("jaunty.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("jaunty", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("karmic.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("karmic", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("lucid.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-    { QRegExp("lucid", Qt::CaseInsensitive), "Ubuntu" },
-    { QRegExp("sarge.*64", Qt::CaseInsensitive), "Debian_64" },
-    { QRegExp("sarge", Qt::CaseInsensitive), "Debian" },
-    { QRegExp("etch.*64", Qt::CaseInsensitive), "Debian_64" },
-    { QRegExp("etch", Qt::CaseInsensitive), "Debian" },
-    { QRegExp("lenny.*64", Qt::CaseInsensitive), "Debian_64" },
-    { QRegExp("lenny", Qt::CaseInsensitive), "Debian" },
-    { QRegExp("sid.*64", Qt::CaseInsensitive), "Debian_64" },
-    { QRegExp("sid", Qt::CaseInsensitive), "Debian" },
-    { QRegExp("squeeze.*64", Qt::CaseInsensitive), "Debian_64" },
-    { QRegExp("squeeze", Qt::CaseInsensitive), "Debian" },
-    { QRegExp("moonshine.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("moonshine", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("werewolf.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("werewolf", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("sulphur.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("sulphur", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("cambridge.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("cambridge", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("leonidas.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("leonidas", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("constantine.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("constantine", Qt::CaseInsensitive), "Fedora" },
-    { QRegExp("goddard.*64", Qt::CaseInsensitive), "Fedora_64" },
-    { QRegExp("goddard", Qt::CaseInsensitive), "Fedora" },
+    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
+    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)", Qt::CaseInsensitive), "Ubuntu" },
+    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
+    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(sid)", Qt::CaseInsensitive), "Debian" },
+    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)).*64", Qt::CaseInsensitive), "Fedora_64" },
+    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)", Qt::CaseInsensitive), "Fedora" },
 
     /* Regular names of Linux distributions */