diff options
author | Manuel Schneider | 2014-07-21 23:51:00 +0200 |
---|---|---|
committer | Manuel Schneider | 2014-07-21 23:51:00 +0200 |
commit | c22a2b47bbd955caf25109b276c823b94f2a7c81 (patch) | |
tree | 02be8509ff93d5004da355a08b1592b0ee69f100 /src/server/net | |
parent | Finally implemented one click projectionsource change (diff) | |
download | pvs2-c22a2b47bbd955caf25109b276c823b94f2a7c81.tar.gz pvs2-c22a2b47bbd955caf25109b276c823b94f2a7c81.tar.xz pvs2-c22a2b47bbd955caf25109b276c823b94f2a7c81.zip |
Correct indenting by tabs
Diffstat (limited to 'src/server/net')
-rw-r--r-- | src/server/net/client.cpp | 12 | ||||
-rw-r--r-- | src/server/net/client.h | 8 | ||||
-rw-r--r-- | src/server/net/filedownloader.cpp | 2 | ||||
-rw-r--r-- | src/server/net/filedownloader.h | 18 | ||||
-rw-r--r-- | src/server/net/sslserver.h | 26 |
5 files changed, 33 insertions, 33 deletions
diff --git a/src/server/net/client.cpp b/src/server/net/client.cpp index dd61b45..a00ef88 100644 --- a/src/server/net/client.cpp +++ b/src/server/net/client.cpp @@ -21,8 +21,8 @@ Client::Client(QSslSocket* socket) : _socket(socket) { assert(socket != NULL); _authed = 0; - _projectionSource = 0; - _isActiveVncClient = false; + _projectionSource = 0; + _isActiveVncClient = false; _vncPort = 0; _isTutor = false; _locked = false; @@ -194,14 +194,14 @@ void Client::handleMsg() if (_fromClient.getFieldString("ENABLED").toInt() != 0) { qDebug() << "Client " << _name << " started its VNC client (watching " << projectionSource << ")"; - _projectionSource = projectionSource; - _isActiveVncClient = true; + _projectionSource = projectionSource; + _isActiveVncClient = true; emit vncClientStateChange(this); } else { qDebug() << "Client " << _name << " stopped its VNC client (watched " << projectionSource << ")"; - _isActiveVncClient = false; + _isActiveVncClient = false; emit vncClientStateChange(this); } emit stateChanged(); @@ -306,7 +306,7 @@ void Client::startVncClient(const Client * const to) /******************************************************************************/ void Client::stopVncClient() { - if (_isActiveVncClient) { + if (_isActiveVncClient) { NetworkMessage msg; msg.setField(_ID, _VNCCLIENT); sendMessage(msg); diff --git a/src/server/net/client.h b/src/server/net/client.h index c4afd16..61b6a5b 100644 --- a/src/server/net/client.h +++ b/src/server/net/client.h @@ -33,8 +33,8 @@ public: inline const QString& host() const { return _host; } inline const QString ip() const { return _socket->peerAddress().toString(); } inline const int id() const { return _id; } - inline const int projectionSource() const { return _projectionSource; } - inline const bool isActiveVncClient() const { return _isActiveVncClient; } + inline const int projectionSource() const { return _projectionSource; } + inline const bool isActiveVncClient() const { return _isActiveVncClient; } inline const bool isActiveVncServer() const { return _vncPort > 0; } inline const bool isLocked() const { return _locked; } inline const bool isWatcher() const { return _isWatcher; } @@ -65,8 +65,8 @@ private: int _id; // this client's unique id QString _vncRwPass, _vncRoPass; int _vncPort; // VNCserver state. Greater 0 -> active on this port. Equals 0 -> no server. - int _projectionSource; // VNCclient state. The source the client was or is connected to (depends on _isActiveVncClient) - bool _isActiveVncClient; // VNCclient state. indicating that the client is displaying a remote screen via VNC + int _projectionSource; // VNCclient state. The source the client was or is connected to (depends on _isActiveVncClient) + bool _isActiveVncClient; // VNCclient state. indicating that the client is displaying a remote screen via VNC bool _isTutor; // Flag indicating that the client has been set as a tutor bool _isWatcher; // Flag indicates that the client should watch to VNC Server. diff --git a/src/server/net/filedownloader.cpp b/src/server/net/filedownloader.cpp index 70e1520..aa27948 100644 --- a/src/server/net/filedownloader.cpp +++ b/src/server/net/filedownloader.cpp @@ -21,7 +21,7 @@ FileDownloader::~FileDownloader() { void FileDownloader::connectSlot(QObject* obj, const char* slot) { QObject::connect(this, SIGNAL(downloaded(QByteArray&)), - obj, slot); + obj, slot); } void FileDownloader::fileDownloaded(QNetworkReply* pReply) { diff --git a/src/server/net/filedownloader.h b/src/server/net/filedownloader.h index 68eaa39..227af50 100644 --- a/src/server/net/filedownloader.h +++ b/src/server/net/filedownloader.h @@ -16,28 +16,28 @@ class FileDownloader : public QObject { - Q_OBJECT + Q_OBJECT public: - explicit FileDownloader(QObject *parent = 0); + explicit FileDownloader(QObject *parent = 0); - virtual ~FileDownloader(); + virtual ~FileDownloader(); - void downloadFile(const QUrl& fileUrl); + void downloadFile(const QUrl& fileUrl); - void connectSlot(QObject* obj, const char* slot); + void connectSlot(QObject* obj, const char* slot); - QByteArray downloadedData() const; + QByteArray downloadedData() const; signals: - void downloaded(QByteArray& downloadedData); + void downloaded(QByteArray& downloadedData); private slots: - void fileDownloaded(QNetworkReply* pReply); + void fileDownloaded(QNetworkReply* pReply); private: - QNetworkAccessManager m_WebCtrl; + QNetworkAccessManager m_WebCtrl; }; diff --git a/src/server/net/sslserver.h b/src/server/net/sslserver.h index cdb12de..0b3120e 100644 --- a/src/server/net/sslserver.h +++ b/src/server/net/sslserver.h @@ -28,26 +28,26 @@ class QSslSocket; */ class SslServer : public QTcpServer { - Q_OBJECT + Q_OBJECT private Q_SLOTS: - void sslErrors ( const QList<QSslError> & errors ); + void sslErrors ( const QList<QSslError> & errors ); public: - SslServer(); - virtual ~SslServer(); + SslServer(); + virtual ~SslServer(); - bool hasPendingConnections (); - // This one has to return a TcpSocket as we're overwriting from the base class - // just cast it to QSslSocket later - virtual QTcpSocket* nextPendingConnection(); + bool hasPendingConnections (); + // This one has to return a TcpSocket as we're overwriting from the base class + // just cast it to QSslSocket later + virtual QTcpSocket* nextPendingConnection(); protected: - void incomingConnection(int socketDescriptor); - void timerEvent (QTimerEvent* event); - QList<QSslSocket*> _pending; - QList<QSslSocket*> _delete; - int _tmr; + void incomingConnection(int socketDescriptor); + void timerEvent (QTimerEvent* event); + QList<QSslSocket*> _pending; + QList<QSslSocket*> _delete; + int _tmr; }; #endif /* SSLSERVER_H_ */ |