rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/amarok@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

amarok/src/actionclasses.cpp

@@ -169,12 +169,12 @@ Menu::instance()
 }
 
 KPopupMenu*
-Menu::helpMenu( TQWidget *tqparent ) //STATIC
+Menu::helpMenu( TQWidget *parent ) //STATIC
 {
     extern KAboutData aboutData;
 
     if ( s_helpMenu == 0 )
-        s_helpMenu = new KHelpMenu( tqparent, &aboutData, Amarok::actionCollection() );
+        s_helpMenu = new KHelpMenu( parent, &aboutData, Amarok::actionCollection() );
 
     return s_helpMenu->menu();
 }
@@ -288,8 +288,8 @@ AnalyzerAction::plug( TQWidget *w, int index )
 }
 
 
-AnalyzerContainer::AnalyzerContainer( TQWidget *tqparent )
-        : TQWidget( tqparent, "AnalyzerContainer" )
+AnalyzerContainer::AnalyzerContainer( TQWidget *parent )
+        : TQWidget( parent, "AnalyzerContainer" )
         , m_child( 0 )
 {
     TQToolTip::add( this, i18n( "Click for more analyzers" ) );

amarok/src/actionclasses.h

@@ -27,7 +27,7 @@ namespace Amarok
   TQ_OBJECT
         public:
             static Menu *instance();
-            static KPopupMenu *helpMenu( TQWidget *tqparent = 0 );
+            static KPopupMenu *helpMenu( TQWidget *parent = 0 );
 
             enum MenuIds {
                 ID_CONF_DECODER,
@@ -68,7 +68,7 @@ namespace Amarok
     class AnalyzerContainer : public TQWidget
     {
         public:
-            AnalyzerContainer( TQWidget *tqparent );
+            AnalyzerContainer( TQWidget *parent );
         protected:
             virtual void resizeEvent( TQResizeEvent* );
             virtual void mousePressEvent( TQMouseEvent* );

amarok/src/amarok.h

@@ -293,7 +293,7 @@ namespace Amarok
      */
     class LIBAMAROK_EXPORT Process : public KProcess {
         public:
-        Process( TQObject *tqparent = 0 ) : KProcess( tqparent ) {}
+        Process( TQObject *parent = 0 ) : KProcess( parent ) {}
         virtual int commSetupDoneC() {
             const int i = KProcess::commSetupDoneC();
             Amarok::closeOpenFiles(KProcess::out[0],KProcess::in[0], KProcess::err[0]);

amarok/src/analyzers/analyzerbase.cpp

@@ -40,8 +40,8 @@ template class Analyzer::Base<TQWidget>;
 
 
 template<class W>
-Analyzer::Base<W>::Base( TQWidget *tqparent, uint timeout, uint scopeSize )
-        : W( tqparent )
+Analyzer::Base<W>::Base( TQWidget *parent, uint timeout, uint scopeSize )
+        : W( parent )
         , m_timeout( timeout )
         , m_fht( new FHT(scopeSize) )
 {}
@@ -188,8 +188,8 @@ Analyzer::Base<W>::demo() //virtual
 
 
 
-Analyzer::Base2D::Base2D( TQWidget *tqparent, uint timeout, uint scopeSize )
-   : Base<TQWidget>( tqparent, timeout, scopeSize )
+Analyzer::Base2D::Base2D( TQWidget *parent, uint timeout, uint scopeSize )
+   : Base<TQWidget>( parent, timeout, scopeSize )
 {
     setWFlags( TQt::WNoAutoErase ); //no flicker
 
@@ -229,8 +229,8 @@ Analyzer::Base2D::paletteChange( const TQPalette& )
 
 
 #ifdef HAVE_TQGLWIDGET
-Analyzer::Base3D::Base3D( TQWidget *tqparent, uint timeout, uint scopeSize )
-        : Base<TQGLWidget>( tqparent, timeout, scopeSize )
+Analyzer::Base3D::Base3D( TQWidget *parent, uint timeout, uint scopeSize )
+        : Base<TQGLWidget>( parent, timeout, scopeSize )
 {
     connect( &m_timer, TQT_SIGNAL( timeout() ), TQT_SLOT( draw() ) );
 }

amarok/src/analyzers/analyzerfactory.cpp

@@ -38,7 +38,7 @@
 //separate from analyzerbase.cpp to save compile time
 
 
-TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *tqparent )
+TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *parent )
 {
     //new XmmsWrapper(); //toplevel
 
@@ -47,80 +47,80 @@ TQWidget *Analyzer::Factory::createAnalyzer( TQWidget *tqparent )
     switch( AmarokConfig::currentAnalyzer() )
     {
     case 2:
-        analyzer = new Sonogram( tqparent );
+        analyzer = new Sonogram( parent );
         break;
     case 1:
-        analyzer = new TurbineAnalyzer( tqparent );
+        analyzer = new TurbineAnalyzer( parent );
         break;
     case 3:
-        analyzer = new BarAnalyzer( tqparent );
+        analyzer = new BarAnalyzer( parent );
         break;
     case 4:
-        analyzer = new BlockAnalyzer( tqparent );
+        analyzer = new BlockAnalyzer( parent );
         break;
 #ifdef HAVE_TQGLWIDGET
     case 5:
-        analyzer = new GLAnalyzer( tqparent );
+        analyzer = new GLAnalyzer( parent );
         break;
     case 6:
-        analyzer = new GLAnalyzer2( tqparent );
+        analyzer = new GLAnalyzer2( parent );
         break;
     case 7:
-        analyzer = new GLAnalyzer3( tqparent );
+        analyzer = new GLAnalyzer3( parent );
         break;
     case 8:
 #else
     case 5:
 #endif
-        analyzer = new TQLabel( i18n( "Click for Analyzers" ), tqparent ); //blank analyzer to satisfy Grue
+        analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
         static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter );
     break;
 
     default:
         AmarokConfig::setCurrentAnalyzer( 0 );
     case 0:
-        analyzer = new BoomAnalyzer( tqparent );
+        analyzer = new BoomAnalyzer( parent );
     }
 
     return analyzer;
 }
 
-TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *tqparent)
+TQWidget *Analyzer::Factory::createPlaylistAnalyzer( TQWidget *parent)
 {
     TQWidget *analyzer = 0;
     switch( AmarokConfig::currentPlaylistAnalyzer() )
     {
         case 1:
-            analyzer = new TurbineAnalyzer( tqparent );
+            analyzer = new TurbineAnalyzer( parent );
             break;
         case 2:
-            analyzer = new Sonogram( tqparent );
+            analyzer = new Sonogram( parent );
             break;
         case 3:
-            analyzer = new BoomAnalyzer( tqparent );
+            analyzer = new BoomAnalyzer( parent );
             break;
     #ifdef HAVE_TQGLWIDGET
         case 4:
-            analyzer = new GLAnalyzer( tqparent );
+            analyzer = new GLAnalyzer( parent );
             break;
         case 5:
-            analyzer = new GLAnalyzer2( tqparent );
+            analyzer = new GLAnalyzer2( parent );
             break;
         case 6:
-            analyzer = new GLAnalyzer3( tqparent );
+            analyzer = new GLAnalyzer3( parent );
             break;
         case 7:
     #else
         case 4:
     #endif
-            analyzer = new TQLabel( i18n( "Click for Analyzers" ), tqparent ); //blank analyzer to satisfy Grue
+            analyzer = new TQLabel( i18n( "Click for Analyzers" ), parent ); //blank analyzer to satisfy Grue
             static_cast<TQLabel *>(analyzer)->tqsetAlignment( TQt::AlignCenter );
             break;
 
         default:
             AmarokConfig::setCurrentPlaylistAnalyzer( 0 );
         case 0:
-            analyzer = new BlockAnalyzer( tqparent );
+            analyzer = new BlockAnalyzer( parent );
             break;
     }
     return analyzer;

amarok/src/analyzers/baranalyzer.cpp

@@ -17,15 +17,15 @@
 #include <tqpainter.h>
 
 
-BarAnalyzer::BarAnalyzer( TQWidget *tqparent )
-    : Analyzer::Base2D( tqparent, 12, 8 )
+BarAnalyzer::BarAnalyzer( TQWidget *parent )
+    : Analyzer::Base2D( parent, 12, 8 )
     //, m_bands( BAND_COUNT )
     //, barVector( BAND_COUNT, 0 )
     //, roofVector( BAND_COUNT, 50 )
     //, roofVelocityVector( BAND_COUNT, ROOF_VELOCITY_REDUCTION_FACTOR )
 {
     //roof pixmaps don't depend on size() so we do in the ctor
-    m_bg = tqparent->paletteBackgroundColor();
+    m_bg = parent->paletteBackgroundColor();
 
     TQColor fg( 0xff, 0x50, 0x70 );
     #define m_bg backgroundColor()

amarok/src/analyzers/blockanalyzer.cpp

@@ -29,8 +29,8 @@ static inline uint myMax( uint v1, uint v2 ) { return v1 > v2 ? v1 : v2; }
 namespace Amarok { extern KConfig *config( const TQString& ); }
 
 
-BlockAnalyzer::BlockAnalyzer( TQWidget *tqparent )
-        : Analyzer::Base2D( tqparent, 20, 9 )
+BlockAnalyzer::BlockAnalyzer( TQWidget *parent )
+        : Analyzer::Base2D( parent, 20, 9 )
         , m_columns( 0 )         //uint
         , m_rows( 0 )            //uint
         , m_y( 0 )               //uint

amarok/src/analyzers/boomanalyzer.cpp

@@ -10,8 +10,8 @@
 #include <tqslider.h>
 #include <tqspinbox.h>
 
-BoomAnalyzer::BoomAnalyzer( TQWidget *tqparent )
-    : Analyzer::Base2D( tqparent, 10, 9 )
+BoomAnalyzer::BoomAnalyzer( TQWidget *parent )
+    : Analyzer::Base2D( parent, 10, 9 )
     , K_barHeight( 1.271 )//1.471
     , F_peakSpeed( 1.103 )//1.122
     , F( 1.0 )

amarok/src/analyzers/glanalyzer.cpp

@@ -24,8 +24,8 @@
 #include <kdebug.h>
 
 
-GLAnalyzer::GLAnalyzer( TQWidget *tqparent )
-        : Analyzer::Base3D(tqparent, 15)
+GLAnalyzer::GLAnalyzer( TQWidget *parent )
+        : Analyzer::Base3D(parent, 15)
         , m_oldy(32, -10.0f)
         , m_peaks(32)
 {}

amarok/src/analyzers/glanalyzer2.cpp

@@ -28,8 +28,8 @@
 #include <sys/time.h>
 
 
-GLAnalyzer2::GLAnalyzer2( TQWidget *tqparent ):
-Analyzer::Base3D(tqparent, 15)
+GLAnalyzer2::GLAnalyzer2( TQWidget *parent ):
+Analyzer::Base3D(parent, 15)
 {
     //initialize openGL context before managing GL calls
     makeCurrent();

amarok/src/analyzers/glanalyzer3.cpp

@@ -121,8 +121,8 @@ class Paddle
 };
 
 
-GLAnalyzer3::GLAnalyzer3( TQWidget *tqparent ):
-Analyzer::Base3D(tqparent, 15)
+GLAnalyzer3::GLAnalyzer3( TQWidget *parent ):
+Analyzer::Base3D(parent, 15)
 {
     //initialize openGL context before managing GL calls
     makeCurrent();

amarok/src/analyzers/sonogram.cpp

@@ -14,8 +14,8 @@
 #include <tqpainter.h>
 #include "sonogram.h"
 
-Sonogram::Sonogram(TQWidget *tqparent) :
-    Analyzer::Base2D(tqparent, 16, 9)
+Sonogram::Sonogram(TQWidget *parent) :
+    Analyzer::Base2D(parent, 16, 9)
 {
 }
 

amarok/src/analyzers/turbine.h

@@ -14,7 +14,7 @@
 class TurbineAnalyzer : public BoomAnalyzer
 {
     public:
-        TurbineAnalyzer( TQWidget *tqparent ) : BoomAnalyzer( tqparent ) {}
+        TurbineAnalyzer( TQWidget *parent ) : BoomAnalyzer( parent ) {}
 
         void analyze( const Scope& );
 };

amarok/src/app.cpp

@@ -530,13 +530,13 @@ void App::fixHyperThreading()
 
         // If the library is new enough try and call sched_setaffinity.
         #ifdef SCHEDAFFINITY_SUPPORT
-        cpu_set_t tqmask;
-        CPU_ZERO( &tqmask ); // Initializes all the bits in the tqmask to zero
-        CPU_SET( 0, &tqmask ); // Sets only the bit corresponding to cpu
+        cpu_set_t mask;
+        CPU_ZERO( &mask ); // Initializes all the bits in the mask to zero
+        CPU_SET( 0, &mask ); // Sets only the bit corresponding to cpu
         #ifdef SCHEDAFFINITY_3PARAMS
-        if ( sched_setaffinity( 0, sizeof(tqmask), &tqmask ) == -1 )
+        if ( sched_setaffinity( 0, sizeof(mask), &mask ) == -1 )
         #else  //SCHEDAFFINITY_3PARAMS
-        if ( sched_setaffinity( 0, &tqmask ) == -1 )
+        if ( sched_setaffinity( 0, &mask ) == -1 )
         #endif //SCHEDAFFINITY_3PARAMS
         {
             warning() << "sched_setaffinity() call failed with error code: " << errno << endl;
@@ -646,7 +646,7 @@ void App::applySettings( bool firstTime )
 
 #ifdef TQ_WS_X11
             //TODO get this to work!
-            //may work if you set no tqparent for the systray?
+            //may work if you set no parent for the systray?
             //KWin::setSystemTrayWindowFor( m_pTray->winId(), m_pPlayerWindow->winId() );
 
             delete m_pTray; m_pTray = new Amarok::TrayIcon( m_pPlayerWindow );

amarok/src/browserToolBar.h

@@ -18,8 +18,8 @@ namespace Browser
     class ToolBar : public KToolBar
     {
         public:
-            ToolBar( TQWidget *tqparent )
-                    : KToolBar( tqparent, "NotMainToolBar" )
+            ToolBar( TQWidget *parent )
+                    : KToolBar( parent, "NotMainToolBar" )
             {
                 setMovingEnabled(false);
                 setFlat(true);

amarok/src/browserbar.cpp

@@ -54,15 +54,15 @@ namespace Amarok
 
         virtual void mouseMoveEvent( TQMouseEvent *e )
         {
-            static_cast<BrowserBar*>(TQT_TQWIDGET(tqparent()))->mouseMovedOverSplitter( e );
+            static_cast<BrowserBar*>(TQT_TQWIDGET(parent()))->mouseMovedOverSplitter( e );
         }
     };
 }
 
 BrowserBar* BrowserBar::s_instance = 0;
 
-BrowserBar::BrowserBar( TQWidget *tqparent )
-        : TQWidget( tqparent, "BrowserBar" )
+BrowserBar::BrowserBar( TQWidget *parent )
+        : TQWidget( parent, "BrowserBar" )
         , EngineObserver( EngineController::instance() )
         , m_playlistBox( new TQVBox( this ) )
         , m_divider( new Amarok::Splitter( this ) )

amarok/src/browserbar.h

@@ -36,7 +36,7 @@ class BrowserBar : public TQWidget, public EngineObserver
   TQ_OBJECT
 
 public:
-    BrowserBar( TQWidget *tqparent );
+    BrowserBar( TQWidget *parent );
    ~BrowserBar();
 
     LIBAMAROK_EXPORT static BrowserBar* instance() { return s_instance; }
@@ -85,12 +85,12 @@ private:
 
     LIBAMAROK_EXPORT static BrowserBar    *s_instance;
     uint           m_pos;         ///the x-axis position of m_divider
-    TQVBox         *m_playlistBox; ///tqparent to playlist, playlist filter and toolbar
+    TQVBox         *m_playlistBox; ///parent to playlist, playlist filter and toolbar
     TQWidget       *m_divider;     ///a qsplitter like widget
     MultiTabBar   *m_tabBar;
     BrowserList    m_browsers;
     BrowserIdMap   m_browserIds;
-    TQVBox         *m_browserBox;  ///tqparent widget to the browsers
+    TQVBox         *m_browserBox;  ///parent widget to the browsers
     int            m_currentIndex;
     int            m_lastIndex;
     TQSignalMapper *m_mapper;      ///maps tab clicks to browsers

amarok/src/clicklineedit.cpp

@@ -25,8 +25,8 @@
 #include "tqpainter.h"
 
 
-ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *tqparent, const char* name ) :
-        KLineEdit( tqparent, name )
+ClickLineEdit::ClickLineEdit( const TQString &msg, TQWidget *parent, const char* name ) :
+        KLineEdit( parent, name )
 {
     mDrawClickMsg = true;
     setClickMessage( msg );

amarok/src/clicklineedit.h

@@ -36,7 +36,7 @@ class ClickLineEdit : public KLineEdit
   TQ_OBJECT
     TQ_PROPERTY( TQString clickMessage READ clickMessage WRITE setClickMessage )
     public:
-        ClickLineEdit( const TQString &msg, TQWidget *tqparent, const char* name = 0 );
+        ClickLineEdit( const TQString &msg, TQWidget *parent, const char* name = 0 );
 
         void setClickMessage( const TQString &msg );
         TQString clickMessage() const { return mClickMessage; }

amarok/src/collectionbrowser.cpp

@@ -440,9 +440,9 @@ CollectionBrowser::ipodToolbar( bool activate )
 CollectionView* CollectionView::m_instance = 0;
 
 
-CollectionView::CollectionView( CollectionBrowser* tqparent )
-        : KListView( tqparent )
-        , m_tqparent( tqparent )
+CollectionView::CollectionView( CollectionBrowser* parent )
+        : KListView( parent )
+        , m_parent( parent )
         , m_timeFilter( 0 )
         , m_currentDepth( 0 )
         , m_ipodIncremented ( 1 )
@@ -570,7 +570,7 @@ CollectionView::keyPressEvent( TQKeyEvent *e )
     // This rewritten code is more faithful to the ordinary moving
     // behavior, even when looping around.  (For instance, it behaves
     // correctly if control-up is pressed at the top of the screen.)
-    // It sends fake keypress events to the tqparent instead of programatically
+    // It sends fake keypress events to the parent instead of programatically
     // selecting items.
     if( (e->key() == Key_Up  ||  e->key() == Key_Down )  && currentItem() )
     {
@@ -637,10 +637,10 @@ CollectionView::keyPressEvent( TQKeyEvent *e )
            && m_viewMode == modeIpodView )
     {
         if( e->key() == Key_Right )
-            m_tqparent->m_ipodIncrement->activate();
+            m_parent->m_ipodIncrement->activate();
 
         else if( e->key() == Key_Left )
-            m_tqparent->m_ipodDecrement->activate();
+            m_parent->m_ipodDecrement->activate();
 
     }
 
@@ -660,7 +660,7 @@ CollectionView::renderView(bool force /* = false */)  //SLOT
     if(!force && !m_dirty )
         return;
 
-    if( BrowserBar::instance()->currentBrowser() != m_tqparent )
+    if( BrowserBar::instance()->currentBrowser() != m_parent )
     {
         // the collectionbrowser is intensive for sql, so we only renderView() if the tab
         // is currently active.  else, wait until user focuses it.
@@ -791,7 +791,7 @@ CollectionView::slotEnsureSelectedItemVisible() //SLOT
         while ( r )
         {
             parents.push( r );
-            r = r->tqparent();
+            r = r->parent();
         }
         while ( !parents.isEmpty() )
         {
@@ -939,18 +939,18 @@ CollectionView::slotExpand( TQListViewItem* item )  //SLOT
             break;
 
         case 1:
-            tmptext = dynamic_cast<CollectionItem*>( item->tqparent() ) ?
-                static_cast<CollectionItem*>( item->tqparent() )->getSTQLText( 0 ) :
-                item->tqparent()->text( 0 );
+            tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ?
+                static_cast<CollectionItem*>( item->parent() )->getSTQLText( 0 ) :
+                item->parent()->text( 0 );
             isUnknown = tmptext.isEmpty();
 
-            if( !static_cast<CollectionItem*>( item->tqparent() )->isSampler() )
+            if( !static_cast<CollectionItem*>( item->parent() )->isSampler() )
             {
                 if ( m_cat1 == IdArtist )
                     qb.setOptions( QueryBuilder::optNoCompilations );
                 if( VisYearAlbum == 1 )
                 {
-                    tmptext = item->tqparent()->text( 0 );
+                    tmptext = item->parent()->text( 0 );
                     TQString year = tmptext.left( tmptext.find( i18n(" - ") ) );
                     yearAlbumCalc( year, tmptext );
                     qb.addMatch( QueryBuilder::tabYear, year, false, true );
@@ -1014,18 +1014,18 @@ CollectionView::slotExpand( TQListViewItem* item )  //SLOT
             break;
 
         case 2:
-            tmptext = dynamic_cast<CollectionItem*> ( item->tqparent()->tqparent() ) ?
-                static_cast<CollectionItem*>( item->tqparent()->tqparent() )->getSTQLText( 0 ) :
-                item->tqparent()->tqparent()->text( 0 );
+            tmptext = dynamic_cast<CollectionItem*> ( item->parent()->parent() ) ?
+                static_cast<CollectionItem*>( item->parent()->parent() )->getSTQLText( 0 ) :
+                item->parent()->parent()->text( 0 );
             isUnknown = tmptext.isEmpty();
 
-            if ( !static_cast<CollectionItem*>( item->tqparent()->tqparent() )->isSampler() )
+            if ( !static_cast<CollectionItem*>( item->parent()->parent() )->isSampler() )
             {
                 if ( m_cat1 == IdArtist )
                     qb.setOptions( QueryBuilder::optNoCompilations );
                 if( VisYearAlbum == 1 )
                 {
-                    tmptext = item->tqparent()->tqparent()->text( 0 );
+                    tmptext = item->parent()->parent()->text( 0 );
                     TQString year = tmptext.left( tmptext.find( i18n(" - ") ) );
                     yearAlbumCalc( year, tmptext );
                     qb.addMatch( QueryBuilder::tabYear, year, false, true );
@@ -1041,14 +1041,14 @@ CollectionView::slotExpand( TQListViewItem* item )  //SLOT
                 c = true;
             }
 
-            tmptext = dynamic_cast<CollectionItem*>( item->tqparent() ) ?
-                static_cast<CollectionItem*>( item->tqparent() )->getSTQLText( 0 ) :
-                item->tqparent()->text( 0 );
+            tmptext = dynamic_cast<CollectionItem*>( item->parent() ) ?
+                static_cast<CollectionItem*>( item->parent() )->getSTQLText( 0 ) :
+                item->parent()->text( 0 );
             isUnknown = tmptext.isEmpty();
 
             if( VisYearAlbum == 2 )
             {
-                tmptext = item->tqparent()->text( 0 );
+                tmptext = item->parent()->text( 0 );
                 TQString year = tmptext.left( tmptext.find( i18n(" - ") ) );
                 yearAlbumCalc( year, tmptext );
                 qb.addMatch( QueryBuilder::tabYear, year, false, true );
@@ -1151,7 +1151,7 @@ CollectionView::slotExpand( TQListViewItem* item )  //SLOT
         child->setExpandable( expandable );
     }
 
-    //Display the album cover for the tqparent item now it is expanded
+    //Display the album cover for the parent item now it is expanded
     if ( dynamic_cast<CollectionItem*>( item ) )
     {
         CollectionItem *i = static_cast<CollectionItem*>( item );
@@ -1235,29 +1235,29 @@ CollectionView::presetMenu( int id )  //SLOT
 void
 CollectionView::cat1Menu( int id, bool rerender )  //SLOT
 {
-    m_tqparent->m_cat1Menu->setItemChecked( m_cat1, false ); //uncheck old item
-    m_tqparent->m_cat2Menu->setItemEnabled( m_cat1, true );  //enable old items
-    m_tqparent->m_cat3Menu->setItemEnabled( m_cat1, true );
+    m_parent->m_cat1Menu->setItemChecked( m_cat1, false ); //uncheck old item
+    m_parent->m_cat2Menu->setItemEnabled( m_cat1, true );  //enable old items
+    m_parent->m_cat3Menu->setItemEnabled( m_cat1, true );
     m_cat1 = id;
     updateColumnHeader();
     resetIpodDepth();
-    m_tqparent->m_cat1Menu->setItemChecked( m_cat1, true );
+    m_parent->m_cat1Menu->setItemChecked( m_cat1, true );
 
     //prevent choosing the same category in both menus
-    m_tqparent->m_cat2Menu->setItemEnabled( id , false );
-    m_tqparent->m_cat3Menu->setItemEnabled( id , false );
+    m_parent->m_cat2Menu->setItemEnabled( id , false );
+    m_parent->m_cat3Menu->setItemEnabled( id , false );
 
     //if this item is checked in second menu, uncheck it
-    if ( m_tqparent->m_cat2Menu->isItemChecked( id ) ) {
-        m_tqparent->m_cat2Menu->setItemChecked( id, false );
-        m_tqparent->m_cat2Menu->setItemChecked( IdNone, true );
+    if ( m_parent->m_cat2Menu->isItemChecked( id ) ) {
+        m_parent->m_cat2Menu->setItemChecked( id, false );
+        m_parent->m_cat2Menu->setItemChecked( IdNone, true );
         m_cat2 = IdNone;
         enableCat3Menu( false );
     }
     //if this item is checked in third menu, uncheck it
-    if ( m_tqparent->m_cat3Menu->isItemChecked( id ) ) {
-        m_tqparent->m_cat3Menu->setItemChecked( id, false );
-        m_tqparent->m_cat3Menu->setItemChecked( IdNone, true );
+    if ( m_parent->m_cat3Menu->isItemChecked( id ) ) {
+        m_parent->m_cat3Menu->setItemChecked( id, false );
+        m_parent->m_cat3Menu->setItemChecked( IdNone, true );
         m_cat3 = IdNone;
     }
     updateTrackDepth();
@@ -1271,23 +1271,23 @@ CollectionView::cat1Menu( int id, bool rerender )  //SLOT
 void
 CollectionView::cat2Menu( int id, bool rerender )  //SLOT
 {
-    m_tqparent->m_cat2Menu->setItemChecked( m_cat2, false ); //uncheck old item
-    m_tqparent->m_cat3Menu->setItemEnabled( m_cat3, true );  //enable old item
+    m_parent->m_cat2Menu->setItemChecked( m_cat2, false ); //uncheck old item
+    m_parent->m_cat3Menu->setItemEnabled( m_cat3, true );  //enable old item
     m_cat2 = id;
-    m_tqparent->m_cat2Menu->setItemChecked( m_cat2, true );
+    m_parent->m_cat2Menu->setItemChecked( m_cat2, true );
     updateColumnHeader();
     resetIpodDepth();
 
     enableCat3Menu( id != IdNone );
 
     //prevent choosing the same category in both menus
-    m_tqparent->m_cat3Menu->setItemEnabled( m_cat1 , false );
+    m_parent->m_cat3Menu->setItemEnabled( m_cat1 , false );
     if( id != IdNone )
-        m_tqparent->m_cat3Menu->setItemEnabled( id , false );
+        m_parent->m_cat3Menu->setItemEnabled( id , false );
 
     //if this item is checked in third menu, uncheck it
-    if ( m_tqparent->m_cat3Menu->isItemChecked( id ) ) {
-        m_tqparent->m_cat3Menu->setItemChecked( id, false );
+    if ( m_parent->m_cat3Menu->isItemChecked( id ) ) {
+        m_parent->m_cat3Menu->setItemChecked( id, false );
         enableCat3Menu( false );
     }
     updateTrackDepth();
@@ -1301,9 +1301,9 @@ CollectionView::cat2Menu( int id, bool rerender )  //SLOT
 void
 CollectionView::cat3Menu( int id, bool rerender )  //SLOT
 {
-    m_tqparent->m_cat3Menu->setItemChecked( m_cat3, false ); //uncheck old item
+    m_parent->m_cat3Menu->setItemChecked( m_cat3, false ); //uncheck old item
     m_cat3 = id;
-    m_tqparent->m_cat3Menu->setItemChecked( m_cat3, true );
+    m_parent->m_cat3Menu->setItemChecked( m_cat3, true );
     updateColumnHeader();
     resetIpodDepth();
     updateTrackDepth();
@@ -1317,17 +1317,17 @@ CollectionView::cat3Menu( int id, bool rerender )  //SLOT
 void
 CollectionView::enableCat3Menu( bool enable )
 {
-    m_tqparent->m_cat3Menu->setItemEnabled( IdAlbum, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdVisYearAlbum, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdArtist, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdComposer, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdGenre, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdYear, enable );
-    m_tqparent->m_cat3Menu->setItemEnabled( IdLabel, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdAlbum, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdVisYearAlbum, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdArtist, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdComposer, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdGenre, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdYear, enable );
+    m_parent->m_cat3Menu->setItemEnabled( IdLabel, enable );
 
     if( !enable ) {
-        m_tqparent->m_cat3Menu->setItemChecked( m_cat3, false );
-        m_tqparent->m_cat3Menu->setItemChecked( IdNone, true );
+        m_parent->m_cat3Menu->setItemChecked( m_cat3, false );
+        m_parent->m_cat3Menu->setItemChecked( IdNone, true );
         m_cat3 = IdNone;
     }
     updateTrackDepth();
@@ -1374,7 +1374,7 @@ CollectionView::ipodItemClicked( TQListViewItem *item, const TQPoint&, int c )
         return;
 
     // The TQt manual says NOT to delete items from within this slot
-    TQTimer::singleShot( 0, m_tqparent->m_ipodIncrement, TQT_SLOT( activate() ) );
+    TQTimer::singleShot( 0, m_parent->m_ipodIncrement, TQT_SLOT( activate() ) );
 }
 
 
@@ -1525,11 +1525,11 @@ CollectionView::rmbPressed( TQListViewItem* item, const TQPoint& point, int ) //
                 {
                     TQString artist;
                     if( item->depth() - artistLevel == 1 )
-                        artist = item->tqparent()->text( 0 );
+                        artist = item->parent()->text( 0 );
                     else if( item->depth() - artistLevel == 2 )
-                        artist = item->tqparent()->tqparent()->text( 0 );
+                        artist = item->parent()->parent()->text( 0 );
                     else if( item->depth() - artistLevel == 3 )
-                        artist = item->tqparent()->tqparent()->tqparent()->text( 0 );
+                        artist = item->parent()->parent()->parent()->text( 0 );
                     K3bExporter::instance()->exportAlbum( artist, trueItemText );
                 }
                 break;
@@ -1579,15 +1579,15 @@ CollectionView::setViewMode( int mode, bool rerender /*=true*/ )
         #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
         setShadeSortColumn( false );
         #endif
-        m_tqparent->m_ipodDecrement->setEnabled( m_currentDepth > 0 );
-        m_tqparent->ipodToolbar( true );
+        m_parent->m_ipodDecrement->setEnabled( m_currentDepth > 0 );
+        m_parent->ipodToolbar( true );
     }
     else
     {
         #if KDE_VERSION >= KDE_MAKE_VERSION(3,4,0)
         setShadeSortColumn( true );
         #endif
-        m_tqparent->ipodToolbar( false );
+        m_parent->ipodToolbar( false );
     }
 
     if ( rerender )
@@ -1628,9 +1628,9 @@ CollectionItem::setPixmap(int column, const TQPixmap & pix)
 
     //Now work out the artist 
     CollectionItem *p = this;
-    while ( p->tqparent() && dynamic_cast<CollectionItem*>( p->tqparent() ) )
+    while ( p->parent() && dynamic_cast<CollectionItem*>( p->parent() ) )
     {
-        p = static_cast<CollectionItem*>( p->tqparent() );
+        p = static_cast<CollectionItem*>( p->parent() );
         if ( IdArtist == p->m_cat )
         {
             artist = p->text( 0 );
@@ -1774,7 +1774,7 @@ CollectionView::organizeFiles( const KURL::List &urls, const TQString &caption,
         return;
     }
 
-    OrganizeCollectionDialogBase base( m_tqparent, "OrganizeFiles", true, caption,
+    OrganizeCollectionDialogBase base( m_parent, "OrganizeFiles", true, caption,
             KDialogBase::Ok|KDialogBase::Cancel|KDialogBase::Details );
     TQVBox* page = base.makeVBoxMainWidget();
 
@@ -2142,12 +2142,12 @@ CollectionView::updateColumnHeader()
     TQResizeEvent rev( size(), TQSize() );
     viewportResizeEvent( &rev );
 
-    m_tqparent->m_categoryMenu->setItemChecked( IdArtist, m_cat1 == IdArtist && m_cat2 == IdNone );
-    m_tqparent->m_categoryMenu->setItemChecked( IdAlbum, m_cat1 == IdAlbum && m_cat2 == IdNone );
-    m_tqparent->m_categoryMenu->setItemChecked( IdArtistAlbum, m_cat1 == IdArtist && m_cat2 == IdAlbum && m_cat3 == IdNone );
-    m_tqparent->m_categoryMenu->setItemChecked( IdArtistVisYearAlbum, m_cat1 == IdArtist && m_cat2 == IdVisYearAlbum && m_cat3 == IdNone );
-    m_tqparent->m_categoryMenu->setItemChecked( IdGenreArtist, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdNone );
-    m_tqparent->m_categoryMenu->setItemChecked( IdGenreArtistAlbum, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdAlbum );
+    m_parent->m_categoryMenu->setItemChecked( IdArtist, m_cat1 == IdArtist && m_cat2 == IdNone );
+    m_parent->m_categoryMenu->setItemChecked( IdAlbum, m_cat1 == IdAlbum && m_cat2 == IdNone );
+    m_parent->m_categoryMenu->setItemChecked( IdArtistAlbum, m_cat1 == IdArtist && m_cat2 == IdAlbum && m_cat3 == IdNone );
+    m_parent->m_categoryMenu->setItemChecked( IdArtistVisYearAlbum, m_cat1 == IdArtist && m_cat2 == IdVisYearAlbum && m_cat3 == IdNone );
+    m_parent->m_categoryMenu->setItemChecked( IdGenreArtist, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdNone );
+    m_parent->m_categoryMenu->setItemChecked( IdGenreArtistAlbum, m_cat1 == IdGenre && m_cat2 == IdArtist && m_cat3 == IdAlbum );
 }
 
 
@@ -2219,7 +2219,7 @@ CollectionView::listSelectedSiblingsOf( int cat, TQListViewItem* item )
 KURL::List
 CollectionView::listSelected()
 {
-    //Here we determine the URLs of all selected items. We use two passes, one for the tqparent items,
+    //Here we determine the URLs of all selected items. We use two passes, one for the parent items,
     //and another one for the tqchildren.
 
     KURL::List list;
@@ -2450,13 +2450,13 @@ CollectionView::listSelected()
     {
         for ( item = firstChild(); item; item = item->nextSibling() )
             for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
-                if ( child->isSelected() && !child->tqparent()->isSelected() )
+                if ( child->isSelected() && !child->parent()->isSelected() )
                     list << static_cast<CollectionItem*>( child ) ->url();
     }
     else {
         for ( item = firstChild(); item; item = item->nextSibling() )
             for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
-                if ( child->isSelected() && !child->tqparent()->isSelected() )
+                if ( child->isSelected() && !child->parent()->isSelected() )
                 {
                     const bool sampler = static_cast<CollectionItem*>( item )->isSampler();
                     qb.clear();
@@ -2543,7 +2543,7 @@ CollectionView::listSelected()
     for ( item = firstChild(); item; item = item->nextSibling() )
         for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
             for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() )
-                if ( grandChild->isSelected() && !grandChild->isExpandable() && !child->tqparent()->isSelected() && !child->isSelected() )
+                if ( grandChild->isSelected() && !grandChild->isExpandable() && !child->parent()->isSelected() && !child->isSelected() )
                     list << static_cast<CollectionItem*>( grandChild ) ->url();
 
     //category 3
@@ -2553,14 +2553,14 @@ CollectionView::listSelected()
             for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
                 for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() )
                     for ( TQListViewItem* grandChild2 = grandChild->firstChild(); grandChild2; grandChild2 = grandChild2->nextSibling() )
-                        if ( grandChild2->isSelected() && !child->tqparent()->isSelected() && !child->isSelected() && !grandChild->isSelected() )
+                        if ( grandChild2->isSelected() && !child->parent()->isSelected() && !child->isSelected() && !grandChild->isSelected() )
                             list << static_cast<CollectionItem*>( grandChild2 ) ->url();
     }
     else {
         for ( item = firstChild(); item; item = item->nextSibling() )
             for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
                 for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() )
-                    if ( grandChild->isSelected() && !grandChild->tqparent()->isSelected() )
+                    if ( grandChild->isSelected() && !grandChild->parent()->isSelected() )
                     {
                         const bool sampler = static_cast<CollectionItem*>( item )->isSampler();
                         qb.clear();
@@ -2661,7 +2661,7 @@ CollectionView::listSelected()
             for ( TQListViewItem* child = item->firstChild(); child; child = child->nextSibling() )
                 for ( TQListViewItem* grandChild = child->firstChild(); grandChild; grandChild = grandChild->nextSibling() )
                     for ( TQListViewItem* grandChild2 = grandChild->firstChild(); grandChild2; grandChild2 = grandChild2->nextSibling() )
-                        if ( grandChild2->isSelected() && !child->tqparent()->isSelected() && !child->isSelected() && !grandChild->isSelected() )
+                        if ( grandChild2->isSelected() && !child->parent()->isSelected() && !child->isSelected() && !grandChild->isSelected() )
                             list << static_cast<CollectionItem*>( grandChild2 ) ->url();
 
     return list;
@@ -2957,7 +2957,7 @@ CollectionView::incrementDepth( bool rerender /*= true*/ )
         return;
     }
 
-    m_tqparent->m_ipodDecrement->setEnabled( true );
+    m_parent->m_ipodDecrement->setEnabled( true );
 
     // We're not in track mode
     int catArr[3] = {m_cat1, m_cat2, m_cat3};
@@ -3051,7 +3051,7 @@ CollectionView::decrementDepth ( bool rerender /*= true*/ )
         return;
 
     m_currentDepth--;
-    m_tqparent->m_ipodDecrement->setEnabled( m_currentDepth > 0 );
+    m_parent->m_ipodDecrement->setEnabled( m_currentDepth > 0 );
     m_ipodFilters[m_currentDepth].clear();
     int catArr[3] = {m_cat1, m_cat2, m_cat3};
     int cat = catArr[m_currentDepth];
@@ -3086,7 +3086,7 @@ CollectionView::resetIpodDepth ( void )
     m_ipodFilters[1].clear();
     m_ipodFilters[2].clear();
     m_ipodIncremented = 1;
-    m_tqparent->m_ipodDecrement->setEnabled( false );
+    m_parent->m_ipodDecrement->setEnabled( false );
 }
 
 
@@ -3384,7 +3384,7 @@ CollectionView::cacheView()
             if ( item->isOpen() ) {
                 //construct path to item
                 TQStringList itemPath;
-                for( const TQListViewItem *i = item; i; i = i->tqparent() )
+                for( const TQListViewItem *i = item; i; i = i->parent() )
                     itemPath.prepend( i->text( 0 ) );
 
                 m_cacheOpenItemPaths.append ( itemPath );
@@ -3445,7 +3445,7 @@ TQStringList
 CollectionView::makeStructuredNameList( TQListViewItem *item ) const
 {
     TQStringList nameList;
-    for ( TQListViewItem *current = item; current; current = current->tqparent() )
+    for ( TQListViewItem *current = item; current; current = current->parent() )
         nameList.push_front( current->text( 0 ) );
     return nameList;
 }
@@ -4538,8 +4538,8 @@ CollectionItem::sortChildItems ( int column, bool ascending ) {
 //
 // DividerItem
 
-DividerItem::DividerItem( TQListView* tqparent, TQString txt, int cat/*, bool sortYearsInverted*/)
-: KListViewItem( tqparent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/
+DividerItem::DividerItem( TQListView* parent, TQString txt, int cat/*, bool sortYearsInverted*/)
+: KListViewItem( parent), m_blockText(false), m_text(txt), m_cat(cat)/*, m_sortYearsInverted(sortYearsInverted)*/
 {
     setExpandable(false);
     setDropEnabled(false);

amarok/src/collectionbrowser.h

@@ -124,7 +124,7 @@ public:
     static bool shareTheSameGroup(const TQString& a, const TQString& b, int cat);
 
 public:
-    DividerItem( TQListView* tqparent, TQString txt, int cat);
+    DividerItem( TQListView* parent, TQString txt, int cat);
 
     virtual void paintCell ( TQPainter * p, const TQColorGroup & cg, int column, int width, int align );
     virtual void paintFocus ( TQPainter * p, const TQColorGroup & cg, const TQRect & r );
@@ -146,13 +146,13 @@ private:
 
 class CollectionItem : public KListViewItem {
     public:
-        CollectionItem( TQListView* tqparent, int cat = 0, bool unknown = false, bool sampler=false )
-            : KListViewItem( tqparent )
+        CollectionItem( TQListView* parent, int cat = 0, bool unknown = false, bool sampler=false )
+            : KListViewItem( parent )
             , m_cat( cat )
             , m_isUnknown( unknown )
             , m_isSampler( sampler ) {};
-        CollectionItem( TQListViewItem* tqparent, int cat = 0, bool unknown = false, bool sampler=false )
-            : KListViewItem( tqparent )
+        CollectionItem( TQListViewItem* parent, int cat = 0, bool unknown = false, bool sampler=false )
+            : KListViewItem( parent )
             , m_cat( cat )
             , m_isUnknown( unknown )
             , m_isSampler( sampler ) {};
@@ -201,7 +201,7 @@ class CollectionView : public KListView, public DropProxyTarget
         friend class CollectionItem; // for access to m_cat2
         friend class ContextBrowser; // for setupDirs()
 
-        CollectionView( CollectionBrowser* tqparent );
+        CollectionView( CollectionBrowser* parent );
         ~CollectionView();
 
         LIBAMAROK_EXPORT static CollectionView* instance() { return m_instance; }
@@ -343,7 +343,7 @@ class CollectionView : public KListView, public DropProxyTarget
     //attributes:
         LIBAMAROK_EXPORT static CollectionView* m_instance;
 
-        CollectionBrowser* m_tqparent;
+        CollectionBrowser* m_parent;
 
         TQString m_filter;
         uint m_timeFilter;
@@ -383,10 +383,10 @@ class OrganizeCollectionDialogBase : public KDialogBase
     Q_OBJECT
   TQ_OBJECT
     public:
-    OrganizeCollectionDialogBase( TQWidget *tqparent=0, const char *name=0, bool modal=true,
+    OrganizeCollectionDialogBase( TQWidget *parent=0, const char *name=0, bool modal=true,
             const TQString &caption=TQString(),
             int buttonMask=Ok|Apply|Cancel )
-        : KDialogBase( tqparent, name, modal, caption, buttonMask )
+        : KDialogBase( parent, name, modal, caption, buttonMask )
     {
     }
 

amarok/src/collectiondb.cpp

@@ -100,9 +100,9 @@ using Amarok::QStringx;
 
 INotify* INotify::s_instance = 0;
 
-INotify::INotify( CollectionDB *tqparent, int fd )
-    : DependentJob( tqparent, "INotify" )
-    , m_tqparent( tqparent )
+INotify::INotify( CollectionDB *parent, int fd )
+    : DependentJob( parent, "INotify" )
+    , m_parent( parent )
     , m_fd( fd )
 {
     s_instance = this;
@@ -144,7 +144,7 @@ INotify::doJob()
         if ( !deviceIds.isEmpty() ) deviceIds += ',';
         deviceIds += TQString::number(*it);
     }
-    const TQStringList values = m_tqparent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" )
+    const TQStringList values = m_parent->query( TQString( "SELECT dir, deviceid FROM directories WHERE deviceid IN (%1);" )
                                                     .tqarg( deviceIds ) );
     foreach( values )
     {
@@ -185,7 +185,7 @@ INotify::doJob()
                     i += EVENT_SIZE + event->len;
                 }
 
-                TQTimer::singleShot( 0, m_tqparent, TQT_SLOT( scanMonitor() ) );
+                TQTimer::singleShot( 0, m_parent, TQT_SLOT( scanMonitor() ) );
             }
         }
     }
@@ -1169,7 +1169,7 @@ CollectionDB::createPodcastTables()
                     "image " + exactTextColumnType() + ","
                     "comment " + longTextColumnType() + ","
                     "copyright "  + textColumnType() + ","
-                    "tqparent INTEGER,"
+                    "parent INTEGER,"
                     "directory "  + textColumnType() + ","
                     "autoscan BOOL, fetchtype INTEGER, "
                     "autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ) );
@@ -1179,7 +1179,7 @@ CollectionDB::createPodcastTables()
                     "id INTEGER PRIMARY KEY %1, "
                     "url " + exactTextColumnType() + " UNITQUE,"
                     "localurl " + exactTextColumnType() + ","
-                    "tqparent " + exactTextColumnType() + ","
+                    "parent " + exactTextColumnType() + ","
                     "guid " + exactTextColumnType() + ","
                     "title " + textColumnType() + ","
                     "subtitle " + textColumnType() + ","
@@ -1196,7 +1196,7 @@ CollectionDB::createPodcastTables()
     query( TQString( "CREATE TABLE podcastfolders ("
                     "id INTEGER PRIMARY KEY %1, "
                     "name " + textColumnType() + ","
-                    "tqparent INTEGER, isOpen BOOL );" )
+                    "parent INTEGER, isOpen BOOL );" )