author | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
---|---|---|
committer | zecke <zecke> | 2004-03-14 13:22:42 (UTC) |
commit | 0f7217afa7cdcb108dd2afba0ff6b42c97ab6f44 (patch) (unidiff) | |
tree | f6a68afa76a9be4099c3de7a286caeadd250c966 /noncore/net/wellenreiter | |
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/wellenreiter/gui/configwindow.cpp | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/main.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/mainwindow.cpp | 5 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/packetview.h | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.cpp | 6 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/scanlist.h | 26 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/statwindow.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/statwindow.h | 4 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.cpp | 10 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiter.h | 56 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.cpp | 3 | ||||
-rw-r--r-- | noncore/net/wellenreiter/gui/wellenreiterbase.h | 2 |
13 files changed, 84 insertions, 49 deletions
diff --git a/noncore/net/wellenreiter/gui/configwindow.cpp b/noncore/net/wellenreiter/gui/configwindow.cpp index 95b03d0..da39113 100644 --- a/noncore/net/wellenreiter/gui/configwindow.cpp +++ b/noncore/net/wellenreiter/gui/configwindow.cpp | |||
@@ -45,2 +45,8 @@ using namespace Opie; | |||
45 | 45 | ||
46 | using namespace Opie::Core; | ||
47 | using namespace Opie::Net; | ||
48 | using namespace Opie::Core; | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Core; | ||
51 | using namespace Opie::Net; | ||
46 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; | 52 | WellenreiterConfigWindow* WellenreiterConfigWindow::_instance = 0; |
diff --git a/noncore/net/wellenreiter/gui/main.cpp b/noncore/net/wellenreiter/gui/main.cpp index 7dcc583..6bbc39b 100644 --- a/noncore/net/wellenreiter/gui/main.cpp +++ b/noncore/net/wellenreiter/gui/main.cpp | |||
@@ -31,2 +31,5 @@ | |||
31 | 31 | ||
32 | using namespace Opie::Core; | ||
33 | using namespace Opie::Core; | ||
34 | using namespace Opie::Core; | ||
32 | int main( int argc, char **argv ) | 35 | int main( int argc, char **argv ) |
diff --git a/noncore/net/wellenreiter/gui/mainwindow.cpp b/noncore/net/wellenreiter/gui/mainwindow.cpp index 5cc0daf..7add6cd 100644 --- a/noncore/net/wellenreiter/gui/mainwindow.cpp +++ b/noncore/net/wellenreiter/gui/mainwindow.cpp | |||
@@ -53,2 +53,7 @@ using namespace Opie; | |||
53 | 53 | ||
54 | using namespace Opie::Ui; | ||
55 | using namespace Opie::Net; | ||
56 | using namespace Opie::Ui; | ||
57 | using namespace Opie::Net; | ||
58 | using namespace Opie::Net; | ||
54 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) | 59 | WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) |
diff --git a/noncore/net/wellenreiter/gui/packetview.cpp b/noncore/net/wellenreiter/gui/packetview.cpp index ef5d020..8312e71 100644 --- a/noncore/net/wellenreiter/gui/packetview.cpp +++ b/noncore/net/wellenreiter/gui/packetview.cpp | |||
@@ -27,2 +27,5 @@ | |||
27 | 27 | ||
28 | using namespace Opie::Net; | ||
29 | using namespace Opie::Net; | ||
30 | using namespace Opie::Net; | ||
28 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) | 31 | PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) |
diff --git a/noncore/net/wellenreiter/gui/packetview.h b/noncore/net/wellenreiter/gui/packetview.h index b5f2b26..1ac19bb 100644 --- a/noncore/net/wellenreiter/gui/packetview.h +++ b/noncore/net/wellenreiter/gui/packetview.h | |||
@@ -25,3 +25,3 @@ class QLabel; | |||
25 | class QTextView; | 25 | class QTextView; |
26 | class OPacket; | 26 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
27 | 27 | ||
@@ -33,3 +33,3 @@ class PacketView: public QFrame | |||
33 | 33 | ||
34 | void add( OPacket* p ); | 34 | void add( Opie::Net::OPacket* p ); |
35 | const QString getLog() const; | 35 | const QString getLog() const; |
@@ -43,3 +43,3 @@ class PacketView: public QFrame | |||
43 | QTextView* _hex; | 43 | QTextView* _hex; |
44 | QList<OPacket> _packets; | 44 | QList<Opie::Net::OPacket> _packets; |
45 | 45 | ||
diff --git a/noncore/net/wellenreiter/gui/scanlist.cpp b/noncore/net/wellenreiter/gui/scanlist.cpp index 6005818..3b7120a 100644 --- a/noncore/net/wellenreiter/gui/scanlist.cpp +++ b/noncore/net/wellenreiter/gui/scanlist.cpp | |||
@@ -48,2 +48,8 @@ const int col_location = 10; | |||
48 | 48 | ||
49 | using namespace Opie::Net; | ||
50 | using namespace Opie::Ui; | ||
51 | using namespace Opie::Net; | ||
52 | using namespace Opie::Ui; | ||
53 | using namespace Opie::Ui; | ||
54 | using namespace Opie::Net; | ||
49 | MScanListView::MScanListView( QWidget* parent, const char* name ) | 55 | MScanListView::MScanListView( QWidget* parent, const char* name ) |
diff --git a/noncore/net/wellenreiter/gui/scanlist.h b/noncore/net/wellenreiter/gui/scanlist.h index ab870c2..6a80f70 100644 --- a/noncore/net/wellenreiter/gui/scanlist.h +++ b/noncore/net/wellenreiter/gui/scanlist.h | |||
@@ -30,3 +30,3 @@ class MScanListItem; | |||
30 | 30 | ||
31 | class MScanListView: public OListView | 31 | class MScanListView: public Opie::Ui::OListView |
32 | { | 32 | { |
@@ -38,3 +38,3 @@ class MScanListView: public OListView | |||
38 | 38 | ||
39 | virtual OListViewItem* childFactory(); | 39 | virtual Opie::Ui::OListViewItem* childFactory(); |
40 | virtual void serializeTo( QDataStream& s ) const; | 40 | virtual void serializeTo( QDataStream& s ) const; |
@@ -43,11 +43,11 @@ class MScanListView: public OListView | |||
43 | public slots: | 43 | public slots: |
44 | void addNewItem( const QString& type, const QString&, const OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); | 44 | void addNewItem( const QString& type, const QString&, const Opie::Net::OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); |
45 | void addService( const QString& name, const OMacAddress& macaddr, const QString& ip ); | 45 | void addService( const QString& name, const Opie::Net::OMacAddress& macaddr, const QString& ip ); |
46 | 46 | ||
47 | void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 47 | void fromDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
48 | void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 48 | void toDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
49 | void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ); | 49 | void WDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& viaFrom, const Opie::Net::OMacAddress& viaTo ); |
50 | void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); | 50 | void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); |
51 | 51 | ||
52 | void identify( const OMacAddress&, const QString& ipaddr ); | 52 | void identify( const Opie::Net::OMacAddress&, const QString& ipaddr ); |
53 | 53 | ||
@@ -60,3 +60,3 @@ class MScanListView: public OListView | |||
60 | protected: | 60 | protected: |
61 | void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" ); | 61 | void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" ); |
62 | 62 | ||
@@ -66,3 +66,3 @@ class MScanListView: public OListView | |||
66 | 66 | ||
67 | class MScanListItem: public OListViewItem | 67 | class MScanListItem: public Opie::Ui::OListViewItem |
68 | { | 68 | { |
@@ -108,3 +108,3 @@ class MScanListItem: public OListViewItem | |||
108 | 108 | ||
109 | virtual OListViewItem* childFactory(); | 109 | virtual Opie::Ui::OListViewItem* childFactory(); |
110 | virtual void serializeTo( QDataStream& s ) const; | 110 | virtual void serializeTo( QDataStream& s ) const; |
@@ -127,3 +127,3 @@ class MScanListItem: public OListViewItem | |||
127 | 127 | ||
128 | class MScanListViewFactory : public OListViewFactory | 128 | class MScanListViewFactory : public Opie::Ui::OListViewFactory |
129 | { | 129 | { |
diff --git a/noncore/net/wellenreiter/gui/statwindow.cpp b/noncore/net/wellenreiter/gui/statwindow.cpp index 48e4847..e3c6bbe 100644 --- a/noncore/net/wellenreiter/gui/statwindow.cpp +++ b/noncore/net/wellenreiter/gui/statwindow.cpp | |||
@@ -18,2 +18,5 @@ | |||
18 | 18 | ||
19 | using namespace Opie::Ui; | ||
20 | using namespace Opie::Ui; | ||
21 | using namespace Opie::Ui; | ||
19 | MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) | 22 | MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) |
diff --git a/noncore/net/wellenreiter/gui/statwindow.h b/noncore/net/wellenreiter/gui/statwindow.h index b9057e7..e11247b 100644 --- a/noncore/net/wellenreiter/gui/statwindow.h +++ b/noncore/net/wellenreiter/gui/statwindow.h | |||
@@ -21,3 +21,3 @@ | |||
21 | class QString; | 21 | class QString; |
22 | class OListView; | 22 | namespace Opie {namespace Ui {class Opie::Ui::OListView;}} |
23 | 23 | ||
@@ -37,3 +37,3 @@ class MStatWindow: public QVBox | |||
37 | protected: | 37 | protected: |
38 | OListView* table; | 38 | Opie::Ui::OListView* table; |
39 | 39 | ||
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.cpp b/noncore/net/wellenreiter/gui/wellenreiter.cpp index ce416e5..e8d9de7 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiter.cpp | |||
@@ -63,2 +63,8 @@ using namespace Opie; | |||
63 | 63 | ||
64 | using namespace Opie::Core; | ||
65 | using namespace Opie::Net; | ||
66 | using namespace Opie::Net; | ||
67 | using namespace Opie::Core; | ||
68 | using namespace Opie::Net; | ||
69 | using namespace Opie::Core; | ||
64 | Wellenreiter::Wellenreiter( QWidget* parent ) | 70 | Wellenreiter::Wellenreiter( QWidget* parent ) |
@@ -448,3 +454,3 @@ void Wellenreiter::stopClicked() | |||
448 | { | 454 | { |
449 | disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 455 | disconnect( SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); |
450 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 456 | disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); |
@@ -613,3 +619,3 @@ void Wellenreiter::startClicked() | |||
613 | // connect socket notifier and start channel hopper | 619 | // connect socket notifier and start channel hopper |
614 | connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); | 620 | connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); |
615 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); | 621 | connect( iface->channelHopper(), SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); |
diff --git a/noncore/net/wellenreiter/gui/wellenreiter.h b/noncore/net/wellenreiter/gui/wellenreiter.h index d02813b..83299c9 100644 --- a/noncore/net/wellenreiter/gui/wellenreiter.h +++ b/noncore/net/wellenreiter/gui/wellenreiter.h | |||
@@ -20,3 +20,2 @@ | |||
20 | #include <opie2/odevice.h> | 20 | #include <opie2/odevice.h> |
21 | using namespace Opie; | ||
22 | #endif | 21 | #endif |
@@ -25,12 +24,13 @@ class QTimerEvent; | |||
25 | class QPixmap; | 24 | class QPixmap; |
26 | class OPacket; | 25 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
27 | class OWaveLanManagementPacket; | 26 | namespace Opie {namespace Net {class Opie::Net::OWaveLanManagementPacket;}} |
28 | class OWaveLanControlPacket; | 27 | namespace Opie {namespace Net {class Opie::Net::OWaveLanControlPacket;}} |
29 | class OWaveLanDataPacket; | 28 | namespace Opie {namespace Net {class Opie::Net::OWaveLanDataPacket;}} |
30 | class OEthernetPacket; | 29 | namespace Opie {namespace Net {class Opie::Net::OEthernetPacket;}} |
31 | class OARPPacket; | 30 | namespace Opie {namespace Net {class Opie::Net::OARPPacket;}} |
32 | class OMacAddress; | 31 | namespace Opie {namespace Net {class Opie::Net::OMacAddress;}} |
33 | class OIPPacket; | 32 | namespace Opie {namespace Net {class Opie::Net::OIPPacket;}} |
34 | class OPacketCapturer; | 33 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
35 | class OWirelessNetworkInterface; | 34 | namespace Opie {namespace Net {class Opie::Net::OWirelessNetworkInterface;}} |
35 | namespace Opie {namespace Net {class Opie::Net::OPacketCapturer;}} | ||
36 | class PacketView; | 36 | class PacketView; |
@@ -64,3 +64,3 @@ class Wellenreiter : public WellenreiterBase { | |||
64 | void channelHopped(int); | 64 | void channelHopped(int); |
65 | void receivePacket(OPacket*); | 65 | void receivePacket(Opie::Net::OPacket*); |
66 | void startClicked(); | 66 | void startClicked(); |
@@ -75,15 +75,15 @@ class Wellenreiter : public WellenreiterBase { | |||
75 | private: | 75 | private: |
76 | void handleManagementFrame( OPacket* p, OWaveLanManagementPacket* ); | 76 | void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
77 | void handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* ); | 77 | void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
78 | void handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* ); | 78 | void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
79 | void handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* ); | 79 | void handleManagementFrameProbeResponse( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); |
80 | void handleControlFrame( OPacket* p, OWaveLanControlPacket* control ); | 80 | void handleControlFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanControlPacket* control ); |
81 | void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ); | 81 | void handleWlanData( Opie::Net::OPacket* p, Opie::Net::OWaveLanDataPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
82 | void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ); | 82 | void handleEthernetData( Opie::Net::OPacket* p, Opie::Net::OEthernetPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
83 | void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to ); | 83 | void handleARPData( Opie::Net::OPacket* p, Opie::Net::OARPPacket* arp, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
84 | void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to ); | 84 | void handleIPData( Opie::Net::OPacket* p, Opie::Net::OIPPacket* ip, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); |
85 | void handleNotification( OPacket* p ); | 85 | void handleNotification( Opie::Net::OPacket* p ); |
86 | void doAction( const QString& action, const QString& protocol, OPacket* p ); | 86 | void doAction( const QString& action, const QString& protocol, Opie::Net::OPacket* p ); |
87 | QObject* childIfToParse( OPacket* p, const QString& protocol ); | 87 | QObject* childIfToParse( Opie::Net::OPacket* p, const QString& protocol ); |
88 | bool checkDumpPacket( OPacket* p ); | 88 | bool checkDumpPacket( Opie::Net::OPacket* p ); |
89 | 89 | ||
@@ -91,3 +91,3 @@ class Wellenreiter : public WellenreiterBase { | |||
91 | #ifdef QWS | 91 | #ifdef QWS |
92 | OSystem _system; // Opie Operating System identifier | 92 | Opie::Core::OSystem _system; // Opie Operating System identifier |
93 | #endif | 93 | #endif |
@@ -95,4 +95,4 @@ class Wellenreiter : public WellenreiterBase { | |||
95 | QString dumpname; | 95 | QString dumpname; |
96 | OWirelessNetworkInterface* iface; | 96 | Opie::Net::OWirelessNetworkInterface* iface; |
97 | OPacketCapturer* pcap; | 97 | Opie::Net::OPacketCapturer* pcap; |
98 | WellenreiterConfigWindow* configwindow; | 98 | WellenreiterConfigWindow* configwindow; |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp index 3d0595d..f035e89 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.cpp +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.cpp | |||
@@ -40,2 +40,5 @@ using namespace Opie; | |||
40 | */ | 40 | */ |
41 | using namespace Opie::Ui; | ||
42 | using namespace Opie::Ui; | ||
43 | using namespace Opie::Ui; | ||
41 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) | 44 | WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) |
diff --git a/noncore/net/wellenreiter/gui/wellenreiterbase.h b/noncore/net/wellenreiter/gui/wellenreiterbase.h index 126aad2..e40b699 100644 --- a/noncore/net/wellenreiter/gui/wellenreiterbase.h +++ b/noncore/net/wellenreiter/gui/wellenreiterbase.h | |||
@@ -48,3 +48,3 @@ public: | |||
48 | #ifdef QWS | 48 | #ifdef QWS |
49 | OTabWidget* TabWidget; | 49 | Opie::Ui::OTabWidget* TabWidget; |
50 | #else | 50 | #else |