X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=61cc22232b735acf8cd2a7fe2e8fe7de2fdaec9e;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hp=609ec77abf722ab35d2f4e2669b13dedd1c696e6;hpb=895816988e0d03e30f4d54bf235af8d201aaad67;p=quassel.git

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 609ec77a..61cc2223 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -22,24 +22,24 @@
 
 #ifdef HAVE_SSL
 
-#include <QSslCertificate>
-#include <QSslKey>
-#include <QTcpServer>
-#include <QLinkedList>
-#include <QFile>
+#    include <QFile>
+#    include <QLinkedList>
+#    include <QSslCertificate>
+#    include <QSslKey>
+#    include <QTcpServer>
 
 class SslServer : public QTcpServer
 {
     Q_OBJECT
 
 public:
-    SslServer(QObject *parent = 0);
+    SslServer(QObject* parent = nullptr);
 
     bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
-    QTcpSocket *nextPendingConnection() override;
+    QTcpSocket* nextPendingConnection() override;
 
-    const QSslCertificate &certificate() const { return _cert; }
-    const QSslKey &key() const { return _key; }
+    const QSslCertificate& certificate() const { return _cert; }
+    const QSslKey& key() const { return _key; }
     bool isCertValid() const { return _isCertValid; }
 
     /**
@@ -53,13 +53,9 @@ public:
     bool reloadCerts();
 
 protected:
-#if QT_VERSION >= 0x050000
     void incomingConnection(qintptr socketDescriptor) override;
-#else
-    void incomingConnection(int socketDescriptor) override;
-#endif
 
-    bool setCertificate(const QString &path, const QString &keyPath);
+    bool setCertificate(const QString& path, const QString& keyPath);
 
 private:
     /**
@@ -71,18 +67,17 @@ private:
      * @return True if certificates loaded successfully, otherwise false.
      */
     bool loadCerts();
-    QSslKey loadKey(QFile *keyFile);
+    QSslKey loadKey(QFile* keyFile);
 
-    QLinkedList<QTcpSocket *> _pendingConnections;
+    QLinkedList<QTcpSocket*> _pendingConnections;
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
-    bool _isCertValid;
+    bool _isCertValid{false};
 
     // Used when reloading certificates later
-    QString _sslCertPath; /// Path to the certificate file
-    QString _sslKeyPath;  /// Path to the private key file (may be in same file as above)
+    QString _sslCertPath;  /// Path to the certificate file
+    QString _sslKeyPath;   /// Path to the private key file (may be in same file as above)
 };
 
-
-#endif //HAVE_SSL
+#endif  // HAVE_SSL