summaryrefslogtreecommitdiffstats
path: root/src/client/connectwindow/connectwindow.h
diff options
context:
space:
mode:
authorChristian Klinger2016-09-29 15:40:18 +0200
committerChristian Klinger2016-09-29 15:40:18 +0200
commit3d82bfc698165bb20f3c38d42f2b77ab855c1edf (patch)
tree2c170bcdd5c89259bb0b530fa11fdfe701c99850 /src/client/connectwindow/connectwindow.h
parentadded an information dialog that displays ip and hostname. (diff)
downloadpvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.tar.gz
pvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.tar.xz
pvs2-3d82bfc698165bb20f3c38d42f2b77ab855c1edf.zip
astyle.
Diffstat (limited to 'src/client/connectwindow/connectwindow.h')
-rw-r--r--src/client/connectwindow/connectwindow.h23
1 files changed, 12 insertions, 11 deletions
diff --git a/src/client/connectwindow/connectwindow.h b/src/client/connectwindow/connectwindow.h
index 3eed6e0..aa89094 100644
--- a/src/client/connectwindow/connectwindow.h
+++ b/src/client/connectwindow/connectwindow.h
@@ -24,7 +24,8 @@
#include "../net/serverdiscovery.h"
#include "../util/room.h"
-namespace Ui{
+namespace Ui
+{
class ConnectWindow;
}
class ServerConnection;
@@ -38,7 +39,7 @@ class ServerConnection;
*/
class ConnectWindow : public QWidget
{
-Q_OBJECT
+ Q_OBJECT
public:
enum ConnectionState {
@@ -55,9 +56,9 @@ public:
explicit ConnectWindow(QWidget *parent = NULL);
virtual ~ConnectWindow();
-
+
void connectToSession(const QByteArray sessionName, QString mgrIP);
- void setAvailableRooms(QList<Room> m);
+ void setAvailableRooms(QList<Room> m);
private:
Ui::ConnectWindow *_ui;
@@ -67,7 +68,7 @@ private:
ConnectionState _state;
QByteArray _currentSession;
QString _currentIp;
- QString _defaultSessionName;
+ QString _defaultSessionName;
NetworkMessage _packet;
bool _tryReconnect;
int _timerHide;
@@ -84,7 +85,7 @@ protected slots:
void onBtnConnection();
void onBtnCancel();
- void onRoomSelection(int index);
+ void onRoomSelection(int index);
void onConnectionStateChange(ConnectWindow::ConnectionState state);
void onConnectionClosed(QObject* connection);
@@ -92,13 +93,13 @@ protected slots:
// void onUdpReadyRead();
void onServerDetected(const QString& host, const quint16 port, const QByteArray& sessionName, const QByteArray& certHash, bool autoConnect);
- void onComboBox_keyPressed(QKeyEvent* e);
+ void onComboBox_keyPressed(QKeyEvent* e);
public slots:
- /** actually connects the connection **/
- void DoConnect();
- /** actually disconnects the connection **/
- void DoDisconnect();
+ /** actually connects the connection **/
+ void DoConnect();
+ /** actually disconnects the connection **/
+ void DoDisconnect();
signals:
void disconnect();
void connected(ServerConnection* connection);