Refactor: move methods under the same #if section.

src/base/http/server.cpp

@@ -60,6 +60,33 @@ Server::~Server()
 {
 }
 
+void Server::incomingConnection(qintptr socketDescriptor)
+{
+    QTcpSocket *serverSocket;
+#ifndef QT_NO_OPENSSL
+    if (m_https)
+        serverSocket = new QSslSocket(this);
+    else
+#endif
+        serverSocket = new QTcpSocket(this);
+
+    if (serverSocket->setSocketDescriptor(socketDescriptor)) {
+#ifndef QT_NO_OPENSSL
+        if (m_https) {
+            static_cast<QSslSocket *>(serverSocket)->setProtocol(QSsl::SecureProtocols);
+            static_cast<QSslSocket *>(serverSocket)->setPrivateKey(m_key);
+            static_cast<QSslSocket *>(serverSocket)->setLocalCertificateChain(m_certificates);
+            static_cast<QSslSocket *>(serverSocket)->setPeerVerifyMode(QSslSocket::VerifyNone);
+            static_cast<QSslSocket *>(serverSocket)->startServerEncryption();
+        }
+#endif
+        new Connection(serverSocket, m_requestHandler, this);
+    }
+    else {
+        serverSocket->deleteLater();
+    }
+}
+
 #ifndef QT_NO_OPENSSL
 bool Server::setupHttps(const QByteArray &certificates, const QByteArray &key)
 {
@@ -90,36 +117,7 @@ void Server::disableHttps()
     m_certificates.clear();
     m_key.clear();
 }
-#endif
-
-void Server::incomingConnection(qintptr socketDescriptor)
-{
-    QTcpSocket *serverSocket;
-#ifndef QT_NO_OPENSSL
-    if (m_https)
-        serverSocket = new QSslSocket(this);
-    else
-#endif
-        serverSocket = new QTcpSocket(this);
-
-    if (serverSocket->setSocketDescriptor(socketDescriptor)) {
-#ifndef QT_NO_OPENSSL
-        if (m_https) {
-            static_cast<QSslSocket *>(serverSocket)->setProtocol(QSsl::SecureProtocols);
-            static_cast<QSslSocket *>(serverSocket)->setPrivateKey(m_key);
-            static_cast<QSslSocket *>(serverSocket)->setLocalCertificateChain(m_certificates);
-            static_cast<QSslSocket *>(serverSocket)->setPeerVerifyMode(QSslSocket::VerifyNone);
-            static_cast<QSslSocket *>(serverSocket)->startServerEncryption();
-        }
-#endif
-        new Connection(serverSocket, m_requestHandler, this);
-    }
-    else {
-        serverSocket->deleteLater();
-    }
-}
 
-#ifndef QT_NO_OPENSSL
 QList<QSslCipher> Server::safeCipherList() const
 {
     const QStringList badCiphers = {"idea", "rc4"};

src/base/http/server.h

@@ -34,6 +34,7 @@
 #define HTTP_SERVER_H
 
 #include <QTcpServer>
+
 #ifndef QT_NO_OPENSSL
 #include <QSslCertificate>
 #include <QSslCipher>
@@ -60,12 +61,13 @@ namespace Http
 #endif
 
     private:
-        IRequestHandler *m_requestHandler;
-
         void incomingConnection(qintptr socketDescriptor);
 
+        IRequestHandler *m_requestHandler;
+
 #ifndef QT_NO_OPENSSL
         QList<QSslCipher> safeCipherList() const;
+
         bool m_https;
         QList<QSslCertificate> m_certificates;
         QSslKey m_key;