Opie2 and ODP changes

Also try to make signals/slots syntax obey the namespaces

11 files changed, 24 insertions, 14 deletions

diff --git a/noncore/tools/clock/clock.cpp b/noncore/tools/clock/clock.cpp
index b780675..485354b 100644
--- a/noncore/tools/clock/clock.cpp
+++ b/noncore/tools/clock/clock.cpp
@@ -51,16 +51,17 @@
 #include <sys/types.h>
 
 #include <pthread.h>
 
 
 const double deg2rad = 0.017453292519943295769; // pi/180
 const int sw_prec = 2;
 
+using namespace Opie::Ui;
 void startPlayer()
 {
   Config config( "qpe" );
   config.setGroup( "Time" );
   sleep(15);
   QCopEnvelope e( "QPE/Application/opieplayer", "setDocument(QString)" );
   e << config.readEntry( "mp3File", "" );
 }
@@ -140,17 +141,17 @@ Clock::Clock( QWidget * parent, const char * name, WFlags f )
   alarmOffBtn = new QPushButton ( controls );
   gl->addWidget( alarmOffBtn, 0, 2 );
 
   alarmBtn = new QPushButton ( controls );
   gl->addWidget( alarmBtn, 1, 2 );
 
   alarmBtn->setText( tr( "Set Alarm" ) );
 
-  Opie::OClickableLabel *click = new Opie::OClickableLabel( controls, "label" );
+  OClickableLabel *click = new Opie::Ui::OClickableLabel( controls, "label" );
   click->setText( tr( "Set date and time." ) );
   gl->addMultiCellWidget( click, 3, 3, 0, 2, AlignHCenter );
   connect( click, SIGNAL( clicked() ), this, SLOT( slotAdjustTime() ) );
 
   connect( set , SIGNAL( pressed() ), SLOT( slotSet() ) );
   connect( reset, SIGNAL( clicked() ), SLOT( slotReset() ) );
 
   connect( alarmBtn, SIGNAL( clicked() ), SLOT( slotSetAlarm() ) );
diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp
index 89dd1bd..237d9f0 100644
--- a/noncore/tools/clock/main.cpp
+++ b/noncore/tools/clock/main.cpp
@@ -18,9 +18,11 @@
 **
 **********************************************************************/
 
 #include "clock.h"
 
 #include <opie2/oapplicationfactory.h>
 
 
+using namespace Opie::Core;
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<Clock> )
diff --git a/noncore/tools/clock/setAlarm.cpp b/noncore/tools/clock/setAlarm.cpp
index 6fec5a0..9d5fc49 100644
--- a/noncore/tools/clock/setAlarm.cpp
+++ b/noncore/tools/clock/setAlarm.cpp
@@ -27,16 +27,17 @@
 #include <qslider.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qtooltip.h>
 #include <qwhatsthis.h>
 #include <qbuttongroup.h>
 #include <qcheckbox.h>
 
+using namespace Opie::Ui;
 Set_Alarm::Set_Alarm( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl )
 {
     if ( !name )
   setName( "Set_Alarm" );
     resize( 240, 101 );
     setMaximumSize( QSize( 240, 320 ) );
     move(0,45);
@@ -204,17 +205,17 @@ void Set_Alarm::slotChangemp3CkeckBox(bool b) {
     Config config( "qpe" );
     config.setGroup("Time");
     if(b) {
         QMap<QString, QStringList> map;
         map.insert(tr("All"), QStringList() );
         QStringList text;
         text << "audio/*";
         map.insert(tr("Audio"), text );
-        QString str = Opie::OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
+        QString str = OFileDialog::getOpenFileName( 2,"/", QString::null, map);//,"", "*", this );
 //        QString str = Opie::OFileDialog::getOpenFileName( 2,"/");//,"", "*", this );
         if(!str.isEmpty() ) {
             qDebug(str);
             config.writeEntry("mp3Alarm",1);
             config.writeEntry("mp3File",str);
         }
     } else {
         config.writeEntry("mp3Alarm",0);
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp
index b765a5e..d5f6c7f 100644
--- a/noncore/tools/euroconv/main.cpp
+++ b/noncore/tools/euroconv/main.cpp
@@ -1,10 +1,12 @@
 /****************************************************************************
  *
+using namespace Opie::Core;
+using namespace Opie::Core;
  * File:        main.cpp
  *
  * Description: main file for OPIE Euroconv aapp
  *              
  *               
  * Authors:     Eric Santonacci <Eric.Santonacci@talc.fr>
  *
  * Requirements:    Qt
@@ -13,17 +15,17 @@
  ***************************************************************************/
 
 #include <qpe/qpeapplication.h>
 #include <qvbox.h>
 
 #include "calcdisplay.h"
 #include "calckeypad.h"
 
-#include <opie/oapplicationfactory.h>
+#include <opie2/oapplicationfactory.h>
 
 struct Layout : QVBox{
     static QString appName() { return QString::fromLatin1("euroconv"); }
     Layout(QWidget *p, const char* n, WFlags) 
         :QVBox(0,"fond" )
     {
         LCDDisplay *lcd = new LCDDisplay(this, "lcd");
         KeyPad *num = new KeyPad(lcd, this, "keypad");
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp
index 77e1790..4204d73 100644
--- a/noncore/tools/formatter/formatter.cpp
+++ b/noncore/tools/formatter/formatter.cpp
@@ -6,17 +6,17 @@
  **
  ****************************************************************************/
 
 #include "formatter.h"
 #include "inputDialog.h"
 #include "output.h"
 
 /* OPIE */
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 #include <qpe/mimetype.h>
 #include <qpe/qcopenvelope_qws.h>
 #include <qpe/storage.h>
 
 /* QT */
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp
index bdd4a2c..d47479e 100644
--- a/noncore/tools/formatter/main.cpp
+++ b/noncore/tools/formatter/main.cpp
@@ -1,18 +1,20 @@
 
 /***************************************************************************
+
                           main.cpp  -  description
                              -------------------
     begin                : March 10, 2002
     copyright            : (C) 2002 by llornkcor
     email                : ljp@llornkcor.com
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  ***************************************************************************/
 
 #include "formatter.h"
 
 #include <opie2/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> )
diff --git a/noncore/tools/opie-sh/config.in b/noncore/tools/opie-sh/config.in
index 614ac8b..b3ca373 100644
--- a/noncore/tools/opie-sh/config.in
+++ b/noncore/tools/opie-sh/config.in
@@ -1,4 +1,4 @@
   config OPIE-SH
     boolean "opie-sh (qdialog frontend allows you to write dialogs from shell scripts)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
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
@@ -11,16 +11,18 @@ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 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);
 
         layout->insertSpacing(0,5);
         output = new QTextView("Please enter the name of the new remote, and press Return\n", 0, this, "output");
@@ -44,19 +46,19 @@ 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!",
                                                                                         "Could not start irrecord.  You must<br>use an lirc ipkg that includes<br>irrecord",
                                                                                         QMessageBox::NoIcon,
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
@@ -22,28 +22,28 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #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
@@ -1,11 +1,11 @@
         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 )