From 81d696e1ee26cfc46fb4c97989575a7376b2d246 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:23:09 -0600
Subject: Rename obsolete tq methods to standard names (cherry picked from
 commit 8a143ab9f846e910c583ea8e770cd05495e0c58d)

---
 kopete/protocols/jabber/jabberformtranslator.cpp     |  2 +-
 .../jabber/jingle/jinglevoicesessiondialogbase.ui    | 12 ++++++------
 .../talk/session/phone/linphonemediaengine.cc        |  4 ++--
 .../talk/session/phone/linphonemediaengine.h         |  2 +-
 .../libjingle/talk/session/phone/mediachannel.h      |  2 +-
 .../talk/session/phone/portaudiomediaengine.cc       |  6 +++---
 .../talk/session/phone/portaudiomediaengine.h        |  2 +-
 .../libjingle/talk/session/phone/voicechannel.cc     |  6 +++---
 kopete/protocols/jabber/ui/dlgaddcontact.ui          |  2 +-
 kopete/protocols/jabber/ui/dlgchatjoin.ui            |  2 +-
 kopete/protocols/jabber/ui/dlgchatroomslist.ui       |  4 ++--
 kopete/protocols/jabber/ui/dlgjabberbrowse.cpp       |  2 +-
 .../jabber/ui/dlgjabbereditaccountwidget.ui          | 12 ++++++------
 kopete/protocols/jabber/ui/dlgjabberregister.cpp     |  2 +-
 .../protocols/jabber/ui/dlgjabberregisteraccount.ui  |  2 +-
 kopete/protocols/jabber/ui/dlgsendraw.ui             |  4 ++--
 kopete/protocols/jabber/ui/dlgservices.ui            |  4 ++--
 kopete/protocols/jabber/ui/dlgvcard.ui               | 20 ++++++++++----------
 18 files changed, 45 insertions(+), 45 deletions(-)

(limited to 'kopete/protocols/jabber')

diff --git a/kopete/protocols/jabber/jabberformtranslator.cpp b/kopete/protocols/jabber/jabberformtranslator.cpp
index 3809bcfa..3344f802 100644
--- a/kopete/protocols/jabber/jabberformtranslator.cpp
+++ b/kopete/protocols/jabber/jabberformtranslator.cpp
@@ -31,7 +31,7 @@ JabberFormTranslator::JabberFormTranslator (const XMPP::Form & form, TQWidget *
 
 	emptyForm = privForm;
 
-	/* Add instructions to tqlayout. */
+	/* Add instructions to layout. */
 	TQVBoxLayout *innerLayout = new TQVBoxLayout (this, 0, 4);
 
 	TQLabel *label = new TQLabel (form.instructions (), this, "InstructionLabel");
diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
index 3ae2edc1..bea1ac4e 100644
--- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
+++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialogbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout8</cstring>
+                <cstring>layout8</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -81,7 +81,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout4</cstring>
+                        <cstring>layout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -147,7 +147,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -232,7 +232,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -309,7 +309,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
index 8456a90f..f3244c54 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
@@ -110,8 +110,8 @@ void LinphoneMediaChannel::OnPacketReceived(const void *data, int len) {
     sendto(fd_, buf, len, 0, (struct sockaddr*)&sockaddr, sizeof(sockaddr));
 }
 
-void LinphoneMediaChannel::SetPtqlayout(bool ptqlayout) {
-  play_ = ptqlayout;
+void LinphoneMediaChannel::SetPlayout(bool playout) {
+  play_ = playout;
 }
 
 void LinphoneMediaChannel::SetSend(bool send) {
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
index 2639c7ac..0c00be75 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.h
@@ -36,7 +36,7 @@ class LinphoneMediaChannel : public MediaChannel {
   virtual void SetCodec(const char *codec);
   virtual void OnPacketReceived(const void *data, int len);
 
-  virtual void SetPtqlayout(bool ptqlayout);
+  virtual void SetPlayout(bool playout);
   virtual void SetSend(bool send);
 
   virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
index 4a2e4560..db2f9654 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/mediachannel.h
@@ -41,7 +41,7 @@ class MediaChannel {
   void SetInterface(NetworkInterface *iface) {network_interface_ = iface;}
   virtual void SetCodec(const char *codec) = 0;
   virtual void OnPacketReceived(const void *data, int len) = 0;
-  virtual void SetPtqlayout(bool ptqlayout) = 0;
+  virtual void SetPlayout(bool playout) = 0;
   virtual void SetSend(bool send) = 0;
   virtual float GetCurrentQuality() = 0;
   virtual int GetOutputLevel() = 0;
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
index 90092283..24036b02 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
@@ -126,12 +126,12 @@ void PortAudioMediaChannel::OnPacketReceived(const void *data, int len)
 	}
 }
 
-void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
+void PortAudioMediaChannel::SetPlayout(bool playout)
 {
 	if (!stream_) 
 		return;
 
-	if (play_ && !ptqlayout) {
+	if (play_ && !playout) {
 		int err = Pa_StopStream(stream_);
 		if (err != paNoError) {
 			fprintf(stderr, "Error stopping PortAudio stream: %s\n", Pa_GetErrorText(err));
@@ -139,7 +139,7 @@ void PortAudioMediaChannel::SetPtqlayout(bool ptqlayout)
 		}
 		play_ = false;
 	}
-	else if (!play_ && ptqlayout) {
+	else if (!play_ && playout) {
 		int err = Pa_StartStream(stream_);
 		if (err != paNoError) {
 			fprintf(stderr, "Error starting PortAudio stream: %s\n", Pa_GetErrorText(err));
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
index 89922e77..95c39a1a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.h
@@ -15,7 +15,7 @@ public:
 	virtual void SetCodec(const char *codec);
 	virtual void OnPacketReceived(const void *data, int len);
 
-	virtual void SetPtqlayout(bool ptqlayout);
+	virtual void SetPlayout(bool playout);
 	virtual void SetSend(bool send);
 
 	virtual float GetCurrentQuality();
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
index c55ef287..58e1db60 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
@@ -168,15 +168,15 @@ void VoiceChannel::SendPacket(const void *data, size_t len) {
 
 void VoiceChannel::ChangeState() {
   if (paused_ || !enabled_ || !socket_writable_) {
-    channel_->SetPtqlayout(false);
+    channel_->SetPlayout(false);
     channel_->SetSend(false);
   } else {
     if (muted_) {
       channel_->SetSend(false);
-      channel_->SetPtqlayout(true);
+      channel_->SetPlayout(true);
     } else {
       channel_->SetSend(true);
-      channel_->SetPtqlayout(true);
+      channel_->SetPlayout(true);
     }
   }
 }
diff --git a/kopete/protocols/jabber/ui/dlgaddcontact.ui b/kopete/protocols/jabber/ui/dlgaddcontact.ui
index ee258105..30a609a0 100644
--- a/kopete/protocols/jabber/ui/dlgaddcontact.ui
+++ b/kopete/protocols/jabber/ui/dlgaddcontact.ui
@@ -27,7 +27,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout24</cstring>
+                <cstring>layout24</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgchatjoin.ui b/kopete/protocols/jabber/ui/dlgchatjoin.ui
index 5c588e57..f5f40392 100644
--- a/kopete/protocols/jabber/ui/dlgchatjoin.ui
+++ b/kopete/protocols/jabber/ui/dlgchatjoin.ui
@@ -57,7 +57,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="3" column="1">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgchatroomslist.ui b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
index 25458a91..645c8931 100644
--- a/kopete/protocols/jabber/ui/dlgchatroomslist.ui
+++ b/kopete/protocols/jabber/ui/dlgchatroomslist.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -97,7 +97,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout5</cstring>
+                <cstring>layout5</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
index d130fa97..be558388 100644
--- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp
@@ -68,7 +68,7 @@ void dlgJabberBrowse::slotGotForm ()
 
 	// translate the form and create it inside the display widget
 	translator = new JabberFormTranslator (task->form (), dynamicForm);
-	dynamicForm->tqlayout()->add( translator );
+	dynamicForm->layout()->add( translator );
 	translator->show();
 
 	// enable the send button
diff --git a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
index 71400791..e0a14f1c 100644
--- a/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
+++ b/kopete/protocols/jabber/ui/dlgjabbereditaccountwidget.ui
@@ -57,7 +57,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout61</cstring>
+                                    <cstring>layout61</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -312,7 +312,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout66</cstring>
+                                    <cstring>layout66</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -608,7 +608,7 @@ If two resources have the same priority, the messages will be sent to the one co
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout70</cstring>
+                                    <cstring>layout70</cstring>
                                 </property>
                                 <grid>
                                     <property name="name">
@@ -632,7 +632,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                     </widget>
                                     <widget class="TQLayoutWidget" row="0" column="1">
                                         <property name="name">
-                                            <cstring>tqlayout68</cstring>
+                                            <cstring>layout68</cstring>
                                         </property>
                                         <hbox>
                                             <property name="name">
@@ -798,7 +798,7 @@ If two resources have the same priority, the messages will be sent to the one co
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -823,7 +823,7 @@ If two resources have the same priority, the messages will be sent to the one co
                                     </spacer>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout9</cstring>
+                                            <cstring>layout9</cstring>
                                         </property>
                                         <vbox>
                                             <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
index 7b39edeb..ff324085 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp
@@ -59,7 +59,7 @@ void dlgJabberRegister::slotGotForm ()
 
 	// translate the form and create it inside the box widget
 	translator = new JabberFormTranslator (task->form (), grpForm);
-	static_cast<TQBoxLayout*>(grpForm->tqlayout())->insertWidget(1, translator);
+	static_cast<TQBoxLayout*>(grpForm->layout())->insertWidget(1, translator);
 	translator->show();
 	resize(sizeHint());
 
diff --git a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
index e34c208b..ea3d51c0 100644
--- a/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
+++ b/kopete/protocols/jabber/ui/dlgjabberregisteraccount.ui
@@ -247,7 +247,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="6" column="0" rowspan="1" colspan="3">
             <property name="name">
-                <cstring>tqlayout3</cstring>
+                <cstring>layout3</cstring>
             </property>
             <vbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgsendraw.ui b/kopete/protocols/jabber/ui/dlgsendraw.ui
index 8eb13e45..eaaf5aa6 100644
--- a/kopete/protocols/jabber/ui/dlgsendraw.ui
+++ b/kopete/protocols/jabber/ui/dlgsendraw.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout4</cstring>
+                <cstring>layout4</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -102,7 +102,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgservices.ui b/kopete/protocols/jabber/ui/dlgservices.ui
index d0d0a6bb..da690a97 100644
--- a/kopete/protocols/jabber/ui/dlgservices.ui
+++ b/kopete/protocols/jabber/ui/dlgservices.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -112,7 +112,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout1</cstring>
+                <cstring>layout1</cstring>
             </property>
             <hbox>
                 <property name="name">
diff --git a/kopete/protocols/jabber/ui/dlgvcard.ui b/kopete/protocols/jabber/ui/dlgvcard.ui
index ce06ba0a..6daa3a4e 100644
--- a/kopete/protocols/jabber/ui/dlgvcard.ui
+++ b/kopete/protocols/jabber/ui/dlgvcard.ui
@@ -33,7 +33,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="4" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout13</cstring>
+                            <cstring>layout13</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -64,7 +64,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="3" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout12</cstring>
+                            <cstring>layout12</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -159,7 +159,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="5" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout14</cstring>
+                            <cstring>layout14</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -190,7 +190,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout11</cstring>
+                            <cstring>layout11</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -221,7 +221,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout10</cstring>
+                            <cstring>layout10</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -255,7 +255,7 @@
                     </widget>
                     <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                         <property name="name">
-                            <cstring>tqlayout9</cstring>
+                            <cstring>layout9</cstring>
                         </property>
                         <hbox>
                             <property name="name">
@@ -427,7 +427,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout36</cstring>
+                            <cstring>layout36</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -625,7 +625,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout37</cstring>
+                            <cstring>layout37</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -823,7 +823,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout57</cstring>
+                            <cstring>layout57</cstring>
                         </property>
                         <grid>
                             <property name="name">
@@ -915,7 +915,7 @@
                     </property>
                     <widget class="TQLayoutWidget" row="0" column="0">
                         <property name="name">
-                            <cstring>tqlayout59</cstring>
+                            <cstring>layout59</cstring>
                         </property>
                         <grid>
                             <property name="name">
-- 
cgit v1.2.1