Diffstat (limited to 'noncore/applets/networkapplet') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 7 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 18 |
2 files changed, 15 insertions, 10 deletions
diff --git a/noncore/applets/networkapplet/networkapplet.cpp b/noncore/applets/networkapplet/networkapplet.cpp index 955ed2e..5eb5ad2 100644 --- a/noncore/applets/networkapplet/networkapplet.cpp +++ b/noncore/applets/networkapplet/networkapplet.cpp @@ -47,2 +47,4 @@ +using namespace Opie::Ui; +using namespace Opie::Net; IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) @@ -248,7 +250,4 @@ void NetworkApplet::mousePressEvent( QMouseEvent* ) +EXPORT_OPIE_APPLET_v1( NetworkApplet ) -Q_EXPORT_INTERFACE() -{ - Q_CREATE_INSTANCE( OTaskbarAppletWrapper<NetworkApplet> ); -} diff --git a/noncore/applets/networkapplet/networkapplet.h b/noncore/applets/networkapplet/networkapplet.h index 8022537..1e2cac8 100644 --- a/noncore/applets/networkapplet/networkapplet.h +++ b/noncore/applets/networkapplet/networkapplet.h @@ -40,3 +40,9 @@ -class ONetworkInterface; + +namespace Opie { +namespace Net { + class ONetwork; + class ONetworkInterface; +} +} class QShowEvent; @@ -57,3 +63,3 @@ class IfaceUpDownButton : public QToolButton private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; @@ -73,3 +79,3 @@ class IfaceIPAddress : public QLineEdit private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; @@ -79,3 +85,3 @@ class NetworkAppletControl : public QFrame public: - NetworkAppletControl( OTaskbarApplet* parent, const char* name = 0 ); + NetworkAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); ~NetworkAppletControl(); @@ -87,3 +93,3 @@ class NetworkAppletControl : public QFrame virtual void hideEvent( QHideEvent* ); - QString guessDevice( ONetworkInterface* iface ); + QString guessDevice( Opie::Net::ONetworkInterface* iface ); void build(); @@ -96,3 +102,3 @@ class NetworkAppletControl : public QFrame -class NetworkApplet : public OTaskbarApplet +class NetworkApplet : public Opie::Ui::OTaskbarApplet { |