author | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-30 11:40:54 (UTC) |
commit | 632b43950f1ac2980c281eb8901d797deb0ba971 (patch) (unidiff) | |
tree | 72534bf865fbef61a29d5e8b2e65672c15b432c0 /microkde | |
parent | 0057c2a8e90346583f606491730cae819d2313ac (diff) | |
download | kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.zip kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.gz kdepimpi-632b43950f1ac2980c281eb8901d797deb0ba971.tar.bz2 |
made ompi compiling on desktop
-rw-r--r-- | microkde/microkde.pro | 7 | ||||
-rw-r--r-- | microkde/oprocess.cpp | 1 |
2 files changed, 7 insertions, 1 deletions
diff --git a/microkde/microkde.pro b/microkde/microkde.pro index 21da158..6e75442 100644 --- a/microkde/microkde.pro +++ b/microkde/microkde.pro | |||
@@ -13,96 +13,99 @@ OBJECTS_DIR = obj/unix | |||
13 | MOC_DIR = moc/unix | 13 | MOC_DIR = moc/unix |
14 | } | 14 | } |
15 | win32: { | 15 | win32: { |
16 | DEFINES += _WIN32_ | 16 | DEFINES += _WIN32_ |
17 | OBJECTS_DIR = obj/win | 17 | OBJECTS_DIR = obj/win |
18 | MOC_DIR = moc/win | 18 | MOC_DIR = moc/win |
19 | } | 19 | } |
20 | include( ../variables.pri ) | 20 | include( ../variables.pri ) |
21 | 21 | ||
22 | 22 | ||
23 | 23 | ||
24 | HEADERS = \ | 24 | HEADERS = \ |
25 | qlayoutengine_p.h \ | 25 | qlayoutengine_p.h \ |
26 | KDGanttMinimizeSplitter.h \ | 26 | KDGanttMinimizeSplitter.h \ |
27 | kapplication.h \ | 27 | kapplication.h \ |
28 | kaudioplayer.h \ | 28 | kaudioplayer.h \ |
29 | kcalendarsystem.h \ | 29 | kcalendarsystem.h \ |
30 | kcalendarsystemgregorian.h \ | 30 | kcalendarsystemgregorian.h \ |
31 | kcolorbutton.h \ | 31 | kcolorbutton.h \ |
32 | kcolordialog.h \ | 32 | kcolordialog.h \ |
33 | kcombobox.h \ | 33 | kcombobox.h \ |
34 | kconfig.h \ | 34 | kconfig.h \ |
35 | kdatetbl.h \ | 35 | kdatetbl.h \ |
36 | kdebug.h \ | 36 | kdebug.h \ |
37 | kdialog.h \ | 37 | kdialog.h \ |
38 | kdialogbase.h \ | 38 | kdialogbase.h \ |
39 | keditlistbox.h \ | 39 | keditlistbox.h \ |
40 | kemailsettings.h \ | 40 | kemailsettings.h \ |
41 | kfiledialog.h \ | 41 | kfiledialog.h \ |
42 | kfontdialog.h \ | 42 | kfontdialog.h \ |
43 | kglobal.h \ | 43 | kglobal.h \ |
44 | kglobalsettings.h \ | 44 | kglobalsettings.h \ |
45 | kiconloader.h \ | 45 | kiconloader.h \ |
46 | klineedit.h \ | 46 | klineedit.h \ |
47 | klineeditdlg.h \ | 47 | klineeditdlg.h \ |
48 | kmessagebox.h \ | 48 | kmessagebox.h \ |
49 | knotifyclient.h \ | 49 | knotifyclient.h \ |
50 | kprinter.h \ | 50 | kprinter.h \ |
51 | kprocess.h \ | 51 | kprocess.h \ |
52 | krestrictedline.h \ | 52 | krestrictedline.h \ |
53 | krun.h \ | 53 | krun.h \ |
54 | ksimpleconfig.h \ | 54 | ksimpleconfig.h \ |
55 | kstaticdeleter.h \ | 55 | kstaticdeleter.h \ |
56 | ksystemtray.h \ | 56 | ksystemtray.h \ |
57 | ktempfile.h \ | 57 | ktempfile.h \ |
58 | ktextedit.h \ | 58 | ktextedit.h \ |
59 | kunload.h \ | 59 | kunload.h \ |
60 | kurl.h \ | 60 | kurl.h \ |
61 | oprocctrl.h \ | ||
62 | oprocess.h \ | ||
63 | osmartpointer.h \ | ||
61 | kdeui/kguiitem.h \ | 64 | kdeui/kguiitem.h \ |
62 | kdeui/kcmodule.h \ | 65 | kdeui/kcmodule.h \ |
63 | kdeui/kbuttonbox.h \ | 66 | kdeui/kbuttonbox.h \ |
64 | kdeui/klistbox.h \ | 67 | kdeui/klistbox.h \ |
65 | kdeui/klistview.h \ | 68 | kdeui/klistview.h \ |
66 | kdeui/kjanuswidget.h \ | 69 | kdeui/kjanuswidget.h \ |
67 | kdeui/kseparator.h \ | 70 | kdeui/kseparator.h \ |
68 | kdeui/knuminput.h \ | 71 | kdeui/knuminput.h \ |
69 | kdeui/knumvalidator.h \ | 72 | kdeui/knumvalidator.h \ |
70 | kdeui/ksqueezedtextlabel.h \ | 73 | kdeui/ksqueezedtextlabel.h \ |
71 | kio/job.h \ | 74 | kio/job.h \ |
72 | kio/kio/kdirwatch.h \ | 75 | kio/kio/kdirwatch.h \ |
73 | kio/kio/kdirwatch_p.h \ | 76 | kio/kio/kdirwatch_p.h \ |
74 | kio/kfile/kurlrequester.h \ | 77 | kio/kfile/kurlrequester.h \ |
75 | kresources/resource.h \ | 78 | kresources/resource.h \ |
76 | kresources/factory.h \ | 79 | kresources/factory.h \ |
77 | kresources/managerimpl.h \ | 80 | kresources/managerimpl.h \ |
78 | kresources/manager.h \ | 81 | kresources/manager.h \ |
79 | kresources/selectdialog.h \ | 82 | kresources/selectdialog.h \ |
80 | kresources/configpage.h \ | 83 | kresources/configpage.h \ |
81 | kresources/configwidget.h \ | 84 | kresources/configwidget.h \ |
82 | kresources/configdialog.h \ | 85 | kresources/configdialog.h \ |
83 | kresources/kcmkresources.h \ | 86 | kresources/kcmkresources.h \ |
84 | kdecore/kmdcodec.h \ | 87 | kdecore/kmdcodec.h \ |
85 | kdecore/kconfigbase.h \ | 88 | kdecore/kconfigbase.h \ |
86 | kdecore/klocale.h \ | 89 | kdecore/klocale.h \ |
87 | kdecore/kcatalogue.h \ | 90 | kdecore/kcatalogue.h \ |
88 | kdecore/ksharedptr.h \ | 91 | kdecore/ksharedptr.h \ |
89 | kdecore/kshell.h \ | 92 | kdecore/kshell.h \ |
90 | kdecore/kstandarddirs.h \ | 93 | kdecore/kstandarddirs.h \ |
91 | kdecore/kstringhandler.h \ | 94 | kdecore/kstringhandler.h \ |
92 | kdecore/kshortcut.h \ | 95 | kdecore/kshortcut.h \ |
93 | kutils/kcmultidialog.h \ | 96 | kutils/kcmultidialog.h \ |
94 | kdeui/kxmlguiclient.h \ | 97 | kdeui/kxmlguiclient.h \ |
95 | kdeui/kstdaction.h \ | 98 | kdeui/kstdaction.h \ |
96 | kdeui/kmainwindow.h \ | 99 | kdeui/kmainwindow.h \ |
97 | kdeui/ktoolbar.h \ | 100 | kdeui/ktoolbar.h \ |
98 | kdeui/ktoolbarbutton.h \ | 101 | kdeui/ktoolbarbutton.h \ |
99 | kdeui/ktoolbarhandler.h \ | 102 | kdeui/ktoolbarhandler.h \ |
100 | kdeui/kaction.h \ | 103 | kdeui/kaction.h \ |
101 | kdeui/kactionclasses.h \ | 104 | kdeui/kactionclasses.h \ |
102 | kdeui/kactioncollection.h \ | 105 | kdeui/kactioncollection.h \ |
103 | kdecore/kprefs.h \ | 106 | kdecore/kprefs.h \ |
104 | kdecore/klibloader.h \ | 107 | kdecore/klibloader.h \ |
105 | kidmanager.h | 108 | kidmanager.h |
106 | 109 | ||
107 | 110 | ||
108 | # kdecore/klibloader.h \ | 111 | # kdecore/klibloader.h \ |
@@ -126,49 +129,51 @@ KDGanttMinimizeSplitter.cpp \ | |||
126 | kglobal.cpp \ | 129 | kglobal.cpp \ |
127 | kglobalsettings.cpp \ | 130 | kglobalsettings.cpp \ |
128 | kiconloader.cpp \ | 131 | kiconloader.cpp \ |
129 | kmessagebox.cpp \ | 132 | kmessagebox.cpp \ |
130 | ktextedit.cpp \ | 133 | ktextedit.cpp \ |
131 | kprocess.cpp \ | 134 | kprocess.cpp \ |
132 | krun.cpp \ | 135 | krun.cpp \ |
133 | ksystemtray.cpp \ | 136 | ksystemtray.cpp \ |
134 | ktempfile.cpp \ | 137 | ktempfile.cpp \ |
135 | kurl.cpp \ | 138 | kurl.cpp \ |
136 | kdecore/kcatalogue.cpp \ | 139 | kdecore/kcatalogue.cpp \ |
137 | kdecore/klocale.cpp \ | 140 | kdecore/klocale.cpp \ |
138 | kdecore/kmdcodec.cpp \ | 141 | kdecore/kmdcodec.cpp \ |
139 | kdecore/kshell.cpp \ | 142 | kdecore/kshell.cpp \ |
140 | kdecore/kstandarddirs.cpp \ | 143 | kdecore/kstandarddirs.cpp \ |
141 | kdecore/kstringhandler.cpp \ | 144 | kdecore/kstringhandler.cpp \ |
142 | kdeui/kbuttonbox.cpp \ | 145 | kdeui/kbuttonbox.cpp \ |
143 | kdeui/kcmodule.cpp \ | 146 | kdeui/kcmodule.cpp \ |
144 | kdeui/kguiitem.cpp \ | 147 | kdeui/kguiitem.cpp \ |
145 | kdeui/kjanuswidget.cpp \ | 148 | kdeui/kjanuswidget.cpp \ |
146 | kdeui/klistbox.cpp \ | 149 | kdeui/klistbox.cpp \ |
147 | kdeui/klistview.cpp \ | 150 | kdeui/klistview.cpp \ |
148 | kdeui/knuminput.cpp \ | 151 | kdeui/knuminput.cpp \ |
149 | kdeui/knumvalidator.cpp \ | 152 | kdeui/knumvalidator.cpp \ |
150 | kdeui/kseparator.cpp \ | 153 | kdeui/kseparator.cpp \ |
151 | kdeui/ksqueezedtextlabel.cpp \ | 154 | kdeui/ksqueezedtextlabel.cpp \ |
152 | kio/kio/kdirwatch.cpp \ | 155 | kio/kio/kdirwatch.cpp \ |
153 | kio/kfile/kurlrequester.cpp \ | 156 | kio/kfile/kurlrequester.cpp \ |
154 | kresources/configpage.cpp \ | 157 | kresources/configpage.cpp \ |
155 | kresources/configdialog.cpp \ | 158 | kresources/configdialog.cpp \ |
156 | kresources/configwidget.cpp \ | 159 | kresources/configwidget.cpp \ |
157 | kresources/factory.cpp \ | 160 | kresources/factory.cpp \ |
158 | kresources/kcmkresources.cpp \ | 161 | kresources/kcmkresources.cpp \ |
159 | kresources/managerimpl.cpp \ | 162 | kresources/managerimpl.cpp \ |
160 | kresources/resource.cpp \ | 163 | kresources/resource.cpp \ |
161 | kresources/selectdialog.cpp \ | 164 | kresources/selectdialog.cpp \ |
162 | kutils/kcmultidialog.cpp \ | 165 | kutils/kcmultidialog.cpp \ |
163 | kdeui/kaction.cpp \ | 166 | kdeui/kaction.cpp \ |
164 | kdeui/kactionclasses.cpp \ | 167 | kdeui/kactionclasses.cpp \ |
165 | kdeui/kactioncollection.cpp \ | 168 | kdeui/kactioncollection.cpp \ |
166 | kdeui/kmainwindow.cpp \ | 169 | kdeui/kmainwindow.cpp \ |
167 | kdeui/ktoolbar.cpp \ | 170 | kdeui/ktoolbar.cpp \ |
168 | kdeui/ktoolbarbutton.cpp \ | 171 | kdeui/ktoolbarbutton.cpp \ |
169 | kdeui/ktoolbarhandler.cpp \ | 172 | kdeui/ktoolbarhandler.cpp \ |
170 | kdeui/kstdaction.cpp \ | 173 | kdeui/kstdaction.cpp \ |
171 | kdeui/kxmlguiclient.cpp \ | 174 | kdeui/kxmlguiclient.cpp \ |
172 | kdecore/kprefs.cpp \ | 175 | kdecore/kprefs.cpp \ |
173 | kdecore/klibloader.cpp \ | 176 | kdecore/klibloader.cpp \ |
174 | kidmanager.cpp | 177 | kidmanager.cpp \ |
178 | oprocctrl.cpp \ | ||
179 | oprocess.cpp | ||
diff --git a/microkde/oprocess.cpp b/microkde/oprocess.cpp index 95e3e4b..a935792 100644 --- a/microkde/oprocess.cpp +++ b/microkde/oprocess.cpp | |||
@@ -1,88 +1,89 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | Copyright (C) 2002-2004 Holger Freyther <zecke@handhelds.org> | 3 | Copyright (C) 2002-2004 Holger Freyther <zecke@handhelds.org> |
4 | and The Opie Team <opie-devel@handhelds.org> | 4 | and The Opie Team <opie-devel@handhelds.org> |
5 | =. Based on KProcess (C) 1997 Christian Czezatke (e9025461@student.tuwien.ac.at) | 5 | =. Based on KProcess (C) 1997 Christian Czezatke (e9025461@student.tuwien.ac.at) |
6 | .=l. | 6 | .=l. |
7 | .>+-= | 7 | .>+-= |
8 | _;:, .> :=|. This program is free software; you can | 8 | _;:, .> :=|. This program is free software; you can |
9 | .> <`_, > . <= redistribute it and/or modify it under | 9 | .> <`_, > . <= redistribute it and/or modify it under |
10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 10 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
11 | .="- .-=="i, .._ License as published by the Free Software | 11 | .="- .-=="i, .._ License as published by the Free Software |
12 | - . .-<_> .<> Foundation; either version 2 of the License, | 12 | - . .-<_> .<> Foundation; either version 2 of the License, |
13 | ._= =} : or (at your option) any later version. | 13 | ._= =} : or (at your option) any later version. |
14 | .%`+i> _;_. | 14 | .%`+i> _;_. |
15 | .i_,=:_. -<s. This program is distributed in the hope that | 15 | .i_,=:_. -<s. This program is distributed in the hope that |
16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; | 16 | + . -:. = it will be useful, but WITHOUT ANY WARRANTY; |
17 | : .. .:, . . . without even the implied warranty of | 17 | : .. .:, . . . without even the implied warranty of |
18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A | 18 | =_ + =;=|` MERCHANTABILITY or FITNESS FOR A |
19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU | 19 | _.=:. : :=>`: PARTICULAR PURPOSE. See the GNU |
20 | ..}^=.= = ; Library General Public License for more | 20 | ..}^=.= = ; Library General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = Library General Public License along with | 24 | -_. . . )=. = Library General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | */ | 29 | */ |
30 | 30 | ||
31 | #include "oprocctrl.h" | 31 | #include "oprocctrl.h" |
32 | 32 | ||
33 | /* OPIE */ | 33 | /* OPIE */ |
34 | #include <oprocess.h> | 34 | #include <oprocess.h> |
35 | 35 | ||
36 | /* QT */ | 36 | /* QT */ |
37 | 37 | ||
38 | #include <qapplication.h> | 38 | #include <qapplication.h> |
39 | #include <qdir.h> | 39 | #include <qdir.h> |
40 | #include <qmap.h> | 40 | #include <qmap.h> |
41 | #include <qregexp.h> | ||
41 | #include <qsocketnotifier.h> | 42 | #include <qsocketnotifier.h> |
42 | #include <qtextstream.h> | 43 | #include <qtextstream.h> |
43 | 44 | ||
44 | /* STD */ | 45 | /* STD */ |
45 | #include <errno.h> | 46 | #include <errno.h> |
46 | #include <fcntl.h> | 47 | #include <fcntl.h> |
47 | #include <pwd.h> | 48 | #include <pwd.h> |
48 | #include <stdlib.h> | 49 | #include <stdlib.h> |
49 | #include <signal.h> | 50 | #include <signal.h> |
50 | #include <stdio.h> | 51 | #include <stdio.h> |
51 | #include <string.h> | 52 | #include <string.h> |
52 | #include <sys/time.h> | 53 | #include <sys/time.h> |
53 | #include <sys/types.h> | 54 | #include <sys/types.h> |
54 | #include <sys/stat.h> | 55 | #include <sys/stat.h> |
55 | #include <sys/socket.h> | 56 | #include <sys/socket.h> |
56 | #include <unistd.h> | 57 | #include <unistd.h> |
57 | #ifdef HAVE_SYS_SELECT_H | 58 | #ifdef HAVE_SYS_SELECT_H |
58 | #include <sys/select.h> | 59 | #include <sys/select.h> |
59 | #endif | 60 | #endif |
60 | #ifdef HAVE_INITGROUPS | 61 | #ifdef HAVE_INITGROUPS |
61 | #include <grp.h> | 62 | #include <grp.h> |
62 | #endif | 63 | #endif |
63 | 64 | ||
64 | using namespace Opie::Core::Internal; | 65 | using namespace Opie::Core::Internal; |
65 | 66 | ||
66 | namespace Opie { | 67 | namespace Opie { |
67 | namespace Core { | 68 | namespace Core { |
68 | namespace Internal { | 69 | namespace Internal { |
69 | class OProcessPrivate | 70 | class OProcessPrivate |
70 | { | 71 | { |
71 | public: | 72 | public: |
72 | OProcessPrivate() : useShell( false ) | 73 | OProcessPrivate() : useShell( false ) |
73 | { } | 74 | { } |
74 | 75 | ||
75 | bool useShell; | 76 | bool useShell; |
76 | QMap<QString, QString> env; | 77 | QMap<QString, QString> env; |
77 | QString wd; | 78 | QString wd; |
78 | QCString shell; | 79 | QCString shell; |
79 | }; | 80 | }; |
80 | } | 81 | } |
81 | 82 | ||
82 | OProcess::OProcess( QObject *parent, const char *name ) | 83 | OProcess::OProcess( QObject *parent, const char *name ) |
83 | : QObject( parent, name ) | 84 | : QObject( parent, name ) |
84 | { | 85 | { |
85 | init ( ); | 86 | init ( ); |
86 | } | 87 | } |
87 | 88 | ||
88 | OProcess::OProcess( const QString &arg0, QObject *parent, const char *name ) | 89 | OProcess::OProcess( const QString &arg0, QObject *parent, const char *name ) |