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

1 files changed, 6 insertions, 5 deletions

diff --git a/kopete/libkopete/connectionmanager.h b/kopete/libkopete/connectionmanager.h
index 63217183..b0f1c05b 100644
--- a/kopete/libkopete/connectionmanager.h
+++ b/kopete/libkopete/connectionmanager.h
@@ -26,30 +26,31 @@ class ConnectionManagerPrivate;
 class KOPETE_EXPORT ConnectionManager : public TQObject, virtual public DCOPObject
 {
 	Q_OBJECT
+//	TQ_OBJECT
 	K_DCOP
 	public:
 		static ConnectionManager* self();
 		enum State { Inactive, Online, Offline, Pending };
 		virtual ~ConnectionManager();
-		NetworkStatus::EnumStatus status( const TQString & host );
+		NetworktqStatus::EnumtqStatus status( const TQString & host );
 			// check if a hostname is available.  Ask user if offline.  Request host
-		NetworkStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated );
+		NetworktqStatus::EnumRequestResult requestConnection( TQWidget* mainWidget, const TQString & host, bool userInitiated );
 			// method to relinquish a connection
 		void relinquishConnection( const TQString & host );
 	signals:
 		// signal that the network for a hostname is up/down
-		void statusChanged( const TQString & host, NetworkStatus::EnumStatus status );
+		void statusChanged( const TQString & host, NetworktqStatus::EnumtqStatus status );
 	protected:
 		// sets up internal state
 		void initialise();
 		// reread the desktop status from the daemon and update internal state
-		void updateStatus();
+		void updatetqStatus();
 			// ask if the user would like to reconnect
 		bool askToConnect( TQWidget * mainWidget );
 	k_dcop:
 			void slotStatusChanged( TQString host, int status );
 	private:
-		ConnectionManager( TQObject *parent, const char * name );
+		ConnectionManager( TQObject *tqparent, const char * name );
 		ConnectionManagerPrivate *d;
 		static ConnectionManager * s_self;
 };