diff options
| author | Simon Rettberg | 2016-10-28 19:31:22 +0200 |
|---|---|---|
| committer | Simon Rettberg | 2016-10-28 19:31:22 +0200 |
| commit | 542ef2fddaf7a485e25529e2a2b09c61da69d4e6 (patch) | |
| tree | fc20843218433cb507227e8a303ac754a691f520 | |
| parent | [client] Fix use-after-free by adding missing signal-slot-connection (diff) | |
| download | pvs2-542ef2fddaf7a485e25529e2a2b09c61da69d4e6.tar.gz pvs2-542ef2fddaf7a485e25529e2a2b09c61da69d4e6.tar.xz pvs2-542ef2fddaf7a485e25529e2a2b09c61da69d4e6.zip | |
Fix compile warnings
| -rw-r--r-- | src/client/net/serverconnection.cpp | 1 | ||||
| -rw-r--r-- | src/client/util/platform/blankscreen.h | 2 | ||||
| -rw-r--r-- | src/server/net/sslserver.h | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp index 46f2538..826cf06 100644 --- a/src/client/net/serverconnection.cpp +++ b/src/client/net/serverconnection.cpp @@ -44,6 +44,7 @@ ServerConnection::ServerConnection(const QString& host, const quint16 port, cons ServerConnection::~ServerConnection() { + this->disconnectFromServer(); if (_socket != NULL) { qCritical("**** SOCKET DELETE IN DESTRUCTOR"); _socket->deleteLater(); diff --git a/src/client/util/platform/blankscreen.h b/src/client/util/platform/blankscreen.h index 35cf297..24c4969 100644 --- a/src/client/util/platform/blankscreen.h +++ b/src/client/util/platform/blankscreen.h @@ -5,7 +5,7 @@ #include <QDialog> #include <QDebug> -class BlankScreen_Sysdep; +struct BlankScreen_Sysdep; class BlankScreen : public QDialog { diff --git a/src/server/net/sslserver.h b/src/server/net/sslserver.h index 0b3120e..7b727aa 100644 --- a/src/server/net/sslserver.h +++ b/src/server/net/sslserver.h @@ -37,7 +37,7 @@ public: SslServer(); virtual ~SslServer(); - bool hasPendingConnections (); + virtual bool hasPendingConnections () const; // This one has to return a TcpSocket as we're overwriting from the base class // just cast it to QSslSocket later virtual QTcpSocket* nextPendingConnection(); |