author | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
commit | 8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (patch) (side-by-side diff) | |
tree | 8f240482113d5588c4fb73769a2ced2ccdb87fb9 /noncore/tools/remote | |
parent | 346288b5a95b72a84fabe9acb2e32aa8a8388c8c (diff) | |
download | opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.zip opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.gz opie-8a243adc61fc9c8a48fa9061f0eba12c7b345d70.tar.bz2 |
Opie2 and ODP changes
Also try to make signals/slots syntax obey the namespaces
-rw-r--r-- | noncore/tools/remote/config.in | 2 | ||||
-rw-r--r-- | noncore/tools/remote/recorddialog.cpp | 8 | ||||
-rw-r--r-- | noncore/tools/remote/recorddialog.h | 8 | ||||
-rw-r--r-- | noncore/tools/remote/remote.pro | 2 |
4 files changed, 11 insertions, 9 deletions
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in index 3b70590..2a42c58 100644 --- a/noncore/tools/remote/config.in +++ b/noncore/tools/remote/config.in @@ -1,4 +1,4 @@ config REMOTE boolean "opie-remote (remote control using irda, frontent to lirc)" default "y" - depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE + depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 diff --git a/noncore/tools/remote/recorddialog.cpp b/noncore/tools/remote/recorddialog.cpp index 1ce5472..a9c4c61 100644 --- a/noncore/tools/remote/recorddialog.cpp +++ b/noncore/tools/remote/recorddialog.cpp @@ -16,6 +16,8 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include "recorddialog.h" +using namespace Opie::Core; +using namespace Opie::Core; RecordDialog::RecordDialog(QWidget *parent, const char *name) :QDialog(parent, name) { @@ -49,9 +51,9 @@ void RecordDialog::retPressed() if(where == 0) { - connect(record, SIGNAL(receivedStdout(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); - connect(record, SIGNAL(receivedStderr(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); - connect(record, SIGNAL(processExited(OProcess*)), this, SLOT(done(OProcess*)) ); + connect(record, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) ); + connect(record, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) ); + connect(record, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(done(Opie::Core::OProcess*)) ); printf("RecordDialog::retPressed: starting irrecord\n"); QString file = "/tmp/" + input->text(); *record<<"irrecord"<<file.latin1(); diff --git a/noncore/tools/remote/recorddialog.h b/noncore/tools/remote/recorddialog.h index e4dcae6..46a82ce 100644 --- a/noncore/tools/remote/recorddialog.h +++ b/noncore/tools/remote/recorddialog.h @@ -27,7 +27,7 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #include <stdio.h> -#include <opie/oprocess.h> +#include <opie2/oprocess.h> class RecordDialog : public QDialog { @@ -36,12 +36,12 @@ public: RecordDialog(QWidget *parent=0, const char *name=0); public slots: void retPressed(); - void incoming(OProcess *proc, char *buffer, int len); - void done(OProcess *proc); + void incoming(Opie::Core::OProcess *proc, char *buffer, int len); + void done(Opie::Core::OProcess *proc); private: QTextView *output; QLineEdit *input; - OProcess *record; + Opie::Core::OProcess *record; int where; }; diff --git a/noncore/tools/remote/remote.pro b/noncore/tools/remote/remote.pro index 660c7f7..8b3e4be 100644 --- a/noncore/tools/remote/remote.pro +++ b/noncore/tools/remote/remote.pro @@ -5,7 +5,7 @@ HEADERS = remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup SOURCES =remote.cpp remotetab.cpp learntab.cpp configtab.cpp topgroup.cpp dvdgroup.cpp channelgroup.cpp vcrgroup.cpp buttondialog.cpp topgroupconf.cpp dvdgroupconf.cpp channelgroupconf.cpp vcrgroupconf.cpp mainview.cpp recorddialog.cpp helptab.cpp INCLUDEPATH +=$(OPIEDIR)/include DEPENDPATH +=$(OPIEDIR)/include -LIBS +=-lqpe -lopie +LIBS +=-lqpe -lopiecore2 TARGET = remote include ( $(OPIEDIR)/include.pro ) |