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/qws/transferserver.cpp | |
parent | bdac663be648746b868757a6fc9e6c443e6f51b1 (diff) | |
download | opie-5b640d3f070b0b2de361421abf93949410546e19.zip opie-5b640d3f070b0b2de361421abf93949410546e19.tar.gz opie-5b640d3f070b0b2de361421abf93949410546e19.tar.bz2 |
fix includes
-rw-r--r-- | core/qws/transferserver.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
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 | } |