Rename obsolete tq methods to standard names

5 files changed, 23 insertions, 23 deletions

diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index 3c8a1668..f8c1df7a 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -53,7 +53,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
          , m_valueChanged( false )
          , m_stringValue( defaultvalue )
 {
-    TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+    TQGridLayout *grid = (TQGridLayout*)parent->layout();
 
     m_w = new KLineEdit( m_stringValue, parent );
     connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
@@ -79,7 +79,7 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
    , m_valueChanged( false )
    , m_stringValue( defaultvalue )
 {
-    TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+    TQGridLayout *grid = (TQGridLayout*)parent->layout();
 
     m_key = str;
 
@@ -110,7 +110,7 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
                                     HelixEngine *engine )
    : deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine)
 {
-   TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
+   TQGridLayout *grid = (TQGridLayout*)parent->layout();
 
    deviceComboBox = new KComboBox( false, parent, "deviceComboBox" );
    deviceComboBox->insertItem("oss");  // I believe these are not subject to translation (they don't seem to be in xine,
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
index 80cdc30b..4d6d7178 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h
@@ -1129,7 +1129,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
      *	Method:
      *	    IHXLayoutStream::GetProperty
      *	Purpose:
-     *	    Get tqlayout stream property
+     *	    Get layout stream property
      *	    
      *
      */
@@ -1140,7 +1140,7 @@ DECLARE_INTERFACE_(IHXLayoutStream, IUnknown)
      *	Method:
      *	    IHXLayoutStream::SetProperty
      *	Purpose:
-     *	    Set tqlayout stream property
+     *	    Set layout stream property
      *
      */
     STDTQT_METHOD(SetProperties)		(THIS_
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
index c70a3cb1..1ccba13b 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h
@@ -614,9 +614,9 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
      *  Method:
      *    IHXSiteSupplier::BeginChangeLayout
      *  Purpose:
-     *    Called to inform the site supplier a tqlayout change has beginning
+     *    Called to inform the site supplier a layout change has beginning
      *	  it can expect to receive SitesNeeded() and SitesNotNeeded() calls
-     *	  while a tqlayout change is in progress,
+     *	  while a layout change is in progress,
      */
     STDTQT_METHOD(BeginChangeLayout) (THIS) PURE;
 
@@ -624,7 +624,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
      *  Method:
      *    IHXSiteSupplier::DoneChangeLayout
      *  Purpose:
-     *    Called to inform the site supplier the tqlayout change has been
+     *    Called to inform the site supplier the layout change has been
      *	  completed.
      */
     STDTQT_METHOD(DoneChangeLayout) (THIS) PURE;
@@ -642,7 +642,7 @@ DECLARE_INTERFACE_(IHXSiteSupplier, IUnknown)
  *
  *	Interface implemented by the client core. This interface is called
  *	by users of the client core to inform it of IHXSite's which are
- *	available for tqlayout of renderers
+ *	available for layout of renderers
  *
  *  IID_IHXSiteManager:
  *
@@ -923,7 +923,7 @@ DECLARE_INTERFACE_(IHXSiteFullScreen, IUnknown)
  *
  *  Purpose:
  *
- *	Allow tqlayout site groups to be added and removed
+ *	Allow layout site groups to be added and removed
  *
  *  IID_IHXLayoutSiteGroupManager:
  *
diff --git a/amarok/src/engine/nmm/nmm_configdialogbase.ui b/amarok/src/engine/nmm/nmm_configdialogbase.ui
index ca8a7b92..c716be9c 100644
--- a/amarok/src/engine/nmm/nmm_configdialogbase.ui
+++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout6</cstring>
+                <cstring>layout6</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -130,7 +130,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout5</cstring>
+                        <cstring>layout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -159,7 +159,7 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout13</cstring>
+                                <cstring>layout13</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
diff --git a/amarok/src/engine/xine/xineconfigbase.ui b/amarok/src/engine/xine/xineconfigbase.ui
index 7e55162a..50e87bbf 100644
--- a/amarok/src/engine/xine/xineconfigbase.ui
+++ b/amarok/src/engine/xine/xineconfigbase.ui
@@ -32,7 +32,7 @@
         </property>
         <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>tqlayout11</cstring>
+                <cstring>layout11</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -74,7 +74,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>tqlayout10</cstring>
+                        <cstring>layout10</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -82,7 +82,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>tqlayout10</cstring>
+                                <cstring>layout10</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -90,7 +90,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout2</cstring>
+                                        <cstring>layout2</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -241,7 +241,7 @@
                                 </widget>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>tqlayout5</cstring>
+                                        <cstring>layout5</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -278,7 +278,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout4</cstring>
+                                                <cstring>layout4</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
@@ -318,7 +318,7 @@
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout2</cstring>
+                                                <cstring>layout2</cstring>
                                             </property>
                                             <hbox>
                                                 <property name="name">
@@ -376,7 +376,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout11</cstring>
+                                                <cstring>layout11</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -419,7 +419,7 @@
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>tqlayout12</cstring>
+                                                <cstring>layout12</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -435,7 +435,7 @@
                                                 </widget>
                                                 <widget class="TQLayoutWidget">
                                                     <property name="name">
-                                                        <cstring>tqlayout10</cstring>
+                                                        <cstring>layout10</cstring>
                                                     </property>
                                                     <hbox>
                                                         <property name="name">