summaryrefslogtreecommitdiff
authorsandman <sandman>2002-12-17 19:12:05 (UTC)
committer sandman <sandman>2002-12-17 19:12:05 (UTC)
commitb6a03145553d7f536b04fc3355718cfdd72c590d (patch) (side-by-side diff)
treecfadab49e69801a2000001f80d57ec081b2c5ea4
parent6bbe59222c6b439f2016d0a36a111f17d338d120 (diff)
downloadopie-b6a03145553d7f536b04fc3355718cfdd72c590d.zip
opie-b6a03145553d7f536b04fc3355718cfdd72c590d.tar.gz
opie-b6a03145553d7f536b04fc3355718cfdd72c590d.tar.bz2
- removed a the obsolete KShellProcess class
- added a few methods to OProcess to make it easier to port programs using QProcess
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--libopie/oprocess.cpp94
-rw-r--r--libopie/oprocess.h72
2 files changed, 56 insertions, 110 deletions
diff --git a/libopie/oprocess.cpp b/libopie/oprocess.cpp
index f3e52bd..5db2b6c 100644
--- a/libopie/oprocess.cpp
+++ b/libopie/oprocess.cpp
@@ -94,22 +94,42 @@ public:
};
-OProcess::OProcess()
- : QObject(),
- run_mode(NotifyOnExit),
- runs(false),
- pid_(0),
- status(0),
- keepPrivs(false),
- innot(0),
- outnot(0),
- errnot(0),
- communication(NoCommunication),
- input_data(0),
- input_sent(0),
- input_total(0),
- d(0)
+OProcess::OProcess(QObject *parent, const char *name)
+ : QObject(parent, name)
{
+ init ( );
+}
+
+OProcess::OProcess(const QString &arg0, QObject *parent, const char *name)
+ : QObject(parent, name)
+{
+ init ( );
+ *this << arg0;
+}
+
+OProcess::OProcess(const QStringList &args, QObject *parent, const char *name)
+ : QObject(parent, name)
+{
+ init ( );
+ *this << args;
+}
+
+void OProcess::init ( )
+{
+ run_mode = NotifyOnExit;
+ runs = false;
+ pid_ = 0;
+ status = 0;
+ keepPrivs = false;
+ innot = 0;
+ outnot = 0;
+ errnot = 0;
+ communication = NoCommunication;
+ input_data = 0;
+ input_sent = 0;
+ input_total = 0;
+ d = 0;
+
if (0 == OProcessController::theOProcessController) {
(void) new OProcessController();
CHECK_PTR(OProcessController::theOProcessController);
@@ -472,6 +492,20 @@ bool OProcess::writeStdin(const char *buffer, int buflen)
return rv;
}
+void OProcess::flushStdin ( )
+{
+ if ( !input_data || ( input_sent == input_total ))
+ return;
+
+ int d1, d2;
+
+ do {
+ d1 = input_total - input_sent;
+ slotSendData ( 0 );
+ d2 = input_total - input_sent;
+ } while ( d2 <= d1 );
+}
+
void OProcess::suspend()
{
if ((communication & Stdout) && outnot)
@@ -888,35 +922,5 @@ bool OProcess::isExecutable(const QCString &filename)
return true;
}
-void OProcess::virtual_hook( int, void* )
-{ /*BASE::virtual_hook( id, data );*/ }
-
-
-///////////////////////////
-// CC: Class KShellProcess
-///////////////////////////
-
-KShellProcess::KShellProcess(const char *shellname):
- OProcess()
-{
- setUseShell(true, shellname);
-}
-
-
-KShellProcess::~KShellProcess() {
-}
-
-QString KShellProcess::quote(const QString &arg)
-{
- return OProcess::quote(arg);
-}
-
-bool KShellProcess::start(RunMode runmode, Communication comm)
-{
- return OProcess::start(runmode, comm);
-}
-void KShellProcess::virtual_hook( int id, void* data )
-{ OProcess::virtual_hook( id, data ); }
-//#include "kprocess.moc"
diff --git a/libopie/oprocess.h b/libopie/oprocess.h
index fd726b4..bf5fe0e 100644
--- a/libopie/oprocess.h
+++ b/libopie/oprocess.h
@@ -187,7 +187,9 @@ public:
/**
* Constructor
*/
- OProcess();
+ OProcess(QObject *parent = 0, const char *name = 0);
+ OProcess(const QString &arg0, QObject *parent = 0, const char *name = 0);
+ OProcess(const QStringList &args, QObject *parent = 0, const char *name = 0);
/**
*Destructor:
@@ -360,6 +362,8 @@ public:
**/
bool writeStdin(const char *buffer, int buflen);
+ void flushStdin();
+
/**
* This causes the stdin file descriptor of the child process to be
* closed indicating an "EOF" to the child.
@@ -731,72 +735,10 @@ private:
OProcess( const OProcess& );
OProcess& operator= ( const OProcess& );
-protected:
- virtual void virtual_hook( int id, void* data );
private:
- OProcessPrivate *d;
-};
-
-class KShellProcessPrivate;
-
-/**
-* @obsolete
-*
-* This class is obsolete. Use OProcess and OProcess::setUseShell(true)
-* instead.
-*
-* @short A class derived from @ref OProcess to start child
-* processes through a shell.
-* @author Christian Czezakte <e9025461@student.tuwien.ac.at>
-* @version $Id$
-*/
-class KShellProcess: public OProcess
-{
- Q_OBJECT
-
-public:
-
- /**
- * Constructor
- *
- * By specifying the name of a shell (like "/bin/bash") you can override
- * the mechanism for finding a valid shell as described in OProcess::searchShell()
- */
- KShellProcess(const char *shellname=0);
-
- /**
- * Destructor.
- */
- ~KShellProcess();
+ void init ( );
- /**
- * Starts up the process. -- For a detailed description
- * have a look at the "start" member function and the detailed
- * description of @ref OProcess .
- */
- virtual bool start(RunMode runmode = NotifyOnExit,
- Communication comm = NoCommunication);
-
- /**
- * This function can be used to quote an argument string such that
- * the shell processes it properly. This is e. g. necessary for
- * user-provided file names which may contain spaces or quotes.
- * It also prevents expansion of wild cards and environment variables.
- */
- static QString quote(const QString &arg);
-
-private:
-
- QCString shell;
-
- // Disallow assignment and copy-construction
- KShellProcess( const KShellProcess& );
- KShellProcess& operator= ( const KShellProcess& );
-
-protected:
- virtual void virtual_hook( int id, void* data );
-private:
- KShellProcessPrivate *d;
+ OProcessPrivate *d;
};