-rw-r--r-- | noncore/apps/opie-console/filetransfer.h | 7 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.cpp | 1 | ||||
-rw-r--r-- | noncore/apps/opie-console/procctl.h | 3 |
3 files changed, 7 insertions, 4 deletions
diff --git a/noncore/apps/opie-console/filetransfer.h b/noncore/apps/opie-console/filetransfer.h index 0829f16..9cc1e8d 100644 --- a/noncore/apps/opie-console/filetransfer.h +++ b/noncore/apps/opie-console/filetransfer.h @@ -32,4 +32,5 @@ private slots: void slotRead(); void slotProgress( const QStringList& ); + void slotExec(); private: /* @@ -39,14 +40,14 @@ private: * for termination and then send a signal */ - static pid_t m_pid; + pid_t m_pid; int m_fd; int m_prog; int m_info[2]; int m_comm[2]; + int m_term[2]; QString m_file; Type m_type; QSocketNotifier *m_not; - static void signal_handler(int); - static bool terminate; + QSocketNotifier* m_proc; }; diff --git a/noncore/apps/opie-console/procctl.cpp b/noncore/apps/opie-console/procctl.cpp index ff6bea8..b0b6846 100644 --- a/noncore/apps/opie-console/procctl.cpp +++ b/noncore/apps/opie-console/procctl.cpp @@ -72,4 +72,5 @@ int ProcCtl::status(pid_t pid )const{ } void ProcCtl::signal_handler(int) { + qWarning("signal handler"); int status; signal( SIGCHLD, signal_handler ); diff --git a/noncore/apps/opie-console/procctl.h b/noncore/apps/opie-console/procctl.h index 5e96423..1da7c6d 100644 --- a/noncore/apps/opie-console/procctl.h +++ b/noncore/apps/opie-console/procctl.h @@ -23,5 +23,5 @@ public: ~ProcCtl(); - ProcCtl* self(); + static ProcCtl* self(); int status(pid_t)const; void add( pid_t, int fd ); @@ -32,4 +32,5 @@ private: static ProcContainer* m_last; static ProcCtl* m_self; + }; |