summaryrefslogtreecommitdiffstats
path: root/networkstatus
diff options
context:
space:
mode:
Diffstat (limited to 'networkstatus')
-rw-r--r--networkstatus/connectionmanager.cpp2
-rw-r--r--networkstatus/connectionmanager.h2
-rw-r--r--networkstatus/networkstatus.cpp22
-rw-r--r--networkstatus/networkstatus.h2
-rw-r--r--networkstatus/networkstatus.tdevelop108
-rw-r--r--networkstatus/networkstatuscommon.cpp4
-rw-r--r--networkstatus/networkstatusindicator.cpp4
-rw-r--r--networkstatus/networkstatusindicator.h4
-rw-r--r--networkstatus/testservice.cpp8
-rw-r--r--networkstatus/testservice.h2
10 files changed, 20 insertions, 138 deletions
diff --git a/networkstatus/connectionmanager.cpp b/networkstatus/connectionmanager.cpp
index f36220886..81db4a121 100644
--- a/networkstatus/connectionmanager.cpp
+++ b/networkstatus/connectionmanager.cpp
@@ -44,7 +44,7 @@ ConnectionManager::ConnectionManager( TQObject * parent, const char * name ) : D
{
d = new ConnectionManagerPrivate;
- d->m_stub = new ClientIface_stub( kapp->dcopClient(), "kded", "networkstatus" );
+ d->m_stub = new ClientIface_stub( tdeApp->dcopClient(), "kded", "networkstatus" );
connectDCOPSignal( "kded", "networkstatus", "statusChange(TQString,int)", "slotStatusChanged(TQString,int)", false );
d->m_userInitiatedOnly = false;
diff --git a/networkstatus/connectionmanager.h b/networkstatus/connectionmanager.h
index 00ca4e35c..540fef443 100644
--- a/networkstatus/connectionmanager.h
+++ b/networkstatus/connectionmanager.h
@@ -24,7 +24,7 @@ class ConnectionManagerPrivate;
class ConnectionManager : public TQObject, virtual public DCOPObject
{
- Q_OBJECT
+ TQ_OBJECT
K_DCOP
public:
static ConnectionManager* self();
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();
diff --git a/networkstatus/networkstatus.h b/networkstatus/networkstatus.h
index 4ff615ef8..cd0ab42ae 100644
--- a/networkstatus/networkstatus.h
+++ b/networkstatus/networkstatus.h
@@ -34,7 +34,7 @@ struct NetworkStatusStruct;
class NetworkStatusModule : virtual public KDEDModule/*, public ClientIface, ServiceIface*/ // <-spot the multiple inheritance pb
{
-Q_OBJECT
+TQ_OBJECT
K_DCOP
public:
NetworkStatusModule( const TQCString & obj );
diff --git a/networkstatus/networkstatus.tdevelop b/networkstatus/networkstatus.tdevelop
deleted file mode 100644
index 543efe323..000000000
--- a/networkstatus/networkstatus.tdevelop
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version = '1.0'?>
-<tdevelop>
- <general>
- <author>Will Stephenson</author>
- <email>wstephenson@suse.de</email>
- <version>$VERSION$</version>
- <projectmanagement>KDevKDEAutoProject</projectmanagement>
- <primarylanguage>C++</primarylanguage>
- <keywords>
- <keyword>Qt</keyword>
- <keyword>KDE</keyword>
- </keywords>
- </general>
- <kdevfileview>
- <groups>
- <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
- <group pattern="*.ui" name="User Interface" />
- <group pattern="*.png" name="Icons" />
- <group pattern="*.po;*.ts" name="Translations" />
- <group pattern="*" name="Others" />
- <hidenonprojectfiles>false</hidenonprojectfiles>
- <hidenonlocation>false</hidenonlocation>
- </groups>
- <tree>
- <hidepatterns>*.o,*.lo,CVS</hidepatterns>
- <hidenonprojectfiles>false</hidenonprojectfiles>
- </tree>
- </kdevfileview>
- <kdevdoctreeview>
- <ignoretocs>
- <toc>ada</toc>
- <toc>ada_bugs_gcc</toc>
- <toc>bash</toc>
- <toc>bash_bugs</toc>
- <toc>clanlib</toc>
- <toc>fortran_bugs_gcc</toc>
- <toc>gnome1</toc>
- <toc>gnustep</toc>
- <toc>gtk</toc>
- <toc>gtk_bugs</toc>
- <toc>haskell</toc>
- <toc>haskell_bugs_ghc</toc>
- <toc>java_bugs_gcc</toc>
- <toc>java_bugs_sun</toc>
- <toc>opengl</toc>
- <toc>pascal_bugs_fp</toc>
- <toc>php</toc>
- <toc>php_bugs</toc>
- <toc>perl</toc>
- <toc>perl_bugs</toc>
- <toc>python</toc>
- <toc>python_bugs</toc>
- <toc>ruby</toc>
- <toc>ruby_bugs</toc>
- <toc>sdl</toc>
- <toc>stl</toc>
- <toc>sw</toc>
- <toc>w3c-dom-level2-html</toc>
- <toc>w3c-svg</toc>
- <toc>w3c-uaag10</toc>
- <toc>wxwidgets_bugs</toc>
- </ignoretocs>
- <ignoreqt_xml>
- <toc>qmake User Guide</toc>
- </ignoreqt_xml>
- </kdevdoctreeview>
- <kdevdebugger>
- <general>
- <dbgshell>libtool</dbgshell>
- </general>
- </kdevdebugger>
- <kdevfilecreate>
- <useglobaltypes>
- <type ext="ui" />
- <type ext="cpp" />
- <type ext="h" />
- </useglobaltypes>
- </kdevfilecreate>
- <kdevautoproject>
- <make>
- <envvars>
- <envvar value="1" name="WANT_AUTOCONF_2_5" />
- <envvar value="1" name="WANT_AUTOMAKE_1_6" />
- </envvars>
- </make>
- <run>
- <directoryradio>executable</directoryradio>
- </run>
- <general>
- <activetarget>kded_networkstatus.la</activetarget>
- </general>
- </kdevautoproject>
- <kdevcppsupport>
- <references/>
- <codecompletion>
- <includeGlobalFunctions>true</includeGlobalFunctions>
- <includeTypes>true</includeTypes>
- <includeEnums>true</includeEnums>
- <includeTypedefs>false</includeTypedefs>
- <automaticCodeCompletion>true</automaticCodeCompletion>
- <automaticArgumentsHint>true</automaticArgumentsHint>
- <automaticHeaderCompletion>true</automaticHeaderCompletion>
- <codeCompletionDelay>250</codeCompletionDelay>
- <argumentsHintDelay>400</argumentsHintDelay>
- <headerCompletionDelay>250</headerCompletionDelay>
- </codecompletion>
- </kdevcppsupport>
-</tdevelop>
diff --git a/networkstatus/networkstatuscommon.cpp b/networkstatus/networkstatuscommon.cpp
index b2a8cc8f1..0b7df6151 100644
--- a/networkstatus/networkstatuscommon.cpp
+++ b/networkstatus/networkstatuscommon.cpp
@@ -22,7 +22,7 @@
#include "networkstatuscommon.h"
#include <kdebug.h>
-KDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
+TDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Properties p )
{
kdDebug() << k_funcinfo << "status is: " << (int)p.status << endl;
s << (int)p.status;
@@ -33,7 +33,7 @@ KDE_EXPORT TQDataStream & operator<< ( TQDataStream & s, const NetworkStatus::Pr
return s;
}
-KDE_EXPORT TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p )
+TDE_EXPORT TQDataStream & operator>> ( TQDataStream & s, NetworkStatus::Properties &p )
{
int status, onDemandPolicy, internet;
s >> status;
diff --git a/networkstatus/networkstatusindicator.cpp b/networkstatus/networkstatusindicator.cpp
index a77f1c1fd..92613626d 100644
--- a/networkstatus/networkstatusindicator.cpp
+++ b/networkstatus/networkstatusindicator.cpp
@@ -38,8 +38,8 @@ StatusBarNetworkStatusIndicator::StatusBarNetworkStatusIndicator(
label->setPixmap( SmallIcon("connect_no") );
TQToolTip::add( label, i18n( "The desktop is offline" ) );
- connect( ConnectionManager::self(), TQT_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ),
- TQT_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) );
+ connect( ConnectionManager::self(), TQ_SIGNAL( statusChanged( const TQString &, NetworkStatus::EnumStatus ) ),
+ TQ_SLOT( networkStatusChanged( const TQString &, NetworkStatus::EnumStatus) ) );
}
diff --git a/networkstatus/networkstatusindicator.h b/networkstatus/networkstatusindicator.h
index f1cfa966a..e7778027e 100644
--- a/networkstatus/networkstatusindicator.h
+++ b/networkstatus/networkstatusindicator.h
@@ -24,12 +24,12 @@
#define KDE_NETWORKSTATUS_INDICATOR_H
#include <tqhbox.h>
-#include <kdemacros.h>
+#include <tdemacros.h>
#include <networkstatuscommon.h>
class StatusBarNetworkStatusIndicator : public TQHBox
{
-Q_OBJECT
+TQ_OBJECT
public:
StatusBarNetworkStatusIndicator( TQWidget * parent, const char * name );
virtual ~StatusBarNetworkStatusIndicator();
diff --git a/networkstatus/testservice.cpp b/networkstatus/testservice.cpp
index 6f713cf29..3af65d143 100644
--- a/networkstatus/testservice.cpp
+++ b/networkstatus/testservice.cpp
@@ -29,14 +29,14 @@
TestService::TestService() : TQObject(), DCOPObject("ProviderIface")
{
- kapp->dcopClient()->registerAs("testservice" );
+ tdeApp->dcopClient()->registerAs("testservice" );
m_service = new ServiceIface_stub( "kded", "networkstatus" );
m_status = NetworkStatus::Offline;
NetworkStatus::Properties nsp;
nsp.internet = true;
nsp.name = "test_net";
nsp.onDemandPolicy = NetworkStatus::All;
- nsp.service = kapp->dcopClient()->appId();
+ nsp.service = tdeApp->dcopClient()->appId();
nsp.status = m_status;
m_service->registerNetwork( "test_net", nsp );
}
@@ -58,7 +58,7 @@ int TestService::establish( const TQString & network )
m_status = NetworkStatus::Establishing;
m_service->setNetworkStatus( "test_net", (int)m_status );
m_nextStatus = NetworkStatus::Online;
- TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+ TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) );
return (int)NetworkStatus::RequestAccepted;
}
@@ -68,7 +68,7 @@ int TestService::shutdown( const TQString & network )
m_status = NetworkStatus::ShuttingDown;
m_service->setNetworkStatus( "test_net", (int)m_status );
m_nextStatus = NetworkStatus::Offline;
- TQTimer::singleShot( 5000, this, TQT_SLOT( slotStatusChange() ) );
+ TQTimer::singleShot( 5000, this, TQ_SLOT( slotStatusChange() ) );
return (int)NetworkStatus::RequestAccepted;
}
diff --git a/networkstatus/testservice.h b/networkstatus/testservice.h
index 9a7ef127d..e893ec6ea 100644
--- a/networkstatus/testservice.h
+++ b/networkstatus/testservice.h
@@ -29,7 +29,7 @@ class ServiceIface_stub;
class TestService : virtual public TQObject, ProviderIface
{
-Q_OBJECT
+TQ_OBJECT
public:
TestService();
virtual ~TestService();
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-15 13:12:46 +0000