Doxygen comments, removed incomplete unused event handling for VNC RW access, introduced terminateVnc method in VncWindow

1 files changed, 3 insertions, 21 deletions

diff --git a/src/client/vnc/vncwindow.h b/src/client/vnc/vncwindow.h
index a9c5910..f79c358 100644
--- a/src/client/vnc/vncwindow.h
+++ b/src/client/vnc/vncwindow.h
@@ -15,18 +15,10 @@
 #define CLIENTVNCVIEWER_H_
 
 #include <QtGui>
-#include <QMouseEvent>
 
 class VncThread;
 class QPainter;
 
-// Definition of key modifier mask constants
-#define KMOD_Alt_R  0x01
-#define KMOD_Alt_L  0x02
-#define KMOD_Meta_L     0x04
-#define KMOD_Control_L  0x08
-#define KMOD_Shift_L    0x10
-
 class VncWindow : public QDialog
 {
 Q_OBJECT
@@ -41,36 +33,26 @@ protected slots:
 	void onProjectionStopped();
 
 	void open(const QString& host, int port, const QString& passwd, bool ro, bool fullscreen, const QString& caption, const int clientId);
+	bool close();
 
 signals:
 	void running(const bool isRunning, const int clientId);
 
-
 protected:
-	void draw(const int x, const int y, const int w, const int h);
 	void paintEvent(QPaintEvent *event);
 	void resizeEvent(QResizeEvent* event);
 	void closeEvent(QCloseEvent *e);
 	void timerEvent(QTimerEvent *event);
-	void close();
-	//bool event(QEvent *event);
-	//bool eventFilter(QObject *obj, QEvent *event);
 
 private:
 	VncThread *_vncWorker;
 	bool _viewOnly;
-	int _buttonMask;
-	QMap<unsigned int, bool> _modkeys;
 	int _clientId;
 	int _redrawTimer;
 	int _tcpTimeoutTimer;
 
-	bool eventFilter(QObject *obj, QEvent *event);
-	void keyPressEvent(QKeyEvent* event);
-	void keyEventHandler(QKeyEvent *e);
-	void unpressModifiers();
-	void wheelEventHandler(QWheelEvent *event);
-	void mouseEventHandler(QMouseEvent *event);
+	void draw(const int x, const int y, const int w, const int h);
+	void terminateVncThread();
 
 };