summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/applets/notesapplet/config.in2
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp4
-rw-r--r--noncore/apps/advancedfm/output.cpp4
-rw-r--r--noncore/apps/opie-console/io_bt.cpp3
-rw-r--r--noncore/apps/opie-console/io_irda.cpp3
-rw-r--r--noncore/apps/opie-console/sz_transfer.cpp4
-rw-r--r--noncore/net/mail/libmailwrapper/mhwrapper.cpp6
-rw-r--r--noncore/net/opietooth/lib/device.cc9
-rw-r--r--noncore/net/opietooth/lib/manager.cc18
-rw-r--r--noncore/net/opietooth/lib/startdunconnection.cpp5
-rw-r--r--noncore/net/opietooth/lib/startpanconnection.cpp8
-rw-r--r--noncore/net/opietooth/manager/pppdialog.cpp3
-rw-r--r--noncore/settings/networksettings/ppp/config.in2
-rw-r--r--noncore/settings/networksettings/wlan/config.in2
-rw-r--r--noncore/unsupported/mail2/bend/bend.cpp2
-rw-r--r--noncore/unsupported/mail2/composerbase.cpp2
-rw-r--r--noncore/unsupported/mail2/main.cpp1
-rw-r--r--noncore/unsupported/mail2/mainwindowbase.cpp2
-rw-r--r--noncore/unsupported/mail2/viewmailbase.cpp2
-rw-r--r--noncore/unsupported/mailit/main.cpp1
-rw-r--r--noncore/unsupported/oipkg/pmipkg.cpp2
-rw-r--r--noncore/unsupported/qpdf/qpdf.cpp2
22 files changed, 41 insertions, 46 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
@@ -3,2 +3,2 @@
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
@@ -707,6 +707,6 @@ void AdvancedFm::startProcess(const QString & cmd) {
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)));
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
@@ -149,6 +149,6 @@ 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)));
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
@@ -4,3 +4,2 @@
using namespace Opie::Core;
-using namespace Opie::Core;
IOBt::IOBt( const Profile &config ) : IOSerial( config ) {
@@ -41,3 +40,3 @@ bool IOBt::open() {
connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
- this, SLOT( slotExited(OProcess*) ) );
+ this, SLOT( slotExited(Opie::Core::OProcess*) ) );
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
@@ -4,3 +4,2 @@
using namespace Opie::Core;
-using namespace Opie::Core;
IOIrda::IOIrda( const Profile &config ) : IOSerial( config ) {
@@ -32,3 +31,3 @@ bool IOIrda::open() {
connect( m_attach, SIGNAL( processExited(Opie::Core::OProcess*) ),
- this, SLOT( slotExited(OProcess*) ) );
+ this, SLOT( slotExited(Opie::Core::OProcess*) ) );
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
@@ -32,5 +32,5 @@ void SzTransfer::sendFile(const QString& file) {
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&)),
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
@@ -11,4 +11,2 @@
using namespace Opie::Core;
-using namespace Opie::Core;
-using namespace Opie::Core;
MHwrapper::MHwrapper(const QString & mbox_dir,const QString&mbox_name)
@@ -323,5 +321,5 @@ 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)));
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
@@ -10,3 +10,2 @@ using namespace OpieTooth;
using namespace Opie::Core;
-using namespace Opie::Core;
namespace {
@@ -52,7 +51,7 @@ void Device::attach(){
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 ) ){
@@ -101,3 +100,3 @@ void Device::slotExited( OProcess* proc)
connect(m_hci, SIGNAL( processExited(Opie::Core::OProcess*) ),
- this, SLOT( slotExited(OProcess* ) ) );
+ this, SLOT( slotExited(Opie::Core::OProcess* ) ) );
if(!m_hci->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
@@ -47,3 +47,3 @@ void Manager::isAvailable( const QString& device ){
connect(l2ping, SIGNAL(processExited(Opie::Core::OProcess* ) ),
- this, SLOT(slotProcessExited(OProcess*) ) );
+ this, SLOT(slotProcessExited(Opie::Core::OProcess*) ) );
if (!l2ping->start() ) {
@@ -65,5 +65,5 @@ void Manager::searchDevices( const QString& device ){
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) ) {
@@ -112,5 +112,5 @@ void Manager::searchServices( const QString& remDevice ){
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) ) {
@@ -251,5 +251,5 @@ 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";
@@ -310,5 +310,5 @@ 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";
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
@@ -7,3 +7,2 @@ using namespace OpieTooth;
using namespace Opie::Core;
-using namespace Opie::Core;
StartDunConnection::StartDunConnection() {
@@ -44,5 +43,5 @@ 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) ) {
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
@@ -45,5 +45,5 @@ 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) ) {
@@ -75,5 +75,5 @@ 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) ) {
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
@@ -12,3 +12,2 @@ 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 )
@@ -57,3 +56,3 @@ void PPPDialog::connectToDevice() {
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) ) {
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
@@ -3,2 +3,2 @@
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
@@ -5,2 +5,2 @@
#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
@@ -11,3 +11,3 @@
-#include <opie/odevice.h>
+#include <opie2/odevice.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
@@ -9,3 +9,3 @@
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qmenubar.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
@@ -2,2 +2,3 @@
+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
@@ -6,3 +6,3 @@
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qmenubar.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
@@ -7,3 +7,3 @@
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qmenubar.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
@@ -24,2 +24,3 @@
+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
@@ -14,3 +14,3 @@
-//#include <opie/oprocess.h>
+//#include <opie2/oprocess.h>
#include <qpe/resource.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
@@ -22,3 +22,3 @@
#include <qclipboard.h>
-#include <qpe/qpetoolbar.h>
+#include <qtoolbar.h>
#include <qtoolbutton.h>