Remove the tq in front of these incorrectly TQt4-converted methods/data members:

tqrepaint[...] tqinvalidate[...] tqparent[...] tqmask[...] tqlayout[...] tqalignment[...] git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1240522 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
11 years ago · e8cac8c271
81 changed files with 272 additions and 272 deletions
--- a/amarok/src/Options1.ui
+++ b/amarok/src/Options1.ui
@ -691,7 +691,7 @@
 <functions>
    <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kcombobox.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/amarok/src/Options2.ui
+++ b/amarok/src/Options2.ui
@ -755,7 +755,7 @@
 <functions>
    <function access="private" specifier="non virtual">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kfontrequester.h</includehint>
    <includehint>kfontrequester.h</includehint>
--- a/amarok/src/Options2.ui.h
+++ b/amarok/src/Options2.ui.h
@ -41,8 +41,8 @@
 class AmarokThemeNewStuff : public KNewStuff
 {
    public:
-    AmarokThemeNewStuff(const TQString &type, TQWidget *tqparentWidget=0)
-             : KNewStuff( type, tqparentWidget )
+    AmarokThemeNewStuff(const TQString &type, TQWidget *parentWidget=0)
+             : KNewStuff( type, parentWidget )
    {}

    bool install( const TQString& fileName )
--- a/amarok/src/Options4.ui
+++ b/amarok/src/Options4.ui
@ -618,5 +618,5 @@
        <slot>setEnabled(bool)</slot>
    </connection>
 </connections>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/Options5.ui
+++ b/amarok/src/Options5.ui
@ -523,7 +523,7 @@
    <function access="protected">hideEvent( QHideEvent * )</function>
    <function access="protected">showEvent( QShowEvent * )</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>ktextedit.h</includehint>
 </includehints>
--- a/amarok/src/Options7.ui
+++ b/amarok/src/Options7.ui
@ -73,7 +73,7 @@
        <data format="XBM.GZ" length="79">789c534e494dcbcc4b554829cdcdad8c2fcf4c29c95030e0524611cd48cd4ccf28010a1797249664262b2467241641a592324b8aa363156c15aab914146aadb90067111b1f</data>
    </image>
 </images>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>klineedit.h</includehint>
    <includehint>kpushbutton.h</includehint>
--- a/amarok/src/Options8.ui
+++ b/amarok/src/Options8.ui
@ -294,7 +294,7 @@
 <Q_SLOTS>
    <slot access="protected">updateServices( const QString &amp; s )</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
    <includehint>kactivelabel.h</includehint>
--- a/amarok/src/browserbar.cpp
+++ b/amarok/src/browserbar.cpp
@ -44,7 +44,7 @@ namespace Amarok
        virtual void paintEvent( TQPaintEvent* )
        {
            TQPainter p( this );
-            tqparentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal );
+            parentWidget()->tqstyle().tqdrawPrimitive( TQStyle::PE_Splitter, &p, rect(), tqcolorGroup(), TQStyle::Style_Horizontal );
        }

        virtual void styleChange( TQStyle& )
--- a/amarok/src/collectionbrowser.cpp
+++ b/amarok/src/collectionbrowser.cpp
@ -197,7 +197,7 @@ CollectionBrowser::CollectionBrowser( const char* name )
    //m_tagfilterMenuButton->setEnabled( m_view->m_viewMode == CollectionView::modeTreeView );
    //connect ( m_treeViewAction, TQT_SIGNAL ( toggled(bool) ), m_tagfilterMenuButton, TQT_SLOT( setEnabled (bool) ) );

-    tqlayoutToolbar();
+    layoutToolbar();

    m_categoryMenu = m_tagfilterMenuButton->popupMenu();
    m_categoryMenu->insertItem( i18n( "Artist" ), m_view, TQT_SLOT( presetMenu( int ) ), 0, IdArtist );
@ -395,7 +395,7 @@ CollectionBrowser::eventFilter( TQObject *o, TQEvent *e )
 }

 void
-CollectionBrowser::tqlayoutToolbar()
+CollectionBrowser::layoutToolbar()
 {
    if ( !m_toolbar ) return;

@ -784,23 +784,23 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
        if ( lastChild() )
            ensureItemVisible( lastChild() );

-        //Create a reverse list of tqparents, grandtqparents etc.
-        //Later we try to make the grandtqparents in view, then their tqchildren etc.
+        //Create a reverse list of parents, grandparents etc.
+        //Later we try to make the grandparents in view, then their tqchildren etc.
        //This means that the selected item has the most priority as it is done last.
-        TQValueStack<TQListViewItem*> tqparents;
+        TQValueStack<TQListViewItem*> parents;
        while ( r )
        {
-            tqparents.push( r );
+            parents.push( r );
            r = r->tqparent();
        }
-        while ( !tqparents.isEmpty() )
+        while ( !parents.isEmpty() )
        {
            //We would prefer the next item to be visible.
-            if ( tqparents.top()->nextSibling() )
-                ensureItemVisible( tqparents.top()->nextSibling() );
+            if ( parents.top()->nextSibling() )
+                ensureItemVisible( parents.top()->nextSibling() );
            //It's even more important the actual item is visible than the next one.
-            ensureItemVisible( tqparents.top() );
-            tqparents.pop();
+            ensureItemVisible( parents.top() );
+            parents.pop();
        }
    }
 }
@ -2378,7 +2378,7 @@ CollectionView::listSelected()
    }


-    //first pass: tqparents
+    //first pass: parents
    for ( item = firstChild(); item; item = item->nextSibling() )
        if ( item->isSelected() )
        {
--- a/amarok/src/collectionbrowser.h
+++ b/amarok/src/collectionbrowser.h
@ -80,7 +80,7 @@ class CollectionBrowser: public TQVBox
        void slotEditFilter();

    private:
-        void tqlayoutToolbar();
+        void layoutToolbar();
        void ipodToolbar( bool activate );
        void appendSearchResults();

@ -315,8 +315,8 @@ class CollectionView : public KListView, public DropProxyTarget
        void cacheView();
        void restoreView();

-        //Used to store the name of an item (and its tqparents), so it can be recalled later
-        //even if the pointer to the item has been tqinvalidated.
+        //Used to store the name of an item (and its parents), so it can be recalled later
+        //even if the pointer to the item has been invalidated.
        TQStringList makeStructuredNameList( TQListViewItem* ) const;
        TQListViewItem* findFromStructuredNameList( const TQStringList& ) const;

--- a/amarok/src/collectiondb.cpp
+++ b/amarok/src/collectiondb.cpp
@ -2572,7 +2572,7 @@ CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &tq
    command += ( image.isEmpty() ?       "NULL" : '\'' + escapeString( image.url() ) + '\'' ) + ',';
    command += ( description.isEmpty() ? "NULL" : '\'' + escapeString( description ) + '\'' ) + ',';
    command += ( copyright.isEmpty() ?   "NULL" : '\'' + escapeString( copyright ) + '\'' ) + ',';
-    command += TQString::number( pcb.tqparentId() ) + ",'";
+    command += TQString::number( pcb.parentId() ) + ",'";
    command += escapeString( pcb.saveLocation() ) + "',";
    command += pcb.autoscan() ? boolT() + ',' : boolF() + ',';
    command += TQString::number( pcb.fetchType() ) + ',';
@ -2812,17 +2812,17 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc

 // return newly created folder id
 int
-CollectionDB::addPodcastFolder( const TQString &name, const int tqparent_id, const bool isOpen )
+CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const bool isOpen )
 {
    TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" );
    command += escapeString( name )   + "',";
-    command += TQString::number( tqparent_id ) + ",";
+    command += TQString::number( parent_id ) + ",";
    command += isOpen ? boolT() + ");" : boolF() + ");";

    insert( command, NULL );

    command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" )
-                       .tqarg( name, TQString::number(tqparent_id) );
+                       .tqarg( name, TQString::number(parent_id) );
    TQStringList values = query( command );

    return values[0].toInt();
@ -2841,7 +2841,7 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b )
 		       << escapeString( b.link().url() )
 		       << escapeString( b.description() )
 		       << escapeString( b.copyright() )
-		       << TQString::number( b.tqparentId() )
+		       << TQString::number( b.parentId() )
 		       << escapeString( b.saveLocation() )
 		       << ( b.autoscan() ? boolT() : boolF() )
 		       << TQString::number( b.fetchType() )
@ -2888,13 +2888,13 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b
 }

 void
-CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id, const bool isOpen )
+CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen )
 {
    if( getDbConnectionType() == DbConnection::postgresql ) {
        query( TQStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" )
                .args( TQStringList()
                    << escapeString(name)
-                    << TQString::number(tqparent_id)
+                    << TQString::number(parent_id)
                    << ( isOpen ? boolT() : boolF() )
                    << TQString::number(folder_id)
                    )
@ -2906,7 +2906,7 @@ CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, co
                .args( TQStringList()
                    << TQString::number(folder_id)
                    << escapeString(name)
-                    << TQString::number(tqparent_id)
+                    << TQString::number(parent_id)
                    << ( isOpen ? boolT() : boolF() )
                    )
             );
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@ -345,7 +345,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
        /// Insert a podcast episode into the database.  If @param idToUpdate is provided, replace the row
        /// use updatePodcastEpisode() always in preference
        int  addPodcastEpisode( const PodcastEpisodeBundle &episode, const int idToUpdate=0 );
-        int  addPodcastFolder( const TQString &name, const int tqparent_id=0, const bool isOpen=false );
+        int  addPodcastFolder( const TQString &name, const int parent_id=0, const bool isOpen=false );
        TQValueList<PodcastChannelBundle> getPodcastChannels();
        PodcastEpisodeBundle getPodcastEpisodeById( int id );
        TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &tqparent, bool newOnly=false, int limit=-1 );
@ -354,7 +354,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
        void removePodcastFolder( const int id );
        void updatePodcastChannel( const PodcastChannelBundle &b );
        void updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b );
-        void updatePodcastFolder( const int folder_id, const TQString &name, const int tqparent_id=0, const bool isOpen=false );
+        void updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id=0, const bool isOpen=false );
        // these return false when no bundle was available
        bool getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *channel );
        bool getPodcastEpisodeBundle( const KURL &url, PodcastEpisodeBundle *channel );
@ -494,7 +494,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
        bool isConnected();
        void releasePreviousConnection(TQThread *currThread);

-        void tqinvalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; };
+        void invalidateArtistAlbumCache() { m_validArtistCache=false; m_validComposerCache=false; m_validAlbumCache=false; };

        void vacuum();

--- a/amarok/src/collectionscanner/collectionscanner.cpp
+++ b/amarok/src/collectionscanner/collectionscanner.cpp
@ -132,7 +132,7 @@ CollectionScanner::doJob() //SLOT
    else {
        foreachType( TQStringList, m_folders ) {
            if( (*it).isEmpty() )
-                //aptqparently somewhere empty strings get into the mix
+                //apparently somewhere empty strings get into the mix
                //which results in a full-system scan! Which we can't allow
                continue;

--- a/amarok/src/dbsetup.ui
+++ b/amarok/src/dbsetup.ui
@ -455,7 +455,7 @@
 <functions>
    <function access="private">init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>knuminput.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/amarok/src/deletedialogbase.ui
+++ b/amarok/src/deletedialogbase.ui
@ -128,7 +128,7 @@
 <Q_SLOTS>
    <slot access="protected">slotShouldDelete(bool)</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>klistbox.h</includehint>
 </includehints>
--- a/amarok/src/devicemanager.cpp
+++ b/amarok/src/devicemanager.cpp
@ -58,7 +58,7 @@ DeviceManager::DeviceManager()
        else
        {
            m_valid = true;
-            //run the DCOP query here because aptqparently if you don't run KDE as a DM the first call will fail
+            //run the DCOP query here because apparently if you don't run KDE as a DM the first call will fail
            //...go figure
            TQByteArray data, replyData;
            TQCString replyType;
--- 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
@ -497,7 +497,7 @@ DECLARE_INTERFACE_(IHXSiteWatcher, IUnknown)
 *
 *  Purpose:
 *
- *	Interface implemented by renderers and objects with provide tqlayouts to
+ *	Interface implemented by renderers and objects with provide layouts to
 *	the client core. This interface is called by the core when it needs a 
 *	new IHXSiteUser, or when it is done using an IHXSiteUser.
 *
@ -1628,7 +1628,7 @@ DECLARE_INTERFACE_(IHXSubRectSite, IHXSite)
    STDTQT_METHOD(SendSubRectMessages) (THIS_ HXBOOL bRet ) PURE;
    /*
     * New damage region call that takes the cross platfrom region
-     * defined in hxwintyp.h and tqinvalidates the rects in it
+     * defined in hxwintyp.h and invalidates the rects in it
     */
    STDTQT_METHOD(SubRectDamageRegion) (THIS_ HXxBoxRegion* pRegion ) PURE;
    /*
--- a/amarok/src/engine/helix/hxplayercontrol.cpp
+++ b/amarok/src/engine/helix/hxplayercontrol.cpp
@ -160,7 +160,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
   }


-   if (!iamtqparent) // tqchildren stay here, tqparents return
+   if (!iamtqparent) // tqchildren stay here, parents return
   {
      int rfd = m_tqchildren[m_index].m_pipeB[0];
      int wfd = m_tqchildren[m_index].m_pipeA[1];
--- a/amarok/src/engine/nmm/nmm_configdialogbase.ui
+++ b/amarok/src/engine/nmm/nmm_configdialogbase.ui
@ -223,5 +223,5 @@ This setting will enable audio on the three hosts desktop, laptop and kitchen, a
        </spacer>
    </vbox>
 </widget>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/engine/xine/xine-engine.cpp
+++ b/amarok/src/engine/xine/xine-engine.cpp
@ -161,7 +161,7 @@ XineEngine::makeNewStream()

   m_audioPort = xine_open_audio_driver( m_xine, XineCfg::outputPlugin().local8Bit(), NULL );
   if( !m_audioPort ) {
-      //TODO make engine method that is the same but tqparents the dialog for us
+      //TODO make engine method that is the same but parents the dialog for us
      KMessageBox::error( 0, i18n("xine was unable to initialize any audio drivers.") );
      return false;
   }
--- a/amarok/src/engine/xine/xineconfigbase.ui
+++ b/amarok/src/engine/xine/xineconfigbase.ui
@ -502,5 +502,5 @@
 <includes>
    <include location="local" impldecl="in declaration">plugin/pluginconfig.h</include>
 </includes>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/equalizersetup.cpp
+++ b/amarok/src/equalizersetup.cpp
@ -96,7 +96,7 @@ EqualizerSetup::EqualizerSetup()
    m_groupBoxSliders->setInsideMargin( KDialog::marginHint() );
    connect( m_groupBoxSliders, TQT_SIGNAL( toggled( bool ) ), TQT_SLOT( setEqualizerEnabled( bool ) ) );

-    // Helper widget for tqlayouting inside the groupbox
+    // Helper widget for layouting inside the groupbox
    TQWidget* slidersLayoutWidget = new TQWidget( m_groupBoxSliders );
    slidersLayoutWidget->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
    TQGridLayout* slidersGridLayout = new TQGridLayout( slidersLayoutWidget, 1, 1, 0, KDialog::spacingHint() );
@ -118,7 +118,7 @@ EqualizerSetup::EqualizerSetup()
    const char *bandLabels[] = { "30", "60", "125", "250", "500", "1k", "2k", "4k", "8k", "16k" };

    int minWidth = 0;
-    TQFontMetrics fm = fontMetrics(); //aptqparently it's an expensive call
+    TQFontMetrics fm = fontMetrics(); //apparently it's an expensive call
    for ( int i = 0; i < 10; i++ ) {
         int w = fm.width( bandLabels[i] );
         if ( w > minWidth )
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@ -117,7 +117,7 @@ private slots:
    void activate( TQListViewItem* );

 private:
-    KURL searchURL() const { return static_cast<FileBrowser*>(tqparentWidget())->url(); }
+    KURL searchURL() const { return static_cast<FileBrowser*>(parentWidget())->url(); }

    TQLineEdit  *m_lineEdit;
    KURLView   *m_listView;
--- a/amarok/src/firstrunwizard.ui
+++ b/amarok/src/firstrunwizard.ui
@ -290,7 +290,7 @@
    <function specifier="non virtual">writeCollectionConfig()</function>
    <function specifier="non virtual" returnType="FirstRunWizard::Interface">interface()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
    <includehint>kactivelabel.h</includehint>
--- a/amarok/src/htmlview.cpp
+++ b/amarok/src/htmlview.cpp
@ -27,8 +27,8 @@ KTempFile *HTMLView::m_headerGradientImage = 0;
 KTempFile *HTMLView::m_shadowGradientImage = 0;
 int HTMLView::m_instances = 0;

-HTMLView::HTMLView( TQWidget *tqparentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled )
-        : KHTMLPart( tqparentWidget, widgetname )
+HTMLView::HTMLView( TQWidget *parentWidget, const char *widgetname, const bool DNDEnabled, const bool JScriptEnabled )
+        : KHTMLPart( parentWidget, widgetname )
 {
    m_instances++;
    setJavaEnabled( false );
--- a/amarok/src/htmlview.h
+++ b/amarok/src/htmlview.h
@ -19,7 +19,7 @@ class HTMLView : public KHTMLPart
  TQ_OBJECT

    public:
-        HTMLView( TQWidget *tqparentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true );
+        HTMLView( TQWidget *parentWidget = 0, const char *widgetname = 0, const bool DNDEnabled = false, const bool JScriptEnabled = true );
       ~HTMLView();

        static TQString loadStyleSheet();
--- a/amarok/src/inotify/inotify.h
+++ b/amarok/src/inotify/inotify.h
@ -73,7 +73,7 @@ struct inotify_event {

 extern void inotify_inode_queue_event(struct inode *, __u32, __u32,
 				      const char *);
-extern void inotify_dentry_tqparent_queue_event(struct dentry *, __u32, __u32,
+extern void inotify_dentry_parent_queue_event(struct dentry *, __u32, __u32,
 					      const char *);
 extern void inotify_unmount_inodes(struct list_head *);
 extern void inotify_inode_is_dead(struct inode *);
@ -87,7 +87,7 @@ static inline void inotify_inode_queue_event(struct inode *inode,
 {
 }

-static inline void inotify_dentry_tqparent_queue_event(struct dentry *dentry,
+static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
 						     __u32 tqmask, __u32 cookie,
 						     const char *filename)
 {
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.cpp
@ -25,8 +25,8 @@

 #include <tqfile.h>

-MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname )
-        : KHTMLPart( tqparentWidget, widgetname )
+MagnatuneArtistInfoBox::MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname )
+        : KHTMLPart( parentWidget, widgetname )
 {}


--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@ -41,11 +41,11 @@ class MagnatuneArtistInfoBox : public KHTMLPart
 public:
    /**
     * Constructor
-     * @param tqparentWidget The tqparent TQWidget
+     * @param parentWidget The tqparent TQWidget
     * @param widgetname The name of this widget
     * @return New MagnatuneArtistInfoBox object
     */
-    MagnatuneArtistInfoBox( TQWidget *tqparentWidget, const char *widgetname );
+    MagnatuneArtistInfoBox( TQWidget *parentWidget, const char *widgetname );

    /**
     * Destructor
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialogbase.ui
@ -111,7 +111,7 @@
 <Q_SLOTS>
    <slot access="protected">downloadButtonClicked()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kurlrequester.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@ -59,7 +59,7 @@ void MagnatuneListViewArtistItem::setOpen( bool o )
    }
    listView()->setUpdatesEnabled( true );
    KListViewItem::setOpen( o );
-    tqinvalidateHeight();
+    invalidateHeight();
    listView()->repaintContents();
   
     
@ -117,7 +117,7 @@ void MagnatuneListViewAlbumItem::setOpen( bool o )

    listView()->setUpdatesEnabled( true );
    KListViewItem::setOpen( o );
-    tqinvalidateHeight();
+    invalidateHeight();
    listView()->repaintContents();
    
    
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialogbase.ui
@ -702,5 +702,5 @@
    <slot>purchase()</slot>
    <slot>cancel()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 </UI>
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialogbase.ui
@ -102,7 +102,7 @@
    <slot access="protected">redownload()</slot>
    <slot access="protected">selectionChanged()</slot>
 </Q_SLOTS>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>klistview.h</includehint>
 </includehints>
--- a/amarok/src/mediadevice/daap/addhostbase.ui
+++ b/amarok/src/mediadevice/daap/addhostbase.ui
@ -170,7 +170,7 @@
 </widget>
 <customwidgets>
 </customwidgets>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/amarok/src/mediadevice/daap/codes.rb
+++ b/amarok/src/mediadevice/daap/codes.rb
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@ -403,37 +403,37 @@ DaapClient::createTree( const TQString& /*host*/, Daap::SongList bundles )
    TQStringList artists = bundles.keys();
    foreach( artists )
    {
-        MediaItem* tqparentArtist =  new MediaItem( root );
-        tqparentArtist->setType( MediaItem::ARTIST );
+        MediaItem* parentArtist =  new MediaItem( root );
+        parentArtist->setType( MediaItem::ARTIST );
        Daap::AlbumList albumMap = *( bundles.tqfind(*it) );
-        tqparentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively
+        parentArtist->setText( 0, (*albumMap.begin()).getFirst()->artist() ); //map was made case insensitively
                                                                              //just get the displayed-case from
                                                                              //the first track
        TQStringList albums = albumMap.keys();
        for ( TQStringList::Iterator itAlbum = albums.begin(); itAlbum != albums.end(); ++itAlbum )
        {
-            MediaItem* tqparentAlbum = new MediaItem( tqparentArtist );
-            tqparentAlbum->setType( MediaItem::ALBUM );
+            MediaItem* parentAlbum = new MediaItem( parentArtist );
+            parentAlbum->setType( MediaItem::ALBUM );
            MetaBundle* track;

            Daap::TrackList trackList = *albumMap.tqfind(*itAlbum);
-            tqparentAlbum->setText( 0, trackList.getFirst()->album() );
+            parentAlbum->setText( 0, trackList.getFirst()->album() );

            for( track = trackList.first(); track; track = trackList.next() )
            {
                if( m_removeDuplicates && trackExistsInCollection( track ) )
                    continue;
-                MediaItem* childTrack = new MediaItem( tqparentAlbum );
+                MediaItem* childTrack = new MediaItem( parentAlbum );
                childTrack->setText( 0, track->title() );
                childTrack->setType( MediaItem::TRACK );
                childTrack->setBundle( track );
                childTrack->m_order = track->track();
            }
-            if( !tqparentAlbum->childCount() )
-                delete tqparentAlbum;
+            if( !parentAlbum->childCount() )
+                delete parentAlbum;
        }
-        if( !tqparentArtist->childCount() )
-            delete tqparentArtist;
+        if( !parentArtist->childCount() )
+            delete parentArtist;
    }
    root->resetTitle();
    root->stopAnimation();
--- a/amarok/src/mediadevice/daap/daapreader/reader.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp
@ -122,7 +122,7 @@ Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQS
        s_codes["asda"] = Code( "daap.songdateadded", DATE );
        s_codes["asbr"] = Code( "daap.songbitrate", SHORT );
        s_codes["mcti"] = Code( "dmap.containeritemid", LONG );
-        s_codes["mpco"] = Code( "dmap.tqparentcontainerid", LONG );
+        s_codes["mpco"] = Code( "dmap.parentcontainerid", LONG );
        s_codes["msdc"] = Code( "dmap.databasescount", LONG );
        s_codes["mlog"] = Code( "dmap.loginresponse", CONTAINER  );
        s_codes["mlid"] = Code( "dmap.sessionid", LONG );
@ -407,12 +407,12 @@ Reader::parse( TQDataStream &raw, uint containerLength, bool first )
 }

 void
-Reader::addElement( Map &tqparentMap, char* tag, TQVariant element )
+Reader::addElement( Map &parentMap, char* tag, TQVariant element )
 {
-    if( !tqparentMap.tqcontains( tag ) )
-        tqparentMap[tag] = TQVariant( TQValueList<TQVariant>() );
+    if( !parentMap.tqcontains( tag ) )
+        parentMap[tag] = TQVariant( TQValueList<TQVariant>() );

-    tqparentMap[tag].asList().append(element);
+    parentMap[tag].asList().append(element);
 }

 void
--- a/amarok/src/mediadevice/daap/daapreader/reader.h
+++ b/amarok/src/mediadevice/daap/daapreader/reader.h
@ -92,7 +92,7 @@ namespace Daap
            * @param containerLength length of the container (or entire result) being analyzed
            */
            static Map parse( TQDataStream &raw, uint containerLength, bool first = false );
-            static void addElement( Map &tqparentMap, char* tag, TQVariant element ); //! supporter function for parse
+            static void addElement( Map &parentMap, char* tag, TQVariant element ); //! supporter function for parse
            static TQ_UINT32 getTagAndLength( TQDataStream &raw, char tag[5] );

            static TQMap<TQString, Code> s_codes;
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@ -614,8 +614,8 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle
 {
    TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/';
    // get info about the PodcastChannel
-    TQString tqparentUrl = bundle->tqparent().url();
-    TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( tqparentUrl ) + "';";
+    TQString parentUrl = bundle->tqparent().url();
+    TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';";
    TQStringList values = CollectionDB::instance()->query( sql );
    TQString channelTitle;
    int tqparent = 0;
@ -854,9 +854,9 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
    TQString path = url.isLocalFile() ? url.path( -1 ) : url.prettyURL( -1 ); //no trailing slash
    int index = path.tqfindRev( '/', -1 );
    TQString baseName = path.right( path.length() - index - 1 );
-    TQString tqparentName = path.left( index );
+    TQString parentName = path.left( index );

-    GenericMediaFile* tqparent = m_mfm[tqparentName];
+    GenericMediaFile* tqparent = m_mfm[parentName];
    GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this );

    if( type == MediaItem::DIRECTORY ) //directory
--- a/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
+++ b/amarok/src/mediadevice/generic/genericmediadeviceconfigdialog.ui
@ -456,7 +456,7 @@
    <function access="private" specifier="non virtual">init()</function>
    <function access="private" specifier="non virtual">destroy()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>kactivelabel.h</includehint>
 </includehints>
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.h
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h
@ -87,7 +87,7 @@ class IfpMediaDevice : public MediaDevice
        // miscellaneous methods
        static int        filetransferCallback( void *pData, struct ifp_transfer_status *progress );
        int               setProgressInfo( struct ifp_transfer_status *progress );
-        // Will iterate over tqparents and add directory name to the item.
+        // Will iterate over parents and add directory name to the item.
        // getFilename = false will return only tqparent structure, as opposed to returning the filename as well
        TQString           getFullPath( const TQListViewItem *item, const bool getFilename = true );
        TQString           cleanPath( const TQString &component );
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@ -666,15 +666,15 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle)
    while ( !dir.exists() )
    {
        TQString path = dir.absPath();
-        TQDir tqparentdir;
+        TQDir parentdir;
        TQDir create;
        do
        {
            create.setPath(path);
            path = path.section("/", 0, path.tqcontains('/')-1);
-            tqparentdir.setPath(path);
+            parentdir.setPath(path);
        }
-        while( !path.isEmpty() && !(path==mountPoint()) && !tqparentdir.exists() );
+        while( !path.isEmpty() && !(path==mountPoint()) && !parentdir.exists() );
        debug() << "trying to create \"" << path << "\"" << endl;
        if(!create.mkdir( create.absPath() ))
        {
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@ -372,11 +372,11 @@ uint32_t
 MtpMediaDevice::getDefaultParentId( void )
 {
    // Decide which folder to send it to:
-    // If the device gave us a tqparent_folder setting, we use it
+    // If the device gave us a parent_folder setting, we use it
    uint32_t parent_id = 0;
-    if( m_default_tqparent_folder )
+    if( m_default_parent_folder )
    {
-        parent_id = m_default_tqparent_folder;
+        parent_id = m_default_parent_folder;
    }
    // Otherwise look for a folder called "Music"
    else if( m_folders != 0 )
@ -1120,8 +1120,8 @@ MtpMediaDevice::openDevice( bool silent )
    if(! ownername.isEmpty() )
        m_name += " (" + ownername + ')';

-    m_default_tqparent_folder = m_device->default_music_folder;
-    debug() << "setting default tqparent : " << m_default_tqparent_folder << endl;
+    m_default_parent_folder = m_device->default_music_folder;
+    debug() << "setting default tqparent : " << m_default_parent_folder << endl;

    MtpMediaDevice::readMtpMusic();

--- a/amarok/src/mediadevice/mtp/mtpmediadevice.h
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h
@ -173,10 +173,10 @@ class MtpMediaDevice : public MediaDevice
        void                    clearItems();
        int                     deleteObject( MtpMediaItem *deleteItem );
        uint32_t                checkFolderStructure( const MetaBundle &bundle, bool create = true );
-        uint32_t                createFolder( const char *name, uint32_t tqparent_id );
+        uint32_t                createFolder( const char *name, uint32_t parent_id );
        uint32_t                getDefaultParentId( void );
        uint32_t                folderNameToID( char *name, LIBMTP_folder_t *folderlist );
-        uint32_t                subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t tqparent_id );
+        uint32_t                subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t parent_id );
        void                    updateFolders( void );
        void                    initView( void );
        void                    readPlaylists( void );
@ -190,7 +190,7 @@ class MtpMediaDevice : public MediaDevice
        TQMutex                  m_mutex;
        TQMutex                  m_critical_mutex;
        LIBMTP_folder_t         *m_folders;
-        uint32_t		        m_default_tqparent_folder;
+        uint32_t		        m_default_parent_folder;
        TQString                 m_folderStructure;
        TQLineEdit               *m_folderStructureBox;
        TQLabel                  *m_folderLabel;
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@ -363,7 +363,7 @@ MetaBundle::operator=( const MetaBundle& bundle )
      }


-//    delete m_podcastBundle; why does this crash Amarok? aptqparently m_podcastBundle isn't always initialized.
+//    delete m_podcastBundle; why does this crash Amarok? apparently m_podcastBundle isn't always initialized.
    m_podcastBundle = 0;
    if( bundle.m_podcastBundle )
        setPodcastBundle( *bundle.m_podcastBundle );
--- a/amarok/src/metabundle.h
+++ b/amarok/src/metabundle.h
@ -103,7 +103,7 @@ public:

    /** This is a bit vector for selecting columns. It's very fast to compare
        in matchFast. It might be a good idea to replace the TQValue<int>
-        column tqmasks with this eventually. */
+        column masks with this eventually. */
    typedef TQ_UINT32 ColumnMask;

    /** Returns the name of the column at \p index as a string -- not i18ned, for internal purposes. */
--- a/amarok/src/moodbar.cpp
+++ b/amarok/src/moodbar.cpp
@ -802,7 +802,7 @@ Moodbar::detach( void )
  m_data = TQDeepCopy<ColorList>(m_data);
  m_pixmap.detach();

-  // Aptqparently this is the wrong hack -- don't detach urls
+  // Apparently this is the wrong hack -- don't detach urls
  //TQString url( TQDeepCopy<TQString>( m_url.url() ) );
  //m_url = KURL::fromPathOrURL( url );

--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@ -596,14 +596,14 @@ void MultiTabBarButton::setStyle( MultiTabBar::MultiTabBarStyle style )
 void MultiTabBarButton::hideEvent( TQHideEvent* he )
 {
    TQPushButton::hideEvent( he );
-    MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() );
+    MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() );
    if ( tb ) tb->updateSeparator();
 }

 void MultiTabBarButton::showEvent( TQShowEvent* he )
 {
    TQPushButton::showEvent( he );
-    MultiTabBar *tb = dynamic_cast<MultiTabBar*>( tqparentWidget() );
+    MultiTabBar *tb = dynamic_cast<MultiTabBar*>( parentWidget() );
    if ( tb ) tb->updateSeparator();
 }

@ -709,9 +709,9 @@ TQSize MultiTabBarButton::tqsizeHint() const
 //     //PATCH by markey
 //     if ( ( m_style == MultiTabBar::AMAROK ) ) {
 //         if( m_position == MultiTabBar::Left || m_position == MultiTabBar::Right )
-//             w = ( tqparentWidget()->height() - 3 ) / NUM_TABS;
+//             w = ( parentWidget()->height() - 3 ) / NUM_TABS;
 //         else
-//             h = ( tqparentWidget()->width() - 3 ) / NUM_TABS;
+//             h = ( parentWidget()->width() - 3 ) / NUM_TABS;
 //     }

    return ( tqstyle().tqsizeFromContents( TQStyle::CT_ToolButton, this, TQSize( w, h ) ).
--- a/amarok/src/newdynamic.ui
+++ b/amarok/src/newdynamic.ui
@ -351,7 +351,7 @@
    <tabstop>m_previousIntSpinBox</tabstop>
    <tabstop>m_upcomingIntSpinBox</tabstop>
 </tabstops>
-<tqlayoutdefaults spacing="6" margin="11"/>
+<layoutdefaults spacing="6" margin="11"/>
 <includehints>
    <includehint>knuminput.h</includehint>
    <includehint>knuminput.h</includehint>
--- a/amarok/src/organizecollectiondialog.ui
+++ b/amarok/src/organizecollectiondialog.ui
@ -585,7 +585,7 @@
    <function returnType="TQString">cleanPath( const QString &amp; component )</function>
    <function>init()</function>
 </functions>
-<tqlayoutdefaults spacing="6" margin="0"/>
+<layoutdefaults spacing="6" margin="0"/>
 <includehints>
    <includehint>kcombobox.h</includehint>
    <includehint>klineedit.h</includehint>
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@ -668,7 +668,7 @@ Amarok::OSD::show( const MetaBundle &bundle ) //slot
        {
            TQString tag;
            TQValueVector<int> availableTags; //eg, ones that aren't empty
-            static const TQValueList<int> parens = //display these in tqparentheses
+            static const TQValueList<int> parens = //display these in parentheses
                TQValueList<int>() << PlaylistItem::PlayCount  << PlaylistItem::Year   << PlaylistItem::Comment
                                  << PlaylistItem::Genre      << PlaylistItem::Length << PlaylistItem::Bitrate
                                  << PlaylistItem::LastPlayed << PlaylistItem::Score  << PlaylistItem::Filesize;
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@ -578,7 +578,7 @@ bool PlayerWidget::event( TQEvent *e )
            //create! If you have an issue with the behaviour bring it up on the mailing
            //list before you even think about committing. Thanks! (includes case Hide)

-            const WId id = tqparentWidget()->winId();
+            const WId id = parentWidget()->winId();
            const uint desktop = KWin::windowInfo( winId() ).desktop();
            const KWin::WindowInfo info = KWin::windowInfo( id );

@ -594,8 +594,8 @@ bool PlayerWidget::event( TQEvent *e )

                //XDeleteProperty( qt_xdisplay(), id, qt_wm_state );

-                //tqparentWidget()->show();
-                //if( !tqparentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id );
+                //parentWidget()->show();
+                //if( !parentWidget()->isShown() ) XMapWindow( qt_xdisplay(), id );
 //                 unsigned long data[2];
 //                 data[0] = (unsigned long) NormalState;
 //                 data[1] = (unsigned long) None;
@ -608,7 +608,7 @@ bool PlayerWidget::event( TQEvent *e )
 //                 XMapWindow( qt_xdisplay(), id );
 //
                //KWin::deIconifyWindow( id, false );
-                tqparentWidget()->show();
+                parentWidget()->show();
            }


@ -630,7 +630,7 @@ bool PlayerWidget::event( TQEvent *e )
            //this prevents the PlaylistButton being set to off (see the eventFilter)
            //by leaving it on we ensure that we show the Playlist Window again when
            //we are next shown (see Show event handler above)
-            if( tqparentWidget()->isShown() ) dontChangeButtonState = true;
+            if( parentWidget()->isShown() ) dontChangeButtonState = true;

            if( e->spontaneous() ) //the window system caused the event
            {
@ -640,7 +640,7 @@ bool PlayerWidget::event( TQEvent *e )

                const KWin::WindowInfo info = KWin::windowInfo( winId() );

-                if( info.isMinimized() ) KWin::iconifyWindow( tqparentWidget()->winId(), false );
+                if( info.isMinimized() ) KWin::iconifyWindow( parentWidget()->winId(), false );
                else
                    //this may seem strange, but it is correct
                    //we have a handler in eventFilter for all other eventualities
@ -651,7 +651,7 @@ bool PlayerWidget::event( TQEvent *e )
                //we caused Amarok to hide, so we should hide the Playlist Window
                //NOTE we "override" closeEvents and thus they count as non-spontaneous
                //hideEvents; which frankly is a huge relief!
-                tqparentWidget()->hide();
+                parentWidget()->hide();
        }

        return false;
@ -712,7 +712,7 @@ PlayerWidget::eventFilter( TQObject *o, TQEvent *e )
            //we want to avoid setting the button for most spontaneous events
            //since they are not user driven, two are however:

-            KWin::WindowInfo info = KWin::windowInfo( tqparentWidget()->winId() );
+            KWin::WindowInfo info = KWin::windowInfo( parentWidget()->winId() );

            if( !info.isMinimized() ) break;
        }
--- a/amarok/src/playerwindow.h
+++ b/amarok/src/playerwindow.h
@ -134,7 +134,7 @@ class PlayerWidget : public TQWidget, public EngineObserver
        virtual void mouseMoveEvent( TQMouseEvent* );

        ///to make the code clearer to n00bies ;)
-        TQWidget *playlistWindow() { return tqparentWidget(); }
+        TQWidget *playlistWindow() { return parentWidget(); }

        static const int SCROLL_RATE = 1;
        static const int ANIM_TIMER  = 30;
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@ -1833,7 +1833,7 @@ Playlist::setCurrentTrack( PlaylistItem *item )

    if ( prev ) {
        //reset to normal height
-        prev->tqinvalidateHeight();
+        prev->invalidateHeight();
        prev->setup();
        //remove pixmap in first column
        prev->setPixmap( m_firstColumn, TQPixmap() );
@ -2094,7 +2094,7 @@ Playlist::engineStateChanged( Engine::State state, Engine::State /*oldState*/ )
    }

    //POSSIBLYAHACK
-    //aptqparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly
+    //apparently you can't rely on EngineController::engine()->state() == state here, so pass it explicitly
    setCurrentTrackPixmap( state );
 }

@ -2371,7 +2371,7 @@ Playlist::paletteChange( const TQPalette &p )

    KListView::paletteChange( p );

-    counter = 0; // reset the counter or aptqparently the text lacks contrast
+    counter = 0; // reset the counter or apparently the text lacks contrast
    slotGlowTimer(); // tqrepaint currentTrack marker
 }

@ -4402,7 +4402,7 @@ void Playlist::ensureItemCentered( TQListViewItem *item )
    if( !item )
        return;

-    //HACK -- aptqparently the various metrics aren't reliable while the UI is still updating & stuff
+    //HACK -- apparently the various metrics aren't reliable while the UI is still updating & stuff
    m_itemToReallyCenter = item;
    TQTimer::singleShot( 0, this, TQT_SLOT( reallyEnsureItemCentered() ) );
 }
@ -4797,7 +4797,7 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
            textLabel2->setBuddy( lineEdit1 );
            textLabel3->setBuddy( lineEdit2 );

-            // tqlayouts
+            // layouts
            TQHBoxLayout *tqlayout1 = new TQHBoxLayout( 0, 0, 6 );
            tqlayout1->addItem( new TQSpacerItem( 181, 20, TQSizePolicy::Expanding, TQSizePolicy::Minimum ) );
            tqlayout1->addWidget( new KPushButton( KStdGuiItem::ok(), this, "OkButton" ) );
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@ -1172,9 +1172,9 @@ DEBUG_BLOCK
    foreachType( TQValueList<PodcastChannelBundle>, channels )
    {
        PlaylistCategory *tqparent = p;
-        const int tqparentId = (*it).tqparentId();
-        if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() )
-            tqparent = folderMap[tqparentId];
+        const int parentId = (*it).parentId();
+        if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() )
+            tqparent = folderMap[parentId];

        channel  = new PodcastChannel( tqparent, channel, *it );

@ -1206,12 +1206,12 @@ DEBUG_BLOCK
    {
        const int     id       =     (*it).toInt();
        const TQString t        =    *++it;
-        const int     tqparentId =   (*++it).toInt();
+        const int     parentId =   (*++it).toInt();
        const bool    isOpen   = ( (*++it) == CollectionDB::instance()->boolT() ? true : false );

        PlaylistCategory *tqparent = p;
-        if( tqparentId > 0 && folderMap.tqfind( tqparentId ) != folderMap.end() )
-            tqparent = folderMap[tqparentId];
+        if( parentId > 0 && folderMap.tqfind( parentId ) != folderMap.end() )
+            tqparent = folderMap[parentId];

        folder = new PlaylistCategory( tqparent, folder, t, id );
        folder->setOpen( isOpen );
@ -1242,14 +1242,14 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder )
    {
        if( folder->id() < 0 ) // probably due to a 1.3->1.4 migration
        {                      // we add the folder to the db, set the id and then update all the tqchildren
-            int tqparentId = static_cast<PlaylistCategory*>(folder->tqparent())->id();
-            int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), tqparentId, folder->isOpen() );
+            int parentId = static_cast<PlaylistCategory*>(folder->tqparent())->id();
+            int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() );
            folder->setId( newId );
            PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild());
            while( chan )
            {
                if( isPodcastChannel( chan ) )
-                    // will update the database so child has correct tqparentId.
+                    // will update the database so child has correct parentId.
                    chan->setParent( folder );
                chan = static_cast<PodcastChannel*>(chan->nextSibling());
            }
@ -3168,7 +3168,7 @@ InfoPane::getHeight()
    if( TQT_TQWIDGET( child( "container" ) )->isShown() )
    {
        //If the InfoPane is shown, return true height.
-        return static_cast<TQSplitter*>( tqparentWidget() )->sizes().last();
+        return static_cast<TQSplitter*>( parentWidget() )->sizes().last();