author | chicken <chicken> | 2004-03-01 17:44:52 (UTC) |
---|---|---|
committer | chicken <chicken> | 2004-03-01 17:44:52 (UTC) |
commit | 5b640d3f070b0b2de361421abf93949410546e19 (patch) (unidiff) | |
tree | 98d6ebb158e780a299cca27cbb7c7105a8dedef3 /core | |
parent | bdac663be648746b868757a6fc9e6c443e6f51b1 (diff) | |
download | opie-5b640d3f070b0b2de361421abf93949410546e19.zip opie-5b640d3f070b0b2de361421abf93949410546e19.tar.gz opie-5b640d3f070b0b2de361421abf93949410546e19.tar.bz2 |
fix includes
-rw-r--r-- | core/qws/main.cpp | 2 | ||||
-rw-r--r-- | core/qws/oqwsserver.cpp | 15 | ||||
-rw-r--r-- | core/qws/qcopbridge.cpp | 6 | ||||
-rw-r--r-- | core/qws/transferserver.cpp | 8 |
4 files changed, 0 insertions, 31 deletions
diff --git a/core/qws/main.cpp b/core/qws/main.cpp index bfed283..1c3c621 100644 --- a/core/qws/main.cpp +++ b/core/qws/main.cpp | |||
@@ -1,26 +1,24 @@ | |||
1 | #include <qwindowsystem_qws.h> | ||
2 | #include <qapplication.h> | ||
3 | 1 | ||
4 | #include "oqwsserver.h" | 2 | #include "oqwsserver.h" |
5 | 3 | ||
6 | #include <sys/types.h> | 4 | #include <sys/types.h> |
7 | #include <sys/stat.h> | 5 | #include <sys/stat.h> |
8 | #include <fcntl.h> | 6 | #include <fcntl.h> |
9 | #include <unistd.h> | 7 | #include <unistd.h> |
10 | 8 | ||
11 | #include <syslog.h> | 9 | #include <syslog.h> |
12 | #include <stdio.h> | 10 | #include <stdio.h> |
13 | 11 | ||
14 | #define APPNAME "op-qws" | 12 | #define APPNAME "op-qws" |
15 | 13 | ||
16 | void toSyslog(QtMsgType type, const char *msg) | 14 | void toSyslog(QtMsgType type, const char *msg) |
17 | { | 15 | { |
18 | int level = LOG_INFO; | 16 | int level = LOG_INFO; |
19 | switch (type) { | 17 | switch (type) { |
20 | case QtDebugMsg: | 18 | case QtDebugMsg: |
21 | level = LOG_DEBUG; | 19 | level = LOG_DEBUG; |
22 | break; | 20 | break; |
23 | case QtWarningMsg: | 21 | case QtWarningMsg: |
24 | level = LOG_WARNING; | 22 | level = LOG_WARNING; |
25 | break; | 23 | break; |
26 | case QtFatalMsg: | 24 | case QtFatalMsg: |
diff --git a/core/qws/oqwsserver.cpp b/core/qws/oqwsserver.cpp index 1c61d19..907686a 100644 --- a/core/qws/oqwsserver.cpp +++ b/core/qws/oqwsserver.cpp | |||
@@ -3,71 +3,56 @@ | |||
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <syslog.h> | 21 | #include <syslog.h> |
22 | 22 | ||
23 | #include "oqwsserver.h" | 23 | #include "oqwsserver.h" |
24 | #include "qcopbridge.h" | 24 | #include "qcopbridge.h" |
25 | #include "transferserver.h" | 25 | #include "transferserver.h" |
26 | 26 | ||
27 | #include <qpe/applnk.h> | ||
28 | #include <qpe/mimetype.h> | ||
29 | #include <qpe/password.h> | ||
30 | #include <qpe/config.h> | ||
31 | #include <qpe/power.h> | ||
32 | #include <qpe/timeconversion.h> | ||
33 | #include <qpe/qcopenvelope_qws.h> | ||
34 | #include <qpe/network.h> | ||
35 | #include <qpe/global.h> | ||
36 | 27 | ||
37 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) | 28 | #if defined( QT_QWS_SL5XXX ) || defined( QT_QWS_IPAQ ) |
38 | #include <qpe/custom.h> | 29 | #include <qpe/custom.h> |
39 | #endif | 30 | #endif |
40 | 31 | ||
41 | #include <opie/odevice.h> | 32 | #include <opie/odevice.h> |
42 | 33 | ||
43 | #include <qgfx_qws.h> | ||
44 | #include <qmainwindow.h> | ||
45 | #include <qmessagebox.h> | ||
46 | #include <qtimer.h> | ||
47 | #include <qwindowsystem_qws.h> | ||
48 | 34 | ||
49 | #include <qvaluelist.h> | ||
50 | 35 | ||
51 | #include <stdlib.h> | 36 | #include <stdlib.h> |
52 | #include <unistd.h> | 37 | #include <unistd.h> |
53 | #include <fcntl.h> | 38 | #include <fcntl.h> |
54 | 39 | ||
55 | using namespace Opie; | 40 | using namespace Opie; |
56 | 41 | ||
57 | OQWSServer::OQWSServer( int& argc, char **argv, Type appType ) | 42 | OQWSServer::OQWSServer( int& argc, char **argv, Type appType ) |
58 | : QPEApplication( argc, argv, appType ) | 43 | : QPEApplication( argc, argv, appType ) |
59 | { | 44 | { |
60 | startServers(); | 45 | startServers(); |
61 | } | 46 | } |
62 | 47 | ||
63 | OQWSServer::~OQWSServer() | 48 | OQWSServer::~OQWSServer() |
64 | { | 49 | { |
65 | terminateServers(); | 50 | terminateServers(); |
66 | } | 51 | } |
67 | 52 | ||
68 | bool OQWSServer::eventFilter ( QObject *o, QEvent *e ) | 53 | bool OQWSServer::eventFilter ( QObject *o, QEvent *e ) |
69 | { | 54 | { |
70 | #if 0 | 55 | #if 0 |
71 | if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) { | 56 | if ( e-> type ( ) == QEvent::KeyPress || e-> type ( ) == QEvent::KeyRelease ) { |
72 | QKeyEvent *ke = (QKeyEvent *) e; | 57 | QKeyEvent *ke = (QKeyEvent *) e; |
73 | 58 | ||
diff --git a/core/qws/qcopbridge.cpp b/core/qws/qcopbridge.cpp index 6177a7c..c0c52e8 100644 --- a/core/qws/qcopbridge.cpp +++ b/core/qws/qcopbridge.cpp | |||
@@ -4,55 +4,49 @@ | |||
4 | ** This file is part of the Qtopia Environment. | 4 | ** This file is part of the Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "qcopbridge.h" | 21 | #include "qcopbridge.h" |
22 | #include "transferserver.h" | 22 | #include "transferserver.h" |
23 | 23 | ||
24 | #include <qpe/qcopenvelope_qws.h> | 24 | #include <qpe/qcopenvelope_qws.h> |
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/version.h> | 26 | #include <qpe/version.h> |
27 | 27 | ||
28 | #include <qdir.h> | ||
29 | #include <qfile.h> | ||
30 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
31 | #include <qdatastream.h> | ||
32 | #include <qstringlist.h> | ||
33 | #include <qfileinfo.h> | ||
34 | #include <qregexp.h> | ||
35 | #ifdef QWS | 29 | #ifdef QWS |
36 | #include <qcopchannel_qws.h> | 30 | #include <qcopchannel_qws.h> |
37 | #endif | 31 | #endif |
38 | 32 | ||
39 | #define _XOPEN_SOURCE | 33 | #define _XOPEN_SOURCE |
40 | #include <pwd.h> | 34 | #include <pwd.h> |
41 | #include <sys/types.h> | 35 | #include <sys/types.h> |
42 | #include <unistd.h> | 36 | #include <unistd.h> |
43 | 37 | ||
44 | #if defined(_OS_LINUX_) | 38 | #if defined(_OS_LINUX_) |
45 | #include <shadow.h> | 39 | #include <shadow.h> |
46 | #endif | 40 | #endif |
47 | 41 | ||
48 | //#define INSECURE | 42 | //#define INSECURE |
49 | 43 | ||
50 | const int block_size = 51200; | 44 | const int block_size = 51200; |
51 | 45 | ||
52 | QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent , | 46 | QCopBridge::QCopBridge( Q_UINT16 port, QObject *parent , |
53 | const char* name ) | 47 | const char* name ) |
54 | : QServerSocket( port, 1, parent, name ), | 48 | : QServerSocket( port, 1, parent, name ), |
55 | desktopChannel( 0 ), | 49 | desktopChannel( 0 ), |
56 | cardChannel( 0 ) | 50 | cardChannel( 0 ) |
57 | { | 51 | { |
58 | if ( !ok() ) | 52 | if ( !ok() ) |
diff --git a/core/qws/transferserver.cpp b/core/qws/transferserver.cpp index 239c824..30bf438 100644 --- a/core/qws/transferserver.cpp +++ b/core/qws/transferserver.cpp | |||
@@ -8,87 +8,79 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #define _XOPEN_SOURCE | 20 | #define _XOPEN_SOURCE |
21 | #include <pwd.h> | 21 | #include <pwd.h> |
22 | #include <sys/types.h> | 22 | #include <sys/types.h> |
23 | #include <unistd.h> | 23 | #include <unistd.h> |
24 | #include <stdlib.h> | 24 | #include <stdlib.h> |
25 | #include <time.h> | 25 | #include <time.h> |
26 | 26 | ||
27 | #ifndef Q_OS_MACX | 27 | #ifndef Q_OS_MACX |
28 | #include <shadow.h> | 28 | #include <shadow.h> |
29 | #endif /* Q_OS_MACX */ | 29 | #endif /* Q_OS_MACX */ |
30 | 30 | ||
31 | /* we need the _OS_LINUX stuff first ! */ | 31 | /* we need the _OS_LINUX stuff first ! */ |
32 | #include <qglobal.h> | ||
33 | 32 | ||
34 | #ifndef _OS_LINUX_ | 33 | #ifndef _OS_LINUX_ |
35 | // Is anybody able to review this ? The include "uuid/uuid.h" couldn't be found | 34 | // Is anybody able to review this ? The include "uuid/uuid.h" couldn't be found |
36 | // anywhere ? Therfore I removed it completely.. | 35 | // anywhere ? Therfore I removed it completely.. |
37 | // I think it should be made permanentyl !? (eilers) | 36 | // I think it should be made permanentyl !? (eilers) |
38 | #warning "Where should uuid/uuid.h be found ? Removed this part .. (eilers)" | 37 | #warning "Where should uuid/uuid.h be found ? Removed this part .. (eilers)" |
39 | #if 0 | 38 | #if 0 |
40 | 39 | ||
41 | extern "C" | 40 | extern "C" |
42 | { | 41 | { |
43 | #include <uuid/uuid.h> | 42 | #include <uuid/uuid.h> |
44 | #define UUID_H_INCLUDED | 43 | #define UUID_H_INCLUDED |
45 | } | 44 | } |
46 | 45 | ||
47 | #endif | 46 | #endif |
48 | 47 | ||
49 | #endif // not defined linux | 48 | #endif // not defined linux |
50 | 49 | ||
51 | #if defined(_OS_LINUX_) | 50 | #if defined(_OS_LINUX_) |
52 | #include <shadow.h> | 51 | #include <shadow.h> |
53 | #elif defined(Q_OS_MACX) | 52 | #elif defined(Q_OS_MACX) |
54 | #include <stdlib.h> | 53 | #include <stdlib.h> |
55 | #endif | 54 | #endif |
56 | 55 | ||
57 | #include <qdir.h> | ||
58 | #include <qfile.h> | ||
59 | #include <qtextstream.h> | 56 | #include <qtextstream.h> |
60 | #include <qdatastream.h> | ||
61 | #include <qmessagebox.h> | 57 | #include <qmessagebox.h> |
62 | #include <qstringlist.h> | ||
63 | #include <qfileinfo.h> | ||
64 | #include <qregexp.h> | ||
65 | //#include <qpe/qcopchannel_qws.h> | 58 | //#include <qpe/qcopchannel_qws.h> |
66 | #include <qpe/process.h> | 59 | #include <qpe/process.h> |
67 | #include <qpe/global.h> | 60 | #include <qpe/global.h> |
68 | #include <qpe/config.h> | 61 | #include <qpe/config.h> |
69 | #include <qpe/contact.h> | 62 | #include <qpe/contact.h> |
70 | #include <qpe/quuid.h> | ||
71 | #include <qpe/version.h> | 63 | #include <qpe/version.h> |
72 | #include <qpe/qcopenvelope_qws.h> | 64 | #include <qpe/qcopenvelope_qws.h> |
73 | 65 | ||
74 | #include "transferserver.h" | 66 | #include "transferserver.h" |
75 | #include <opie/oprocess.h> | 67 | #include <opie/oprocess.h> |
76 | 68 | ||
77 | const int block_size = 51200; | 69 | const int block_size = 51200; |
78 | 70 | ||
79 | TransferServer::TransferServer( Q_UINT16 port, QObject *parent , | 71 | TransferServer::TransferServer( Q_UINT16 port, QObject *parent , |
80 | const char* name ) | 72 | const char* name ) |
81 | : QServerSocket( port, 1, parent, name ) | 73 | : QServerSocket( port, 1, parent, name ) |
82 | { | 74 | { |
83 | if ( !ok() ) | 75 | if ( !ok() ) |
84 | qWarning( "Failed to bind to port %d", port ); | 76 | qWarning( "Failed to bind to port %d", port ); |
85 | } | 77 | } |
86 | 78 | ||
87 | TransferServer::~TransferServer() | 79 | TransferServer::~TransferServer() |
88 | { | 80 | { |
89 | } | 81 | } |
90 | 82 | ||
91 | void TransferServer::newConnection( int socket ) | 83 | void TransferServer::newConnection( int socket ) |
92 | { | 84 | { |
93 | (void) new ServerPI( socket, this ); | 85 | (void) new ServerPI( socket, this ); |
94 | } | 86 | } |