author | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-09-10 12:09:49 (UTC) |
commit | 6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4 (patch) (unidiff) | |
tree | 6ebc93c6432f4ed9d00ef1448b6a047ef522a79a /library/process_unix.cpp | |
parent | d10cddb3c9ce75bc90b14add14bc133737fe35aa (diff) | |
download | opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.zip opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.gz opie-6b77a1cdb9536b1c135eb86d53a6b2c22c19b0a4.tar.bz2 |
Qtopia1-6 merge
still to test
bic changes to be resolved
more changes to be made?
-rw-r--r-- | library/process_unix.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/process_unix.cpp b/library/process_unix.cpp index b599edb..e0fbf8c 100644 --- a/library/process_unix.cpp +++ b/library/process_unix.cpp | |||
@@ -1,52 +1,52 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of 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 | #ifndef QT_H | 21 | #ifndef QT_H |
22 | # include <qfeatures.h> | 22 | # include <qfeatures.h> |
23 | #endif // QT_H | 23 | #endif // QT_H |
24 | 24 | ||
25 | #ifndef QT_NO_PROCESS | 25 | #ifndef QT_NO_PROCESS |
26 | 26 | ||
27 | //#include "qplatformdefs.h" | 27 | //#include "qplatformdefs.h" |
28 | #include <stdio.h> | 28 | #include <stdio.h> |
29 | #include <unistd.h> | 29 | #include <unistd.h> |
30 | #include <signal.h> | 30 | #include <signal.h> |
31 | #include <sys/types.h> | 31 | #include <sys/types.h> |
32 | #include <sys/socket.h> | 32 | #include <sys/socket.h> |
33 | #include <fcntl.h> | 33 | #include <fcntl.h> |
34 | 34 | ||
35 | #include "process.h" | 35 | #include "process.h" |
36 | #include "qapplication.h" | 36 | #include "qapplication.h" |
37 | //#include "qptrqueue.h" | 37 | //#include "qptrqueue.h" |
38 | //#include "qptrlist.h" | 38 | //#include "qptrlist.h" |
39 | #include "qsocketnotifier.h" | 39 | #include "qsocketnotifier.h" |
40 | #include "qtimer.h" | 40 | #include "qtimer.h" |
41 | //#include "qcleanuphandler.h" | 41 | //#include "qcleanuphandler.h" |
42 | #include "qregexp.h" | 42 | #include "qregexp.h" |
43 | 43 | ||
44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
45 | #include <errno.h> | 45 | #include <errno.h> |
46 | 46 | ||
47 | #define QPtrList QList | 47 | #define QPtrList QList |
48 | 48 | ||
49 | //#define QT_QPROCESS_DEBUG | 49 | //#define QT_QPROCESS_DEBUG |
50 | 50 | ||
51 | 51 | ||
52 | class Proc; | 52 | class Proc; |