rename the following methods:

tqparent parent
tqmask mask


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

6 files changed, 18 insertions, 18 deletions

diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 09778d7..7e41034 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -714,7 +714,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 				kvi_free(data->buffer);
 				data->buffer = end = aux = 0;
 			}
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		} else aux++;
 //		debug("PASSING CHAR %c",*aux);
 	}
@@ -732,7 +732,7 @@ bool KviDccChatThread::handleIncomingData(KviDccThreadIncomingData * data,bool b
 			data->iLen = 0;
 			kvi_free(data->buffer);
 			data->buffer = 0;
-			postEvent(tqparent(),e);
+			postEvent(parent(),e);
 		}
 	}
 	return true;
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 3cb5a7c..93274b4 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -862,7 +862,7 @@ static bool dcc_kvs_cmd_recv(KviKvsModuleCommandCall * c)
 		The remote end may acknowledge the request by sending a DCC RECV request.
 		This command effects are similar to [cmd]dcc.send[/cmd], but will work also on machines
 		that can't accept incoming connections (firewalling or masquerading problems).[br]
-		A 120 seconds file offer is added for the specified file and tqmask "<nickname>!*@*".
+		A 120 seconds file offer is added for the specified file and mask "<nickname>!*@*".
 	@examples:
 
 */
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 4eed239..00a1d1e 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -878,7 +878,7 @@ static void dccModuleParseDccGet(KviDccRequest *dcc)
 			// now add a file offer , so he we will accept it automatically
 			// 120 secs is a reasonable timeout
 			TQString szMask;
-			dcc->ctcpMsg->pSource->tqmask(szMask,KviIrcMask::NickUserHost);
+			dcc->ctcpMsg->pSource->mask(szMask,KviIrcMask::NickUserHost);
 
 			KviSharedFile * pOld = o;
 			o = g_pSharedFilesManager->addSharedFile(szFileName,o->absFilePath(),szMask,120);
@@ -1081,7 +1081,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 
 static void dccModuleParseDccList(KviDccRequest *dcc)
 {
-	// DCC LIST <tqmask> <ipaddr> <port>
+	// DCC LIST <mask> <ipaddr> <port>
 	// FIXME!
 }
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 7458611..a7485ca 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -158,7 +158,7 @@ void KviDccRecvThread::postMessageEvent(const char * m)
 {
 	KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 	e->setData(new KviStr(m));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 }
 
 // FIXME: This stuff should be somewhat related to the 1448 bytes TCP basic packet size
@@ -292,7 +292,7 @@ void KviDccRecvThread::run()
 								{
 									// Received the whole file...die
 									KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 									break;
 								}
 							}
@@ -327,7 +327,7 @@ void KviDccRecvThread::run()
 							{
 								// success if we got the whole file or if we don't know the file size (we trust the peer)
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							}
 						}
@@ -368,7 +368,7 @@ void KviDccRecvThread::run()
 							// success if we got the whole file or if we don't know the file size (we trust the peer)
 							postMessageEvent(__tr2qs_ctx("Data transfer was terminated 30 seconds ago, closing the connection","dcc"));
 							KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-							postEvent(tqparent(),e);
+							postEvent(parent(),e);
 							break;
 						}
 					}
@@ -572,7 +572,7 @@ void KviDccSendThread::run()
 					if(iLastAck >= pFile->size())
 					{
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					}
 				} else {
@@ -589,7 +589,7 @@ void KviDccSendThread::run()
 								// done...success
 								updateStats();
 								KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-								postEvent(tqparent(),e);
+								postEvent(parent(),e);
 								break;
 							} else {
 								if(readLen < 0)
@@ -598,7 +598,7 @@ void KviDccSendThread::run()
 								} else {
 									KviThreadDataEvent<KviStr> * e = new KviThreadDataEvent<KviStr>(KVI_DCC_THREAD_EVENT_MESSAGE);
 									e->setData(new KviStr(__tr2qs_ctx("WARNING: Received data in a DCC TSEND, there should be no acknowledges","dcc")));
-									postEvent(tqparent(),e);
+									postEvent(parent(),e);
 								}
 							}
 						}
@@ -672,7 +672,7 @@ void KviDccSendThread::run()
 						// not in a tdcc: we can close the file...
 						updateStats();
 						KviThreadEvent * e = new KviThreadEvent(KVI_DCC_THREAD_EVENT_SUCCESS);
-						postEvent(tqparent(),e);
+						postEvent(parent(),e);
 						break;
 					} else {
 						// upload finished but we're waiting for the last ack
diff --git a/src/modules/dcc/thread.h b/src/modules/dcc/thread.h
index b91e2a2..7687f65 100644
--- a/src/modules/dcc/thread.h
+++ b/src/modules/dcc/thread.h
@@ -66,7 +66,7 @@ protected:
 protected:
 	bool handleInvalidSocketRead(int readLen);
 public:
-	TQObject * tqparent(){ return m_pParent; };
+	TQObject * parent(){ return m_pParent; };
 	void postErrorEvent(int err);
 	// Warning!..newer call __tr() here!...use __tr_no_lookup()
 	void postMessageEvent(const char * message);
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 4bf9ad9..e9d8a2a 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -533,7 +533,7 @@ void KviDccVoiceThread::startRecording()
 //		debug("Posting event");
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_RECORDING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 
 		m_bRecording = true;
 		m_bRecordingRequestPending = false;
@@ -552,7 +552,7 @@ void KviDccVoiceThread::stopRecording()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_RECORDING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bRecording = false;
 	if(!m_bPlaying)closeSoundcard();
@@ -569,7 +569,7 @@ void KviDccVoiceThread::startPlaying()
 	{
 		KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 		e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_START_PLAYING));
-		postEvent(tqparent(),e);
+		postEvent(parent(),e);
 		m_bPlaying = true;
 	}
 #endif
@@ -583,7 +583,7 @@ void KviDccVoiceThread::stopPlaying()
 
 	KviThreadDataEvent<int> * e = new KviThreadDataEvent<int>(KVI_DCC_THREAD_EVENT_ACTION);
 	e->setData(new int(KVI_DCC_VOICE_THREAD_ACTION_STOP_PLAYING));
-	postEvent(tqparent(),e);
+	postEvent(parent(),e);
 
 	m_bPlaying = false;
 	if(!m_bRecording)closeSoundcard();