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

Timestamp:

Dec 14, 2007 7:23:03 PM (17 years ago)

Author:

vboxsync

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

26769

Message:

Merged dmik/s2 branch (r25959:26751) to the trunk.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• src/VBoxGlobal.cpp (modified) (1 diff)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp

@@ -2886 +2886 @@
     QString text = aStr;
 
+    /* replace special entities, '&' -- first! */
+        text.replace ('&', "&");
+    text.replace ('<', "&lt;");
+        text.replace ('>', "&gt;");
+        text.replace ('\"', "&quot;");
+
     /* mark strings in single quotes with color */
     QRegExp rx = QRegExp ("((?:^|\\s)[(]?)'([^']*)'(?=[:.-!);]?(?:\\s|$))");

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -2026 +2026 @@
     }
 
-    /* Description */
-    cmachine.SetDescription (teDescription->text());
+    /* Description (set empty to null to avoid an empty <Description> node
+     * in the settings file) */
+    cmachine.SetDescription (teDescription->text().isEmpty() ? QString::null :
+                             teDescription->text());
 
     /* Shared clipboard mode */