author | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
commit | 0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44 (patch) (side-by-side diff) | |
tree | f6a68afa76a9be4099c3de7a286caeadd250c966 /noncore/net/opietooth/manager | |
parent | d9d68663164078b8dbdbfe70d291291b9fd5aacf (diff) | |
download | opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.zip opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.gz opie-0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44.tar.bz2 |
Convert net to ODP and QtAUX
-rw-r--r-- | noncore/net/opietooth/manager/main.cpp | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.cpp | 7 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/obexdialog.h | 2 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.cpp | 6 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/pppdialog.h | 4 |
5 files changed, 15 insertions, 8 deletions
diff --git a/noncore/net/opietooth/manager/main.cpp b/noncore/net/opietooth/manager/main.cpp index 82aeebd..a96f128 100644 --- a/noncore/net/opietooth/manager/main.cpp +++ b/noncore/net/opietooth/manager/main.cpp @@ -1,3 +1,5 @@ /* +using namespace Opie::Core; +using namespace Opie::Core; * main.cpp * @@ -20,5 +22,5 @@ #include "bluebase.h" #include <qpe/qpeapplication.h> -#include <opie/oapplicationfactory.h> +#include <opie2/oapplicationfactory.h> OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) diff --git a/noncore/net/opietooth/manager/obexdialog.cpp b/noncore/net/opietooth/manager/obexdialog.cpp index 46a0e3d..1ef862a 100644 --- a/noncore/net/opietooth/manager/obexdialog.cpp +++ b/noncore/net/opietooth/manager/obexdialog.cpp @@ -10,9 +10,12 @@ #include <qpe/resource.h> -#include <opie/oprocess.h> -#include <opie/ofiledialog.h> +#include <opie2/oprocess.h> +#include <opie2/ofiledialog.h> using namespace OpieTooth; +using namespace Opie::Core; +using namespace Opie::Ui; +using namespace Opie::Core; ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) : QDialog( parent, name, modal, fl ) { diff --git a/noncore/net/opietooth/manager/obexdialog.h b/noncore/net/opietooth/manager/obexdialog.h index b3d5e6d..d5b5682 100644 --- a/noncore/net/opietooth/manager/obexdialog.h +++ b/noncore/net/opietooth/manager/obexdialog.h @@ -4,5 +4,5 @@ #include <qdialog.h> -#include <opie/oprocess.h> +#include <opie2/oprocess.h> class QVBoxLayout; diff --git a/noncore/net/opietooth/manager/pppdialog.cpp b/noncore/net/opietooth/manager/pppdialog.cpp index 4e58552..870e7fd 100644 --- a/noncore/net/opietooth/manager/pppdialog.cpp +++ b/noncore/net/opietooth/manager/pppdialog.cpp @@ -6,8 +6,10 @@ #include <qlayout.h> #include <qlabel.h> -#include <opie/oprocess.h> +#include <opie2/oprocess.h> 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 ) { @@ -53,5 +55,5 @@ void PPPDialog::connectToDevice() { OProcess* pppDial = new OProcess(); *pppDial << "pppd" << m_device << "call" << connectScript; - connect( pppDial, SIGNAL(receivedStdout(OProcess*,char*,int) ), + connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), this, SLOT(fillOutPut(OProcess*,char*,int) ) ); if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { diff --git a/noncore/net/opietooth/manager/pppdialog.h b/noncore/net/opietooth/manager/pppdialog.h index bb8b734..05894e2 100644 --- a/noncore/net/opietooth/manager/pppdialog.h +++ b/noncore/net/opietooth/manager/pppdialog.h @@ -4,5 +4,5 @@ #include <qdialog.h> -#include <opie/oprocess.h> +#include <opie2/oprocess.h> class QVBoxLayout; @@ -24,5 +24,5 @@ namespace OpieTooth { private slots: void connectToDevice(); - void fillOutPut( OProcess* pppDial, char* cha, int len ); + void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len ); protected: QVBoxLayout* layout; |