X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=6ca1b915f531b00159168aa35b3fd1685d7b50ce;hp=16ab183bd3e33495ce6fe72e49b872832e6272d6;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=68878dc8366f2f4a0afe132847aad9a51a80cdbf

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 16ab183b..6ca1b915 100644
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -18,8 +18,7 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SSLSERVER_H
-#define SSLSERVER_H
+#pragma once
 
 #ifdef HAVE_SSL
 
@@ -34,14 +33,14 @@ class SslServer : public QTcpServer
     Q_OBJECT
 
 public:
-    SslServer(QObject *parent = 0);
+    SslServer(QObject *parent = nullptr);
 
-    virtual inline bool hasPendingConnections() const { return !_pendingConnections.isEmpty(); }
-    virtual QTcpSocket *nextPendingConnection();
+    bool hasPendingConnections() const override { return !_pendingConnections.isEmpty(); }
+    QTcpSocket *nextPendingConnection() override;
 
-    virtual inline const QSslCertificate &certificate() const { return _cert; }
-    virtual inline const QSslKey &key() const { return _key; }
-    virtual inline bool isCertValid() const { return _isCertValid; }
+    const QSslCertificate &certificate() const { return _cert; }
+    const QSslKey &key() const { return _key; }
+    bool isCertValid() const { return _isCertValid; }
 
     /**
      * Reloads SSL certificates used for connections
@@ -54,13 +53,9 @@ public:
     bool reloadCerts();
 
 protected:
-#if QT_VERSION >= 0x050000
-    virtual void incomingConnection(qintptr socketDescriptor);
-#else
-    virtual void incomingConnection(int socketDescriptor);
-#endif
+    void incomingConnection(qintptr socketDescriptor) override;
 
-    virtual bool setCertificate(const QString &path, const QString &keyPath);
+    bool setCertificate(const QString &path, const QString &keyPath);
 
 private:
     /**
@@ -78,7 +73,7 @@ private:
     QSslCertificate _cert;
     QSslKey _key;
     QList<QSslCertificate> _ca;
-    bool _isCertValid;
+    bool _isCertValid{false};
 
     // Used when reloading certificates later
     QString _sslCertPath; /// Path to the certificate file
@@ -87,5 +82,3 @@ private:
 
 
 #endif //HAVE_SSL
-
-#endif //SSLSERVER_H