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.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.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/library/process.cpp b/library/process.cpp index 2e25dd5..103dcae 100644 --- a/library/process.cpp +++ b/library/process.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 | #include <stdio.h> | 21 | #include <stdio.h> |
22 | #include <stdlib.h> | 22 | #include <stdlib.h> |
23 | 23 | ||
24 | #include "process.h" | 24 | #include "process.h" |
25 | 25 | ||
26 | #ifndef QT_NO_PROCESS | 26 | #ifndef QT_NO_PROCESS |
27 | 27 | ||
28 | #include "qapplication.h" | 28 | #include "qapplication.h" |
29 | 29 | ||
30 | 30 | ||
31 | Process::Process( QObject *parent, const char *name ) | 31 | Process::Process( QObject *parent, const char *name ) |
32 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), | 32 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), |
33 | wroteToStdinConnected( FALSE ) | 33 | wroteToStdinConnected( FALSE ) |
34 | { | 34 | { |
35 | init(); | 35 | init(); |
36 | } | 36 | } |
37 | 37 | ||
38 | Process::Process( const QString& arg0, QObject *parent, const char *name ) | 38 | Process::Process( const QString& arg0, QObject *parent, const char *name ) |
39 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), | 39 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), |
40 | wroteToStdinConnected( FALSE ) | 40 | wroteToStdinConnected( FALSE ) |
41 | { | 41 | { |
42 | init(); | 42 | init(); |
43 | addArgument( arg0 ); | 43 | addArgument( arg0 ); |
44 | } | 44 | } |
45 | 45 | ||
46 | Process::Process( const QStringList& args, QObject *parent, const char *name ) | 46 | Process::Process( const QStringList& args, QObject *parent, const char *name ) |
47 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), | 47 | : QObject( parent, name ), ioRedirection( FALSE ), notifyOnExit( FALSE ), |
48 | wroteToStdinConnected( FALSE ) | 48 | wroteToStdinConnected( FALSE ) |
49 | { | 49 | { |
50 | init(); | 50 | init(); |
51 | setArguments( args ); | 51 | setArguments( args ); |
52 | } | 52 | } |