Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...]
tqinvalidate[...]
tqparent[...]
tqmask[...]
tqlayout[...]
tqalignment[...]


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

41 files changed, 64 insertions, 64 deletions

diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index c6349007..72e3827c 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -360,7 +360,7 @@
         </spacer>
     </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
index 41ae9068..09655472 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
@@ -34,7 +34,7 @@ namespace buzz {
 
 Task::Task(Task * tqparent) :
     state_(STATE_INIT),
-    tqparent_(tqparent),
+    parent_(tqparent),
     blocked_(false),
     done_(false),
     aborted_(false),
@@ -43,8 +43,8 @@ Task::Task(Task * tqparent) :
     child_error_(false),
     start_time_(0) {
   runner_ = ((tqparent == NULL) ? (TaskRunner *)this : tqparent->GetRunner());
-  if (tqparent_ != NULL) {
-    tqparent_->AddChild(this);
+  if (parent_ != NULL) {
+    parent_->AddChild(this);
   }
 }
 
@@ -224,7 +224,7 @@ Task::AbortAllChildren() {
 void
 Task::Stop() {
   AbortAllChildren(); // No need to wake because we're either awake or in abort
-  tqparent_->OnChildStopped(this);
+  parent_->OnChildStopped(this);
 }
 
 void
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
index 553d04fb..c583bda8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.h
@@ -115,9 +115,9 @@ public:
   unsigned long long ElapsedTime();
   virtual void Poll() {}
 
-  Task * GetParent() { return tqparent_; }
+  Task * GetParent() { return parent_; }
   TaskRunner * GetRunner() { return runner_; }
-  virtual Task * GetParent(int code) { return tqparent_->GetParent(code); }
+  virtual Task * GetParent(int code) { return parent_->GetParent(code); }
 
   // Called from outside to stop task without any more callbacks
   void Abort(bool nowake = false);
@@ -162,7 +162,7 @@ private:
   void OnChildStopped(Task * child);
   
   int state_;
-  Task * tqparent_;
+  Task * parent_;
   TaskRunner * runner_;
   bool blocked_;
   bool done_;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
index 9e13459e..c10d76fd 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawdec.h
@@ -42,7 +42,7 @@ typedef struct _MSALAWDecoderClass
 {
 	/* the MSALAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSALAWDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
index d76f2f62..66e9fa63 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msAlawenc.h
@@ -42,7 +42,7 @@ typedef struct _MSALAWEncoderClass
 {
 	/* the MSALAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSALAWEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSALAWEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
index dd8d330c..8fbce4a0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMdecoder.h
@@ -45,7 +45,7 @@ typedef struct _MSGSMDecoderClass
 {
 	/* the MSGSMDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSGSMDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
index 3fad63e3..e2130625 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msGSMencoder.h
@@ -44,7 +44,7 @@ typedef struct _MSGSMEncoderClass
 {
 	/* the MSGSMEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSGSMEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSGSMEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
index af1ecc7c..8f61778b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10decoder.h
@@ -45,7 +45,7 @@ typedef struct _MSLPC10DecoderClass
 {
 	/* the MSLPC10Decoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Decoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSLPC10DecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
index af900445..e72539ec 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msLPC10encoder.h
@@ -57,7 +57,7 @@ typedef struct _MSLPC10EncoderClass
 {
 	/* the MSLPC10Encoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSLPC10Encoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSLPC10EncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
index 6e516db5..6e038368 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawdec.h
@@ -42,7 +42,7 @@ typedef struct _MSMULAWDecoderClass
 {
 	/* the MSMULAWDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSMULAWDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
index 0192984e..b302b339 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h
@@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass
 {
 	/* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSMULAWEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
index 71a04d3a..55008939 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavdecoder.h
@@ -57,7 +57,7 @@ struct _MSAVDecoderClass
 {
 	/* the MSAVDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSAVDecoderClass MSAVDecoderClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
index 23da59f6..b703a396 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msavencoder.h
@@ -58,7 +58,7 @@ struct _MSAVEncoderClass
 {
 	/* the MSAVEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSAVEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSAVEncoderClass MSAVEncoderClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
index 2e03e525..9b7c438b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mscopy.h
@@ -44,7 +44,7 @@ typedef struct _MSCopyClass
 {
 	/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSCopyClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
index 84859fda..623a3682 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.c
@@ -51,15 +51,15 @@ void ms_fdispatcher_init(MSFdispatcher *obj)
 
 void ms_fdispatcher_class_init(MSFdispatcherClass *klass)
 {
-	MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass);
-	ms_filter_class_init(tqparent_class);
-	ms_filter_class_set_name(tqparent_class,"fdispatcher");
-	tqparent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS;
-	tqparent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS;
-	tqparent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN;
-	tqparent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN;
-	tqparent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy;
-	tqparent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process;
+	MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
+	ms_filter_class_init(parent_class);
+	ms_filter_class_set_name(parent_class,"fdispatcher");
+	parent_class->max_finputs=MS_FDISPATCHER_MAX_INPUTS;
+	parent_class->max_foutputs=MS_FDISPATCHER_MAX_OUTPUTS;
+	parent_class->r_maxgran=MS_FDISPATCHER_DEF_GRAN;
+	parent_class->w_maxgran=MS_FDISPATCHER_DEF_GRAN;
+	parent_class->destroy=(MSFilterDestroyFunc)ms_fdispatcher_destroy;
+	parent_class->process=(MSFilterProcessFunc)ms_fdispatcher_process;
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
index a50c5637..4aea7e95 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msfdispatcher.h
@@ -44,7 +44,7 @@ typedef struct _MSFdispatcherClass
 {
 	/* the MSFdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSFdispatcher class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSFdispatcherClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
index 035a80fd..a3d0a326 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcdec.h
@@ -49,7 +49,7 @@ typedef struct _MSILBCDecoderClass
 {
 	/* the MSILBCDecoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCDecoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSILBCDecoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
index 6995022c..b072e430 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msilbcenc.h
@@ -64,7 +64,7 @@ typedef struct _MSILBCEncoderClass
 {
 	/* the MSILBCEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSILBCEncoder class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSILBCEncoderClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
index 7af095f8..a6c9e9e8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msnosync.h
@@ -38,7 +38,7 @@ typedef struct _MSNoSync
 typedef struct _MSNoSyncClass
 {
 	/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
-	MSSyncClass tqparent_class;
+	MSSyncClass parent_class;
 } MSNoSyncClass;
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
index 78fa91ad..e359f271 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msossread.h
@@ -53,7 +53,7 @@ struct _MSOssReadClass
 {
 	/* the MSOssRead derivates from MSSoundRead, so the MSSoundRead class MUST be the first of the MSOssRead class
        in order to the class mechanism to work*/
-	MSSoundReadClass tqparent_class;
+	MSSoundReadClass parent_class;
 };
 
 typedef struct _MSOssReadClass MSOssReadClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
index 21abb2a1..024eebb4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msosswrite.h
@@ -52,7 +52,7 @@ struct _MSOssWriteClass
 {
 	/* the MSOssWrite derivates from MSSoundWrite, so the MSSoundWrite class MUST be the first of the MSOssWrite class
        in order to the class mechanism to work*/
-	MSSoundWriteClass tqparent_class;
+	MSSoundWriteClass parent_class;
 };
 
 typedef struct _MSOssWriteClass MSOssWriteClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
index 20051b62..568411c6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.c
@@ -51,14 +51,14 @@ void ms_qdispatcher_init(MSQdispatcher *obj)
 
 void ms_qdispatcher_class_init(MSQdispatcherClass *klass)
 {
-	MSFilterClass *tqparent_class=MS_FILTER_CLASS(klass);
-	ms_filter_class_init(tqparent_class);
-	ms_filter_class_set_name(tqparent_class,"qdispatcher");
-	tqparent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS;
-	tqparent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS;
+	MSFilterClass *parent_class=MS_FILTER_CLASS(klass);
+	ms_filter_class_init(parent_class);
+	ms_filter_class_set_name(parent_class,"qdispatcher");
+	parent_class->max_qinputs=MS_TQDISPATCHER_MAX_INPUTS;
+	parent_class->max_qoutputs=MS_TQDISPATCHER_MAX_OUTPUTS;
 	
-	tqparent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy;
-	tqparent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process;
+	parent_class->destroy=(MSFilterDestroyFunc)ms_qdispatcher_destroy;
+	parent_class->process=(MSFilterProcessFunc)ms_qdispatcher_process;
 }
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
index 66e80902..6f28abf9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
@@ -43,7 +43,7 @@ typedef struct _MSQdispatcherClass
 {
 	/* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSQdispatcherClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
index a40f4fa0..b695f7da 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msread.h
@@ -55,7 +55,7 @@ typedef struct _MSReadClass
 {
 	/* the MSRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSRead class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSReadClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
index 715cdf3c..a090afbf 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msringplayer.h
@@ -59,7 +59,7 @@ struct _MSRingPlayerClass
 {
 	/* the MSRingPlayer derivates from MSFilter, so the MSFilter class MUST be the first of the MSRingPlayer class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRingPlayerClass MSRingPlayerClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
index e9fd7937..0f36c379 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtprecv.h
@@ -55,7 +55,7 @@ struct _MSRtpRecvClass
 {
 	/* the MSCopy derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRtpRecvClass MSRtpRecvClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
index 56728f16..96889964 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msrtpsend.h
@@ -59,7 +59,7 @@ struct _MSRtpSendClass
 {
 	/* the MSRtpSend derivates from MSFilter, so the MSFilter class MUST be the first of the MSCopy class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSRtpSendClass MSRtpSendClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
index b19c7e74..9c7d5ab3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssdlout.h
@@ -51,7 +51,7 @@ typedef struct _MSSdlOut MSSdlOut;
 	
 struct _MSSdlOutClass
 {
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 };
 
 typedef struct _MSSdlOutClass MSSdlOutClass;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
index 31349250..9c5512b0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundread.h
@@ -38,7 +38,7 @@ struct _MSSoundReadClass
 {
 	/* the MSOssRead derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssRead class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSSoundRead *, gint devid);
 	void (*start)(MSSoundRead *);
 	void (*stop)(MSSoundRead*);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
index e8fae0d8..8c1bab2d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mssoundwrite.h
@@ -38,7 +38,7 @@ struct _MSSoundWriteClass
 {
 	/* the MSOssWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSOssWrite class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSSoundWrite *, gint devid);
 	void (*start)(MSSoundWrite *);
 	void (*stop)(MSSoundWrite*);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
index b245ab86..3fe11350 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstimer.h
@@ -42,7 +42,7 @@ typedef struct _MSTimer
 typedef struct _MSTimerClass
 {
 	/* the MSSyncClass must be the first field of the class in order to the class mechanism to work*/
-	MSSyncClass tqparent_class;
+	MSSyncClass parent_class;
 } MSTimerClass;
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
index 105e2603..a61719ea 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechdecoder.h
@@ -42,7 +42,7 @@ typedef struct _MSTrueSpeechDecoderClass
            so the MSFilter class MUST be the first of the MSTrueSpechDecoder
            class
            in order for the class mechanism to work*/
-  MSFilterClass tqparent_class;
+  MSFilterClass parent_class;
   Win32CodecDriver* driver;
 } MSTrueSpeechDecoderClass;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
index 2637d3ac..78024946 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mstruespeechencoder.h
@@ -46,7 +46,7 @@ typedef struct _MSTrueSpeechEncoderClass
            so the MSFilter class MUST be the first of the MSTrueSpechEncoder
            class
            in order for the class mechanism to work*/
-  MSFilterClass tqparent_class;
+  MSFilterClass parent_class;
   Win32CodecDriver* driver;
 } MSTrueSpeechEncoderClass;
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
index e289ccc8..950187b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msv4l.h
@@ -61,7 +61,7 @@ typedef struct _MSV4l MSV4l;
 
 struct _MSV4lClass
 {
-	MSVideoSourceClass tqparent_class;
+	MSVideoSourceClass parent_class;
 	
 };
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
index 2189a6df..897b239e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msvideosource.h
@@ -45,7 +45,7 @@ typedef struct _MSVideoSourceClass
 {
 	/* the MSVideoSource derivates from MSFilter, so the MSFilter class MUST be the first of the MSVideoSource class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 	gint (*set_device)(MSVideoSource *s, const gchar *name);
 	void (*start)(MSVideoSource *s);
 	void (*stop)(MSVideoSource *s);
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
index 55081793..8492a09d 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/mswrite.h
@@ -45,7 +45,7 @@ typedef struct _MSWriteClass
 {
 	/* the MSWrite derivates from MSFilter, so the MSFilter class MUST be the first of the MSWrite class
        in order to the class mechanism to work*/
-	MSFilterClass tqparent_class;
+	MSFilterClass parent_class;
 } MSWriteClass;
 
 /* PUBLIC */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
index 81554a06..7518e075 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/rtpsession.h
@@ -177,7 +177,7 @@ struct _RtpSession
 	RtpSessionMode mode;
 	struct _RtpScheduler *sched;
 	guint32 flags;
-	gint tqmask_pos;	/* the position in the scheduler tqmask of RtpSession */
+	gint mask_pos;	/* the position in the scheduler tqmask of RtpSession */
 	gpointer user_data;
 	
 	/* telephony events extension */
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
index 2ea733ac..bee787a2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.c
@@ -177,7 +177,7 @@ void rtp_scheduler_add_session(RtpScheduler *sched, RtpSession *session)
 	/* find a free pos in the session tqmask*/
 	for (i=0;i<sched->max_sessions;i++){
 		if (!ORTP_FD_ISSET(i,&sched->all_sessions.rtpset)){
-			session->tqmask_pos=i;
+			session->mask_pos=i;
 			session_set_set(&sched->all_sessions,session);
 			/* make a new session scheduled not blockable if it has not started*/
 			if (session->flags & RTP_SESSION_RECV_NOT_STARTED) 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
index 106f1fcd..4dcd9afb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/scheduler.h
@@ -37,7 +37,7 @@ struct _RtpScheduler {
 	gint 		w_max;
 	SessionSet	e_sessions;	/* tqmask of session that have error event */
 	gint		e_max;
-	gint max_sessions;		/* the number of position in the tqmasks */
+	gint max_sessions;		/* the number of position in the masks */
   /* GMutex  *unblock_select_mutex; */
 	GCond   *unblock_select_cond;
 	GMutex	*lock;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
index bea1a7c9..36856a99 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.c
@@ -67,7 +67,7 @@ gint session_set_and(SessionSet *sched_set, gint maxs, SessionSet *user_set, Ses
 	tqmask2=(guint32*)&user_set->rtpset;
 	tqmask3=(guint32*)&result_set->rtpset;
 	while(i<maxs+1){
-		*tqmask3=(*tqmask1) & (*tqmask2);	/* computes the AND between the two tqmasks*/
+		*tqmask3=(*tqmask1) & (*tqmask2);	/* computes the AND between the two masks*/
 		/* and unset the sessions that have been found from the sched_set */
 		*tqmask1=(*tqmask1) & (~(*tqmask3));
 		if ((*tqmask3)!=0){
@@ -116,12 +116,12 @@ int session_set_select(SessionSet *recvs, SessionSet *sends, SessionSet *errors)
 	SessionSet temp;
 	RtpScheduler *sched=ortp_get_scheduler();
 	
-	/*lock the scheduler to not read the tqmasks while they are being modified by the scheduler*/
+	/*lock the scheduler to not read the masks while they are being modified by the scheduler*/
 	rtp_scheduler_lock(sched);
 	
 	while(1){
 		/* computes the SessionSet intersection (in the other words tqmask intersection) between
-		the tqmask given by the user and scheduler tqmasks */
+		the tqmask given by the user and scheduler masks */
 		if (recvs!=NULL){
 			bits=session_set_and(&sched->r_sessions,sched->all_max,recvs,&temp);
 			if (bits>0){
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
index b4a0b904..8d166222 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/ortp/sessionset.h
@@ -87,9 +87,9 @@ typedef struct _SessionSet SessionSet;
 
 SessionSet * session_set_new();
 #define session_set_init(ss)		ORTP_FD_ZERO(&(ss)->rtpset)
-#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->tqmask_pos,&(ss)->rtpset)
-#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->tqmask_pos,&(ss)->rtpset)
-#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->tqmask_pos,&(ss)->rtpset)
+#define session_set_set(ss,rtpsession)		ORTP_FD_SET((rtpsession)->mask_pos,&(ss)->rtpset)
+#define session_set_is_set(ss,rtpsession)	ORTP_FD_ISSET((rtpsession)->mask_pos,&(ss)->rtpset)
+#define session_set_clr(ss,rtpsession)		ORTP_FD_CLR((rtpsession)->mask_pos,&(ss)->rtpset)
 
 #define session_set_copy(dest,src)		memcpy(&(dest)->rtpset,&(src)->rtpset,sizeof(ortp_fd_set))