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/nowlistening/nljuk.cpp              |  6 +++---
 kopete/plugins/nowlistening/nowlisteningplugin.cpp | 10 ++++-----
 .../nowlistening/nowlisteningpreferences.cpp       |  2 +-
 kopete/plugins/nowlistening/nowlisteningprefs.ui   | 24 +++++++++++-----------
 4 files changed, 21 insertions(+), 21 deletions(-)

(limited to 'kopete/plugins/nowlistening')

diff --git a/kopete/plugins/nowlistening/nljuk.cpp b/kopete/plugins/nowlistening/nljuk.cpp
index 78d6914b..fe58aba4 100644
--- a/kopete/plugins/nowlistening/nljuk.cpp
+++ b/kopete/plugins/nowlistening/nljuk.cpp
@@ -58,7 +58,7 @@ void NLJuk::update()
 		
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Album");
+			arg << TQString::tqfromLatin1("Album");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
@@ -72,7 +72,7 @@ void NLJuk::update()
 		
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Artist");
+			arg << TQString::tqfromLatin1("Artist");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
@@ -86,7 +86,7 @@ void NLJuk::update()
 
 		{
 			TQDataStream arg( data, IO_WriteOnly );
-			arg << TQString::fromLatin1("Title");
+			arg << TQString::tqfromLatin1("Title");
 			if ( m_client->call( "juk", "Player", "trackProperty(TQString)", data,
 						replyType, replyData ) )
 			{
diff --git a/kopete/plugins/nowlistening/nowlisteningplugin.cpp b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
index a9148187..4c929a4c 100644
--- a/kopete/plugins/nowlistening/nowlisteningplugin.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningplugin.cpp
@@ -298,7 +298,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				// KDE4 TODO: Use the new status message framework, and remove this "hack".
 				if( isPlaying )
 				{
-					advert = TQString("[Music]%1").arg(mediaList);
+					advert = TQString("[Music]%1").tqarg(mediaList);
 				}
 
 			}
@@ -308,7 +308,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				{
 					// Check for the now listening message in parenthesis, 
 					// include the header to not override other messages in parenthesis.
-					TQRegExp statusSong( TQString(" \\(%1.*\\)$").arg( NowListeningConfig::header()) );
+					TQRegExp statusSong( TQString(" \\(%1.*\\)$").tqarg( NowListeningConfig::header()) );
 					
 					// HACK: Don't keep appending the now listened song. Replace it in the status message.
 					advert = a->myself()->property( Kopete::Global::Properties::self()->awayMessage() ).value().toString();
@@ -318,11 +318,11 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 					{
 						if(statusSong.search(advert) != -1)
 						{
-							advert = advert.replace(statusSong, TQString(" (%1)").arg(mediaPlayerAdvert(false)) );
+							advert = advert.replace(statusSong, TQString(" (%1)").tqarg(mediaPlayerAdvert(false)) );
 						}
 						else
 						{
-							advert += TQString(" (%1)").arg( mediaPlayerAdvert(false) );
+							advert += TQString(" (%1)").tqarg( mediaPlayerAdvert(false) );
 						}
 					}
 					else
@@ -336,7 +336,7 @@ void NowListeningPlugin::slotAdvertCurrentMusic()
 				}
 			}
 
-			a->setOnlineStatus(a->myself()->onlineStatus(), advert);
+			a->setOnlineStatus(a->myself()->onlinetqStatus(), advert);
 		}
 	}
 }
diff --git a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
index 9770bd6b..bd0cb983 100644
--- a/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
+++ b/kopete/plugins/nowlistening/nowlisteningpreferences.cpp
@@ -19,7 +19,7 @@
 */
 #include <tqspinbox.h>
 #include <tqlineedit.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqradiobutton.h>
 
 #include <klistbox.h>
diff --git a/kopete/plugins/nowlistening/nowlisteningprefs.ui b/kopete/plugins/nowlistening/nowlisteningprefs.ui
index 125ff80b..21d2f0e9 100644
--- a/kopete/plugins/nowlistening/nowlisteningprefs.ui
+++ b/kopete/plugins/nowlistening/nowlisteningprefs.ui
@@ -32,7 +32,7 @@
             <property name="text">
                 <string>&lt;b&gt;Share Your Musical Taste&lt;/b&gt;</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignVCenter</set>
             </property>
         </widget>
@@ -64,7 +64,7 @@
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout4</cstring>
+                            <cstring>tqlayout4</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -86,13 +86,13 @@
                                     <string>%track, %artist, %album, %player will be substituted if known.
 Expressions in brackets depend on a substitution being made.</string>
                                 </property>
-                                <property name="alignment">
+                                <property name="tqalignment">
                                     <set>WordBreak|AlignVCenter</set>
                                 </property>
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>layout2</cstring>
+                                    <cstring>tqlayout2</cstring>
                                 </property>
                                 <vbox>
                                     <property name="name">
@@ -105,7 +105,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>Start with:</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -127,7 +127,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>For each track:</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -149,7 +149,7 @@ Expressions in brackets depend on a substitution being made.</string>
                                         <property name="text">
                                             <string>Conjunction (if &gt;1 track):</string>
                                         </property>
-                                        <property name="alignment">
+                                        <property name="tqalignment">
                                             <set>AlignVCenter|AlignLeft</set>
                                         </property>
                                         <property name="buddy" stdset="0">
@@ -178,7 +178,7 @@ Expressions in brackets depend on a substitution being made.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -259,7 +259,7 @@ in place of your status message.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>80</height>
@@ -281,7 +281,7 @@ in place of your status message.</string>
                     </property>
                     <widget class="TQLayoutWidget">
                         <property name="name">
-                            <cstring>layout2_2</cstring>
+                            <cstring>tqlayout2_2</cstring>
                         </property>
                         <vbox>
                             <property name="name">
@@ -332,7 +332,7 @@ in place of your status message.</string>
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>40</height>
@@ -352,7 +352,7 @@ in place of your status message.</string>
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>40</height>
-- 
cgit v1.2.1