Opie2 and ODP changes

Also try to make signals/slots syntax obey the namespaces

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
@@ -13,12 +13,14 @@ Public License for more details.
 You should have received a copy of the GNU General Public License along with this program; if not, write to the Free
 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)
 {
         QVBoxLayout *layout = new QVBoxLayout(this);
         QHBoxLayout *hlayout = new QHBoxLayout(this);
 
@@ -46,15 +48,15 @@ RecordDialog::RecordDialog(QWidget *parent, const char *name)
 void RecordDialog::retPressed()
 {
         printf("RecordDialog::retPressed: ret pressed\n");
 
         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();
                 if(!record->start(OProcess::NotifyOnExit, OProcess::AllOutput))
                 {
                         QMessageBox *mb = new QMessageBox("Error!",
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
@@ -24,26 +24,26 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qwidget.h>
 #include <qlayout.h>
 #include <qmessagebox.h>
 
 #include <stdio.h>
 
-#include <opie/oprocess.h>
+#include <opie2/oprocess.h>
 
 class RecordDialog : public QDialog
 {
         Q_OBJECT
 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;
 };
 
 #endif
 
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
@@ -2,10 +2,10 @@ TEMPLATE	=app
         CONFIG  +=qt warn_on release
         DESTDIR         =$(OPIEDIR)/bin
         HEADERS         = remotetab.h learntab.h configtab.h topgroup.h dvdgroup.h channelgroup.h vcrgroup.h buttondialog.h topgroupconf.h dvdgroupconf.h channelgroupconf.h vcrgroupconf.h mainview.h recorddialog.h helptab.h
         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 )