modified to use constexpr instead of macro.

Author: treefrogframework

src/tepollhttpsocket.cpp

@@ -15,6 +15,7 @@
 #include "tepoll.h"
 #include "tepollwebsocket.h"
 #include "twebsocket.h"
+using namespace Tf;
 
 const int BUFFER_RESERVE_SIZE = 1023;
 static int limitBodyBytes = -1;
@@ -164,7 +165,7 @@ void TEpollHttpSocket::parse()
     }
 
     if (Q_LIKELY(lengthToRead < 0)) {
-        int idx = httpBuffer.indexOf("\r\n\r\n");
+        int idx = httpBuffer.indexOf(CRLFCRLF);
         if (idx > 0) {
             THttpRequestHeader header(httpBuffer);
             tSystemDebug("content-length: %d", header.contentLength());

src/tglobal.h

@@ -185,6 +185,10 @@ namespace Tf
     T_CORE_EXPORT TDatabaseContext *currentDatabaseContext();
     T_CORE_EXPORT QSqlDatabase &currentSqlDatabase(int id);
     T_CORE_EXPORT QMap<QByteArray, std::function<QObject*()>> *objectFactories();
+
+    static constexpr auto CRLFCRLF = "\x0d\x0a\x0d\x0a";
+    static constexpr auto CRLF     = "\x0d\x0a";
+    static constexpr auto LF       = "\x0a";
 }
 
 #endif // TGLOBAL_H

src/thtmlparser.cpp

@@ -7,6 +7,7 @@
 
 #include <THtmlParser>
 #include <THttpUtility>
+using namespace Tf;
 
 // Regular expression of an HTML tag
 const QRegExp htmlTagReg("<([a-zA-Z0-9]+\\s+(\"[^\"]*\"|'[^']*'|[^'\"<>(){};])*|/?[a-zA-Z0-9]+/?\\s*)>", Qt::CaseSensitive, QRegExp::RegExp2);
@@ -375,7 +376,7 @@ QList<QPair<QString, QString>> THtmlParser::parseAttributes()
 
         // Newline
         if (lf > 0) {
-            newline = (lf == cr) ? QLatin1String("\r\n") : QLatin1String("\n");
+            newline = (lf == cr) ? QLatin1String(CRLF) : QLatin1String(LF);
             attrs << qMakePair(newline, QString());  // Appends the newline as a attribute
         }
 

src/tinternetmessageheader.cpp

@@ -8,8 +8,7 @@
 #include <TInternetMessageHeader>
 #include "tsystemglobal.h"
 #include "thttputility.h"
-
-#define CRLF "\r\n"
+using namespace Tf;
 
 /*!
   \class TInternetMessageHeader
@@ -210,7 +209,7 @@ void TInternetMessageHeader::parse(const QByteArray &header)
 
     value.reserve(255);
 
-    headerlen = header.indexOf("\r\n\r\n");
+    headerlen = header.indexOf(CRLFCRLF);
     if (headerlen < 0)
         headerlen = header.length();
 

src/tpopmailer.cpp

@@ -9,12 +9,7 @@
 #include <QCryptographicHash>
 #include "tpopmailer.h"
 #include "tsystemglobal.h"
-
-#if defined(Q_OS_WIN)
-#  define CRLF "\n"
-#else
-#  define CRLF "\r\n"
-#endif
+using namespace Tf;
 
 /*!
   \class TPopMailer
@@ -161,7 +156,7 @@ bool TPopMailer::cmdRetr(int index, QByteArray &message)
     if (res) {
         while (socket->waitForReadyRead(5000)) {
             message += socket->readAll();
-            if (message.endsWith("." CRLF)) {
+            if (message.endsWith(QByteArray(".") + CRLF)) {
                 break;
             }
         }

src/tredisdriver.cpp

@@ -11,8 +11,7 @@
 #include <QTcpSocket>
 #include <TApplicationServerBase>
 #include <TSystemGlobal>
-
-#define CRLF "\r\n"
+using namespace Tf;
 
 const int DEFAULT_PORT = 6379;
 

src/tsmtpmailer.cpp

@@ -13,12 +13,7 @@
 #include <TPopMailer>
 #include "tsmtpmailer.h"
 #include "tsystemglobal.h"
-
-#if defined(Q_OS_WIN)
-#  define CRLF "\n"
-#else
-#  define CRLF "\r\n"
-#endif
+using namespace Tf;
 
 //#define tSystemError(fmt, ...)  printf(fmt "\n", ## __VA_ARGS__)
 //#define tSystemDebug(fmt, ...)  printf(fmt "\n", ## __VA_ARGS__)