-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,25 +1,27 @@ | |||
1 | /* | 1 | /* |
2 | using namespace Opie::Core; | ||
3 | using namespace Opie::Core; | ||
2 | * main.cpp | 4 | * main.cpp |
3 | * | 5 | * |
4 | * --------------------- | 6 | * --------------------- |
5 | * | 7 | * |
6 | * begin : Sun 10 17:20:00 CEST 2002 | 8 | * begin : Sun 10 17:20:00 CEST 2002 |
7 | * copyright : (c) 2002 by Maximilian Reiß | 9 | * copyright : (c) 2002 by Maximilian Reiß |
8 | * email : max.reiss@gmx.de | 10 | * email : max.reiss@gmx.de |
9 | * | 11 | * |
10 | */ | 12 | */ |
11 | /*************************************************************************** | 13 | /*************************************************************************** |
12 | * * | 14 | * * |
13 | * This program is free software; you can redistribute it and/or modify * | 15 | * This program is free software; you can redistribute it and/or modify * |
14 | * it under the terms of the GNU General Public License as published by * | 16 | * it under the terms of the GNU General Public License as published by * |
15 | * the Free Software Foundation; either version 2 of the License, or * | 17 | * the Free Software Foundation; either version 2 of the License, or * |
16 | * (at your option) any later version. * | 18 | * (at your option) any later version. * |
17 | * * | 19 | * * |
18 | ***************************************************************************/ | 20 | ***************************************************************************/ |
19 | 21 | ||
20 | #include "bluebase.h" | 22 | #include "bluebase.h" |
21 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
22 | #include <opie/oapplicationfactory.h> | 24 | #include <opie2/oapplicationfactory.h> |
23 | 25 | ||
24 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<OpieTooth::BlueBase> ) |
25 | 27 | ||
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 | |||
@@ -1,28 +1,31 @@ | |||
1 | 1 | ||
2 | #include "obexdialog.h" | 2 | #include "obexdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <qfileinfo.h> | 8 | #include <qfileinfo.h> |
9 | 9 | ||
10 | #include <qpe/resource.h> | 10 | #include <qpe/resource.h> |
11 | 11 | ||
12 | #include <opie/oprocess.h> | 12 | #include <opie2/oprocess.h> |
13 | #include <opie/ofiledialog.h> | 13 | #include <opie2/ofiledialog.h> |
14 | 14 | ||
15 | using namespace OpieTooth; | 15 | using namespace OpieTooth; |
16 | 16 | ||
17 | using namespace Opie::Core; | ||
18 | using namespace Opie::Ui; | ||
19 | using namespace Opie::Core; | ||
17 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 20 | ObexDialog::ObexDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
18 | : QDialog( parent, name, modal, fl ) { | 21 | : QDialog( parent, name, modal, fl ) { |
19 | 22 | ||
20 | if ( !name ) | 23 | if ( !name ) |
21 | setName( "ObexDialog" ); | 24 | setName( "ObexDialog" ); |
22 | setCaption( tr( "beam files " ) ) ; | 25 | setCaption( tr( "beam files " ) ) ; |
23 | 26 | ||
24 | m_device = device; | 27 | m_device = device; |
25 | 28 | ||
26 | layout = new QVBoxLayout( this ); | 29 | layout = new QVBoxLayout( this ); |
27 | 30 | ||
28 | QLabel* info = new QLabel( this ); | 31 | QLabel* info = new QLabel( this ); |
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 | |||
@@ -1,18 +1,18 @@ | |||
1 | #ifndef OBEXDIALOG_H | 1 | #ifndef OBEXDIALOG_H |
2 | #define OBEXDIALOG_H | 2 | #define OBEXDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | 13 | ||
14 | namespace OpieTooth { | 14 | namespace OpieTooth { |
15 | 15 | ||
16 | class ObexDialog : public QDialog { | 16 | class ObexDialog : public QDialog { |
17 | 17 | ||
18 | Q_OBJECT | 18 | Q_OBJECT |
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 | |||
@@ -1,23 +1,25 @@ | |||
1 | 1 | ||
2 | #include "pppdialog.h" | 2 | #include "pppdialog.h" |
3 | #include <qpushbutton.h> | 3 | #include <qpushbutton.h> |
4 | #include <qmultilineedit.h> | 4 | #include <qmultilineedit.h> |
5 | #include <qlineedit.h> | 5 | #include <qlineedit.h> |
6 | #include <qlayout.h> | 6 | #include <qlayout.h> |
7 | #include <qlabel.h> | 7 | #include <qlabel.h> |
8 | #include <opie/oprocess.h> | 8 | #include <opie2/oprocess.h> |
9 | 9 | ||
10 | using namespace OpieTooth; | 10 | using namespace OpieTooth; |
11 | 11 | ||
12 | using namespace Opie::Core; | ||
13 | using namespace Opie::Core; | ||
12 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) | 14 | PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, const QString& device ) |
13 | : QDialog( parent, name, modal, fl ) { | 15 | : QDialog( parent, name, modal, fl ) { |
14 | 16 | ||
15 | if ( !name ) | 17 | if ( !name ) |
16 | setName( "PPPDialog" ); | 18 | setName( "PPPDialog" ); |
17 | setCaption( tr( "ppp connection " ) ) ; | 19 | setCaption( tr( "ppp connection " ) ) ; |
18 | 20 | ||
19 | m_device = device; | 21 | m_device = device; |
20 | 22 | ||
21 | layout = new QVBoxLayout( this ); | 23 | layout = new QVBoxLayout( this ); |
22 | 24 | ||
23 | QLabel* info = new QLabel( this ); | 25 | QLabel* info = new QLabel( this ); |
@@ -43,25 +45,25 @@ PPPDialog::PPPDialog( QWidget* parent, const char* name, bool modal, WFlags fl, | |||
43 | 45 | ||
44 | } | 46 | } |
45 | 47 | ||
46 | PPPDialog::~PPPDialog() { | 48 | PPPDialog::~PPPDialog() { |
47 | } | 49 | } |
48 | 50 | ||
49 | void PPPDialog::connectToDevice() { | 51 | void PPPDialog::connectToDevice() { |
50 | outPut->clear(); | 52 | outPut->clear(); |
51 | // vom popupmenu beziehen | 53 | // vom popupmenu beziehen |
52 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); | 54 | QString connectScript = "/etc/ppp/peers/" + cmdLine->text(); |
53 | OProcess* pppDial = new OProcess(); | 55 | OProcess* pppDial = new OProcess(); |
54 | *pppDial << "pppd" << m_device << "call" << connectScript; | 56 | *pppDial << "pppd" << m_device << "call" << connectScript; |
55 | connect( pppDial, SIGNAL(receivedStdout(OProcess*,char*,int) ), | 57 | connect( pppDial, SIGNAL(receivedStdout(Opie::Core::OProcess*,char*,int) ), |
56 | this, SLOT(fillOutPut(OProcess*,char*,int) ) ); | 58 | this, SLOT(fillOutPut(OProcess*,char*,int) ) ); |
57 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { | 59 | if (!pppDial->start(OProcess::DontCare, OProcess::AllOutput) ) { |
58 | qWarning("could not start"); | 60 | qWarning("could not start"); |
59 | delete pppDial; | 61 | delete pppDial; |
60 | } | 62 | } |
61 | } | 63 | } |
62 | 64 | ||
63 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { | 65 | void PPPDialog::fillOutPut( OProcess* pppDial, char* cha, int len ) { |
64 | QCString str(cha, len ); | 66 | QCString str(cha, len ); |
65 | outPut->insertLine( str ); | 67 | outPut->insertLine( str ); |
66 | delete pppDial; | 68 | delete pppDial; |
67 | } | 69 | } |
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 | |||
@@ -1,37 +1,37 @@ | |||
1 | #ifndef PPPDIALOG_H | 1 | #ifndef PPPDIALOG_H |
2 | #define PPPDIALOG_H | 2 | #define PPPDIALOG_H |
3 | 3 | ||
4 | 4 | ||
5 | #include <qdialog.h> | 5 | #include <qdialog.h> |
6 | #include <opie/oprocess.h> | 6 | #include <opie2/oprocess.h> |
7 | 7 | ||
8 | class QVBoxLayout; | 8 | class QVBoxLayout; |
9 | class QPushButton; | 9 | class QPushButton; |
10 | class QMultiLineEdit; | 10 | class QMultiLineEdit; |
11 | class QLineEdit; | 11 | class QLineEdit; |
12 | 12 | ||
13 | 13 | ||
14 | namespace OpieTooth { | 14 | namespace OpieTooth { |
15 | 15 | ||
16 | class PPPDialog : public QDialog { | 16 | class PPPDialog : public QDialog { |
17 | 17 | ||
18 | Q_OBJECT | 18 | Q_OBJECT |
19 | 19 | ||
20 | public: | 20 | public: |
21 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); | 21 | PPPDialog( QWidget* parent = 0, const char* name = 0, bool modal = TRUE, WFlags fl = 0, const QString& device = 0); |
22 | ~PPPDialog(); | 22 | ~PPPDialog(); |
23 | 23 | ||
24 | private slots: | 24 | private slots: |
25 | void connectToDevice(); | 25 | void connectToDevice(); |
26 | void fillOutPut( OProcess* pppDial, char* cha, int len ); | 26 | void fillOutPut( Opie::Core::OProcess* pppDial, char* cha, int len ); |
27 | protected: | 27 | protected: |
28 | QVBoxLayout* layout; | 28 | QVBoxLayout* layout; |
29 | QLineEdit* cmdLine; | 29 | QLineEdit* cmdLine; |
30 | QPushButton* connectButton; | 30 | QPushButton* connectButton; |
31 | QMultiLineEdit* outPut; | 31 | QMultiLineEdit* outPut; |
32 | 32 | ||
33 | private: | 33 | private: |
34 | QString m_device; | 34 | QString m_device; |
35 | }; | 35 | }; |
36 | } | 36 | } |
37 | #endif | 37 | #endif |