Changeset 45574 in vbox

Timestamp:

Apr 16, 2013 3:01:53 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Tune r85065 to Win host.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp

@@ -290 +290 @@
         /* Parse the file content: */
         QString strData(file.readAll());
+#ifdef Q_WS_WIN
+        QRegExp regExp("(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\r\\n]+-{5}END CERTIFICATE-{5})\\r\\n"
+                       "(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\r\\n]+-{5}END CERTIFICATE-{5})");
+#else /* Q_WS_WIN */
         QRegExp regExp("(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\n]+-{5}END CERTIFICATE-{5})\\n"
                        "(-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\n]+-{5}END CERTIFICATE-{5})");
+#endif /* !Q_WS_WIN */
         regExp.setMinimal(true);
         int iIndex = regExp.indexIn(strData);
@@ -488 +493 @@
     /* Add 'new-line' character: */
     if (RT_SUCCESS(rc))
+#ifdef Q_WS_WIN
+        rc = file.write("\r\n") != -1 ? VINF_SUCCESS : VERR_WRITE_ERROR;
+#else /* Q_WS_WIN */
         rc = file.write("\n") != -1 ? VINF_SUCCESS : VERR_WRITE_ERROR;
+#endif /* !Q_WS_WIN */
 
     /* Return result-code: */