merge noncore/comm/*

5 files changed, 25 insertions, 26 deletions

diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro
index 7af60f9..b3cb172 100644
--- a/noncore/comm/keypebble/keypebble.pro
+++ b/noncore/comm/keypebble/keypebble.pro
@@ -1,4 +1,2 @@
-TEMPLATE        = app
-CONFIG          += qt warn_on release
-DESTDIR         = $(OPIEDIR)/bin
+CONFIG          += qt warn_on release quick-app
 HEADERS		= d3des.h \
@@ -29,3 +27,3 @@ INTERFACES	= kvncconndlgbase.ui \
 						kvncbookmarkdlgbase.ui
-TARGET          = keypebble
+
 INCLUDEPATH += $(OPIEDIR)/include
@@ -34,2 +32,4 @@ LIBS            += -lqpe
 
+TARGET		= keypebble
+
 TRANSLATIONS = ../../../i18n/de/keypebble.ts \
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp
index 33418ae..dc90d9c 100644
--- a/noncore/comm/keypebble/krfbdecoder.cpp
+++ b/noncore/comm/keypebble/krfbdecoder.cpp
@@ -336,3 +336,3 @@ void KRFBDecoder::sendAllowedEncodings()
 
-  static CARD16 noEncodings = con->options()->encodings();
+  CARD16 noEncodings = con->options()->encodings();
   noEncodings = Swap16IfLE( noEncodings );
@@ -561,4 +561,7 @@ void KRFBDecoder::gotRawRectChunk()
     }
-    else
+    else {
+      // we are now ready for the next update - no need to wait for the timer
       currentState = Idle;
+      sendUpdateRequest (1);
+    }
   }
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp
index 48a442c..c89dec5 100644
--- a/noncore/comm/keypebble/kvnc.cpp
+++ b/noncore/comm/keypebble/kvnc.cpp
@@ -29,4 +29,4 @@
 static int u_id = 1;
-static int get_unique_id() 
-{   
+static int get_unique_id()
+{
 		return u_id++;
@@ -58,3 +58,3 @@ const int StatusTextId = 0;
 
-KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
+KVNC::KVNC(  QWidget *parent, const char *name, WFlags f) : QMainWindow( 0, name ,WStyle_ContextHelp)
 {
@@ -68,3 +68,3 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
 		stack->addWidget(bookmarkSelector,get_unique_id());
-		stack->raiseWidget( bookmarkSelector );                                        
+		stack->raiseWidget( bookmarkSelector );
 
@@ -105,3 +105,3 @@ KVNC::KVNC( const char *name ) : QMainWindow( 0, name ,WStyle_ContextHelp)
 		n->addTo( bar );
-								     
+
 		 QAction *o = new QAction( tr( "Open Bookmark" ), Resource::loadPixmap( "fileopen" ),
@@ -222,7 +222,7 @@ void KVNC::toggleFullScreen()
 				canvas->show();
-				
+
 				fullScreenAction->setText( tr("Stop Full Screen") );
 		}
-						
-						
+
+
     fullscreen = !fullscreen;
@@ -268,3 +268,3 @@ void KVNC::disconnected()
 
-		if ( fullscreen ) 
+		if ( fullscreen )
 				toggleFullScreen();
diff --git a/noncore/comm/keypebble/kvnc.h b/noncore/comm/keypebble/kvnc.h
index 51c7151..7b7cc91 100644
--- a/noncore/comm/keypebble/kvnc.h
+++ b/noncore/comm/keypebble/kvnc.h
@@ -24,5 +24,5 @@ class KVNC : public QMainWindow
   Q_OBJECT
-public: 
-  KVNC( const char *name = 0 );
-  ~KVNC(); 
+public:
+  KVNC( QWidget *parent = 0, const char *name = 0, WFlags f = 0 );
+  ~KVNC();
 
@@ -36,2 +36,3 @@ public slots:
   void closeConnection();
+  static QString appName() { return QString::fromLatin1("keypebble"); }
 
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp
index bc7782c..11f67fc 100644
--- a/noncore/comm/keypebble/main.cpp
+++ b/noncore/comm/keypebble/main.cpp
@@ -2,14 +2,9 @@
 
-#include <qurl.h>
+
 #include <qpe/qpeapplication.h>
 #include "kvnc.h"
+#include <opie/oapplicationfactory.h>
 
-int main( int argc, char **argv )
-{
-  QPEApplication app( argc, argv );
-  KVNC *view = new KVNC( "Keypebble" );
-  app.showMainWidget( view );
 
-  return app.exec();
-}
 
+OPIE_EXPORT_APP( OApplicationFactory<KVNC> )