author | chicken <chicken> | 2004-03-01 20:00:34 (UTC) |
---|---|---|
committer | chicken <chicken> | 2004-03-01 20:00:34 (UTC) |
commit | 6bab4a28785c4ab5b0f0707c8c8db953e399cac8 (patch) (unidiff) | |
tree | 126dd6c09cc82b3d41ea70410803daac5cde5b60 /noncore/comm | |
parent | 4ffae5ecb25f6d640c69f53f02755b6ec58d4c98 (diff) | |
download | opie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.zip opie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.tar.gz opie-6bab4a28785c4ab5b0f0707c8c8db953e399cac8.tar.bz2 |
fix includes
-rw-r--r-- | noncore/comm/keypebble/krfbbuffer.cpp | 3 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbcanvas.cpp | 9 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbconnection.cpp | 1 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbdecoder.cpp | 6 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfblogin.cpp | 1 | ||||
-rw-r--r-- | noncore/comm/keypebble/krfbserver.cpp | 1 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvnc.cpp | 13 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvncbookmarkdlg.cpp | 14 | ||||
-rw-r--r-- | noncore/comm/keypebble/kvncconndlg.cpp | 8 | ||||
-rw-r--r-- | noncore/comm/keypebble/main.cpp | 1 | ||||
-rw-r--r-- | noncore/comm/mobilemsg/mobilemsg.cpp | 5 |
11 files changed, 0 insertions, 62 deletions
diff --git a/noncore/comm/keypebble/krfbbuffer.cpp b/noncore/comm/keypebble/krfbbuffer.cpp index f1cb929..92918d4 100644 --- a/noncore/comm/keypebble/krfbbuffer.cpp +++ b/noncore/comm/keypebble/krfbbuffer.cpp | |||
@@ -1,22 +1,19 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | #include <qpixmap.h> | ||
3 | #include <qbrush.h> | ||
4 | #include <qimage.h> | 2 | #include <qimage.h> |
5 | #include <qpainter.h> | 3 | #include <qpainter.h> |
6 | #include <qapplication.h> | 4 | #include <qapplication.h> |
7 | #include "krfbdecoder.h" | 5 | #include "krfbdecoder.h" |
8 | #include "krfbbuffer.h" | 6 | #include "krfbbuffer.h" |
9 | #include "krfbconnection.h" | 7 | #include "krfbconnection.h" |
10 | #include "krfbserver.h" | ||
11 | #include "krfbserverinfo.h" | 8 | #include "krfbserverinfo.h" |
12 | 9 | ||
13 | // | 10 | // |
14 | // Endian stuff | 11 | // Endian stuff |
15 | // | 12 | // |
16 | #ifndef KDE_USE_FINAL | 13 | #ifndef KDE_USE_FINAL |
17 | const int endianTest = 1; | 14 | const int endianTest = 1; |
18 | #endif | 15 | #endif |
19 | 16 | ||
20 | #define Swap16IfLE(s) \ | 17 | #define Swap16IfLE(s) \ |
21 | (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) | 18 | (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) |
22 | 19 | ||
diff --git a/noncore/comm/keypebble/krfbcanvas.cpp b/noncore/comm/keypebble/krfbcanvas.cpp index bc71c90..75cba68 100644 --- a/noncore/comm/keypebble/krfbcanvas.cpp +++ b/noncore/comm/keypebble/krfbcanvas.cpp | |||
@@ -1,28 +1,19 @@ | |||
1 | #include "krfbconnection.h" | 1 | #include "krfbconnection.h" |
2 | #include "krfbcanvas.h" | 2 | #include "krfbcanvas.h" |
3 | #include "krfbserver.h" | ||
4 | #include "krfbbuffer.h" | 3 | #include "krfbbuffer.h" |
5 | 4 | ||
6 | #include <qpe/config.h> | ||
7 | #include <qpe/qpeapplication.h> | 5 | #include <qpe/qpeapplication.h> |
8 | 6 | ||
9 | #include <qapplication.h> | ||
10 | #include <qclipboard.h> | 7 | #include <qclipboard.h> |
11 | #include <qaction.h> | ||
12 | #include <qpixmap.h> | ||
13 | #include <qpoint.h> | ||
14 | #include <qapplication.h> | ||
15 | #include <qmainwindow.h> | ||
16 | #include <qiconset.h> | ||
17 | 8 | ||
18 | KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) | 9 | KRFBCanvas::KRFBCanvas( QWidget *parent, const char *name ) |
19 | : QScrollView( parent, name ) | 10 | : QScrollView( parent, name ) |
20 | { | 11 | { |
21 | connection_ = new KRFBConnection(); | 12 | connection_ = new KRFBConnection(); |
22 | connect( connection_, SIGNAL( loggedIn() ), | 13 | connect( connection_, SIGNAL( loggedIn() ), |
23 | this, SLOT( loggedIn() ) ); | 14 | this, SLOT( loggedIn() ) ); |
24 | 15 | ||
25 | loggedIn_ = false; | 16 | loggedIn_ = false; |
26 | 17 | ||
27 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold); | 18 | //QPEApplication::setStylusOperation(viewport(), QPEApplication::RightOnHold); |
28 | 19 | ||
diff --git a/noncore/comm/keypebble/krfbconnection.cpp b/noncore/comm/keypebble/krfbconnection.cpp index 389c836..e6c33c6 100644 --- a/noncore/comm/keypebble/krfbconnection.cpp +++ b/noncore/comm/keypebble/krfbconnection.cpp | |||
@@ -1,20 +1,19 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | #include <qsocket.h> | 2 | #include <qsocket.h> |
3 | #include <qtimer.h> | 3 | #include <qtimer.h> |
4 | #include <string.h> | 4 | #include <string.h> |
5 | 5 | ||
6 | #include "krfbconnection.h" | 6 | #include "krfbconnection.h" |
7 | #include "krfblogin.h" | 7 | #include "krfblogin.h" |
8 | #include "krfbserver.h" | ||
9 | #include "krfbdecoder.h" | 8 | #include "krfbdecoder.h" |
10 | #include "krfbbuffer.h" | 9 | #include "krfbbuffer.h" |
11 | 10 | ||
12 | KRFBConnection::KRFBConnection( QObject *parent ) | 11 | KRFBConnection::KRFBConnection( QObject *parent ) |
13 | : QObject( parent, "KRFBConnection" ) | 12 | : QObject( parent, "KRFBConnection" ) |
14 | { | 13 | { |
15 | portBase_ = 5900; | 14 | portBase_ = 5900; |
16 | currentState_ = Disconnected; | 15 | currentState_ = Disconnected; |
17 | sock = 0; | 16 | sock = 0; |
18 | minData_ = 0; | 17 | minData_ = 0; |
19 | options_ = new KRFBServer(); | 18 | options_ = new KRFBServer(); |
20 | updater = 0; | 19 | updater = 0; |
diff --git a/noncore/comm/keypebble/krfbdecoder.cpp b/noncore/comm/keypebble/krfbdecoder.cpp index c43aed5..2c9ad71 100644 --- a/noncore/comm/keypebble/krfbdecoder.cpp +++ b/noncore/comm/keypebble/krfbdecoder.cpp | |||
@@ -1,25 +1,19 @@ | |||
1 | #include "krfbconnection.h" | 1 | #include "krfbconnection.h" |
2 | #include "krfbserver.h" | ||
3 | #include "krfbserverinfo.h" | 2 | #include "krfbserverinfo.h" |
4 | #include "krfbdecoder.h" | 3 | #include "krfbdecoder.h" |
5 | #include "krfbbuffer.h" | 4 | #include "krfbbuffer.h" |
6 | 5 | ||
7 | #include <qpe/qpeapplication.h> | ||
8 | 6 | ||
9 | #include <qpixmap.h> | 7 | #include <qpixmap.h> |
10 | #include <qsocket.h> | ||
11 | #include <qevent.h> | ||
12 | #include <qstring.h> | ||
13 | #include <qclipboard.h> | ||
14 | 8 | ||
15 | #include <assert.h> | 9 | #include <assert.h> |
16 | 10 | ||
17 | // | 11 | // |
18 | // Endian stuff | 12 | // Endian stuff |
19 | // | 13 | // |
20 | #ifndef KDE_USE_FINAL | 14 | #ifndef KDE_USE_FINAL |
21 | const int endianTest = 1; | 15 | const int endianTest = 1; |
22 | #endif | 16 | #endif |
23 | 17 | ||
24 | #define Swap16IfLE(s) \ | 18 | #define Swap16IfLE(s) \ |
25 | (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) | 19 | (*(char *)&endianTest ? ((((s) & 0xff) << 8) | (((s) >> 8) & 0xff)) : (s)) |
diff --git a/noncore/comm/keypebble/krfblogin.cpp b/noncore/comm/keypebble/krfblogin.cpp index 0d2a205..0b4a757 100644 --- a/noncore/comm/keypebble/krfblogin.cpp +++ b/noncore/comm/keypebble/krfblogin.cpp | |||
@@ -1,23 +1,22 @@ | |||
1 | #include <assert.h> | 1 | #include <assert.h> |
2 | 2 | ||
3 | 3 | ||
4 | extern "C" { | 4 | extern "C" { |
5 | #include "vncauth.h" | 5 | #include "vncauth.h" |
6 | } | 6 | } |
7 | 7 | ||
8 | #include "krfblogin.h" | 8 | #include "krfblogin.h" |
9 | #include "krfbconnection.h" | 9 | #include "krfbconnection.h" |
10 | #include <qtimer.h> | 10 | #include <qtimer.h> |
11 | #include <qregexp.h> | ||
12 | 11 | ||
13 | // The length of the various messages (used to decide how many bytes to | 12 | // The length of the various messages (used to decide how many bytes to |
14 | // wait for). | 13 | // wait for). |
15 | const int ServerVersionLength = 12; | 14 | const int ServerVersionLength = 12; |
16 | const int ClientVersionLength = 12; | 15 | const int ClientVersionLength = 12; |
17 | const int AuthSchemeLength = 4; | 16 | const int AuthSchemeLength = 4; |
18 | const int FailureReasonSizeLength = 4; | 17 | const int FailureReasonSizeLength = 4; |
19 | const int ChallengeLength = 16; | 18 | const int ChallengeLength = 16; |
20 | const int AuthResultLength = 4; | 19 | const int AuthResultLength = 4; |
21 | 20 | ||
22 | // Authentication results | 21 | // Authentication results |
23 | enum AuthResult { | 22 | enum AuthResult { |
diff --git a/noncore/comm/keypebble/krfbserver.cpp b/noncore/comm/keypebble/krfbserver.cpp index b47534e..fda81a1 100644 --- a/noncore/comm/keypebble/krfbserver.cpp +++ b/noncore/comm/keypebble/krfbserver.cpp | |||
@@ -1,13 +1,12 @@ | |||
1 | #include <qpe/config.h> | ||
2 | #include <qpe/qpeapplication.h> | 1 | #include <qpe/qpeapplication.h> |
3 | #include "krfbserver.h" | 2 | #include "krfbserver.h" |
4 | 3 | ||
5 | KRFBServer::KRFBServer() | 4 | KRFBServer::KRFBServer() |
6 | { | 5 | { |
7 | QString name; | 6 | QString name; |
8 | QString hostname; | 7 | QString hostname; |
9 | QString password; | 8 | QString password; |
10 | display=0; | 9 | display=0; |
11 | 10 | ||
12 | scaleFactor=1; | 11 | scaleFactor=1; |
13 | 12 | ||
diff --git a/noncore/comm/keypebble/kvnc.cpp b/noncore/comm/keypebble/kvnc.cpp index 2fa8d1f..c678edf 100644 --- a/noncore/comm/keypebble/kvnc.cpp +++ b/noncore/comm/keypebble/kvnc.cpp | |||
@@ -1,39 +1,26 @@ | |||
1 | #include <qiconset.h> | ||
2 | #include <qdialog.h> | ||
3 | #include <qpixmap.h> | ||
4 | #include <qdom.h> | ||
5 | #include <qaction.h> | 1 | #include <qaction.h> |
6 | #include <qmenubar.h> | ||
7 | #include <qstatusbar.h> | ||
8 | #include <qpopupmenu.h> | 2 | #include <qpopupmenu.h> |
9 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
10 | #include <qpe/qpetoolbar.h> | ||
11 | #include <qtimer.h> | ||
12 | #include <qmessagebox.h> | 4 | #include <qmessagebox.h> |
13 | #include <qspinbox.h> | ||
14 | #include <qlistbox.h> | 5 | #include <qlistbox.h> |
15 | #include <qlineedit.h> | ||
16 | #include <qpe/qpeapplication.h> | 6 | #include <qpe/qpeapplication.h> |
17 | #include <qpe/global.h> | ||
18 | #include <qpe/qpetoolbar.h> | ||
19 | #include <qpe/resource.h> | 7 | #include <qpe/resource.h> |
20 | 8 | ||
21 | #include <assert.h> | 9 | #include <assert.h> |
22 | 10 | ||
23 | #include "kvnc.h" | 11 | #include "kvnc.h" |
24 | #include "krfbcanvas.h" | 12 | #include "krfbcanvas.h" |
25 | #include "krfbconnection.h" | 13 | #include "krfbconnection.h" |
26 | #include "kvncconndlg.h" | 14 | #include "kvncconndlg.h" |
27 | #include "krfbserver.h" | ||
28 | 15 | ||
29 | static int u_id = 1; | 16 | static int u_id = 1; |
30 | static int get_unique_id() | 17 | static int get_unique_id() |
31 | { | 18 | { |
32 | return u_id++; | 19 | return u_id++; |
33 | } | 20 | } |
34 | 21 | ||
35 | 22 | ||
36 | /* XPM */ | 23 | /* XPM */ |
37 | static char * menu_xpm[] = { | 24 | static char * menu_xpm[] = { |
38 | "12 12 5 1", | 25 | "12 12 5 1", |
39 | " c None", | 26 | " c None", |
diff --git a/noncore/comm/keypebble/kvncbookmarkdlg.cpp b/noncore/comm/keypebble/kvncbookmarkdlg.cpp index 8556d49..ef2fa12 100644 --- a/noncore/comm/keypebble/kvncbookmarkdlg.cpp +++ b/noncore/comm/keypebble/kvncbookmarkdlg.cpp | |||
@@ -1,30 +1,16 @@ | |||
1 | #include <qframe.h> | ||
2 | #include <qvbox.h> | ||
3 | #include <qcheckbox.h> | ||
4 | #include <qspinbox.h> | ||
5 | #include <qlabel.h> | ||
6 | #include <qlayout.h> | ||
7 | #include <qwhatsthis.h> | ||
8 | #include <qfile.h> | ||
9 | #include <qdir.h> | 1 | #include <qdir.h> |
10 | #include <qstring.h> | ||
11 | #include <qapplication.h> | ||
12 | #include <qlineedit.h> | ||
13 | #include <qtextstream.h> | 2 | #include <qtextstream.h> |
14 | #include <qpushbutton.h> | ||
15 | #include <qlistbox.h> | 3 | #include <qlistbox.h> |
16 | #include <qpe/config.h> | ||
17 | #include <qpe/global.h> | 4 | #include <qpe/global.h> |
18 | #include "krfbserver.h" | ||
19 | #include "kvncbookmarkdlg.h" | 5 | #include "kvncbookmarkdlg.h" |
20 | 6 | ||
21 | KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) | 7 | KVNCBookmarkDlg::KVNCBookmarkDlg( QWidget * parent, const char * name, WFlags f ) |
22 | 8 | ||
23 | : KVNCBookmarkDlgBase( parent, name,f) | 9 | : KVNCBookmarkDlgBase( parent, name,f) |
24 | { | 10 | { |
25 | readBookmarks(); | 11 | readBookmarks(); |
26 | refresh(); | 12 | refresh(); |
27 | 13 | ||
28 | } | 14 | } |
29 | 15 | ||
30 | KVNCBookmarkDlg::~KVNCBookmarkDlg() | 16 | KVNCBookmarkDlg::~KVNCBookmarkDlg() |
diff --git a/noncore/comm/keypebble/kvncconndlg.cpp b/noncore/comm/keypebble/kvncconndlg.cpp index cd55bb0..420c816 100644 --- a/noncore/comm/keypebble/kvncconndlg.cpp +++ b/noncore/comm/keypebble/kvncconndlg.cpp | |||
@@ -1,24 +1,16 @@ | |||
1 | #include <qframe.h> | ||
2 | #include <qvbox.h> | ||
3 | #include <qcheckbox.h> | 1 | #include <qcheckbox.h> |
4 | #include <qcombobox.h> | 2 | #include <qcombobox.h> |
5 | #include <qspinbox.h> | 3 | #include <qspinbox.h> |
6 | #include <qlabel.h> | ||
7 | #include <qlayout.h> | ||
8 | #include <qwhatsthis.h> | ||
9 | #include <qapplication.h> | ||
10 | #include <qlineedit.h> | 4 | #include <qlineedit.h> |
11 | #include <qpushbutton.h> | ||
12 | #include "krfbserver.h" | ||
13 | 5 | ||
14 | #include "kvncconndlg.h" | 6 | #include "kvncconndlg.h" |
15 | 7 | ||
16 | KVNCConnDlg::KVNCConnDlg( KRFBServer *options, | 8 | KVNCConnDlg::KVNCConnDlg( KRFBServer *options, |
17 | QWidget *parent, char *name, bool modal ) | 9 | QWidget *parent, char *name, bool modal ) |
18 | : KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp ) | 10 | : KVNCConnDlgBase( parent, name, modal, WStyle_ContextHelp ) |
19 | { | 11 | { |
20 | this->options=options; | 12 | this->options=options; |
21 | tmpOptions=*options; | 13 | tmpOptions=*options; |
22 | 14 | ||
23 | serverHostname->setText(options->hostname); | 15 | serverHostname->setText(options->hostname); |
24 | serverDisplay->setValue(options->display); | 16 | serverDisplay->setValue(options->display); |
diff --git a/noncore/comm/keypebble/main.cpp b/noncore/comm/keypebble/main.cpp index 11f67fc..fc34099 100644 --- a/noncore/comm/keypebble/main.cpp +++ b/noncore/comm/keypebble/main.cpp | |||
@@ -1,10 +1,9 @@ | |||
1 | 1 | ||
2 | 2 | ||
3 | 3 | ||
4 | #include <qpe/qpeapplication.h> | ||
5 | #include "kvnc.h" | 4 | #include "kvnc.h" |
6 | #include <opie/oapplicationfactory.h> | 5 | #include <opie/oapplicationfactory.h> |
7 | 6 | ||
8 | 7 | ||
9 | 8 | ||
10 | OPIE_EXPORT_APP( OApplicationFactory<KVNC> ) | 9 | OPIE_EXPORT_APP( OApplicationFactory<KVNC> ) |
diff --git a/noncore/comm/mobilemsg/mobilemsg.cpp b/noncore/comm/mobilemsg/mobilemsg.cpp index 707872e..9a4db35 100644 --- a/noncore/comm/mobilemsg/mobilemsg.cpp +++ b/noncore/comm/mobilemsg/mobilemsg.cpp | |||
@@ -1,20 +1,15 @@ | |||
1 | #include "mobilemsg.h" | 1 | #include "mobilemsg.h" |
2 | #include <qpushbutton.h> | ||
3 | 2 | ||
4 | #include <qpe/qpeapplication.h> | ||
5 | 3 | ||
6 | #include <qlistbox.h> | ||
7 | #include <qpushbutton.h> | ||
8 | #include <qlayout.h> | ||
9 | 4 | ||
10 | 5 | ||
11 | /* | 6 | /* |
12 | * Constructs a MobileMsg which is a child of 'parent', with the | 7 | * Constructs a MobileMsg which is a child of 'parent', with the |
13 | * name 'name' and widget flags set to 'f' | 8 | * name 'name' and widget flags set to 'f' |
14 | */ | 9 | */ |
15 | MobileMsg::MobileMsg( QWidget* parent, const char* name, WFlags fl ) | 10 | MobileMsg::MobileMsg( QWidget* parent, const char* name, WFlags fl ) |
16 | : MobileMsgBase( parent, name, fl ) | 11 | : MobileMsgBase( parent, name, fl ) |
17 | { | 12 | { |
18 | //connect(add, SIGNAL(clicked()), this, SLOT(goodBye())); | 13 | //connect(add, SIGNAL(clicked()), this, SLOT(goodBye())); |
19 | //connect(remove, SIGNAL(clicked()), this, SLOT(goodBye())); | 14 | //connect(remove, SIGNAL(clicked()), this, SLOT(goodBye())); |
20 | //connect(props, SIGNAL(clicked()), this, SLOT(goodBye())); | 15 | //connect(props, SIGNAL(clicked()), this, SLOT(goodBye())); |