Fix up depends on LIBOPIE1

Proper signature for signal and slots and namespaces

22 files changed, 43 insertions, 48 deletions

diff --git a/noncore/applets/notesapplet/config.in b/noncore/applets/notesapplet/config.in
index 866adfb..27a8187 100644
--- a/noncore/applets/notesapplet/config.in
+++ b/noncore/applets/notesapplet/config.in
@@ -2,3 +2,3 @@
     boolean "opie-notesapplet (quick note taking applet)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
+    depends ( LIBQPE || LIBQPE-X11 ) 
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp
index a694b70..6d41ac3 100644
--- a/noncore/apps/advancedfm/advancedfmMenu.cpp
+++ b/noncore/apps/advancedfm/advancedfmMenu.cpp
@@ -33,6 +33,6 @@
 

 

-using namespace Opie::Core;
-using namespace Opie::Core;
+using namespace Opie::Core;

+using namespace Opie::Core;

 void AdvancedFm::doDirChange() {

    QString pathItem = CurrentView()->currentItem()->text(0);

@@ -706,8 +706,8 @@ void AdvancedFm::startProcess(const QString & cmd) {
   process = new OProcess();

   connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),

-          this, SLOT( processEnded(OProcess*)));

+          this, SLOT( processEnded(Opie::Core::OProcess*)));

 

   connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),

-            this, SLOT( oprocessStderr(OProcess*,char*,int)));

+          this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));

 

   command << "/bin/sh";

diff --git a/noncore/apps/advancedfm/output.cpp b/noncore/apps/advancedfm/output.cpp
index 16a0992..6906298 100644
--- a/noncore/apps/advancedfm/output.cpp
+++ b/noncore/apps/advancedfm/output.cpp
@@ -148,8 +148,8 @@ Output::Output( const QStringList commands, QWidget* parent,  const char* name,
 
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStdout(OProcess*,char*,int)));
+            this, SLOT(commandStdout(Opie::Core::OProcess*,char*,int)));
 
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(commandStderr(OProcess*,char*,int)));
+            this, SLOT(commandStderr(Opie::Core::OProcess*,char*,int)));
 
 //     connect( , SIGNAL(received(const QByteArray&)),
diff --git a/noncore/apps/opie-console/io_bt.cpp b/noncore/apps/opie-console/io_bt.cpp
index 35a328f..a29fa8e 100644
--- a/noncore/apps/opie-console/io_bt.cpp
+++ b/noncore/apps/opie-console/io_bt.cpp
@@ -3,5 +3,4 @@
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
@@ -40,5 +39,5 @@ bool IOBt::open() {
 
         connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-                 this, SLOT( slotExited(OProcess*) ) );
+                 this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
         if ( m_attach->start() ) {
diff --git a/noncore/apps/opie-console/io_irda.cpp b/noncore/apps/opie-console/io_irda.cpp
index ba0b0e5..07c2b62 100644
--- a/noncore/apps/opie-console/io_irda.cpp
+++ b/noncore/apps/opie-console/io_irda.cpp
@@ -3,5 +3,4 @@
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
     m_attach = 0;
@@ -31,5 +30,5 @@ bool IOIrda::open() {
 
     connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
-            this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
 
     if ( m_attach->start() ) {
diff --git a/noncore/apps/opie-console/sz_transfer.cpp b/noncore/apps/opie-console/sz_transfer.cpp
index 5958e93..fbc5306 100644
--- a/noncore/apps/opie-console/sz_transfer.cpp
+++ b/noncore/apps/opie-console/sz_transfer.cpp
@@ -31,7 +31,7 @@ void SzTransfer::sendFile(const QString& file) {
             this, SLOT(sent()));
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStdout(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStdout(Opie::Core::OProcess*,char*,int)));
     connect(proc, SIGNAL(receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT(SzReceivedStderr(OProcess*,char*,int)));
+            this, SLOT(SzReceivedStderr(Opie::Core::OProcess*,char*,int)));
     connect(layer(), SIGNAL(received(const QByteArray&)),
             this, SLOT(receivedStdin(const QByteArray&)));
diff --git a/noncore/net/mail/libmailwrapper/mhwrapper.cpp b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
index 21e24a0..5eae31f 100644
--- a/noncore/net/mail/libmailwrapper/mhwrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/mhwrapper.cpp
@@ -10,6 +10,4 @@
 
 using namespace Opie::Core;
-using namespace Opie::Core;
-using namespace Opie::Core;
 MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
     : Genericwrapper(),MHPath(mbox_dir),MHName(mbox_name)
@@ -322,7 +320,7 @@ int MHwrapper::deleteMbox(const FolderP&tfolder)
 
     connect(process, SIGNAL(processExited(Opie::Core::OProcess*)),
-            this, SLOT( processEnded(OProcess*)));
+            this, SLOT( processEnded(Opie::Core::OProcess*)));
     connect(process, SIGNAL( receivedStderr(Opie::Core::OProcess*,char*,int)),
-            this, SLOT( oprocessStderr(OProcess*,char*,int)));
+            this, SLOT( oprocessStderr(Opie::Core::OProcess*,char*,int)));
 
     *process << command;
diff --git a/noncore/net/opietooth/lib/device.cc b/noncore/net/opietooth/lib/device.cc
index d913853..18d26e4 100644
--- a/noncore/net/opietooth/lib/device.cc
+++ b/noncore/net/opietooth/lib/device.cc
@@ -9,5 +9,4 @@ using namespace OpieTooth;
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 namespace {
   int parsePid( const QCString& par ){
@@ -51,9 +50,9 @@ void Device::attach(){
     *m_process << m_device << m_mode << m_speed;
     connect(m_process, SIGNAL( processExited(Opie::Core::OProcess*) ),
-	    this, SLOT( slotExited(OProcess* ) ) );
+            this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
     connect(m_process, SIGNAL( receivedStdout(Opie::Core::OProcess*, char*, int) ),
-	    this, SLOT(slotStdOut(OProcess*,char*,int ) ) );
+            this, SLOT(slotStdOut(Opie::Core::OProcess*,char*,int ) ) );
     connect(m_process, SIGNAL(receivedStderr(Opie::Core::OProcess*, char*, int ) ),
-	    this, SLOT(slotStdErr(OProcess*,char*,int) ) );
+            this, SLOT(slotStdErr(Opie::Core::OProcess*,char*,int) ) );
     if(!m_process->start(OProcess::NotifyOnExit, OProcess::AllOutput ) ){
       qWarning("Could not start" );
@@ -100,5 +99,5 @@ void Device::slotExited( OProcess* proc)
 	*m_hci << "hci0 up";
 	connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
-		this, SLOT( slotExited(OProcess* ) ) );
+                this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
 	if(!m_hci->start() ){
 	  qWarning("could not start" );
diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 56156a8..7c9ea5b 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -46,5 +46,5 @@ void Manager::isAvailable( const QString& device ){
     *l2ping << "l2ping" << "-c1" << device;
     connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ),
-            this, SLOT(slotProcessExited(OProcess*) ) );
+            this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) );
     if (!l2ping->start() ) {
         emit available( device,  false );
@@ -64,7 +64,7 @@ void Manager::searchDevices( const QString& device ){
     *hcitool << "hcitool" << "scan";
     connect( hcitool, SIGNAL(processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT(slotHCIExited(OProcess* ) ) );
+             this, SLOT(slotHCIExited(Opie::Core::OProcess* ) ) );
     connect( hcitool, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int ) ),
-             this, SLOT(slotHCIOut(OProcess*, char*, int ) ) );
+             this, SLOT(slotHCIOut(Opie::Core::OProcess*, char*, int ) ) );
     if (!hcitool->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning("could not start");
@@ -111,7 +111,7 @@ void Manager::searchServices( const QString& remDevice ){
     qWarning("search Services for %s", remDevice.latin1() );
     connect(m_sdp, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotSDPExited(OProcess* ) ) );
+            this, SLOT(slotSDPExited(Opie::Core::OProcess* ) ) );
     connect(m_sdp, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*,  int ) ),
-            this, SLOT(slotSDPOut(OProcess*, char*, int) ) );
+            this, SLOT(slotSDPOut(Opie::Core::OProcess*, char*, int) ) );
     if (!m_sdp->start(OProcess::NotifyOnExit,  OProcess::AllOutput) ) {
         qWarning("could not start sdptool" );
@@ -250,7 +250,7 @@ void Manager::searchConnections() {
 
     connect(proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotConnectionExited( OProcess*) ) );
+            this, SLOT(slotConnectionExited( Opie::Core::OProcess*) ) );
     connect(proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
-            this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) );
+            this, SLOT(slotConnectionOutput(Opie::Core::OProcess*, char*, int) ) );
     *proc << "hcitool";
     *proc << "con";
@@ -309,7 +309,7 @@ void Manager::signalStrength( const QString &mac ) {
 
     connect(sig_proc, SIGNAL(processExited(Opie::Core::OProcess*) ),
-            this, SLOT(slotSignalStrengthExited( OProcess*) ) );
+            this, SLOT(slotSignalStrengthExited( Opie::Core::OProcess*) ) );
     connect(sig_proc, SIGNAL(receivedStdout(Opie::Core::OProcess*, char*, int) ),
-            this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) );
+            this, SLOT(slotSignalStrengthOutput(Opie::Core::OProcess*, char*, int) ) );
     *sig_proc << "hcitool";
     *sig_proc << "lq";
diff --git a/noncore/net/opietooth/lib/startdunconnection.cpp b/noncore/net/opietooth/lib/startdunconnection.cpp
index 90ef04a..09b19d2 100644
--- a/noncore/net/opietooth/lib/startdunconnection.cpp
+++ b/noncore/net/opietooth/lib/startdunconnection.cpp
@@ -6,5 +6,4 @@ using namespace OpieTooth;
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 StartDunConnection::StartDunConnection() {
     m_dunConnect = 0l;
@@ -43,7 +42,7 @@ void StartDunConnection::start()  {
 
     connect( m_dunConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_dunConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_dunConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not start" );
diff --git a/noncore/net/opietooth/lib/startpanconnection.cpp b/noncore/net/opietooth/lib/startpanconnection.cpp
index fef35d9..24ac530 100644
--- a/noncore/net/opietooth/lib/startpanconnection.cpp
+++ b/noncore/net/opietooth/lib/startpanconnection.cpp
@@ -44,7 +44,7 @@ void StartPanConnection::start()  {
 
     connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not start" );
@@ -74,7 +74,7 @@ void StartPanConnection::stop()  {
 
     connect( m_panConnect, SIGNAL( processExited(Opie::Core::OProcess*) ) ,
-             this, SLOT( slotExited(OProcess*) ) );
+             this, SLOT( slotExited(Opie::Core::OProcess*) ) );
     connect( m_panConnect, SIGNAL( receivedStdout(Opie::Core::OProcess*,char*,int) ),
-             this, SLOT( slotStdOut(OProcess*,char*,int) ) );
+             this, SLOT( slotStdOut(Opie::Core::OProcess*,char*,int) ) );
     if (!m_panConnect->start( OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         qWarning( "could not stop" );
diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp
index 870e7fd..78c1501 100644
--- a/noncore/net/opietooth/manager/pppdialog.cpp
+++ b/noncore/net/opietooth/manager/pppdialog.cpp
@@ -11,5 +11,4 @@ using namespace OpieTooth;
 
 using namespace Opie::Core;
-using namespace Opie::Core;
 PPPDialog::PPPDialog( QWidget* parent,  const char* name, bool modal, WFlags fl, const QString& device )
     : QDialog( parent, name, modal, fl ) {
@@ -56,5 +55,5 @@ void PPPDialog::connectToDevice() {
     *pppDial << "pppd" << m_device << "call" << connectScript;
     connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ),
-                this, SLOT(fillOutPut(OProcess*,char*,int) ) );
+             this, SLOT(fillOutPut(Opie::Core::OProcess*,char*,int) ) );
      if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) {
         qWarning("could not start");
diff --git a/noncore/settings/networksettings/ppp/config.in b/noncore/settings/networksettings/ppp/config.in
index 3b8501d..0b71434 100644
--- a/noncore/settings/networksettings/ppp/config.in
+++ b/noncore/settings/networksettings/ppp/config.in
@@ -2,3 +2,3 @@
     boolean "opie-networksettingsplugin-kppp (PPP module)"
     default "n" if NETWORKSETUP
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
+    depends ( LIBQPE || LIBQPE-X11 ) && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES
diff --git a/noncore/settings/networksettings/wlan/config.in b/noncore/settings/networksettings/wlan/config.in
index 97fa468..d4661cb 100644
--- a/noncore/settings/networksettings/wlan/config.in
+++ b/noncore/settings/networksettings/wlan/config.in
@@ -4,3 +4,3 @@
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && NETWORKSETUP && NETWORKSETUP-CORE && INTERFACES && LIBOPIE2NET
     #comment "opie-networksettingsplugin-wlan needs libopie2ui, libopie2net and networksetup"
-    #depends !( LIBOPIE2NET && LIBOPIE && NETWORKSETUP)
\ No newline at end of file
+    #depends !( LIBOPIE2NET && NETWORKSETUP)
\ No newline at end of file
diff --git a/noncore/unsupported/mail2/bend/bend.cpp b/noncore/unsupported/mail2/bend/bend.cpp
index ab6eb45..4ded402 100644
--- a/noncore/unsupported/mail2/bend/bend.cpp
+++ b/noncore/unsupported/mail2/bend/bend.cpp
@@ -10,5 +10,5 @@
 #include <qpe/config.h>
 
-#include <opie/odevice.h>
+#include <opie2/odevice.h>
 
 #include "imapresponse.h"
diff --git a/noncore/unsupported/mail2/composerbase.cpp b/noncore/unsupported/mail2/composerbase.cpp
index 94de15c..cac3f26 100644
--- a/noncore/unsupported/mail2/composerbase.cpp
+++ b/noncore/unsupported/mail2/composerbase.cpp
@@ -8,5 +8,5 @@
 #include <qvbox.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
diff --git a/noncore/unsupported/mail2/main.cpp b/noncore/unsupported/mail2/main.cpp
index a11b4e2..fce9b0b 100644
--- a/noncore/unsupported/mail2/main.cpp
+++ b/noncore/unsupported/mail2/main.cpp
@@ -1,4 +1,5 @@
 #include <qpe/qpeapplication.h>
 
+using namespace Opie::Core;
 #include "mainwindow.h"
 
diff --git a/noncore/unsupported/mail2/mainwindowbase.cpp b/noncore/unsupported/mail2/mainwindowbase.cpp
index 4e804c2..666cc4a 100644
--- a/noncore/unsupported/mail2/mainwindowbase.cpp
+++ b/noncore/unsupported/mail2/mainwindowbase.cpp
@@ -5,5 +5,5 @@
 #include <qvbox.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
diff --git a/noncore/unsupported/mail2/viewmailbase.cpp b/noncore/unsupported/mail2/viewmailbase.cpp
index f72026f..ff02a7d 100644
--- a/noncore/unsupported/mail2/viewmailbase.cpp
+++ b/noncore/unsupported/mail2/viewmailbase.cpp
@@ -6,5 +6,5 @@
 #include <qpopupmenu.h>
 
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qmenubar.h>
 #include <qpe/resource.h>
diff --git a/noncore/unsupported/mailit/main.cpp b/noncore/unsupported/mailit/main.cpp
index 71f8877..1ccd666 100644
--- a/noncore/unsupported/mailit/main.cpp
+++ b/noncore/unsupported/mailit/main.cpp
@@ -23,3 +23,4 @@
 #include <opie/oapplicationfactory.h>
 
+using namespace Opie::Core;
 OPIE_EXPORT_APP( OApplicationFactory<MailItWindow> )
\ No newline at end of file
diff --git a/noncore/unsupported/oipkg/pmipkg.cpp b/noncore/unsupported/oipkg/pmipkg.cpp
index cfaadbf..db4db71 100644
--- a/noncore/unsupported/oipkg/pmipkg.cpp
+++ b/noncore/unsupported/oipkg/pmipkg.cpp
@@ -13,5 +13,5 @@
 #include "packagelistitem.h"
 
-//#include <opie/oprocess.h>
+//#include <opie2/oprocess.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
diff --git a/noncore/unsupported/qpdf/qpdf.cpp b/noncore/unsupported/qpdf/qpdf.cpp
index 75e86d0..df9df54 100644
--- a/noncore/unsupported/qpdf/qpdf.cpp
+++ b/noncore/unsupported/qpdf/qpdf.cpp
@@ -21,5 +21,5 @@
 
 #include <qclipboard.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qmenubar.h>