TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

2 files changed, 13 insertions, 12 deletions

diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
index 33f4e3dd..a35a4cf4 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.cpp
@@ -28,15 +28,15 @@
 typedef KGenericFactory<ConnectionStatusPlugin> ConnectionStatusPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_connectionstatus, ConnectionStatusPluginFactory( "kopete_connectionstatus" )  )
 
-ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList& /* args */ )
-: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), parent, name )
+ConnectionStatusPlugin::ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList& /* args */ )
+: Kopete::Plugin( ConnectionStatusPluginFactory::instance(), tqparent, name )
 {
 	kdDebug( 14301 ) << k_funcinfo << endl;
 
 	m_process = 0L;
 
 	m_timer = new TQTimer();
-	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotCheckStatus() ) );
+	connect( m_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( slotChecktqStatus() ) );
 	m_timer->start( 60000 );
 
 	m_pluginConnected = false;
@@ -49,7 +49,7 @@ ConnectionStatusPlugin::~ConnectionStatusPlugin()
 	delete m_process;
 }
 
-void ConnectionStatusPlugin::slotCheckStatus()
+void ConnectionStatusPlugin::slotChecktqStatus()
 {
 	kdDebug( 14301 ) << k_funcinfo << endl;
 
@@ -61,7 +61,7 @@ void ConnectionStatusPlugin::slotCheckStatus()
 		return;
 	}
 
-	m_buffer = TQString::null;
+	m_buffer = TQString();
 	
 	// Use KProcess to run netstat -rn. We'll then parse the output of
 	// netstat -rn in slotProcessStdout() to see if it mentions the
@@ -87,8 +87,8 @@ void ConnectionStatusPlugin::slotProcessExited( KProcess *process )
 
 	if ( process == m_process )
 	{
-		setConnectedStatus( m_buffer.contains( "default" ) );
-		m_buffer = TQString::null;
+		setConnectedtqStatus( m_buffer.tqcontains( "default" ) );
+		m_buffer = TQString();
 		delete m_process;
 		m_process = 0L;
 	}
@@ -98,11 +98,11 @@ void ConnectionStatusPlugin::slotProcessStdout( KProcess *, char *buffer, int bu
 {
 	// Look for a default gateway
 	//kdDebug( 14301 ) << k_funcinfo << endl;
-	m_buffer += TQString::fromLatin1( buffer, buflen );
+	m_buffer += TQString::tqfromLatin1( buffer, buflen );
 	//kdDebug( 14301 ) << qsBuffer << endl;
 }
 
-void ConnectionStatusPlugin::setConnectedStatus( bool connected )
+void ConnectionStatusPlugin::setConnectedtqStatus( bool connected )
 {
 	//kdDebug( 14301 ) << k_funcinfo << endl;
 
diff --git a/kopete/plugins/connectionstatus/connectionstatusplugin.h b/kopete/plugins/connectionstatus/connectionstatusplugin.h
index 56f662ab..50148b0a 100644
--- a/kopete/plugins/connectionstatus/connectionstatusplugin.h
+++ b/kopete/plugins/connectionstatus/connectionstatusplugin.h
@@ -29,13 +29,14 @@ class KProcess;
 class ConnectionStatusPlugin : public Kopete::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	ConnectionStatusPlugin( TQObject *parent, const char *name, const TQStringList &args );
+	ConnectionStatusPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
 	~ConnectionStatusPlugin();
 
 private slots:
-	void slotCheckStatus();
+	void slotChecktqStatus();
 	void slotProcessStdout( KProcess *process, char *buffer, int len );
 
 	/**
@@ -44,7 +45,7 @@ private slots:
 	void slotProcessExited( KProcess *process );
 
 private:
-	void setConnectedStatus( bool newStatus );
+	void setConnectedtqStatus( bool newtqStatus );
 
 	bool m_pluginConnected;
 	KProcess *m_process;