-rw-r--r-- | noncore/applets/networkapplet/networkapplet.cpp | 7 | ||||
-rw-r--r-- | noncore/applets/networkapplet/networkapplet.h | 16 |
2 files changed, 14 insertions, 9 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 @@ -45,6 +45,8 @@ #include <assert.h> +using namespace Opie::Ui; +using namespace Opie::Net; IfaceUpDownButton::IfaceUpDownButton( QWidget* parent, const char* name ) :QToolButton( parent, name ) { @@ -246,9 +248,6 @@ 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 @@ -38,7 +38,13 @@ #include <qlineedit.h> #include <qpixmap.h> + +namespace Opie { +namespace Net { + class ONetwork; class ONetworkInterface; +} +} class QShowEvent; class QHideEvent; class QVBoxLayout; @@ -55,7 +61,7 @@ class IfaceUpDownButton : public QToolButton virtual void clicked(); private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; @@ -71,13 +77,13 @@ class IfaceIPAddress : public QLineEdit virtual void returnPressed(); private: - ONetworkInterface* _iface; + Opie::Net::ONetworkInterface* _iface; }; class NetworkAppletControl : public QFrame { public: - NetworkAppletControl( OTaskbarApplet* parent, const char* name = 0 ); + NetworkAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); ~NetworkAppletControl(); virtual QSize sizeHint() const; @@ -85,7 +91,7 @@ class NetworkAppletControl : public QFrame protected: virtual void showEvent( QShowEvent* ); virtual void hideEvent( QHideEvent* ); - QString guessDevice( ONetworkInterface* iface ); + QString guessDevice( Opie::Net::ONetworkInterface* iface ); void build(); private: @@ -94,7 +100,7 @@ class NetworkAppletControl : public QFrame }; -class NetworkApplet : public OTaskbarApplet +class NetworkApplet : public Opie::Ui::OTaskbarApplet { public: NetworkApplet( QWidget* parent = 0, const char* name = 0 ); |