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

Timestamp:

Oct 30, 2013 3:37:57 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: be eol-style agnostic

File:

• trunk/src/VBox/Frontends/VirtualBox/src/net/UINetworkReply.cpp (modified) (1 diff)

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

@@ -290 +290 @@
         /* Parse the file content: */
         QString strData(file.readAll());
-#ifdef Q_WS_WIN
-# define CERT   "-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\r\\n]+-{5}END CERTIFICATE-{5}"
-# define REOLD  "(" CERT ")\\r\\n(" CERT ")\\r\\n(" CERT ")"
-# define RENEW  "(" CERT ")\\r\\n(" CERT ")"
-#else
-# define CERT   "-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\n]+-{5}END CERTIFICATE-{5}"
-# define REOLD  "(" CERT ")\\n(" CERT ")\\n(" CERT ")"
-# define RENEW  "(" CERT ")\\n(" CERT ")"
-#endif
+#define CERT   "-{5}BEGIN CERTIFICATE-{5}[\\s\\S\\r{0,1}\\n]+-{5}END CERTIFICATE-{5}"
+#define REOLD  "(" CERT ")\\r{0,1}\\n(" CERT ")\\r{0,1}\\n(" CERT ")"
+#define RENEW  "(" CERT ")\\r{0,1}\\n(" CERT ")"
         /* First check if we have the old format with three certificates: */
         QRegExp regExp(REOLD);