X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsslserver.h;h=6ca1b915f531b00159168aa35b3fd1685d7b50ce;hp=609ec77abf722ab35d2f4e2669b13dedd1c696e6;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=895816988e0d03e30f4d54bf235af8d201aaad67 diff --git a/src/core/sslserver.h b/src/core/sslserver.h index 609ec77a..6ca1b915 100644 --- a/src/core/sslserver.h +++ b/src/core/sslserver.h @@ -33,7 +33,7 @@ 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; @@ -53,11 +53,7 @@ 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); @@ -77,7 +73,7 @@ private: QSslCertificate _cert; QSslKey _key; QList _ca; - bool _isCertValid; + bool _isCertValid{false}; // Used when reloading certificates later QString _sslCertPath; /// Path to the certificate file