summaryrefslogtreecommitdiffstats
path: root/src/client/net/serverconnection.cpp
diff options
context:
space:
mode:
authorManuel Schneider2014-09-03 15:40:39 +0200
committerManuel Schneider2014-09-03 15:40:39 +0200
commit6017ad54c22bcb991c832f90d2a19722198886bb (patch)
tree384bbf35357aba506d2bae131abc4747b8c30af0 /src/client/net/serverconnection.cpp
parentChange system settings path. Change name of config file (diff)
parentAdded german translations for client. (diff)
downloadpvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.gz
pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.tar.xz
pvs2-6017ad54c22bcb991c832f90d2a19722198886bb.zip
Merge branch 'master' of git.openslx.org:pvs2
Diffstat (limited to 'src/client/net/serverconnection.cpp')
-rw-r--r--src/client/net/serverconnection.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/client/net/serverconnection.cpp b/src/client/net/serverconnection.cpp
index babd64f..7954c34 100644
--- a/src/client/net/serverconnection.cpp
+++ b/src/client/net/serverconnection.cpp
@@ -26,7 +26,7 @@ ServerConnection::ServerConnection(const QString& host, const quint16 port, cons
connect(_socket, SIGNAL(encrypted()), this, SLOT(sock_connected()));
connect(_socket, SIGNAL(readyRead()), this, SLOT(sock_dataArrival()));
connect(_socket, SIGNAL(disconnected()), this, SLOT(sock_closed()));
- connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError)));
+ connect(_socket, SIGNAL(error(QAbstractSocket::SocketError)), this, SLOT(sock_error(QAbstractSocket::SocketError)));
connect(_socket,
SIGNAL(sslErrors(const QList<QSslError> &)),
this,