X-Git-Url: http://git.maemo.org/git/?p=presencevnc;a=blobdiff_plain;f=src%2Fvncclientthread.h;h=ad8ef8aab989319d97f3ba779db58228d69a25c4;hp=20a11e6e2d1a7fb7b9fea8dcb05224352db45f3a;hb=ac795fc0fea7969778120657dd1caec6442048fd;hpb=b3d126294130bab3d11d10ec88cdff1c7ec0c7fc

diff --git a/src/vncclientthread.h b/src/vncclientthread.h
index 20a11e6..ad8ef8a 100644
--- a/src/vncclientthread.h
+++ b/src/vncclientthread.h
@@ -25,13 +25,13 @@
 #define VNCCLIENTTHREAD_H
 
 #ifdef QTONLY
-    #include <QDebug>
-    #define kDebug(n) qDebug()
-    #define kBacktrace() ""
-    #define i18n tr
+#include <QDebug>
+#define kDebug(n) qDebug()
+#define kBacktrace() ""
+#define i18n tr
 #else
-    #include <KDebug>
-    #include <KLocale>
+#include <KDebug>
+#include <KLocale>
 #endif
 
 #include "remoteview.h"
@@ -57,7 +57,7 @@ class KeyClientEvent : public ClientEvent
 {
 public:
     KeyClientEvent(int key, int pressed)
-            : m_key(key), m_pressed(pressed) {}
+        : m_key(key), m_pressed(pressed) {}
 
     void fire(rfbClient*);
 
@@ -70,7 +70,7 @@ class PointerClientEvent : public ClientEvent
 {
 public:
     PointerClientEvent(int x, int y, int buttonMask)
-            : m_x(x), m_y(y), m_buttonMask(buttonMask) {}
+        : m_x(x), m_y(y), m_buttonMask(buttonMask) {}
 
     void fire(rfbClient*);
 
@@ -84,7 +84,7 @@ class ClientCutEvent : public ClientEvent
 {
 public:
     ClientCutEvent(const QString &text)
-            : text(text) {}
+        : text(text) {}
 
     void fire(rfbClient*);
 
@@ -106,13 +106,11 @@ public:
     void stop();
     void setHost(const QString &host);
     void setPort(int port);
-	void setListenPort(int port) { listen_port = port; }
+    void setListenPort(int port) { m_listen_port = port; }
     void setQuality(RemoteView::Quality quality);
-    void setPassword(const QString &password) { m_password = password; }
+    void setPassword(const QString &password);
     const QString password() const { return m_password; }
-
     RemoteView::Quality quality() const;
-    uint8_t *frameBuffer;
 
 signals:
     void imageUpdated(int x, int y, int w, int h);
@@ -128,27 +126,29 @@ public slots:
 protected:
     void run();
 
+private slots:
+    void checkOutputErrorMessage();
+
 private:
+    //callbacks for libvncclient
     static rfbBool newclient(rfbClient *cl);
     static void updatefb(rfbClient *cl, int x, int y, int w, int h);
     static void cuttext(rfbClient *cl, const char *text, int textlen);
     static char* passwdHandler(rfbClient *cl);
     static void outputHandler(const char *format, ...);
 
+    uint8_t *m_frameBuffer;
     QImage m_image;
-    rfbClient *cl;
+    rfbClient *m_cl;
     QString m_host;
     QString m_password;
-    int m_port, listen_port;
-    QMutex mutex;
+    int m_port, m_listen_port;
+    QMutex m_mutex;
     RemoteView::Quality m_quality;
     QQueue<ClientEvent* > m_eventQueue;
 
     volatile bool m_stopped;
     volatile bool m_passwordError;
-
-private slots:
-    void checkOutputErrorMessage();
 };
 
 #endif