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

---
 .../base_k3bexternalencoderconfigwidget.ui         |  4 ++--
 plugins/encoder/external/k3bexternalencoder.cpp    |  4 ++--
 .../external/k3bexternalencoderconfigwidget.cpp    |  2 +-
 .../lame/base_k3blameencodersettingswidget.ui      | 24 +++++++++++-----------
 .../lame/base_k3bmanualbitratesettingswidget.ui    |  6 +++---
 plugins/encoder/lame/k3blameencoder.cpp            | 22 ++++++++++----------
 .../ogg/base_k3boggvorbisencodersettingswidget.ui  | 16 +++++++--------
 plugins/encoder/ogg/k3boggvorbisencoder.cpp        |  4 ++--
 .../encoder/sox/base_k3bsoxencoderconfigwidget.ui  |  8 ++++----
 plugins/encoder/sox/k3bsoxencoder.cpp              |  2 +-
 10 files changed, 46 insertions(+), 46 deletions(-)

(limited to 'plugins/encoder')

diff --git a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
index 5c69fec..1f61071 100644
--- a/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
+++ b/plugins/encoder/external/base_k3bexternalencoderconfigwidget.ui
@@ -88,7 +88,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -104,7 +104,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>71</width>
                                     <height>20</height>
diff --git a/plugins/encoder/external/k3bexternalencoder.cpp b/plugins/encoder/external/k3bexternalencoder.cpp
index 7f54bf9..2290012 100644
--- a/plugins/encoder/external/k3bexternalencoder.cpp
+++ b/plugins/encoder/external/k3bexternalencoder.cpp
@@ -242,7 +242,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   kdDebug() << s << flush << endl;
 
   // set one general error message
-  setLastError( i18n("Command failed: %1").tqarg( s ) );
+  setLastError( i18n("Command failed: %1").arg( s ) );
   
   if( d->process->start( KProcess::NotifyOnExit, KProcess::All ) ) {
     if( d->cmd.writeWaveHeader )
@@ -253,7 +253,7 @@ bool K3bExternalEncoder::initEncoderInternal( const TQString& extension )
   else {
     TQString commandName = d->cmd.command.section( TQRegExp("\\s+"), 0 );
     if( !KStandardDirs::findExe( commandName ).isEmpty() )
-      setLastError( i18n("Could not find program '%1'").tqarg(commandName) );
+      setLastError( i18n("Could not find program '%1'").arg(commandName) );
 
     return false;
   }
diff --git a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
index 7f2b289..1628d8c 100644
--- a/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
+++ b/plugins/encoder/external/k3bexternalencoderconfigwidget.cpp
@@ -18,7 +18,7 @@
 #include <k3bcore.h>
 
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqlistview.h>
 #include <tqpushbutton.h>
 
diff --git a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
index d7ed073..a874760 100644
--- a/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
+++ b/plugins/encoder/lame/base_k3blameencodersettingswidget.ui
@@ -48,7 +48,7 @@
                             </property>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout10</cstring>
+                                    <cstring>layout10</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -77,7 +77,7 @@
                                         <property name="text">
                                             <string>textLabel1</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                     </widget>
@@ -116,7 +116,7 @@
                                         <property name="sizeType">
                                             <enum>Fixed</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>20</height>
@@ -125,7 +125,7 @@
                                     </spacer>
                                     <widget class="TQLayoutWidget">
                                         <property name="name">
-                                            <cstring>tqlayout8</cstring>
+                                            <cstring>layout8</cstring>
                                         </property>
                                         <grid>
                                             <property name="name">
@@ -143,7 +143,7 @@
                                                 <property name="text">
                                                     <string>high quality</string>
                                                 </property>
-                                                <property name="tqalignment">
+                                                <property name="alignment">
                                                     <set>AlignVCenter|AlignRight</set>
                                                 </property>
                                             </widget>
@@ -191,7 +191,7 @@
                                 <property name="sizeType">
                                     <enum>Fixed</enum>
                                 </property>
-                                <property name="tqsizeHint">
+                                <property name="sizeHint">
                                     <size>
                                         <width>20</width>
                                         <height>20</height>
@@ -200,7 +200,7 @@
                             </spacer>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout12</cstring>
+                                    <cstring>layout12</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -229,7 +229,7 @@
                                         <property name="text">
                                             <string>textLabel2</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                     </widget>
@@ -237,7 +237,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout11</cstring>
+                                    <cstring>layout11</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -259,7 +259,7 @@
                                         <property name="sizeType">
                                             <enum>Expanding</enum>
                                         </property>
-                                        <property name="tqsizeHint">
+                                        <property name="sizeHint">
                                             <size>
                                                 <width>20</width>
                                                 <height>5</height>
@@ -326,7 +326,7 @@
                             </widget>
                             <widget class="TQLayoutWidget">
                                 <property name="name">
-                                    <cstring>tqlayout2</cstring>
+                                    <cstring>layout2</cstring>
                                 </property>
                                 <hbox>
                                     <property name="name">
@@ -360,7 +360,7 @@
                                         <property name="text">
                                             <string>high quality</string>
                                         </property>
-                                        <property name="tqalignment">
+                                        <property name="alignment">
                                             <set>AlignVCenter|AlignRight</set>
                                         </property>
                                     </widget>
diff --git a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
index f22ad76..9df1c17 100644
--- a/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
+++ b/plugins/encoder/lame/base_k3bmanualbitratesettingswidget.ui
@@ -43,7 +43,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout3</cstring>
+                        <cstring>layout3</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -59,7 +59,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -119,7 +119,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/plugins/encoder/lame/k3blameencoder.cpp b/plugins/encoder/lame/k3blameencoder.cpp
index 8946f19..9abfa37 100644
--- a/plugins/encoder/lame/k3blameencoder.cpp
+++ b/plugins/encoder/lame/k3blameencoder.cpp
@@ -28,14 +28,14 @@
 #include <kcombobox.h>
 #include <kdialogbase.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqcstring.h>
 #include <tqradiobutton.h>
 #include <tqcheckbox.h>
 #include <tqspinbox.h>
 #include <tqgroupbox.h>
 #include <tqbuttongroup.h>
-#include <tqtextcodec.h>
+#include <textcodec.h>
 #include <tqfile.h>
 #include <tqslider.h>
 #include <tqlabel.h>
@@ -411,13 +411,13 @@ K3bLameEncoderSettingsWidget::K3bLameEncoderSettingsWidget( TQWidget* parent, co
   m_manualSettingsDlg->setMainWidget( m_brW );
 
   for( int i = 0; s_lame_bitrates[i]; ++i )
-    m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+    m_brW->m_comboMaximumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
 
   for( int i = 0; s_lame_bitrates[i]; ++i )
-    m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+    m_brW->m_comboMinimumBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
 
   for( int i = 0; s_lame_bitrates[i]; ++i )
-    m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).tqarg(s_lame_bitrates[i]) );
+    m_brW->m_comboConstantBitrate->insertItem( i18n("%1 kbps" ).arg(s_lame_bitrates[i]) );
 
 
   TQHBoxLayout* lay = new TQHBoxLayout( this );
@@ -469,11 +469,11 @@ void K3bLameEncoderSettingsWidget::updateManualSettingsLabel()
 {
   if( m_brW->m_radioConstantBitrate->isChecked() )
     m_w->m_labelManualSettings->setText( i18n("Constant Bitrate: %1 kbps (%2)")
-					 .tqarg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()])
-					 .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
+					 .arg(s_lame_bitrates[m_brW->m_comboConstantBitrate->currentItem()])
+					 .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
   else
     m_w->m_labelManualSettings->setText( i18n("Variable Bitrate (%1)")
-					 .tqarg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
+					 .arg(i18n(s_lame_mode_strings[m_brW->m_comboMode->currentItem()])) );
 }
 
 
@@ -507,9 +507,9 @@ void K3bLameEncoderSettingsWidget::loadConfig()
   else
     m_brW->m_radioConstantBitrate->setChecked( true );
 
-  m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Constant Bitrate", 128 )) );
-  m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Maximum Bitrate", 224 )) );
-  m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").tqarg(c->readNumEntry( "Minimum Bitrate", 32 )) );
+  m_brW->m_comboConstantBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Constant Bitrate", 128 )) );
+  m_brW->m_comboMaximumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Maximum Bitrate", 224 )) );
+  m_brW->m_comboMinimumBitrate->setCurrentItem( i18n("%1 kbps").arg(c->readNumEntry( "Minimum Bitrate", 32 )) );
   m_brW->m_spinAverageBitrate->setValue( c->readNumEntry( "Average Bitrate", 128) );
 
   m_brW->m_checkBitrateMaximum->setChecked( c->readBoolEntry( "Use Maximum Bitrate", false ) );
diff --git a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
index d0a6f2d..a76c3c5 100644
--- a/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
+++ b/plugins/encoder/ogg/base_k3boggvorbisencodersettingswidget.ui
@@ -33,7 +33,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout7</cstring>
+                        <cstring>layout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -68,7 +68,7 @@
                             <property name="text">
                                 <string>textLabel1</string>
                             </property>
-                            <property name="tqalignment">
+                            <property name="alignment">
                                 <set>AlignVCenter|AlignRight</set>
                             </property>
                         </widget>
@@ -101,7 +101,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -110,7 +110,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout8</cstring>
+                                <cstring>layout8</cstring>
                             </property>
                             <grid>
                                 <property name="name">
@@ -148,7 +148,7 @@
                                     <property name="text">
                                         <string>high quality</string>
                                     </property>
-                                    <property name="tqalignment">
+                                    <property name="alignment">
                                         <set>AlignVCenter|AlignRight</set>
                                     </property>
                                 </widget>
@@ -179,7 +179,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -196,7 +196,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout6</cstring>
+                        <cstring>layout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -212,7 +212,7 @@
                             <property name="sizeType">
                                 <enum>Fixed</enum>
                             </property>
-                            <property name="tqsizeHint">
+                            <property name="sizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>21</height>
diff --git a/plugins/encoder/ogg/k3boggvorbisencoder.cpp b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
index 7878497..685d9e0 100644
--- a/plugins/encoder/ogg/k3boggvorbisencoder.cpp
+++ b/plugins/encoder/ogg/k3boggvorbisencoder.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <knuminput.h>
 
-#include <tqlayout.h>
+#include <layout.h>
 #include <tqradiobutton.h>
 #include <tqslider.h>
 #include <tqlcdnumber.h>
@@ -470,7 +470,7 @@ K3bOggVorbisEncoderSettingsWidget::~K3bOggVorbisEncoderSettingsWidget()
 void K3bOggVorbisEncoderSettingsWidget::slotQualityLevelChanged( int val )
 {
   w->m_labelQualityLevel->setText( TQString::number(val) + " " 
-				   + i18n("(targetted VBR of %1)").tqarg(s_rough_average_quality_level_bitrates[val+1]) );
+				   + i18n("(targetted VBR of %1)").arg(s_rough_average_quality_level_bitrates[val+1]) );
 }
 
 
diff --git a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
index 332dce0..ce874d3 100644
--- a/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
+++ b/plugins/encoder/sox/base_k3bsoxencoderconfigwidget.ui
@@ -30,7 +30,7 @@
         </widget>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout2</cstring>
+                <cstring>layout2</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -46,7 +46,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="tqsizeHint">
+                    <property name="sizeHint">
                         <size>
                             <width>20</width>
                             <height>10</height>
@@ -55,7 +55,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout1</cstring>
+                        <cstring>layout1</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -219,7 +219,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="tqsizeHint">
+            <property name="sizeHint">
                 <size>
                     <width>250</width>
                     <height>16</height>
diff --git a/plugins/encoder/sox/k3bsoxencoder.cpp b/plugins/encoder/sox/k3bsoxencoder.cpp
index ee69541..674091b 100644
--- a/plugins/encoder/sox/k3bsoxencoder.cpp
+++ b/plugins/encoder/sox/k3bsoxencoder.cpp
@@ -33,7 +33,7 @@
 #include <tqlineedit.h>
 #include <tqcombobox.h>
 #include <tqcheckbox.h>
-#include <tqlayout.h>
+#include <layout.h>
 
 #include <sys/types.h>
 #include <sys/wait.h>
-- 
cgit v1.2.3