Changeset 10115 in vbox

Timestamp:

Jul 2, 2008 3:36:42 PM (17 years ago)

Author:

vboxsync

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

32626

Message:

FE/Qt4-Win: build fix

File:

• trunk/src/VBox/Frontends/VirtualBox4/src/VBoxGlobal.cpp (modified) (3 diffs)

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

@@ -85 +85 @@
 #if defined (Q_WS_X11)
 #include <iprt/mem.h>
+#endif
+
+//#warning "port me: check this"
+#if defined(Q_OS_WIN64)
+typedef __int64 Q_LONG;             /* word up to 64 bit signed */
+typedef unsigned __int64 Q_ULONG;   /* word up to 64 bit unsigned */
+#else
+typedef long Q_LONG;                /* word up to 64 bit signed */
+typedef unsigned long Q_ULONG;      /* word up to 64 bit unsigned */
 #endif
 
@@ -391 +400 @@
     QString result = aRawFilter;
     QRegExp r (QString::fromLatin1 (qt_file_dialog_filter_reg_exp));
-    int index = r.search (result);
+    int index = r.indexIn (result);
     if (index >= 0)
         result = r.cap (2);
@@ -406 +415 @@
     if (!aFilter.isEmpty())
     {
-        int i = aFilter.find (";;", 0);
+        int i = aFilter.indexOf (";;", 0);
         QString sep (";;");
         if (i == -1)
         {
-            if (aFilter.find ("\n", 0) != -1)
+            if (aFilter.indexOf ("\n", 0) != -1)
             {
                 sep = "\n";
-                i = aFilter.find (sep, 0);
+                i = aFilter.indexOf (sep, 0);
             }
         }
 
-        filterLst = QStringList::split (sep, aFilter);
+        filterLst = aFilter.split (sep);
     }