diff options
Diffstat (limited to 'networkstatus/networkstatus.cpp')
| -rw-r--r-- | networkstatus/networkstatus.cpp | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/networkstatus/networkstatus.cpp b/networkstatus/networkstatus.cpp index 41bff9edb..8f8e1969c 100644 --- a/networkstatus/networkstatus.cpp +++ b/networkstatus/networkstatus.cpp @@ -34,20 +34,10 @@ #include "network.h" #include <tdeversion.h> -#include <kdemacros.h> - -#if KDE_IS_VERSION( 3,3,90 ) -/* life is great */ -#else -/* workaround typo that breaks compilation with newer gcc */ -#undef KDE_EXPORT -#define KDE_EXPORT -#undef KDE_NO_EXPORT -#define KDE_NO_EXPORT -#endif +#include <tdemacros.h> extern "C" { - KDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj ) + TDE_EXPORT KDEDModule* create_networkstatus( const TQCString& obj ) { return new NetworkStatusModule( obj ); } @@ -73,8 +63,8 @@ NetworkStatusModule::NetworkStatusModule( const TQCString & obj ) : KDEDModule( d = new Private; /* d->clientIface = new ClientIfaceImpl( this ); d->serviceIface = new ServiceIfaceImpl( this );*/ - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); - connect( kapp->dcopClient(), TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) ); + connect( tdeApp->dcopClient(), TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) ); } NetworkStatusModule::~NetworkStatusModule() @@ -122,7 +112,7 @@ int NetworkStatusModule::request( const TQString & host, bool userInitiated ) return NetworkStatus::Unavailable; NetworkStatus::EnumStatus status = p->status(); - TQCString appId = kapp->dcopClient()->senderId(); + TQCString appId = tdeApp->dcopClient()->senderId(); if ( status == NetworkStatus::Online ) { p->registerUsage( appId, host ); @@ -171,7 +161,7 @@ int NetworkStatusModule::request( const TQString & host, bool userInitiated ) void NetworkStatusModule::relinquish( const TQString & host ) { - TQCString appId = kapp->dcopClient()->senderId(); + TQCString appId = tdeApp->dcopClient()->senderId(); // find network currently used by app for host... NetworkList::iterator end = d->networks.end(); NetworkList::iterator it = d->networks.begin(); |