modernize: Prefer default member init over ctor init

[quassel.git] / src / core / sslserver.h

diff --git a/src/core/sslserver.h b/src/core/sslserver.h
index 1f43cc4..6ca1b91 100644 (file)
--- a/src/core/sslserver.h
+++ b/src/core/sslserver.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -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
 
@@ -27,20 +26,21 @@
 #include <QSslKey>
 #include <QTcpServer>
 #include <QLinkedList>
+#include <QFile>
 
 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
@@ -53,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:
     /**
@@ -71,12 +67,13 @@ private:
      * @return True if certificates loaded successfully, otherwise false.
      */
     bool loadCerts();
+    QSslKey loadKey(QFile *keyFile);
 
     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
@@ -85,5 +82,3 @@ private:
 
 
 #endif //HAVE_SSL
-
-#endif //SSLSERVER_H