Changeset 9819 in vbox

Timestamp:

Jun 19, 2008 12:37:14 PM (17 years ago)

Author:

vboxsync

Message:

Fe/Qt4: correct porting of qt3::QString::ucs2() to qt4::QString::utf16() in all places which may be not correct in all places but at least now similar to qt3.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/COMDefs.h (modified) (1 diff)
• src/COMDefs.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (6 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/COMDefs.h

@@ -322 +322 @@
     public:
 
-        BSTRIn (const QString &s) : bstr (SysAllocString ((const OLECHAR *) s.utf16())) {}
+        BSTRIn (const QString &s) : bstr (SysAllocString ((const OLECHAR *)
+            (s.isNull() ? 0 : s.utf16()))) {}
 
         ~BSTRIn()

trunk/src/VBox/Frontends/VirtualBox4/src/COMDefs.cpp

@@ -191 +191 @@
 {
     aArr.reset (aVec.size());
-    for (int i = 0; i < aVec.size(); ++i)
-        aArr [i] = SysAllocString ((const OLECHAR *) aVec.at (i).utf16());
+    for (int i = 0; i < aVec.size(); ++ i)
+        aArr [i] = SysAllocString ((const OLECHAR *)
+            (aVec.at (i).isNull() ? 0 : aVec.at (i).utf16()));
 }
 

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

@@ -246 +246 @@
                         /* disallow the change when there is an error*/
                         *error = SysAllocString ((const OLECHAR *)
-                                                 gs.lastError().utf16());
+                            (gs.lastError().isNull() ? 0 : gs.lastError().utf16()));
                         *allowChange = FALSE;
                     }
@@ -484 +484 @@
         if (!initDir->isEmpty())
         {
-            SendMessage (hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG (initDir->utf16()));
+            SendMessage (hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG (
+                initDir.isNull() ? 0 : initDir->utf16()));
             //SendMessage (hwnd, BFFM_SETEXPANDED, TRUE, Q_ULONG (initDir->utf16()));
         }
@@ -3261 +3262 @@
             bi.hwndOwner = topParent ? topParent->winId() : 0;
             bi.pidlRoot = NULL;
-            bi.lpszTitle = (TCHAR*)title.utf16();
+            bi.lpszTitle = (TCHAR*)(title.isNull() ? 0 : title.utf16());
             bi.pszDisplayName = initPath;
             bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
@@ -3412 +3413 @@
             TCHAR buf [1024];
             if (initSel.length() > 0 && initSel.length() < sizeof (buf))
-                memcpy (buf, initSel.utf16(), (initSel.length() + 1) * sizeof (TCHAR));
+                memcpy (buf, initSel.isNull() ? 0 : initSel.utf16(),
+                        (initSel.length() + 1) * sizeof (TCHAR));
             else
                 buf [0] = 0;
@@ -3421 +3423 @@
             ofn.lStructSize = sizeof (OPENFILENAME);
             ofn.hwndOwner = topParent ? topParent->winId() : 0;
-            ofn.lpstrFilter = (TCHAR *) winFilters.utf16();
+            ofn.lpstrFilter = (TCHAR *) winFilters.isNull() ? 0 : winFilters.utf16();
             ofn.lpstrFile = buf;
             ofn.nMaxFile = sizeof (buf) - 1;
-            ofn.lpstrInitialDir = (TCHAR *) workDir.utf16();
-            ofn.lpstrTitle = (TCHAR *) title.utf16();
+            ofn.lpstrInitialDir = (TCHAR *) workDir.isNull() ? 0 : workDir.utf16();
+            ofn.lpstrTitle = (TCHAR *) title.isNull() ? 0 : title.utf16();
             ofn.Flags = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY |
                           OFN_EXPLORER | OFN_ENABLEHOOK |
@@ -3756 +3758 @@
         void run()
         {
-            int rc = (int) ShellExecute (NULL, NULL, mURL.utf16(), NULL, NULL, SW_SHOW);
+            int rc = (int) ShellExecute (NULL, NULL, mURL.isNull() ? 0 : mURL.utf16(),
+                                         NULL, NULL, SW_SHOW);
             bool ok = rc > 32;
             QApplication::postEvent