-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,10 +1,8 @@ | |||
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 | ||
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 | |||
@@ -19,39 +19,24 @@ | |||
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 ) |
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 | |||
@@ -20,23 +20,17 @@ | |||
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> |
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 | |||
@@ -24,17 +24,16 @@ | |||
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 | ||
@@ -49,30 +48,23 @@ extern "C" | |||
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 | ||