Rename old tq methods that no longer need a unique name

11 files changed, 41 insertions, 41 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 4110c213..f4728172 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -81,7 +81,7 @@ KviDccZeroPortTag * KviDccBroker::addZeroPortTag()
 	static unsigned int g_uNextZeroPortTag = 0;
 	g_uNextZeroPortTag++;
 	KviDccZeroPortTag * t = new KviDccZeroPortTag;
-	t->m_tTimestamp = TQDateTime::tqcurrentDateTime();
+	t->m_tTimestamp = TQDateTime::currentDateTime();
 	t->m_szTag.setNum(g_uNextZeroPortTag);
 	//t->m_szTag.prepend("mIrc-zero-port-");
 	t->m_uResumePosition = 0;
@@ -94,7 +94,7 @@ KviDccZeroPortTag * KviDccBroker::findZeroPortTag(const TQString &szTag)
 {
 	KviDccZeroPortTag * t = m_pZeroPortTags->find(szTag);
 	if(!t)return 0;
-	if(t->m_tTimestamp.secsTo(TQDateTime::tqcurrentDateTime()) > 180)
+	if(t->m_tTimestamp.secsTo(TQDateTime::currentDateTime()) > 180)
 	{
 		// too late man...
 		m_pZeroPortTags->remove(szTag);
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 6b5f6872..cea1b918 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -258,16 +258,16 @@ bool KviDccCanvas::event(TQEvent *e)
 void KviDccCanvas::resizeEvent(TQResizeEvent *e)
 {
 	int hght = m_pInput->heightHint();
-//	int hght2 = m_pTopSplitter->tqsizeHint().height();
+//	int hght2 = m_pTopSplitter->sizeHint().height();
 //	m_pTopSplitter->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,0,width(),height() - hght);
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-TQSize KviDccCanvas::tqsizeHint() const
+TQSize KviDccCanvas::sizeHint() const
 {
-	TQSize ret(m_pIrcView->tqsizeHint().width(),
-		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pIrcView->sizeHint().width(),
+		m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 38349cae..6c481255 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -61,7 +61,7 @@ protected:
 	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual TQPixmap * myIconPtr();
 	virtual void resizeEvent(TQResizeEvent *e);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual bool event(TQEvent *e);
 	virtual void ownMessage(const char *text);
 	virtual void ownAction(const char *text);
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index e007a3cb..47bacf5b 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1540,9 +1540,9 @@ KviCanvasWidget::~KviCanvasWidget()
 
 void KviCanvasWidget::resizeEvent(TQResizeEvent *)
 {
-	int h = m_pMenuBar->tqsizeHint().height();
+	int h = m_pMenuBar->sizeHint().height();
 	m_pMenuBar->setGeometry(0,0,width(),h);
-	int h2 = m_pStatusLabel->tqsizeHint().height();
+	int h2 = m_pStatusLabel->sizeHint().height();
 	m_pStatusLabel->setGeometry(0,height() - h2,width(),h2);
 	m_pSplitter->setGeometry(0,h,width(),height() - (h + h2));
 }
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 7e41034b..660191fe 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -473,16 +473,16 @@ bool KviDccChat::event(TQEvent *e)
 void KviDccChat::resizeEvent(TQResizeEvent *e)
 {
 	int hght = m_pInput->heightHint();
-	int hght2 = m_pTopSplitter->tqsizeHint().height();
+	int hght2 = m_pTopSplitter->sizeHint().height();
 	m_pTopSplitter->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
 	m_pInput->setGeometry(0,height() - hght,width(),hght);
 }
 
-TQSize KviDccChat::tqsizeHint() const
+TQSize KviDccChat::sizeHint() const
 {
-	TQSize ret(m_pIrcView->tqsizeHint().width(),
-		m_pIrcView->tqsizeHint().height() + m_pInput->heightHint());
+	TQSize ret(m_pIrcView->sizeHint().width(),
+		m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
 
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index c2785915..bf492b3a 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -81,7 +81,7 @@ protected:
 	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual TQPixmap * myIconPtr();
 	virtual void resizeEvent(TQResizeEvent *e);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual const TQString & localNick();
 	virtual bool event(TQEvent *e);
 	virtual void ownMessage(const TQString &text);
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index ce6949f2..56f28b3d 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2369,16 +2369,16 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 
 
 /*
-	@doc: dcc.transfertqStatus
+	@doc: dcc.transferStatus
 	@type:
 		function
 	@title:
-		$dcc.transfertqStatus
+		$dcc.transferStatus
 	@short:
 		Returns the current status of a dcc file transfer
 	@syntax:
-		<string> $dcc.transfertqStatus
-		<string> $dcc.transfertqStatus(<dcc_id:uint>)
+		<string> $dcc.transferStatus
+		<string> $dcc.transferStatus(<dcc_id:uint>)
 	@description:
 		Returns the status in the specified DCC session.[br]
 		The status is one of the strings "connecting", "transferring", "success" and "failure".
@@ -2393,7 +2393,7 @@ static bool dcc_kvs_fnc_ircContext(KviKvsModuleFunctionCall * c)
 		See the [module:dcc]dcc module[/module] documentation for more informations.[br]
 */
 
-static bool dcc_kvs_fnc_transfertqStatus(KviKvsModuleFunctionCall * c)
+static bool dcc_kvs_fnc_transferStatus(KviKvsModuleFunctionCall * c)
 {
 	kvs_uint_t uDccId;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -2669,7 +2669,7 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 		[fnc]$dcc.sessionList[/fnc][br]
 		[fnc]$dcc.protocol[/fnc][br]
 		[fnc]$dcc.connectionType[/fnc][br]
-		[fnc]$dcc.transfertqStatus[/fnc][br]
+		[fnc]$dcc.transferStatus[/fnc][br]
 		[fnc]$dcc.isFileTransfer[/fnc][br]
 		[fnc]$dcc.isFileUpload[/fnc][br]
 		[fnc]$dcc.isFileDownload[/fnc][br]
@@ -2708,7 +2708,7 @@ static bool dcc_module_init(KviModule * m)
 
 	// FIXME: file upload / download state ?
 
-	KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transfertqStatus);
+	KVSM_REGISTER_FUNCTION(m,"transferStatus",dcc_kvs_fnc_transferStatus);
 	KVSM_REGISTER_FUNCTION(m,"protocol",dcc_kvs_fnc_protocol);
 	KVSM_REGISTER_FUNCTION(m,"connectionType",dcc_kvs_fnc_connectionType);
 	KVSM_REGISTER_FUNCTION(m,"isFileTransfer",dcc_kvs_fnc_isFileTransfer);
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index a7485ca2..969a54aa 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -753,7 +753,7 @@ KviDccFileTransfer::KviDccFileTransfer(KviDccDescriptor * dcc)
 	m_tTransferEndTime = 0;
 
 	m_szStatusString = __tr2qs_ctx("Setting up the connection","dcc");
-	m_eGeneraltqStatus = Connecting;
+	m_eGeneralStatus = Connecting;
 
 	bool bOk;
 	m_uTotalFileSize = dcc->bRecvFile ? dcc->szFileSize.toUInt(&bOk) :  dcc->szLocalFileSize.toUInt(&bOk);
@@ -919,7 +919,7 @@ void KviDccFileTransfer::abort()
 	else if(m_pSlaveSendThread)tmp.setNum(m_pSlaveSendThread->sentBytes());
 	else tmp = '0';
 
-	m_eGeneraltqStatus = Failure;
+	m_eGeneralStatus = Failure;
 	m_tTransferEndTime = kvi_unixTime();
 	m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
 	m_szStatusString += __tr2qs_ctx("Aborted","dcc");
@@ -988,7 +988,7 @@ void KviDccFileTransfer::retryRevDCC()
 
 void KviDccFileTransfer::fillStatusString(TQString &szBuffer)
 {
-	switch(m_eGeneraltqStatus)
+	switch(m_eGeneralStatus)
 	{
 		case Connecting:
 			szBuffer = "connecting";
@@ -1010,7 +1010,7 @@ void KviDccFileTransfer::fillStatusString(TQString &szBuffer)
 
 bool KviDccFileTransfer::active()
 {
-	return ((m_eGeneraltqStatus == Connecting) || (m_eGeneraltqStatus == Transferring));
+	return ((m_eGeneralStatus == Connecting) || (m_eGeneralStatus == Transferring));
 }
 
 int KviDccFileTransfer::bandwidthLimit()
@@ -1108,7 +1108,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei
 {
 
 	TQString txt;
-	bool bIsTerminated = ((m_eGeneraltqStatus == Success) || (m_eGeneraltqStatus == Failure));
+	bool bIsTerminated = ((m_eGeneralStatus == Success) || (m_eGeneralStatus == Failure));
 
 	switch(column)
 	{
@@ -1117,7 +1117,7 @@ void KviDccFileTransfer::displayPaint(TQPainter * p,int column,int width,int hei
 			int xoffset = 0;
 			int yoffset = 0;
 			if(m_pDescriptor->bRecvFile)yoffset = 64;
-			switch(m_eGeneraltqStatus)
+			switch(m_eGeneralStatus)
 			{
 				case Connecting: xoffset = 0; break;
 				case Transferring: xoffset = 48; break;
@@ -1396,7 +1396,7 @@ KviDccFileTransfer * KviDccFileTransfer::nonFailedTransferWithLocalFileName(cons
 		if(t->localFileName() == szLocalFileName)
 #endif
 		{
-			if(t->m_eGeneraltqStatus != Failure)
+			if(t->m_eGeneralStatus != Failure)
 				return t;
 		}
 	}
@@ -1456,7 +1456,7 @@ void KviDccFileTransfer::outputAndLog(int msgtype,const TQString &s)
 
 void KviDccFileTransfer::addToTransferLog(const TQString &s)
 {
-	TQDateTime dt = TQDateTime::tqcurrentDateTime();
+	TQDateTime dt = TQDateTime::currentDateTime();
 	TQString ts;
 	ts.sprintf("[%4d.%2d.%2d %2d:%2d:%2d] ",dt.date().year(),dt.date().month(),dt.date().day(),dt.time().hour(),dt.time().minute(),dt.time().second());
 	m_szTransferLog += ts+s;
@@ -1602,7 +1602,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
 
 				m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
 				m_szStatusString += szErrorString;
-				m_eGeneraltqStatus = Failure;
+				m_eGeneralStatus = Failure;
 				m_tTransferEndTime = kvi_unixTime();
 
 				KVS_TRIGGER_EVENT_3(KviEvent_OnDCCFileTransferFailed,
@@ -1642,7 +1642,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
 				if(m_pDescriptor->bRecvFile)g_pApp->fileDownloadTerminated(true,m_pDescriptor->szFileName.utf8().data(),m_pDescriptor->szLocalFileName.utf8().data(),m_pDescriptor->szNick.utf8().data());
 				m_szStatusString = __tr2qs_ctx("Transfer completed","dcc");
 				outputAndLog(m_szStatusString);
-				m_eGeneraltqStatus = Success;
+				m_eGeneralStatus = Success;
 				m_tTransferEndTime = kvi_unixTime();
 
 				KVS_TRIGGER_EVENT_2(KviEvent_OnDCCFileTransferSuccess,
@@ -1677,7 +1677,7 @@ bool KviDccFileTransfer::event(TQEvent *e)
 void KviDccFileTransfer::handleMarshalError(int err)
 {
 	TQString szErr = KviError::getDescription(err);
-	m_eGeneraltqStatus = Failure;
+	m_eGeneralStatus = Failure;
 	m_szStatusString = __tr2qs_ctx("Transfer failed: ","dcc");
 	m_szStatusString += szErr;
 	outputAndLog(m_szStatusString);
@@ -1731,7 +1731,7 @@ void KviDccFileTransfer::connected()
 		m_pSlaveSendThread->start();
 	}
 
-	m_eGeneraltqStatus = Transferring;
+	m_eGeneralStatus = Transferring;
 	m_szStatusString = __tr2qs_ctx("Transferring data","dcc");
 
 	KVS_TRIGGER_EVENT_1(KviEvent_OnDCCFileTransferBegin,eventWindow(),m_pDescriptor->idString());
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index a5e80be9..8b03306b 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -173,7 +173,7 @@ class KviTalPopupMenu;
 
 class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
 {
-	enum GeneraltqStatus { Connecting , Transferring , Success , Failure };
+	enum GeneralStatus { Connecting , Transferring , Success , Failure };
 	Q_OBJECT
   TQ_OBJECT
 public:
@@ -190,7 +190,7 @@ private:
 	TQString                  m_szTransferIdString;
 
 	TQString                  m_szStatusString;
-	GeneraltqStatus            m_eGeneraltqStatus;
+	GeneralStatus            m_eGeneralStatus;
 
 	TQString                  m_szTransferLog; // html
 
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index e9d8a2a6..deec4452 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -886,16 +886,16 @@ void KviDccVoice::updateInfo()
 
 void KviDccVoice::resizeEvent(TQResizeEvent *e)
 {
-	int hght2 = m_pHBox->tqsizeHint().height();
+	int hght2 = m_pHBox->sizeHint().height();
 	m_pHBox->setGeometry(0,0,width(),hght2);
 	m_pSplitter->setGeometry(0,hght2,width(),height() - hght2);
 }
 
-TQSize KviDccVoice::tqsizeHint() const
+TQSize KviDccVoice::sizeHint() const
 {
-	int w = m_pIrcView->tqsizeHint().width();
-	int w2 = m_pHBox->tqsizeHint().width();
-	TQSize ret(w > w2 ? w : w2, m_pIrcView->tqsizeHint().height() + m_pHBox->tqsizeHint().height());
+	int w = m_pIrcView->sizeHint().width();
+	int w2 = m_pHBox->sizeHint().width();
+	TQSize ret(w > w2 ? w : w2, m_pIrcView->sizeHint().height() + m_pHBox->sizeHint().height());
 	return ret;
 }
 
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index c241f4a1..49899602 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -124,7 +124,7 @@ protected:
 	virtual void fillCaptionBuffers();
 	virtual TQPixmap * myIconPtr();
 	virtual void resizeEvent(TQResizeEvent *e);
-	virtual TQSize tqsizeHint() const;
+	virtual TQSize sizeHint() const;
 	virtual bool event(TQEvent *e);
 	virtual void getBaseLogFileName(KviStr &buffer);
 	void startTalking();