From 23aecb275d6085b7a15a38da0180edf156c8ea9d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Thu, 15 Dec 2011 15:44:52 -0600
Subject: Rename a number of old tq methods that are no longer tq specific

---
 kttsd/libkttsd/notify.cpp            | 10 +++++-----
 kttsd/libkttsd/pluginproc.cpp        |  2 +-
 kttsd/libkttsd/selecttalkerwidget.ui | 20 ++++++++++----------
 kttsd/libkttsd/stretcher.cpp         |  2 +-
 kttsd/libkttsd/talkercode.cpp        |  2 +-
 kttsd/libkttsd/testplayer.cpp        |  2 +-
 6 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'kttsd/libkttsd')

diff --git a/kttsd/libkttsd/notify.cpp b/kttsd/libkttsd/notify.cpp
index a226675..bd2fbd1 100644
--- a/kttsd/libkttsd/notify.cpp
+++ b/kttsd/libkttsd/notify.cpp
@@ -148,9 +148,9 @@ static void notifypresent_init()
  */
 /*static*/ TQString NotifyEvent::getEventSrcName(const TQString& eventSrc, TQString& iconName)
 {
-    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
-    config->setGroup( TQString::tqfromLatin1( "!Global!" ) );
+    config->setGroup( TQString::fromLatin1( "!Global!" ) );
     TQString appDesc = config->readEntry( "Comment", i18n("No description available") );
     iconName = config->readEntry( "IconName" );
     delete config;
@@ -163,13 +163,13 @@ static void notifypresent_init()
 /*static*/ TQString NotifyEvent::getEventName(const TQString& eventSrc, const TQString& event)
 {
     TQString eventName;
-    TQString configFilename = eventSrc + TQString::tqfromLatin1( "/eventsrc" );
+    TQString configFilename = eventSrc + TQString::fromLatin1( "/eventsrc" );
     KConfig* config = new KConfig( configFilename, true, false, "data" );
     if ( config->hasGroup( event ) )
     {
         config->setGroup( event );
-        eventName = config->readEntry( TQString::tqfromLatin1( "Comment" ),
-            config->readEntry( TQString::tqfromLatin1( "Name" )));
+        eventName = config->readEntry( TQString::fromLatin1( "Comment" ),
+            config->readEntry( TQString::fromLatin1( "Name" )));
     }
     delete config;
     return eventName;
diff --git a/kttsd/libkttsd/pluginproc.cpp b/kttsd/libkttsd/pluginproc.cpp
index bcd79fd..317113f 100644
--- a/kttsd/libkttsd/pluginproc.cpp
+++ b/kttsd/libkttsd/pluginproc.cpp
@@ -17,7 +17,7 @@
 
 // TQt includes. 
 #include <tqstring.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 
 // KDE includes.
 #include <kdebug.h>
diff --git a/kttsd/libkttsd/selecttalkerwidget.ui b/kttsd/libkttsd/selecttalkerwidget.ui
index 6a0541b..be55d45 100644
--- a/kttsd/libkttsd/selecttalkerwidget.ui
+++ b/kttsd/libkttsd/selecttalkerwidget.ui
@@ -77,7 +77,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -93,7 +93,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -127,7 +127,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="0">
                                     <property name="name">
-                                        <cstring>tqlayout11_2</cstring>
+                                        <cstring>layout11_2</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -140,7 +140,7 @@
                                             <property name="text">
                                                 <string>&amp;Synthesizer:</string>
                                             </property>
-                                            <property name="tqalignment">
+                                            <property name="alignment">
                                                 <set>WordBreak|AlignVCenter|AlignLeft</set>
                                             </property>
                                             <property name="buddy" stdset="0">
@@ -178,7 +178,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="0" column="2">
                                     <property name="name">
-                                        <cstring>tqlayout12</cstring>
+                                        <cstring>layout12</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -243,7 +243,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="0">
                                     <property name="name">
-                                        <cstring>tqlayout14</cstring>
+                                        <cstring>layout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -291,7 +291,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="1" column="2">
                                     <property name="name">
-                                        <cstring>tqlayout13</cstring>
+                                        <cstring>layout13</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -339,7 +339,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget" row="2" column="0" rowspan="1" colspan="3">
                                     <property name="name">
-                                        <cstring>tqlayout10</cstring>
+                                        <cstring>layout10</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -426,7 +426,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -442,7 +442,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
diff --git a/kttsd/libkttsd/stretcher.cpp b/kttsd/libkttsd/stretcher.cpp
index 6af8baf..91ae8fe 100644
--- a/kttsd/libkttsd/stretcher.cpp
+++ b/kttsd/libkttsd/stretcher.cpp
@@ -61,7 +61,7 @@ bool Stretcher::stretch(const TQString &inFilename, const TQString &outFilename,
     if (m_stretchProc) return false;
     m_outFilename = outFilename;
     m_stretchProc = new KProcess;
-    TQString stretchStr = TQString("%1").tqarg(stretchFactor, 0, 'f', 3);
+    TQString stretchStr = TQString("%1").arg(stretchFactor, 0, 'f', 3);
     *m_stretchProc << "sox" << inFilename << outFilename << "stretch" << stretchStr;
     connect(m_stretchProc, TQT_SIGNAL(processExited(KProcess*)),
         this, TQT_SLOT(slotProcessExited(KProcess*)));
diff --git a/kttsd/libkttsd/talkercode.cpp b/kttsd/libkttsd/talkercode.cpp
index 53be627..c0d26ed 100644
--- a/kttsd/libkttsd/talkercode.cpp
+++ b/kttsd/libkttsd/talkercode.cpp
@@ -507,7 +507,7 @@ void TalkerCode::parseTalkerCode(const TQString &talkerCode)
 {
     if (desktopEntryName.isEmpty()) return TQString();
     KTrader::OfferList offers = KTrader::self()->query("KTTSD/SynthPlugin",
-    TQString("DesktopEntryName == '%1'").tqarg(desktopEntryName));
+    TQString("DesktopEntryName == '%1'").arg(desktopEntryName));
 
     if (offers.count() == 1)
         return offers[0]->name();
diff --git a/kttsd/libkttsd/testplayer.cpp b/kttsd/libkttsd/testplayer.cpp
index f83a7e4..06d97cf 100644
--- a/kttsd/libkttsd/testplayer.cpp
+++ b/kttsd/libkttsd/testplayer.cpp
@@ -162,7 +162,7 @@ Player* TestPlayer::createPlayerObject(int playerOption)
         }
     }
     KTrader::OfferList offers = KTrader::self()->query(
-            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").tqarg(plugInName));
+            "KTTSD/AudioPlugin", TQString("DesktopEntryName == '%1'").arg(plugInName));
 
     if(offers.count() == 1)
     {
-- 
cgit v1.2.3