author | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2004-04-04 13:54:40 (UTC) |
commit | 16cf79e90b5217f8d4bfce2a0fa817ae4b73db36 (patch) (unidiff) | |
tree | 0701eae15aa606a0211a2fccfde0eafdac69357c /noncore/comm | |
parent | 8d2d2664e5f544b8292806e617deb7a0e4170dc0 (diff) | |
download | opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.zip opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.gz opie-16cf79e90b5217f8d4bfce2a0fa817ae4b73db36.tar.bz2 |
convert to Opie Debugging Framework
-rw-r--r-- | noncore/comm/keypebble/config.in | 2 | ||||
-rw-r--r-- | noncore/comm/keypebble/keypebble.pro | 5 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbbuffer.cpp | 24 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbcanvas.cpp | 8 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbconnection.cpp | 31 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbdecoder.cpp | 63 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfblogin.cpp | 41 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvncbookmarkdlg.cpp | 12 |
8 files changed, 110 insertions, 76 deletions
diff --git a/noncore/comm/keypebble/config.in b/noncore/comm/keypebble/config.in index 20384aa..8a800b9 100644 --- a/noncore/comm/keypebble/config.in +++ b/noncore/comm/keypebble/config.in | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) | 4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE |
diff --git a/noncore/comm/keypebble/keypebble.pro b/noncore/comm/keypebble/keypebble.pro index 3515016..7631e4e 100644 --- a/noncore/comm/keypebble/keypebble.pro +++ b/noncore/comm/keypebble/keypebble.pro | |||
@@ -25,4 +25,3 @@ SOURCES = d3des.c \ | |||
25 | main.cpp | 25 | main.cpp |
26 | INTERFACES= kvncconndlgbase.ui \ | 26 | INTERFACES= kvncconndlgbase.ui kvncbookmarkdlgbase.ui |
27 | kvncbookmarkdlgbase.ui | ||
28 | 27 | ||
@@ -30,3 +29,3 @@ INCLUDEPATH += $(OPIEDIR)/include | |||
30 | DEPENDPATH += $(OPIEDIR)/include | 29 | DEPENDPATH += $(OPIEDIR)/include |
31 | LIBS += -lqpe | 30 | LIBS += -lqpe -lopiecore2 |
32 | 31 | ||
diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp index 4cec0c2..4b29612 100644 --- a/noncore/comm/keypebble/krfbbuffer.cpp +++ b/noncore/comm/keypebble/krfbbuffer.cpp | |||
@@ -1,5 +1 @@ | |||
1 | #include <assert.h> | ||
2 | #include <qimage.h> | ||
3 | #include <qpainter.h> | ||
4 | #include <qapplication.h> | ||
5 | #include "krfbdecoder.h" | #include "krfbdecoder.h" | |
@@ -9,2 +5,14 @@ | |||
9 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
11 | #include <qimage.h> | ||
12 | #include <qpainter.h> | ||
13 | #include <qapplication.h> | ||
14 | |||
15 | /* STD */ | ||
16 | #include <assert.h> | ||
17 | |||
10 | // | 18 | // |
@@ -12,3 +20,3 @@ | |||
12 | // | 20 | // |
13 | #ifndef KDE_USE_FINAL | 21 | #ifndef OPIE_NO_DEBUG |
14 | const int endianTest = 1; | 22 | const int endianTest = 1; |
@@ -41,3 +49,3 @@ void KRFBBuffer::resize( int w, int h ) | |||
41 | { | 49 | { |
42 | qWarning( "Resizing buffer" ); | 50 | owarn << "Resizing buffer" << oendl; |
43 | 51 | ||
@@ -63,3 +71,3 @@ void KRFBBuffer::keyPressEvent( QKeyEvent *e ) | |||
63 | { | 71 | { |
64 | qWarning( "Buffer got a key" ); | 72 | owarn << "Buffer got a key" << oendl; |
65 | 73 | ||
@@ -76,3 +84,3 @@ void KRFBBuffer::copyRect( int srcX, int srcY, | |||
76 | { | 84 | { |
77 | // qWarning( "Got copy rect" ); | 85 | // owarn << "Got copy rect" << oendl; |
78 | bitBlt( pix, destX, destY, pix, srcX, srcY, w, h, CopyROP ); | 86 | bitBlt( pix, destX, destY, pix, srcX, srcY, w, h, CopyROP ); |
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp index cd1fda0..b3525df 100644 --- a/noncore/comm/keypebble/krfbcanvas.cpp +++ b/noncore/comm/keypebble/krfbcanvas.cpp | |||
@@ -4,4 +4,8 @@ | |||
4 | 4 | ||
5 | /* OPIE */ | ||
6 | #include <opie2/odebug.h> | ||
5 | #include <qpe/qpeapplication.h> | 7 | #include <qpe/qpeapplication.h> |
8 | using namespace Opie::Core; | ||
6 | 9 | ||
10 | /* QT */ | ||
7 | #include <qclipboard.h> | 11 | #include <qclipboard.h> |
@@ -44,3 +48,3 @@ void KRFBCanvas::openURL( const QUrl &url ) | |||
44 | if ( loggedIn_ ) { | 48 | if ( loggedIn_ ) { |
45 | qWarning( "openURL invoked when logged in\n" ); | 49 | owarn << "openURL invoked when logged in\n" << oendl; |
46 | return; | 50 | return; |
@@ -76,3 +80,3 @@ void KRFBCanvas::loggedIn() | |||
76 | { | 80 | { |
77 | qWarning( "Ok, we're logged in" ); | 81 | owarn << "Ok, we're logged in" << oendl; |
78 | 82 | ||
diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp index b447046..33e0563 100644 --- a/noncore/comm/keypebble/krfbconnection.cpp +++ b/noncore/comm/keypebble/krfbconnection.cpp | |||
@@ -1,6 +1 @@ | |||
1 | #include <assert.h> | ||
2 | #include <qsocket.h> | ||
3 | #include <qtimer.h> | ||
4 | #include <string.h> | ||
5 | |||
6 | #include "krfbconnection.h" | #include "krfbconnection.h" | |
@@ -10,2 +5,14 @@ | |||
10 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
9 | |||
10 | /* QT */ | ||
11 | #include <qsocket.h> | ||
12 | #include <qtimer.h> | ||
13 | |||
14 | /* STD */ | ||
15 | #include <assert.h> | ||
16 | #include <string.h> | ||
17 | |||
11 | KRFBConnection::KRFBConnection( QObject *parent ) | 18 | KRFBConnection::KRFBConnection( QObject *parent ) |
@@ -45,3 +52,3 @@ void KRFBConnection::connectTo( KRFBServer server) | |||
45 | 52 | ||
46 | qWarning( "Connecting..." ); | 53 | owarn << "Connecting..." << oendl; |
47 | 54 | ||
@@ -53,3 +60,3 @@ void KRFBConnection::disconnect() | |||
53 | { | 60 | { |
54 | qWarning( "Disconnecting from server" ); | 61 | owarn << "Disconnecting from server" << oendl; |
55 | 62 | ||
@@ -84,3 +91,3 @@ void KRFBConnection::gotSocketConnection() | |||
84 | 91 | ||
85 | qWarning( "Connected, logging in..." ); | 92 | owarn << "Connected, logging in..." << oendl; |
86 | 93 | ||
@@ -95,3 +102,3 @@ void KRFBConnection::gotRFBConnection() | |||
95 | { | 102 | { |
96 | qWarning( "Logged into server" ); | 103 | owarn << "Logged into server" << oendl; |
97 | 104 | ||
@@ -124,3 +131,3 @@ void KRFBConnection::gotSocketError( int err ) | |||
124 | // Do some error handling stuff | 131 | // Do some error handling stuff |
125 | qWarning( "KRFBConnection: Socket error %d", err ); | 132 | owarn << "KRFBConnection: Socket error " << err << "" << oendl; |
126 | 133 | ||
@@ -174,3 +181,3 @@ void KRFBConnection::waitForData( unsigned int sz ) | |||
174 | if ( sock->size() >= sz ) { | 181 | if ( sock->size() >= sz ) { |
175 | // qWarning( "No need to wait for data" ); | 182 | // owarn << "No need to wait for data" << oendl; |
176 | emit gotEnoughData(); | 183 | emit gotEnoughData(); |
@@ -178,3 +185,3 @@ void KRFBConnection::waitForData( unsigned int sz ) | |||
178 | else { | 185 | else { |
179 | // qWarning( "Waiting for %u bytes", sz ); | 186 | // owarn << "Waiting for " << sz << " bytes" << oendl; |
180 | minData_ = sz; | 187 | minData_ = sz; |
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp index db95154..69457e2 100644 --- a/noncore/comm/keypebble/krfbdecoder.cpp +++ b/noncore/comm/keypebble/krfbdecoder.cpp | |||
@@ -5,5 +5,10 @@ | |||
5 | 5 | ||
6 | /* OPIE */ | ||
7 | #include <opie2/odebug.h> | ||
8 | using namespace Opie::Core; | ||
6 | 9 | ||
10 | /* QT */ | ||
7 | #include <qpixmap.h> | 11 | #include <qpixmap.h> |
8 | 12 | ||
13 | /* STD */ | ||
9 | #include <assert.h> | 14 | #include <assert.h> |
@@ -13,3 +18,3 @@ | |||
13 | // | 18 | // |
14 | #ifndef KDE_USE_FINAL | 19 | #ifndef OPIE_NO_DEBUG |
15 | const int endianTest = 1; | 20 | const int endianTest = 1; |
@@ -137,3 +142,3 @@ void KRFBDecoder::sendClientInit() | |||
137 | // Wait for server init | 142 | // Wait for server init |
138 | qWarning( "Waiting for server init" ); | 143 | owarn << "Waiting for server init" << oendl; |
139 | 144 | ||
@@ -149,3 +154,3 @@ void KRFBDecoder::gotServerInit() | |||
149 | { | 154 | { |
150 | qWarning( "Got server init" ); | 155 | owarn << "Got server init" << oendl; |
151 | disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) ); | 156 | disconnect( con, SIGNAL( gotEnoughData() ), this, SLOT( gotServerInit() ) ); |
@@ -183,3 +188,3 @@ void KRFBDecoder::gotServerInit() | |||
183 | 188 | ||
184 | qWarning( "Width = %d, Height = %d", info->width, info->height ); | 189 | owarn << "Width = " << info->width << ", Height = " << info->height << "" << oendl; |
185 | qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d", | 190 | qWarning( "Bpp = %d, Depth = %d, Big = %d, True = %d", |
@@ -194,3 +199,3 @@ void KRFBDecoder::gotServerInit() | |||
194 | // Wait for desktop name | 199 | // Wait for desktop name |
195 | qWarning( "Waiting for desktop name" ); | 200 | owarn << "Waiting for desktop name" << oendl; |
196 | 201 | ||
@@ -209,3 +214,3 @@ void KRFBDecoder::gotDesktopName() | |||
209 | 214 | ||
210 | qWarning( "Got desktop name" ); | 215 | owarn << "Got desktop name" << oendl; |
211 | 216 | ||
@@ -221,3 +226,3 @@ void KRFBDecoder::gotDesktopName() | |||
221 | 226 | ||
222 | qWarning( "Desktop: %s", info->name.latin1() ); | 227 | owarn << "Desktop: " << info->name.latin1() << "" << oendl; |
223 | 228 | ||
@@ -373,3 +378,3 @@ void KRFBDecoder::gotUpdateHeader() | |||
373 | 378 | ||
374 | // qWarning( "Got update header" ); | 379 | // owarn << "Got update header" << oendl; |
375 | 380 | ||
@@ -408,3 +413,3 @@ void KRFBDecoder::gotUpdateHeader() | |||
408 | 413 | ||
409 | // qWarning( "Expecting %d rects", noRects ); | 414 | // owarn << "Expecting " << noRects << " rects" << oendl; |
410 | 415 | ||
@@ -420,3 +425,3 @@ void KRFBDecoder::gotRectHeader() | |||
420 | 425 | ||
421 | // qWarning( "Got rect header" ); | 426 | // owarn << "Got rect header" << oendl; |
422 | 427 | ||
@@ -448,3 +453,3 @@ void KRFBDecoder::gotRectHeader() | |||
448 | if ( encoding == RawEncoding ) { | 453 | if ( encoding == RawEncoding ) { |
449 | // qWarning( "Raw encoding" ); | 454 | // owarn << "Raw encoding" << oendl; |
450 | handleRawRect(); | 455 | handleRawRect(); |
@@ -452,3 +457,3 @@ void KRFBDecoder::gotRectHeader() | |||
452 | else if ( encoding == CopyRectEncoding ) { | 457 | else if ( encoding == CopyRectEncoding ) { |
453 | // qWarning( "CopyRect encoding" ); | 458 | // owarn << "CopyRect encoding" << oendl; |
454 | handleCopyRect(); | 459 | handleCopyRect(); |
@@ -456,3 +461,3 @@ void KRFBDecoder::gotRectHeader() | |||
456 | else if ( encoding == RreEncoding ) { | 461 | else if ( encoding == RreEncoding ) { |
457 | qWarning( "RRE encoding" ); | 462 | owarn << "RRE encoding" << oendl; |
458 | handleRRERect(); | 463 | handleRRERect(); |
@@ -460,3 +465,3 @@ void KRFBDecoder::gotRectHeader() | |||
460 | else if ( encoding == CorreEncoding ) { | 465 | else if ( encoding == CorreEncoding ) { |
461 | qWarning( "CoRRE encoding" ); | 466 | owarn << "CoRRE encoding" << oendl; |
462 | handleCoRRERect(); | 467 | handleCoRRERect(); |
@@ -464,3 +469,3 @@ void KRFBDecoder::gotRectHeader() | |||
464 | else if ( encoding == HexTileEncoding ) { | 469 | else if ( encoding == HexTileEncoding ) { |
465 | qWarning( "HexTile encoding" ); | 470 | owarn << "HexTile encoding" << oendl; |
466 | handleHexTileRect(); | 471 | handleHexTileRect(); |
@@ -472,3 +477,3 @@ void KRFBDecoder::gotRectHeader() | |||
472 | currentState = Error; | 477 | currentState = Error; |
473 | qWarning( "Unknown encoding, %d", msg ); | 478 | owarn << "Unknown encoding, " << msg << "" << oendl; |
474 | emit error( protocolError ); | 479 | emit error( protocolError ); |
@@ -488,3 +493,3 @@ void KRFBDecoder::handleRawRect() | |||
488 | 493 | ||
489 | // qWarning( "Handling a raw rect chunk" ); | 494 | // owarn << "Handling a raw rect chunk" << oendl; |
490 | 495 | ||
@@ -511,3 +516,3 @@ void KRFBDecoder::getRawRectChunk( int lines ) | |||
511 | // Wait for server init | 516 | // Wait for server init |
512 | // qWarning( "Waiting for raw rect chunk, %ld", count ); | 517 | // owarn << "Waiting for raw rect chunk, " << count << "" << oendl; |
513 | 518 | ||
@@ -525,3 +530,3 @@ void KRFBDecoder::gotRawRectChunk() | |||
525 | 530 | ||
526 | // qWarning( "Got raw rect chunk" ); | 531 | // owarn << "Got raw rect chunk" << oendl; |
527 | 532 | ||
@@ -548,3 +553,3 @@ void KRFBDecoder::gotRawRectChunk() | |||
548 | 553 | ||
549 | // qWarning( "There are %d rects left", noRects ); | 554 | // owarn << "There are " << noRects << " rects left" << oendl; |
550 | 555 | ||
@@ -592,3 +597,3 @@ void KRFBDecoder::gotCopyRectPos() | |||
592 | 597 | ||
593 | // qWarning( "There are %d rects left", noRects ); | 598 | // owarn << "There are " << noRects << " rects left" << oendl; |
594 | 599 | ||
@@ -605,3 +610,3 @@ void KRFBDecoder::handleRRERect() | |||
605 | { | 610 | { |
606 | qWarning( "RRE not implemented" ); | 611 | owarn << "RRE not implemented" << oendl; |
607 | } | 612 | } |
@@ -610,3 +615,3 @@ void KRFBDecoder::handleCoRRERect() | |||
610 | { | 615 | { |
611 | qWarning( "CoRRE not implemented" ); | 616 | owarn << "CoRRE not implemented" << oendl; |
612 | } | 617 | } |
@@ -615,3 +620,3 @@ void KRFBDecoder::handleHexTileRect() | |||
615 | { | 620 | { |
616 | qWarning( "HexTile not implemented" ); | 621 | owarn << "HexTile not implemented" << oendl; |
617 | } | 622 | } |
@@ -675,3 +680,3 @@ void KRFBDecoder::gotServerCut() | |||
675 | { | 680 | { |
676 | qWarning( "Got server cut" ); | 681 | owarn << "Got server cut" << oendl; |
677 | 682 | ||
@@ -723,3 +728,3 @@ void KRFBDecoder::gotServerCutText() | |||
723 | * from within keypebble's mass of signals and slots | 728 | * from within keypebble's mass of signals and slots |
724 | qWarning( "Server cut: %s", cutbuf ); | 729 | owarn << "Server cut: " << cutbuf << "" << oendl; |
725 | 730 | ||
@@ -740,3 +745,3 @@ void KRFBDecoder::gotServerCutText() | |||
740 | else { | 745 | else { |
741 | qWarning( "Async handled in weird state" ); | 746 | owarn << "Async handled in weird state" << oendl; |
742 | currentState = oldState; | 747 | currentState = oldState; |
@@ -747,3 +752,3 @@ void KRFBDecoder::gotBell() | |||
747 | { | 752 | { |
748 | qWarning( "Got server bell" ); | 753 | owarn << "Got server bell" << oendl; |
749 | buf->soundBell(); | 754 | buf->soundBell(); |
@@ -760,3 +765,3 @@ void KRFBDecoder::gotBell() | |||
760 | else { | 765 | else { |
761 | qWarning( "Async handled in weird state" ); | 766 | owarn << "Async handled in weird state" << oendl; |
762 | currentState = oldState; | 767 | currentState = oldState; |
diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp index 2bbd110..92005d2 100644 --- a/noncore/comm/keypebble/krfblogin.cpp +++ b/noncore/comm/keypebble/krfblogin.cpp | |||
@@ -1,4 +1,13 @@ | |||
1 | #include <assert.h> | 1 | #include "krfblogin.h" |
2 | #include "krfbconnection.h" | ||
2 | 3 | ||
4 | /* OPIE */ | ||
5 | #include <opie2/odebug.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
9 | #include <qtimer.h> | ||
3 | 10 | ||
11 | /* STD */ | ||
12 | #include <assert.h> | ||
4 | extern "C" { | 13 | extern "C" { |
@@ -7,6 +16,2 @@ extern "C" { | |||
7 | 16 | ||
8 | #include "krfblogin.h" | ||
9 | #include "krfbconnection.h" | ||
10 | #include <qtimer.h> | ||
11 | |||
12 | // The length of the various messages (used to decide how many bytes to | 17 | // The length of the various messages (used to decide how many bytes to |
@@ -54,3 +59,3 @@ KRFBLogin::KRFBLogin( KRFBConnection *con ) | |||
54 | 59 | ||
55 | qWarning( "Waiting for server version..." ); | 60 | owarn << "Waiting for server version..." << oendl; |
56 | 61 | ||
@@ -76,3 +81,3 @@ void KRFBLogin::gotServerVersion() | |||
76 | { | 81 | { |
77 | qWarning( "Got server version" ); | 82 | owarn << "Got server version" << oendl; |
78 | 83 | ||
@@ -94,3 +99,3 @@ void KRFBLogin::gotServerVersion() | |||
94 | 99 | ||
95 | qWarning( msg ); | 100 | owarn << msg << oendl; |
96 | emit error( msg ); | 101 | emit error( msg ); |
@@ -108,3 +113,3 @@ void KRFBLogin::gotServerVersion() | |||
108 | 113 | ||
109 | qWarning("Server Version: %03d.%03d", serverMajor, serverMinor ); | 114 | owarn << "Server Version: " << serverMajor << "." << serverMinor << "" << oendl; |
110 | 115 | ||
@@ -114,3 +119,3 @@ void KRFBLogin::gotServerVersion() | |||
114 | 119 | ||
115 | qWarning( msg ); | 120 | owarn << msg << oendl; |
116 | emit error( msg ); | 121 | emit error( msg ); |
@@ -121,3 +126,3 @@ void KRFBLogin::gotServerVersion() | |||
121 | if ( serverMinor != 3 ) { | 126 | if ( serverMinor != 3 ) { |
122 | qWarning( "Minor version mismatch: %d", serverMinor ); | 127 | owarn << "Minor version mismatch: " << serverMinor << "" << oendl; |
123 | } | 128 | } |
@@ -145,3 +150,3 @@ void KRFBLogin::gotAuthScheme() | |||
145 | case 0: | 150 | case 0: |
146 | qWarning( "Failed" ); | 151 | owarn << "Failed" << oendl; |
147 | // Handle failure | 152 | // Handle failure |
@@ -161,3 +166,3 @@ void KRFBLogin::gotAuthScheme() | |||
161 | default: | 166 | default: |
162 | qWarning( "Unknown authentication scheme, 0x%08lx", scheme ); | 167 | owarn << "Unknown authentication scheme, 0x" << scheme << "" << oendl; |
163 | currentState = Error; | 168 | currentState = Error; |
@@ -183,3 +188,3 @@ void KRFBLogin::getPassword() | |||
183 | if ( con->options_->password.isNull() ) { | 188 | if ( con->options_->password.isNull() ) { |
184 | qWarning( "krfblogin needs a password" ); | 189 | owarn << "krfblogin needs a password" << oendl; |
185 | emit passwordRequired( con ); | 190 | emit passwordRequired( con ); |
@@ -218,3 +223,3 @@ void KRFBLogin::gotAuthResult() | |||
218 | 223 | ||
219 | qWarning( "Authentication Result is 0x%08lx", result ); | 224 | owarn << "Authentication Result is 0x" << result << "" << oendl; |
220 | 225 | ||
@@ -234,3 +239,3 @@ void KRFBLogin::gotAuthResult() | |||
234 | case AuthFailed: | 239 | case AuthFailed: |
235 | qWarning( "Dammit" ); | 240 | owarn << "Dammit" << oendl; |
236 | emit status( statusMsgFailed ); | 241 | emit status( statusMsgFailed ); |
@@ -243,3 +248,3 @@ void KRFBLogin::gotAuthResult() | |||
243 | default: | 248 | default: |
244 | qWarning( "Invalid authentication result, %lx", result ); | 249 | owarn << "Invalid authentication result, " << result << "" << oendl; |
245 | break; | 250 | break; |
@@ -250,3 +255,3 @@ void KRFBLogin::sendClientVersion() | |||
250 | { | 255 | { |
251 | qWarning( "Sending client version" ); | 256 | owarn << "Sending client version" << oendl; |
252 | con->write( (void*)"RFB 003.003\n", ClientVersionLength ); | 257 | con->write( (void*)"RFB 003.003\n", ClientVersionLength ); |
diff --git a/noncore/comm/keypebble/kvncbookmarkdlg.cpp b/noncore/comm/keypebble/kvncbookmarkdlg.cpp index ef2fa12..149c398 100644 --- a/noncore/comm/keypebble/kvncbookmarkdlg.cpp +++ b/noncore/comm/keypebble/kvncbookmarkdlg.cpp | |||
@@ -1 +1,9 @@ | |||
1 | #include "kvncbookmarkdlg.h" | ||
2 | |||
3 | /* OPIE */ | ||
4 | #include <opie2/odebug.h> | ||
5 | #include <qpe/global.h> | ||
6 | using namespace Opie::Core; | ||
7 | |||
8 | /* QT */ | ||
1 | #include <qdir.h> | 9 | #include <qdir.h> |
@@ -3,4 +11,2 @@ | |||
3 | #include <qlistbox.h> | 11 | #include <qlistbox.h> |
4 | #include <qpe/global.h> | ||
5 | #include "kvncbookmarkdlg.h" | ||
6 | 12 | ||
@@ -177,3 +183,3 @@ void KVNCBookmarkDlg::writeBookmarks(void) | |||
177 | for ( server=servers.first(); server != 0; server=servers.next() ) { | 183 | for ( server=servers.first(); server != 0; server=servers.next() ) { |
178 | qDebug(server->name); | 184 | odebug << server->name << oendl; |
179 | t << "server=" << server->name << '\n'; | 185 | t << "server=" << server->name << '\n'; |