From 83677e35509b4dafac63b76995652bdf3b49f209 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 16 Dec 2011 09:59:34 -0600
Subject: Revert "Rename a number of old tq methods that are no longer tq
 specific"

This reverts commit 808e453c56036211f57482ed847d54aca01bba68.
---
 kopete/plugins/netmeeting/netmeetinginvitation.cpp  | 4 ++--
 kopete/plugins/netmeeting/netmeetingpreferences.cpp | 2 +-
 kopete/plugins/netmeeting/netmeetingprefs_ui.ui     | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kopete/plugins/netmeeting')

diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 5fb799c1..711dc665 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -64,7 +64,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg)
 		MSNInvitation::parseInvitation(msg); //for the cookie
 
 		unsigned int result = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
-					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).arg(m_contact->metaContact()->displayName()),
+					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).tqarg(m_contact->metaContact()->displayName()),
 					i18n("MSN Plugin") , i18n("Accept"),i18n("Refuse"));
 
 		MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@@ -162,7 +162,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 	
 	KConfig *config=KGlobal::config();
 	config->setGroup("Netmeeting Plugin");
-	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
+	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").tqarg(ip_address);
 	
 	kdDebug() << k_funcinfo << app <<  endl ;
 	
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 69003a12..313eb197 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -14,7 +14,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqcheckbox.h>
 
 #include <kcombobox.h>
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index 0c0838fb..5725a2ae 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -26,7 +26,7 @@
 
 This is not the same as webcam chat you can find in the newer Windows Messenger®,  but uses the older NetMeeting chat you can find in old versions.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -46,7 +46,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -98,7 +98,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger
             <property name="text">
                 <string>&lt;b&gt;%1&lt;/b&gt; will be replaced by the ip to call</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -112,7 +112,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>60</height>
-- 
cgit v1.2.3