author | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 15:07:48 (UTC) |
commit | 8a243adc61fc9c8a48fa9061f0eba12c7b345d70 (patch) (unidiff) | |
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 | |||
@@ -3,2 +3,2 @@ | |||
3 | default "y" | 3 | default "y" |
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE | 4 | 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 | |||
@@ -18,2 +18,4 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
18 | 18 | ||
19 | using namespace Opie::Core; | ||
20 | using namespace Opie::Core; | ||
19 | RecordDialog::RecordDialog(QWidget *parent, const char *name) | 21 | RecordDialog::RecordDialog(QWidget *parent, const char *name) |
@@ -51,5 +53,5 @@ void RecordDialog::retPressed() | |||
51 | { | 53 | { |
52 | connect(record, SIGNAL(receivedStdout(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); | 54 | connect(record, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) ); |
53 | connect(record, SIGNAL(receivedStderr(OProcess*,char*,int)), this, SLOT(incoming(OProcess*,char*,int)) ); | 55 | connect(record, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)), this, SLOT(incoming(Opie::Core::OProcess*,char*,int)) ); |
54 | connect(record, SIGNAL(processExited(OProcess*)), this, SLOT(done(OProcess*)) ); | 56 | connect(record, SIGNAL(processExited(Opie::Core::OProcess*)), this, SLOT(done(Opie::Core::OProcess*)) ); |
55 | printf("RecordDialog::retPressed: starting irrecord\n"); | 57 | printf("RecordDialog::retPressed: starting irrecord\n"); |
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 | |||
@@ -29,3 +29,3 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | |||
29 | 29 | ||
30 | #include <opie/oprocess.h> | 30 | #include <opie2/oprocess.h> |
31 | 31 | ||
@@ -38,4 +38,4 @@ public slots: | |||
38 | void retPressed(); | 38 | void retPressed(); |
39 | void incoming(OProcess *proc, char *buffer, int len); | 39 | void incoming(Opie::Core::OProcess *proc, char *buffer, int len); |
40 | void done(OProcess *proc); | 40 | void done(Opie::Core::OProcess *proc); |
41 | private: | 41 | private: |
@@ -43,3 +43,3 @@ private: | |||
43 | QLineEdit *input; | 43 | QLineEdit *input; |
44 | OProcess *record; | 44 | Opie::Core::OProcess *record; |
45 | int where; | 45 | 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 | |||
@@ -7,3 +7,3 @@ INCLUDEPATH +=$(OPIEDIR)/include | |||
7 | DEPENDPATH+=$(OPIEDIR)/include | 7 | DEPENDPATH+=$(OPIEDIR)/include |
8 | LIBS +=-lqpe -lopie | 8 | LIBS +=-lqpe -lopiecore2 |
9 | TARGET = remote | 9 | TARGET = remote |