From c5f09a8e4a9970c8c1fceeca2801101683fd46e2 Mon Sep 17 00:00:00 2001
From: Fabio Bas
Date: Sat, 11 Oct 2008 19:57:04 +0000
Subject: fix

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@2704 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/objects/class_socket.cpp | 7 +++----
 src/modules/objects/class_socket.h   | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/modules')

diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 0efabf88e..8556bed0c 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -284,10 +284,9 @@ KVSO_BEGIN_REGISTERCLASS(KviKvsObject_socket,"socket","object")
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,remoteIp)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localIp)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,localPort)
-/*	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect)
+	KVSO_REGISTER_HANDLER(KviKvsObject_socket,"connect",functionConnect)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,connectTimeout)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,setConnectTimeout)
-*/
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,close)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,read)
 	KVSO_REGISTER_HANDLER_NEW(KviKvsObject_socket,readHex)
@@ -1006,7 +1005,7 @@ debug ("Socket created");
 	}
 	debug ("Socket connected");
 	m_pDelayTimer = new QTimer();
-	connect(m_pDelayTimer,SIGNAL(timeout()),this,SLOT(connectTimeout()));
+	connect(m_pDelayTimer,SIGNAL(timeout()),this,SLOT(connectTimeoutSlot()));
 	m_pDelayTimer->setInterval(m_uConnectTimeout);
 	m_pDelayTimer->setSingleShot(true);
 	m_pDelayTimer->start();
@@ -1016,7 +1015,7 @@ debug ("Socket created");
 	m_pSn->setEnabled(true);
 }
 
-void KviKvsObject_socket::connectTimeout()
+void KviKvsObject_socket::connectTimeoutSlot()
 {
 	unsigned int uOldConnectionId = m_uConnectionId;
 
diff --git a/src/modules/objects/class_socket.h b/src/modules/objects/class_socket.h
index 950305209..b59fce6b1 100644
--- a/src/modules/objects/class_socket.h
+++ b/src/modules/objects/class_socket.h
@@ -105,7 +105,7 @@ protected slots:
 	void doConnect();
 	void lookupRemoteIp();
 	void lookupDone(KviDns * pDns);
-	void connectTimeout();
+	void connectTimeoutSlot();
 	void writeNotifierFired(int);
 	void readNotifierFired(int);
 	void tryFlush();
-- 
cgit v1.3.1-10-gc9f91