-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 @@ -44,4 +44,10 @@ using namespace Opie; #include <assert.h> +using namespace Opie::Core; +using namespace Opie::Net; +using namespace Opie::Core; +using namespace Opie::Net; +using namespace Opie::Core; +using namespace Opie::Net; 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 @@ -30,4 +30,7 @@ #include <unistd.h> +using namespace Opie::Core; +using namespace Opie::Core; +using namespace Opie::Core; 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 @@ -52,4 +52,9 @@ using namespace Opie; #include <unistd.h> +using namespace Opie::Ui; +using namespace Opie::Net; +using namespace Opie::Ui; +using namespace Opie::Net; +using namespace Opie::Net; WellenreiterMainWindow::WellenreiterMainWindow( QWidget * parent, const char * name, WFlags f ) :QMainWindow( parent, name, 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 @@ -26,4 +26,7 @@ #include <qlist.h> +using namespace Opie::Net; +using namespace Opie::Net; +using namespace Opie::Net; PacketView::PacketView( QWidget * parent, const char * name, WFlags f ) :QFrame( parent, name, 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 @@ -24,5 +24,5 @@ class QSpinBox; class QLabel; class QTextView; -class OPacket; +namespace Opie {namespace Net {class Opie::Net::OPacket;}} class PacketView: public QFrame @@ -32,5 +32,5 @@ class PacketView: public QFrame PacketView( QWidget * parent = 0, const char * name = "PacketView", WFlags f = 0 ); - void add( OPacket* p ); + void add( Opie::Net::OPacket* p ); const QString getLog() const; void clear(); @@ -42,5 +42,5 @@ class PacketView: public QFrame QLabel* _list; QTextView* _hex; - QList<OPacket> _packets; + QList<Opie::Net::OPacket> _packets; }; 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 @@ -47,4 +47,10 @@ const int col_lastseen = 9; const int col_location = 10; +using namespace Opie::Net; +using namespace Opie::Ui; +using namespace Opie::Net; +using namespace Opie::Ui; +using namespace Opie::Ui; +using namespace Opie::Net; MScanListView::MScanListView( QWidget* parent, const char* name ) :OListView( parent, 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 @@ -29,5 +29,5 @@ class QString; class MScanListItem; -class MScanListView: public OListView +class MScanListView: public Opie::Ui::OListView { Q_OBJECT @@ -37,18 +37,18 @@ class MScanListView: public OListView virtual ~MScanListView(); - virtual OListViewItem* childFactory(); + virtual Opie::Ui::OListViewItem* childFactory(); virtual void serializeTo( QDataStream& s ) const; virtual void serializeFrom( QDataStream& s ); public slots: - void addNewItem( const QString& type, const QString&, const OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); - void addService( const QString& name, const OMacAddress& macaddr, const QString& ip ); + void addNewItem( const QString& type, const QString&, const Opie::Net::OMacAddress&, bool, int, int, const GpsLocation&, bool = false ); + void addService( const QString& name, const Opie::Net::OMacAddress& macaddr, const QString& ip ); - void fromDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); - void toDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); - void WDStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& viaFrom, const OMacAddress& viaTo ); - void IBSStraffic( const OMacAddress& from, const OMacAddress& to, const OMacAddress& via ); + void fromDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); + void toDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); + void WDStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& viaFrom, const Opie::Net::OMacAddress& viaTo ); + void IBSStraffic( const Opie::Net::OMacAddress& from, const Opie::Net::OMacAddress& to, const Opie::Net::OMacAddress& via ); - void identify( const OMacAddress&, const QString& ipaddr ); + void identify( const Opie::Net::OMacAddress&, const QString& ipaddr ); void contextMenuRequested( QListViewItem* item, const QPoint&, int ); @@ -59,5 +59,5 @@ class MScanListView: public OListView protected: - void addIfNotExisting( MScanListItem* parent, const OMacAddress& addr, const QString& type = "station" ); + void addIfNotExisting( MScanListItem* parent, const Opie::Net::OMacAddress& addr, const QString& type = "station" ); }; @@ -65,5 +65,5 @@ class MScanListView: public OListView //****************************** MScanListItem **************************************************************** -class MScanListItem: public OListViewItem +class MScanListItem: public Opie::Ui::OListViewItem { public: @@ -107,5 +107,5 @@ class MScanListItem: public OListViewItem void setLocation( const QString& location ); - virtual OListViewItem* childFactory(); + virtual Opie::Ui::OListViewItem* childFactory(); virtual void serializeTo( QDataStream& s ) const; virtual void serializeFrom( QDataStream& s ); @@ -126,5 +126,5 @@ class MScanListItem: public OListViewItem /* -class MScanListViewFactory : public OListViewFactory +class MScanListViewFactory : public Opie::Ui::OListViewFactory { public: 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 @@ -17,4 +17,7 @@ #include <opie2/olistview.h> +using namespace Opie::Ui; +using namespace Opie::Ui; +using namespace Opie::Ui; MStatWindow::MStatWindow( QWidget * parent, const char * name, WFlags f ) :QVBox( parent, name, 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 @@ -20,5 +20,5 @@ class QString; -class OListView; +namespace Opie {namespace Ui {class Opie::Ui::OListView;}} class MStatWindow: public QVBox @@ -36,5 +36,5 @@ class MStatWindow: public QVBox protected: - OListView* table; + Opie::Ui::OListView* table; }; 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 @@ -62,4 +62,10 @@ using namespace Opie; #include <stdlib.h> +using namespace Opie::Core; +using namespace Opie::Net; +using namespace Opie::Net; +using namespace Opie::Core; +using namespace Opie::Net; +using namespace Opie::Core; Wellenreiter::Wellenreiter( QWidget* parent ) : WellenreiterBase( parent, 0, 0 ), @@ -447,5 +453,5 @@ void Wellenreiter::stopClicked() if ( iface ) { - disconnect( SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); + disconnect( SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); disconnect( SIGNAL( hopped(int) ), this, SLOT( channelHopped(int) ) ); iface->setChannelHopping(); // stop hopping channels @@ -612,5 +618,5 @@ void Wellenreiter::startClicked() { // connect socket notifier and start channel hopper - connect( pcap, SIGNAL( receivedPacket(OPacket*) ), this, SLOT( receivePacket(OPacket*) ) ); + connect( pcap, SIGNAL( receivedPacket(Opie::Net::OPacket*) ), this, SLOT( receivePacket(Opie::Net::OPacket*) ) ); 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 @@ -19,19 +19,19 @@ #ifdef QWS #include <opie2/odevice.h> -using namespace Opie; #endif class QTimerEvent; class QPixmap; -class OPacket; -class OWaveLanManagementPacket; -class OWaveLanControlPacket; -class OWaveLanDataPacket; -class OEthernetPacket; -class OARPPacket; -class OMacAddress; -class OIPPacket; -class OPacketCapturer; -class OWirelessNetworkInterface; +namespace Opie {namespace Net {class Opie::Net::OPacket;}} +namespace Opie {namespace Net {class Opie::Net::OWaveLanManagementPacket;}} +namespace Opie {namespace Net {class Opie::Net::OWaveLanControlPacket;}} +namespace Opie {namespace Net {class Opie::Net::OWaveLanDataPacket;}} +namespace Opie {namespace Net {class Opie::Net::OEthernetPacket;}} +namespace Opie {namespace Net {class Opie::Net::OARPPacket;}} +namespace Opie {namespace Net {class Opie::Net::OMacAddress;}} +namespace Opie {namespace Net {class Opie::Net::OIPPacket;}} +namespace Opie {namespace Net {class Opie::Net::OPacket;}} +namespace Opie {namespace Net {class Opie::Net::OWirelessNetworkInterface;}} +namespace Opie {namespace Net {class Opie::Net::OPacketCapturer;}} class PacketView; class WellenreiterConfigWindow; @@ -63,5 +63,5 @@ class Wellenreiter : public WellenreiterBase { void channelHopped(int); - void receivePacket(OPacket*); + void receivePacket(Opie::Net::OPacket*); void startClicked(); void stopClicked(); @@ -74,26 +74,26 @@ class Wellenreiter : public WellenreiterBase { private: - void handleManagementFrame( OPacket* p, OWaveLanManagementPacket* ); - void handleManagementFrameBeacon( OPacket* p, OWaveLanManagementPacket* ); - void handleManagementFrameProbeRequest( OPacket* p, OWaveLanManagementPacket* ); - void handleManagementFrameProbeResponse( OPacket* p, OWaveLanManagementPacket* ); - void handleControlFrame( OPacket* p, OWaveLanControlPacket* control ); - void handleWlanData( OPacket* p, OWaveLanDataPacket* data, OMacAddress& from, OMacAddress& to ); - void handleEthernetData( OPacket* p, OEthernetPacket* data, OMacAddress& from, OMacAddress& to ); - void handleARPData( OPacket* p, OARPPacket* arp, OMacAddress& from, OMacAddress& to ); - void handleIPData( OPacket* p, OIPPacket* ip, OMacAddress& from, OMacAddress& to ); - void handleNotification( OPacket* p ); - void doAction( const QString& action, const QString& protocol, OPacket* p ); - QObject* childIfToParse( OPacket* p, const QString& protocol ); - bool checkDumpPacket( OPacket* p ); + void handleManagementFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); + void handleManagementFrameBeacon( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); + void handleManagementFrameProbeRequest( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); + void handleManagementFrameProbeResponse( Opie::Net::OPacket* p, Opie::Net::OWaveLanManagementPacket* ); + void handleControlFrame( Opie::Net::OPacket* p, Opie::Net::OWaveLanControlPacket* control ); + void handleWlanData( Opie::Net::OPacket* p, Opie::Net::OWaveLanDataPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); + void handleEthernetData( Opie::Net::OPacket* p, Opie::Net::OEthernetPacket* data, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); + void handleARPData( Opie::Net::OPacket* p, Opie::Net::OARPPacket* arp, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); + void handleIPData( Opie::Net::OPacket* p, Opie::Net::OIPPacket* ip, Opie::Net::OMacAddress& from, Opie::Net::OMacAddress& to ); + void handleNotification( Opie::Net::OPacket* p ); + void doAction( const QString& action, const QString& protocol, Opie::Net::OPacket* p ); + QObject* childIfToParse( Opie::Net::OPacket* p, const QString& protocol ); + bool checkDumpPacket( Opie::Net::OPacket* p ); private: #ifdef QWS - OSystem _system; // Opie Operating System identifier + Opie::Core::OSystem _system; // Opie Operating System identifier #endif QString dumpname; - OWirelessNetworkInterface* iface; - OPacketCapturer* pcap; + Opie::Net::OWirelessNetworkInterface* iface; + Opie::Net::OPacketCapturer* pcap; WellenreiterConfigWindow* configwindow; GPS* gps; 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 @@ -39,4 +39,7 @@ using namespace Opie; * name 'name' and widget flags set to 'f' */ +using namespace Opie::Ui; +using namespace Opie::Ui; +using namespace Opie::Ui; WellenreiterBase::WellenreiterBase( QWidget* parent, const char* name, WFlags fl ) : QWidget( parent, name, 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 @@ -47,5 +47,5 @@ public: #ifdef QWS - OTabWidget* TabWidget; + Opie::Ui::OTabWidget* TabWidget; #else QTabWidget* TabWidget; |