Diffstat (limited to 'noncore/net/wellenreiter/gui') (more/less context) (ignore whitespace changes)
-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 | |||
@@ -42,8 +42,14 @@ using namespace Opie; | |||
42 | 42 | ||
43 | /* POSIX */ | 43 | /* POSIX */ |
44 | #include <assert.h> | 44 | #include <assert.h> |
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; |
47 | 53 | ||
48 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) | 54 | WellenreiterConfigWindow::WellenreiterConfigWindow( QWidget * parent, const char * name, WFlags f ) |
49 | :WellenreiterConfigBase( parent, name, true, f ) | 55 | :WellenreiterConfigBase( parent, name, true, f ) |
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 | |||
@@ -28,8 +28,11 @@ | |||
28 | #include <signal.h> | 28 | #include <signal.h> |
29 | #include <string.h> | 29 | #include <string.h> |
30 | #include <unistd.h> | 30 | #include <unistd.h> |
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 ) |
33 | { | 36 | { |
34 | #ifdef QWS | 37 | #ifdef QWS |
35 | OApplication a( argc, argv, "Wellenreiter II" ); | 38 | OApplication a( argc, argv, "Wellenreiter II" ); |
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 | |||
@@ -50,8 +50,13 @@ using namespace Opie; | |||
50 | #endif | 50 | #endif |
51 | 51 | ||
52 | #include <unistd.h> | 52 | #include <unistd.h> |
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 ) |
55 | :QMainWindow( parent, name, f ) | 60 | :QMainWindow( parent, name, f ) |
56 | { | 61 | { |
57 | cw = new WellenreiterConfigWindow( this ); | 62 | cw = new WellenreiterConfigWindow( this ); |
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 | |||
@@ -24,8 +24,11 @@ | |||
24 | #include <qlabel.h> | 24 | #include <qlabel.h> |
25 | #include <qlayout.h> | 25 | #include <qlayout.h> |
26 | #include <qlist.h> | 26 | #include <qlist.h> |
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 ) |
29 | :QFrame( parent, name, f ) | 32 | :QFrame( parent, name, f ) |
30 | { | 33 | { |
31 | _number = new QSpinBox( this ); | 34 | _number = new QSpinBox( this ); |
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 | |||
@@ -22,17 +22,17 @@ | |||
22 | class QString; | 22 | class QString; |
23 | class QSpinBox; | 23 | class QSpinBox; |
24 | class QLabel; | 24 | class QLabel; |
25 | class QTextView; | 25 | class QTextView; |
26 | class OPacket; | 26 | namespace Opie {namespace Net {class Opie::Net::OPacket;}} |
27 | 27 | ||
28 | class PacketView: public QFrame | 28 | class PacketView: public QFrame |
29 | { | 29 | { |
30 | 30 | ||
31 | public: | 31 | public: |
32 | PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); | 32 | PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); |
33 | 33 | ||
34 | void add( OPacket* p ); | 34 | void add( Opie::Net::OPacket* p ); |
35 | const QString getLog() const; | 35 | const QString getLog() const; |
36 | void clear(); | 36 | void clear(); |
37 | 37 | ||
38 | protected: | 38 | protected: |
@@ -40,9 +40,9 @@ class PacketView: public QFrame | |||
40 | QSpinBox* _number; | 40 | QSpinBox* _number; |
41 | QLabel* _label; | 41 | QLabel* _label; |
42 | QLabel* _list; | 42 | QLabel* _list; |
43 | QTextView* _hex; | 43 | QTextView* _hex; |
44 | QList<OPacket> _packets; | 44 | QList<Opie::Net::OPacket> _packets; |
45 | 45 | ||
46 | }; | 46 | }; |
47 | 47 | ||
48 | #endif | 48 | #endif |
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 | |||
@@ -45,8 +45,14 @@ const int col_manuf = 7; | |||
45 | const int col_firstseen = 8; | 45 | const int col_firstseen = 8; |
46 | const int col_lastseen = 9; | 46 | const int col_lastseen = 9; |
47 | const int col_location = 10; | 47 | 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 ) |
50 | :OListView( parent, name ) | 56 | :OListView( parent, name ) |
51 | { | 57 | { |
52 | setFrameShape( QListView::StyledPanel ); | 58 | setFrameShape( QListView::StyledPanel ); |
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 | |||
@@ -27,45 +27,45 @@ | |||
27 | 27 | ||
28 | class QString; | 28 | class QString; |
29 | class MScanListItem; | 29 | class MScanListItem; |
30 | 30 | ||
31 | class MScanListView: public OListView | 31 | class MScanListView: public Opie::Ui::OListView |
32 | { | 32 | { |
33 | Q_OBJECT | 33 | Q_OBJECT |
34 | 34 | ||
35 | public: | 35 | public: |
36 | MScanListView( QWidget* parent = 0, const char* name = 0 ); | 36 | MScanListView( QWidget* parent = 0, const char* name = 0 ); |
37 | virtual ~MScanListView(); | 37 | virtual ~MScanListView(); |
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; |
41 | virtual void serializeFrom( QDataStream& s ); | 41 | virtual void serializeFrom( QDataStream& s ); |
42 | 42 | ||
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 | ||
54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); | 54 | void contextMenuRequested( QListViewItem* item, const QPoint&, int ); |
55 | 55 | ||
56 | signals: | 56 | signals: |
57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); | 57 | void rightButtonClicked(QListViewItem*,const QPoint&,int); |
58 | void joinNetwork( const QString&, const QString&, int, const QString& ); | 58 | void joinNetwork( const QString&, const QString&, int, const QString& ); |
59 | 59 | ||
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 | ||
63 | }; | 63 | }; |
64 | 64 | ||
65 | //****************************** MScanListItem **************************************************************** | 65 | //****************************** MScanListItem **************************************************************** |
66 | 66 | ||
67 | class MScanListItem: public OListViewItem | 67 | class MScanListItem: public Opie::Ui::OListViewItem |
68 | { | 68 | { |
69 | public: | 69 | public: |
70 | MScanListItem::MScanListItem( QListView* parent, | 70 | MScanListItem::MScanListItem( QListView* parent, |
71 | const QString& type = "unknown", | 71 | const QString& type = "unknown", |
@@ -105,9 +105,9 @@ class MScanListItem: public OListViewItem | |||
105 | 105 | ||
106 | void setManufacturer( const QString& manufacturer ); | 106 | void setManufacturer( const QString& manufacturer ); |
107 | void setLocation( const QString& location ); | 107 | void setLocation( const QString& location ); |
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; |
111 | virtual void serializeFrom( QDataStream& s ); | 111 | virtual void serializeFrom( QDataStream& s ); |
112 | 112 | ||
113 | private: | 113 | private: |
@@ -124,9 +124,9 @@ class MScanListItem: public OListViewItem | |||
124 | //****************************** MScanListViewFactory **************************************************************** | 124 | //****************************** MScanListViewFactory **************************************************************** |
125 | 125 | ||
126 | /* | 126 | /* |
127 | 127 | ||
128 | class MScanListViewFactory : public OListViewFactory | 128 | class MScanListViewFactory : public Opie::Ui::OListViewFactory |
129 | { | 129 | { |
130 | public: | 130 | public: |
131 | virtual QListView* listViewFactory(); | 131 | virtual QListView* listViewFactory(); |
132 | virtual QListViewItem* listViewItemFactory( QListView* lv ); | 132 | virtual QListViewItem* listViewItemFactory( QListView* lv ); |
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 | |||
@@ -15,8 +15,11 @@ | |||
15 | 15 | ||
16 | #include "statwindow.h" | 16 | #include "statwindow.h" |
17 | #include <opie2/olistview.h> | 17 | #include <opie2/olistview.h> |
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 ) |
20 | :QVBox( parent, name, f ) | 23 | :QVBox( parent, name, f ) |
21 | { | 24 | { |
22 | table = new OListView( this ); | 25 | table = new OListView( this ); |
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 | |||
@@ -18,9 +18,9 @@ | |||
18 | 18 | ||
19 | #include <qvbox.h> | 19 | #include <qvbox.h> |
20 | 20 | ||
21 | class QString; | 21 | class QString; |
22 | class OListView; | 22 | namespace Opie {namespace Ui {class Opie::Ui::OListView;}} |
23 | 23 | ||
24 | class MStatWindow: public QVBox | 24 | class MStatWindow: public QVBox |
25 | { | 25 | { |
26 | Q_OBJECT | 26 | Q_OBJECT |
@@ -34,9 +34,9 @@ class MStatWindow: public QVBox | |||
34 | 34 | ||
35 | void updateCounter( const QString&, int ); | 35 | void updateCounter( const QString&, int ); |
36 | 36 | ||
37 | protected: | 37 | protected: |
38 | OListView* table; | 38 | Opie::Ui::OListView* table; |
39 | 39 | ||
40 | }; | 40 | }; |
41 | 41 | ||
42 | #endif | 42 | #endif |
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 | |||
@@ -60,8 +60,14 @@ using namespace Opie; | |||
60 | #include <string.h> | 60 | #include <string.h> |
61 | #include <sys/types.h> | 61 | #include <sys/types.h> |
62 | #include <stdlib.h> | 62 | #include <stdlib.h> |
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 ) |
65 | : WellenreiterBase( parent, 0, 0 ), | 71 | : WellenreiterBase( parent, 0, 0 ), |
66 | sniffing( false ), iface( 0 ), configwindow( 0 ) | 72 | sniffing( false ), iface( 0 ), configwindow( 0 ) |
67 | { | 73 | { |
@@ -445,9 +451,9 @@ void Wellenreiter::receivePacket( OPacket* p ) | |||
445 | void Wellenreiter::stopClicked() | 451 | void Wellenreiter::stopClicked() |
446 | { | 452 | { |
447 | if ( iface ) | 453 | if ( iface ) |
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) ) ); |
451 | iface->setChannelHopping(); // stop hopping channels | 457 | iface->setChannelHopping(); // stop hopping channels |
452 | } | 458 | } |
453 | else | 459 | else |
@@ -610,9 +616,9 @@ void Wellenreiter::startClicked() | |||
610 | 616 | ||
611 | if ( cardtype != DEVTYPE_FILE ) | 617 | if ( cardtype != DEVTYPE_FILE ) |
612 | { | 618 | { |
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) ) ); |
616 | } | 622 | } |
617 | else | 623 | else |
618 | { | 624 | { |
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 | |||
@@ -17,23 +17,23 @@ | |||
17 | #include "wellenreiterbase.h" | 17 | #include "wellenreiterbase.h" |
18 | 18 | ||
19 | #ifdef QWS | 19 | #ifdef QWS |
20 | #include <opie2/odevice.h> | 20 | #include <opie2/odevice.h> |
21 | using namespace Opie; | ||
22 | #endif | 21 | #endif |
23 | 22 | ||
24 | class QTimerEvent; | 23 | 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; |
37 | class WellenreiterConfigWindow; | 37 | class WellenreiterConfigWindow; |
38 | class MLogWindow; | 38 | class MLogWindow; |
39 | class GPS; | 39 | class GPS; |
@@ -61,9 +61,9 @@ class Wellenreiter : public WellenreiterBase { | |||
61 | public slots: | 61 | public slots: |
62 | void initialTimer(); | 62 | void initialTimer(); |
63 | 63 | ||
64 | void channelHopped(int); | 64 | void channelHopped(int); |
65 | void receivePacket(OPacket*); | 65 | void receivePacket(Opie::Net::OPacket*); |
66 | void startClicked(); | 66 | void startClicked(); |
67 | void stopClicked(); | 67 | void stopClicked(); |
68 | 68 | ||
69 | void joinNetwork(const QString&,const QString&,int,const QString&); | 69 | void joinNetwork(const QString&,const QString&,int,const QString&); |
@@ -72,30 +72,30 @@ class Wellenreiter : public WellenreiterBase { | |||
72 | void startedSniffing(); | 72 | void startedSniffing(); |
73 | void stoppedSniffing(); | 73 | void stoppedSniffing(); |
74 | 74 | ||
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 | ||
90 | private: | 90 | private: |
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 |
94 | 94 | ||
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; |
99 | GPS* gps; | 99 | GPS* gps; |
100 | 100 | ||
101 | //void readConfig(); | 101 | //void readConfig(); |
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 | |||
@@ -37,8 +37,11 @@ using namespace Opie; | |||
37 | /* | 37 | /* |
38 | * Constructs a WellenreiterBase which is a child of 'parent', with the | 38 | * Constructs a WellenreiterBase which is a child of 'parent', with the |
39 | * name 'name' and widget flags set to 'f' | 39 | * name 'name' and widget flags set to 'f' |
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 ) |
42 | : QWidget( parent, name, fl ) | 45 | : QWidget( parent, name, fl ) |
43 | { | 46 | { |
44 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); | 47 | //ani1 = new QPixmap( Resource::loadPixmap( "wellenreiter/networks_rot0" ) ); |
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 | |||
@@ -45,9 +45,9 @@ public: | |||
45 | WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | 45 | WellenreiterBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); |
46 | ~WellenreiterBase(); | 46 | ~WellenreiterBase(); |
47 | 47 | ||
48 | #ifdef QWS | 48 | #ifdef QWS |
49 | OTabWidget* TabWidget; | 49 | Opie::Ui::OTabWidget* TabWidget; |
50 | #else | 50 | #else |
51 | QTabWidget* TabWidget; | 51 | QTabWidget* TabWidget; |
52 | #endif | 52 | #endif |
53 | QWidget* ap; | 53 | QWidget* ap; |