summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-08-10 22:19:39 +0000
commiteb88625a55dbaa7e92042d96241e9ddda4604862 (patch)
tree4c27a5cdb55479be9713df0175bf0fef29c2cbf2
parent1dbf3ff1cbb6d82a451bc319301bf38816c2c232 (diff)
downloadamarok-eb88625a55dbaa7e92042d96241e9ddda4604862.tar.gz
amarok-eb88625a55dbaa7e92042d96241e9ddda4604862.zip
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
-rw-r--r--amarok/src/actionclasses.cpp8
-rw-r--r--amarok/src/actionclasses.h4
-rw-r--r--amarok/src/amarok.h2
-rw-r--r--amarok/src/analyzers/analyzerbase.cpp12
-rw-r--r--amarok/src/analyzers/analyzerfactory.cpp38
-rw-r--r--amarok/src/analyzers/baranalyzer.cpp6
-rw-r--r--amarok/src/analyzers/blockanalyzer.cpp4
-rw-r--r--amarok/src/analyzers/boomanalyzer.cpp4
-rw-r--r--amarok/src/analyzers/glanalyzer.cpp4
-rw-r--r--amarok/src/analyzers/glanalyzer2.cpp4
-rw-r--r--amarok/src/analyzers/glanalyzer3.cpp4
-rw-r--r--amarok/src/analyzers/sonogram.cpp4
-rw-r--r--amarok/src/analyzers/turbine.h2
-rw-r--r--amarok/src/app.cpp12
-rw-r--r--amarok/src/browserToolBar.h4
-rw-r--r--amarok/src/browserbar.cpp6
-rw-r--r--amarok/src/browserbar.h6
-rw-r--r--amarok/src/clicklineedit.cpp4
-rw-r--r--amarok/src/clicklineedit.h2
-rw-r--r--amarok/src/collectionbrowser.cpp166
-rw-r--r--amarok/src/collectionbrowser.h18
-rw-r--r--amarok/src/collectiondb.cpp82
-rw-r--r--amarok/src/collectiondb.h8
-rw-r--r--amarok/src/columnlist.cpp4
-rw-r--r--amarok/src/columnlist.h2
-rw-r--r--amarok/src/configdialog.cpp4
-rw-r--r--amarok/src/configdialog.h2
-rw-r--r--amarok/src/contextbrowser.cpp12
-rw-r--r--amarok/src/coverfetcher.cpp30
-rw-r--r--amarok/src/coverfetcher.h6
-rw-r--r--amarok/src/covermanager.cpp16
-rw-r--r--amarok/src/covermanager.h8
-rw-r--r--amarok/src/database_refactor/collectiondb.cpp10
-rw-r--r--amarok/src/database_refactor/collectiondb.h2
-rw-r--r--amarok/src/deletedialog.cpp12
-rw-r--r--amarok/src/deletedialog.h6
-rw-r--r--amarok/src/directorylist.cpp18
-rw-r--r--amarok/src/directorylist.h12
-rw-r--r--amarok/src/editfilterdialog.cpp4
-rw-r--r--amarok/src/editfilterdialog.h2
-rw-r--r--amarok/src/engine/helix/helix-configdialog.cpp56
-rw-r--r--amarok/src/engine/helix/helix-configdialog.h10
-rw-r--r--amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h4
-rw-r--r--amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcore.h6
-rw-r--r--amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h50
-rw-r--r--amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwin.h2
-rw-r--r--amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h2
-rw-r--r--amarok/src/engine/helix/hxplayercontrol.cpp22
-rw-r--r--amarok/src/engine/helix/hxplayercontrol.h2
-rw-r--r--amarok/src/engine/nmm/HostList.cpp4
-rw-r--r--amarok/src/engine/nmm/HostListItem.cpp8
-rw-r--r--amarok/src/engine/yauap/yauap-engine.h2
-rw-r--r--amarok/src/equalizergraph.cpp4
-rw-r--r--amarok/src/equalizergraph.h2
-rw-r--r--amarok/src/equalizerpresetmanager.cpp4
-rw-r--r--amarok/src/equalizerpresetmanager.h2
-rw-r--r--amarok/src/filebrowser.cpp8
-rw-r--r--amarok/src/filebrowser.h2
-rw-r--r--amarok/src/hintlineedit.cpp16
-rw-r--r--amarok/src/hintlineedit.h8
-rw-r--r--amarok/src/inotify/inotify-syscalls.h4
-rw-r--r--amarok/src/inotify/inotify.h8
-rw-r--r--amarok/src/kbookmarkhandler.cpp8
-rw-r--r--amarok/src/kbookmarkhandler.h2
-rw-r--r--amarok/src/konquisidebar/universalamarok.cpp8
-rw-r--r--amarok/src/konquisidebar/universalamarok.h4
-rw-r--r--amarok/src/lastfm.cpp16
-rw-r--r--amarok/src/lastfm.h8
-rw-r--r--amarok/src/magnatunebrowser/magnatuneartistinfobox.h2
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunedownloaddialog.h4
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistview.h2
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.cpp12
-rw-r--r--amarok/src/magnatunebrowser/magnatunelistviewitems.h6
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasedialog.h4
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp10
-rw-r--r--amarok/src/magnatunebrowser/magnatunepurchasehandler.h6
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp4
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloaddialog.h2
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp12
-rw-r--r--amarok/src/magnatunebrowser/magnatuneredownloadhandler.h4
-rw-r--r--amarok/src/mediabrowser.cpp206
-rw-r--r--amarok/src/mediabrowser.h44
-rw-r--r--amarok/src/mediadevice/daap/daapclient.cpp20
-rw-r--r--amarok/src/mediadevice/daap/daapclient.h6
-rw-r--r--amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp4
-rw-r--r--amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h2
-rw-r--r--amarok/src/mediadevice/daap/daapreader/reader.cpp4
-rw-r--r--amarok/src/mediadevice/daap/daapreader/reader.h2
-rw-r--r--amarok/src/mediadevice/daap/daapserver.cpp4
-rw-r--r--amarok/src/mediadevice/daap/daapserver.h2
-rw-r--r--amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c38
-rw-r--r--amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb2
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.cpp84
-rw-r--r--amarok/src/mediadevice/generic/genericmediadevice.h8
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.cpp54
-rw-r--r--amarok/src/mediadevice/ifp/ifpmediadevice.h12
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.cpp68
-rw-r--r--amarok/src/mediadevice/ipod/ipodmediadevice.h6
-rw-r--r--amarok/src/mediadevice/mtp/mtpmediadevice.cpp44
-rw-r--r--amarok/src/mediadevice/mtp/mtpmediadevice.h22
-rw-r--r--amarok/src/mediadevice/njb/njbmediadevice.cpp12
-rw-r--r--amarok/src/mediadevice/njb/njbmediadevice.h8
-rw-r--r--amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp8
-rw-r--r--amarok/src/mediadevice/riokarma/riokarmamediadevice.h6
-rw-r--r--amarok/src/mediumpluginmanager.cpp4
-rw-r--r--amarok/src/mediumpluginmanager.h2
-rw-r--r--amarok/src/metabundle.cpp4
-rw-r--r--amarok/src/metadata/m4a/mp4propsproxy.h2
-rw-r--r--amarok/src/moodbar.cpp4
-rw-r--r--amarok/src/moodbar.h2
-rw-r--r--amarok/src/multitabbar.cpp16
-rw-r--r--amarok/src/multitabbar.h8
-rw-r--r--amarok/src/multitabbar_p.h4
-rw-r--r--amarok/src/mydiroperator.cpp2
-rw-r--r--amarok/src/mydiroperator.h2
-rw-r--r--amarok/src/organizecollectiondialog.ui.h6
-rw-r--r--amarok/src/osd.cpp42
-rw-r--r--amarok/src/osd.h4
-rw-r--r--amarok/src/playerwindow.cpp30
-rw-r--r--amarok/src/playlist.cpp22
-rw-r--r--amarok/src/playlist.h2
-rw-r--r--amarok/src/playlistbrowser.cpp190
-rw-r--r--amarok/src/playlistbrowser.h30
-rw-r--r--amarok/src/playlistbrowseritem.cpp162
-rw-r--r--amarok/src/playlistbrowseritem.h74
-rw-r--r--amarok/src/playlistselection.cpp36
-rw-r--r--amarok/src/playlistselection.h12
-rw-r--r--amarok/src/playlistwindow.cpp10
-rw-r--r--amarok/src/playlistwindow.h4
-rw-r--r--amarok/src/plugin/plugin.h4
-rw-r--r--amarok/src/podcastbundle.h14
-rw-r--r--amarok/src/podcastsettings.cpp8
-rw-r--r--amarok/src/podcastsettings.h4
-rw-r--r--amarok/src/prettypopupmenu.cpp4
-rw-r--r--amarok/src/prettypopupmenu.h2
-rw-r--r--amarok/src/queuemanager.cpp12
-rw-r--r--amarok/src/queuemanager.h8
-rw-r--r--amarok/src/scancontroller.cpp4
-rw-r--r--amarok/src/scancontroller.h2
-rw-r--r--amarok/src/scriptmanager.cpp4
-rw-r--r--amarok/src/scriptmanager.h2
-rw-r--r--amarok/src/scripts/common/Zeroconf.py2
-rw-r--r--amarok/src/scripts/databasescripts/TODO2
-rw-r--r--amarok/src/scripts/databasescripts/databaseScripts.rb2
-rw-r--r--amarok/src/scripts/graphequalizer/equalizercanvasview.cpp4
-rw-r--r--amarok/src/scripts/graphequalizer/equalizercanvasview.h6
-rw-r--r--amarok/src/scripts/graphequalizer/stdinreader.h4
-rw-r--r--amarok/src/sliderwidget.cpp18
-rw-r--r--amarok/src/sliderwidget.h4
-rw-r--r--amarok/src/smartplaylisteditor.cpp12
-rw-r--r--amarok/src/smartplaylisteditor.h6
-rw-r--r--amarok/src/socketserver.cpp18
-rw-r--r--amarok/src/socketserver.h8
-rw-r--r--amarok/src/sqlite/sqlite3.c320
-rw-r--r--amarok/src/statistics.cpp16
-rw-r--r--amarok/src/statistics.h8
-rw-r--r--amarok/src/statusbar/overlayWidget.cpp8
-rw-r--r--amarok/src/statusbar/overlayWidget.h4
-rw-r--r--amarok/src/statusbar/popupMessage.cpp24
-rw-r--r--amarok/src/statusbar/popupMessage.h6
-rw-r--r--amarok/src/statusbar/progressBar.cpp6
-rw-r--r--amarok/src/statusbar/progressBar.h2
-rw-r--r--amarok/src/statusbar/queueLabel.cpp4
-rw-r--r--amarok/src/statusbar/queueLabel.h2
-rw-r--r--amarok/src/statusbar/selectLabel.h4
-rw-r--r--amarok/src/statusbar/squeezedtextlabel.cpp8
-rw-r--r--amarok/src/statusbar/squeezedtextlabel.h4
-rw-r--r--amarok/src/statusbar/statusBarBase.cpp8
-rw-r--r--amarok/src/statusbar/statusBarBase.h6
-rw-r--r--amarok/src/statusbar/statusbar.cpp4
-rw-r--r--amarok/src/statusbar/statusbar.h2
-rw-r--r--amarok/src/statusbar/timeLabel.h2
-rw-r--r--amarok/src/statusbar/toggleLabel.h4
-rw-r--r--amarok/src/tagdialog.cpp12
-rw-r--r--amarok/src/tagdialog.h6
-rw-r--r--amarok/src/threadmanager.h2
-rw-r--r--amarok/src/tooltip.cpp10
-rw-r--r--amarok/src/tooltip.h6
-rw-r--r--amarok/src/trackpickerdialog.cpp10
-rw-r--r--amarok/src/trackpickerdialog.h2
-rw-r--r--amarok/src/tracktooltip.cpp2
184 files changed, 1446 insertions, 1446 deletions
diff --git a/amarok/src/actionclasses.cpp b/amarok/src/actionclasses.cpp
index ec85dd26..3fd5c490 100644
--- a/amarok/src/actionclasses.cpp
+++ b/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" ) );
diff --git a/amarok/src/actionclasses.h b/amarok/src/actionclasses.h
index 2725bd7a..233fb626 100644
--- a/amarok/src/actionclasses.h
+++ b/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* );
diff --git a/amarok/src/amarok.h b/amarok/src/amarok.h
index 45ed1aba..aa48d1ac 100644
--- a/amarok/src/amarok.h
+++ b/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]);
diff --git a/amarok/src/analyzers/analyzerbase.cpp b/amarok/src/analyzers/analyzerbase.cpp
index 83fb1595..b4ff9ac0 100644
--- a/amarok/src/analyzers/analyzerbase.cpp
+++ b/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() ) );
}
diff --git a/amarok/src/analyzers/analyzerfactory.cpp b/amarok/src/analyzers/analyzerfactory.cpp
index e712b4cf..2016656b 100644
--- a/amarok/src/analyzers/analyzerfactory.cpp
+++ b/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;
diff --git a/amarok/src/analyzers/baranalyzer.cpp b/amarok/src/analyzers/baranalyzer.cpp
index 40f5694f..c54353aa 100644
--- a/amarok/src/analyzers/baranalyzer.cpp
+++ b/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()
diff --git a/amarok/src/analyzers/blockanalyzer.cpp b/amarok/src/analyzers/blockanalyzer.cpp
index 68538ae7..1ebfdf0f 100644
--- a/amarok/src/analyzers/blockanalyzer.cpp
+++ b/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
diff --git a/amarok/src/analyzers/boomanalyzer.cpp b/amarok/src/analyzers/boomanalyzer.cpp
index d50ca3af..3505c82c 100644
--- a/amarok/src/analyzers/boomanalyzer.cpp
+++ b/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 )
diff --git a/amarok/src/analyzers/glanalyzer.cpp b/amarok/src/analyzers/glanalyzer.cpp
index a3387734..74884b22 100644
--- a/amarok/src/analyzers/glanalyzer.cpp
+++ b/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)
{}
diff --git a/amarok/src/analyzers/glanalyzer2.cpp b/amarok/src/analyzers/glanalyzer2.cpp
index 19fae32d..ae6c5b2c 100644
--- a/amarok/src/analyzers/glanalyzer2.cpp
+++ b/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();
diff --git a/amarok/src/analyzers/glanalyzer3.cpp b/amarok/src/analyzers/glanalyzer3.cpp
index 74f8ad29..bd16f689 100644
--- a/amarok/src/analyzers/glanalyzer3.cpp
+++ b/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();
diff --git a/amarok/src/analyzers/sonogram.cpp b/amarok/src/analyzers/sonogram.cpp
index cff361fb..253d3915 100644
--- a/amarok/src/analyzers/sonogram.cpp
+++ b/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)
{
}
diff --git a/amarok/src/analyzers/turbine.h b/amarok/src/analyzers/turbine.h
index c216a9a0..6ad34fbc 100644
--- a/amarok/src/analyzers/turbine.h
+++ b/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& );
};
diff --git a/amarok/src/app.cpp b/amarok/src/app.cpp
index a0b2a34a..a517ac34 100644
--- a/amarok/src/app.cpp
+++ b/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 );
diff --git a/amarok/src/browserToolBar.h b/amarok/src/browserToolBar.h
index 1425cd37..6d421ab0 100644
--- a/amarok/src/browserToolBar.h
+++ b/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);
diff --git a/amarok/src/browserbar.cpp b/amarok/src/browserbar.cpp
index d945c8b0..e2c6365b 100644
--- a/amarok/src/browserbar.cpp
+++ b/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 ) )
diff --git a/amarok/src/browserbar.h b/amarok/src/browserbar.h
index c0cb226d..25ff2a33 100644
--- a/amarok/src/browserbar.h
+++ b/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
diff --git a/amarok/src/clicklineedit.cpp b/amarok/src/clicklineedit.cpp
index 8e1b2b77..00d27832 100644
--- a/amarok/src/clicklineedit.cpp
+++ b/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 );
diff --git a/amarok/src/clicklineedit.h b/amarok/src/clicklineedit.h
index 9881ab3f..2046609c 100644
--- a/amarok/src/clicklineedit.h
+++ b/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; }
diff --git a/amarok/src/collectionbrowser.cpp b/amarok/src/collectionbrowser.cpp
index 7d3df15f..b2fb94f8 100644
--- a/amarok/src/collectionbrowser.cpp
+++ b/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);
diff --git a/amarok/src/collectionbrowser.h b/amarok/src/collectionbrowser.h
index d0a7b4b8..c8cc0a86 100644
--- a/amarok/src/collectionbrowser.h
+++ b/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 )
{
}
diff --git a/amarok/src/collectiondb.cpp b/amarok/src/collectiondb.cpp
index 63a1bdff..753ec474 100644
--- a/amarok/src/collectiondb.cpp
+++ b/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 );" )
.tqarg( podcastFolderAutoInc ) );
query( "CREATE INDEX url_podchannel ON podcastchannels( url );" );
@@ -1236,7 +1236,7 @@ CollectionDB::createPodcastTablesV2( bool temp )
"image " + exactTextColumnType() + ","
"comment " + longTextColumnType() + ","
"copyright " + textColumnType() + ","
- "tqparent INTEGER,"
+ "parent INTEGER,"
"directory " + textColumnType() + ","
"autoscan BOOL, fetchtype INTEGER, "
"autotransfer BOOL, haspurge BOOL, purgecount INTEGER );" ).tqarg( a,b ) );
@@ -1246,7 +1246,7 @@ CollectionDB::createPodcastTablesV2( bool temp )
"id INTEGER PRIMARY KEY %1, "
"url " + exactTextColumnType() + " UNITQUE,"
"localurl " + exactTextColumnType() + ","
- "tqparent " + exactTextColumnType() + ","
+ "parent " + exactTextColumnType() + ","
"guid " + exactTextColumnType() + ","
"title " + textColumnType() + ","
"subtitle " + textColumnType() + ","
@@ -1263,7 +1263,7 @@ CollectionDB::createPodcastTablesV2( bool temp )
query( TQString( "CREATE %2 TABLE podcastfolders%3 ("
"id INTEGER PRIMARY KEY %1, "
"name " + textColumnType() + ","
- "tqparent INTEGER, isOpen BOOL );" )
+ "parent INTEGER, isOpen BOOL );" )
.tqarg( podcastFolderAutoInc, a, b ) );
if ( !temp )
@@ -1911,7 +1911,7 @@ CollectionDB::podcastImage( const MetaBundle &bundle, const bool withShadow, uin
if( getPodcastEpisodeBundle( url, &peb ) )
{
- url = peb.tqparent().url();
+ url = peb.parent().url();
}
if( getPodcastChannelBundle( url, &pcb ) )
@@ -2547,12 +2547,12 @@ CollectionDB::addPodcastChannel( const PodcastChannelBundle &pcb, const bool &re
TQString command;
if( replace ) {
command = "REPLACE INTO podcastchannels "
- "( url, title, weblink, image, comment, copyright, tqparent, directory"
+ "( url, title, weblink, image, comment, copyright, parent, directory"
", autoscan, fetchtype, autotransfer, haspurge, purgecount ) "
"VALUES (";
} else {
command = "INSERT INTO podcastchannels "
- "( url, title, weblink, image, comment, copyright, tqparent, directory"
+ "( url, title, weblink, image, comment, copyright, parent, directory"
", autoscan, fetchtype, autotransfer, haspurge, purgecount ) "
"VALUES (";
}
@@ -2593,11 +2593,11 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int
if( idToUpdate ) {
command = "REPLACE INTO podcastepisodes "
- "( id, url, localurl, tqparent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) "
+ "( id, url, localurl, parent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) "
"VALUES (";
} else {
command = "INSERT INTO podcastepisodes "
- "( url, localurl, tqparent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) "
+ "( url, localurl, parent, title, subtitle, composer, comment, filetype, createdate, guid, length, size, isNew ) "
"VALUES (";
}
@@ -2620,7 +2620,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int
command += '\'' + escapeString( episode.url().url() ) + "',";
command += ( localurl.isEmpty() ? "NULL" : '\'' + escapeString( localurl ) + '\'' ) + ',';
- command += '\'' + escapeString( episode.tqparent().url()) + "',";
+ command += '\'' + escapeString( episode.parent().url()) + "',";
command += ( title.isEmpty() ? "NULL" : '\'' + escapeString( title ) + '\'' ) + ',';
command += ( subtitle.isEmpty() ? "NULL" : '\'' + escapeString( subtitle ) + '\'' ) + ',';
command += ( author.isEmpty() ? "NULL" : '\'' + escapeString( author ) + '\'' ) + ',';
@@ -2647,7 +2647,7 @@ CollectionDB::addPodcastEpisode( const PodcastEpisodeBundle &episode, const int
TQValueList<PodcastChannelBundle>
CollectionDB::getPodcastChannels()
{
- TQString command = "SELECT url, title, weblink, image, comment, copyright, tqparent, directory "
+ TQString command = "SELECT url, title, weblink, image, comment, copyright, parent, directory "
", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels;";
TQStringList values = query( command );
@@ -2677,9 +2677,9 @@ CollectionDB::getPodcastChannels()
}
TQValueList<PodcastEpisodeBundle>
-CollectionDB::getPodcastEpisodes( const KURL &tqparent, bool onlyNew, int limit )
+CollectionDB::getPodcastEpisodes( const KURL &parent, bool onlyNew, int limit )
{
- TQString command = TQString( "SELECT id, url, localurl, tqparent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( tqparent='%1'" ).tqarg( tqparent.url() );
+ TQString command = TQString( "SELECT id, url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE ( parent='%1'" ).tqarg( parent.url() );
if( onlyNew )
command += TQString( " AND isNew='%1'" ).tqarg( boolT() );
command += " ) ORDER BY id";
@@ -2722,7 +2722,7 @@ CollectionDB::getPodcastEpisodes( const KURL &tqparent, bool onlyNew, int limit
PodcastEpisodeBundle
CollectionDB::getPodcastEpisodeById( int id )
{
- TQString command = TQString( "SELECT url, localurl, tqparent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id );
+ TQString command = TQString( "SELECT url, localurl, parent, guid, title, subtitle, composer, comment, filetype, createdate, length, size, isNew FROM podcastepisodes WHERE id=%1;").tqarg( id );
TQStringList values = query( command );
PodcastEpisodeBundle peb;
@@ -2785,7 +2785,7 @@ bool
CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pcb )
{
TQStringList values = query( TQString(
- "SELECT url, title, weblink, image, comment, copyright, tqparent, directory "
+ "SELECT url, title, weblink, image, comment, copyright, parent, directory "
", autoscan, fetchtype, autotransfer, haspurge, purgecount FROM podcastchannels WHERE url = '%1';"
).tqarg( escapeString( url.url() ) ) );
@@ -2814,14 +2814,14 @@ CollectionDB::getPodcastChannelBundle( const KURL &url, PodcastChannelBundle *pc
int
CollectionDB::addPodcastFolder( const TQString &name, const int parent_id, const bool isOpen )
{
- TQString command = TQString( "INSERT INTO podcastfolders ( name, tqparent, isOpen ) VALUES ('" );
+ TQString command = TQString( "INSERT INTO podcastfolders ( name, parent, isOpen ) VALUES ('" );
command += escapeString( name ) + "',";
command += TQString::number( parent_id ) + ",";
command += isOpen ? boolT() + ");" : boolF() + ");";
insert( command, NULL );
- command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND tqparent = '%2';" )
+ command = TQString( "SELECT id FROM podcastfolders WHERE name = '%1' AND parent = '%2';" )
.tqarg( name, TQString::number(parent_id) );
TQStringList values = query( command );
@@ -2834,7 +2834,7 @@ CollectionDB::updatePodcastChannel( const PodcastChannelBundle &b )
if( getDbConnectionType() == DbConnection::postgresql )
{
query( QStringx( "UPDATE podcastchannels SET title='%1', weblink='%2', comment='%3', "
- "copyright='%4', tqparent=%5, directory='%6', autoscan=%7, fetchtype=%8, "
+ "copyright='%4', parent=%5, directory='%6', autoscan=%7, fetchtype=%8, "
"autotransfer=%9, haspurge=%10, purgecount=%11 WHERE url='%12';" )
.args ( TQStringList()
<< escapeString( b.title() )
@@ -2862,12 +2862,12 @@ CollectionDB::updatePodcastEpisode( const int id, const PodcastEpisodeBundle &b
{
if( getDbConnectionType() == DbConnection::postgresql )
{
- query( QStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', tqparent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', "
+ query( QStringx( "UPDATE podcastepisodes SET url='%1', localurl='%2', parent='%3', title='%4', subtitle='%5', composer='%6', comment='%7', "
"filetype='%8', createdate='%9', guid='%10', length=%11, size=%12, isNew=%13 WHERE id=%14;" )
.args( TQStringList()
<< escapeString( b.url().url() )
<< ( b.localUrl().isValid() ? escapeString( b.localUrl().url() ) : "NULL" )
- << escapeString( b.tqparent().url() )
+ << escapeString( b.parent().url() )
<< escapeString( b.title() )
<< escapeString( b.subtitle() )
<< escapeString( b.author() )
@@ -2891,7 +2891,7 @@ void
CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, const int parent_id, const bool isOpen )
{
if( getDbConnectionType() == DbConnection::postgresql ) {
- query( QStringx( "UPDATE podcastfolders SET name='%1', tqparent=%2, isOpen=%3 WHERE id=%4;" )
+ query( QStringx( "UPDATE podcastfolders SET name='%1', parent=%2, isOpen=%3 WHERE id=%4;" )
.args( TQStringList()
<< escapeString(name)
<< TQString::number(parent_id)
@@ -2901,7 +2901,7 @@ CollectionDB::updatePodcastFolder( const int folder_id, const TQString &name, co
);
}
else {
- query( QStringx( "REPLACE INTO podcastfolders ( id, name, tqparent, isOpen ) "
+ query( QStringx( "REPLACE INTO podcastfolders ( id, name, parent, isOpen ) "
"VALUES ( %1, '%2', %3, %4 );" )
.args( TQStringList()
<< TQString::number(folder_id)
@@ -2920,7 +2920,7 @@ CollectionDB::removePodcastChannel( const KURL &url )
query( TQString( "DELETE FROM podcastchannels WHERE url = '%1';" )
.tqarg( escapeString( url.url() ) ) );
//remove all tqchildren
- query( TQString( "DELETE FROM podcastepisodes WHERE tqparent = '%1';" )
+ query( TQString( "DELETE FROM podcastepisodes WHERE parent = '%1';" )
.tqarg( escapeString( url.url() ) ) );
}
@@ -4880,7 +4880,7 @@ void CollectionDB::engineTrackEnded( int finalPosition, int trackLength, const T
PodcastEpisodeBundle peb;
if( getPodcastEpisodeBundle( url.url(), &peb ) )
{
- PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb.url(), peb.tqparent() );
+ PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb.url(), peb.parent() );
if ( p )
p->setListened();
@@ -4913,7 +4913,7 @@ CollectionDB::timerEvent( TQTimerEvent* )
//////////////////////////////////////////////////////////////////////////////////////////
void
-CollectionDB::fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item ) //SLOT
+CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item ) //SLOT
{
#ifdef AMAZON_SUPPORT
debug() << "Fetching cover for " << artist << " - " << album << endl;
@@ -4922,9 +4922,9 @@ CollectionDB::fetchCover( TQWidget* tqparent, const TQString& artist, const TQSt
CoverFetcher* fetcher;
if( isCompilation )
// avoid putting various artists in front of album title. this causes problems for locales other than US.
- fetcher = new CoverFetcher( tqparent, "", album );
+ fetcher = new CoverFetcher( parent, "", album );
else
- fetcher = new CoverFetcher( tqparent, artist, album );
+ fetcher = new CoverFetcher( parent, artist, album );
if( item )
{
itemCoverMapMutex->lock();
@@ -5040,10 +5040,10 @@ class SimilarArtistsInsertionJob : public ThreadManager::DependentJob
const TQStringList suggestions;
public:
- SimilarArtistsInsertionJob( CollectionDB *tqparent, const TQString &s, const TQStringList &list )
- : ThreadManager::DependentJob( tqparent, "SimilarArtistsInsertionJob" )
+ SimilarArtistsInsertionJob( CollectionDB *parent, const TQString &s, const TQStringList &list )
+ : ThreadManager::DependentJob( parent, "SimilarArtistsInsertionJob" )
, artist( TQDeepCopy<TQString>(s) )
- , escapedArtist( tqparent->escapeString( TQDeepCopy<TQString>(s) ) )
+ , escapedArtist( parent->escapeString( TQDeepCopy<TQString>(s) ) )
, suggestions( TQDeepCopy<TQStringList>(list) )
{}
};
@@ -5729,12 +5729,12 @@ CollectionDB::updatePodcastTables()
{
createPodcastTablesV2( true );
query( "INSERT INTO podcastchannels_fix SELECT url,title,weblink,image,comment,"
- "copyright,tqparent,directory,autoscan,fetchtype,autotransfer,haspurge,"
+ "copyright,parent,directory,autoscan,fetchtype,autotransfer,haspurge,"
"purgecount FROM podcastchannels;" );
- query( "INSERT INTO podcastepisodes_fix SELECT id,url,localurl,tqparent,guid,title,"
+ query( "INSERT INTO podcastepisodes_fix SELECT id,url,localurl,parent,guid,title,"
"subtitle,composer,comment,filetype,createdate,length,size,isNew FROM "
"podcastepisodes;" );
- query( "INSERT INTO podcastfolders_fix SELECT id,name,tqparent,isOpen FROM podcastfolders;" );
+ query( "INSERT INTO podcastfolders_fix SELECT id,name,parent,isOpen FROM podcastfolders;" );
dropPodcastTablesV2();
createPodcastTablesV2( false );
query( "INSERT INTO podcastchannels SELECT * FROM podcastchannels_fix;" );
@@ -7939,7 +7939,7 @@ QueryBuilder::valueName( TQ_INT64 value )
"sampler",
"bpm",
"copyright",
- "tqparent",
+ "parent",
"weblink",
"autoscan",
"fetchtype",
diff --git a/amarok/src/collectiondb.h b/amarok/src/collectiondb.h
index 383ba088..17c925a6 100644
--- a/amarok/src/collectiondb.h
+++ b/amarok/src/collectiondb.h
@@ -348,7 +348,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
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 );
+ TQValueList<PodcastEpisodeBundle> getPodcastEpisodes( const KURL &parent, bool newOnly=false, int limit=-1 );
void removePodcastChannel( const KURL &url ); // will remove all episodes too
void removePodcastEpisode( const int id );
void removePodcastFolder( const int id );
@@ -510,7 +510,7 @@ class LIBAMAROK_EXPORT CollectionDB : public TQObject, public EngineObserver
void timerEvent( TQTimerEvent* e );
public slots:
- void fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item = 0 );
+ void fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit, TQListViewItem* item = 0 );
void scanMonitor();
void startScan();
void stopScan();
@@ -658,7 +658,7 @@ class INotify : public ThreadManager::DependentJob
TQ_OBJECT
public:
- INotify( CollectionDB *tqparent, int fd );
+ INotify( CollectionDB *parent, int fd );
~INotify();
static INotify *instance() { return s_instance; }
@@ -669,7 +669,7 @@ class INotify : public ThreadManager::DependentJob
private:
virtual bool doJob();
- CollectionDB* m_tqparent;
+ CollectionDB* m_parent;
int m_fd;
static INotify* s_instance;
diff --git a/amarok/src/columnlist.cpp b/amarok/src/columnlist.cpp
index 9d1eb698..6cced338 100644
--- a/amarok/src/columnlist.cpp
+++ b/amarok/src/columnlist.cpp
@@ -56,8 +56,8 @@ public:
MyCheckListItem *itemBelow() { return static_cast<MyCheckListItem*>( TQCheckListItem::itemBelow() ); }
};
-ColumnList::ColumnList( TQWidget *tqparent, const char *name )
- : TQHBox( tqparent, name ), m_changed( true )
+ColumnList::ColumnList( TQWidget *parent, const char *name )
+ : TQHBox( parent, name ), m_changed( true )
{
setSpacing( 5 );
diff --git a/amarok/src/columnlist.h b/amarok/src/columnlist.h
index efc59b06..4ed2a9ee 100644
--- a/amarok/src/columnlist.h
+++ b/amarok/src/columnlist.h
@@ -32,7 +32,7 @@ class ColumnList: public TQHBox
Q_OBJECT
TQ_OBJECT
public:
- ColumnList( TQWidget *tqparent = 0, const char *name = 0 );
+ ColumnList( TQWidget *parent = 0, const char *name = 0 );
TQValueList<int> visibleColumns() const;
TQValueList<int> columnOrder() const;
bool isChanged() const;
diff --git a/amarok/src/configdialog.cpp b/amarok/src/configdialog.cpp
index e364a2a2..68c8db60 100644
--- a/amarok/src/configdialog.cpp
+++ b/amarok/src/configdialog.cpp
@@ -79,8 +79,8 @@ int AmarokConfigDialog::s_currentPage = 0;
// PUBLIC
//////////////////////////////////////////////////////////////////////////////////////////
-AmarokConfigDialog::AmarokConfigDialog( TQWidget *tqparent, const char* name, KConfigSkeleton *config )
- : KConfigDialog( tqparent, name, config )
+AmarokConfigDialog::AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config )
+ : KConfigDialog( parent, name, config )
, m_engineConfig( 0 )
, m_opt4( 0 )
{
diff --git a/amarok/src/configdialog.h b/amarok/src/configdialog.h
index ba0f284a..d565601b 100644
--- a/amarok/src/configdialog.h
+++ b/amarok/src/configdialog.h
@@ -37,7 +37,7 @@ class AmarokConfigDialog : public KConfigDialog
TQ_OBJECT
public:
- AmarokConfigDialog( TQWidget *tqparent, const char* name, KConfigSkeleton *config );
+ AmarokConfigDialog( TQWidget *parent, const char* name, KConfigSkeleton *config );
~AmarokConfigDialog();
void addPage( TQWidget *page, const TQString &itemName, const TQString &pixmapName,
diff --git a/amarok/src/contextbrowser.cpp b/amarok/src/contextbrowser.cpp
index 045e4fc3..8c230bb2 100644
--- a/amarok/src/contextbrowser.cpp
+++ b/amarok/src/contextbrowser.cpp
@@ -1102,9 +1102,9 @@ void ContextBrowser::slotContextMenu( const TQString& urlString, const TQPoint&
class CurrentTrackJob : public ThreadManager::DependentJob
{
public:
- CurrentTrackJob( ContextBrowser *tqparent )
- : ThreadManager::DependentJob( TQT_TQOBJECT(tqparent), "CurrentTrackJob" )
- , b( tqparent )
+ CurrentTrackJob( ContextBrowser *parent )
+ : ThreadManager::DependentJob( TQT_TQOBJECT(parent), "CurrentTrackJob" )
+ , b( parent )
, m_currentTrack( TQDeepCopy<MetaBundle>( EngineController::instance()->bundle() ) )
, m_isStream( EngineController::engine()->isStream() )
{
@@ -1946,7 +1946,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
PodcastEpisodeBundle peb = *currentTrack.podcastBundle();
PodcastChannelBundle pcb;
bool channelInDB = true;
- if( !CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) )
+ if( !CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) )
{
pcb.setTitle( i18n( "Unknown Channel (not in Database)" ) );
channelInDB = false;
@@ -2032,7 +2032,7 @@ void CurrentTrackJob::showPodcast( const MetaBundle &currentTrack )
"<table id='albums_box-body' class='box-body' width='100%' border='0' cellspacing='0' cellpadding='0'>\n" );
uint i = 0;
- TQValueList<PodcastEpisodeBundle> episodes = CollectionDB::instance()->getPodcastEpisodes( peb.tqparent() );
+ TQValueList<PodcastEpisodeBundle> episodes = CollectionDB::instance()->getPodcastEpisodes( peb.parent() );
while( !episodes.isEmpty() )
{
PodcastEpisodeBundle &ep = episodes.back();
@@ -4333,7 +4333,7 @@ ContextBrowser::imageFetched( const TQString &url ) //SLOT
if( CollectionDB::instance()->getPodcastEpisodeBundle( currentTrack.url(), &peb ) )
{
PodcastChannelBundle pcb;
- if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) )
+ if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) )
{
if( pcb.imageURL().url() == url )
{
diff --git a/amarok/src/coverfetcher.cpp b/amarok/src/coverfetcher.cpp
index 6751b850..4947fd8a 100644
--- a/amarok/src/coverfetcher.cpp
+++ b/amarok/src/coverfetcher.cpp
@@ -35,7 +35,7 @@
void
-Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager )
+Amarok::coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager )
{
KPopupMenu menu;
enum { SHOW, FETCH, CUSTOM, DELETE, MANAGER };
@@ -65,12 +65,12 @@ Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &art
switch( menu.exec( point ) )
{
case SHOW:
- CoverManager::viewCover( artist, album, tqparent );
+ CoverManager::viewCover( artist, album, parent );
break;
case DELETE:
{
- const int button = KMessageBox::warningContinueCancel( tqparent,
+ const int button = KMessageBox::warningContinueCancel( parent,
i18n( "Are you sure you want to remove this cover from the Collection?" ),
TQString(),
KStdGuiItem::del() );
@@ -82,7 +82,7 @@ Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &art
case FETCH:
#ifdef AMAZON_SUPPORT
- CollectionDB::instance()->fetchCover( tqparent, artist, album, false );
+ CollectionDB::instance()->fetchCover( parent, artist, album, false );
break;
#endif
@@ -99,7 +99,7 @@ Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &art
startPath = url.directory();
}
- KURL file = KFileDialog::getImageOpenURL( startPath, tqparent, i18n("Select Cover Image File") );
+ KURL file = KFileDialog::getImageOpenURL( startPath, parent, i18n("Select Cover Image File") );
if ( !file.isEmpty() )
CollectionDB::instance()->setAlbumImage( artist, album, file );
break;
@@ -113,8 +113,8 @@ Amarok::coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &art
-CoverLabel::CoverLabel ( TQWidget * tqparent, const char * name, WFlags f )
- : TQLabel( tqparent, name, f)
+CoverLabel::CoverLabel ( TQWidget * parent, const char * name, WFlags f )
+ : TQLabel( parent, name, f)
{}
@@ -126,8 +126,8 @@ void CoverLabel::mouseReleaseEvent(TQMouseEvent *pEvent) {
}
-CoverFetcher::CoverFetcher( TQWidget *tqparent, const TQString &artist, TQString album )
- : TQObject( tqparent, "CoverFetcher" )
+CoverFetcher::CoverFetcher( TQWidget *parent, const TQString &artist, TQString album )
+ : TQObject( parent, "CoverFetcher" )
, m_artist( artist )
, m_album( album )
, m_size( 2 )
@@ -459,8 +459,8 @@ CoverFetcher::attemptAnotherFetch()
class EditSearchDialog : public KDialog
{
public:
- EditSearchDialog( TQWidget* tqparent, const TQString &text, const TQString &keyword, CoverFetcher *fetcher )
- : KDialog( tqparent )
+ EditSearchDialog( TQWidget* parent, const TQString &text, const TQString &keyword, CoverFetcher *fetcher )
+ : KDialog( parent )
{
setCaption( i18n( "Amazon Query Editor" ) );
@@ -561,7 +561,7 @@ CoverFetcher::getUserQuery( TQString explanation )
explanation = i18n("Ask Amazon for covers using this query:");
EditSearchDialog dialog(
- TQT_TQWIDGET( tqparent() ),
+ TQT_TQWIDGET( parent() ),
explanation,
m_userQuery,
this );
@@ -582,8 +582,8 @@ CoverFetcher::getUserQuery( TQString explanation )
class CoverFoundDialog : public KDialog
{
public:
- CoverFoundDialog( TQWidget *tqparent, const TQImage &cover, const TQString &productname )
- : KDialog( tqparent )
+ CoverFoundDialog( TQWidget *parent, const TQImage &cover, const TQString &productname )
+ : KDialog( parent )
{
// Gives the window a small title bar, and skips a taskbar entry
KWin::setType( winId(), NET::Utility );
@@ -629,7 +629,7 @@ CoverFetcher::getUserQuery( TQString explanation )
void
CoverFetcher::showCover()
{
- CoverFoundDialog dialog( TQT_TQWIDGET( tqparent() ), m_image, m_currentCoverName );
+ CoverFoundDialog dialog( TQT_TQWIDGET( parent() ), m_image, m_currentCoverName );
switch( dialog.exec() )
{
diff --git a/amarok/src/coverfetcher.h b/amarok/src/coverfetcher.h
index 00aef24a..cb119704 100644
--- a/amarok/src/coverfetcher.h
+++ b/amarok/src/coverfetcher.h
@@ -12,13 +12,13 @@
#include <tqdom.h> //stack allocated
namespace Amarok {
- void coverContextMenu( TQWidget *tqparent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager = true );
+ void coverContextMenu( TQWidget *parent, TQPoint point, const TQString &artist, const TQString &album, bool showCoverManager = true );
}
class CoverLabel : public TQLabel {
public:
- CoverLabel ( TQWidget * tqparent, const char * name = 0, WFlags f = 0 );
+ CoverLabel ( TQWidget * parent, const char * name = 0, WFlags f = 0 );
void setInformation( const TQString artist, const TQString album ) {
m_artist = artist;
@@ -46,7 +46,7 @@ class CoverFetcher : public TQObject
static const uint MAX_COVERS_CHOICE = 10;
public:
- CoverFetcher( TQWidget *tqparent, const TQString &artist, TQString album );
+ CoverFetcher( TQWidget *parent, const TQString &artist, TQString album );
~CoverFetcher();
/// allow the user to edit the query?
diff --git a/amarok/src/covermanager.cpp b/amarok/src/covermanager.cpp
index 7ef53c29..63804794 100644
--- a/amarok/src/covermanager.cpp
+++ b/amarok/src/covermanager.cpp
@@ -270,8 +270,8 @@ void CoverManager::init()
}
-CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, TQWidget *tqparent )
- : TQDialog( tqparent, 0, false, WDestructiveClose | WType_TopLevel | WNoAutoErase )
+CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album, TQWidget *parent )
+ : TQDialog( parent, 0, false, WDestructiveClose | WType_TopLevel | WNoAutoErase )
, m_pixmap( CollectionDB::instance()->albumImage( artist, album, false, 0 ) )
{
KWin::setType( winId(), NET::Utility );
@@ -286,10 +286,10 @@ CoverViewDialog::CoverViewDialog( const TQString& artist, const TQString& album,
}
-void CoverManager::viewCover( const TQString& artist, const TQString& album, TQWidget *tqparent ) //static
+void CoverManager::viewCover( const TQString& artist, const TQString& album, TQWidget *parent ) //static
{
//TQDialog means "escape" works as expected
- TQDialog *dialog = new CoverViewDialog( artist, album, tqparent );
+ TQDialog *dialog = new CoverViewDialog( artist, album, parent );
dialog->show();
}
@@ -884,8 +884,8 @@ void CoverManager::setStatusText( TQString text )
// CLASS CoverView
/////////////////////////////////////////////////////////////////////
-CoverView::CoverView( TQWidget *tqparent, const char *name, WFlags f )
- : KIconView( tqparent, name, f )
+CoverView::CoverView( TQWidget *parent, const char *name, WFlags f )
+ : KIconView( parent, name, f )
{
Debug::Block block( __PRETTY_FUNCTION__ );
@@ -951,8 +951,8 @@ void CoverView::setStatusText( TQIconViewItem *item )
// CLASS CoverViewItem
/////////////////////////////////////////////////////////////////////
-CoverViewItem::CoverViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &artist, const TQString &album )
- : KIconViewItem( tqparent, after, album )
+CoverViewItem::CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album )
+ : KIconViewItem( parent, after, album )
, m_artist( artist )
, m_album( album )
, m_coverImagePath( CollectionDB::instance()->albumImage( m_artist, m_album, false, 0, &m_embedded ) )
diff --git a/amarok/src/covermanager.h b/amarok/src/covermanager.h
index 7f4b9262..fc271c65 100644
--- a/amarok/src/covermanager.h
+++ b/amarok/src/covermanager.h
@@ -39,7 +39,7 @@ class CoverManager : public TQSplitter
static CoverManager *instance() { return s_instance; }
static void showOnce( const TQString &artist = TQString() );
- static void viewCover( const TQString& artist, const TQString& album, TQWidget *tqparent=0 );
+ static void viewCover( const TQString& artist, const TQString& album, TQWidget *parent=0 );
void setStatusText( TQString text );
@@ -114,7 +114,7 @@ class CoverView : public KIconView
TQ_OBJECT
public:
- CoverView( TQWidget *tqparent = 0, const char *name = 0, WFlags f = 0 );
+ CoverView( TQWidget *parent = 0, const char *name = 0, WFlags f = 0 );
protected:
TQDragObject *dragObject();
@@ -126,7 +126,7 @@ class CoverView : public KIconView
class CoverViewItem : public KIconViewItem
{
public:
- CoverViewItem( TQIconView *tqparent, TQIconViewItem *after, const TQString &artist, const TQString &album );
+ CoverViewItem( TQIconView *parent, TQIconViewItem *after, const TQString &artist, const TQString &album );
void loadCover();
bool hasCover() const;
@@ -157,7 +157,7 @@ class CoverViewDialog : public TQDialog {
TQ_OBJECT
public:
- CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *tqparent);
+ CoverViewDialog(const TQString& artist, const TQString& album, TQWidget *parent);
private:
TQHBoxLayout *m_tqlayout;
diff --git a/amarok/src/database_refactor/collectiondb.cpp b/amarok/src/database_refactor/collectiondb.cpp
index 82fcbb77..f6fd7979 100644
--- a/amarok/src/database_refactor/collectiondb.cpp
+++ b/amarok/src/database_refactor/collectiondb.cpp
@@ -1675,12 +1675,12 @@ CollectionDB::timerEvent( TQTimerEvent* )
//////////////////////////////////////////////////////////////////////////////////////////
void
-CollectionDB::fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit ) //SLOT
+CollectionDB::fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit ) //SLOT
{
#ifdef AMAZON_SUPPORT
debug() << "Fetching cover for " << artist << " - " << album << endl;
- CoverFetcher* fetcher = new CoverFetcher( tqparent, artist, album );
+ CoverFetcher* fetcher = new CoverFetcher( parent, artist, album );
connect( fetcher, TQT_SIGNAL(result( CoverFetcher* )), TQT_SLOT(coverFetcherResult( CoverFetcher* )) );
fetcher->setUserCanEditQuery( !noedit );
fetcher->startFetch();
@@ -1773,10 +1773,10 @@ class SimilarArtistsInsertionJob : public ThreadWeaver::DependentJob
const TQStringList suggestions;
public:
- SimilarArtistsInsertionJob( CollectionDB *tqparent, const TQString &s, const TQStringList &list )
- : ThreadWeaver::DependentJob( tqparent, "SimilarArtistsInsertionJob" )
+ SimilarArtistsInsertionJob( CollectionDB *parent, const TQString &s, const TQStringList &list )
+ : ThreadWeaver::DependentJob( parent, "SimilarArtistsInsertionJob" )
, artist( s )
- , escapedArtist( tqparent->escapeString( s ) )
+ , escapedArtist( parent->escapeString( s ) )
, suggestions( list )
{}
};
diff --git a/amarok/src/database_refactor/collectiondb.h b/amarok/src/database_refactor/collectiondb.h
index 8217ec06..f2c955b0 100644
--- a/amarok/src/database_refactor/collectiondb.h
+++ b/amarok/src/database_refactor/collectiondb.h
@@ -184,7 +184,7 @@ class CollectionDB : public TQObject, public EngineObserver
void timerEvent( TQTimerEvent* e );
public slots:
- void fetchCover( TQWidget* tqparent, const TQString& artist, const TQString& album, bool noedit );
+ void fetchCover( TQWidget* parent, const TQString& artist, const TQString& album, bool noedit );
void scanMonitor();
void startScan();
void stopScan();
diff --git a/amarok/src/deletedialog.cpp b/amarok/src/deletedialog.cpp
index 631bd319..970526c5 100644
--- a/amarok/src/deletedialog.cpp
+++ b/amarok/src/deletedialog.cpp
@@ -41,8 +41,8 @@
// DeleteWidget implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteWidget::DeleteWidget(TQWidget *tqparent, const char *name)
- : DeleteDialogBase(tqparent, name)
+DeleteWidget::DeleteWidget(TQWidget *parent, const char *name)
+ : DeleteDialogBase(parent, name)
{
KConfigGroup messageGroup(KGlobal::config(), "FileRemover");
@@ -84,8 +84,8 @@ void DeleteWidget::slotShouldDelete(bool shouldDelete)
// DeleteDialog implementation
//////////////////////////////////////////////////////////////////////////////
-DeleteDialog::DeleteDialog(TQWidget *tqparent, const char *name) :
- KDialogBase(Swallow, WStyle_DialogBorder, tqparent, name,
+DeleteDialog::DeleteDialog(TQWidget *parent, const char *name) :
+ KDialogBase(Swallow, WStyle_DialogBorder, parent, name,
true /* modal */, i18n("About to delete selected files"),
Ok | Cancel, Cancel /* Default */, true /* separator */),
m_trashGuiItem(i18n("&Send to Trash"), "trashcan_full")
@@ -131,9 +131,9 @@ void DeleteDialog::slotShouldDelete(bool shouldDelete)
setButtonGuiItem(Ok, shouldDelete ? KStdGuiItem::del() : m_trashGuiItem);
}
-bool DeleteDialog::showTrashDialog(TQWidget* tqparent, const KURL::List& files)
+bool DeleteDialog::showTrashDialog(TQWidget* parent, const KURL::List& files)
{
- DeleteDialog dialog(tqparent);
+ DeleteDialog dialog(parent);
bool doDelete = dialog.confirmDeleteList(files);
if( doDelete )
diff --git a/amarok/src/deletedialog.h b/amarok/src/deletedialog.h
index 79d11705..7bf981af 100644
--- a/amarok/src/deletedialog.h
+++ b/amarok/src/deletedialog.h
@@ -34,7 +34,7 @@ class DeleteWidget : public DeleteDialogBase
TQ_OBJECT
public:
- DeleteWidget(TQWidget *tqparent = 0, const char *name = 0);
+ DeleteWidget(TQWidget *parent = 0, const char *name = 0);
void setFiles(const KURL::List &files);
@@ -48,8 +48,8 @@ class DeleteDialog : public KDialogBase
TQ_OBJECT
public:
- DeleteDialog(TQWidget *tqparent, const char *name = "delete_dialog");
- static bool showTrashDialog(TQWidget* tqparent, const KURL::List &files);
+ DeleteDialog(TQWidget *parent, const char *name = "delete_dialog");
+ static bool showTrashDialog(TQWidget* parent, const KURL::List &files);
bool confirmDeleteList(const KURL::List &condemnedFiles);
void setFiles(const KURL::List &files);
diff --git a/amarok/src/directorylist.cpp b/amarok/src/directorylist.cpp
index b1f1c86a..91c4641c 100644
--- a/amarok/src/directorylist.cpp
+++ b/amarok/src/directorylist.cpp
@@ -32,8 +32,8 @@
CollectionSetup* CollectionSetup::s_instance;
-CollectionSetup::CollectionSetup( TQWidget *tqparent )
- : TQVBox( tqparent, "CollectionSetup" )
+CollectionSetup::CollectionSetup( TQWidget *parent )
+ : TQVBox( parent, "CollectionSetup" )
{
s_instance = this;
@@ -112,8 +112,8 @@ CollectionSetup::writeConfig()
namespace Collection {
-Item::Item( TQListView *tqparent )
- : TQCheckListItem( tqparent, "/", TQCheckListItem::CheckBox )
+Item::Item( TQListView *parent )
+ : TQCheckListItem( parent, "/", TQCheckListItem::CheckBox )
, m_lister( true )
, m_url( "file:/" )
, m_listed( false )
@@ -129,8 +129,8 @@ Item::Item( TQListView *tqparent )
}
-Item::Item( TQListViewItem *tqparent, const KURL &url , bool full_disable /* default=false */ )
- : TQCheckListItem( tqparent, url.fileName(), TQCheckListItem::CheckBox )
+Item::Item( TQListViewItem *parent, const KURL &url , bool full_disable /* default=false */ )
+ : TQCheckListItem( parent, url.fileName(), TQCheckListItem::CheckBox )
, m_lister( true )
, m_url( url )
, m_listed( false )
@@ -149,7 +149,7 @@ Item::fullPath() const
{
TQString path;
- for( const TQListViewItem *item = this; item != listView()->firstChild(); item = item->tqparent() )
+ for( const TQListViewItem *item = this; item != listView()->firstChild(); item = item->parent() )
{
path.prepend( item->text( 0 ) );
path.prepend( '/' );
@@ -214,7 +214,7 @@ Item::stateChange( bool b )
else {
//Deselect item and recurse through tqchildren but only deselect tqchildren if they
//do not exist unless we are in recursive mode (where no tqchildren should be
- //selected if the tqparent is being unselected)
+ //selected if the parent is being unselected)
//Note this does not do anything to the checkboxes, but they should be doing
//the same thing as we are (hopefully)
//Note: all paths lack a trailing '/' except for "/", which must be handled as a
@@ -239,7 +239,7 @@ Item::stateChange( bool b )
}
}
- // Redraw tqparent items
+ // Redraw parent items
listView()->triggerUpdate();
}
diff --git a/amarok/src/directorylist.h b/amarok/src/directorylist.h
index 543f2f21..0065f04f 100644
--- a/amarok/src/directorylist.h
+++ b/amarok/src/directorylist.h
@@ -33,8 +33,8 @@ class TQFixedListView : public TQListView
// Reimplement tqsizeHint to have directorylist not being too big for "low" (1024x768 is not exactly low) resolutions
{
public:
- TQFixedListView ( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 )
- :TQListView(tqparent, name, f) {};
+ TQFixedListView ( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 )
+ :TQListView(parent, name, f) {};
TQSize tqsizeHint() const
{
return TQSize(400, 100);
@@ -73,12 +73,12 @@ class Item : public TQObject, public TQCheckListItem
Q_OBJECT
TQ_OBJECT
public:
- Item( TQListView *tqparent );
- Item( TQListViewItem *tqparent, const KURL &url , bool full_disable=false );
+ Item( TQListView *parent );
+ Item( TQListViewItem *parent, const KURL &url , bool full_disable=false );
- TQCheckListItem *tqparent() const { return static_cast<TQCheckListItem*>( TQListViewItem::tqparent() ); }
+ TQCheckListItem *parent() const { return static_cast<TQCheckListItem*>( TQListViewItem::parent() ); }
bool isFullyDisabled() const { return m_fullyDisabled; }
- bool isDisabled() const { return isFullyDisabled() || ( CollectionSetup::instance()->recursive() && tqparent() && tqparent()->isOn() ); }
+ bool isDisabled() const { return isFullyDisabled() || ( CollectionSetup::instance()->recursive() && parent() && parent()->isOn() ); }
TQString fullPath() const;
void setOpen( bool b ); // reimpl.
diff --git a/amarok/src/editfilterdialog.cpp b/amarok/src/editfilterdialog.cpp
index c7d97d2e..f9dd1739 100644
--- a/amarok/src/editfilterdialog.cpp
+++ b/amarok/src/editfilterdialog.cpp
@@ -26,9 +26,9 @@
#include "editfilterdialog.h"
#include "metabundle.h"
-EditFilterDialog::EditFilterDialog( TQWidget* tqparent, bool metaBundleKeywords, const TQString &text )
+EditFilterDialog::EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text )
: KDialogBase( Plain, i18n("Edit Filter"), User1|User2|Default|Ok|Cancel,
- Cancel, tqparent, "editfilter", /*modal*/true, /*separator*/false ),
+ Cancel, parent, "editfilter", /*modal*/true, /*separator*/false ),
m_minMaxRadio(0),
m_filterText(text)
{
diff --git a/amarok/src/editfilterdialog.h b/amarok/src/editfilterdialog.h
index 49706987..bf14ca81 100644
--- a/amarok/src/editfilterdialog.h
+++ b/amarok/src/editfilterdialog.h
@@ -25,7 +25,7 @@ class EditFilterDialog : public KDialogBase
Q_OBJECT
TQ_OBJECT
public:
- EditFilterDialog( TQWidget* tqparent, bool metaBundleKeywords, const TQString &text = "" );
+ EditFilterDialog( TQWidget* parent, bool metaBundleKeywords, const TQString &text = "" );
~EditFilterDialog();
TQString filter() const;
diff --git a/amarok/src/engine/helix/helix-configdialog.cpp b/amarok/src/engine/helix/helix-configdialog.cpp
index 5cb0be23..73080389 100644
--- a/amarok/src/engine/helix/helix-configdialog.cpp
+++ b/amarok/src/engine/helix/helix-configdialog.cpp
@@ -43,7 +43,7 @@ using namespace std;
HelixConfigDialogBase *HelixConfigDialog::instance = NULL;
-HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent,
+HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
Amarok::PluginConfig *pluginConfig,
int row,
const TQString & description,
@@ -53,22 +53,22 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
- TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
- m_w = new KLineEdit( m_stringValue, tqparent );
+ m_w = new KLineEdit( m_stringValue, parent );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
connect( (TQWidget *) m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) );
TQToolTip::add( (TQWidget *) m_w, "<qt>" + tooltip );
- TQLabel* d = new TQLabel( description + ':', tqparent );
+ TQLabel* d = new TQLabel( description + ':', parent );
d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( (TQWidget *) m_w, row, 1 );
grid->addWidget( d, row, 0 );
}
-HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent,
+HelixConfigEntry::HelixConfigEntry( TQWidget *parent,
TQString &str,
Amarok::PluginConfig *pluginConfig,
int row,
@@ -79,17 +79,17 @@ HelixConfigEntry::HelixConfigEntry( TQWidget *tqparent,
, m_valueChanged( false )
, m_stringValue( defaultvalue )
{
- TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
m_key = str;
- m_w = new KLineEdit( str, tqparent );
+ m_w = new KLineEdit( str, parent );
connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
connect( m_w, TQT_SIGNAL(textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) );
TQToolTip::add( m_w, "<qt>" + tooltip );
- TQLabel* d = new TQLabel( description + ':', tqparent );
+ TQLabel* d = new TQLabel( description + ':', parent );
d->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( m_w, row, 1 );
@@ -104,21 +104,21 @@ HelixConfigEntry::slotStringChanged( const TQString& )
m_valueChanged = true;
}
-HelixSoundDevice::HelixSoundDevice( TQWidget *tqparent,
+HelixSoundDevice::HelixSoundDevice( TQWidget *parent,
Amarok::PluginConfig *pluginConfig,
int &row,
HelixEngine *engine )
: deviceComboBox(0), checkBox_outputDevice(0), lineEdit_outputDevice(0), m_changed(false), m_engine(engine)
{
- TQGridLayout *grid = (TQGridLayout*)tqparent->tqlayout();
+ TQGridLayout *grid = (TQGridLayout*)parent->tqlayout();
- deviceComboBox = new KComboBox( false, tqparent, "deviceComboBox" );
+ 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,
#ifdef USE_HELIX_ALSA
deviceComboBox->insertItem("alsa"); // and neither are the equivalents in gst (osssink and alsasink)
#endif
deviceComboBox->setCurrentItem(HelixConfig::outputplugin());
- TQLabel* op = new TQLabel( i18n("Output plugin:"), tqparent );
+ TQLabel* op = new TQLabel( i18n("Output plugin:"), parent );
op->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
grid->addWidget( op, row, 0 );
grid->addWidget( deviceComboBox, row, 1);
@@ -127,12 +127,12 @@ HelixSoundDevice::HelixSoundDevice( TQWidget *tqparent,
++row;
- checkBox_outputDevice = new TQCheckBox( tqparent, "checkBox_outputDevice" );
+ checkBox_outputDevice = new TQCheckBox( parent, "checkBox_outputDevice" );
checkBox_outputDevice->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 0, checkBox_outputDevice->sizePolicy().hasHeightForWidth() ) );
grid->addWidget( checkBox_outputDevice, row, 0 );
checkBox_outputDevice->setText( i18n( "Device:" ) );
- lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), tqparent );
+ lineEdit_outputDevice = new KLineEdit( HelixConfig::device(), parent );
connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL(textChanged( const TQString& )), this, TQT_SLOT(slotStringChanged( const TQString& )) );
connect( (TQWidget *) lineEdit_outputDevice, TQT_SIGNAL( textChanged( const TQString& )), pluginConfig, TQT_SIGNAL(viewChanged()) );
connect( checkBox_outputDevice, TQT_SIGNAL( toggled(bool) ), lineEdit_outputDevice, TQT_SLOT( setEnabled(bool) ) );
@@ -257,21 +257,21 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
{
int row = 0;
TQString currentPage;
- TQWidget *tqparent = 0;
+ TQWidget *parent = 0;
TQGridLayout *grid = 0;
TQScrollView *sv = 0;
TQString pageName( i18n("Main") );
addTab( sv = new TQScrollView, pageName );
- tqparent = new TQWidget( sv->viewport() );
+ parent = new TQWidget( sv->viewport() );
sv->setResizePolicy( TQScrollView::AutoOneFit );
sv->setHScrollBarMode( TQScrollView::AlwaysOff );
sv->setFrameShape( TQFrame::NoFrame );
- sv->addChild( tqparent );
+ sv->addChild( parent );
- grid = new TQGridLayout( tqparent, /*rows*/20, /*cols*/2, /*margin*/10, /*spacing*/10 );
+ grid = new TQGridLayout( parent, /*rows*/20, /*cols*/2, /*margin*/10, /*spacing*/10 );
grid->setColStretch( 0, 1 );
grid->setColStretch( 1, 1 );
@@ -279,30 +279,30 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
sv->setMinimumWidth( grid->tqsizeHint().width() + 20 );
engine->m_coredir = HelixConfig::coreDirectory();
- m_core = new HelixConfigEntry( tqparent, engine->m_coredir,
+ m_core = new HelixConfigEntry( parent, engine->m_coredir,
config, row,
i18n("Helix/Realplay core directory"),
HelixConfig::coreDirectory().utf8(),
i18n("This is the directory where clntcore.so is located"));
++row;
engine->m_pluginsdir = HelixConfig::pluginDirectory();
- m_plugin = new HelixConfigEntry( tqparent, engine->m_pluginsdir,
+ m_plugin = new HelixConfigEntry( parent, engine->m_pluginsdir,
config, row,
i18n("Helix/Realplay plugins directory"),
HelixConfig::pluginDirectory().utf8(),
i18n("This is the directory where, for example, vorbisrend.so is located"));
++row;
engine->m_codecsdir = HelixConfig::codecsDirectory();
- m_codec = new HelixConfigEntry( tqparent, engine->m_codecsdir,
+ m_codec = new HelixConfigEntry( parent, engine->m_codecsdir,
config, row,
i18n("Helix/Realplay codecs directory"),
HelixConfig::codecsDirectory().utf8(),
i18n("This is the directory where, for example, cvt1.so is located"));
++row;
- grid->addMultiCellWidget( new KSeparator( KSeparator::Horizontal, tqparent ), row, row, 0, 1 );
+ grid->addMultiCellWidget( new KSeparator( KSeparator::Horizontal, parent ), row, row, 0, 1 );
++row;
- m_device = new HelixSoundDevice( tqparent, config, row, engine );
+ m_device = new HelixSoundDevice( parent, config, row, engine );
// lets find the logo if we can
TQPixmap *pm = 0;
@@ -332,7 +332,7 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
if (pm)
{
- TQLabel *l = new TQLabel(tqparent);
+ TQLabel *l = new TQLabel(parent);
l->setPixmap(*pm);
grid->addMultiCellWidget( l, 20, 20, 1, 1, TQt::AlignRight );
}
@@ -342,16 +342,16 @@ HelixConfigDialogBase::HelixConfigDialogBase( HelixEngine *engine, Amarok::Plugi
pageName = i18n("Plugins");
addTab( sv = new TQScrollView, pageName );
- tqparent = new TQWidget( sv->viewport() );
+ parent = new TQWidget( sv->viewport() );
sv->setResizePolicy( TQScrollView::AutoOneFit );
- sv->addChild( tqparent );
+ sv->addChild( parent );
- TQTextEdit *le = new TQTextEdit( tqparent );
+ TQTextEdit *le = new TQTextEdit( parent );
if( sv )
sv->setMinimumWidth( le->tqsizeHint().width() );
- grid = new TQGridLayout( tqparent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 );
+ grid = new TQGridLayout( parent, /*rows*/1, /*cols*/1, /*margin*/2, /*spacing*/1 );
grid->addMultiCellWidget( le, 0, 1, 0, 1, 0 );
le->setWordWrap(TQTextEdit::NoWrap);
diff --git a/amarok/src/engine/helix/helix-configdialog.h b/amarok/src/engine/helix/helix-configdialog.h
index 3375b64c..3da4af0b 100644
--- a/amarok/src/engine/helix/helix-configdialog.h
+++ b/amarok/src/engine/helix/helix-configdialog.h
@@ -30,9 +30,9 @@ class HelixConfigEntry : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- HelixConfigEntry( TQWidget *tqparent, Amarok::PluginConfig*,
+ HelixConfigEntry( TQWidget *parent, Amarok::PluginConfig*,
int row, const TQString & description, const char *defaultvalue, const TQString & tooltip );
- HelixConfigEntry( TQWidget *tqparent, TQString &str, Amarok::PluginConfig*,
+ HelixConfigEntry( TQWidget *parent, TQString &str, Amarok::PluginConfig*,
int row, const TQString & description, const char *defaultvalue, const TQString & tooltip );
bool isChanged() const { return m_valueChanged; }
@@ -57,7 +57,7 @@ class HelixSoundDevice : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- HelixSoundDevice( TQWidget *tqparent, Amarok::PluginConfig *config, int &row, HelixEngine *engine );
+ HelixSoundDevice( TQWidget *parent, Amarok::PluginConfig *config, int &row, HelixEngine *engine );
bool save();
void setSoundSystem( int api );
bool isChanged() const { return m_changed; }
@@ -80,7 +80,7 @@ private:
class HelixConfigDialogBase : public TQTabWidget
{
public:
- HelixConfigDialogBase( HelixEngine *engine, Amarok::PluginConfig *config, TQWidget *tqparent = 0 );
+ HelixConfigDialogBase( HelixEngine *engine, Amarok::PluginConfig *config, TQWidget *parent = 0 );
~HelixConfigDialogBase();
virtual TQWidget *view() { return this; }
@@ -105,7 +105,7 @@ private:
class HelixConfigDialog : public Amarok::PluginConfig
{
public:
- HelixConfigDialog( HelixEngine *engine, TQWidget *tqparent = 0 );
+ HelixConfigDialog( HelixEngine *engine, TQWidget *parent = 0 );
~HelixConfigDialog();
virtual TQWidget *view() { return instance->view(); }
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h
index 6d44bf7d..ac83d81d 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxcomm.h
@@ -190,12 +190,12 @@ DECLARE_INTERFACE_(IHXServerFork, IUnknown)
* Purpose:
* Fork off a child process. The child process cannot use any RMA
* APIs. Upon successful completion, Fork returns 0 to the child
- * process and the PID of the child to the tqparent. A return value
+ * process and the PID of the child to the parent. A return value
* of -1 indicates an error.
*
* Note: The child process should *NOT* Release any interfaces.
* The cleanup of the IHXServerFork() interface and other
- * RMA interfaces is done by the tqparent.
+ * RMA interfaces is done by the parent.
*
*/
STDMETHOD_(INT32, Fork) (THIS) PURE;
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 63d18324..6789f26f 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
@@ -1562,7 +1562,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown)
* Method:
* IHXPlayerNavigator::SetParentPlayer
* Purpose:
- * Set the tqparent player
+ * Set the parent player
*/
STDTQT_METHOD(SetParentPlayer) (THIS_
IHXPlayer* pPlayer) PURE;
@@ -1571,7 +1571,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown)
* Method:
* IHXPlayerNavigator::RemoveParentPlayer
* Purpose:
- * Remove the tqparent player
+ * Remove the parent player
*/
STDTQT_METHOD(RemoveParentPlayer) (THIS_
IHXPlayer* pPlayer) PURE;
@@ -1580,7 +1580,7 @@ DECLARE_INTERFACE_(IHXPlayerNavigator, IUnknown)
* Method:
* IHXPlayerNavigator::GetParentPlayer
* Purpose:
- * Get the tqparent player
+ * Get the parent player
*/
STDTQT_METHOD(GetParentPlayer) (THIS_
REF(IHXPlayer*) pPlayer) PURE;
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
index 5740e344..775d287c 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxmon.h
@@ -421,11 +421,11 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Method:
* IHXRegistry::FindParentIdByName
* Purpose:
- * Returns the id value of the tqparent node of the Property whose
+ * Returns the id value of the parent node of the Property whose
* name "pName" has been passed in. If it fails, a ZERO value is
* returned.
*
- * pName - IN - name of the Property whose tqparent's unique id is to be
+ * pName - IN - name of the Property whose parent's unique id is to be
* retrieved
*/
STDMETHOD_(UINT32, FindParentIdByName) (THIS_
@@ -435,10 +435,10 @@ DECLARE_INTERFACE_(IHXRegistry, IUnknown)
* Method:
* IHXRegistry::FindParentIdById
* Purpose:
- * Returns the id value of the tqparent node of the Property whose
+ * Returns the id value of the parent node of the Property whose
* id "ulId" has been passed in. If it fails, a ZERO value is returned.
*
- * ulId - IN - unique id of the Property whose tqparent's id is to be
+ * ulId - IN - unique id of the Property whose parent's id is to be
* retrieved
*/
STDMETHOD_(UINT32, FindParentIdById) (THIS_
@@ -722,7 +722,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown)
* Purpose:
* Gets called when a new Property gets added under the Property
* on which the Watch was set. It passes the id of the Property just
- * added, its datatype and the id of its immediate tqparent COMPOSITE
+ * added, its datatype and the id of its immediate parent COMPOSITE
* property.
*/
STDTQT_METHOD(AddedProp) (THIS_
@@ -736,7 +736,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown)
* Purpose:
* Gets called when a watched Property gets modified. It passes
* the id of the Property just modified, its datatype and the
- * id of its immediate tqparent COMPOSITE property.
+ * id of its immediate parent COMPOSITE property.
*/
STDTQT_METHOD(ModifiedProp) (THIS_
const UINT32 ulId,
@@ -749,7 +749,7 @@ DECLARE_INTERFACE_(IHXPropWatchResponse, IUnknown)
* Purpose:
* Gets called when a watched Property gets deleted. As can be
* seen, it returns the id of the Property just deleted and
- * its immediate tqparent COMPOSITE property.
+ * its immediate parent COMPOSITE property.
*/
STDTQT_METHOD(DeletedProp) (THIS_
const UINT32 ulId,
@@ -1483,11 +1483,11 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method:
* IHXRegistry2::FindParentIdByName
* Purpose:
- * Returns the id value of the tqparent node of the Property whose
+ * Returns the id value of the parent node of the Property whose
* name "pName" has been passed in. If it fails, a ZERO value is
* returned.
*
- * pName - IN - name of the Property whose tqparent's unique id is to be
+ * pName - IN - name of the Property whose parent's unique id is to be
* retrieved
*/
STDMETHOD_(UINT32, FindParentIdByName) (THIS_
@@ -1497,10 +1497,10 @@ DECLARE_INTERFACE_(IHXRegistry2, IUnknown)
* Method:
* IHXRegistry2::FindParentIdById
* Purpose:
- * Returns the id value of the tqparent node of the Property whose
+ * Returns the id value of the parent node of the Property whose
* id "ulId" has been passed in. If it fails, a ZERO value is returned.
*
- * ulId - IN - unique id of the Property whose tqparent's id is to be
+ * ulId - IN - unique id of the Property whose parent's id is to be
* retrieved
*/
STDMETHOD_(UINT32, FindParentIdById) (THIS_
@@ -2211,8 +2211,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* from the registry.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
*/
STDTQT_METHOD(DeletedComposite)(THIS_
@@ -2228,8 +2228,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* Provide notification that a INTEGER Property has been deleted.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the Property being deleted (null-terminated)
* nValue - IN - integer value of the Property which has been deleted
*/
@@ -2248,8 +2248,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* been deleted from the registry.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
* nValue - IN - integer value of the Property which has been deleted
* pValue - IN - the pointer of the integer reference Property
@@ -2271,8 +2271,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* from the registry.
*
* ulId - IN - unique id of the deleted Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
* pValue - IN - value of the deleted Property
*/
@@ -2291,8 +2291,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* from the registry.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
* pValue - IN - buffer value of the deleted Property
*/
@@ -2313,8 +2313,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* Note: This is not used for IHXRegistry, but for IHXRegistry2.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
* nValue - IN - 64-bit integer value of the deleted Property
*/
@@ -2335,8 +2335,8 @@ DECLARE_INTERFACE_(IHXDeletedPropResponse, IUnknown)
* Note: This is not used for IHXRegistry, but for IHXRegistry2.
*
* ulId - IN - unique id of the Property which has been deleted
- * ulParentID - IN - unique id of the tqparent Property of the deleted item
- * bIsParentNotify - IN - TRUE if this is a tqparent notification.
+ * ulParentID - IN - unique id of the parent Property of the deleted item
+ * bIsParentNotify - IN - TRUE if this is a parent notification.
* pName - IN - name of the deleted Property (null-terminated)
* nValue - IN - 64-bit integer value of the deleted Property
* pValue - IN - the pointer of the 64-bit integer reference Property
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 ca46e4ac..42afd584 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
@@ -237,7 +237,7 @@ DECLARE_INTERFACE_(IHXSiteWindowless, IUnknown)
HXxEvent* /*IN*/ pEvent) PURE;
/*
- * IHXSiteWindowless method. Returns some tqparent window that
+ * IHXSiteWindowless method. Returns some parent window that
* owns the windowless site. Useful for right-click menus and
* dialog box calls.
*/
diff --git a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
index 72bdf788..4316cc2f 100644
--- a/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
+++ b/amarok/src/engine/helix/helix-sp/helix-include/common/include/hxwintyp.h
@@ -151,7 +151,7 @@ inline void HXxRect_Intersection( const HXxRect& r1, const HXxRect& r2, HXxRect*
* Purpose:
*
* Cross Platform definition of a window. This struct is sufficiently
- * wide to describe tqparent or child windows in Windows, MacOS, and
+ * wide to describe parent or child windows in Windows, MacOS, and
* various flavors of X-Windows.
*
* Data Members:
diff --git a/amarok/src/engine/helix/hxplayercontrol.cpp b/amarok/src/engine/helix/hxplayercontrol.cpp
index fd1b2e4c..fabc8a0d 100644
--- a/amarok/src/engine/helix/hxplayercontrol.cpp
+++ b/amarok/src/engine/helix/hxplayercontrol.cpp
@@ -65,7 +65,7 @@ void HSPPlayerControlled::onBuffering(int percentage)
}
-PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iamtqparent(0), m_index(0), nNumPlayers(0),
+PlayerControl::PlayerControl() : m_eq_enabled(false), m_preamp(0), m_err(0), iamparent(0), m_index(0), nNumPlayers(0),
m_inited(false), m_api( HelixSimplePlayer::OSS ), m_device(0), mimehead(0), mimelistlen(0),
m_numPlugins(0), m_pluginInfo(0)
{
@@ -88,7 +88,7 @@ PlayerControl::~PlayerControl()
void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, const char *codecspath, int numPlayers)
{
int err;
- iamtqparent = 0;
+ iamparent = 0;
nNumPlayers = numPlayers;
m_err = 0;
@@ -136,14 +136,14 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
}
err = pipe(m_tqchildren[i].m_pipeA);
err |= pipe(m_tqchildren[i].m_pipeB);
- if ( !err && (iamtqparent = fork()) )
+ if ( !err && (iamparent = fork()) )
{
- // tqparent
- print2stderr("%%%%%% tqparent initializes player %d\n", i);
+ // parent
+ print2stderr("%%%%%% parent initializes player %d\n", i);
- // tqparent's m_pid remains 0
- m_tqchildren[i].m_pid = iamtqparent;
- close(m_tqchildren[i].m_pipeA[1]); // tqparent uses A for reading
+ // parent's m_pid remains 0
+ m_tqchildren[i].m_pid = iamparent;
+ close(m_tqchildren[i].m_pipeA[1]); // parent uses A for reading
close(m_tqchildren[i].m_pipeB[0]); // and B for writing
}
else if (!err)
@@ -160,7 +160,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
}
- if (!iamtqparent) // tqchildren stay here, parents return
+ if (!iamparent) // tqchildren stay here, parents return
{
int rfd = m_tqchildren[m_index].m_pipeB[0];
int wfd = m_tqchildren[m_index].m_pipeA[1];
@@ -413,7 +413,7 @@ void PlayerControl::init(const char *corelibpath, const char *pluginslibpath, co
cerr << "CHILD " << m_index << " sz not right in TEARDOWN, sz=" << sz << endl;
break;
- default: // send an error to the tqparent
+ default: // send an error to the parent
cerr << "CHILD " << m_index << " received unhandled message, sz=" << sz << endl;
break;
}
@@ -534,7 +534,7 @@ int PlayerControl::initDirectSS()
void PlayerControl::tearDown()
{
int tmp;
- if (iamtqparent)
+ if (iamparent)
{
for (int i = 0; i < nNumPlayers; i++)
{
diff --git a/amarok/src/engine/helix/hxplayercontrol.h b/amarok/src/engine/helix/hxplayercontrol.h
index 3ffefe90..37b0a121 100644
--- a/amarok/src/engine/helix/hxplayercontrol.h
+++ b/amarok/src/engine/helix/hxplayercontrol.h
@@ -100,7 +100,7 @@ protected:
private:
int m_err;
- pid_t iamtqparent;
+ pid_t iamparent;
int m_index;
int nNumPlayers;
bool m_inited;
diff --git a/amarok/src/engine/nmm/HostList.cpp b/amarok/src/engine/nmm/HostList.cpp
index 7225548e..e6213643 100644
--- a/amarok/src/engine/nmm/HostList.cpp
+++ b/amarok/src/engine/nmm/HostList.cpp
@@ -31,8 +31,8 @@
#include "debug.h"
#include "HostListItem.h"
-HostList::HostList( TQWidget *tqparent, const char *name )
- : KListView( tqparent, name ),
+HostList::HostList( TQWidget *parent, const char *name )
+ : KListView( parent, name ),
m_read_only( false ),
m_hoveredVolume(0)
{
diff --git a/amarok/src/engine/nmm/HostListItem.cpp b/amarok/src/engine/nmm/HostListItem.cpp
index dbf72003..cb8e61f0 100644
--- a/amarok/src/engine/nmm/HostListItem.cpp
+++ b/amarok/src/engine/nmm/HostListItem.cpp
@@ -41,8 +41,8 @@
#include "HostList.h"
#include "nmm_engine.h"
-HostListItem::HostListItem( TQListView *tqparent, TQString hostname, bool audio, bool video, int volume, int status, bool read_only )
- : KListViewItem( tqparent ),
+HostListItem::HostListItem( TQListView *parent, TQString hostname, bool audio, bool video, int volume, int status, bool read_only )
+ : KListViewItem( parent ),
m_audio( audio ),
m_video( video ),
m_volume( volume ),
@@ -253,7 +253,7 @@ TQPixmap HostListItem::generateGradient( int type )
temp = TQPixmap( locate( "data", "amarok/images/nmm-gradient-right.png" ) );
else // PixLeft
temp = TQPixmap( locate( "data", "amarok/images/nmm-gradient-left.png" ) );
- const TQBitmap tqmask( temp.createHeuristicMask() );
+ const TQBitmap mask( temp.createHeuristicMask() );
KPixmap result = TQPixmap( 113, 24 );
if( type == PixRight)
@@ -261,6 +261,6 @@ TQPixmap HostListItem::generateGradient( int type )
else
KPixmapEffect::gradient( result, listView()->tqcolorGroup().highlight(), listView()->tqcolorGroup().background(), KPixmapEffect::HorizontalGradient );
- result.setMask( tqmask);
+ result.setMask( mask);
return result;
}
diff --git a/amarok/src/engine/yauap/yauap-engine.h b/amarok/src/engine/yauap/yauap-engine.h
index 2562cf5d..6f42cc9f 100644
--- a/amarok/src/engine/yauap/yauap-engine.h
+++ b/amarok/src/engine/yauap/yauap-engine.h
@@ -50,7 +50,7 @@ public:
class yauapProcess : public Amarok::Process
{
public:
- yauapProcess(TQObject* tqparent) : Amarok::Process(tqparent) {}
+ yauapProcess(TQObject* parent) : Amarok::Process(parent) {}
virtual int commSetupDoneC();
};
diff --git a/amarok/src/equalizergraph.cpp b/amarok/src/equalizergraph.cpp
index b8207eaa..7f4d2951 100644
--- a/amarok/src/equalizergraph.cpp
+++ b/amarok/src/equalizergraph.cpp
@@ -25,8 +25,8 @@
#include <kapplication.h>
-EqualizerGraph::EqualizerGraph( TQWidget* tqparent )
- : TQWidget( tqparent, 0, TQt::WNoAutoErase )
+EqualizerGraph::EqualizerGraph( TQWidget* parent )
+ : TQWidget( parent, 0, TQt::WNoAutoErase )
, m_backgroundPixmap( new TQPixmap() )
, m_composePixmap( new TQPixmap() )
{
diff --git a/amarok/src/equalizergraph.h b/amarok/src/equalizergraph.h
index 7014e3c4..de9cea6c 100644
--- a/amarok/src/equalizergraph.h
+++ b/amarok/src/equalizergraph.h
@@ -26,7 +26,7 @@ class TQPixmap;
class EqualizerGraph : public TQWidget
{
public:
- EqualizerGraph( TQWidget* tqparent );
+ EqualizerGraph( TQWidget* parent );
~EqualizerGraph();
TQSize tqsizeHint() const;
diff --git a/amarok/src/equalizerpresetmanager.cpp b/amarok/src/equalizerpresetmanager.cpp
index 80179c66..02e9a8d4 100644
--- a/amarok/src/equalizerpresetmanager.cpp
+++ b/amarok/src/equalizerpresetmanager.cpp
@@ -32,8 +32,8 @@
#include <kmessagebox.h>
#include <kstandarddirs.h> //locate()
-EqualizerPresetManager::EqualizerPresetManager( TQWidget *tqparent, const char *name )
- : KDialogBase( tqparent, name, true, i18n("Presets"), Ok | Cancel | Default, Ok, true )
+EqualizerPresetManager::EqualizerPresetManager( TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, true, i18n("Presets"), Ok | Cancel | Default, Ok, true )
{
TQWidget *mainWidget = new TQWidget( this );
setMainWidget( mainWidget );
diff --git a/amarok/src/equalizerpresetmanager.h b/amarok/src/equalizerpresetmanager.h
index 716be81b..1da346f7 100644
--- a/amarok/src/equalizerpresetmanager.h
+++ b/amarok/src/equalizerpresetmanager.h
@@ -34,7 +34,7 @@ class EqualizerPresetManager : public KDialogBase
TQ_OBJECT
public:
- EqualizerPresetManager( TQWidget *tqparent = 0, const char *name = 0 );
+ EqualizerPresetManager( TQWidget *parent = 0, const char *name = 0 );
virtual ~EqualizerPresetManager();
void setPresets(TQMap< TQString, TQValueList<int> > presets);
diff --git a/amarok/src/filebrowser.cpp b/amarok/src/filebrowser.cpp
index 9db38420..31ebb7d3 100644
--- a/amarok/src/filebrowser.cpp
+++ b/amarok/src/filebrowser.cpp
@@ -530,7 +530,7 @@ FileBrowser::selectAll()
class KURLView : public KListView
{
public:
- KURLView( TQWidget *tqparent ) : KListView( tqparent )
+ KURLView( TQWidget *parent ) : KListView( parent )
{
reinterpret_cast<TQWidget*>(header())->hide();
addColumn( TQString() );
@@ -541,7 +541,7 @@ public:
class Item : public KListViewItem {
public:
- Item( const KURL &url, KURLView *tqparent ) : KListViewItem( tqparent, url.fileName() ), m_url( url ) {}
+ Item( const KURL &url, KURLView *parent ) : KListViewItem( parent, url.fileName() ), m_url( url ) {}
KURL m_url;
};
@@ -595,8 +595,8 @@ private:
-SearchPane::SearchPane( FileBrowser *tqparent )
- : TQVBox( tqparent )
+SearchPane::SearchPane( FileBrowser *parent )
+ : TQVBox( parent )
, m_lineEdit( 0 )
, m_listView( 0 )
, m_lister( 0 )
diff --git a/amarok/src/filebrowser.h b/amarok/src/filebrowser.h
index bd539e8a..94eb8083 100644
--- a/amarok/src/filebrowser.h
+++ b/amarok/src/filebrowser.h
@@ -105,7 +105,7 @@ class SearchPane : public TQVBox
TQ_OBJECT
public:
- SearchPane( FileBrowser *tqparent );
+ SearchPane( FileBrowser *parent );
private slots:
void toggle( bool );
diff --git a/amarok/src/hintlineedit.cpp b/amarok/src/hintlineedit.cpp
index a5591b3b..a934218c 100644
--- a/amarok/src/hintlineedit.cpp
+++ b/amarok/src/hintlineedit.cpp
@@ -3,24 +3,24 @@
#include <tqlabel.h>
#include <tqfont.h>
-HintLineEdit::HintLineEdit( const TQString &hint, const TQString &text, TQWidget *tqparent, const char *name )
+HintLineEdit::HintLineEdit( const TQString &hint, const TQString &text, TQWidget *parent, const char *name )
: KLineEdit( text, 0, name )
- , m_vbox( new TQVBox( tqparent ) )
+ , m_vbox( new TQVBox( parent ) )
{
init();
m_hint->setText( hint );
}
-HintLineEdit::HintLineEdit( const TQString &text, TQWidget *tqparent, const char *name )
+HintLineEdit::HintLineEdit( const TQString &text, TQWidget *parent, const char *name )
: KLineEdit( text, 0, name )
- , m_vbox( new TQVBox( tqparent ) )
+ , m_vbox( new TQVBox( parent ) )
{
init();
}
-HintLineEdit::HintLineEdit( TQWidget *tqparent, const char *name )
+HintLineEdit::HintLineEdit( TQWidget *parent, const char *name )
: KLineEdit( 0, name )
- , m_vbox( new TQVBox( tqparent ) )
+ , m_vbox( new TQVBox( parent ) )
{
init();
}
@@ -50,9 +50,9 @@ HintLineEdit::setHint( const TQString &hint )
}
TQObject *
-HintLineEdit::tqparent()
+HintLineEdit::parent()
{
- return m_vbox->tqparent();
+ return m_vbox->parent();
}
#include "hintlineedit.moc"
diff --git a/amarok/src/hintlineedit.h b/amarok/src/hintlineedit.h
index fb3a0e65..ba21b6a2 100644
--- a/amarok/src/hintlineedit.h
+++ b/amarok/src/hintlineedit.h
@@ -13,11 +13,11 @@ class HintLineEdit : public KLineEdit
TQ_OBJECT
public:
- HintLineEdit( const TQString &hint, const TQString &text, TQWidget *tqparent = 0, const char *name = 0 );
- HintLineEdit( const TQString &text, TQWidget *tqparent = 0, const char *name = 0 );
- HintLineEdit( TQWidget *tqparent = 0, const char *name = 0 );
+ HintLineEdit( const TQString &hint, const TQString &text, TQWidget *parent = 0, const char *name = 0 );
+ HintLineEdit( const TQString &text, TQWidget *parent = 0, const char *name = 0 );
+ HintLineEdit( TQWidget *parent = 0, const char *name = 0 );
virtual ~HintLineEdit();
- virtual TQObject *tqparent();
+ virtual TQObject *parent();
virtual void setHint( const TQString &hint );
private:
void init();
diff --git a/amarok/src/inotify/inotify-syscalls.h b/amarok/src/inotify/inotify-syscalls.h
index a8d06a33..1431d467 100644
--- a/amarok/src/inotify/inotify-syscalls.h
+++ b/amarok/src/inotify/inotify-syscalls.h
@@ -48,9 +48,9 @@ static inline int inotify_init (void)
return syscall (__NR_inotify_init);
}
-static inline int inotify_add_watch (int fd, const char *name, __u32 tqmask)
+static inline int inotify_add_watch (int fd, const char *name, __u32 mask)
{
- return syscall (__NR_inotify_add_watch, fd, name, tqmask);
+ return syscall (__NR_inotify_add_watch, fd, name, mask);
}
static inline int inotify_rm_watch (int fd, __u32 wd)
diff --git a/amarok/src/inotify/inotify.h b/amarok/src/inotify/inotify.h
index 4c06aa13..7e0eb32b 100644
--- a/amarok/src/inotify/inotify.h
+++ b/amarok/src/inotify/inotify.h
@@ -17,7 +17,7 @@
*/
struct inotify_event {
__s32 wd; /* watch descriptor */
- __u32 tqmask; /* watch tqmask */
+ __u32 mask; /* watch mask */
__u32 cookie; /* cookie to synchronize two events */
__u32 len; /* length (including nulls) of name */
char name[0]; /* stub for possible name */
@@ -49,7 +49,7 @@ struct inotify_event {
/* special flags */
#define IN_ONLYDIR 0x01000000 /* only watch the path if it is a directory */
#define IN_DONT_FOLLOW 0x02000000 /* don't follow a sym link */
-#define IN_MASK_ADD 0x20000000 /* add to the tqmask of an already existing watch */
+#define IN_MASK_ADD 0x20000000 /* add to the mask of an already existing watch */
#define IN_ISDIR 0x40000000 /* event occurred against dir */
#define IN_ONESHOT 0x80000000 /* only send event once */
@@ -82,13 +82,13 @@ extern u32 inotify_get_cookie(void);
#else
static inline void inotify_inode_queue_event(struct inode *inode,
- __u32 tqmask, __u32 cookie,
+ __u32 mask, __u32 cookie,
const char *filename)
{
}
static inline void inotify_dentry_parent_queue_event(struct dentry *dentry,
- __u32 tqmask, __u32 cookie,
+ __u32 mask, __u32 cookie,
const char *filename)
{
}
diff --git a/amarok/src/kbookmarkhandler.cpp b/amarok/src/kbookmarkhandler.cpp
index b6fa3ffb..0e5a74e4 100644
--- a/amarok/src/kbookmarkhandler.cpp
+++ b/amarok/src/kbookmarkhandler.cpp
@@ -26,8 +26,8 @@
#include <kdiroperator.h>
#include <kstandarddirs.h>
-KBookmarkHandler::KBookmarkHandler( KDirOperator *tqparent, KPopupMenu* rootmenu )
- : TQObject( tqparent, "KBookmarkHandler" )
+KBookmarkHandler::KBookmarkHandler( KDirOperator *parent, KPopupMenu* rootmenu )
+ : TQObject( parent, "KBookmarkHandler" )
, KBookmarkOwner()
{
const TQString file = Amarok::saveLocation() + "fileBrowserBookmarks.xml";
@@ -42,11 +42,11 @@ KBookmarkHandler::KBookmarkHandler( KDirOperator *tqparent, KPopupMenu* rootmenu
TQString
KBookmarkHandler::currentURL() const
{
- return static_cast<KDirOperator*>(TQT_TQWIDGET(tqparent()))->url().url();
+ return static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->url().url();
}
void
KBookmarkHandler::openBookmarkURL( const TQString &url )
{
- static_cast<KDirOperator*>(TQT_TQWIDGET(tqparent()))->setURL( KURL(url), true );
+ static_cast<KDirOperator*>(TQT_TQWIDGET(parent()))->setURL( KURL(url), true );
}
diff --git a/amarok/src/kbookmarkhandler.h b/amarok/src/kbookmarkhandler.h
index 4a5d3fa6..86a44eff 100644
--- a/amarok/src/kbookmarkhandler.h
+++ b/amarok/src/kbookmarkhandler.h
@@ -29,7 +29,7 @@ class KPopupMenu;
class KBookmarkHandler : public TQObject, public KBookmarkOwner
{
public:
- KBookmarkHandler( KDirOperator *tqparent, KPopupMenu* );
+ KBookmarkHandler( KDirOperator *parent, KPopupMenu* );
/// KBookmarkOwner interface:
virtual void openBookmarkURL( const TQString &url );
diff --git a/amarok/src/konquisidebar/universalamarok.cpp b/amarok/src/konquisidebar/universalamarok.cpp
index aa5b775f..72ab2f74 100644
--- a/amarok/src/konquisidebar/universalamarok.cpp
+++ b/amarok/src/konquisidebar/universalamarok.cpp
@@ -46,8 +46,8 @@
#define HTML_FILE KGlobal::dirs()->saveLocation( "data", "amarok/", true ) + "contextbrowser.html"
-amarokWidget::amarokWidget( TQWidget * tqparent, const char * name, WFlags f )
- : TQVBox(tqparent, name, f)
+amarokWidget::amarokWidget( TQWidget * parent, const char * name, WFlags f )
+ : TQVBox(parent, name, f)
{
setAcceptDrops(true);
}
@@ -76,8 +76,8 @@ bool amarokWidget::eventFilter( TQObject *, TQEvent *e )
return true;
}
-UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name):
- KonqSidebarPlugin(inst,tqparent,widgetParent,desktopName,name)
+UniversalAmarok::UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name):
+ KonqSidebarPlugin(inst,parent,widgetParent,desktopName,name)
{
KGlobal::iconLoader()->addAppDir( "amarok" );
widget = new amarokWidget( widgetParent );
diff --git a/amarok/src/konquisidebar/universalamarok.h b/amarok/src/konquisidebar/universalamarok.h
index ed20ca73..f033101d 100644
--- a/amarok/src/konquisidebar/universalamarok.h
+++ b/amarok/src/konquisidebar/universalamarok.h
@@ -43,7 +43,7 @@ class amarokWidget : public TQVBox
Q_OBJECT
TQ_OBJECT
public:
- amarokWidget( TQWidget * tqparent = 0, const char * name = 0, WFlags f = 0 );
+ amarokWidget( TQWidget * parent = 0, const char * name = 0, WFlags f = 0 );
protected:
virtual void dragEnterEvent ( TQDragEnterEvent * );
@@ -60,7 +60,7 @@ class UniversalAmarok : public KonqSidebarPlugin
Q_OBJECT
TQ_OBJECT
public:
- UniversalAmarok(KInstance *inst,TQObject *tqparent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
+ UniversalAmarok(KInstance *inst,TQObject *parent,TQWidget *widgetParent, TQString &desktopName, const char* name=0);
~UniversalAmarok();
diff --git a/amarok/src/lastfm.cpp b/amarok/src/lastfm.cpp
index 27d46f6d..9fb03845 100644
--- a/amarok/src/lastfm.cpp
+++ b/amarok/src/lastfm.cpp
@@ -51,8 +51,8 @@ using namespace LastFm;
// DO NOT use this class for anything else, use KIO directly instead.
////////////////////////////////////////////////////////////////////////////////
AmarokHttp::AmarokHttp ( const TQString& hostname, TQ_UINT16 port,
- TQObject* tqparent )
- : TQObject( tqparent ),
+ TQObject* parent )
+ : TQObject( parent ),
m_hostname( hostname ),
m_port( port )
{}
@@ -382,8 +382,8 @@ Controller::stationDescription( TQString url )
// CLASS WebService
////////////////////////////////////////////////////////////////////////////////
-WebService::WebService( TQObject* tqparent, bool useProxy )
- : TQObject( tqparent, "lastfmParent" )
+WebService::WebService( TQObject* parent, bool useProxy )
+ : TQObject( parent, "lastfmParent" )
, m_useProxy( useProxy )
, m_deletionUnsafe( false )
, m_wasCanceled( false )
@@ -1093,8 +1093,8 @@ void Bundle::detach() {
////////////////////////////////////////////////////////////////////////////////
// CLASS LastFm::LoginDialog
////////////////////////////////////////////////////////////////////////////////
-LoginDialog::LoginDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "LastfmLogin", true, TQString(), Ok|Cancel)
+LoginDialog::LoginDialog( TQWidget *parent )
+ : KDialogBase( parent, "LastfmLogin", true, TQString(), Ok|Cancel)
{
makeGridMainWidget( 1, Qt::Horizontal );
new TQLabel( i18n( "To use last.fm with Amarok, you need a last.fm profile." ), mainWidget() );
@@ -1125,8 +1125,8 @@ void LoginDialog::slotOk()
////////////////////////////////////////////////////////////////////////////////
// CLASS LastFm::CustomStationDialog
////////////////////////////////////////////////////////////////////////////////
-CustomStationDialog::CustomStationDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "LastfmCustomStation", true, i18n( "Create Custom Station" ) , Ok|Cancel)
+CustomStationDialog::CustomStationDialog( TQWidget *parent )
+ : KDialogBase( parent, "LastfmCustomStation", true, i18n( "Create Custom Station" ) , Ok|Cancel)
{
makeVBoxMainWidget();
diff --git a/amarok/src/lastfm.h b/amarok/src/lastfm.h
index b5e01349..c3826889 100644
--- a/amarok/src/lastfm.h
+++ b/amarok/src/lastfm.h
@@ -44,7 +44,7 @@ class AmarokHttp : public TQObject
TQ_OBJECT
public:
- AmarokHttp ( const TQString & hostname, TQ_UINT16 port = 80, TQObject* tqparent = 0 );
+ AmarokHttp ( const TQString & hostname, TQ_UINT16 port = 80, TQObject* parent = 0 );
int get ( const TQString & path );
TQHttp::State state() const;
TQByteArray readAll ();
@@ -116,7 +116,7 @@ namespace LastFm
public:
enum DataType { Artist, Album, Track };
- WebService( TQObject* tqparent, bool useProxy );
+ WebService( TQObject* parent, bool useProxy );
~WebService();
bool handshake( const TQString& username, const TQString& password );
@@ -276,7 +276,7 @@ namespace LastFm
TQ_OBJECT
public:
- LoginDialog( TQWidget *tqparent );
+ LoginDialog( TQWidget *parent );
protected slots:
void slotOk();
@@ -293,7 +293,7 @@ namespace LastFm
TQ_OBJECT
public:
- CustomStationDialog( TQWidget *tqparent );
+ CustomStationDialog( TQWidget *parent );
TQString text() const;
diff --git a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
index 1d9bc139..b0d1ed44 100644
--- a/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
+++ b/amarok/src/magnatunebrowser/magnatuneartistinfobox.h
@@ -41,7 +41,7 @@ class MagnatuneArtistInfoBox : public KHTMLPart
public:
/**
* Constructor
- * @param parentWidget The tqparent TQWidget
+ * @param parentWidget The parent TQWidget
* @param widgetname The name of this widget
* @return New MagnatuneArtistInfoBox object
*/
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
index f0fca6b5..6959139e 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.cpp
@@ -29,8 +29,8 @@ Boston, MA 02110-1301, USA.
#include <tqtextedit.h>
-MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *tqparent, const char *name, bool modal, WFlags fl )
- : MagnatuneDownloadDialogBase( tqparent, name, modal, fl )
+MagnatuneDownloadDialog::MagnatuneDownloadDialog( TQWidget *parent, const char *name, bool modal, WFlags fl )
+ : MagnatuneDownloadDialogBase( parent, name, modal, fl )
{
downloadTargetURLRequester->fileDialog() ->setMode( KFile::Directory );
m_currentDownloadInfo = 0;
diff --git a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
index c9a3de33..956a7f6c 100644
--- a/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatunedownloaddialog.h
@@ -39,12 +39,12 @@ class MagnatuneDownloadDialog : public MagnatuneDownloadDialogBase
public:
/**
* Overridden constructor.
- * @param tqparent Pointer to the tqparent TQWidget.
+ * @param parent Pointer to the parent TQWidget.
* @param name Name of this widget.
* @param modal Sets modal state.
* @param fl Additional dialog flags.
*/
- MagnatuneDownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatuneDownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
/**
* Destructor
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.cpp b/amarok/src/magnatunebrowser/magnatunelistview.cpp
index 0ea7c53e..3ea8a167 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistview.cpp
@@ -26,8 +26,8 @@
#include <tqcolor.h>
-MagnatuneListView::MagnatuneListView( TQWidget * tqparent )
- : KListView( tqparent )
+MagnatuneListView::MagnatuneListView( TQWidget * parent )
+ : KListView( parent )
{
setRootIsDecorated( true );
diff --git a/amarok/src/magnatunebrowser/magnatunelistview.h b/amarok/src/magnatunebrowser/magnatunelistview.h
index b116fece..2a7f7391 100644
--- a/amarok/src/magnatunebrowser/magnatunelistview.h
+++ b/amarok/src/magnatunebrowser/magnatunelistview.h
@@ -34,7 +34,7 @@ A specialized KListView that provides drag and drop functionality
class MagnatuneListView : public KListView
{
public:
- MagnatuneListView(TQWidget * tqparent);
+ MagnatuneListView(TQWidget * parent);
~MagnatuneListView();
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
index 47450697..8ce1046c 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.cpp
@@ -29,8 +29,8 @@
-MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * tqparent )
-: KListViewItem( tqparent ), MagnatuneArtist( artist )
+MagnatuneListViewArtistItem::MagnatuneListViewArtistItem( MagnatuneArtist artist, KListView * parent )
+: KListViewItem( parent ), MagnatuneArtist( artist )
{
KListViewItem::setText( 0, artist.getName() );
@@ -84,8 +84,8 @@ void MagnatuneListViewArtistItem::setup()
-MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * tqparent )
-: KListViewItem( tqparent ), MagnatuneAlbum( album )
+MagnatuneListViewAlbumItem::MagnatuneListViewAlbumItem( MagnatuneAlbum album, KListViewItem * parent )
+: KListViewItem( parent ), MagnatuneAlbum( album )
{
KListViewItem::setText( 0, album.getName() );
setDragEnabled( true );
@@ -141,8 +141,8 @@ void MagnatuneListViewAlbumItem::setup( )
-MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * tqparent )
-: KListViewItem( tqparent ), MagnatuneTrack( track )
+MagnatuneListViewTrackItem::MagnatuneListViewTrackItem( MagnatuneTrack track, KListViewItem * parent )
+: KListViewItem( parent ), MagnatuneTrack( track )
{
int trackNumber = track.getTrackNumber();
diff --git a/amarok/src/magnatunebrowser/magnatunelistviewitems.h b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
index cc848cc4..573acb67 100644
--- a/amarok/src/magnatunebrowser/magnatunelistviewitems.h
+++ b/amarok/src/magnatunebrowser/magnatunelistviewitems.h
@@ -36,7 +36,7 @@ A specialized KListViewItem that encapsulates a MagnatuneArtist
class MagnatuneListViewArtistItem : public KListViewItem, public MagnatuneArtist
{
public:
- MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * tqparent);
+ MagnatuneListViewArtistItem(MagnatuneArtist artist, KListView * parent);
~MagnatuneListViewArtistItem();
@@ -55,7 +55,7 @@ class MagnatuneListViewAlbumItem : public KListViewItem, public MagnatuneAlbum
{
public:
- MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * tqparent);
+ MagnatuneListViewAlbumItem(MagnatuneAlbum album, KListViewItem * parent);
~MagnatuneListViewAlbumItem();
void setOpen( bool o );
@@ -73,7 +73,7 @@ class MagnatuneListViewTrackItem : public KListViewItem, public MagnatuneTrack
{
public:
- MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * tqparent);
+ MagnatuneListViewTrackItem(MagnatuneTrack track, KListViewItem * parent);
~MagnatuneListViewTrackItem();
};
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
index 4ea1166b..aeaa6843 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.cpp
@@ -29,8 +29,8 @@
#include <tqlabel.h>
-MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* tqparent, const char* name, bool modal, WFlags fl )
- : magnatunePurchaseDialogBase( tqparent, name, modal, fl )
+MagnatunePurchaseDialog::MagnatunePurchaseDialog( TQWidget* parent, const char* name, bool modal, WFlags fl )
+ : magnatunePurchaseDialogBase( parent, name, modal, fl )
{}
MagnatunePurchaseDialog::~MagnatunePurchaseDialog()
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
index 085ca931..b8042b30 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasedialog.h
@@ -32,12 +32,12 @@ public:
/**
* Overridden constructor.
- * @param tqparent Pointer to the tqparent TQWidget.
+ * @param parent Pointer to the parent TQWidget.
* @param name Name of this widget.
* @param modal Sets modal state.
* @param fl Additional dialog flags.
*/
- MagnatunePurchaseDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatunePurchaseDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
/**
* Destructor
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
index 053c039c..fbfed0ba 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.cpp
@@ -81,7 +81,7 @@ void MagnatunePurchaseHandler::showPurchaseDialog( TQString coverTempLocation )
if ( m_purchaseDialog == 0 )
{
- m_purchaseDialog = new MagnatunePurchaseDialog( m_tqparent, "PurchaseDialog", true, 0 );
+ m_purchaseDialog = new MagnatunePurchaseDialog( m_parent, "PurchaseDialog", true, 0 );
connect( m_purchaseDialog, TQT_SIGNAL( makePurchase( TQString, TQString, TQString, TQString, TQString, TQString, int ) ), this, TQT_SLOT( processPayment( TQString, TQString, TQString, TQString, TQString, TQString, int ) ) );
connect ( m_purchaseDialog, TQT_SIGNAL( cancelled() ), this, TQT_SLOT( albumPurchaseCancelled() ) );
@@ -146,7 +146,7 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
if ( m_downloadDialog == 0 )
{
- m_downloadDialog = new MagnatuneDownloadDialog( m_tqparent, "downloaddialog", true, 0 );
+ m_downloadDialog = new MagnatuneDownloadDialog( m_parent, "downloaddialog", true, 0 );
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
}
@@ -171,16 +171,16 @@ void MagnatunePurchaseHandler::xmlDownloadComplete( KIO::Job * downloadJob )
else
{
- TQMessageBox::information( m_tqparent, "Could not process payment",
+ TQMessageBox::information( m_parent, "Could not process payment",
"There seems to be an error in the information entered (check the credit card number), please try again\n" );
m_purchaseDialog->setEnabled( true );
}
}
-void MagnatunePurchaseHandler::setParent( TQWidget * tqparent )
+void MagnatunePurchaseHandler::setParent( TQWidget * parent )
{
- m_tqparent = tqparent;
+ m_parent = parent;
}
diff --git a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
index a9a5e538..4bae3105 100644
--- a/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
+++ b/amarok/src/magnatunebrowser/magnatunepurchasehandler.h
@@ -43,7 +43,7 @@ public:
MagnatunePurchaseHandler();
~MagnatunePurchaseHandler();
- void setParent( TQWidget * tqparent );
+ void setParent( TQWidget * parent );
/**
* Starts a purchase operation
* @param album The album to purchase
@@ -58,8 +58,8 @@ private:
KIO::TransferJob * m_resultDownloadJob;
- //need a tqparent to pass to any dialogs we spawn
- TQWidget * m_tqparent;
+ //need a parent to pass to any dialogs we spawn
+ TQWidget * m_parent;
MagnatunePurchaseDialog * m_purchaseDialog;
MagnatuneDownloadDialog * m_downloadDialog;
MagnatuneAlbumDownloader * m_albumDownloader;
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
index 0e3c26b3..5d7c1417 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.cpp
@@ -23,8 +23,8 @@
#include <tqpushbutton.h>
#include <klistview.h>
-MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* tqparent, const char* name, bool modal, WFlags fl)
-: magnatuneReDownloadDialogBase(tqparent,name, modal,fl)
+MagnatuneRedownloadDialog::MagnatuneRedownloadDialog(TQWidget* parent, const char* name, bool modal, WFlags fl)
+: magnatuneReDownloadDialogBase(parent,name, modal,fl)
{
redownloadButton->setEnabled ( false );
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
index e7b5fc2a..ad4fd651 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloaddialog.h
@@ -31,7 +31,7 @@ class MagnatuneRedownloadDialog : public magnatuneReDownloadDialogBase
TQ_OBJECT
public:
- MagnatuneRedownloadDialog( TQWidget* tqparent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
+ MagnatuneRedownloadDialog( TQWidget* parent = 0, const char* name = 0, bool modal = false, WFlags fl = 0 );
~MagnatuneRedownloadDialog();
/*$PUBLIC_FUNCTIONS$*/
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
index 643dab5d..72e19ed4 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.cpp
@@ -30,9 +30,9 @@
-MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * tqparent)
+MagnatuneRedownloadHandler::MagnatuneRedownloadHandler(TQWidget * parent)
{
- m_tqparent = tqparent;
+ m_parent = parent;
m_redownloadDialog = 0;
m_downloadDialog = 0;
m_albumDownloader = 0;
@@ -51,13 +51,13 @@ void MagnatuneRedownloadHandler::showRedownloadDialog( )
if (previousDownloads.isEmpty()) {
//No previously purchased track information found. No more to do here...
- TQMessageBox::information( m_tqparent, i18n( "No purchases found!" ) ,
+ TQMessageBox::information( m_parent, i18n( "No purchases found!" ) ,
i18n( "No previous purchases have been found. Nothing to redownload..." ) + "\n" );
return;
}
if (m_redownloadDialog == 0) {
- m_redownloadDialog = new MagnatuneRedownloadDialog( m_tqparent );
+ m_redownloadDialog = new MagnatuneRedownloadDialog( m_parent );
connect( m_redownloadDialog, TQT_SIGNAL( redownload( TQString) ), this, TQT_SLOT( redownload( TQString ) ) );
connect( m_redownloadDialog, TQT_SIGNAL(cancelled() ), this, TQT_SLOT( selectionDialogCancelled() ));
}
@@ -107,7 +107,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName )
if (m_downloadDialog == 0) {
- m_downloadDialog = new MagnatuneDownloadDialog(m_tqparent);
+ m_downloadDialog = new MagnatuneDownloadDialog(m_parent);
connect( m_downloadDialog, TQT_SIGNAL( downloadAlbum( MagnatuneDownloadInfo * ) ), m_albumDownloader, TQT_SLOT( downloadAlbum( MagnatuneDownloadInfo * ) ) );
}
@@ -123,7 +123,7 @@ void MagnatuneRedownloadHandler::redownload( TQString storedInfoFileName )
else
{
- TQMessageBox::information( m_tqparent, i18n( "Could not re-download album" ),
+ TQMessageBox::information( m_parent, i18n( "Could not re-download album" ),
i18n( "There seems to be a problem with the selected redownload info file." ) + "\n" );
}
diff --git a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
index f41e291a..b09ec64b 100644
--- a/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
+++ b/amarok/src/magnatunebrowser/magnatuneredownloadhandler.h
@@ -37,7 +37,7 @@ class MagnatuneRedownloadHandler : public TQObject {
Q_OBJECT
TQ_OBJECT
public:
- MagnatuneRedownloadHandler(TQWidget * tqparent);
+ MagnatuneRedownloadHandler(TQWidget * parent);
~MagnatuneRedownloadHandler();
@@ -52,7 +52,7 @@ signals:
protected:
- TQWidget * m_tqparent;
+ TQWidget * m_parent;
TQStringList GetPurchaseList( );
MagnatuneRedownloadDialog * m_redownloadDialog;
MagnatuneDownloadDialog * m_downloadDialog;
diff --git a/amarok/src/mediabrowser.cpp b/amarok/src/mediabrowser.cpp
index ced592d1..967ace1f 100644
--- a/amarok/src/mediabrowser.cpp
+++ b/amarok/src/mediabrowser.cpp
@@ -112,8 +112,8 @@ bool MediaBrowser::isAvailable() //static
class SpaceLabel : public TQLabel {
public:
- SpaceLabel(TQWidget *tqparent)
- : TQLabel(tqparent)
+ SpaceLabel(TQWidget *parent)
+ : TQLabel(parent)
{
m_total = m_used = m_scheduled = 0;
setBackgroundMode(TQt::NoBackground);
@@ -789,26 +789,26 @@ MediaBrowser::~MediaBrowser()
}
-MediaItem::MediaItem( TQListView* tqparent )
-: KListViewItem( tqparent )
+MediaItem::MediaItem( TQListView* parent )
+: KListViewItem( parent )
{
init();
}
-MediaItem::MediaItem( TQListViewItem* tqparent )
-: KListViewItem( tqparent )
+MediaItem::MediaItem( TQListViewItem* parent )
+: KListViewItem( parent )
{
init();
}
-MediaItem::MediaItem( TQListView* tqparent, TQListViewItem* after )
-: KListViewItem( tqparent, after )
+MediaItem::MediaItem( TQListView* parent, TQListViewItem* after )
+: KListViewItem( parent, after )
{
init();
}
-MediaItem::MediaItem( TQListViewItem* tqparent, TQListViewItem* after )
-: KListViewItem( tqparent, after )
+MediaItem::MediaItem( TQListViewItem* parent, TQListViewItem* after )
+: KListViewItem( parent, after )
{
init();
}
@@ -1171,9 +1171,9 @@ class MediaItemTip : public TQToolTip
};
-MediaView::MediaView( TQWidget* tqparent, MediaDevice *device )
- : KListView( tqparent )
- , m_tqparent( tqparent )
+MediaView::MediaView( TQWidget* parent, MediaDevice *device )
+ : KListView( parent )
+ , m_parent( parent )
, m_device( device )
{
hide();
@@ -1317,17 +1317,17 @@ MediaView::nodeBuildDragList( MediaItem* item, int flags )
}
int
-MediaView::getSelectedLeaves( MediaItem *tqparent, TQPtrList<MediaItem> *list, int flags )
+MediaView::getSelectedLeaves( MediaItem *parent, TQPtrList<MediaItem> *list, int flags )
{
int numFiles = 0;
if( !list )
list = new TQPtrList<MediaItem>;
MediaItem *it;
- if( !tqparent )
+ if( !parent )
it = dynamic_cast<MediaItem *>(firstChild());
else
- it = dynamic_cast<MediaItem *>(tqparent->firstChild());
+ it = dynamic_cast<MediaItem *>(parent->firstChild());
for( ; it; it = dynamic_cast<MediaItem*>(it->nextSibling()))
{
@@ -1419,9 +1419,9 @@ MediaView::contentsDropEvent( TQDropEvent *e )
}
else if( item->type() == MediaItem::PLAYLISTITEM )
{
- MediaItem *list = dynamic_cast<MediaItem *>(item->tqparent());
+ MediaItem *list = dynamic_cast<MediaItem *>(item->parent());
MediaItem *after = 0;
- for(MediaItem *it = dynamic_cast<MediaItem*>(item->tqparent()->firstChild());
+ for(MediaItem *it = dynamic_cast<MediaItem*>(item->parent()->firstChild());
it;
it = dynamic_cast<MediaItem *>(it->nextSibling()))
{
@@ -1513,14 +1513,14 @@ MediaView::rmbPressed( TQListViewItem *item, const TQPoint &p, int i )
}
MediaItem *
-MediaView::newDirectory( MediaItem *tqparent )
+MediaView::newDirectory( MediaItem *parent )
{
bool ok;
const TQString name = KInputDialog::getText(i18n("Add Directory"), i18n("Directory Name:"), TQString(), &ok, this);
if( ok && !name.isEmpty() )
{
- m_device->newDirectory( name, tqparent );
+ m_device->newDirectory( name, parent );
}
return 0;
@@ -1864,7 +1864,7 @@ MediaBrowser::updateStats()
bool
-MediaView::setFilter( const TQString &filter, MediaItem *tqparent )
+MediaView::setFilter( const TQString &filter, MediaItem *parent )
{
bool advanced = ExpressionParser::isAdvancedExpression( filter );
TQValueList<int> defaultColumns;
@@ -1874,14 +1874,14 @@ MediaView::setFilter( const TQString &filter, MediaItem *tqparent )
bool root = false;
MediaItem *it;
- if( !tqparent )
+ if( !parent )
{
root = true;
it = dynamic_cast<MediaItem *>(firstChild());
}
else
{
- it = dynamic_cast<MediaItem *>(tqparent->firstChild());
+ it = dynamic_cast<MediaItem *>(parent->firstChild());
}
bool tqchildrenVisible = false;
@@ -1947,7 +1947,7 @@ MediaDevice::MediaDevice()
, m_transcodeAlways( false )
, m_transcodeRemove( false )
, sysProc ( 0 )
- , m_tqparent( 0 )
+ , m_parent( 0 )
, m_view( 0 )
, m_wait( false )
, m_requireMount( false )
@@ -1968,11 +1968,11 @@ MediaDevice::MediaDevice()
sysProc = new KShellProcess(); Q_CHECK_PTR(sysProc);
}
-void MediaDevice::init( MediaBrowser* tqparent )
+void MediaDevice::init( MediaBrowser* parent )
{
- m_tqparent = tqparent;
+ m_parent = parent;
if( !m_view )
- m_view = new MediaView( m_tqparent->m_views, this );
+ m_view = new MediaView( m_parent->m_views, this );
m_view->hide();
}
@@ -2057,7 +2057,7 @@ MediaDevice::view()
void
MediaDevice::hideProgress()
{
- m_tqparent->m_progressBox->hide();
+ m_parent->m_progressBox->hide();
}
void
@@ -2083,7 +2083,7 @@ MediaQueue::syncPlaylist( const TQString &name, const TQString &query, bool load
item->m_playlistName = name;
item->setText( 0, name );
item->m_flags |= MediaItem::SmartPlaylist;
- m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 );
+ m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 );
itemCountChanged();
if( !loading )
URLsAdded();
@@ -2098,7 +2098,7 @@ MediaQueue::syncPlaylist( const TQString &name, const KURL &url, bool loading )
item->setData( url.url() );
item->m_playlistName = name;
item->setText( 0, name );
- m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 );
+ m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 );
itemCountChanged();
if( !loading )
URLsAdded();
@@ -2323,8 +2323,8 @@ MediaQueue::addURL( const KURL& url2, MetaBundle *bundle, const TQString &playli
}
item->setText( 0, text);
- m_tqparent->updateButtons();
- m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 );
+ m_parent->updateButtons();
+ m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 );
addItemToSize( item );
itemCountChanged();
}
@@ -2354,8 +2354,8 @@ MediaQueue::addURL( const KURL &url, MediaItem *item )
}
newitem->setText( 0, text);
newitem->setBundle( bundle );
- m_tqparent->updateButtons();
- m_tqparent->m_progress->setTotalSteps( m_tqparent->m_progress->totalSteps() + 1 );
+ m_parent->updateButtons();
+ m_parent->m_progress->setTotalSteps( m_parent->m_progress->totalSteps() + 1 );
addItemToSize( item );
itemCountChanged();
@@ -2374,13 +2374,13 @@ MediaQueue::addURLs( const KURL::List urls, const TQString &playlistName )
void
MediaQueue::URLsAdded()
{
- m_tqparent->updateStats();
- m_tqparent->updateButtons();
- if( m_tqparent->currentDevice()
- && m_tqparent->currentDevice()->isConnected()
- && m_tqparent->currentDevice()->asynchronousTransfer()
- && !m_tqparent->currentDevice()->isTransferring() )
- m_tqparent->currentDevice()->transferFiles();
+ m_parent->updateStats();
+ m_parent->updateButtons();
+ if( m_parent->currentDevice()
+ && m_parent->currentDevice()->isConnected()
+ && m_parent->currentDevice()->asynchronousTransfer()
+ && !m_parent->currentDevice()->isTransferring() )
+ m_parent->currentDevice()->transferFiles();
save( Amarok::saveLocation() + "transferlist.xml" );
}
@@ -2662,8 +2662,8 @@ MediaDevice::connectDevice( bool silent )
{
MediaBrowser::instance()->activateDevice( this );
}
- m_tqparent->updateStats();
- m_tqparent->updateButtons();
+ m_parent->updateStats();
+ m_parent->updateButtons();
if( !isConnected() )
{
@@ -2686,7 +2686,7 @@ MediaDevice::connectDevice( bool silent )
if(numFiles > 0)
{
- m_tqparent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) );
+ m_parent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) );
setProgress( 0, numFiles );
@@ -2708,9 +2708,9 @@ MediaDevice::connectDevice( bool silent )
synchronizeDevice();
- TQTimer::singleShot( 1500, m_tqparent->m_progressBox, TQT_SLOT(hide()) );
- m_tqparent->queue()->computeSize();
- m_tqparent->updateStats();
+ TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) );
+ m_parent->queue()->computeSize();
+ m_parent->updateStats();
}
}
unlockDevice();
@@ -2725,7 +2725,7 @@ MediaDevice::connectDevice( bool silent )
Amarok::StatusBar::instance()->shortMessage( i18n( "Device successfully connected" ) );
- m_tqparent->updateDevices();
+ m_parent->updateDevices();
return true;
}
@@ -2756,7 +2756,7 @@ MediaDevice::disconnectDevice( bool postDisconnectHook )
closeDevice();
unlockDevice();
- m_tqparent->updateStats();
+ m_parent->updateStats();
bool result = true;
if( postDisconnectHook && runPostDisconnectCommand() != 0 )
@@ -2769,7 +2769,7 @@ MediaDevice::disconnectDevice( bool postDisconnectHook )
else
Amarok::StatusBar::instance()->shortMessage( i18n( "Device successfully disconnected" ) );
- m_tqparent->updateDevices();
+ m_parent->updateDevices();
return result;
}
@@ -2790,7 +2790,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root )
switch( it->type() )
{
case MediaItem::TRACK:
- if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST )
+ if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST )
{
const MetaBundle *bundle = it->bundle();
for( int i=0; i<it->recentlyPlayed(); i++ )
@@ -2830,7 +2830,7 @@ MediaDevice::syncStatsFromDevice( MediaItem *root )
}
break;
case MediaItem::PODCASTITEM:
- if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST )
+ if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST )
{
const MetaBundle *bundle = it->bundle();
if( it->played() || it->recentlyPlayed() )
@@ -2840,11 +2840,11 @@ MediaDevice::syncStatsFromDevice( MediaItem *root )
debug() << "marking podcast episode as played: " << peb->url() << endl;
if( PlaylistBrowser::instance() )
{
- PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->tqparent() );
+ PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->parent() );
if ( p )
p->setListened();
else
- debug() << "did not find podcast episode: " << peb->url() << " from " << peb->tqparent() << endl;
+ debug() << "did not find podcast episode: " << peb->url() << " from " << peb->parent() << endl;
}
}
}
@@ -2892,7 +2892,7 @@ MediaDevice::syncStatsToDevice( MediaItem *root )
switch( it->type() )
{
case MediaItem::TRACK:
- if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST )
+ if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST )
{
const MetaBundle *bundle = it->bundle();
TQString url = CollectionDB::instance()->getURL( *bundle );
@@ -2901,14 +2901,14 @@ MediaDevice::syncStatsToDevice( MediaItem *root )
break;
case MediaItem::PODCASTITEM:
- if( !it->tqparent() || static_cast<MediaItem *>( it->tqparent() )->type() != MediaItem::PLAYLIST )
+ if( !it->parent() || static_cast<MediaItem *>( it->parent() )->type() != MediaItem::PLAYLIST )
{
const MetaBundle *bundle = it->bundle();
if( PodcastEpisodeBundle *peb = bundle->podcastBundle() )
{
if( PlaylistBrowser::instance() )
{
- PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->tqparent() );
+ PodcastEpisode *p = PlaylistBrowser::instance()->findPodcastEpisode( peb->url(), peb->parent() );
if( p )
it->setListened( !p->isNew() );
}
@@ -2934,16 +2934,16 @@ MediaDevice::transferFiles()
setCanceled( false );
m_transferring = true;
- m_tqparent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( false );
+ m_parent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( false );
- setProgress( 0, m_tqparent->m_queue->childCount() );
+ setProgress( 0, m_parent->m_queue->childCount() );
// ok, let's copy the stuff to the device
KURL::List existing, unplayable;
unsigned transcodeFail = 0;
// iterate through items
- MediaItem *next = static_cast<MediaItem *>(m_tqparent->m_queue->firstChild());
+ MediaItem *next = static_cast<MediaItem *>(m_parent->m_queue->firstChild());
while( next )
{
MediaItem *transferredItem = next;
@@ -2954,10 +2954,10 @@ MediaDevice::transferFiles()
if( transferredItem->device() )
{
transferredItem->device()->copyTrackFromDevice( transferredItem );
- m_tqparent->m_queue->subtractItemFromSize( transferredItem, true );
+ m_parent->m_queue->subtractItemFromSize( transferredItem, true );
delete transferredItem;
setProgress( progress() + 1 );
- m_tqparent->m_queue->itemCountChanged();
+ m_parent->m_queue->itemCountChanged();
kapp->tqprocessEvents( 100 );
continue;
}
@@ -2976,9 +2976,9 @@ MediaDevice::transferFiles()
{
// this should not happen
debug() << "invalid item in transfer queue" << endl;
- m_tqparent->m_queue->subtractItemFromSize( transferredItem, true );
+ m_parent->m_queue->subtractItemFromSize( transferredItem, true );
delete transferredItem;
- m_tqparent->m_queue->itemCountChanged();
+ m_parent->m_queue->itemCountChanged();
continue;
}
@@ -3120,17 +3120,17 @@ MediaDevice::transferFiles()
if( isCanceled() )
{
- m_tqparent->updateStats();
+ m_parent->updateStats();
break;
}
if( !(transferredItem->flags() & MediaItem::Failed) )
{
- m_tqparent->m_queue->subtractItemFromSize( transferredItem, true );
+ m_parent->m_queue->subtractItemFromSize( transferredItem, true );
delete transferredItem;
- m_tqparent->m_queue->itemCountChanged();
+ m_parent->m_queue->itemCountChanged();
}
- m_tqparent->updateStats();
+ m_parent->updateStats();
kapp->tqprocessEvents( 100 );
}
@@ -3189,8 +3189,8 @@ MediaDevice::transferFiles()
Amarok::StatusBar::instance()->shortMessage( msg, KDE::StatusBar::Sorry );
}
- m_tqparent->updateButtons();
- m_tqparent->queue()->save( Amarok::saveLocation() + "transferlist.xml" );
+ m_parent->updateButtons();
+ m_parent->queue()->save( Amarok::saveLocation() + "transferlist.xml" );
m_transferring = false;
if( m_deferredDisconnect )
@@ -3208,24 +3208,24 @@ MediaDevice::transferFiles()
int
MediaDevice::progress() const
{
- return m_tqparent->m_progress->progress();
+ return m_parent->m_progress->progress();
}
void
MediaDevice::setProgress( const int progress, const int total )
{
if( total != -1 )
- m_tqparent->m_progress->setTotalSteps( total );
- m_tqparent->m_progress->setProgress( progress );
- m_tqparent->m_progressBox->show();
+ m_parent->m_progress->setTotalSteps( total );
+ m_parent->m_progress->setProgress( progress );
+ m_parent->m_progressBox->show();
}
void
MediaDevice::fileTransferFinished() //SLOT
{
- m_tqparent->updateStats();
- m_tqparent->m_progressBox->hide();
- m_tqparent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( isConnected() && m_tqparent->queue()->childCount() > 0 );
+ m_parent->updateStats();
+ m_parent->m_progressBox->hide();
+ m_parent->m_toolbar->getButton(MediaBrowser::TRANSFER)->setEnabled( isConnected() && m_parent->queue()->childCount() > 0 );
m_wait = false;
}
@@ -3249,10 +3249,10 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
//NOTE we assume that currentItem is the main target
int numFiles = m_view->getSelectedLeaves(item, &list, MediaView::OnlySelected | ((flags & OnlyPlayed) ? MediaView::OnlyPlayed : MediaView::None) );
- m_tqparent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) );
+ m_parent->m_stats->setText( i18n( "1 track to be deleted", "%n tracks to be deleted", numFiles ) );
if( numFiles > 0 && (flags & DeleteTrack) )
{
- int button = KMessageBox::warningContinueCancel( m_tqparent,
+ int button = KMessageBox::warningContinueCancel( m_parent,
i18n( "<p>You have selected 1 track to be <b>irreversibly</b> deleted.",
"<p>You have selected %n tracks to be <b>irreversibly</b> deleted.",
numFiles
@@ -3262,8 +3262,8 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
if ( button != KMessageBox::Continue )
{
- m_tqparent->queue()->computeSize();
- m_tqparent->updateStats();
+ m_parent->queue()->computeSize();
+ m_parent->updateStats();
m_deleting = false;
unlockDevice();
return 0;
@@ -3315,7 +3315,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
count = -1;
}
}
- m_tqparent->updateStats();
+ m_parent->updateStats();
fi = next;
}
@@ -3329,7 +3329,7 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
if(!isTransferring())
{
- TQTimer::singleShot( 1500, m_tqparent->m_progressBox, TQT_SLOT(hide()) );
+ TQTimer::singleShot( 1500, m_parent->m_progressBox, TQT_SLOT(hide()) );
}
if( m_deferredDisconnect )
@@ -3338,8 +3338,8 @@ MediaDevice::deleteFromDevice(MediaItem *item, int flags )
disconnectDevice( m_runDisconnectHook );
}
}
- m_tqparent->queue()->computeSize();
- m_tqparent->updateStats();
+ m_parent->queue()->computeSize();
+ m_parent->updateStats();
return count;
}
@@ -3448,7 +3448,7 @@ MediaQueue::save( const TQString &path )
i.appendChild( attr );
attr = newdoc.createElement( "PodcastRSS" );
- t = newdoc.createTextNode( peb->tqparent().url() );
+ t = newdoc.createTextNode( peb->parent().url() );
attr.appendChild( t );
i.appendChild( attr );
@@ -3599,8 +3599,8 @@ MediaDevice::isPreferredFormat( const MetaBundle &bundle )
}
-MediaQueue::MediaQueue(MediaBrowser *tqparent)
- : KListView( tqparent ), m_tqparent( tqparent )
+MediaQueue::MediaQueue(MediaBrowser *parent)
+ : KListView( parent ), m_parent( parent )
{
setFixedHeight( 200 );
setSelectionMode( TQListView::Extended );
@@ -3640,7 +3640,7 @@ MediaQueue::acceptDrag( TQDropEvent *e ) const
}
void
-MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after)
+MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after)
{
if( e->source() != viewport() )
{
@@ -3664,7 +3664,7 @@ MediaQueue::slotDropped( TQDropEvent* e, TQListViewItem* tqparent, TQListViewIte
}
else if( TQListViewItem *i = currentItem() )
{
- moveItem( i, tqparent, after );
+ moveItem( i, parent, after );
}
}
@@ -3699,9 +3699,9 @@ MediaQueue::computeSize() const
MediaItem *item = static_cast<MediaItem *>(it);
if( item && item->bundle() &&
- ( !m_tqparent->currentDevice()
- || !m_tqparent->currentDevice()->isConnected()
- || !m_tqparent->currentDevice()->trackExists(*item->bundle()) ) )
+ ( !m_parent->currentDevice()
+ || !m_parent->currentDevice()->isConnected()
+ || !m_parent->currentDevice()->trackExists(*item->bundle()) ) )
m_totalSize += ((item->size()+1023)/1024)*1024;
}
}
@@ -3716,9 +3716,9 @@ void
MediaQueue::addItemToSize( const MediaItem *item ) const
{
if( item && item->bundle() &&
- ( !m_tqparent->currentDevice()
- || !m_tqparent->currentDevice()->isConnected()
- || !m_tqparent->currentDevice()->trackExists(*item->bundle()) ) )
+ ( !m_parent->currentDevice()
+ || !m_parent->currentDevice()->isConnected()
+ || !m_parent->currentDevice()->trackExists(*item->bundle()) ) )
m_totalSize += ((item->size()+1023)/1024)*1024;
}
@@ -3726,9 +3726,9 @@ void
MediaQueue::subtractItemFromSize( const MediaItem *item, bool unconditionally ) const
{
if( item && item->bundle() &&
- ( !m_tqparent->currentDevice()
- || !m_tqparent->currentDevice()->isConnected()
- || (unconditionally || !m_tqparent->currentDevice()->trackExists(*item->bundle())) ) )
+ ( !m_parent->currentDevice()
+ || !m_parent->currentDevice()->isConnected()
+ || (unconditionally || !m_parent->currentDevice()->trackExists(*item->bundle())) ) )
m_totalSize -= ((item->size()+1023)/1024)*1024;
}
@@ -3743,7 +3743,7 @@ MediaQueue::removeSelected()
{
subtractItemFromSize( static_cast<MediaItem *>(item) );
delete item;
- if( m_tqparent->currentDevice() && m_tqparent->currentDevice()->isTransferring() )
+ if( m_parent->currentDevice() && m_parent->currentDevice()->isTransferring() )
{
MediaBrowser::instance()->m_progress->setTotalSteps( MediaBrowser::instance()->m_progress->totalSteps() - 1 );
}
@@ -3812,11 +3812,11 @@ MediaQueue::clearItems()
{
clear();
itemCountChanged();
- if(m_tqparent)
+ if(m_parent)
{
computeSize();
- m_tqparent->updateStats();
- m_tqparent->updateButtons();
+ m_parent->updateStats();
+ m_parent->updateButtons();
}
}
diff --git a/amarok/src/mediabrowser.h b/amarok/src/mediabrowser.h
index 88eab485..2e93c2f8 100644
--- a/amarok/src/mediabrowser.h
+++ b/amarok/src/mediabrowser.h
@@ -46,10 +46,10 @@ class TQPalette;
class LIBAMAROK_EXPORT MediaItem : public KListViewItem
{
public:
- MediaItem( TQListView* tqparent );
- MediaItem( TQListViewItem* tqparent );
- MediaItem( TQListView* tqparent, TQListViewItem* after );
- MediaItem( TQListViewItem* tqparent, TQListViewItem* after );
+ MediaItem( TQListView* parent );
+ MediaItem( TQListViewItem* parent );
+ MediaItem( TQListView* parent, TQListViewItem* after );
+ MediaItem( TQListViewItem* parent, TQListViewItem* after );
void init();
virtual ~MediaItem();
@@ -128,7 +128,7 @@ class MediaQueue : public KListView, public DropProxyTarget
TQ_OBJECT
public:
- MediaQueue(MediaBrowser *tqparent);
+ MediaQueue(MediaBrowser *parent);
MediaItem *findPath( TQString path );
KIO::filesize_t totalSize() const; // total size of items to transfer in KB
@@ -160,11 +160,11 @@ class MediaQueue : public KListView, public DropProxyTarget
private slots:
void selectAll() {TQListView::selectAll(true); }
void slotShowContextMenu( TQListViewItem* item, const TQPoint& point, int );
- void slotDropped (TQDropEvent* e, TQListViewItem* tqparent, TQListViewItem* after);
+ void slotDropped (TQDropEvent* e, TQListViewItem* parent, TQListViewItem* after);
private:
void keyPressEvent( TQKeyEvent *e );
- MediaBrowser *m_tqparent;
+ MediaBrowser *m_parent;
mutable KIO::filesize_t m_totalSize;
};
@@ -292,12 +292,12 @@ class MediaView : public KListView
OnlyPlayed = 2
};
- MediaView( TQWidget *tqparent, MediaDevice *device );
+ MediaView( TQWidget *parent, MediaDevice *device );
virtual ~MediaView();
LIBAMAROK_EXPORT KURL::List nodeBuildDragList( MediaItem* item, int flags=OnlySelected );
- int getSelectedLeaves(MediaItem *tqparent, TQPtrList<MediaItem> *list, int flags=OnlySelected );
- LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* tqparent );
- bool setFilter( const TQString &filter, MediaItem *tqparent=NULL );
+ int getSelectedLeaves(MediaItem *parent, TQPtrList<MediaItem> *list, int flags=OnlySelected );
+ LIBAMAROK_EXPORT MediaItem *newDirectory( MediaItem* parent );
+ bool setFilter( const TQString &filter, MediaItem *parent=NULL );
private slots:
void rmbPressed( TQListViewItem*, const TQPoint&, int );
@@ -315,7 +315,7 @@ class MediaView : public KListView
bool acceptDrag( TQDropEvent *e ) const;
TQDragObject *dragObject();
- TQWidget *m_tqparent;
+ TQWidget *m_parent;
MediaDevice *m_device;
MediaItemTip *m_toolTip;
};
@@ -345,7 +345,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
};
MediaDevice();
- virtual void init( MediaBrowser* tqparent );
+ virtual void init( MediaBrowser* parent );
virtual ~MediaDevice();
MediaView *view();
@@ -382,7 +382,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
/**
* Adds particular tracks to a playlist
- * @param playlist tqparent playlist for tracks to be added to
+ * @param playlist parent playlist for tracks to be added to
* @param after insert following this item
* @param items tracks to add to playlist
*/
@@ -391,15 +391,15 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
/**
* Create a new playlist
* @param name playlist title
- * @param tqparent tqparent MediaItem of the new playlist
+ * @param parent parent MediaItem of the new playlist
* @param items tracks to add to the new playlist
* @return the newly created playlist
*/
- virtual MediaItem *newPlaylist(const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items) { Q_UNUSED(name); Q_UNUSED(tqparent); Q_UNUSED(items); return 0; }
+ virtual MediaItem *newPlaylist(const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items) { Q_UNUSED(name); Q_UNUSED(parent); Q_UNUSED(items); return 0; }
/**
* Move items to a directory
- * @param directory new tqparent of dropped items
+ * @param directory new parent of dropped items
* @param items tracks to add to the directory
*/
virtual void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items ) { Q_UNUSED(directory); Q_UNUSED(items); }
@@ -407,11 +407,11 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
/**
* Create a new directory
* @param name directory title
- * @param tqparent tqparent MediaItem of the new directory
+ * @param parent parent MediaItem of the new directory
* @param items tracks to add to the new directory
* @return the newly created directory
*/
- virtual MediaItem *newDirectory( const TQString &name, MediaItem *tqparent ) { Q_UNUSED(name); Q_UNUSED(tqparent); return 0; }
+ virtual MediaItem *newDirectory( const TQString &name, MediaItem *parent ) { Q_UNUSED(name); Q_UNUSED(parent); return 0; }
/**
* Notify device of changed tags
@@ -444,8 +444,8 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
*/
virtual bool needsManualConfig() { return true; }
- virtual void addConfigElements( TQWidget * /*tqparent*/ ) {}
- virtual void removeConfigElements( TQWidget * /*tqparent*/ ) {}
+ virtual void addConfigElements( TQWidget * /*parent*/ ) {}
+ virtual void removeConfigElements( TQWidget * /*parent*/ ) {}
virtual void applyConfig() {}
virtual void loadConfig();
@@ -630,7 +630,7 @@ class LIBAMAROK_EXPORT MediaDevice : public TQObject, public Amarok::Plugin
bool m_transcodeRemove;
KShellProcess *sysProc;
- MediaBrowser *m_tqparent;
+ MediaBrowser *m_parent;
MediaView *m_view;
Medium m_medium;
TQString m_transferDir;
diff --git a/amarok/src/mediadevice/daap/daapclient.cpp b/amarok/src/mediadevice/daap/daapclient.cpp
index 7fbffac4..d73a1f89 100644
--- a/amarok/src/mediadevice/daap/daapclient.cpp
+++ b/amarok/src/mediadevice/daap/daapclient.cpp
@@ -468,8 +468,8 @@ DaapClient::customClicked()
{
public:
- AddHostDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel)
+ AddHostDialog( TQWidget *parent )
+ : KDialogBase( parent, "DaapAddHostDialog", true, i18n( "Add Computer" ) , Ok|Cancel)
{
m_base = new AddHostBase( this, "DaapAddHostBase" );
m_base->m_downloadPixmap->setPixmap( TQPixmap( KGlobal::iconLoader()->iconPath( Amarok::icon( "download" ), -KIcon::SizeEnormous ) ) );
@@ -512,8 +512,8 @@ DaapClient::passwordPrompt()
class PasswordDialog : public KDialogBase
{
public:
- PasswordDialog( TQWidget *tqparent )
- : KDialogBase( tqparent, "PasswordDialog", true, i18n( "Password Required" ) , Ok|Cancel)
+ PasswordDialog( TQWidget *parent )
+ : KDialogBase( parent, "PasswordDialog", true, i18n( "Password Required" ) , Ok|Cancel)
{
makeHBoxMainWidget();
@@ -601,12 +601,12 @@ DaapClient::trackExistsInCollection( MetaBundle *bundle )
/// Configuration Dialog Extension
void
-DaapClient::addConfigElements( TQWidget * tqparent )
+DaapClient::addConfigElements( TQWidget * parent )
{
- m_broadcastServerCheckBox = new TQCheckBox( "Broadcast my music", tqparent );
+ m_broadcastServerCheckBox = new TQCheckBox( "Broadcast my music", parent );
m_broadcastServerCheckBox->setChecked( m_broadcastServer );
- m_removeDuplicatesCheckBox = new TQCheckBox( "Hide songs in my collection", tqparent );
+ m_removeDuplicatesCheckBox = new TQCheckBox( "Hide songs in my collection", parent );
m_removeDuplicatesCheckBox->setChecked( m_removeDuplicates );
TQToolTip::add( m_removeDuplicatesCheckBox, i18n( "Enabling this may reduce connection times" ) );
@@ -614,7 +614,7 @@ DaapClient::addConfigElements( TQWidget * tqparent )
void
-DaapClient::removeConfigElements( TQWidget * /* tqparent */ )
+DaapClient::removeConfigElements( TQWidget * /* parent */ )
{
if( m_broadcastServerCheckBox != 0 )
delete m_broadcastServerCheckBox;
@@ -680,8 +680,8 @@ DEBUG_BLOCK
// CLASS ServerItem
////////////////////////////////////////////////////////////////////////////////
-ServerItem::ServerItem( TQListView* tqparent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host )
- : MediaItem( tqparent )
+ServerItem::ServerItem( TQListView* parent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host )
+ : MediaItem( parent )
, m_daapClient( client )
, m_reader( 0 )
, m_ip( ip )
diff --git a/amarok/src/mediadevice/daap/daapclient.h b/amarok/src/mediadevice/daap/daapclient.h
index 9b0af159..4b111a76 100644
--- a/amarok/src/mediadevice/daap/daapclient.h
+++ b/amarok/src/mediadevice/daap/daapclient.h
@@ -66,8 +66,8 @@ class DaapClient : public MediaDevice
bool isConnected();
virtual bool needsManualConfig() { return true; }
- virtual void addConfigElements ( TQWidget * /*tqparent*/ );
- virtual void removeConfigElements( TQWidget * /*tqparent*/ );
+ virtual void addConfigElements ( TQWidget * /*parent*/ );
+ virtual void removeConfigElements( TQWidget * /*parent*/ );
virtual void applyConfig();
virtual void loadConfig();
@@ -132,7 +132,7 @@ class ServerItem : public TQObject, public MediaItem
TQ_OBJECT
public:
- ServerItem( TQListView* tqparent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host );
+ ServerItem( TQListView* parent, DaapClient* client, const TQString& ip, TQ_UINT16 port, const TQString& title, const TQString& host );
~ServerItem();
void setOpen( bool o );
void resetTitle() { setText( 0, m_title ); }
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
index 57b36fc3..e27f27eb 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.cpp
@@ -26,8 +26,8 @@
using namespace Daap;
int ContentFetcher::s_requestId = 10;
-ContentFetcher::ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * tqparent, const char * name )
- : TQHttp(hostname, port, tqparent, name)
+ContentFetcher::ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * parent, const char * name )
+ : TQHttp(hostname, port, parent, name)
, m_hostname( hostname )
, m_port( port )
, m_selfDestruct( false )
diff --git a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
index a890ec7d..5823a948 100644
--- a/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
+++ b/amarok/src/mediadevice/daap/daapreader/authentication/contentfetcher.h
@@ -31,7 +31,7 @@ class ContentFetcher : public TQHttp
TQ_OBJECT
public:
- ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * tqparent = 0, const char * name = 0 );
+ ContentFetcher( const TQString & hostname, TQ_UINT16 port, const TQString& password, TQObject * parent = 0, const char * name = 0 );
~ContentFetcher();
void getDaap( const TQString & command, TQIODevice* musicFile = 0 );
diff --git a/amarok/src/mediadevice/daap/daapreader/reader.cpp b/amarok/src/mediadevice/daap/daapreader/reader.cpp
index 61ec5404..b0629c9d 100644
--- a/amarok/src/mediadevice/daap/daapreader/reader.cpp
+++ b/amarok/src/mediadevice/daap/daapreader/reader.cpp
@@ -28,8 +28,8 @@ using namespace Daap;
TQMap<TQString, Code> Reader::s_codes;
-Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQString& password, TQObject* tqparent, const char* name)
- : TQObject(tqparent, name)
+Reader::Reader(const TQString& host, TQ_UINT16 port, ServerItem* root, const TQString& password, TQObject* parent, const char* name)
+ : TQObject(parent, name)
, m_host( host )
, m_port( port )
, m_sessionId( -1 )
diff --git a/amarok/src/mediadevice/daap/daapreader/reader.h b/amarok/src/mediadevice/daap/daapreader/reader.h
index c05ce0ce..535200bd 100644
--- a/amarok/src/mediadevice/daap/daapreader/reader.h
+++ b/amarok/src/mediadevice/daap/daapreader/reader.h
@@ -59,7 +59,7 @@ namespace Daap
public:
Reader( const TQString& host, TQ_UINT16 port, ServerItem* root,
- const TQString& password, TQObject* tqparent, const char* name );
+ const TQString& password, TQObject* parent, const char* name );
~Reader();
//TQPtrList<MetaBundle> getSongList();
diff --git a/amarok/src/mediadevice/daap/daapserver.cpp b/amarok/src/mediadevice/daap/daapserver.cpp
index 40e4cf24..af0fe7f9 100644
--- a/amarok/src/mediadevice/daap/daapserver.cpp
+++ b/amarok/src/mediadevice/daap/daapserver.cpp
@@ -21,8 +21,8 @@
#if DNSSD_SUPPORT
#include <dnssd/publicservice.h>
#endif
-DaapServer::DaapServer(TQObject* tqparent, char* name)
- : TQObject( tqparent, name )
+DaapServer::DaapServer(TQObject* parent, char* name)
+ : TQObject( parent, name )
, m_service( 0 )
{
DEBUG_BLOCK
diff --git a/amarok/src/mediadevice/daap/daapserver.h b/amarok/src/mediadevice/daap/daapserver.h
index f096a1a4..8833279f 100644
--- a/amarok/src/mediadevice/daap/daapserver.h
+++ b/amarok/src/mediadevice/daap/daapserver.h
@@ -25,7 +25,7 @@ class DaapServer : public TQObject
TQ_OBJECT
public:
- DaapServer(TQObject* tqparent, char* name);
+ DaapServer(TQObject* parent, char* name);
~DaapServer();
public slots:
void readSql();
diff --git a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c
index aca99fe4..cb18f16a 100644
--- a/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c
+++ b/amarok/src/mediadevice/daap/mongrel/http11/tst_delete.c
@@ -6,9 +6,9 @@
void *tst_delete(unsigned char *key, struct tst *tst)
{
struct node *current_node;
- struct node *current_node_tqparent;
+ struct node *current_node_parent;
struct node *last_branch;
- struct node *last_branch_tqparent;
+ struct node *last_branch_parent;
struct node *next_node;
struct node *last_branch_replacement;
struct node *last_branch_dangling_child;
@@ -21,9 +21,9 @@ void *tst_delete(unsigned char *key, struct tst *tst)
return NULL;
last_branch = NULL;
- last_branch_tqparent = NULL;
+ last_branch_parent = NULL;
current_node = tst->head[(int)key[0]];
- current_node_tqparent = NULL;
+ current_node_parent = NULL;
key_index = 1;
while(current_node != NULL)
{
@@ -33,13 +33,13 @@ void *tst_delete(unsigned char *key, struct tst *tst)
if( (current_node->left != NULL) || (current_node->right != NULL) )
{
last_branch = current_node;
- last_branch_tqparent = current_node_tqparent;
+ last_branch_parent = current_node_parent;
}
if(key[key_index] == 0)
break;
else
{
- current_node_tqparent = current_node;
+ current_node_parent = current_node;
current_node = current_node->middle;
key_index++;
continue;
@@ -49,16 +49,16 @@ void *tst_delete(unsigned char *key, struct tst *tst)
((current_node->value != 0) && (key[key_index] <
current_node->value)) )
{
- last_branch_tqparent = current_node;
- current_node_tqparent = current_node;
+ last_branch_parent = current_node;
+ current_node_parent = current_node;
current_node = current_node->left;
last_branch = current_node;
continue;
}
else
{
- last_branch_tqparent = current_node;
- current_node_tqparent = current_node;
+ last_branch_parent = current_node;
+ current_node_parent = current_node;
current_node = current_node->right;
last_branch = current_node;
continue;
@@ -77,10 +77,10 @@ void *tst_delete(unsigned char *key, struct tst *tst)
else if( (last_branch->left == NULL) && (last_branch->right == NULL) )
{
- if(last_branch_tqparent->left == last_branch)
- last_branch_tqparent->left = NULL;
+ if(last_branch_parent->left == last_branch)
+ last_branch_parent->left = NULL;
else
- last_branch_tqparent->right = NULL;
+ last_branch_parent->right = NULL;
next_node = last_branch;
}
@@ -103,16 +103,16 @@ void *tst_delete(unsigned char *key, struct tst *tst)
last_branch_dangling_child = NULL;
}
- if(last_branch_tqparent == NULL)
+ if(last_branch_parent == NULL)
tst->head[(int)key[0]]=last_branch_replacement;
else
{
- if (last_branch_tqparent->left == last_branch)
- last_branch_tqparent->left = last_branch_replacement;
- else if (last_branch_tqparent->right == last_branch)
- last_branch_tqparent->right = last_branch_replacement;
+ if (last_branch_parent->left == last_branch)
+ last_branch_parent->left = last_branch_replacement;
+ else if (last_branch_parent->right == last_branch)
+ last_branch_parent->right = last_branch_replacement;
else
- last_branch_tqparent->middle = last_branch_replacement;
+ last_branch_parent->middle = last_branch_replacement;
}
if(last_branch_dangling_child != NULL)
diff --git a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
index af6108af..cce1f36a 100644
--- a/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
+++ b/amarok/src/mediadevice/daap/mongrel/lib/mongrel/handlers.rb
@@ -164,7 +164,7 @@ module Mongrel
Dir.entries(dir).each do |child|
next if child == "."
out << "<a href=\"#{base}/#{ HttpRequest.escape(child)}\">"
- out << (child == ".." ? "Up to tqparent.." : child)
+ out << (child == ".." ? "Up to parent.." : child)
out << "</a><br/>"
end
out << "</body></html>"
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.cpp b/amarok/src/mediadevice/generic/genericmediadevice.cpp
index f0f32159..7a13253a 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.cpp
+++ b/amarok/src/mediadevice/generic/genericmediadevice.cpp
@@ -72,12 +72,12 @@ typedef TQPtrListIterator<GenericMediaFile> MediaFileListIterator;
class GenericMediaItem : public MediaItem
{
public:
- GenericMediaItem( TQListView *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after )
+ GenericMediaItem( TQListView *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after )
{ }
- GenericMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after )
+ GenericMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after )
{ }
// List directories first, always
@@ -108,22 +108,22 @@ class GenericMediaItem : public MediaItem
class GenericMediaFile
{
public:
- GenericMediaFile( GenericMediaFile *tqparent, TQString basename, GenericMediaDevice *device )
- : m_tqparent( tqparent )
+ GenericMediaFile( GenericMediaFile *parent, TQString basename, GenericMediaDevice *device )
+ : m_parent( parent )
, m_device( device )
{
m_listed = false;
m_tqchildren = new MediaFileList();
- if( m_tqparent )
+ if( m_parent )
{
- if( m_tqparent == m_device->getInitialFile() )
+ if( m_parent == m_device->getInitialFile() )
m_viewItem = new GenericMediaItem( m_device->view() );
else
- m_viewItem = new GenericMediaItem( m_tqparent->getViewItem() );
+ m_viewItem = new GenericMediaItem( m_parent->getViewItem() );
setNamesFromBase( basename );
m_viewItem->setText( 0, m_baseName );
- m_tqparent->getChildren()->append( this );
+ m_parent->getChildren()->append( this );
}
else
{
@@ -148,8 +148,8 @@ class GenericMediaFile
~GenericMediaFile()
{
- if( m_tqparent )
- m_tqparent->removeChild( this );
+ if( m_parent )
+ m_parent->removeChild( this );
m_device->getItemMap().erase( m_viewItem );
m_device->getFileMap().erase( m_fullName );
if ( m_tqchildren )
@@ -159,16 +159,16 @@ class GenericMediaFile
}
GenericMediaFile*
- getParent() { return m_tqparent; }
+ getParent() { return m_parent; }
void
- setParent( GenericMediaFile* tqparent )
+ setParent( GenericMediaFile* parent )
{
m_device->getFileMap().erase( m_fullName );
- m_tqparent->getChildren()->remove( this );
- m_tqparent = tqparent;
- if( m_tqparent )
- m_tqparent->getChildren()->append( this );
+ m_parent->getChildren()->remove( this );
+ m_parent = parent;
+ if( m_parent )
+ m_parent->getChildren()->append( this );
setNamesFromBase( m_baseName );
m_device->getFileMap()[m_fullName] = this;
}
@@ -200,8 +200,8 @@ class GenericMediaFile
{
if( name != TQString() )
m_baseName = name;
- if( m_tqparent )
- m_fullName = m_tqparent->getFullName() + '/' + m_baseName;
+ if( m_parent )
+ m_fullName = m_parent->getFullName() + '/' + m_baseName;
else
m_fullName = m_baseName;
if( m_viewItem )
@@ -243,7 +243,7 @@ class GenericMediaFile
private:
TQString m_fullName;
TQString m_baseName;
- GenericMediaFile *m_tqparent;
+ GenericMediaFile *m_parent;
MediaFileList *m_tqchildren;
GenericMediaItem *m_viewItem;
GenericMediaDevice* m_device;
@@ -314,9 +314,9 @@ GenericMediaDevice::GenericMediaDevice()
}
void
-GenericMediaDevice::init( MediaBrowser* tqparent )
+GenericMediaDevice::init( MediaBrowser* parent )
{
- MediaDevice::init( tqparent );
+ MediaDevice::init( parent );
}
GenericMediaDevice::~GenericMediaDevice()
@@ -476,7 +476,7 @@ GenericMediaDevice::newDirectory( const TQString &name, MediaItem *parent )
debug() << "Creating directory: " << fullPath << endl;
const KURL url( fullPath );
- if( !KIO::NetAccess::mkdir( url, m_tqparent ) ) //failed
+ if( !KIO::NetAccess::mkdir( url, m_parent ) ) //failed
{
debug() << "Failed to create directory " << fullPath << endl;
return 0;
@@ -516,7 +516,7 @@ GenericMediaDevice::addToDirectory( MediaItem *directory, TQPtrList<MediaItem> i
const KURL srcurl(src);
const KURL dsturl(dst);
- if ( !KIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_tqparent ) )
+ if ( !KIO::NetAccess::file_move( srcurl, dsturl, -1, false, false, m_parent ) )
debug() << "Failed moving " << src << " to " << dst << endl;
else
{
@@ -597,7 +597,7 @@ GenericMediaDevice::checkAndBuildLocation( const TQString& location )
TQString secondpart = cleanPath( location.section( '/', i, i ) );
KURL url = KURL::fromPathOrURL( firstpart + '/' + secondpart );
- if( !KIO::NetAccess::exists( url, false, m_tqparent ) )
+ if( !KIO::NetAccess::exists( url, false, m_parent ) )
{
debug() << "directory does not exist, creating..." << url << endl;
if( !KIO::NetAccess::mkdir(url, m_view ) ) //failed
@@ -614,21 +614,21 @@ GenericMediaDevice::buildPodcastDestination( const PodcastEpisodeBundle *bundle
{
TQString location = m_podcastLocation.endsWith("/") ? m_podcastLocation : m_podcastLocation + '/';
// get info about the PodcastChannel
- TQString parentUrl = bundle->tqparent().url();
- TQString sql = "SELECT title,tqparent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';";
+ TQString parentUrl = bundle->parent().url();
+ TQString sql = "SELECT title,parent FROM podcastchannels WHERE url='" + CollectionDB::instance()->escapeString( parentUrl ) + "';";
TQStringList values = CollectionDB::instance()->query( sql );
TQString channelTitle;
- int tqparent = 0;
+ int parent = 0;
channelTitle = values.first();
- tqparent = values.last().toInt();
+ parent = values.last().toInt();
// Put the file in a directory tree like in the playlistbrowser
- sql = "SELECT name,tqparent FROM podcastfolders WHERE id=%1;";
+ sql = "SELECT name,parent FROM podcastfolders WHERE id=%1;";
TQString name;
- while ( tqparent > 0 )
+ while ( parent > 0 )
{
- values = CollectionDB::instance()->query( sql.tqarg( tqparent ) );
+ values = CollectionDB::instance()->query( sql.tqarg( parent ) );
name = values.first();
- tqparent = values.last().toInt();
+ parent = values.last().toInt();
location += cleanPath( name ) + '/';
}
location += cleanPath( channelTitle ) + '/' + cleanPath( bundle->localUrl().filename() );
@@ -856,8 +856,8 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
TQString baseName = path.right( path.length() - index - 1 );
TQString parentName = path.left( index );
- GenericMediaFile* tqparent = m_mfm[parentName];
- GenericMediaFile* newItem = new GenericMediaFile( tqparent, baseName, this );
+ GenericMediaFile* parent = m_mfm[parentName];
+ GenericMediaFile* newItem = new GenericMediaFile( parent, baseName, this );
if( type == MediaItem::DIRECTORY ) //directory
newItem->getViewItem()->setType( MediaItem::DIRECTORY );
@@ -877,7 +877,7 @@ GenericMediaDevice::addTrackToList( int type, KURL url, int /*size*/ )
newItem->getViewItem()->setType( MediaItem::UNKNOWN );
}
- refreshDir( tqparent->getFullName() );
+ refreshDir( parent->getFullName() );
return 0;
}
@@ -889,7 +889,7 @@ GenericMediaDevice::getCapacity( KIO::filesize_t *total, KIO::filesize_t *availa
{
if( !m_connected || !KURL::fromPathOrURL( m_medium.mountPoint() ).isLocalFile() ) return false;
- KDiskFreeSp* kdf = new KDiskFreeSp( TQT_TQOBJECT(m_tqparent), "generic_kdf" );
+ KDiskFreeSp* kdf = new KDiskFreeSp( TQT_TQOBJECT(m_parent), "generic_kdf" );
kdf->readDF( m_medium.mountPoint() );
connect(kdf, TQT_SIGNAL(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )),
TQT_SLOT(foundMountPoint( const TQString &, unsigned long, unsigned long, unsigned long )));
@@ -983,7 +983,7 @@ GenericMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int
if( item->type() == MediaItem::DIRECTORY )
m_view->newDirectory( static_cast<MediaItem*>(item) );
else
- m_view->newDirectory( static_cast<MediaItem*>(item->tqparent()) );
+ m_view->newDirectory( static_cast<MediaItem*>(item->parent()) );
break;
case RENAME:
@@ -1072,15 +1072,15 @@ bool GenericMediaDevice::isPreferredFormat( const MetaBundle &bundle )
/// Configuration Dialog Extension
-void GenericMediaDevice::addConfigElements( TQWidget * tqparent )
+void GenericMediaDevice::addConfigElements( TQWidget * parent )
{
- m_configDialog = new GenericMediaDeviceConfigDialog( tqparent );
+ m_configDialog = new GenericMediaDeviceConfigDialog( parent );
m_configDialog->setDevice( this );
}
-void GenericMediaDevice::removeConfigElements( TQWidget * /* tqparent */ )
+void GenericMediaDevice::removeConfigElements( TQWidget * /* parent */ )
{
if( m_configDialog != 0 )
delete m_configDialog;
diff --git a/amarok/src/mediadevice/generic/genericmediadevice.h b/amarok/src/mediadevice/generic/genericmediadevice.h
index 9791b0ac..246fd92e 100644
--- a/amarok/src/mediadevice/generic/genericmediadevice.h
+++ b/amarok/src/mediadevice/generic/genericmediadevice.h
@@ -47,7 +47,7 @@ class GenericMediaDevice : public MediaDevice
public:
GenericMediaDevice();
- void init( MediaBrowser* tqparent );
+ void init( MediaBrowser* parent );
virtual ~GenericMediaDevice();
bool isConnected() { return m_connected; }
@@ -59,8 +59,8 @@ class GenericMediaDevice : public MediaDevice
bool isPreferredFormat( const MetaBundle &bundle );
bool needsManualConfig() { return false; }
- void addConfigElements( TQWidget * tqparent );
- void removeConfigElements( TQWidget * /* tqparent */);
+ void addConfigElements( TQWidget * parent );
+ void removeConfigElements( TQWidget * /* parent */);
void applyConfig();
void loadConfig();
@@ -75,7 +75,7 @@ class GenericMediaDevice : public MediaDevice
MediaItem *copyTrackToDevice( const MetaBundle& bundle );
int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack );
- MediaItem *newDirectory( const TQString &name, MediaItem *tqparent );
+ MediaItem *newDirectory( const TQString &name, MediaItem *parent );
void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items );
bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
index b8b3571e..f1df4e76 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.cpp
@@ -57,12 +57,12 @@ namespace Amarok {
class IfpMediaItem : public MediaItem
{
public:
- IfpMediaItem( TQListView *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after )
+ IfpMediaItem( TQListView *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after )
{}
- IfpMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after )
+ IfpMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after )
{}
void
@@ -127,9 +127,9 @@ IfpMediaDevice::IfpMediaDevice()
}
void
-IfpMediaDevice::init( MediaBrowser* tqparent )
+IfpMediaDevice::init( MediaBrowser* parent )
{
- MediaDevice::init( tqparent );
+ MediaDevice::init( parent );
}
IfpMediaDevice::~IfpMediaDevice()
@@ -278,32 +278,32 @@ IfpMediaDevice::renameItem( TQListViewItem *item ) // SLOT
/// Creating a directory
MediaItem *
-IfpMediaDevice::newDirectory( const TQString &name, MediaItem *tqparent )
+IfpMediaDevice::newDirectory( const TQString &name, MediaItem *parent )
{
if( !m_connected || name.isEmpty() ) return 0;
TQString cleanedName = cleanPath( name );
- const TQCString dirPath = TQFile::encodeName( getFullPath( tqparent ) + "\\" + cleanedName );
+ const TQCString dirPath = TQFile::encodeName( getFullPath( parent ) + "\\" + cleanedName );
debug() << "Creating directory: " << dirPath << endl;
int err = ifp_mkdir( &m_ifpdev, dirPath );
if( err ) //failed
return 0;
- m_tmpParent = tqparent;
+ m_tmpParent = parent;
addTrackToList( IFP_DIR, cleanedName );
return m_last;
}
MediaItem *
-IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *tqparent )
+IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *parent )
{
TQStringList folders = TQStringList::split( '\\', name );
TQString progress = "";
- if( tqparent )
- progress += getFullPath( tqparent ) + "\\";
+ if( parent )
+ progress += getFullPath( parent ) + "\\";
else
progress += "\\";
@@ -315,32 +315,32 @@ IfpMediaDevice::newDirectoryRecursive( const TQString &name, MediaItem *tqparent
if( ifp_exists( &m_ifpdev, dirPath ) == IFP_DIR )
{
- m_tmpParent = tqparent;
- tqparent = findChildItem( *it, tqparent );
- if( !tqparent )
+ m_tmpParent = parent;
+ parent = findChildItem( *it, parent );
+ if( !parent )
{
addTrackToList( IFP_DIR, *it );
- tqparent = m_last;
+ parent = m_last;
}
}
else
{
- tqparent = newDirectory( *it, tqparent );
- if( !tqparent ) //failed
+ parent = newDirectory( *it, parent );
+ if( !parent ) //failed
return 0;
}
progress += "\\";
}
- return tqparent;
+ return parent;
}
MediaItem *
-IfpMediaDevice::findChildItem( const TQString &name, MediaItem *tqparent )
+IfpMediaDevice::findChildItem( const TQString &name, MediaItem *parent )
{
TQListViewItem *child;
- tqparent ?
- child = tqparent->firstChild():
+ parent ?
+ child = parent->firstChild():
child = m_view->firstChild();
while( child )
@@ -628,12 +628,12 @@ IfpMediaDevice::getFullPath( const TQListViewItem *item, const bool getFilename
if( getFilename ) path = item->text(0);
- TQListViewItem *tqparent = item->tqparent();
- while( tqparent )
+ TQListViewItem *parent = item->parent();
+ while( parent )
{
path.prepend( "\\" );
- path.prepend( tqparent->text(0) );
- tqparent = tqparent->tqparent();
+ path.prepend( parent->text(0) );
+ parent = parent->parent();
}
path.prepend( "\\" );
@@ -667,7 +667,7 @@ IfpMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
if( item->type() == MediaItem::DIRECTORY )
m_view->newDirectory( static_cast<MediaItem*>(item) );
else
- m_view->newDirectory( static_cast<MediaItem*>(item->tqparent()) );
+ m_view->newDirectory( static_cast<MediaItem*>(item->parent()) );
break;
case RENAME:
diff --git a/amarok/src/mediadevice/ifp/ifpmediadevice.h b/amarok/src/mediadevice/ifp/ifpmediadevice.h
index 8aa6b66c..9dcffbe6 100644
--- a/amarok/src/mediadevice/ifp/ifpmediadevice.h
+++ b/amarok/src/mediadevice/ifp/ifpmediadevice.h
@@ -38,7 +38,7 @@ class IfpMediaDevice : public MediaDevice
public:
IfpMediaDevice();
- void init( MediaBrowser* tqparent );
+ void init( MediaBrowser* parent );
virtual ~IfpMediaDevice();
bool isConnected() { return m_connected; }
@@ -58,7 +58,7 @@ class IfpMediaDevice : public MediaDevice
MediaItem *copyTrackToDevice( const MetaBundle& bundle);
int deleteItemFromDevice( MediaItem *item, int flags=DeleteTrack );
bool getCapacity( KIO::filesize_t *total, KIO::filesize_t *available );
- MediaItem *newDirectory( const TQString &name, MediaItem *tqparent );
+ MediaItem *newDirectory( const TQString &name, MediaItem *parent );
void addToDirectory( MediaItem *directory, TQPtrList<MediaItem> items );
protected slots:
@@ -74,7 +74,7 @@ class IfpMediaDevice : public MediaDevice
bool checkResult( int result, TQString message );
// file transfer
- MediaItem *newDirectoryRecursive( const TQString &name, MediaItem *tqparent );
+ MediaItem *newDirectoryRecursive( const TQString &name, MediaItem *parent );
int uploadTrack( const TQCString& src, const TQCString& dest );
void downloadSelectedItems();
int downloadTrack( const TQCString& src, const TQCString& dest );
@@ -88,11 +88,11 @@ class IfpMediaDevice : public MediaDevice
static int filetransferCallback( void *pData, struct ifp_transfer_status *progress );
int setProgressInfo( struct ifp_transfer_status *progress );
// 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
+ // getFilename = false will return only parent structure, as opposed to returning the filename as well
TQString getFullPath( const TQListViewItem *item, const bool getFilename = true );
TQString cleanPath( const TQString &component );
- MediaItem *findChildItem( const TQString &name, MediaItem *tqparent );
+ MediaItem *findChildItem( const TQString &name, MediaItem *parent );
// IFP device
struct usb_device *m_dev;
@@ -102,7 +102,7 @@ class IfpMediaDevice : public MediaDevice
bool m_connected;
IfpMediaItem *m_last;
- //used to specify new IfpMediaItem tqparent. Make sure it is restored to 0 (m_listview)
+ //used to specify new IfpMediaItem parent. Make sure it is restored to 0 (m_listview)
TQListViewItem *m_tmpParent;
TransferDialog *m_td;
};
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
index c0830531..2dd6e8c5 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.cpp
@@ -107,17 +107,17 @@ class TrackList : public TQPtrList<Itdb_Track>
class IpodMediaItem : public MediaItem
{
public:
- IpodMediaItem( TQListView *tqparent, MediaDevice *dev )
- : MediaItem( tqparent ) { init( dev ); }
+ IpodMediaItem( TQListView *parent, MediaDevice *dev )
+ : MediaItem( parent ) { init( dev ); }
- IpodMediaItem( TQListViewItem *tqparent, MediaDevice *dev )
- : MediaItem( tqparent ) { init( dev ); }
+ IpodMediaItem( TQListViewItem *parent, MediaDevice *dev )
+ : MediaItem( parent ) { init( dev ); }
- IpodMediaItem( TQListView *tqparent, TQListViewItem *after, MediaDevice *dev )
- : MediaItem( tqparent, after ) { init( dev ); }
+ IpodMediaItem( TQListView *parent, TQListViewItem *after, MediaDevice *dev )
+ : MediaItem( parent, after ) { init( dev ); }
- IpodMediaItem( TQListViewItem *tqparent, TQListViewItem *after, MediaDevice *dev )
- : MediaItem( tqparent, after ) { init( dev ); }
+ IpodMediaItem( TQListViewItem *parent, TQListViewItem *after, MediaDevice *dev )
+ : MediaItem( parent, after ) { init( dev ); }
virtual ~IpodMediaItem() { delete m_podcastInfo; }
@@ -410,9 +410,9 @@ IpodMediaDevice::slotIpodAction( int id )
}
void
-IpodMediaDevice::init( MediaBrowser* tqparent )
+IpodMediaDevice::init( MediaBrowser* parent )
{
- MediaDevice::init( tqparent );
+ MediaDevice::init( parent );
}
IpodMediaDevice::~IpodMediaDevice()
@@ -594,7 +594,7 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname,
if( metaBundle.podcastBundle() )
{
PodcastChannelBundle pcb;
- if( CollectionDB::instance()->getPodcastChannelBundle( metaBundle.podcastBundle()->tqparent(), &pcb ) )
+ if( CollectionDB::instance()->getPodcastChannelBundle( metaBundle.podcastBundle()->parent(), &pcb ) )
image = CollectionDB::instance()->podcastImage( pcb.imageURL().url(), 0 );
}
if( image.isEmpty() )
@@ -608,14 +608,14 @@ IpodMediaDevice::updateTrackInDB( IpodMediaItem *item, const TQString &pathname,
if( item )
{
- MediaItem *tqparent = dynamic_cast<MediaItem *>(item->tqparent());
- if( tqparent )
+ MediaItem *parent = dynamic_cast<MediaItem *>(item->parent());
+ if( parent )
{
- tqparent->takeItem( item );
- if( tqparent->childCount() == 0 && !isSpecialItem( tqparent ) )
+ parent->takeItem( item );
+ if( parent->childCount() == 0 && !isSpecialItem( parent ) )
{
- MediaItem *pp = dynamic_cast<MediaItem *>(tqparent->tqparent());
- delete tqparent;
+ MediaItem *pp = dynamic_cast<MediaItem *>(parent->parent());
+ delete parent;
if( pp && pp->childCount() == 0 && !isSpecialItem( pp ) )
delete pp;
}
@@ -702,7 +702,7 @@ IpodMediaDevice::copyTrackToDevice(const MetaBundle &bundle)
podcastInfo->url = peb->url().url();
podcastInfo->description = peb->description();
podcastInfo->author = peb->author();
- podcastInfo->rss = peb->tqparent().url();
+ podcastInfo->rss = peb->parent().url();
podcastInfo->date = peb->dateTime();
podcastInfo->listened = !peb->isNew();
}
@@ -747,10 +747,10 @@ IpodMediaDevice::trackExists( const MetaBundle& bundle )
}
MediaItem *
-IpodMediaDevice::newPlaylist(const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items)
+IpodMediaDevice::newPlaylist(const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items)
{
m_dbChanged = true;
- IpodMediaItem *item = new IpodMediaItem(tqparent, this);
+ IpodMediaItem *item = new IpodMediaItem(parent, this);
item->setType(MediaItem::PLAYLIST);
item->setText(0, name);
@@ -801,7 +801,7 @@ IpodMediaDevice::addToPlaylist(MediaItem *mlist, MediaItem *after, TQPtrList<Med
continue;
IpodMediaItem *add;
- if(it->tqparent() == list)
+ if(it->parent() == list)
{
add = it;
if(after)
@@ -998,7 +998,7 @@ IpodMediaDevice::createLockFile( bool silent )
if( !silent )
{
- if( KMessageBox::warningContinueCancel( m_tqparent, msg, i18n( "Remove iTunes Lock File?" ),
+ if( KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Remove iTunes Lock File?" ),
KGuiItem(i18n("&Remove"), "editdelete"), TQString(), KMessageBox::Dangerous )
== KMessageBox::Continue )
{
@@ -1188,7 +1188,7 @@ IpodMediaDevice::openDevice( bool silent )
"Should I try to initialize your iPod?" ).tqarg( mountPoint() );
if( !silent
- && KMessageBox::warningContinueCancel( m_tqparent, msg, i18n( "Initialize iPod?" ),
+ && KMessageBox::warningContinueCancel( m_parent, msg, i18n( "Initialize iPod?" ),
KGuiItem(i18n("&Initialize"), "new") ) == KMessageBox::Continue )
{
if( !initializeIpod() )
@@ -1260,7 +1260,7 @@ IpodMediaDevice::openDevice( bool silent )
for( cur = m_itdb->tracks; cur; cur = cur->next )
{
Itdb_Track *track = (Itdb_Track *)cur->data;
- addTrackToView( track, 0 /*tqparent*/, false /*checkintegrity*/, true /*batchmode*/ );
+ addTrackToView( track, 0 /*parent*/, false /*checkintegrity*/, true /*batchmode*/ );
}
if( !silent )
@@ -1854,8 +1854,8 @@ IpodMediaDevice::ipodPath(const TQString &realPath)
class IpodWriteDBJob : public ThreadManager::DependentJob
{
public:
- IpodWriteDBJob( TQObject *tqparent, Itdb_iTunesDB *itdb, bool isShuffle, bool *resultPtr )
- : ThreadManager::DependentJob( tqparent, "IpodWriteDBJob" )
+ IpodWriteDBJob( TQObject *parent, Itdb_iTunesDB *itdb, bool isShuffle, bool *resultPtr )
+ : ThreadManager::DependentJob( parent, "IpodWriteDBJob" )
, m_itdb( itdb )
, m_isShuffle( isShuffle )
, m_resultPtr( resultPtr )
@@ -2285,7 +2285,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
{
IpodMediaItem *it = static_cast<IpodMediaItem *>(item);
menu.insertItem( SmallIconSet( Amarok::icon( "podcast" ) ), i18n( "Subscribe to This Podcast" ), SUBSCRIBE );
- //menu.setItemEnabled( SUBSCRIBE, item->bundle()->podcastBundle() && item->bundle()->podcastBundle()->tqparent().isValid() );
+ //menu.setItemEnabled( SUBSCRIBE, item->bundle()->podcastBundle() && item->bundle()->podcastBundle()->parent().isValid() );
menu.setItemEnabled( SUBSCRIBE, it->m_podcastInfo && !it->m_podcastInfo->rss.isEmpty() );
menu.insertSeparator();
}
@@ -2492,7 +2492,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
continue;
}
- i->tqparent()->takeItem(i);
+ i->parent()->takeItem(i);
insertTrackIntoDB(i->url().path(), *i->bundle(), *i->bundle(), 0);
delete i;
}
@@ -2508,7 +2508,7 @@ IpodMediaDevice::rmbPressed( TQListViewItem* qitem, const TQPoint& point, int )
{
MediaItem *podcasts = 0;
if(item->type() == MediaItem::PODCASTCHANNEL)
- podcasts = dynamic_cast<MediaItem *>(item->tqparent());
+ podcasts = dynamic_cast<MediaItem *>(item->parent());
else
podcasts = item;
deleteFromDevice( podcasts, true );
@@ -2590,21 +2590,21 @@ IpodMediaDevice::supportedFiletypes()
}
void
-IpodMediaDevice::addConfigElements( TQWidget *tqparent )
+IpodMediaDevice::addConfigElements( TQWidget *parent )
{
- m_autoDeletePodcastsCheck = new TQCheckBox( tqparent );
+ m_autoDeletePodcastsCheck = new TQCheckBox( parent );
m_autoDeletePodcastsCheck->setText( i18n( "&Automatically delete podcasts" ) );
TQToolTip::add( m_autoDeletePodcastsCheck, i18n( "Automatically delete podcast shows already played when connecting device" ) );
m_autoDeletePodcastsCheck->setChecked( m_autoDeletePodcasts );
- m_syncStatsCheck = new TQCheckBox( tqparent );
+ m_syncStatsCheck = new TQCheckBox( parent );
m_syncStatsCheck->setText( i18n( "&Synchronize with Amarok statistics" ) );
TQToolTip::add( m_syncStatsCheck, i18n( "Synchronize with Amarok statistics and submit tracks played to last.fm" ) );
m_syncStatsCheck->setChecked( m_syncStats );
}
void
-IpodMediaDevice::removeConfigElements( TQWidget * /*tqparent*/ )
+IpodMediaDevice::removeConfigElements( TQWidget * /*parent*/ )
{
delete m_syncStatsCheck;
m_syncStatsCheck = 0;
@@ -2680,7 +2680,7 @@ IpodMediaDevice::fileDeleted( KIO::Job *job ) //SLOT
debug() << "file deletion failed: " << job->errorText() << endl;
}
m_waitForDeletion = false;
- m_tqparent->updateStats();
+ m_parent->updateStats();
}
void
diff --git a/amarok/src/mediadevice/ipod/ipodmediadevice.h b/amarok/src/mediadevice/ipod/ipodmediadevice.h
index 8fbebc32..022cb24c 100644
--- a/amarok/src/mediadevice/ipod/ipodmediadevice.h
+++ b/amarok/src/mediadevice/ipod/ipodmediadevice.h
@@ -56,7 +56,7 @@ class IpodMediaDevice : public MediaDevice
public:
IpodMediaDevice();
- void init( MediaBrowser* tqparent );
+ void init( MediaBrowser* parent );
virtual ~IpodMediaDevice();
virtual bool autoConnect() { return m_autoConnect; }
virtual bool asynchronousTransfer() { return false; /* kernel buffer flushes freeze Amarok */ }
@@ -64,8 +64,8 @@ class IpodMediaDevice : public MediaDevice
bool isConnected();
- virtual void addConfigElements( TQWidget *tqparent );
- virtual void removeConfigElements( TQWidget *tqparent );
+ virtual void addConfigElements( TQWidget *parent );
+ virtual void removeConfigElements( TQWidget *parent );
virtual void applyConfig();
virtual void loadConfig();
virtual MediaItem*tagsChanged( MediaItem *item, const MetaBundle &bundle );
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
index cd0f68b8..97952ce4 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.cpp
@@ -112,9 +112,9 @@ MtpMediaDevice::MtpMediaDevice() : MediaDevice()
}
void
-MtpMediaDevice::init( MediaBrowser *tqparent )
+MtpMediaDevice::init( MediaBrowser *parent )
{
- MediaDevice::init( tqparent );
+ MediaDevice::init( parent );
}
bool
@@ -279,10 +279,10 @@ MediaItem
parent_id = checkFolderStructure( bundle );
if( parent_id == 0 )
{
- debug() << "Couldn't create new tqparent (" << m_folderStructure << ")" << endl;
+ debug() << "Couldn't create new parent (" << m_folderStructure << ")" << endl;
Amarok::StatusBar::instance()->shortLongMessage(
genericError,
- i18n( "Cannot create tqparent folder. Check your structure." ),
+ i18n( "Cannot create parent folder. Check your structure." ),
KDE::StatusBar::Error
);
return 0;
@@ -387,7 +387,7 @@ MtpMediaDevice::getDefaultParentId( void )
debug() << "Parent folder could not be found. Going to use top level." << endl;
}
}
- // Give up and don't set a tqparent folder, let the device deal with it
+ // Give up and don't set a parent folder, let the device deal with it
else
{
debug() << "No folders found. Going to use top level." << endl;
@@ -543,7 +543,7 @@ LIBMTP_album_t
/**
* Check (and optionally create) the folder structure to put a
- * track into. Return the (possibly new) tqparent folder ID
+ * track into. Return the (possibly new) parent folder ID
*/
uint32_t
MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create )
@@ -592,12 +592,12 @@ MtpMediaDevice::checkFolderStructure( const MetaBundle &bundle, bool create )
}
}
completePath += (*it).utf8() + '/';
- // set new tqparent
+ // set new parent
parent_id = check_folder;
}
m_critical_mutex.unlock();
debug() << "Folder path : " << completePath << endl;
- // return tqparent
+ // return parent
return parent_id;
}
@@ -624,7 +624,7 @@ MtpMediaDevice::createFolder( const char *name, uint32_t parent_id )
/**
* Recursively search the folder list for a matching one under the specified
- * tqparent ID and return the child's ID
+ * parent ID and return the child's ID
*/
uint32_t
MtpMediaDevice::subfolderNameToID( const char *name, LIBMTP_folder_t *folderlist, uint32_t parent_id )
@@ -766,10 +766,10 @@ MediaItem
* Create a new playlist
*/
MtpMediaItem
-*MtpMediaDevice::newPlaylist( const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items )
+*MtpMediaDevice::newPlaylist( const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items )
{
DEBUG_BLOCK
- MtpMediaItem *item = new MtpMediaItem( tqparent, this );
+ MtpMediaItem *item = new MtpMediaItem( parent, this );
item->setType( MediaItem::PLAYLIST );
item->setText( 0, name );
item->setPlaylist( new MtpPlaylist() );
@@ -819,7 +819,7 @@ MtpMediaDevice::addToPlaylist( MediaItem *mlist, MediaItem *after, TQPtrList<Med
continue;
MtpMediaItem *add;
- if( it->tqparent() == list )
+ if( it->parent() == list )
{
add = it;
if( after )
@@ -980,10 +980,10 @@ MtpMediaDevice::deleteItemFromDevice(MediaItem* item, int flags )
break;
if( item )
{
- MtpMediaItem *tqparent = dynamic_cast<MtpMediaItem *> ( item->tqparent() );
- if( tqparent && tqparent->type() == MediaItem::PLAYLIST ) {
+ MtpMediaItem *parent = dynamic_cast<MtpMediaItem *> ( item->parent() );
+ if( parent && parent->type() == MediaItem::PLAYLIST ) {
delete( item );
- playlistFromItem( tqparent );
+ playlistFromItem( parent );
}
}
break;
@@ -1121,7 +1121,7 @@ MtpMediaDevice::openDevice( bool silent )
m_name += " (" + ownername + ')';
m_default_parent_folder = m_device->default_music_folder;
- debug() << "setting default tqparent : " << m_default_parent_folder << endl;
+ debug() << "setting default parent : " << m_default_parent_folder << endl;
MtpMediaDevice::readMtpMusic();
@@ -1341,7 +1341,7 @@ MtpMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, int )
if( items->count() > 100 )
{
- int button = KMessageBox::warningContinueCancel( m_tqparent,
+ int button = KMessageBox::warningContinueCancel( m_parent,
i18n( "<p>You are updating cover art for 1 track. This may take some time.",
"<p>You are updating cover art for %n tracks. This may take some time.",
items->count()
@@ -1363,13 +1363,13 @@ MtpMediaDevice::rmbPressed( TQListViewItem *qitem, const TQPoint &point, int )
* Add gui elements to the device configuration
*/
void
-MtpMediaDevice::addConfigElements( TQWidget *tqparent )
+MtpMediaDevice::addConfigElements( TQWidget *parent )
{
- m_folderLabel = new TQLabel( tqparent );
+ m_folderLabel = new TQLabel( parent );
m_folderLabel->setText( i18n( "Folder structure:" ) );
- m_folderStructureBox = new TQLineEdit( tqparent );
+ m_folderStructureBox = new TQLineEdit( parent );
m_folderStructureBox->setText( m_folderStructure );
TQToolTip::add( m_folderStructureBox,
i18n( "Files copied to the device will be placed in this folder." ) + '\n'
@@ -1384,9 +1384,9 @@ MtpMediaDevice::addConfigElements( TQWidget *tqparent )
* Remove gui elements from the device configuration
*/
void
-MtpMediaDevice::removeConfigElements( TQWidget *tqparent)
+MtpMediaDevice::removeConfigElements( TQWidget *parent)
{
- Q_UNUSED(tqparent)
+ Q_UNUSED(parent)
delete m_folderStructureBox;
m_folderStructureBox = 0;
diff --git a/amarok/src/mediadevice/mtp/mtpmediadevice.h b/amarok/src/mediadevice/mtp/mtpmediadevice.h
index e8a595a6..1cf4210d 100644
--- a/amarok/src/mediadevice/mtp/mtpmediadevice.h
+++ b/amarok/src/mediadevice/mtp/mtpmediadevice.h
@@ -91,14 +91,14 @@ class MtpAlbum {
class MtpMediaItem : public MediaItem
{
public:
- MtpMediaItem( TQListView *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after ) {}
- MtpMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 )
- : MediaItem( tqparent, after ) {}
- MtpMediaItem( TQListView *tqparent, MediaDevice *dev )
- : MediaItem( tqparent ) { init( dev ); }
- MtpMediaItem( TQListViewItem *tqparent, MediaDevice *dev )
- : MediaItem( tqparent ) { init( dev ); }
+ MtpMediaItem( TQListView *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after ) {}
+ MtpMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 )
+ : MediaItem( parent, after ) {}
+ MtpMediaItem( TQListView *parent, MediaDevice *dev )
+ : MediaItem( parent ) { init( dev ); }
+ MtpMediaItem( TQListViewItem *parent, MediaDevice *dev )
+ : MediaItem( parent ) { init( dev ); }
void init( MediaDevice *dev )
{
@@ -135,13 +135,13 @@ class MtpMediaDevice : public MediaDevice
LIBMTP_mtpdevice_t *current_device();
void setDisconnected();
virtual void rmbPressed( TQListViewItem *qitem, const TQPoint &point, int arg1 );
- virtual void init( MediaBrowser* tqparent );
+ virtual void init( MediaBrowser* parent );
virtual TQStringList supportedFiletypes();
void setFolders( LIBMTP_folder_t *folders );
void cancelTransfer();
void customClicked();
- virtual void addConfigElements( TQWidget *tqparent );
- virtual void removeConfigElements( TQWidget *tqparent );
+ virtual void addConfigElements( TQWidget *parent );
+ virtual void removeConfigElements( TQWidget *parent );
virtual void applyConfig();
virtual void loadConfig();
static int progressCallback( uint64_t const sent, uint64_t const total, void const * const data );
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.cpp b/amarok/src/mediadevice/njb/njbmediadevice.cpp
index 542e2313..ea07df5f 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.cpp
+++ b/amarok/src/mediadevice/njb/njbmediadevice.cpp
@@ -359,7 +359,7 @@ NjbMediaDevice::downloadSelectedItems()
path = destDir.path();
if( it->type() == MediaItem::TRACK )
{
- dynamic_cast<MediaBrowser *>( tqparent() )->queue()->addURL(path, dynamic_cast<MediaItem *>(it) );
+ dynamic_cast<MediaBrowser *>( parent() )->queue()->addURL(path, dynamic_cast<MediaItem *>(it) );
}
}
@@ -510,12 +510,12 @@ NjbMediaDevice::copyTrackFromDevice( MediaItem *item )
}
MediaItem*
-NjbMediaDevice::newPlaylist(const TQString& name, MediaItem* tqparent, TQPtrList< MediaItem > items)
+NjbMediaDevice::newPlaylist(const TQString& name, MediaItem* parent, TQPtrList< MediaItem > items)
{
DEBUG_BLOCK
- Q_UNUSED(tqparent);
- //MediaItem* newplaylist = new MediaItem(tqparent);
+ Q_UNUSED(parent);
+ //MediaItem* newplaylist = new MediaItem(parent);
NjbPlaylist playlist;
int status = playlist.setName( name );
@@ -594,9 +594,9 @@ NjbMediaDevice::cancelTransfer()
}
void
-NjbMediaDevice::init(MediaBrowser* tqparent)
+NjbMediaDevice::init(MediaBrowser* parent)
{
- MediaDevice::init(tqparent);
+ MediaDevice::init(parent);
}
void
diff --git a/amarok/src/mediadevice/njb/njbmediadevice.h b/amarok/src/mediadevice/njb/njbmediadevice.h
index bcf29d09..5d81178d 100644
--- a/amarok/src/mediadevice/njb/njbmediadevice.h
+++ b/amarok/src/mediadevice/njb/njbmediadevice.h
@@ -64,10 +64,10 @@ extern trackValueList* theTracks;
class NjbMediaItem : public MediaItem
{
public:
- NjbMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after )
+ NjbMediaItem( TQListView *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after )
{}
- NjbMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after )
+ NjbMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after )
{}
~NjbMediaItem()
@@ -98,7 +98,7 @@ class NjbMediaDevice : public MediaDevice
// virtual bool needsManualConfig();
- virtual MediaItem* newPlaylist(const TQString& name, MediaItem* tqparent, TQPtrList< MediaItem > items);
+ virtual MediaItem* newPlaylist(const TQString& name, MediaItem* parent, TQPtrList< MediaItem > items);
// virtual MediaItem* tagsChanged(MediaItem* item, const MetaBundle& changed);
@@ -110,7 +110,7 @@ class NjbMediaDevice : public MediaDevice
virtual void addToDirectory(MediaItem* directory, TQPtrList< MediaItem > items) { Q_UNUSED(directory) Q_UNUSED(items) }
virtual void addToPlaylist(MediaItem* playlist, MediaItem* after, TQPtrList< MediaItem > items);
virtual void applyConfig();
- virtual void init(MediaBrowser* tqparent);
+ virtual void init(MediaBrowser* parent);
virtual void loadConfig();
virtual void removeConfigElements(TQWidget* arg1);
virtual void rmbPressed(TQListViewItem* qitem, const TQPoint& point, int arg1);
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
index 954053cf..7dc83c33 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.cpp
@@ -60,9 +60,9 @@ RioKarmaMediaDevice::RioKarmaMediaDevice() : MediaDevice()
}
void
-RioKarmaMediaDevice::init( MediaBrowser *tqparent )
+RioKarmaMediaDevice::init( MediaBrowser *parent )
{
- MediaDevice::init( tqparent );
+ MediaDevice::init( parent );
}
bool
@@ -165,10 +165,10 @@ MediaItem
* @note Playlists not implemented yet... :-)
*/
RioKarmaMediaItem
-*RioKarmaMediaDevice::newPlaylist( const TQString &name, MediaItem *tqparent, TQPtrList<MediaItem> items )
+*RioKarmaMediaDevice::newPlaylist( const TQString &name, MediaItem *parent, TQPtrList<MediaItem> items )
{
Q_UNUSED( name );
- Q_UNUSED( tqparent );
+ Q_UNUSED( parent );
Q_UNUSED( items );
return 0;
}
diff --git a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
index 0cbf61bd..54d0dfec 100644
--- a/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
+++ b/amarok/src/mediadevice/riokarma/riokarmamediadevice.h
@@ -55,9 +55,9 @@ class RioKarmaTrack {
class RioKarmaMediaItem : public MediaItem
{
public:
- RioKarmaMediaItem( TQListView *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after )
+ RioKarmaMediaItem( TQListView *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after )
{}
- RioKarmaMediaItem( TQListViewItem *tqparent, TQListViewItem *after = 0 ) : MediaItem( tqparent, after )
+ RioKarmaMediaItem( TQListViewItem *parent, TQListViewItem *after = 0 ) : MediaItem( parent, after )
{}
~RioKarmaMediaItem()
{
@@ -83,7 +83,7 @@ class RioKarmaMediaDevice : public MediaDevice
int current_id();
void setDisconnected();
virtual void rmbPressed( TQListViewItem *qitem, const TQPoint &point, int arg1 );
- virtual void init( MediaBrowser *tqparent );
+ virtual void init( MediaBrowser *parent );
virtual TQStringList supportedFiletypes();
protected:
diff --git a/amarok/src/mediumpluginmanager.cpp b/amarok/src/mediumpluginmanager.cpp
index efd00d12..d2f3ba1a 100644
--- a/amarok/src/mediumpluginmanager.cpp
+++ b/amarok/src/mediumpluginmanager.cpp
@@ -376,8 +376,8 @@ ManualDeviceAdder::getMedium( bool recreate )
return m_newMed;
}
-MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics, TQWidget *tqparent, const char *name )
-: TQHBox( tqparent, name )
+MediaDeviceConfig::MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics, TQWidget *parent, const char *name )
+: TQHBox( parent, name )
, m_manager( mgr )
, m_medium( medium )
, m_configButton( 0 )
diff --git a/amarok/src/mediumpluginmanager.h b/amarok/src/mediumpluginmanager.h
index 3a0a5bcd..4e1461d8 100644
--- a/amarok/src/mediumpluginmanager.h
+++ b/amarok/src/mediumpluginmanager.h
@@ -47,7 +47,7 @@ class MediaDeviceConfig : public TQHBox
TQ_OBJECT
public:
- MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics=false, TQWidget *tqparent=0, const char *name=0 );
+ MediaDeviceConfig( Medium *medium, MediumPluginManager *mgr, const bool nographics=false, TQWidget *parent=0, const char *name=0 );
~MediaDeviceConfig();
TQString oldPlugin();
void setOldPlugin( const TQString &oldPlugin );
diff --git a/amarok/src/metabundle.cpp b/amarok/src/metabundle.cpp
index 59b9fde4..be64494b 100644
--- a/amarok/src/metabundle.cpp
+++ b/amarok/src/metabundle.cpp
@@ -728,7 +728,7 @@ void MetaBundle::copyFrom( const PodcastEpisodeBundle &peb )
setTitle( peb.title() );
setArtist( peb.author() );
PodcastChannelBundle pcb;
- if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent(), &pcb ) )
+ if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent(), &pcb ) )
{
if( !pcb.title().isEmpty() )
setAlbum( pcb.title() );
@@ -1871,7 +1871,7 @@ void PodcastEpisodeBundle::detach()
{
m_url = Amarok::detachedKURL( m_url );
m_localUrl = Amarok::detachedKURL( m_localUrl );
- m_tqparent = Amarok::detachedKURL( m_tqparent );
+ m_parent = Amarok::detachedKURL( m_parent );
m_author = TQDeepCopy<TQString>(m_author);
m_title = TQDeepCopy<TQString>(m_title);
diff --git a/amarok/src/metadata/m4a/mp4propsproxy.h b/amarok/src/metadata/m4a/mp4propsproxy.h
index c6b6f9df..0ea29e2b 100644
--- a/amarok/src/metadata/m4a/mp4propsproxy.h
+++ b/amarok/src/metadata/m4a/mp4propsproxy.h
@@ -29,7 +29,7 @@ namespace TagLib
namespace MP4
{
//! Mp4PropsProxy is used to access the stsd box and mvhd box directly
- /*! this class works as a shortcut to avoid stepping through all tqparent boxes
+ /*! this class works as a shortcut to avoid stepping through all parent boxes
* to access the boxes in question
*/
class Mp4PropsProxy
diff --git a/amarok/src/moodbar.cpp b/amarok/src/moodbar.cpp
index 2cbdce5f..ac1d51f0 100644
--- a/amarok/src/moodbar.cpp
+++ b/amarok/src/moodbar.cpp
@@ -142,7 +142,7 @@
// dataExists() or load() is called. Note that load()
// will return immediately unless the state is Unloaded.
// CantLoad: For some reason we know that we'll never be able to
-// load the Moodbar, for instance if the tqparent bundle
+// load the Moodbar, for instance if the parent bundle
// describes a streaming source. Most methods will return
// immediately in this state.
// JobQueued: At some point load() was called, so we queued a job with
@@ -163,7 +163,7 @@
// aren't displayed in the GUI.
//
// Important members:
-// m_bundle: link to the tqparent bundle
+// m_bundle: link to the parent bundle
// m_data: if we are loaded, this is the contents of the .mood file
// m_pixmap: the last time draw() was called, we cached what we drew
// here
diff --git a/amarok/src/moodbar.h b/amarok/src/moodbar.h
index 4ae13cfb..c71495b8 100644
--- a/amarok/src/moodbar.h
+++ b/amarok/src/moodbar.h
@@ -96,7 +96,7 @@ signals:
private:
// Undefined! We can't construct unless we know what
- // *our* tqparent bundle is.
+ // *our* parent bundle is.
Moodbar( const Moodbar& );
bool readFile( void );
diff --git a/amarok/src/multitabbar.cpp b/amarok/src/multitabbar.cpp
index fb450f33..b11b3a67 100644
--- a/amarok/src/multitabbar.cpp
+++ b/amarok/src/multitabbar.cpp
@@ -66,7 +66,7 @@ class MultiTabBarButtonPrivate
};
-MultiTabBarInternal::MultiTabBarInternal( TQWidget *tqparent, MultiTabBar::MultiTabBarMode bm ) : TQScrollView( tqparent )
+MultiTabBarInternal::MultiTabBarInternal( TQWidget *parent, MultiTabBar::MultiTabBarMode bm ) : TQScrollView( parent )
{
m_expandedTabSize = -1;
m_showActiveTabTexts = false;
@@ -508,8 +508,8 @@ uint MultiTabBarInternal::sizePerTab()
MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text, TQPopupMenu *popup,
- int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style )
- : TQPushButton( TQIconSet(), text, tqparent )
+ int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style )
+ : TQPushButton( TQIconSet(), text, parent )
, m_position( pos )
, m_style( style )
, m_id( id )
@@ -532,8 +532,8 @@ MultiTabBarButton::MultiTabBarButton( const TQPixmap& pic, const TQString& text,
}
MultiTabBarButton::MultiTabBarButton( const TQString& text, TQPopupMenu *popup,
- int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style )
- : TQPushButton( TQIconSet(), text, tqparent ), m_style( style )
+ int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style )
+ : TQPushButton( TQIconSet(), text, parent ), m_style( style )
, m_animCount( 0 )
, m_animTimer( new TQTimer( this ) )
, m_dragSwitchTimer( new TQTimer( this ) )
@@ -720,9 +720,9 @@ TQSize MultiTabBarButton::tqsizeHint() const
MultiTabBarTab::MultiTabBarTab( const TQPixmap& pic, const TQString& text,
- int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos,
+ int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos,
MultiTabBar::MultiTabBarStyle style )
- : MultiTabBarButton( text, 0, id, tqparent, pos, style ),
+ : MultiTabBarButton( text, 0, id, parent, pos, style ),
m_visible(true),
m_showActiveTabText( false )
{
@@ -1142,7 +1142,7 @@ TQColor MultiTabBarTab::blendColors( const TQColor& color1, const TQColor& color
-MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *tqparent, const char *name ) : TQWidget( tqparent, name )
+MultiTabBar::MultiTabBar( MultiTabBarMode bm, TQWidget *parent, const char *name ) : TQWidget( parent, name )
{
m_buttons.setAutoDelete( false );
if ( bm == Vertical ) {
diff --git a/amarok/src/multitabbar.h b/amarok/src/multitabbar.h
index b94020e9..b63d90ae 100644
--- a/amarok/src/multitabbar.h
+++ b/amarok/src/multitabbar.h
@@ -73,7 +73,7 @@ class MultiTabBar: public TQWidget
*/
enum MultiTabBarStyle{VSNET = 0, KDEV3 = 1, KONTQSBC = 2, KDEV3ICON = 3, AMAROK = 4, STYLELAST = 0xffff};
- MultiTabBar( MultiTabBarMode bm, TQWidget *tqparent = 0, const char *name = 0 );
+ MultiTabBar( MultiTabBarMode bm, TQWidget *parent = 0, const char *name = 0 );
virtual ~MultiTabBar();
/**
@@ -177,9 +177,9 @@ class MultiTabBarButton: public TQPushButton
TQ_OBJECT
public:
MultiTabBarButton( const TQPixmap& pic, const TQString&, TQPopupMenu *popup,
- int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
+ int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
MultiTabBarButton( const TQString&, TQPopupMenu *popup,
- int id, TQWidget *tqparent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
+ int id, TQWidget *parent, MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
virtual ~MultiTabBarButton();
int id() const;
@@ -253,7 +253,7 @@ class MultiTabBarTab: public MultiTabBarButton
Q_OBJECT
TQ_OBJECT
public:
- MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *tqparent,
+ MultiTabBarTab( const TQPixmap& pic, const TQString&, int id, TQWidget *parent,
MultiTabBar::MultiTabBarPosition pos, MultiTabBar::MultiTabBarStyle style );
virtual ~MultiTabBarTab();
/**
diff --git a/amarok/src/multitabbar_p.h b/amarok/src/multitabbar_p.h
index b11cd58b..74cf8fad 100644
--- a/amarok/src/multitabbar_p.h
+++ b/amarok/src/multitabbar_p.h
@@ -32,7 +32,7 @@ class MultiTabBarInternal: public TQScrollView
Q_OBJECT
TQ_OBJECT
public:
- MultiTabBarInternal(TQWidget *tqparent,MultiTabBar::MultiTabBarMode bm);
+ MultiTabBarInternal(TQWidget *parent,MultiTabBar::MultiTabBarMode bm);
int appendTab(const TQPixmap &,int=-1,const TQString& =TQString(), const TQString&identifier=TQString());
MultiTabBarTab *tab(int) const;
void removeTab(int);
@@ -64,7 +64,7 @@ protected:
/**
* [contentsM|m]ousePressEvent are reimplemented from TQScrollView
* in order to ignore all mouseEvents on the viewport, so that the
- * tqparent can handle them.
+ * parent can handle them.
*/
virtual void contentsMousePressEvent(TQMouseEvent *);
virtual void mousePressEvent(TQMouseEvent *);
diff --git a/amarok/src/mydiroperator.cpp b/amarok/src/mydiroperator.cpp
index 0233bb0e..e00878d9 100644
--- a/amarok/src/mydiroperator.cpp
+++ b/amarok/src/mydiroperator.cpp
@@ -5,7 +5,7 @@
#include <tqdir.h>
-MyDirOperator::MyDirOperator ( const KURL &url, TQWidget *tqparent, Medium *medium ) : KDirOperator( url, tqparent )
+MyDirOperator::MyDirOperator ( const KURL &url, TQWidget *parent, Medium *medium ) : KDirOperator( url, parent )
{
m_medium = medium;
setDirLister( new MyDirLister( true ) );
diff --git a/amarok/src/mydiroperator.h b/amarok/src/mydiroperator.h
index c9787648..8c0134b4 100644
--- a/amarok/src/mydiroperator.h
+++ b/amarok/src/mydiroperator.h
@@ -15,7 +15,7 @@ class MyDirOperator : public KDirOperator {
TQ_OBJECT
public:
- MyDirOperator( const KURL &url, TQWidget *tqparent, Medium *medium = 0 );
+ MyDirOperator( const KURL &url, TQWidget *parent, Medium *medium = 0 );
public slots:
//reimplemented due to a bug in KDirOperator::activatedMenu ( KDE 3.4.2 ) - See Bug #103305
diff --git a/amarok/src/organizecollectiondialog.ui.h b/amarok/src/organizecollectiondialog.ui.h
index bc1c7754..1d2f517b 100644
--- a/amarok/src/organizecollectiondialog.ui.h
+++ b/amarok/src/organizecollectiondialog.ui.h
@@ -201,9 +201,9 @@ void OrganizeCollectionDialog::slotDetails()
formatHelp->hide();
}
- if( dynamic_cast<TQWidget *>(tqparent()) ) {
- TQT_TQWIDGET(tqparent())->adjustSize();
- TQT_TQWIDGET(tqparent())->updateGeometry();
+ if( dynamic_cast<TQWidget *>(parent()) ) {
+ TQT_TQWIDGET(parent())->adjustSize();
+ TQT_TQWIDGET(parent())->updateGeometry();
}
}
diff --git a/amarok/src/osd.cpp b/amarok/src/osd.cpp
index 187340ea..cc475524 100644
--- a/amarok/src/osd.cpp
+++ b/amarok/src/osd.cpp
@@ -45,8 +45,8 @@ namespace ShadowEngine
#define MOODBAR_HEIGHT 20
-OSDWidget::OSDWidget( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop )
+OSDWidget::OSDWidget( TQWidget *parent, const char *name )
+ : TQWidget( parent, name, WType_TopLevel | WNoAutoErase | WStyle_Customize | WX11BypassWM | WStyle_StaysOnTop )
, m_duration( 2000 )
, m_timer( new TQTimer( this ) )
, m_tqalignment( Middle )
@@ -284,16 +284,16 @@ OSDWidget::render( const uint M, const TQSize &size )
const uint xround = (M * 200) / size.width();
const uint yround = (M * 200) / size.height();
- { /// apply the tqmask
- static TQBitmap tqmask;
+ { /// apply the mask
+ static TQBitmap mask;
- tqmask.resize( size );
- tqmask.fill( TQt::black );
+ mask.resize( size );
+ mask.fill( TQt::black );
- TQPainter p( &tqmask );
+ TQPainter p( &mask );
p.setBrush( TQt::white );
p.drawRoundRect( rect, xround, yround );
- setMask( tqmask );
+ setMask( mask );
}
TQColor shadowColor;
@@ -370,11 +370,11 @@ OSDWidget::render( const uint M, const TQSize &size )
KPixmap pixmapGradient;
{ // gradient
- TQBitmap tqmask;
- tqmask.resize( vol.size() );
- tqmask.fill( TQt::black );
+ TQBitmap mask;
+ mask.resize( vol.size() );
+ mask.fill( TQt::black );
- TQPainter p( &tqmask );
+ TQPainter p( &mask );
p.setBrush( TQt::white );
p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6,
M * 300 / vol.width(), 99 );
@@ -383,7 +383,7 @@ OSDWidget::render( const uint M, const TQSize &size )
pixmapGradient = TQPixmap( vol.size() );
KPixmapEffect::gradient( pixmapGradient, tqcolorGroup().background(),
tqcolorGroup().highlight(), KPixmapEffect::EllipticGradient );
- pixmapGradient.setMask( tqmask );
+ pixmapGradient.setMask( mask );
}
if( m_translucency )
@@ -396,11 +396,11 @@ OSDWidget::render( const uint M, const TQSize &size )
vol.fill( backgroundColor() );
{ // vol ( bg-alpha )
- static TQBitmap tqmask;
- tqmask.resize( vol.size() );
- tqmask.fill( TQt::white );
+ static TQBitmap mask;
+ mask.resize( vol.size() );
+ mask.fill( TQt::white );
- TQPainter p( &tqmask );
+ TQPainter p( &mask );
p.setBrush( TQt::black );
p.drawRoundRect ( 1, 1, rect.width()-2, rect.height() + fontMetrics().height() / 4 - 2,
M * 300 / vol.width(), 99 );
@@ -408,7 +408,7 @@ OSDWidget::render( const uint M, const TQSize &size )
p.drawRoundRect ( 3, 3, vol.width() - 6, vol.height() - 6,
M * 300 / vol.width(), 99 );
p.end();
- vol.setMask( tqmask );
+ vol.setMask( mask );
}
buf.fill( backgroundColor().dark() );
@@ -544,8 +544,8 @@ namespace Amarok
TQImage icon() { return TQImage( KIconLoader().iconPath( "amarok", -KIcon::SizeHuge ) ); }
}
-OSDPreviewWidget::OSDPreviewWidget( TQWidget *tqparent )
- : OSDWidget( tqparent, "osdpreview" )
+OSDPreviewWidget::OSDPreviewWidget( TQWidget *parent )
+ : OSDWidget( parent, "osdpreview" )
, m_dragging( false )
{
m_text = i18n( "OSD Preview - drag to reposition" );
@@ -841,7 +841,7 @@ Amarok::OSD::slotImageChanged( const TQString &remoteURL )
if( CollectionDB::instance()->getPodcastEpisodeBundle( url, &peb ) )
{
PodcastChannelBundle pcb;
- if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent().url(), &pcb ) )
+ if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent().url(), &pcb ) )
{
if( pcb.imageURL().url() == remoteURL )
{
diff --git a/amarok/src/osd.h b/amarok/src/osd.h
index f8c3cabc..cfa5cf70 100644
--- a/amarok/src/osd.h
+++ b/amarok/src/osd.h
@@ -31,7 +31,7 @@ class OSDWidget : public TQWidget
public:
enum Alignment { Left, Middle, Center, Right };
- OSDWidget( TQWidget *tqparent, const char *name = "osd" );
+ OSDWidget( TQWidget *parent, const char *name = "osd" );
/** resets the colours to defaults */
void unsetColors();
@@ -111,7 +111,7 @@ class OSDPreviewWidget : public OSDWidget
TQ_OBJECT
public:
- OSDPreviewWidget( TQWidget *tqparent );
+ OSDPreviewWidget( TQWidget *parent );
int screen() { return m_screen; }
int tqalignment() { return m_tqalignment; }
diff --git a/amarok/src/playerwindow.cpp b/amarok/src/playerwindow.cpp
index 3e501d3d..91e03f9f 100644
--- a/amarok/src/playerwindow.cpp
+++ b/amarok/src/playerwindow.cpp
@@ -71,16 +71,16 @@ using Amarok::getPNG;
//fairly pointless template which was designed to make the ctor clearer,
//but probably achieves the opposite. Still, the code is neater..
template<class W> static inline W*
-createWidget( const TQRect &r, TQWidget *tqparent, const char *name = 0, TQt::WFlags f = 0 )
+createWidget( const TQRect &r, TQWidget *parent, const char *name = 0, TQt::WFlags f = 0 )
{
- W *w = new W( tqparent, name, f );
+ W *w = new W( parent, name, f );
w->setGeometry( r );
return w;
}
-PlayerWidget::PlayerWidget( TQWidget *tqparent, const char *name, bool enablePlaylist )
- : TQWidget( tqparent, name, TQt::WType_TopLevel )
+PlayerWidget::PlayerWidget( TQWidget *parent, const char *name, bool enablePlaylist )
+ : TQWidget( parent, name, TQt::WType_TopLevel )
, EngineObserver( EngineController::instance() )
, m_minimalView( false )
, m_pAnimTimer( new TQTimer( this ) )
@@ -95,7 +95,7 @@ PlayerWidget::PlayerWidget( TQWidget *tqparent, const char *name, bool enablePla
// Sets caption and icon correctly (needed e.g. for GNOME)
kapp->setTopWidget( this );
- tqparent->installEventFilter( this ); //for hidePLaylistWithMainWindow mode
+ parent->installEventFilter( this ); //for hidePLaylistWithMainWindow mode
//if this is the first time we have ever been run we let KWin place us
if ( AmarokConfig::playerPos() != TQPoint(-1,-1) )
@@ -182,7 +182,7 @@ PlayerWidget::PlayerWidget( TQWidget *tqparent, const char *name, bool enablePla
m_pPlaylistButton = new IconButton( this, "pl", TQT_SIGNAL(playlistToggled( bool )) );
m_pPlaylistButton->setGeometry( 5,85, 28,13 );
- m_pPlaylistButton->setOn( tqparent->isShown() || enablePlaylist );
+ m_pPlaylistButton->setOn( parent->isShown() || enablePlaylist );
m_pDescription = createWidget<TQLabel>( TQRect(4,6, 250,10), this );
@@ -549,7 +549,7 @@ bool PlayerWidget::event( TQEvent *e )
case 6/*TQEvent::KeyPress*/:
if (TQT_TQKEYEVENT(e)->key() == TQt::Key_D/* && (m_pAnalyzer->inherits(TQGLWIDGET_OBJECT_NAME_STRING)*/)
{
- if( m_pAnalyzer->tqparent() )
+ if( m_pAnalyzer->parent() )
{
m_pAnalyzer->reparent( 0, TQPoint(50,50), true );
m_pAnalyzer->setCaption( kapp->makeStdCaption( i18n("Analyzer") ) );
@@ -676,7 +676,7 @@ bool PlayerWidget::event( TQEvent *e )
bool
PlayerWidget::eventFilter( TQObject *o, TQEvent *e )
{
- //NOTE we only monitor for tqparent() - which is the PlaylistWindow
+ //NOTE we only monitor for parent() - which is the PlaylistWindow
if( TQT_BASE_OBJECT(o) == TQT_BASE_OBJECT(m_pAnalyzer) )
{
@@ -839,8 +839,8 @@ void PlayerWidget::slotShowEqualizer( bool show ) //SLOT
#include <kiconeffect.h>
#include <kimageeffect.h>
-NavButton::NavButton( TQWidget *tqparent, const TQString &icon, KAction *action )
- : TQToolButton( tqparent )
+NavButton::NavButton( TQWidget *parent, const TQString &icon, KAction *action )
+ : TQToolButton( parent )
, m_glowIndex( 0 )
{
// Prevent flicker
@@ -925,19 +925,19 @@ void NavButton::drawButtonLabel( TQPainter* p )
// CLASS IconButton
//////////////////////////////////////////////////////////////////////////////////////////
-IconButton::IconButton( TQWidget *tqparent, const TQString &icon, const char *signal )
- : TQButton( tqparent )
+IconButton::IconButton( TQWidget *parent, const TQString &icon, const char *signal )
+ : TQButton( parent )
, m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!)
, m_down( getPNG( icon + "_inactive2" ) )
{
- connect( this, TQT_SIGNAL(toggled( bool )), tqparent, signal );
+ connect( this, TQT_SIGNAL(toggled( bool )), parent, signal );
setToggleButton( true );
setFocusPolicy( TQ_NoFocus ); //we have no way to show focus on these widgets currently
}
-IconButton::IconButton( TQWidget *tqparent, const TQString &icon, TQObject* receiver, const char *slot )
- : TQButton( tqparent )
+IconButton::IconButton( TQWidget *parent, const TQString &icon, TQObject* receiver, const char *slot )
+ : TQButton( parent )
, m_up( getPNG( icon + "_active2" ) ) //TODO rename files better (like the right way round for one!)
, m_down( getPNG( icon + "_inactive2" ) )
{
diff --git a/amarok/src/playlist.cpp b/amarok/src/playlist.cpp
index f881c0e8..e8d1698e 100644
--- a/amarok/src/playlist.cpp
+++ b/amarok/src/playlist.cpp
@@ -163,8 +163,8 @@ namespace Glow
TQMutex* Playlist::s_dynamicADTMutex = new TQMutex();
Playlist *Playlist::s_instance = 0;
-Playlist::Playlist( TQWidget *tqparent )
- : KListView( tqparent, "ThePlaylist" )
+Playlist::Playlist( TQWidget *parent )
+ : KListView( parent, "ThePlaylist" )
, EngineObserver( EngineController::instance() )
, m_startupTime_t( TQDateTime::tqcurrentDateTime().toTime_t() )
, m_oldestTime_t( CollectionDB::instance()->query( "SELECT MIN( createdate ) FROM statistics;" ).first().toInt() )
@@ -2425,8 +2425,8 @@ Playlist::contentsDropEvent( TQDropEvent *e )
{
DEBUG_BLOCK
- //NOTE tqparent is always 0 currently, but we support it in case we start using trees
- TQListViewItem *tqparent = 0;
+ //NOTE parent is always 0 currently, but we support it in case we start using trees
+ TQListViewItem *parent = 0;
TQListViewItem *after = m_marker;
//make sure to disable only if in dynamic mode and you're inserting
@@ -2448,13 +2448,13 @@ Playlist::contentsDropEvent( TQDropEvent *e )
}
if( !after )
- findDrop( e->pos(), tqparent, after ); //shouldn't happen, but you never know!
+ findDrop( e->pos(), parent, after ); //shouldn't happen, but you never know!
slotEraseMarker();
if ( e->source() == viewport() ) {
setSorting( NO_SORT ); //disableSorting and saveState()
- movableDropEvent( tqparent, after );
+ movableDropEvent( parent, after );
TQPtrList<TQListViewItem> items = selectedItems();
if( dynamicMode() && after )
{
@@ -4291,10 +4291,10 @@ TQValueList<int> Playlist::visibleColumns() const
}
MetaBundle::ColumnMask Playlist::getVisibleColumnMask() const {
- MetaBundle::ColumnMask tqmask = 0;
+ MetaBundle::ColumnMask mask = 0;
for( int i = 0, n = columns(); i < n; ++i)
- if( columnWidth( i ) ) tqmask = tqmask | (1 << i);
- return tqmask;
+ if( columnWidth( i ) ) mask = mask | (1 << i);
+ return mask;
}
@@ -4770,8 +4770,8 @@ Playlist::showTagDialog( TQPtrList<TQListViewItem> items )
class CustomColumnDialog : public KDialog
{
public:
- CustomColumnDialog( TQWidget *tqparent )
- : KDialog( tqparent )
+ CustomColumnDialog( TQWidget *parent )
+ : KDialog( parent )
{
TQLabel *textLabel1, *textLabel2, *textLabel3;
TQLineEdit *lineEdit1, *lineEdit2;
diff --git a/amarok/src/playlist.h b/amarok/src/playlist.h
index 6e39f05c..66ad6aa0 100644
--- a/amarok/src/playlist.h
+++ b/amarok/src/playlist.h
@@ -508,7 +508,7 @@ class PlaylistIterator : public TQListViewItemIterator
public:
PlaylistIterator( TQListViewItem *item, int flags = 0 )
//TQListViewItemIterator is not great and doesn't allow you to see everything if you
- //tqmask both Visible and Invisible :( instead just visible items are returned
+ //mask both Visible and Invisible :( instead just visible items are returned
: TQListViewItemIterator( item, flags == All ? 0 : flags | Visible )
{}
diff --git a/amarok/src/playlistbrowser.cpp b/amarok/src/playlistbrowser.cpp
index 8f424f18..3d74d65f 100644
--- a/amarok/src/playlistbrowser.cpp
+++ b/amarok/src/playlistbrowser.cpp
@@ -460,18 +460,18 @@ void PlaylistBrowser::loadCoolStreams()
}
}
-void PlaylistBrowser::addStream( TQListViewItem *tqparent )
+void PlaylistBrowser::addStream( TQListViewItem *parent )
{
StreamEditor dialog( this, i18n( "Radio Stream" ), TQString() );
dialog.setCaption( i18n( "Add Radio Stream" ) );
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_streamsCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_streamsCategory);
if( dialog.exec() == TQDialog::Accepted )
{
- new StreamEntry( tqparent, 0, dialog.url(), dialog.name() );
- tqparent->sortChildItems( 0, true );
- tqparent->setOpen( true );
+ new StreamEntry( parent, 0, dialog.url(), dialog.name() );
+ parent->sortChildItems( 0, true );
+ parent->setOpen( true );
saveStreams();
}
@@ -582,23 +582,23 @@ void PlaylistBrowser::loadLastfmStreams( const bool subscriber /*false*/ )
}
}
-void PlaylistBrowser::addLastFmRadio( TQListViewItem *tqparent )
+void PlaylistBrowser::addLastFmRadio( TQListViewItem *parent )
{
StreamEditor dialog( this, i18n( "Last.fm Radio" ), TQString() );
dialog.setCaption( i18n( "Add Last.fm Radio" ) );
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_lastfmCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_lastfmCategory);
if( dialog.exec() == TQDialog::Accepted )
{
- new LastFmEntry( tqparent, 0, dialog.url(), dialog.name() );
- tqparent->sortChildItems( 0, true );
- tqparent->setOpen( true );
+ new LastFmEntry( parent, 0, dialog.url(), dialog.name() );
+ parent->sortChildItems( 0, true );
+ parent->setOpen( true );
saveLastFm();
}
}
-void PlaylistBrowser::addLastFmCustomRadio( TQListViewItem *tqparent )
+void PlaylistBrowser::addLastFmCustomRadio( TQListViewItem *parent )
{
TQString token = LastFm::Controller::createCustomStation();
if( token.isEmpty() ) return;
@@ -609,7 +609,7 @@ void PlaylistBrowser::addLastFmCustomRadio( TQListViewItem *tqparent )
TQString name = LastFm::Controller::stationDescription( text );
name.replace( "%252", "/" );
- new LastFmEntry( tqparent, 0, url, name );
+ new LastFmEntry( parent, 0, url, name );
saveLastFm();
}
@@ -651,18 +651,18 @@ TQString PlaylistBrowser::smartplaylistBrowserCache() const
return Amarok::saveLocation() + "smartplaylistbrowser_save.xml";
}
-void PlaylistBrowser::addSmartPlaylist( TQListViewItem *tqparent ) //SLOT
+void PlaylistBrowser::addSmartPlaylist( TQListViewItem *parent ) //SLOT
{
if( CollectionDB::instance()->isEmpty() || !m_smartCategory )
return;
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_smartCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_smartCategory);
SmartPlaylistEditor dialog( i18n("Untitled"), this );
if( dialog.exec() == TQDialog::Accepted ) {
- PlaylistCategory *category = dynamic_cast<PlaylistCategory*>(tqparent);
+ PlaylistCategory *category = dynamic_cast<PlaylistCategory*>(parent);
for( TQListViewItem *item = category->firstChild(); item; item = item->nextSibling() ) {
SmartPlaylist *sp = dynamic_cast<SmartPlaylist*>(item);
if ( sp && sp->title() == dialog.name() ) {
@@ -678,9 +678,9 @@ void PlaylistBrowser::addSmartPlaylist( TQListViewItem *tqparent ) //SLOT
return;
}
}
- new SmartPlaylist( tqparent, 0, dialog.result() );
- tqparent->sortChildItems( 0, true );
- tqparent->setOpen( true );
+ new SmartPlaylist( parent, 0, dialog.result() );
+ parent->sortChildItems( 0, true );
+ parent->setOpen( true );
saveSmartPlaylists();
}
@@ -1171,14 +1171,14 @@ DEBUG_BLOCK
foreachType( TQValueList<PodcastChannelBundle>, channels )
{
- PlaylistCategory *tqparent = p;
+ PlaylistCategory *parent = p;
const int parentId = (*it).parentId();
if( parentId > 0 && folderMap.find( parentId ) != folderMap.end() )
- tqparent = folderMap[parentId];
+ parent = folderMap[parentId];
- channel = new PodcastChannel( tqparent, channel, *it );
+ channel = new PodcastChannel( parent, channel, *it );
- bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(tqparent) FROM podcastepisodes WHERE ( tqparent='%1' AND isNew=%2 ) LIMIT 1" )
+ bool hasNew = CollectionDB::instance()->query( TQString("SELECT COUNT(parent) FROM podcastepisodes WHERE ( parent='%1' AND isNew=%2 ) LIMIT 1" )
.tqarg( (*it).url().url(), CollectionDB::instance()->boolT() ) )
.first().toInt() > 0;
@@ -1196,10 +1196,10 @@ TQMap<int,PlaylistCategory*>
PlaylistBrowser::loadPodcastFolders( PlaylistCategory *p )
{
DEBUG_BLOCK
- TQString sql = "SELECT * FROM podcastfolders ORDER BY tqparent ASC;";
+ TQString sql = "SELECT * FROM podcastfolders ORDER BY parent ASC;";
TQStringList values = CollectionDB::instance()->query( sql );
- // store the folder and IDs so finding a tqparent is fast
+ // store the folder and IDs so finding a parent is fast
TQMap<int,PlaylistCategory*> folderMap;
PlaylistCategory *folder = 0;
foreach( values )
@@ -1209,11 +1209,11 @@ DEBUG_BLOCK
const int parentId = (*++it).toInt();
const bool isOpen = ( (*++it) == CollectionDB::instance()->boolT() ? true : false );
- PlaylistCategory *tqparent = p;
+ PlaylistCategory *parent = p;
if( parentId > 0 && folderMap.find( parentId ) != folderMap.end() )
- tqparent = folderMap[parentId];
+ parent = folderMap[parentId];
- folder = new PlaylistCategory( tqparent, folder, t, id );
+ folder = new PlaylistCategory( parent, folder, t, id );
folder->setOpen( isOpen );
folderMap[id] = folder;
@@ -1242,7 +1242,7 @@ 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 parentId = static_cast<PlaylistCategory*>(folder->tqparent())->id();
+ int parentId = static_cast<PlaylistCategory*>(folder->parent())->id();
int newId = CollectionDB::instance()->addPodcastFolder( folder->text(0), parentId, folder->isOpen() );
folder->setId( newId );
PodcastChannel *chan = static_cast<PodcastChannel*>(folder->firstChild());
@@ -1257,7 +1257,7 @@ void PlaylistBrowser::savePodcastFolderStates( PlaylistCategory *folder )
else
{
CollectionDB::instance()->updatePodcastFolder( folder->id(), folder->text(0),
- static_cast<PlaylistCategory*>(folder->tqparent())->id(), folder->isOpen() );
+ static_cast<PlaylistCategory*>(folder->parent())->id(), folder->isOpen() );
}
}
}
@@ -1277,9 +1277,9 @@ void PlaylistBrowser::scanPodcasts()
m_podcastTimer->start( m_podcastTimerInterval );
}
-void PlaylistBrowser::refreshPodcasts( TQListViewItem *tqparent )
+void PlaylistBrowser::refreshPodcasts( TQListViewItem *parent )
{
- for( TQListViewItem *child = tqparent->firstChild();
+ for( TQListViewItem *child = parent->firstChild();
child;
child = child->nextSibling() )
{
@@ -1290,21 +1290,21 @@ void PlaylistBrowser::refreshPodcasts( TQListViewItem *tqparent )
}
}
-void PlaylistBrowser::addPodcast( TQListViewItem *tqparent )
+void PlaylistBrowser::addPodcast( TQListViewItem *parent )
{
bool ok;
const TQString name = KInputDialog::getText(i18n("Add Podcast"), i18n("Enter Podcast URL:"), TQString(), &ok, this);
if( ok && !name.isEmpty() )
{
- addPodcast( KURL::fromPathOrURL( name ), tqparent );
+ addPodcast( KURL::fromPathOrURL( name ), parent );
}
}
-void PlaylistBrowser::configurePodcasts( TQListViewItem *tqparent )
+void PlaylistBrowser::configurePodcasts( TQListViewItem *parent )
{
TQPtrList<PodcastChannel> podcastChannelList;
- for( TQListViewItem *child = tqparent->firstChild();
+ for( TQListViewItem *child = parent->firstChild();
child;
child = child->nextSibling() )
{
@@ -1314,7 +1314,7 @@ void PlaylistBrowser::configurePodcasts( TQListViewItem *tqparent )
}
}
if( !podcastChannelList.isEmpty() )
- configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").tqarg( tqparent->text( 0 ) ) );
+ configurePodcasts( podcastChannelList, i18n( "Podcasts contained in %1", "All in %1").tqarg( parent->text( 0 ) ) );
}
void PlaylistBrowser::configureSelectedPodcasts()
@@ -1375,11 +1375,11 @@ void PlaylistBrowser::configurePodcasts( TQPtrList<PodcastChannel> &podcastChann
}
PodcastChannel *
-PlaylistBrowser::findPodcastChannel( const KURL &feed, TQListViewItem *tqparent ) const
+PlaylistBrowser::findPodcastChannel( const KURL &feed, TQListViewItem *parent ) const
{
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_podcastCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_podcastCategory);
- for( TQListViewItem *it = tqparent->firstChild();
+ for( TQListViewItem *it = parent->firstChild();
it;
it = it->nextSibling() )
{
@@ -1425,9 +1425,9 @@ PlaylistBrowser::findPodcastEpisode( const KURL &episode, const KURL &feed ) con
return 0;
}
-void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *tqparent )
+void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *parent )
{
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_podcastCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_podcastCategory);
KURL url( origUrl );
if( url.protocol() == "itpc" || url.protocol() == "pcast" )
@@ -1443,7 +1443,7 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *tqparent
return;
}
- PodcastChannel *pc = new PodcastChannel( tqparent, 0, url );
+ PodcastChannel *pc = new PodcastChannel( parent, 0, url );
if( m_podcastItemsToScan.isEmpty() )
{
@@ -1455,8 +1455,8 @@ void PlaylistBrowser::addPodcast( const KURL& origUrl, TQListViewItem *tqparent
m_podcastItemsToScan.append( pc );
}
- tqparent->sortChildItems( 0, true );
- tqparent->setOpen( true );
+ parent->sortChildItems( 0, true );
+ parent->setOpen( true );
}
void PlaylistBrowser::changePodcastInterval()
@@ -1686,11 +1686,11 @@ DynamicMode *PlaylistBrowser::findDynamicModeByTitle( const TQString &title )
}
PlaylistEntry *
-PlaylistBrowser::findPlaylistEntry( const TQString &url, TQListViewItem *tqparent ) const
+PlaylistBrowser::findPlaylistEntry( const TQString &url, TQListViewItem *parent ) const
{
- if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_playlistCategory);
+ if( !parent ) parent = static_cast<TQListViewItem*>(m_playlistCategory);
- for( TQListViewItem *it = tqparent->firstChild();
+ for( TQListViewItem *it = parent->firstChild();
it;
it = it->nextSibling() )
{
@@ -1728,7 +1728,7 @@ int PlaylistBrowser::loadPlaylist( const TQString &playlist, bool /*force*/ )
// roland
}
-void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *tqparent, bool force, bool imported )
+void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *parent, bool force, bool imported )
{
// this function adds a playlist to the playlist browser
@@ -1757,9 +1757,9 @@ void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *tqparen
}
if ( !playlistImports ) //We didn't find the Imported folder, so create it.
playlistImports = new PlaylistCategory( m_playlistCategory, 0, i18n("Imported") );
- tqparent = playlistImports;
+ parent = playlistImports;
}
- else if( !tqparent ) tqparent = static_cast<TQListViewItem*>(m_playlistCategory);
+ else if( !parent ) parent = static_cast<TQListViewItem*>(m_playlistCategory);
if( !playlist ) {
if( !m_playlistCategory || !m_playlistCategory->childCount() ) { //first child
@@ -1769,11 +1769,11 @@ void PlaylistBrowser::addPlaylist( const TQString &path, TQListViewItem *tqparen
KURL auxKURL;
auxKURL.setPath(path);
- m_lastPlaylist = playlist = new PlaylistEntry( tqparent, 0, auxKURL );
+ m_lastPlaylist = playlist = new PlaylistEntry( parent, 0, auxKURL );
}
- tqparent->setOpen( true );
- tqparent->sortChildItems( 0, true );
+ parent->setOpen( true );
+ parent->sortChildItems( 0, true );
m_listview->clearSelection();
playlist->setSelected( true );
}
@@ -1836,7 +1836,7 @@ bool PlaylistBrowser::savePlaylist( const TQString &path, const TQValueList<KURL
return true;
}
-void PlaylistBrowser::openPlaylist( TQListViewItem *tqparent ) //SLOT
+void PlaylistBrowser::openPlaylist( TQListViewItem *parent ) //SLOT
{
// open a file selector to add playlists to the playlist browser
TQStringList files;
@@ -1844,7 +1844,7 @@ void PlaylistBrowser::openPlaylist( TQListViewItem *tqparent ) //SLOT
const TQStringList::ConstIterator end = files.constEnd();
for( TQStringList::ConstIterator it = files.constBegin(); it != end; ++it )
- addPlaylist( *it, tqparent );
+ addPlaylist( *it, parent );
savePlaylists();
}
@@ -1930,7 +1930,7 @@ PlaylistBrowser::findItem( TQString &t, int c ) const
return static_cast<PlaylistBrowserEntry *>( m_listview->findItem( t, c, TQt::ExactMatch ) );
}
-bool PlaylistBrowser::createPlaylist( TQListViewItem *tqparent, bool current, TQString title )
+bool PlaylistBrowser::createPlaylist( TQListViewItem *parent, bool current, TQString title )
{
if( title.isEmpty() ) title = i18n("Untitled");
@@ -1938,8 +1938,8 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *tqparent, bool current, TQ
if( path.isEmpty() )
return false;
- if( !tqparent )
- tqparent = static_cast<TQListViewItem *>( m_playlistCategory );
+ if( !parent )
+ parent = static_cast<TQListViewItem *>( m_playlistCategory );
if( current )
{
@@ -1951,7 +1951,7 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *tqparent, bool current, TQ
{
//Remove any items in Listview that have the same path as this one
// Should only happen when overwriting a playlist
- TQListViewItem *item = tqparent->firstChild();
+ TQListViewItem *item = parent->firstChild();
while( item )
{
if( static_cast<PlaylistEntry*>( item )->url() == path )
@@ -1968,8 +1968,8 @@ bool PlaylistBrowser::createPlaylist( TQListViewItem *tqparent, bool current, TQ
if ( TQFileInfo( path ).exists() )
TQFileInfo( path ).dir().remove( path );
- m_lastPlaylist = new PlaylistEntry( tqparent, 0, path );
- tqparent->sortChildItems( 0, true );
+ m_lastPlaylist = new PlaylistEntry( parent, 0, path );
+ parent->sortChildItems( 0, true );
}
savePlaylists();
@@ -2105,18 +2105,18 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
continue;
// if the playlist containing this item is already selected the current item will be skipped
- // it will be deleted from the tqparent
- TQListViewItem *tqparent = it.current()->tqparent();
+ // it will be deleted from the parent
+ TQListViewItem *parent = it.current()->parent();
- if( tqparent && tqparent->isSelected() ) //tqparent will remove tqchildren
+ if( parent && parent->isSelected() ) //parent will remove tqchildren
continue;
- if (tqparent) {
- while( tqparent->tqparent() && static_cast<PlaylistBrowserEntry*>(tqparent)->isKept() )
- tqparent = tqparent->tqparent();
+ if (parent) {
+ while( parent->parent() && static_cast<PlaylistBrowserEntry*>(parent)->isKept() )
+ parent = parent->parent();
}
- if( tqparent && !static_cast<PlaylistBrowserEntry*>(tqparent)->isKept() )
+ if( parent && !static_cast<PlaylistBrowserEntry*>(parent)->isKept() )
continue;
switch( (*it)->rtti() )
@@ -2154,7 +2154,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
case PlaylistCategory::RTTI:
folderCount++;
- if( tqparent == m_playlistCategory )
+ if( parent == m_playlistCategory )
{
for( TQListViewItem *ch = (*it)->firstChild(); ch; ch = ch->nextSibling() )
{
@@ -2172,7 +2172,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
playlistFoldersToDelete.append( static_cast<PlaylistCategory*>(*it) );
continue; // don't add the folder to selected, else it will be deleted twice
}
- else if( tqparent == m_podcastCategory )
+ else if( parent == m_podcastCategory )
{
for( TQListViewItem *ch = (*it)->firstChild(); ch; ch = ch->nextSibling() )
{
@@ -2235,7 +2235,7 @@ void PlaylistBrowser::removeSelectedItems() //SLOT
{
if ( isPlaylistTrackItem( *it ) )
{
- static_cast<PlaylistEntry*>( (*it)->tqparent() )->removeTrack( (*it) );
+ static_cast<PlaylistEntry*>( (*it)->parent() )->removeTrack( (*it) );
continue;
}
if ( isDynamic( *it ) )
@@ -2556,8 +2556,8 @@ void PlaylistBrowser::showContextMenu( TQListViewItem *item, const TQPoint &p, i
// CLASS PlaylistBrowserView
////////////////////////////////////////////////////////////////////////////
-PlaylistBrowserView::PlaylistBrowserView( TQWidget *tqparent, const char *name )
- : KListView( tqparent, name )
+PlaylistBrowserView::PlaylistBrowserView( TQWidget *parent, const char *name )
+ : KListView( parent, name )
, m_marker( 0 )
{
addColumn( i18n("Playlists") );
@@ -2619,7 +2619,7 @@ void PlaylistBrowserView::contentsDragLeaveEvent( TQDragLeaveEvent* )
void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e )
{
- TQListViewItem *tqparent = 0;
+ TQListViewItem *parent = 0;
TQListViewItem *after;
const TQPoint p = contentsToViewport( e->pos() );
@@ -2630,7 +2630,7 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e )
}
if( !isPlaylist( item ) )
- findDrop( e->pos(), tqparent, after );
+ findDrop( e->pos(), parent, after );
eraseMarker();
@@ -2656,7 +2656,7 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e )
{ // check if it is podcast category
TQListViewItem *cat = item;
while( isCategory(cat) && cat!=PlaylistBrowser::instance()->podcastCategory() )
- cat = cat->tqparent();
+ cat = cat->parent();
if( cat == PlaylistBrowser::instance()->podcastCategory() )
PlaylistBrowser::instance()->addPodcast(*it, item);
@@ -2691,24 +2691,24 @@ void PlaylistBrowserView::contentsDropEvent( TQDropEvent *e )
if( bundles.isEmpty() ) return;
- if( tqparent && isPlaylist( tqparent ) ) {
+ if( parent && isPlaylist( parent ) ) {
//insert the dropped tracks
- PlaylistEntry *playlist = static_cast<PlaylistEntry *>( tqparent );
+ PlaylistEntry *playlist = static_cast<PlaylistEntry *>( parent );
playlist->insertTracks( after, bundles );
}
else //dropped on a playlist item
{
- TQListViewItem *tqparent = item;
+ TQListViewItem *parent = item;
bool isPlaylistFolder = false;
- while( tqparent )
+ while( parent )
{
- if( tqparent == PlaylistBrowser::instance()->m_playlistCategory )
+ if( parent == PlaylistBrowser::instance()->m_playlistCategory )
{
isPlaylistFolder = true;
break;
}
- tqparent = tqparent->tqparent();
+ parent = parent->parent();
}
if( isPlaylist( item ) ) {
@@ -2795,7 +2795,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
isSmartPlaylist( newParent ) || isPodcastEpisode( newParent ) || isStream( newParent ) )
{
after = newParent;
- newParent = newParent->tqparent();
+ newParent = newParent->parent();
}
#define newParent static_cast<PlaylistBrowserEntry*>(newParent)
@@ -2807,7 +2807,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
TQListViewItemIterator it( this, TQListViewItemIterator::Selected );
for( ; it.current(); ++it )
{
- if( !(*it)->tqparent() ) //must be a base category we are draggin'
+ if( !(*it)->parent() ) //must be a base category we are draggin'
continue;
selected.append( *it );
@@ -2815,15 +2815,15 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
for( TQListViewItem *item = selected.first(); item; item = selected.next() )
{
- TQListViewItem *itemParent = item->tqparent();
+ TQListViewItem *itemParent = item->parent();
if( isPlaylistTrackItem( item ) )
{
if( isPlaylistTrackItem( newParent ) )
{
- if( !after && newParent != newParent->tqparent()->firstChild() )
+ if( !after && newParent != newParent->parent()->firstChild() )
after = newParent->itemAbove();
- newParent = static_cast<PlaylistEntry*>(newParent->tqparent());
+ newParent = static_cast<PlaylistEntry*>(newParent->parent());
}
else if( !isPlaylist( newParent ) )
continue;
@@ -2841,8 +2841,8 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
continue;
TQListViewItem *base = newParent;
- while( base->tqparent() )
- base = base->tqparent();
+ while( base->parent() )
+ base = base->parent();
if( base == PlaylistBrowser::instance()->m_playlistCategory && isPlaylist( item ) ||
base == PlaylistBrowser::instance()->m_streamsCategory && isStream( item ) ||
@@ -2850,7 +2850,7 @@ void PlaylistBrowserView::moveSelectedItems( TQListViewItem *newParent )
base == PlaylistBrowser::instance()->m_dynamicCategory && isDynamic( item ) )
{
// if the item is from the cool streams dir, copy it.
- if( item->tqparent() == PlaylistBrowser::instance()->m_coolStreams )
+ if( item->parent() == PlaylistBrowser::instance()->m_coolStreams )
{
#define item static_cast<StreamEntry*>(item)
new StreamEntry( newParent, after, item->url(), item->title() );
@@ -2951,8 +2951,8 @@ void PlaylistBrowserView::startDrag()
else if( isPodcastEpisode( *it ) )
{
- if( (*it)->tqparent()->isSelected() ) continue;
- if( !podList.isEmpty() && lastPodcastEpisode && lastPodcastEpisode->TQListViewItem::tqparent() != (*it)->tqparent() )
+ if( (*it)->parent()->isSelected() ) continue;
+ if( !podList.isEmpty() && lastPodcastEpisode && lastPodcastEpisode->TQListViewItem::parent() != (*it)->parent() )
{ // we moved onto a new podcast channel
urls += podList;
podList.clear();
@@ -3026,7 +3026,7 @@ void PlaylistBrowserView::startDrag()
else if( isPlaylistTrackItem( *it ) )
{
- if( (*it)->tqparent()->isSelected() ) continue;
+ if( (*it)->parent()->isSelected() ) continue;
urls += static_cast<PlaylistTrackItem*>(*it)->url();
itemList += static_cast<PlaylistTrackItem*>(*it)->url();
}
@@ -3124,8 +3124,8 @@ void PlaylistDialog::slotCustomPath()
}
-InfoPane::InfoPane( TQWidget *tqparent )
- : TQVBox( tqparent ),
+InfoPane::InfoPane( TQWidget *parent )
+ : TQVBox( parent ),
m_enable( false ),
m_storedHeight( 100 )
{
diff --git a/amarok/src/playlistbrowser.h b/amarok/src/playlistbrowser.h
index aac06bab..6e87f659 100644
--- a/amarok/src/playlistbrowser.h
+++ b/amarok/src/playlistbrowser.h
@@ -65,15 +65,15 @@ class PlaylistBrowser : public TQVBox
void setInfo( const TQString &title, const TQString &info );
- void addStream( TQListViewItem *tqparent = 0 );
- void addSmartPlaylist( TQListViewItem *tqparent = 0 );
- void addDynamic( TQListViewItem *tqparent = 0 );
- void addPlaylist( const TQString &path, TQListViewItem *tqparent = 0, bool force=false, bool imported=false );
- PlaylistEntry *findPlaylistEntry( const TQString &url, TQListViewItem *tqparent=0 ) const;
+ void addStream( TQListViewItem *parent = 0 );
+ void addSmartPlaylist( TQListViewItem *parent = 0 );
+ void addDynamic( TQListViewItem *parent = 0 );
+ void addPlaylist( const TQString &path, TQListViewItem *parent = 0, bool force=false, bool imported=false );
+ PlaylistEntry *findPlaylistEntry( const TQString &url, TQListViewItem *parent=0 ) const;
int loadPlaylist( const TQString &playlist, bool force=false );
- void addPodcast( TQListViewItem *tqparent = 0 );
- void addPodcast( const KURL &url, TQListViewItem *tqparent = 0 );
+ void addPodcast( TQListViewItem *parent = 0 );
+ void addPodcast( const KURL &url, TQListViewItem *parent = 0 );
void loadPodcastsFromDatabase( PlaylistCategory *p = 0 );
void registerPodcastSettings( const TQString &title, const PodcastSettings *settings );
@@ -113,7 +113,7 @@ class PlaylistBrowser : public TQVBox
void selectionChanged();
public slots:
- void openPlaylist( TQListViewItem *tqparent = 0 );
+ void openPlaylist( TQListViewItem *parent = 0 );
void scanPodcasts();
private slots:
@@ -146,8 +146,8 @@ class PlaylistBrowser : public TQVBox
void saveStreams();
void loadLastfmStreams( const bool subscriber = false );
- void addLastFmRadio( TQListViewItem *tqparent );
- void addLastFmCustomRadio( TQListViewItem *tqparent );
+ void addLastFmRadio( TQListViewItem *parent );
+ void addLastFmCustomRadio( TQListViewItem *parent );
void saveLastFm();
PlaylistCategory* loadSmartPlaylists();
@@ -164,7 +164,7 @@ class PlaylistBrowser : public TQVBox
PlaylistCategory* loadPodcasts();
TQMap<int,PlaylistCategory*> loadPodcastFolders( PlaylistCategory *p );
void changePodcastInterval();
- void configurePodcasts( TQListViewItem *tqparent );
+ void configurePodcasts( TQListViewItem *parent );
void configurePodcasts( TQPtrList<PodcastChannel> &podcastChannelList, const TQString &caption );
void configureSelectedPodcasts();
bool deleteSelectedPodcastItems( const bool removeItem=false, const bool silent=false );
@@ -173,7 +173,7 @@ class PlaylistBrowser : public TQVBox
void refreshPodcasts( TQListViewItem *category );
void removePodcastFolder( PlaylistCategory *item );
void savePodcastFolderStates( PlaylistCategory *folder );
- PodcastChannel *findPodcastChannel( const KURL &feed, TQListViewItem *tqparent=0 ) const;
+ PodcastChannel *findPodcastChannel( const KURL &feed, TQListViewItem *parent=0 ) const;
void markDynamicEntries();
PlaylistBrowserEntry* findByName( TQString name );
@@ -181,7 +181,7 @@ class PlaylistBrowser : public TQVBox
PlaylistCategory* loadPlaylists();
void savePlaylists();
void savePlaylist( PlaylistEntry * );
- bool createPlaylist( TQListViewItem *tqparent = 0, bool current = true, TQString title = 0 );
+ bool createPlaylist( TQListViewItem *parent = 0, bool current = true, TQString title = 0 );
bool deletePlaylists( TQPtrList<PlaylistEntry> items );
bool deletePlaylists( KURL::List items );
@@ -246,7 +246,7 @@ class PlaylistBrowserView : public KListView
friend class PlaylistEntry;
public:
- PlaylistBrowserView( TQWidget *tqparent, const char *name=0 );
+ PlaylistBrowserView( TQWidget *parent, const char *name=0 );
~PlaylistBrowserView();
void rename( TQListViewItem *item, int c );
@@ -396,7 +396,7 @@ class InfoPane : public TQVBox
TQ_OBJECT
public:
- InfoPane( TQWidget *tqparent );
+ InfoPane( TQWidget *parent );
~InfoPane();
int getHeight();
void setStoredHeight( const int newHeight );
diff --git a/amarok/src/playlistbrowseritem.cpp b/amarok/src/playlistbrowseritem.cpp
index f0c476db..229340c4 100644
--- a/amarok/src/playlistbrowseritem.cpp
+++ b/amarok/src/playlistbrowseritem.cpp
@@ -156,15 +156,15 @@ PlaylistBrowserEntry::slotDoubleClicked()
void
PlaylistBrowserEntry::slotRenameItem()
{
- TQListViewItem *tqparent = KListViewItem::tqparent();
+ TQListViewItem *parent = KListViewItem::parent();
- while( tqparent )
+ while( parent )
{
- if( !static_cast<PlaylistBrowserEntry*>( tqparent )->isKept() )
+ if( !static_cast<PlaylistBrowserEntry*>( parent )->isKept() )
return;
- if( !tqparent->tqparent() )
+ if( !parent->parent() )
break;
- tqparent = tqparent->tqparent();
+ parent = parent->parent();
}
setRenameEnabled( 0, true );
@@ -181,8 +181,8 @@ PlaylistBrowserEntry::slotPostRenameItem( const TQString /*newName*/ )
/// CLASS PlaylistCategory
////////////////////////////////////////////////////////////////////////////
-PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQString &t, bool isFolder )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &t, bool isFolder )
+ : PlaylistBrowserEntry( parent, after )
, m_title( t )
, m_id( -1 )
, m_folder( isFolder )
@@ -194,8 +194,8 @@ PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after,
}
-PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, bool isFolder )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, bool isFolder )
+ : PlaylistBrowserEntry( parent, after )
, m_title( t )
, m_id( -1 )
, m_folder( isFolder )
@@ -207,8 +207,8 @@ PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *
}
-PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistCategory::PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder )
+ : PlaylistBrowserEntry( parent, after )
, m_id( -1 )
, m_folder( isFolder )
{
@@ -219,8 +219,8 @@ PlaylistCategory::PlaylistCategory( TQListView *tqparent, TQListViewItem *after,
}
-PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : PlaylistBrowserEntry( parent, after )
, m_id( -1 )
, m_folder( true )
{
@@ -230,8 +230,8 @@ PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *
setPixmap( 0, SmallIcon( Amarok::icon( "files" ) ) );
}
-PlaylistCategory::PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, const int id )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistCategory::PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, const int id )
+ : PlaylistBrowserEntry( parent, after )
, m_title( t )
, m_id( id )
, m_folder( true )
@@ -249,7 +249,7 @@ void PlaylistCategory::okRename( int col )
if( m_id < 0 ) return;
// update the database entry to have the correct name
- const int parentId = tqparent() ? static_cast<PlaylistCategory*>(tqparent())->id() : 0;
+ const int parentId = parent() ? static_cast<PlaylistCategory*>(parent())->id() : 0;
CollectionDB::instance()->updatePodcastFolder( m_id, text(0), parentId, isOpen() );
}
@@ -401,8 +401,8 @@ PlaylistCategory::showContextMenu( const TQPoint &position )
TQListViewItem *parentCat = this;
- while( parentCat->tqparent() )
- parentCat = parentCat->tqparent();
+ while( parentCat->parent() )
+ parentCat = parentCat->parent();
bool isPodcastFolder = false;
@@ -553,8 +553,8 @@ PlaylistCategory::paintCell( TQPainter *p, const TQColorGroup &cg, int column, i
/// CLASS PlaylistEntry
////////////////////////////////////////////////////////////////////////////
-PlaylistEntry::PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url, int tracks, int length )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &url, int tracks, int length )
+ : PlaylistBrowserEntry( parent, after )
, m_url( url )
, m_length( length )
, m_trackCount( tracks )
@@ -583,8 +583,8 @@ PlaylistEntry::PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, c
}
-PlaylistEntry::PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistEntry::PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : PlaylistBrowserEntry( parent, after )
, m_loading( false )
, m_loaded( false )
, m_dynamic( false )
@@ -1053,15 +1053,15 @@ TQDomElement PlaylistEntry::xml() const
/// CLASS PlaylistTrackItem
////////////////////////////////////////////////////////////////////////////////
-PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *tqparent, TQListViewItem *after, TrackItemInfo *info )
- : PlaylistBrowserEntry( tqparent, after )
+PlaylistTrackItem::PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *after, TrackItemInfo *info )
+ : PlaylistBrowserEntry( parent, after )
, m_trackInfo( info )
{
setDragEnabled( true );
setRenameEnabled( 0, false );
- PlaylistEntry *p = dynamic_cast<PlaylistEntry *>(tqparent);
+ PlaylistEntry *p = dynamic_cast<PlaylistEntry *>(parent);
if(!p)
- debug() << "tqparent: " << tqparent << " is not a PlaylistEntry" << endl;
+ debug() << "parent: " << parent << " is not a PlaylistEntry" << endl;
if( p && p->text( 0 ).contains( info->artist() ) )
setText( 0, info->title() );
else
@@ -1155,8 +1155,8 @@ TrackItemInfo::TrackItemInfo( const MetaBundle &mb )
/// CLASS StreamEntry
////////////////////////////////////////////////////////////////////////////
-StreamEntry::StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &u, const TQString &t )
- : PlaylistBrowserEntry( tqparent, after )
+StreamEntry::StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t )
+ : PlaylistBrowserEntry( parent, after )
, m_title( t )
, m_url( u )
{
@@ -1172,8 +1172,8 @@ StreamEntry::StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const
setText( 0, m_title );
}
-StreamEntry::StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+StreamEntry::StreamEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : PlaylistBrowserEntry( parent, after )
{
setDragEnabled( true );
setRenameEnabled( 0, true );
@@ -1354,8 +1354,8 @@ TQDomElement LastFmEntry::xml() const
/// CLASS StreamEditor
////////////////////////////////////////////////////////////////////////////
-StreamEditor::StreamEditor( TQWidget *tqparent, const TQString &title, const TQString &url, bool readonly )
- : KDialogBase( tqparent, "StreamEditor", true, TQString(), Ok|Cancel)
+StreamEditor::StreamEditor( TQWidget *parent, const TQString &title, const TQString &url, bool readonly )
+ : KDialogBase( parent, "StreamEditor", true, TQString(), Ok|Cancel)
{
makeGridMainWidget( 2, Qt::Horizontal );
@@ -1387,16 +1387,16 @@ StreamEditor::StreamEditor( TQWidget *tqparent, const TQString &title, const TQS
/////////////////////////////////////////////////////////////////////////////
/// CLASS DynamicEntry
////////////////////////////////////////////////////////////////////////////
-DynamicEntry::DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name )
- : PlaylistBrowserEntry( tqparent, after, name )
+DynamicEntry::DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &name )
+ : PlaylistBrowserEntry( parent, after, name )
, DynamicMode( name )
{
setPixmap( 0, SmallIcon( Amarok::icon( "dynamic" ) ) );
setDragEnabled( true );
}
-DynamicEntry::DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+DynamicEntry::DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : PlaylistBrowserEntry( parent, after )
, DynamicMode( xmlDefinition.attribute( "name" ) )
{
setPixmap( 0, SmallIcon( Amarok::icon( "dynamic" ) ) );
@@ -1511,15 +1511,15 @@ DynamicEntry::showContextMenu( const TQPoint &position )
/// CLASS PodcastChannel
////////////////////////////////////////////////////////////////////////////
-PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url )
- : PlaylistBrowserEntry( tqparent, after )
+PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url )
+ : PlaylistBrowserEntry( parent, after )
, m_polished( true ) // we get the items immediately if url is given
, m_url( url )
, m_fetching( false )
, m_updating( false )
, m_new( false )
, m_hasProblem( false )
- , m_tqparent( static_cast<PlaylistCategory*>(tqparent) )
+ , m_parent( static_cast<PlaylistCategory*>(parent) )
, m_settingsValid( false )
{
setDragEnabled( true );
@@ -1531,16 +1531,16 @@ PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after,
fetch();
}
-PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url,
+PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url,
const TQDomNode &channelSettings )
- : PlaylistBrowserEntry( tqparent, after )
+ : PlaylistBrowserEntry( parent, after )
, m_polished( true ) // we get the items immediately if url is given
, m_url( url )
, m_fetching( false )
, m_updating( false )
, m_new( false )
, m_hasProblem( false )
- , m_tqparent( static_cast<PlaylistCategory*>(tqparent) )
+ , m_parent( static_cast<PlaylistCategory*>(parent) )
, m_settingsValid( true )
{
setDragEnabled( true );
@@ -1554,17 +1554,17 @@ PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after,
fetch();
}
-PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after,
+PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after,
const KURL &url, const TQDomNode &channelSettings,
const TQDomDocument &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+ : PlaylistBrowserEntry( parent, after )
, m_polished( true ) //automatically load the channel
, m_url( url )
, m_fetching( false )
, m_updating( false )
, m_new( false )
, m_hasProblem( false )
- , m_tqparent( static_cast<PlaylistCategory*>(tqparent) )
+ , m_parent( static_cast<PlaylistCategory*>(parent) )
, m_settingsValid( true )
{
TQDomNode type = xmlDefinition.namedItem("rss");
@@ -1581,8 +1581,8 @@ PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after,
setPixmap( 0, SmallIcon( Amarok::icon( "podcast" ) ) );
}
-PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const PodcastChannelBundle &pcb )
- : PlaylistBrowserEntry( tqparent, after )
+PodcastChannel::PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const PodcastChannelBundle &pcb )
+ : PlaylistBrowserEntry( parent, after )
, m_bundle( pcb )
, m_polished( false )
, m_url( pcb.url() )
@@ -1590,7 +1590,7 @@ PodcastChannel::PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after,
, m_updating( false )
, m_new( false )
, m_hasProblem( false )
- , m_tqparent( static_cast<PlaylistCategory*>(tqparent) )
+ , m_parent( static_cast<PlaylistCategory*>(parent) )
, m_settingsValid( true )
{
setText( 0, title() );
@@ -1964,7 +1964,7 @@ PodcastChannel::setXml( const TQDomNode &xml, const int feedType )
delete settings;
m_bundle.setImageURL( KURL::fromPathOrURL( img ) );
- m_bundle.setParentId( m_tqparent->id() );
+ m_bundle.setParentId( m_parent->id() );
if( !m_updating )
{ // don't reinsert on a refresh
debug() << "Adding podcast to database" << endl;
@@ -2056,7 +2056,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
TQString guid = xml.namedItem( "guid" ).toElement().text();
if( !guid.isEmpty() )
{
- command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND guid='%2';")
+ command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';")
.tqarg( CollectionDB::instance()->escapeString( url().url() ),
CollectionDB::instance()->escapeString( guid ) );
TQStringList values = CollectionDB::instance()->query( command );
@@ -2065,7 +2065,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
TQString episodeTitle = xml.namedItem( "title" ).toElement().text();
KURL episodeURL = xml.namedItem( "enclosure" ).toElement().attribute( "url" );
- command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND url='%2' AND title='%3';")
+ command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';")
.tqarg( CollectionDB::instance()->escapeString( url().url() ),
CollectionDB::instance()->escapeString( episodeURL.url() ),
CollectionDB::instance()->escapeString( episodeTitle ) );
@@ -2079,7 +2079,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
TQString guid = xml.namedItem( "id" ).toElement().text();
if( !guid.isEmpty() )
{
- command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND guid='%2';")
+ command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND guid='%2';")
.tqarg( CollectionDB::instance()->escapeString( url().url() ),
CollectionDB::instance()->escapeString( guid ) );
TQStringList values = CollectionDB::instance()->query( command );
@@ -2098,7 +2098,7 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
}
}
- command = TQString("SELECT id FROM podcastepisodes WHERE tqparent='%1' AND url='%2' AND title='%3';")
+ command = TQString("SELECT id FROM podcastepisodes WHERE parent='%1' AND url='%2' AND title='%3';")
.tqarg( CollectionDB::instance()->escapeString( url().url() ),
CollectionDB::instance()->escapeString( episodeURL ),
CollectionDB::instance()->escapeString( episodeTitle ) );
@@ -2113,15 +2113,15 @@ PodcastChannel::episodeExists( const TQDomNode &xml, const int feedType )
void
PodcastChannel::setParent( PlaylistCategory *newParent )
{
- if( newParent != m_tqparent )
+ if( newParent != m_parent )
{
- m_tqparent->takeItem( this );
+ m_parent->takeItem( this );
newParent->insertItem( this );
newParent->sortChildItems( 0, true );
- m_tqparent = newParent;
+ m_parent = newParent;
}
- m_bundle.setParentId( m_tqparent->id() );
+ m_bundle.setParentId( m_parent->id() );
CollectionDB::instance()->updatePodcastChannel( m_bundle );
}
@@ -2355,10 +2355,10 @@ PodcastChannel::showContextMenu( const TQPoint &position )
/// @note we fucking hate itunes for taking over podcasts and inserting
/// their own attributes.
////////////////////////////////////////////////////////////////////////////
-PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after,
+PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after,
const TQDomElement &xml, const int feedType, const bool &isNew )
- : PlaylistBrowserEntry( tqparent, after )
- , m_tqparent( tqparent )
+ : PlaylistBrowserEntry( parent, after )
+ , m_parent( parent )
, m_fetching( false )
, m_onDisk( false )
, m_localUrl( KURL() )
@@ -2428,7 +2428,7 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after,
if( title.isEmpty() )
title = link.fileName();
- KURL parentUrl = static_cast<PodcastChannel*>(tqparent)->url();
+ KURL parentUrl = static_cast<PodcastChannel*>(parent)->url();
m_bundle.setDBId( -1 );
m_bundle.setURL( link );
m_bundle.setParent( parentUrl );
@@ -2452,9 +2452,9 @@ PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after,
setRenameEnabled( 0, false );
}
-PodcastEpisode::PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, PodcastEpisodeBundle &bundle )
- : PlaylistBrowserEntry( tqparent, after )
- , m_tqparent( tqparent )
+PodcastEpisode::PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, PodcastEpisodeBundle &bundle )
+ : PlaylistBrowserEntry( parent, after )
+ , m_parent( parent )
, m_bundle( bundle )
, m_fetching( false )
, m_onDisk( false )
@@ -2550,7 +2550,7 @@ PodcastEpisode::downloadMedia()
connect( &m_animationTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotAnimation()) );
KURL localDir;
- PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_tqparent);
+ PodcastChannel *channel = dynamic_cast<PodcastChannel*>(m_parent);
if( channel )
localDir = KURL::fromPathOrURL( channel->saveLocation() );
else
@@ -2633,7 +2633,7 @@ void PodcastEpisode::downloadResult( KIO::Job * transferJob )
setLocalUrl( m_localUrl );
- PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_tqparent );
+ PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_parent );
if( channel && channel->autotransfer() && MediaBrowser::isAvailable() )
{
addToMediaDevice();
@@ -2658,7 +2658,7 @@ void
PodcastEpisode::addToMediaDevice()
{
MetaBundle *bundle = new MetaBundle( localUrl() );
- PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_tqparent );
+ PodcastChannel *channel = dynamic_cast<PodcastChannel *>( m_parent );
if(channel && !channel->title().isEmpty())
bundle->setAlbum(channel->title());
if(!title().isEmpty())
@@ -2687,11 +2687,11 @@ PodcastEpisode::setNew( const bool &n )
updatePixmap();
CollectionDB::instance()->updatePodcastEpisode( dBId(), m_bundle );
- // if we mark an item as listened, we might need to update the tqparent
+ // if we mark an item as listened, we might need to update the parent
if( n == true )
- static_cast<PodcastChannel*>(m_tqparent)->setNew( true );
+ static_cast<PodcastChannel*>(m_parent)->setNew( true );
else
- static_cast<PodcastChannel*>(m_tqparent)->checkAndSetNew();
+ static_cast<PodcastChannel*>(m_parent)->checkAndSetNew();
}
void
@@ -2776,7 +2776,7 @@ PodcastEpisode::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int
if( fmName.width( name ) > _width )
{
//decapitateString removes the channels title from the epsiodes title
- name = Amarok::decapitateString( name, static_cast<PodcastChannel *>(m_tqparent)->title() );
+ name = Amarok::decapitateString( name, static_cast<PodcastChannel *>(m_parent)->title() );
if( fmName.width( name ) > _width )
name = KStringHandler::rPixelSqueeze( name, pBuf.fontMetrics(), _width );
}
@@ -2983,8 +2983,8 @@ class AssociatePodcastDialog : public KDialogBase
vbox->setSpacing( KDialog::spacingHint() );
m_urlRequester = new KURLRequester( vbox );
- if( dynamic_cast<PodcastChannel *>(item->tqparent()) )
- m_urlRequester->setURL( static_cast<PodcastChannel *>(item->tqparent())->saveLocation() );
+ if( dynamic_cast<PodcastChannel *>(item->parent()) )
+ m_urlRequester->setURL( static_cast<PodcastChannel *>(item->parent())->saveLocation() );
}
KURL url() const { return KURL::fromPathOrURL( m_urlRequester->url() ); }
};
@@ -3007,8 +3007,8 @@ PodcastEpisode::associateWithLocalFile()
/// CLASS SmartPlaylist
////////////////////////////////////////////////////////////////////////////
-SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &query )
- : PlaylistBrowserEntry( tqparent, after, name )
+SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query )
+ : PlaylistBrowserEntry( parent, after, name )
, m_sqlForTags( query )
, m_title( name )
, m_dynamic( false )
@@ -3019,8 +3019,8 @@ SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, c
setText( 0, name );
}
-SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &urls, const TQString &tags )
- : PlaylistBrowserEntry( tqparent, after, name )
+SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &urls, const TQString &tags )
+ : PlaylistBrowserEntry( parent, after, name )
, m_sqlForTags( tags )
, m_title( name )
, m_dynamic( false )
@@ -3032,8 +3032,8 @@ SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, c
}
-SmartPlaylist::SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : PlaylistBrowserEntry( tqparent, after )
+SmartPlaylist::SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : PlaylistBrowserEntry( parent, after )
, m_after( after )
, m_dynamic( false )
{
@@ -3454,8 +3454,8 @@ void SmartPlaylist::slotPostRenameItem( const TQString newName )
xml().setAttribute( "name", newName );
}
-ShoutcastBrowser::ShoutcastBrowser( PlaylistCategory *tqparent )
- : PlaylistCategory( tqparent, 0, i18n( "Shoutcast Streams" ) )
+ShoutcastBrowser::ShoutcastBrowser( PlaylistCategory *parent )
+ : PlaylistCategory( parent, 0, i18n( "Shoutcast Streams" ) )
, m_downloading( false )
, m_cj( 0 )
, m_loading1( new TQPixmap( locate("data", "amarok/images/loading1.png" ) ) )
diff --git a/amarok/src/playlistbrowseritem.h b/amarok/src/playlistbrowseritem.h
index 62a2ed6b..3f0ae8db 100644
--- a/amarok/src/playlistbrowseritem.h
+++ b/amarok/src/playlistbrowseritem.h
@@ -52,15 +52,15 @@ class PlaylistBrowserEntry : public TQObject, public KListViewItem
Q_OBJECT
TQ_OBJECT
public:
- PlaylistBrowserEntry( TQListViewItem *tqparent, TQListViewItem *after )
- : KListViewItem( tqparent, after) { m_kept = true; }
- PlaylistBrowserEntry( TQListView *tqparent, TQListViewItem *after )
- : KListViewItem( tqparent, after) { m_kept = true; }
- PlaylistBrowserEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name )
- : KListViewItem( tqparent, after, name) { m_kept = true; }
+ PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after )
+ : KListViewItem( parent, after) { m_kept = true; }
+ PlaylistBrowserEntry( TQListView *parent, TQListViewItem *after )
+ : KListViewItem( parent, after) { m_kept = true; }
+ PlaylistBrowserEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &name )
+ : KListViewItem( parent, after, name) { m_kept = true; }
virtual TQDomElement xml() const { return TQDomElement(); }
- TQListViewItem* tqparent() const { return KListViewItem::tqparent(); }
+ TQListViewItem* parent() const { return KListViewItem::parent(); }
bool isKept() const { return m_kept; } // if kept == true, then it will be saved
void setKept( bool k ); // to the cache files. If false, non-renameable
@@ -89,8 +89,8 @@ class DynamicEntry : public PlaylistBrowserEntry, public DynamicMode
Q_OBJECT
TQ_OBJECT
public:
- DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQString &title );
- DynamicEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition );
+ DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQString &title );
+ DynamicEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
~DynamicEntry() { };
virtual TQString text( int column ) const;
@@ -110,11 +110,11 @@ class PlaylistCategory : public PlaylistBrowserEntry
Q_OBJECT
TQ_OBJECT
public:
- PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQString &, bool isFolder=false );
- PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &, bool isFolder=true );
- PlaylistCategory( TQListView *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder=false);
- PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition );
- PlaylistCategory( PlaylistCategory *tqparent, TQListViewItem *after, const TQString &t, const int id );
+ PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQString &, bool isFolder=false );
+ PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &, bool isFolder=true );
+ PlaylistCategory( TQListView *parent, TQListViewItem *after, const TQDomElement &xmlDefinition, bool isFolder=false);
+ PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
+ PlaylistCategory( PlaylistCategory *parent, TQListViewItem *after, const TQString &t, const int id );
~PlaylistCategory() { };
@@ -159,8 +159,8 @@ class PlaylistEntry : public PlaylistBrowserEntry
friend class PlaylistCategory;
public:
- PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &, int tracks=0, int length=0 );
- PlaylistEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition );
+ PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, int tracks=0, int length=0 );
+ PlaylistEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
~PlaylistEntry();
void sortChildItems ( int /*column*/, bool /*ascending*/ ) { /* Don't sort its tqchildren */ }; //reimplemented
@@ -238,7 +238,7 @@ class PlaylistTrackItem : public PlaylistBrowserEntry
friend class TrackItemInfo;
public:
- PlaylistTrackItem( TQListViewItem *tqparent, TQListViewItem *after, TrackItemInfo *info );
+ PlaylistTrackItem( TQListViewItem *parent, TQListViewItem *after, TrackItemInfo *info );
const KURL &url();
TrackItemInfo *trackInfo() const { return m_trackInfo; }
@@ -262,13 +262,13 @@ class PodcastEpisode : public PlaylistBrowserEntry
TQ_OBJECT
public:
- PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xml,
+ PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xml,
const int feedType, const bool &isNew=false );
- PodcastEpisode( TQListViewItem *tqparent, TQListViewItem *after, PodcastEpisodeBundle &bundle );
+ PodcastEpisode( TQListViewItem *parent, TQListViewItem *after, PodcastEpisodeBundle &bundle );
void downloadMedia();
void setOnDisk( bool d = true );
- TQListViewItem *itemChannel() { return m_tqparent; }
+ TQListViewItem *itemChannel() { return m_parent; }
const bool isNew() const { return m_bundle.isNew(); }
@@ -328,7 +328,7 @@ class PodcastEpisode : public PlaylistBrowserEntry
void stopAnimation();
void updatePixmap();
- TQListViewItem *m_tqparent; //podcast channel it belongs to
+ TQListViewItem *m_parent; //podcast channel it belongs to
PodcastEpisodeBundle m_bundle;
KURL m_localUrl;
@@ -350,12 +350,12 @@ class PodcastChannel : public PlaylistBrowserEntry
TQ_OBJECT
public:
- PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url,
+ PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url,
const TQDomNode &channelSettings );
- PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url );
- PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const KURL &url,
+ PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url );
+ PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const KURL &url,
const TQDomNode &channelSettings, const TQDomDocument &xml );
- PodcastChannel( TQListViewItem *tqparent, TQListViewItem *after, const PodcastChannelBundle &pcb );
+ PodcastChannel( TQListViewItem *parent, TQListViewItem *after, const PodcastChannelBundle &pcb );
enum MediaFetch{ STREAM=0, AUTOMATIC=1 };
@@ -443,7 +443,7 @@ class PodcastChannel : public PlaylistBrowserEntry
bool m_hasProblem;
KIO::TransferJob *m_podcastJob;
- PlaylistCategory *m_tqparent; // category it belongs to
+ PlaylistCategory *m_parent; // category it belongs to
TQString m_podcastCurrentUrl;
TQPtrList<PodcastEpisode> m_podcastDownloadQueue;
bool m_settingsValid;
@@ -454,8 +454,8 @@ class StreamEntry : public PlaylistBrowserEntry
Q_OBJECT
TQ_OBJECT
public:
- StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &, const TQString &t );
- StreamEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition );
+ StreamEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &, const TQString &t );
+ StreamEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
~StreamEntry() { };
void setURL ( KURL u ) { m_url = u; }
@@ -488,10 +488,10 @@ class LastFmEntry : public StreamEntry
Q_OBJECT
TQ_OBJECT
public:
- LastFmEntry( TQListViewItem *tqparent, TQListViewItem *after, const KURL &u, const TQString &t )
- : StreamEntry( tqparent, after, u, t ) { }
- LastFmEntry( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition )
- : StreamEntry( tqparent, after, xmlDefinition ) { }
+ LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const KURL &u, const TQString &t )
+ : StreamEntry( parent, after, u, t ) { }
+ LastFmEntry( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition )
+ : StreamEntry( parent, after, xmlDefinition ) { }
virtual TQDomElement xml() const;
public slots:
@@ -505,7 +505,7 @@ class LastFmEntry : public StreamEntry
class StreamEditor : public KDialogBase
{
public:
- StreamEditor( TQWidget *tqparent, const TQString &title, const TQString &url, bool readonly = false );
+ StreamEditor( TQWidget *parent, const TQString &title, const TQString &url, bool readonly = false );
KURL url() const { return KURL( m_urlLineEdit->text() ); }
TQString name() const { return m_nameLineEdit->text().replace( "\n", " " ); }
@@ -521,10 +521,10 @@ class SmartPlaylist : public PlaylistBrowserEntry
Q_OBJECT
TQ_OBJECT
public:
- SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name, const TQString &query );
- SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQString &name,
+ SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name, const TQString &query );
+ SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQString &name,
const TQString &urls, const TQString &tags );
- SmartPlaylist( TQListViewItem *tqparent, TQListViewItem *after, const TQDomElement &xmlDefinition );
+ SmartPlaylist( TQListViewItem *parent, TQListViewItem *after, const TQDomElement &xmlDefinition );
bool isDynamic() const { return m_dynamic; }
bool isEditable() const { return !m_xml.isNull(); }
@@ -592,7 +592,7 @@ class ShoutcastBrowser : public PlaylistCategory
Q_OBJECT
TQ_OBJECT
public:
- ShoutcastBrowser( PlaylistCategory* tqparent );
+ ShoutcastBrowser( PlaylistCategory* parent );
void setOpen( bool open );
public slots:
diff --git a/amarok/src/playlistselection.cpp b/amarok/src/playlistselection.cpp
index e5c69391..881667b0 100644
--- a/amarok/src/playlistselection.cpp
+++ b/amarok/src/playlistselection.cpp
@@ -31,8 +31,8 @@
#include <klistview.h>
#include <klocale.h>
-PlaylistSelection::PlaylistSelection( TQWidget* tqparent, const char* name )
- : KListView( tqparent, name )
+PlaylistSelection::PlaylistSelection( TQWidget* parent, const char* name )
+ : KListView( parent, name )
{
addColumn( i18n("Select Playlists") );
setRootIsDecorated( true );
@@ -71,9 +71,9 @@ void PlaylistSelection::loadChildren( TQListViewItem* browserParent, TQListViewI
////////////////////////////////
namespace ConfigDynamic
{
- KDialogBase* basicDialog( TQWidget* tqparent )
+ KDialogBase* basicDialog( TQWidget* parent )
{
- KDialogBase* dialog = new KDialogBase( tqparent, "new dynamic", true,
+ KDialogBase* dialog = new KDialogBase( parent, "new dynamic", true,
i18n("Create Dynamic Playlist"),
KDialogBase::Ok | KDialogBase::Cancel,
KDialogBase::Ok, true );
@@ -87,9 +87,9 @@ namespace ConfigDynamic
return dialog;
}
- void dynamicDialog( TQWidget* tqparent )
+ void dynamicDialog( TQWidget* parent )
{
- KDialogBase* dialog = basicDialog( tqparent );
+ KDialogBase* dialog = basicDialog( parent );
NewDynamic* nd = static_cast<NewDynamic*>(dialog->mainWidget());
nd->m_mixLabel->setText( i18n("Add Dynamic Playlist") );
@@ -97,9 +97,9 @@ namespace ConfigDynamic
addDynamic( nd );
}
- void editDynamicPlaylist( TQWidget* tqparent, DynamicMode* mode )
+ void editDynamicPlaylist( TQWidget* parent, DynamicMode* mode )
{
- KDialogBase* dialog = basicDialog( tqparent );
+ KDialogBase* dialog = basicDialog( parent );
NewDynamic* nd = static_cast<NewDynamic*>(dialog->mainWidget());
nd->m_name->setText( mode->title() );
@@ -171,14 +171,14 @@ namespace ConfigDynamic
void addDynamic( NewDynamic* dialog )
{
- TQListViewItem *tqparent = PlaylistBrowser::instance()->getDynamicCategory();
- DynamicEntry *saveMe = new DynamicEntry( tqparent, 0, dialog->m_name->text().replace( "\n", " " ) );
+ TQListViewItem *parent = PlaylistBrowser::instance()->getDynamicCategory();
+ DynamicEntry *saveMe = new DynamicEntry( parent, 0, dialog->m_name->text().replace( "\n", " " ) );
saveMe->setAppendType( DynamicMode::CUSTOM );
loadDynamicMode( saveMe, dialog );
- tqparent->sortChildItems( 0, true );
- tqparent->setOpen( true );
+ parent->sortChildItems( 0, true );
+ parent->setOpen( true );
PlaylistBrowser::instance()->saveDynamics();
}
@@ -187,13 +187,13 @@ namespace ConfigDynamic
////////////////////////////////
/// SelectionListItem
////////////////////////////////
-SelectionListItem::SelectionListItem( TQCheckListItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent )
- : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox )
+SelectionListItem::SelectionListItem( TQCheckListItem * parent, const TQString& text, TQListViewItem* browserEquivalent )
+ : TQCheckListItem( parent, text, TQCheckListItem::CheckBox )
, m_browserEquivalent( browserEquivalent )
{ }
-SelectionListItem::SelectionListItem( TQListViewItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent )
- : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox )
+SelectionListItem::SelectionListItem( TQListViewItem * parent, const TQString& text, TQListViewItem* browserEquivalent )
+ : TQCheckListItem( parent, text, TQCheckListItem::CheckBox )
, m_browserEquivalent( browserEquivalent )
{ }
@@ -211,10 +211,10 @@ TQString
SelectionListItem::name() const
{
TQString fullName = text(0).replace('/', "\\/");
- TQListViewItem *p = tqparent();
+ TQListViewItem *p = parent();
while ( p ) {
fullName.prepend( p->text(0).replace('/', "\\/") + "/" );
- p = p->tqparent();
+ p = p->parent();
}
return fullName;
}
diff --git a/amarok/src/playlistselection.h b/amarok/src/playlistselection.h
index e1d2844b..da65d54d 100644
--- a/amarok/src/playlistselection.h
+++ b/amarok/src/playlistselection.h
@@ -22,7 +22,7 @@ class PlaylistSelection : public KListView
Q_OBJECT
TQ_OBJECT
public:
- PlaylistSelection(TQWidget* tqparent, const char* name);
+ PlaylistSelection(TQWidget* parent, const char* name);
virtual TQSize tqsizeHint() const
{
return tqminimumSizeHint();
@@ -35,18 +35,18 @@ class PlaylistSelection : public KListView
namespace ConfigDynamic
{
void addDynamic( NewDynamic* dialog );
- void dynamicDialog( TQWidget* tqparent );
- void editDynamicPlaylist( TQWidget* tqparent, DynamicMode* mode );
+ void dynamicDialog( TQWidget* parent );
+ void editDynamicPlaylist( TQWidget* parent, DynamicMode* mode );
void loadDynamicMode( DynamicMode* saveMe, NewDynamic* dialog );
- KDialogBase* basicDialog( TQWidget* tqparent );
+ KDialogBase* basicDialog( TQWidget* parent );
}
class SelectionListItem : public TQCheckListItem
{
public:
- SelectionListItem( TQListViewItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent );
- SelectionListItem( TQCheckListItem * tqparent, const TQString& text, TQListViewItem* browserEquivalent );
+ SelectionListItem( TQListViewItem * parent, const TQString& text, TQListViewItem* browserEquivalent );
+ SelectionListItem( TQCheckListItem * parent, const TQString& text, TQListViewItem* browserEquivalent );
virtual TQString name() const;
diff --git a/amarok/src/playlistwindow.cpp b/amarok/src/playlistwindow.cpp
index a44a36af..8a71fdb0 100644
--- a/amarok/src/playlistwindow.cpp
+++ b/amarok/src/playlistwindow.cpp
@@ -86,8 +86,8 @@ namespace Amarok
class ToolBar : public KToolBar
{
public:
- ToolBar( TQWidget *tqparent, const char *name )
- : KToolBar( tqparent, name )
+ ToolBar( TQWidget *parent, const char *name )
+ : KToolBar( parent, name )
{}
protected:
@@ -561,7 +561,7 @@ void PlaylistWindow::createGUI()
//TEXT ON RIGHT HACK
//KToolBarButtons have independent settings for their appearance.
- //KToolBarButton::modeChange() causes that button to set its mode to that of its tqparent KToolBar
+ //KToolBarButton::modeChange() causes that button to set its mode to that of its parent KToolBar
//KToolBar::setIconText() calls modeChange() for tqchildren, unless 2nd param is false
TQStringList list;
@@ -1187,8 +1187,8 @@ PlaylistWindow::mbAvailabilityChanged( bool isAvailable ) //SLOT
//////////////////////////////////////////////////////////////////////////////////////////
/// DynamicBar
//////////////////////////////////////////////////////////////////////////////////////////
-DynamicBar::DynamicBar(TQWidget* tqparent)
- : TQHBox( tqparent, "DynamicModeStatusBar" )
+DynamicBar::DynamicBar(TQWidget* parent)
+ : TQHBox( parent, "DynamicModeStatusBar" )
{
m_titleWidget = new DynamicTitle(this);
diff --git a/amarok/src/playlistwindow.h b/amarok/src/playlistwindow.h
index 3cb5943a..83d4d816 100644
--- a/amarok/src/playlistwindow.h
+++ b/amarok/src/playlistwindow.h
@@ -127,7 +127,7 @@ class DynamicTitle : public TQWidget
Q_OBJECT
TQ_OBJECT
public:
- DynamicTitle( TQWidget* tqparent );
+ DynamicTitle( TQWidget* parent );
void setTitle( const TQString& newTitle );
protected:
@@ -145,7 +145,7 @@ class DynamicBar : public TQHBox
Q_OBJECT
TQ_OBJECT
public:
- DynamicBar( TQWidget* tqparent );
+ DynamicBar( TQWidget* parent );
void init();
public slots:
diff --git a/amarok/src/plugin/plugin.h b/amarok/src/plugin/plugin.h
index e29c88e8..b10948c7 100644
--- a/amarok/src/plugin/plugin.h
+++ b/amarok/src/plugin/plugin.h
@@ -27,10 +27,10 @@ namespace Amarok
virtual ~Plugin();
/**
- * TODO @param tqparent you must tqparent the widget to tqparent
+ * TODO @param parent you must parent the widget to parent
* @return the configure widget for your plugin, create it on the heap!
*/
- //TODO rename configureWidget( TQWidget *tqparent )
+ //TODO rename configureWidget( TQWidget *parent )
virtual PluginConfig* configure() const { return 0; }
void addPluginProperty( const TQString& key, const TQString& value );
diff --git a/amarok/src/podcastbundle.h b/amarok/src/podcastbundle.h
index 5df89ae0..f1e4fbe1 100644
--- a/amarok/src/podcastbundle.h
+++ b/amarok/src/podcastbundle.h
@@ -60,7 +60,7 @@ class PodcastChannelBundle
const KURL &imageURL() const;
const TQString &description() const;
const TQString &copyright() const;
- /// The id which the tqparent folder has in the database
+ /// The id which the parent folder has in the database
int parentId() const;
void setURL( const KURL &u );
@@ -149,7 +149,7 @@ class PodcastEpisodeBundle
, m_isNew( false )
{
}
- PodcastEpisodeBundle( const KURL &url, const KURL &tqparent, const TQString &title,
+ PodcastEpisodeBundle( const KURL &url, const KURL &parent, const TQString &title,
const TQString &author, const TQString &desc, const TQString &date,
const TQString &type, const int duration, const TQString &guid,
const bool isNew )
@@ -157,7 +157,7 @@ class PodcastEpisodeBundle
, m_size( 0 )
{
m_url = url;
- m_tqparent = tqparent;
+ m_parent = parent;
m_author = author;
m_title = title;
m_description = desc;
@@ -178,7 +178,7 @@ class PodcastEpisodeBundle
/// The local url of the podcast episode (if it has been downloaded, an invalid url otherwise)
const KURL &localUrl() const;
/// The url of the podcast channel
- const KURL &tqparent() const;
+ const KURL &parent() const;
const TQString &author() const;
const TQString &title() const;
const TQString &subtitle() const;
@@ -215,7 +215,7 @@ class PodcastEpisodeBundle
int m_id;
KURL m_url;
KURL m_localUrl;
- KURL m_tqparent;
+ KURL m_parent;
TQString m_author;
TQString m_title;
TQString m_subtitle;
@@ -232,7 +232,7 @@ class PodcastEpisodeBundle
inline int PodcastEpisodeBundle::dBId() const { return m_id; }
inline const KURL &PodcastEpisodeBundle::url() const { return m_url; }
inline const KURL &PodcastEpisodeBundle::localUrl() const { return m_localUrl; }
-inline const KURL &PodcastEpisodeBundle::tqparent() const { return m_tqparent; }
+inline const KURL &PodcastEpisodeBundle::parent() const { return m_parent; }
inline const TQString &PodcastEpisodeBundle::author() const { return m_author; }
inline const TQString &PodcastEpisodeBundle::title() const { return m_title; }
inline const TQString &PodcastEpisodeBundle::subtitle() const { return m_subtitle; }
@@ -248,7 +248,7 @@ inline bool PodcastEpisodeBundle::isNew() const { return m_isNew
inline void PodcastEpisodeBundle::setDBId( const int i ) { m_id = i; }
inline void PodcastEpisodeBundle::setURL( const KURL &u ) { m_url = u; }
inline void PodcastEpisodeBundle::setLocalURL( const KURL &u ) { m_localUrl = u; }
-inline void PodcastEpisodeBundle::setParent( const KURL &u ) { m_tqparent = u; }
+inline void PodcastEpisodeBundle::setParent( const KURL &u ) { m_parent = u; }
inline void PodcastEpisodeBundle::setAuthor( const TQString &a ) { m_author = a; }
inline void PodcastEpisodeBundle::setTitle( const TQString &t ) { m_title = t; }
inline void PodcastEpisodeBundle::setSubtitle( const TQString &t ) { m_subtitle = t; }
diff --git a/amarok/src/podcastsettings.cpp b/amarok/src/podcastsettings.cpp
index 9a3168f9..2d68b0e6 100644
--- a/amarok/src/podcastsettings.cpp
+++ b/amarok/src/podcastsettings.cpp
@@ -62,8 +62,8 @@ PodcastSettings::PodcastSettings( const TQString &title, const TQString &save, c
m_purgeCount = purgecount;
}
-PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* tqparent )
- : KDialogBase( tqparent, 0, true, i18n("change options", "Configure %1").tqarg( settings->m_title )
+PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidget* parent )
+ : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( settings->m_title )
, KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel
, KDialogBase::Ok, true
, KGuiItem(i18n("Reset"), "reset" ) )
@@ -73,8 +73,8 @@ PodcastSettingsDialog::PodcastSettingsDialog( PodcastSettings *settings, TQWidge
setSettings( settings );
}
-PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* tqparent )
- : KDialogBase( tqparent, 0, true, i18n("change options", "Configure %1").tqarg( caption )
+PodcastSettingsDialog::PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent )
+ : KDialogBase( parent, 0, true, i18n("change options", "Configure %1").tqarg( caption )
, KDialogBase::User1|KDialogBase::Ok|KDialogBase::Cancel
, KDialogBase::Ok, true
, KGuiItem(i18n("Reset"), "reset" ) )
diff --git a/amarok/src/podcastsettings.h b/amarok/src/podcastsettings.h
index 8ad7beb1..f99a8aca 100644
--- a/amarok/src/podcastsettings.h
+++ b/amarok/src/podcastsettings.h
@@ -51,8 +51,8 @@ class PodcastSettingsDialog : public KDialogBase
TQ_OBJECT
public:
- PodcastSettingsDialog( PodcastSettings *list, TQWidget* tqparent=0 );
- PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* tqparent=0 );
+ PodcastSettingsDialog( PodcastSettings *list, TQWidget* parent=0 );
+ PodcastSettingsDialog( const TQPtrList<PodcastSettings> &list, const TQString &caption, TQWidget* parent=0 );
bool configure();
PodcastSettings *getSettings() { return m_settings; }
diff --git a/amarok/src/prettypopupmenu.cpp b/amarok/src/prettypopupmenu.cpp
index 6962cfbb..5fe1bbe4 100644
--- a/amarok/src/prettypopupmenu.cpp
+++ b/amarok/src/prettypopupmenu.cpp
@@ -37,8 +37,8 @@ TQColor PrettyPopupMenu::s_sidePixmapColor;
// public
////////////////////////////////////////////////////////////////////////////////
-PrettyPopupMenu::PrettyPopupMenu( TQWidget* tqparent, const char* name )
- : KPopupMenu( tqparent, name )
+PrettyPopupMenu::PrettyPopupMenu( TQWidget* parent, const char* name )
+ : KPopupMenu( parent, name )
{
// Must be initialized so that we know the size on first invocation
if ( s_sidePixmap.isNull() )
diff --git a/amarok/src/prettypopupmenu.h b/amarok/src/prettypopupmenu.h
index 06bdbd66..53444a1d 100644
--- a/amarok/src/prettypopupmenu.h
+++ b/amarok/src/prettypopupmenu.h
@@ -45,7 +45,7 @@ class PrettyPopupMenu : public KPopupMenu
TQ_OBJECT
public:
- PrettyPopupMenu( TQWidget *tqparent = 0, const char *name = 0 );
+ PrettyPopupMenu( TQWidget *parent = 0, const char *name = 0 );
int sidePixmapWidth() const { return s_sidePixmap.width(); }
diff --git a/amarok/src/queuemanager.cpp b/amarok/src/queuemanager.cpp
index d99596fa..cb656662 100644
--- a/amarok/src/queuemanager.cpp
+++ b/amarok/src/queuemanager.cpp
@@ -64,8 +64,8 @@ QueueItem::paintCell( TQPainter *p, const TQColorGroup &cg, int column, int widt
/// CLASS QueueList
//////////////////////////////////////////////////////////////////////////////////////////
-QueueList::QueueList( TQWidget *tqparent, const char *name )
- : KListView( tqparent, name )
+QueueList::QueueList( TQWidget *parent, const char *name )
+ : KListView( parent, name )
{
addColumn( i18n("Name") );
setResizeMode( TQListView::LastColumn );
@@ -262,10 +262,10 @@ QueueList::contentsDropEvent( TQDropEvent *e )
}
else
{
- TQListViewItem *tqparent = 0;
+ TQListViewItem *parent = 0;
TQListViewItem *after;
- findDrop( e->pos(), tqparent, after );
+ findDrop( e->pos(), parent, after );
QueueManager::instance()->addItems( after );
}
@@ -278,8 +278,8 @@ QueueList::contentsDropEvent( TQDropEvent *e )
QueueManager *QueueManager::s_instance = 0;
-QueueManager::QueueManager( TQWidget *tqparent, const char *name )
- : KDialogBase( KDialogBase::Swallow, 0, tqparent, name, false, 0, Ok|Apply|Cancel )
+QueueManager::QueueManager( TQWidget *parent, const char *name )
+ : KDialogBase( KDialogBase::Swallow, 0, parent, name, false, 0, Ok|Apply|Cancel )
{
s_instance = this;
diff --git a/amarok/src/queuemanager.h b/amarok/src/queuemanager.h
index 478bc247..10df80ba 100644
--- a/amarok/src/queuemanager.h
+++ b/amarok/src/queuemanager.h
@@ -26,8 +26,8 @@ class KPushButton;
class QueueItem : public KListViewItem
{
public:
- QueueItem( TQListView *tqparent, TQListViewItem *after, TQString t )
- : KListViewItem( tqparent, after, t )
+ QueueItem( TQListView *parent, TQListViewItem *after, TQString t )
+ : KListViewItem( parent, after, t )
{ };
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -42,7 +42,7 @@ class QueueList : public KListView
friend class QueueManager;
public:
- QueueList( TQWidget *tqparent, const char *name = 0 );
+ QueueList( TQWidget *parent, const char *name = 0 );
~QueueList() {};
bool hasSelection();
@@ -72,7 +72,7 @@ class QueueManager : public KDialogBase
TQ_OBJECT
public:
- QueueManager( TQWidget *tqparent = 0, const char *name = 0 );
+ QueueManager( TQWidget *parent = 0, const char *name = 0 );
~QueueManager();
TQPtrList<PlaylistItem> newQueue();
diff --git a/amarok/src/scancontroller.cpp b/amarok/src/scancontroller.cpp
index c147333a..cb68dc58 100644
--- a/amarok/src/scancontroller.cpp
+++ b/amarok/src/scancontroller.cpp
@@ -55,8 +55,8 @@ void ScanController::setInstance( ScanController* curr )
currController = curr;
}
-ScanController::ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders )
- : DependentJob( tqparent, "CollectionScanner" )
+ScanController::ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders )
+ : DependentJob( parent, "CollectionScanner" )
, TQXmlDefaultHandler()
, m_scanner( new Amarok::ProcIO() )
, m_folders( TQDeepCopy<TQStringList>( folders ) )
diff --git a/amarok/src/scancontroller.h b/amarok/src/scancontroller.h
index 780b65c6..05de2373 100644
--- a/amarok/src/scancontroller.h
+++ b/amarok/src/scancontroller.h
@@ -74,7 +74,7 @@ class ScanController : public ThreadManager::DependentJob, public TQXmlDefaultHa
};
public:
- ScanController( CollectionDB* tqparent, bool incremental, const TQStringList& folders = TQStringList() );
+ ScanController( CollectionDB* parent, bool incremental, const TQStringList& folders = TQStringList() );
~ScanController();
static ScanController* instance();
diff --git a/amarok/src/scriptmanager.cpp b/amarok/src/scriptmanager.cpp
index a173a843..8cf3c91e 100644
--- a/amarok/src/scriptmanager.cpp
+++ b/amarok/src/scriptmanager.cpp
@@ -134,8 +134,8 @@ class AmarokScriptNewStuff : public KNewStuff
ScriptManager* ScriptManager::s_instance = 0;
-ScriptManager::ScriptManager( TQWidget *tqparent, const char *name )
- : KDialogBase( tqparent, name, false, TQString(), Close, Close, true )
+ScriptManager::ScriptManager( TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, false, TQString(), Close, Close, true )
, EngineObserver( EngineController::instance() )
, m_gui( new ScriptManagerBase( this ) )
{
diff --git a/amarok/src/scriptmanager.h b/amarok/src/scriptmanager.h
index a3707248..c07f994e 100644
--- a/amarok/src/scriptmanager.h
+++ b/amarok/src/scriptmanager.h
@@ -61,7 +61,7 @@ class ScriptManager : public KDialogBase, public EngineObserver
friend class AmarokScriptNewStuff;
public:
- ScriptManager( TQWidget *tqparent = 0, const char *name = 0 );
+ ScriptManager( TQWidget *parent = 0, const char *name = 0 );
virtual ~ScriptManager();
static ScriptManager* instance() { return s_instance ? s_instance : new ScriptManager( PlaylistWindow::self() ); }
diff --git a/amarok/src/scripts/common/Zeroconf.py b/amarok/src/scripts/common/Zeroconf.py
index 14f4668f..fa508393 100644
--- a/amarok/src/scripts/common/Zeroconf.py
+++ b/amarok/src/scripts/common/Zeroconf.py
@@ -112,7 +112,7 @@ _DNS_TTL = 60 * 60; # one hour default TTL
_MAX_MSG_TYPICAL = 1460 # unused
_MAX_MSG_ABSOLUTE = 8972
-_FLAGS_QR_MASK = 0x8000 # query response tqmask
+_FLAGS_QR_MASK = 0x8000 # query response mask
_FLAGS_QR_QUERY = 0x0000 # query
_FLAGS_QR_RESPONSE = 0x8000 # response
diff --git a/amarok/src/scripts/databasescripts/TODO b/amarok/src/scripts/databasescripts/TODO
index cfebb831..76457207 100644
--- a/amarok/src/scripts/databasescripts/TODO
+++ b/amarok/src/scripts/databasescripts/TODO
@@ -6,5 +6,5 @@ Script Ideas:
General:
* Properly use the ui file, to make it easier to maintain later
-* Maybe pass error messages back to the tqparent dialog to abstract scripts away from amarok?
+* Maybe pass error messages back to the parent dialog to abstract scripts away from amarok?
diff --git a/amarok/src/scripts/databasescripts/databaseScripts.rb b/amarok/src/scripts/databasescripts/databaseScripts.rb
index d42086fc..d2b5d162 100644
--- a/amarok/src/scripts/databasescripts/databaseScripts.rb
+++ b/amarok/src/scripts/databasescripts/databaseScripts.rb
@@ -29,7 +29,7 @@ class DatabaseScriptChooser < Qt::Dialog
Q_SLOTS 'optionChanged(int)', 'textChanged(const QString &)', 'accept()', 'cancel()'
- def initialize(tqparent = nil, name = nil, modal = false, fl = 0)
+ def initialize(parent = nil, name = nil, modal = false, fl = 0)
super
if name.nil?
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
index 2ff6d27c..a377b88e 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.cpp
@@ -16,8 +16,8 @@
#include <klocale.h>
#include <kmessagebox.h>
-EqualizerCanvasView::EqualizerCanvasView(TQWidget *tqparent = 0, const char *name = 0)
- : TQCanvasView(tqparent, name)
+EqualizerCanvasView::EqualizerCanvasView(TQWidget *parent = 0, const char *name = 0)
+ : TQCanvasView(parent, name)
{
m_pen.setWidth(5);
m_circleList = new TQPtrList<EqualizerCircle>();
diff --git a/amarok/src/scripts/graphequalizer/equalizercanvasview.h b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
index f34dc8d9..045aff16 100644
--- a/amarok/src/scripts/graphequalizer/equalizercanvasview.h
+++ b/amarok/src/scripts/graphequalizer/equalizercanvasview.h
@@ -45,7 +45,7 @@ class EqualizerCanvasView : public TQCanvasView
Q_OBJECT
TQ_OBJECT
public:
- EqualizerCanvasView(TQWidget *tqparent, const char *name);
+ EqualizerCanvasView(TQWidget *parent, const char *name);
void init();
void contentsMousePressEvent(TQMouseEvent *event);
void contentsMouseDoubleClickEvent(TQMouseEvent *event);
@@ -67,9 +67,9 @@ class CallAmarok : public TQObject
Q_OBJECT
TQ_OBJECT
public:
- CallAmarok(TQObject* tqparent, const char *name,
+ CallAmarok(TQObject* parent, const char *name,
EqualizerCanvasView* canvasView, TQSlider* preampSlider)
- : TQObject(tqparent, name)
+ : TQObject(parent, name)
{
m_canvasView = canvasView;
m_preampSlider = preampSlider;
diff --git a/amarok/src/scripts/graphequalizer/stdinreader.h b/amarok/src/scripts/graphequalizer/stdinreader.h
index b4b8acbd..95a0adc1 100644
--- a/amarok/src/scripts/graphequalizer/stdinreader.h
+++ b/amarok/src/scripts/graphequalizer/stdinreader.h
@@ -15,8 +15,8 @@ class StdinReader : public TQObject
TQ_OBJECT
public:
- StdinReader(TQObject * tqparent = 0, const char * name = 0)
- :TQObject(tqparent,name)
+ StdinReader(TQObject * parent = 0, const char * name = 0)
+ :TQObject(parent,name)
{
TQSocketNotifier* streamListener = new TQSocketNotifier(0, TQSocketNotifier::Read, this, "stdinWatcher");
connect(streamListener, TQT_SIGNAL(activated(int)), this, TQT_SLOT(dataRecieved()) );
diff --git a/amarok/src/sliderwidget.cpp b/amarok/src/sliderwidget.cpp
index 4e2c1d81..15998af7 100644
--- a/amarok/src/sliderwidget.cpp
+++ b/amarok/src/sliderwidget.cpp
@@ -41,8 +41,8 @@
#include <kpopupmenu.h>
#include <kstandarddirs.h>
-Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *tqparent, uint max )
- : TQSlider( orientation, tqparent )
+Amarok::Slider::Slider( Qt::Orientation orientation, TQWidget *parent, uint max )
+ : TQSlider( orientation, parent )
, m_sliding( false )
, m_outside( false )
, m_prevValue( 0 )
@@ -54,7 +54,7 @@ void
Amarok::Slider::wheelEvent( TQWheelEvent *e )
{
if( orientation() == Qt::Vertical ) {
- // Will be handled by the tqparent widget
+ // Will be handled by the parent widget
e->ignore();
return;
}
@@ -141,8 +141,8 @@ Amarok::Slider::setValue( int newValue )
#define MARGIN 3
Amarok::PrettySlider::PrettySlider( Qt::Orientation orientation, SliderMode mode,
- TQWidget *tqparent, uint max )
- : Amarok::Slider( orientation, tqparent, max )
+ TQWidget *parent, uint max )
+ : Amarok::Slider( orientation, parent, max )
, m_mode( mode )
, m_showingMoodbar( false )
{
@@ -350,8 +350,8 @@ Amarok::PrettySlider::tqsizeHint() const
/// CLASS VolumeSlider
//////////////////////////////////////////////////////////////////////////////////////////
-Amarok::VolumeSlider::VolumeSlider( TQWidget *tqparent, uint max )
- : Amarok::Slider( Qt::Horizontal, tqparent, max )
+Amarok::VolumeSlider::VolumeSlider( TQWidget *parent, uint max )
+ : Amarok::Slider( Qt::Horizontal, parent, max )
, m_animCount( 0 )
, m_animTimer( new TQTimer( this ) )
, m_pixmapInset( TQPixmap( locate( "data","amarok/images/volumeslider-inset.png" ) ) )
@@ -389,12 +389,12 @@ Amarok::VolumeSlider::generateGradient()
//KIconEffect::colorize( temp, tqcolorGroup().highlight(), 1.0 );
const TQPixmap temp( locate( "data","amarok/images/volumeslider-gradient.png" ) );
- const TQBitmap tqmask( temp.createHeuristicMask() );
+ const TQBitmap mask( temp.createHeuristicMask() );
m_pixmapGradient = TQPixmap( m_pixmapInset.size() );
KPixmapEffect::gradient( m_pixmapGradient, tqcolorGroup().background(), tqcolorGroup().highlight(),
KPixmapEffect::HorizontalGradient );
- m_pixmapGradient.setMask( tqmask );
+ m_pixmapGradient.setMask( mask );
}
void
diff --git a/amarok/src/sliderwidget.h b/amarok/src/sliderwidget.h
index 2bf4d7aa..9d90f4eb 100644
--- a/amarok/src/sliderwidget.h
+++ b/amarok/src/sliderwidget.h
@@ -94,7 +94,7 @@ namespace Amarok
} SliderMode;
PrettySlider( Qt::Orientation orientation, SliderMode mode,
- TQWidget *tqparent, uint max = 0 );
+ TQWidget *parent, uint max = 0 );
virtual void newBundle( const MetaBundle &bundle );
@@ -122,7 +122,7 @@ namespace Amarok
TQ_OBJECT
public:
- VolumeSlider( TQWidget *tqparent, uint max = 0 );
+ VolumeSlider( TQWidget *parent, uint max = 0 );
protected:
virtual void paintEvent( TQPaintEvent* );
diff --git a/amarok/src/smartplaylisteditor.cpp b/amarok/src/smartplaylisteditor.cpp
index d81e3e12..5ca0242f 100644
--- a/amarok/src/smartplaylisteditor.cpp
+++ b/amarok/src/smartplaylisteditor.cpp
@@ -64,8 +64,8 @@ TQStringList m_expandableDbFields;
-SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *tqparent, const char *name )
- : KDialogBase( tqparent, name, true, i18n("Create Smart Playlist"),
+SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *parent, const char *name )
+ : KDialogBase( parent, name, true, i18n("Create Smart Playlist"),
Ok|Cancel, Ok, true )
{
init(defaultName);
@@ -74,8 +74,8 @@ SmartPlaylistEditor::SmartPlaylistEditor( TQString defaultName, TQWidget *tqpare
}
-SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *tqparent, TQDomElement xml, const char *name)
- : KDialogBase( tqparent, name, true, i18n("Edit Smart Playlist"),
+SmartPlaylistEditor::SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, const char *name)
+ : KDialogBase( parent, name, true, i18n("Edit Smart Playlist"),
Ok|Cancel, Ok, true )
{
init( xml.attribute( "name" ) );
@@ -403,8 +403,8 @@ TQDomElement SmartPlaylistEditor::result()
// CLASS CriteriaEditor
////////////////////////////////////////////////////////////////////////////
-CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *tqparent, int criteriaType, TQDomElement criteria )
- : TQHBox( tqparent )
+CriteriaEditor::CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria )
+ : TQHBox( parent )
, m_playlistEditor( editor )
, m_currentValueType( -1 )
{
diff --git a/amarok/src/smartplaylisteditor.h b/amarok/src/smartplaylisteditor.h
index 03021851..145648bb 100644
--- a/amarok/src/smartplaylisteditor.h
+++ b/amarok/src/smartplaylisteditor.h
@@ -30,8 +30,8 @@ Q_OBJECT
friend class CriteriaEditor;
public:
- SmartPlaylistEditor( TQString playlist_name, TQWidget *tqparent, const char *name=0 );
- SmartPlaylistEditor( TQWidget *tqparent, TQDomElement xml, const char *name=0 );
+ SmartPlaylistEditor( TQString playlist_name, TQWidget *parent, const char *name=0 );
+ SmartPlaylistEditor( TQWidget *parent, TQDomElement xml, const char *name=0 );
TQDomElement result();
@@ -86,7 +86,7 @@ class CriteriaEditor : public TQHBox
Q_OBJECT
TQ_OBJECT
public:
- CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *tqparent, int criteriaType, TQDomElement criteria = TQDomElement() );
+ CriteriaEditor( SmartPlaylistEditor *editor, TQWidget *parent, int criteriaType, TQDomElement criteria = TQDomElement() );
~CriteriaEditor();
TQString getSearchCriteria();
void setSearchCriteria( const TQString &str );
diff --git a/amarok/src/socketserver.cpp b/amarok/src/socketserver.cpp
index 813e412d..8559bbeb 100644
--- a/amarok/src/socketserver.cpp
+++ b/amarok/src/socketserver.cpp
@@ -38,8 +38,8 @@
/// @class Amarok::SocketServer
-Amarok::SocketServer::SocketServer( const TQString &socketName, TQObject *tqparent )
- : TQServerSocket( tqparent )
+Amarok::SocketServer::SocketServer( const TQString &socketName, TQObject *parent )
+ : TQServerSocket( parent )
{
m_sockfd = ::socket( AF_UNIX, SOCK_STREAM, 0 );
@@ -85,8 +85,8 @@ Amarok::SocketServer::~SocketServer()
/// @class Vis::SocketServer
-Vis::SocketServer::SocketServer( TQObject *tqparent )
- : Amarok::SocketServer( "amarok.visualization_socket", tqparent )
+Vis::SocketServer::SocketServer( TQObject *parent )
+ : Amarok::SocketServer( "amarok.visualization_socket", parent )
{}
void
@@ -145,16 +145,16 @@ Vis::SocketNotifier::request( int sockfd ) //slot
Vis::Selector*
Vis::Selector::instance()
{
- TQWidget *tqparent = reinterpret_cast<TQWidget*>( pApp->playlistWindow() );
- TQObject *o = tqparent->child( "Vis::Selector::instance" );
+ TQWidget *parent = reinterpret_cast<TQWidget*>( pApp->playlistWindow() );
+ TQObject *o = parent->child( "Vis::Selector::instance" );
debug() << bool(o == 0) << endl;
- return o ? static_cast<Selector*>( TQT_TQWIDGET(o) ) : new Selector( tqparent );
+ return o ? static_cast<Selector*>( TQT_TQWIDGET(o) ) : new Selector( parent );
}
-Vis::Selector::Selector( TQWidget *tqparent )
- : TQListView( tqparent, "Vis::Selector::instance", TQt::WType_Dialog )
+Vis::Selector::Selector( TQWidget *parent )
+ : TQListView( parent, "Vis::Selector::instance", TQt::WType_Dialog )
, m_server( new SocketServer( TQT_TQOBJECT(this) ) )
{
Amarok::OverrideCursor waitcursor;
diff --git a/amarok/src/socketserver.h b/amarok/src/socketserver.h
index 35fa7bc3..03768047 100644
--- a/amarok/src/socketserver.h
+++ b/amarok/src/socketserver.h
@@ -25,7 +25,7 @@ namespace Amarok
class SocketServer : public TQServerSocket
{
public:
- SocketServer( const TQString &socketName, TQObject *tqparent );
+ SocketServer( const TQString &socketName, TQObject *parent );
~SocketServer();
protected:
@@ -63,7 +63,7 @@ namespace Vis
{
Q_OBJECT
TQ_OBJECT
- Selector( TQWidget *tqparent=0 );
+ Selector( TQWidget *parent=0 );
SocketServer *m_server;
virtual void viewportPaintEvent( TQPaintEvent* );
@@ -79,8 +79,8 @@ namespace Vis
class Item : public TQCheckListItem
{
public:
- Item( TQListView *tqparent, const char *command, const TQString &text, const TQString &s2 )
- : TQCheckListItem( tqparent, text, TQCheckListItem::CheckBox )
+ Item( TQListView *parent, const char *command, const TQString &text, const TQString &s2 )
+ : TQCheckListItem( parent, text, TQCheckListItem::CheckBox )
, m_proc( 0 )
, m_sockfd( -1 )
, m_command( command ) { setText( 1, s2 ); }
diff --git a/amarok/src/sqlite/sqlite3.c b/amarok/src/sqlite/sqlite3.c
index 1742e80e..1c596d16 100644
--- a/amarok/src/sqlite/sqlite3.c
+++ b/amarok/src/sqlite/sqlite3.c
@@ -2910,7 +2910,7 @@ int sqlite3_blob_write(sqlite3_blob *, const void *z, int n, int iOffset);
** The maximum number of attached databases. This must be at least 2
** in order to support the main database file (0) and the file used to
** hold temporary tables (1). And it must be less than 32 because
-** we use a bittqmask of databases with a u32 in places (for example
+** we use a bitmask of databases with a u32 in places (for example
** the Parse.cookieMask field).
*/
#ifndef STQLITE_MAX_ATTACHED
@@ -3688,7 +3688,7 @@ typedef struct VdbeOpList VdbeOpList;
#define OP_NotUsed_137 137
/* Opcodes that are guaranteed to never push a value onto the stack
-** contain a 1 their corresponding position of the following tqmask
+** contain a 1 their corresponding position of the following mask
** set. See the opcodeNoPush() function in vdbeaux.c */
#define NOPUSH_MASK_0 0xeeb4
#define NOPUSH_MASK_1 0xf96b
@@ -5459,13 +5459,13 @@ struct IdList {
};
/*
-** The bittqmask datatype defined below is used for various optimizations.
+** The bitmask datatype defined below is used for various optimizations.
**
** Changing this from a 64-bit to a 32-bit type limits the number of
** tables in a join to 32 instead of 64. But it also reduces the size
** of the library by 738 bytes on ix86.
*/
-typedef u64 Bittqmask;
+typedef u64 Bitmask;
/*
** The following structure describes the FROM clause of a SELECT statement.
@@ -5497,7 +5497,7 @@ struct SrcList {
int iCursor; /* The VDBE cursor number used to access this table */
Expr *pOn; /* The ON clause of a join */
IdList *pUsing; /* The USING clause of a join */
- Bittqmask colUsed; /* Bit N (1<<N) set if column N or pTab is used */
+ Bitmask colUsed; /* Bit N (1<<N) set if column N or pTab is used */
} a[1]; /* One entry for each identifier on the list */
};
@@ -5594,7 +5594,7 @@ struct WhereInfo {
** the context containing the match is incremented.
**
** Each subquery gets a new NameContext. The pNext field points to the
-** NameContext in the tqparent query. Thus the process of scanning the
+** NameContext in the parent query. Thus the process of scanning the
** NameContext list corresponds to searching through successively outer
** subqueries looking for a match.
*/
@@ -5704,7 +5704,7 @@ struct Parse {
int nSet; /* Number of sets used so far */
int ckOffset; /* Stack offset to data used by CHECK constraints */
u32 writeMask; /* Start a write transaction on these databases */
- u32 cookieMask; /* Bittqmask of schema verified databases */
+ u32 cookieMask; /* Bitmask of schema verified databases */
int cookieGoto; /* Address of OP_Goto to cookie verifier subroutine */
int cookieValue[STQLITE_MAX_ATTACHED+2]; /* Values of cookies to verify */
#ifndef STQLITE_OMIT_SHARED_CACHE
@@ -5874,9 +5874,9 @@ struct TriggerStep {
*
* struct TriggerStack has a "pNext" member, to allow linked lists to be
* constructed. When coding nested triggers (triggers fired by other triggers)
- * each nested trigger stores its tqparent trigger's TriggerStack as the "pNext"
+ * each nested trigger stores its parent trigger's TriggerStack as the "pNext"
* pointer. Once the nested trigger has been coded, the pNext value is restored
- * to the pTriggerStack member of the Parse stucture and coding of the tqparent
+ * to the pTriggerStack member of the Parse stucture and coding of the parent
* trigger continues.
*
* Before a nested trigger is coded, the linked list pointed to by the
@@ -22605,9 +22605,9 @@ typedef struct BtLock BtLock;
** structure is appended and initialized to zero. This structure stores
** information about the page that is decoded from the raw file page.
**
-** The pParent field points back to the tqparent page. This allows us to
+** The pParent field points back to the parent page. This allows us to
** walk up the BTree from any leaf to the root. Care must be taken to
-** unref() the tqparent page pointer when this page is no longer referenced.
+** unref() the parent page pointer when this page is no longer referenced.
** The pageDestructor() routine handles that chore.
*/
struct MemPage {
@@ -22624,7 +22624,7 @@ struct MemPage {
u16 maxLocal; /* Copy of Btree.maxLocal or Btree.maxLeaf */
u16 minLocal; /* Copy of Btree.minLocal or Btree.minLeaf */
u16 cellOffset; /* Index in aData of first cell pointer */
- u16 idxParent; /* Index in tqparent of this node */
+ u16 idxParent; /* Index in parent of this node */
u16 nFree; /* Number of free bytes on the page */
u16 nCell; /* Number of cells on this page, local and ovfl */
struct _OvflCell { /* Cells that will not fit on aData[] */
@@ -22635,7 +22635,7 @@ struct MemPage {
u8 *aData; /* Pointer back to the start of the page */
DbPage *pDbPage; /* Pager page handle */
Pgno pgno; /* Page number for this page */
- MemPage *pParent; /* The tqparent of this page. NULL for root */
+ MemPage *pParent; /* The parent of this page. NULL for root */
};
/*
@@ -22835,18 +22835,18 @@ struct BtLock {
#define PTRMAP_ISPAGE(pBt, pgno) (PTRMAP_PAGENO((pBt),(pgno))==(pgno))
/*
-** The pointer map is a lookup table that identifies the tqparent page for
-** each child page in the database file. The tqparent page is the page that
+** The pointer map is a lookup table that identifies the parent page for
+** each child page in the database file. The parent page is the page that
** contains a pointer to the child. Every page in the database contains
-** 0 or 1 tqparent pages. (In this context 'database page' refers
+** 0 or 1 parent pages. (In this context 'database page' refers
** to any page that is not part of the pointer map itself.) Each pointer map
-** entry consists of a single byte 'type' and a 4 byte tqparent page number.
+** entry consists of a single byte 'type' and a 4 byte parent page number.
** The PTRMAP_XXX identifiers below are the valid types.
**
** The purpose of the pointer map is to facility moving pages from one
** position in the file to another as part of autovacuum. When a page
-** is moved, the pointer in its tqparent must be updated to point to the
-** new location. The pointer map is used to locate the tqparent page quickly.
+** is moved, the pointer in its parent must be updated to point to the
+** new location. The pointer map is used to locate the parent page quickly.
**
** PTRMAP_ROOTPAGE: The database page is a root-page. The page-number is not
** used in this case.
@@ -22863,7 +22863,7 @@ struct BtLock {
** page in the overflow page list.
**
** PTRMAP_BTREE: The database page is a non-root btree page. The page number
-** identifies the tqparent page in the btree.
+** identifies the parent page in the btree.
*/
#define PTRMAP_ROOTPAGE 1
#define PTRMAP_FREEPAGE 2
@@ -23259,10 +23259,10 @@ static Pgno ptrmapPageno(BtShared *pBt, Pgno pgno){
** Write an entry into the pointer map.
**
** This routine updates the pointer map entry for page number 'key'
-** so that it maps to type 'eType' and tqparent page number 'pgno'.
+** so that it maps to type 'eType' and parent page number 'pgno'.
** An error code is returned if something goes wrong, otherwise STQLITE_OK.
*/
-static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno tqparent){
+static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno parent){
DbPage *pDbPage; /* The pointer map page */
u8 *pPtrmap; /* The pointer map data */
Pgno iPtrmap; /* The pointer map page number */
@@ -23284,12 +23284,12 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno tqparent){
offset = PTRMAP_PTROFFSET(pBt, key);
pPtrmap = (u8 *)sqlite3PagerGetData(pDbPage);
- if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=tqparent ){
- TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, tqparent));
+ if( eType!=pPtrmap[offset] || get4byte(&pPtrmap[offset+1])!=parent ){
+ TRACE(("PTRMAP_UPDATE: %d->(%d,%d)\n", key, eType, parent));
rc = sqlite3PagerWrite(pDbPage);
if( rc==STQLITE_OK ){
pPtrmap[offset] = eType;
- put4byte(&pPtrmap[offset+1], tqparent);
+ put4byte(&pPtrmap[offset+1], parent);
}
}
@@ -23301,7 +23301,7 @@ static int ptrmapPut(BtShared *pBt, Pgno key, u8 eType, Pgno tqparent){
** Read an entry from the pointer map.
**
** This routine retrieves the pointer map entry for page 'key', writing
-** the type and tqparent page number to *pEType and *pPgno respectively.
+** the type and parent page number to *pEType and *pPgno respectively.
** An error code is returned if something goes wrong, otherwise STQLITE_OK.
*/
static int ptrmapGet(BtShared *pBt, Pgno key, u8 *pEType, Pgno *pPgno){
@@ -23719,8 +23719,8 @@ static void decodeFlags(MemPage *pPage, int flagByte){
** Initialize the auxiliary information for a disk block.
**
** The pParent parameter must be a pointer to the MemPage which
-** is the tqparent of the page being initialized. The root of a
-** BTree has no tqparent and so for that page, pParent==NULL.
+** is the parent of the page being initialized. The root of a
+** BTree has no parent and so for that page, pParent==NULL.
**
** Return STQLITE_OK on success. If we see that the page does
** not contain a well-formed database page, then return
@@ -23730,7 +23730,7 @@ static void decodeFlags(MemPage *pPage, int flagByte){
*/
STQLITE_PRIVATE int sqlite3BtreeInitPage(
MemPage *pPage, /* The page to be initialized */
- MemPage *pParent /* The tqparent. Might be NULL */
+ MemPage *pParent /* The parent. Might be NULL */
){
int pc; /* Address of a freeblock within pPage->aData[] */
int hdr; /* Offset to beginning of page header */
@@ -23747,7 +23747,7 @@ STQLITE_PRIVATE int sqlite3BtreeInitPage(
assert( pPage->pgno==sqlite3PagerPagenumber(pPage->pDbPage) );
assert( pPage->aData == &((unsigned char*)pPage)[-pBt->pageSize] );
if( pPage->pParent!=pParent && (pPage->pParent!=0 || pPage->isInit) ){
- /* The tqparent page should never change unless the file is corrupt */
+ /* The parent page should never change unless the file is corrupt */
return STQLITE_CORRUPT_BKPT;
}
if( pPage->isInit ) return STQLITE_OK;
@@ -25917,7 +25917,7 @@ STQLITE_PRIVATE int sqlite3BtreeIsRootPage(MemPage *pPage){
}
/*
-** Move the cursor up to the tqparent page.
+** Move the cursor up to the parent page.
**
** pCur->idx is set to the cell index that contains the pointer
** to the page we are coming from. If we are coming from the
@@ -26892,7 +26892,7 @@ static int reparentPage(BtShared *pBt, Pgno pgno, MemPage *pNewParent, int idx){
** to pPage.
**
** In other words, for every child of pPage, invoke reparentPage()
-** to make sure that each child knows that pPage is its tqparent.
+** to make sure that each child knows that pPage is its parent.
**
** This routine gets called after you memcpy() one page into
** another.
@@ -27122,7 +27122,7 @@ static int balance(MemPage*, int);
** fill up. On average.
**
** pPage is the leaf page which is the right-most page in the tree.
-** pParent is its tqparent. pPage must have a single overflow entry
+** pParent is its parent. pPage must have a single overflow entry
** which is also the right-most entry on the page.
*/
static int balance_quick(MemPage *pPage, MemPage *pParent){
@@ -27150,7 +27150,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
assemblePage(pNew, 1, &pCell, &szCell);
pPage->nOverflow = 0;
- /* Set the tqparent of the newly allocated page to pParent. */
+ /* Set the parent of the newly allocated page to pParent. */
pNew->pParent = pParent;
sqlite3PagerRef(pParent->pDbPage);
@@ -27190,7 +27190,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
}
#endif
- /* Release the reference to the new page and balance the tqparent page,
+ /* Release the reference to the new page and balance the parent page,
** in case the divider cell inserted caused it to become overfull.
*/
releasePage(pNew);
@@ -27203,7 +27203,7 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
** of pPage so that all pages have about the same amount of free space.
** Usually NN siblings on either side of pPage is used in the balancing,
** though more siblings might come from one side if pPage is the first
-** or last child of its tqparent. If pPage has fewer than 2*NN siblings
+** or last child of its parent. If pPage has fewer than 2*NN siblings
** (something which can only happen if pPage is the root page or a
** child of root) then all available siblings participate in the balancing.
**
@@ -27219,16 +27219,16 @@ static int balance_quick(MemPage *pPage, MemPage *pParent){
** if the page is overfull. Part of the job of this routine is to
** make sure all Cells for pPage once again fit in pPage->aData[].
**
-** In the course of balancing the siblings of pPage, the tqparent of pPage
+** In the course of balancing the siblings of pPage, the parent of pPage
** might become overfull or underfull. If that happens, then this routine
-** is called recursively on the tqparent.
+** is called recursively on the parent.
**
** If this routine fails for any reason, it might leave the database
** in a corrupted state. So if this routine fails, the database should
** be rolled back.
*/
static int balance_nonroot(MemPage *pPage){
- MemPage *pParent; /* The tqparent of pPage */
+ MemPage *pParent; /* The parent of pPage */
BtShared *pBt; /* The whole database */
int nCell = 0; /* Number of cells in apCell[] */
int nMaxCells = 0; /* Allocated size of apCell, szCell, aFrom. */
@@ -27262,7 +27262,7 @@ static int balance_nonroot(MemPage *pPage){
#endif
/*
- ** Find the tqparent page.
+ ** Find the parent page.
*/
assert( pPage->isInit );
assert( sqlite3PagerIswriteable(pPage->pDbPage) );
@@ -27300,7 +27300,7 @@ static int balance_nonroot(MemPage *pPage){
#endif
/*
- ** Find the cell in the tqparent page whose left child points back
+ ** Find the cell in the parent page whose left child points back
** to pPage. The "idx" variable is the index of that cell. If pPage
** is the rightmost child of pParent then set idx to pParent->nCell
*/
@@ -27675,7 +27675,7 @@ static int balance_nonroot(MemPage *pPage){
j = cntNew[i];
/* If the sibling page assembled above was not the right-most sibling,
- ** insert a divider cell into the tqparent page.
+ ** insert a divider cell into the parent page.
*/
if( i<nNew-1 && j<nCell ){
u8 *pCell;
@@ -27758,7 +27758,7 @@ static int balance_nonroot(MemPage *pPage){
}
/*
- ** Retqparent tqchildren of all cells.
+ ** Reparent tqchildren of all cells.
*/
for(i=0; i<nNew; i++){
rc = reparentChildPages(apNew[i]);
@@ -27768,9 +27768,9 @@ static int balance_nonroot(MemPage *pPage){
if( rc!=STQLITE_OK ) goto balance_cleanup;
/*
- ** Balance the tqparent page. Note that the current page (pPage) might
+ ** Balance the parent page. Note that the current page (pPage) might
** have been added to the freelist so it might no longer be initialized.
- ** But the tqparent page will always be initialized.
+ ** But the parent page will always be initialized.
*/
assert( pParent->isInit );
rc = balance(pParent, 0);
@@ -27848,7 +27848,7 @@ static int balance_shallower(MemPage *pPage){
szCell[i] = cellSizePtr(pChild, apCell[i]);
}
assemblePage(pPage, pChild->nCell, apCell, szCell);
- /* Copy the right-pointer of the child to the tqparent. */
+ /* Copy the right-pointer of the child to the parent. */
put4byte(&pPage->aData[pPage->hdrOffset+8],
get4byte(&pChild->aData[pChild->hdrOffset+8]));
freePage(pChild);
@@ -27905,10 +27905,10 @@ static int balance_deeper(MemPage *pPage){
Pgno pgnoChild; /* Page number of the new child page */
BtShared *pBt; /* The BTree */
int usableSize; /* Total usable size of a page */
- u8 *data; /* Content of the tqparent page */
+ u8 *data; /* Content of the parent page */
u8 *cdata; /* Content of the child page */
- int hdr; /* Offset to page header in tqparent */
- int brk; /* Offset to content of first cell in tqparent */
+ int hdr; /* Offset to page header in parent */
+ int brk; /* Offset to content of first cell in parent */
assert( pPage->pParent==0 );
assert( pPage->nOverflow>0 );
@@ -28705,7 +28705,7 @@ static void checkPtrmap(
IntegrityCk *pCheck, /* Integrity check context */
Pgno iChild, /* Child page number */
u8 eType, /* Expected pointer map type */
- Pgno iParent, /* Expected pointer map tqparent page number */
+ Pgno iParent, /* Expected pointer map parent page number */
char *zContext /* Context description (used for error msg) */
){
int rc;
@@ -30617,7 +30617,7 @@ STQLITE_PRIVATE void sqlite3VdbeResolveLabel(Vdbe *p, int x){
*/
static int opcodeNoPush(u8 op){
/* The 10 NOPUSH_MASK_n constants are defined in the automatically
- ** generated header file opcodes.h. Each is a 16-bit bittqmask, one
+ ** generated header file opcodes.h. Each is a 16-bit bitmask, one
** bit corresponding to each opcode implemented by the virtual
** machine in vdbe.c. The bit is true if the word "no-push" appears
** in a comment on the same line as the "case OP_XXX:" in
@@ -32015,15 +32015,15 @@ STQLITE_PRIVATE int sqlite3VdbeFinalize(Vdbe *p){
/*
** Call the destructor for each auxdata entry in pVdbeFunc for which
-** the corresponding bit in tqmask is clear. Auxdata entries beyond 31
+** the corresponding bit in mask is clear. Auxdata entries beyond 31
** are always destroyed. To destroy all auxdata entries, call this
-** routine with tqmask==0.
+** routine with mask==0.
*/
-STQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int tqmask){
+STQLITE_PRIVATE void sqlite3VdbeDeleteAuxData(VdbeFunc *pVdbeFunc, int mask){
int i;
for(i=0; i<pVdbeFunc->nAux; i++){
struct AuxData *pAux = &pVdbeFunc->apAux[i];
- if( (i>31 || !(tqmask&(1<<i))) && pAux->pAux ){
+ if( (i>31 || !(mask&(1<<i))) && pAux->pAux ){
if( pAux->xDelete ){
pAux->xDelete(pAux->pAux);
}
@@ -34760,7 +34760,7 @@ case OP_CollSeq: { /* no-push */
** defines the function) with P2 arguments taken from the stack. Pop all
** arguments from the stack and push back the result.
**
-** P1 is a 32-bit bittqmask indicating whether or not each argument to the
+** P1 is a 32-bit bitmask indicating whether or not each argument to the
** function was determined to be constant at compile time. If the first
** argument was constant then bit 0 of P1 is set. This is used to determine
** whether meta data associated with a user function argument using the
@@ -35104,7 +35104,7 @@ case OP_ToReal: { /* same as TK_TO_REAL, no-push */
** whereas it would normally be NULL. Similarly, NULL==123 is false when
** 0x200 is set but is NULL when the 0x200 bit of P1 is clear.
**
-** The least significant byte of P1 (tqmask 0xff) must be an affinity character -
+** The least significant byte of P1 (mask 0xff) must be an affinity character -
** STQLITE_AFF_TEXT, STQLITE_AFF_INTEGER, and so forth. An attempt is made
** to coerce both values
** according to the affinity before the comparison is made. If the byte is
@@ -36268,8 +36268,8 @@ case OP_OpenWrite: { /* no-push */
case STQLITE_OK: {
int flags = sqlite3BtreeFlags(pCur->pCursor);
/* Sanity checking. Only the lower four bits of the flags byte should
- ** be used. Bit 3 (tqmask 0x08) is unpreditable. The lower 3 bits
- ** (tqmask 0x07) should be either 5 (intkey+leafdata for tables) or
+ ** be used. Bit 3 (mask 0x08) is unpreditable. The lower 3 bits
+ ** (mask 0x07) should be either 5 (intkey+leafdata for tables) or
** 2 (zerodata for indices). If these conditions are not met it can
** only mean that we are dealing with a corrupt database file
*/
@@ -40260,18 +40260,18 @@ static int lookupName(
}
/* If a column from a table in pSrcList is referenced, then record
- ** this fact in the pSrcList.a[].colUsed bittqmask. Column 0 causes
+ ** this fact in the pSrcList.a[].colUsed bitmask. Column 0 causes
** bit 0 to be set. Column 1 sets bit 1. And so forth. If the
- ** column number is greater than the number of bits in the bittqmask
- ** then set the high-order bit of the bittqmask.
+ ** column number is greater than the number of bits in the bitmask
+ ** then set the high-order bit of the bitmask.
*/
if( pExpr->iColumn>=0 && pMatch!=0 ){
int n = pExpr->iColumn;
- if( n>=sizeof(Bittqmask)*8 ){
- n = sizeof(Bittqmask)*8-1;
+ if( n>=sizeof(Bitmask)*8 ){
+ n = sizeof(Bitmask)*8-1;
}
assert( pMatch->iCursor==pExpr->iTable );
- pMatch->colUsed |= ((Bittqmask)1)<<n;
+ pMatch->colUsed |= ((Bitmask)1)<<n;
}
lookupname_end:
@@ -43561,19 +43561,19 @@ STQLITE_PRIVATE void sqlite3FinishCoding(Parse *pParse){
if( v ){
sqlite3VdbeAddOp(v, OP_Halt, 0, 0);
- /* The cookie tqmask contains one bit for each database file open.
+ /* The cookie mask contains one bit for each database file open.
** (Bit 0 is for main, bit 1 is for temp, and so forth.) Bits are
** set for each database that is used. Generate code to start a
** transaction on each used database and to verify the schema cookie
** on each used database.
*/
if( pParse->cookieGoto>0 ){
- u32 tqmask;
+ u32 mask;
int iDb;
sqlite3VdbeJumpHere(v, pParse->cookieGoto-1);
- for(iDb=0, tqmask=1; iDb<db->nDb; tqmask<<=1, iDb++){
- if( (tqmask & pParse->cookieMask)==0 ) continue;
- sqlite3VdbeAddOp(v, OP_Transaction, iDb, (tqmask & pParse->writeMask)!=0);
+ for(iDb=0, mask=1; iDb<db->nDb; mask<<=1, iDb++){
+ if( (mask & pParse->cookieMask)==0 ) continue;
+ sqlite3VdbeAddOp(v, OP_Transaction, iDb, (mask & pParse->writeMask)!=0);
sqlite3VdbeAddOp(v, OP_VerifyCookie, iDb, pParse->cookieValue[iDb]);
}
#ifndef STQLITE_OMIT_VIRTUALTABLE
@@ -46558,7 +46558,7 @@ STQLITE_PRIVATE int sqlite3OpenTempDatabase(Parse *pParse){
STQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
sqlite3 *db;
Vdbe *v;
- int tqmask;
+ int mask;
v = sqlite3GetVdbe(pParse);
if( v==0 ) return; /* This only happens if there was a prior error */
@@ -46570,9 +46570,9 @@ STQLITE_PRIVATE void sqlite3CodeVerifySchema(Parse *pParse, int iDb){
assert( iDb<db->nDb );
assert( db->aDb[iDb].pBt!=0 || iDb==1 );
assert( iDb<STQLITE_MAX_ATTACHED+2 );
- tqmask = 1<<iDb;
- if( (pParse->cookieMask & tqmask)==0 ){
- pParse->cookieMask |= tqmask;
+ mask = 1<<iDb;
+ if( (pParse->cookieMask & mask)==0 ){
+ pParse->cookieMask |= mask;
pParse->cookieValue[iDb] = db->aDb[iDb].pSchema->schema_cookie;
if( !OMIT_TEMPDB && iDb==1 ){
sqlite3OpenTempDatabase(pParse);
@@ -47922,20 +47922,20 @@ static void minmaxFunc(
sqlite3_value **argv
){
int i;
- int tqmask; /* 0 for min() or 0xffffffff for max() */
+ int mask; /* 0 for min() or 0xffffffff for max() */
int iBest;
CollSeq *pColl;
if( argc==0 ) return;
- tqmask = sqlite3_user_data(context)==0 ? 0 : -1;
+ mask = sqlite3_user_data(context)==0 ? 0 : -1;
pColl = sqlite3GetFuncCollSeq(context);
assert( pColl );
- assert( tqmask==-1 || tqmask==0 );
+ assert( mask==-1 || mask==0 );
iBest = 0;
if( sqlite3_value_type(argv[0])==STQLITE_NULL ) return;
for(i=1; i<argc; i++){
if( sqlite3_value_type(argv[i])==STQLITE_NULL ) return;
- if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^tqmask)>=0 ){
+ if( (sqlite3MemCompare(argv[iBest], argv[i], pColl)^mask)>=0 ){
iBest = i;
}
}
@@ -52019,7 +52019,7 @@ static void returnSingleInt(Parse *pParse, const char *zLabel, int value){
static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
static const struct sPragmaType {
const char *zName; /* Name of the pragma */
- int tqmask; /* Mask for the db->flags value */
+ int mask; /* Mask for the db->flags value */
} aPragma[] = {
{ "full_column_names", STQLITE_FullColNames },
{ "short_column_names", STQLITE_ShortColNames },
@@ -52052,12 +52052,12 @@ static int flagPragma(Parse *pParse, const char *zLeft, const char *zRight){
v = sqlite3GetVdbe(pParse);
if( v ){
if( zRight==0 ){
- returnSingleInt(pParse, p->zName, (db->flags & p->tqmask)!=0 );
+ returnSingleInt(pParse, p->zName, (db->flags & p->mask)!=0 );
}else{
if( getBoolean(zRight) ){
- db->flags |= p->tqmask;
+ db->flags |= p->mask;
}else{
- db->flags &= ~p->tqmask;
+ db->flags &= ~p->mask;
}
}
}
@@ -55920,7 +55920,7 @@ static void substSelect(Select *p, int iTable, ExprList *pEList){
** the subquery before this routine runs.
*/
static int flattenSubquery(
- Select *p, /* The tqparent or outer SELECT statement */
+ Select *p, /* The parent or outer SELECT statement */
int iFrom, /* Index in p->pSrc->a[] of the inner subquery */
int isAgg, /* True if outer SELECT uses aggregate functions */
int subqueryIsAgg /* True if the subquery uses aggregate functions */
@@ -56322,7 +56322,7 @@ static int processOrderGroupBy(
** This routine resolves any names used in the result set of the
** supplied SELECT statement. If the SELECT statement being resolved
** is a sub-select, then pOuterNC is a pointer to the NameContext
-** of the tqparent SELECT.
+** of the parent SELECT.
*/
STQLITE_PRIVATE int sqlite3SelectResolve(
Parse *pParse, /* The parser context */
@@ -56580,8 +56580,8 @@ static void updateAccumulator(Parse *pParse, AggInfo *pAggInfo){
**
** The pParent, parentTab, and *pParentAgg fields are filled in if this
** SELECT is a subquery. This routine may try to combine this SELECT
-** with its tqparent to form a single flat query. In so doing, it might
-** change the tqparent query from a non-aggregate to an aggregate query.
+** with its parent to form a single flat query. In so doing, it might
+** change the parent query from a non-aggregate to an aggregate query.
** For that reason, the pParentAgg flag is passed as a pointer, so it
** can be changed.
**
@@ -56715,7 +56715,7 @@ STQLITE_PRIVATE int sqlite3Select(
}
#if STQLITE_MAX_EXPR_DEPTH>0
/* Increment Parse.nHeight by the height of the largest expression
- ** tree refered to by this, the tqparent select. The child select
+ ** tree refered to by this, the parent select. The child select
** may contain expression trees of at most
** (STQLITE_MAX_EXPR_DEPTH-Parse.nHeight) height. This is a bit
** more conservative than necessary, but much easier than enforcing
@@ -56750,7 +56750,7 @@ STQLITE_PRIVATE int sqlite3Select(
goto select_end;
}
- /* Check to see if this is a subquery that can be "flattened" into its tqparent.
+ /* Check to see if this is a subquery that can be "flattened" into its parent.
** If flattening is a possiblity, do so and return immediately.
*/
#ifndef STQLITE_OMIT_VIEW
@@ -58043,16 +58043,16 @@ STQLITE_PRIVATE int sqlite3TriggersExist(
ExprList *pChanges /* Columns that change in an UPDATE statement */
){
Trigger *pTrigger;
- int tqmask = 0;
+ int mask = 0;
pTrigger = IsVirtual(pTab) ? 0 : pTab->pTrigger;
while( pTrigger ){
if( pTrigger->op==op && checkColumnOverLap(pTrigger->pColumns, pChanges) ){
- tqmask |= pTrigger->tr_tm;
+ mask |= pTrigger->tr_tm;
}
pTrigger = pTrigger->pNext;
}
- return tqmask;
+ return mask;
}
/*
@@ -59959,9 +59959,9 @@ STQLITE_PRIVATE FuncDef *sqlite3VtabOverloadFunction(
*/
/*
-** The number of bits in a Bittqmask. "BMS" means "BitMask Size".
+** The number of bits in a Bitmask. "BMS" means "BitMask Size".
*/
-#define BMS (sizeof(Bittqmask)*8)
+#define BMS (sizeof(Bitmask)*8)
/*
** Trace output macros
@@ -59995,20 +59995,20 @@ typedef struct ExprMaskSet ExprMaskSet;
** where X is a column name and <op> is one of certain operators,
** then WhereTerm.leftCursor and WhereTerm.leftColumn record the
** cursor number and column number for X. WhereTerm.operator records
-** the <op> using a bittqmask encoding defined by WO_xxx below. The
-** use of a bittqmask encoding for the operator allows us to search
+** the <op> using a bitmask encoding defined by WO_xxx below. The
+** use of a bitmask encoding for the operator allows us to search
** quickly for terms that match any of several different operators.
**
** prereqRight and prereqAll record sets of cursor numbers,
** but they do so indirectly. A single ExprMaskSet structure translates
** cursor number into bits and the translated bit is stored in the prereq
** fields. The translation is used in order to maximize the number of
-** bits that will fit in a Bittqmask. The VDBE cursor numbers might be
+** bits that will fit in a Bitmask. The VDBE cursor numbers might be
** spread out over the non-negative integers. For example, the cursor
** numbers might be 3, 8, 9, 10, 20, 23, 41, and 45. The ExprMaskSet
** translates these sparse cursor numbers into consecutive integers
** beginning with 0 in order to make the best possible use of the available
-** bits in the Bittqmask. So, in the example above, the cursor numbers
+** bits in the Bitmask. So, in the example above, the cursor numbers
** would be mapped into integers 0 through 7.
*/
typedef struct WhereTerm WhereTerm;
@@ -60021,8 +60021,8 @@ struct WhereTerm {
u8 flags; /* Bit flags. See below */
u8 nChild; /* Number of tqchildren that must disable us */
WhereClause *pWC; /* The clause this term is part of */
- Bittqmask prereqRight; /* Bittqmask of tables used by pRight */
- Bittqmask prereqAll; /* Bittqmask of tables referenced by p */
+ Bitmask prereqRight; /* Bitmask of tables used by pRight */
+ Bitmask prereqAll; /* Bitmask of tables referenced by p */
};
/*
@@ -60059,8 +60059,8 @@ struct WhereClause {
** from the sparse cursor numbers into consecutive integers beginning
** with 0.
**
-** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bittqmask
-** corresponds VDBE cursor number B. The A-th bit of a bittqmask is 1<<A.
+** If ExprMaskSet.ix[A]==B it means that The A-th bit of a Bitmask
+** corresponds VDBE cursor number B. The A-th bit of a bitmask is 1<<A.
**
** For example, if the WHERE clause expression used these VDBE
** cursors: 4, 5, 8, 29, 57, 73. Then the ExprMaskSet structure
@@ -60075,7 +60075,7 @@ struct WhereClause {
*/
struct ExprMaskSet {
int n; /* Number of assigned cursor values */
- int ix[sizeof(Bittqmask)*8]; /* Cursor assigned to each bit */
+ int ix[sizeof(Bitmask)*8]; /* Cursor assigned to each bit */
};
@@ -60096,7 +60096,7 @@ struct ExprMaskSet {
/*
** Value for flags returned by bestIndex().
**
-** The least significant byte is reserved as a tqmask for WO_ values above.
+** The least significant byte is reserved as a mask for WO_ values above.
** The WhereLevel.flags field is usually set to WO_IN|WO_EQ|WO_ISNULL.
** But if the table is the right table of a left join, WhereLevel.flags
** is set to WO_IN|WO_EQ. The WhereLevel.flags field can then be used as
@@ -60216,26 +60216,26 @@ static void whereSplit(WhereClause *pWC, Expr *pExpr, int op){
}
/*
-** Initialize an expression tqmask set
+** Initialize an expression mask set
*/
#define initMaskSet(P) memset(P, 0, sizeof(*P))
/*
-** Return the bittqmask for the given cursor number. Return 0 if
+** Return the bitmask for the given cursor number. Return 0 if
** iCursor is not in the set.
*/
-static Bittqmask getMask(ExprMaskSet *pMaskSet, int iCursor){
+static Bitmask getMask(ExprMaskSet *pMaskSet, int iCursor){
int i;
for(i=0; i<pMaskSet->n; i++){
if( pMaskSet->ix[i]==iCursor ){
- return ((Bittqmask)1)<<i;
+ return ((Bitmask)1)<<i;
}
}
return 0;
}
/*
-** Create a new tqmask for cursor iCursor.
+** Create a new mask for cursor iCursor.
**
** There is one cursor per table in the FROM clause. The number of
** tables in the FROM clause is limited by a test early in the
@@ -60249,7 +60249,7 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
/*
** This routine walks (recursively) an expression tree and generates
-** a bittqmask indicating which tables are used in that expression
+** a bitmask indicating which tables are used in that expression
** tree.
**
** In order for this routine to work, the calling function must have
@@ -60258,46 +60258,46 @@ static void createMask(ExprMaskSet *pMaskSet, int iCursor){
** The sqlite3ExprResolveNames() routines looks for column names and
** sets their opcodes to TK_COLUMN and their Expr.iTable fields to
** the VDBE cursor number of the table. This routine just has to
-** translate the cursor numbers into bittqmask values and OR all
+** translate the cursor numbers into bitmask values and OR all
** the bitmasks together.
*/
-static Bittqmask exprListTableUsage(ExprMaskSet*, ExprList*);
-static Bittqmask exprSelectTableUsage(ExprMaskSet*, Select*);
-static Bittqmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
- Bittqmask tqmask = 0;
+static Bitmask exprListTableUsage(ExprMaskSet*, ExprList*);
+static Bitmask exprSelectTableUsage(ExprMaskSet*, Select*);
+static Bitmask exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){
+ Bitmask mask = 0;
if( p==0 ) return 0;
if( p->op==TK_COLUMN ){
- tqmask = getMask(pMaskSet, p->iTable);
- return tqmask;
+ mask = getMask(pMaskSet, p->iTable);
+ return mask;
}
- tqmask = exprTableUsage(pMaskSet, p->pRight);
- tqmask |= exprTableUsage(pMaskSet, p->pLeft);
- tqmask |= exprListTableUsage(pMaskSet, p->pList);
- tqmask |= exprSelectTableUsage(pMaskSet, p->pSelect);
- return tqmask;
+ mask = exprTableUsage(pMaskSet, p->pRight);
+ mask |= exprTableUsage(pMaskSet, p->pLeft);
+ mask |= exprListTableUsage(pMaskSet, p->pList);
+ mask |= exprSelectTableUsage(pMaskSet, p->pSelect);
+ return mask;
}
-static Bittqmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
+static Bitmask exprListTableUsage(ExprMaskSet *pMaskSet, ExprList *pList){
int i;
- Bittqmask tqmask = 0;
+ Bitmask mask = 0;
if( pList ){
for(i=0; i<pList->nExpr; i++){
- tqmask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
+ mask |= exprTableUsage(pMaskSet, pList->a[i].pExpr);
}
}
- return tqmask;
+ return mask;
}
-static Bittqmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
- Bittqmask tqmask;
+static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){
+ Bitmask mask;
if( pS==0 ){
- tqmask = 0;
+ mask = 0;
}else{
- tqmask = exprListTableUsage(pMaskSet, pS->pEList);
- tqmask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
- tqmask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
- tqmask |= exprTableUsage(pMaskSet, pS->pWhere);
- tqmask |= exprTableUsage(pMaskSet, pS->pHaving);
+ mask = exprListTableUsage(pMaskSet, pS->pEList);
+ mask |= exprListTableUsage(pMaskSet, pS->pGroupBy);
+ mask |= exprListTableUsage(pMaskSet, pS->pOrderBy);
+ mask |= exprTableUsage(pMaskSet, pS->pWhere);
+ mask |= exprTableUsage(pMaskSet, pS->pHaving);
}
- return tqmask;
+ return mask;
}
/*
@@ -60337,7 +60337,7 @@ static void exprCommute(Expr *pExpr){
}
/*
-** Translate from TK_xx operator to WO_xx bittqmask.
+** Translate from TK_xx operator to WO_xx bitmask.
*/
static int operatorMask(int op){
int c;
@@ -60369,7 +60369,7 @@ static WhereTerm *findTerm(
WhereClause *pWC, /* The WHERE clause to be searched */
int iCur, /* Cursor number of LHS */
int iColumn, /* Column number of LHS */
- Bittqmask notReady, /* RHS must not overlap with this tqmask */
+ Bitmask notReady, /* RHS must not overlap with this mask */
u16 op, /* Mask of WO_xx values describing operator */
Index *pIdx /* Must be compatible with this index, if not NULL */
){
@@ -60636,8 +60636,8 @@ static void exprAnalyze(
WhereTerm *pTerm = &pWC->a[idxTerm];
ExprMaskSet *pMaskSet = pWC->pMaskSet;
Expr *pExpr = pTerm->pExpr;
- Bittqmask prereqLeft;
- Bittqmask prereqAll;
+ Bitmask prereqLeft;
+ Bitmask prereqAll;
int nPattern;
int isComplete;
int op;
@@ -60849,7 +60849,7 @@ or_not_possible:
int idxNew;
Expr *pRight, *pLeft;
WhereTerm *pNewTerm;
- Bittqmask prereqColumn, prereqExpr;
+ Bitmask prereqColumn, prereqExpr;
pRight = pExpr->pList->a[0].pExpr;
pLeft = pExpr->pList->a[1].pExpr;
@@ -60884,7 +60884,7 @@ static int referencesOtherTables(
int iFirst, /* Be searching with the iFirst-th expression */
int iBase /* Ignore references to this table */
){
- Bittqmask allowed = ~getMask(pMaskSet, iBase);
+ Bitmask allowed = ~getMask(pMaskSet, iBase);
while( iFirst<pList->nExpr ){
if( (exprTableUsage(pMaskSet, pList->a[iFirst++].pExpr)&allowed)!=0 ){
return 1;
@@ -61133,7 +61133,7 @@ static double bestVirtualIndex(
Parse *pParse, /* The parsing context */
WhereClause *pWC, /* The WHERE clause */
struct SrcList_item *pSrc, /* The FROM clause term to search */
- Bittqmask notReady, /* Mask of cursors that are not available */
+ Bitmask notReady, /* Mask of cursors that are not available */
ExprList *pOrderBy, /* The order by clause */
int orderByUsable, /* True if we can potential sort */
sqlite3_index_info **ppIdxInfo /* Index information passed to xBestIndex */
@@ -61337,7 +61337,7 @@ static double bestIndex(
Parse *pParse, /* The parsing context */
WhereClause *pWC, /* The WHERE clause */
struct SrcList_item *pSrc, /* The FROM clause term to search */
- Bittqmask notReady, /* Mask of cursors that are not available */
+ Bitmask notReady, /* Mask of cursors that are not available */
ExprList *pOrderBy, /* The order by clause */
Index **ppIndex, /* Make *ppIndex point to the best index */
int *pFlags, /* Put flags describing this choice in *pFlags */
@@ -61532,13 +61532,13 @@ static double bestIndex(
** ever reading the table. If that is the case, then halve the
** cost of this index.
*/
- if( flags && pSrc->colUsed < (((Bittqmask)1)<<(BMS-1)) ){
- Bittqmask m = pSrc->colUsed;
+ if( flags && pSrc->colUsed < (((Bitmask)1)<<(BMS-1)) ){
+ Bitmask m = pSrc->colUsed;
int j;
for(j=0; j<pProbe->nColumn; j++){
int x = pProbe->aiColumn[j];
if( x<BMS-1 ){
- m &= ~(((Bittqmask)1)<<x);
+ m &= ~(((Bitmask)1)<<x);
}
}
if( m==0 ){
@@ -61705,7 +61705,7 @@ static void codeAllEqualityTerms(
Parse *pParse, /* Parsing context */
WhereLevel *pLevel, /* Which nested loop of the FROM we are coding */
WhereClause *pWC, /* The WHERE clause */
- Bittqmask notReady /* Which parts of FROM have not yet been coded */
+ Bitmask notReady /* Which parts of FROM have not yet been coded */
){
int nEq = pLevel->nEq; /* The number of == or IN constraints to code */
int termsInMem = 0; /* If true, store value in mem[] cells */
@@ -61887,9 +61887,9 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
WhereInfo *pWInfo; /* Will become the return value of this function */
Vdbe *v = pParse->pVdbe; /* The virtual database engine */
int brk, cont = 0; /* Addresses used during code generation */
- Bittqmask notReady; /* Cursors that are not yet positioned */
+ Bitmask notReady; /* Cursors that are not yet positioned */
WhereTerm *pTerm; /* A single term in the WHERE clause */
- ExprMaskSet maskSet; /* The expression tqmask set */
+ ExprMaskSet maskSet; /* The expression mask set */
WhereClause wc; /* The WHERE clause is divided into these terms */
struct SrcList_item *pTabItem; /* A single entry from pTabList */
WhereLevel *pLevel; /* A single level in the pWInfo list */
@@ -61897,7 +61897,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
int andFlags; /* AND-ed combination of all wc.a[].flags */
/* The number of tables in the FROM clause is limited by the number of
- ** bits in a Bittqmask
+ ** bits in a Bitmask
*/
if( pTabList->nSrc>BMS ){
sqlite3ErrorMsg(pParse, "at most %d tables in a join", BMS);
@@ -61958,7 +61958,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
** This loop also figures out the nesting order of tables in the FROM
** clause.
*/
- notReady = ~(Bittqmask)0;
+ notReady = ~(Bitmask)0;
pTabItem = pTabList->a;
pLevel = pWInfo->a;
andFlags = ~0;
@@ -61974,7 +61974,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
int bestNEq = 0; /* nEq associated with pBest */
double lowestCost; /* Cost of the pBest */
int bestJ = 0; /* The value of j */
- Bittqmask m; /* Bittqmask value for j or bestJ */
+ Bitmask m; /* Bitmask value for j or bestJ */
int once = 0; /* True when first table is seen */
sqlite3_index_info *pIndex; /* Current virtual index */
@@ -62106,8 +62106,8 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
#endif
if( (pLevel->flags & WHERE_IDX_ONLY)==0 ){
sqlite3OpenTable(pParse, pTabItem->iCursor, iDb, pTab, OP_OpenRead);
- if( pTab->nCol<(sizeof(Bittqmask)*8) ){
- Bittqmask b = pTabItem->colUsed;
+ if( pTab->nCol<(sizeof(Bitmask)*8) ){
+ Bitmask b = pTabItem->colUsed;
int n = 0;
for(; b; b=b>>1, n++){}
sqlite3VdbeChangeP2(v, sqlite3VdbeCurrentAddr(v)-1, n);
@@ -62138,7 +62138,7 @@ STQLITE_PRIVATE WhereInfo *sqlite3WhereBegin(
** loop below generates code for a single nested loop of the VM
** program.
*/
- notReady = ~(Bittqmask)0;
+ notReady = ~(Bitmask)0;
for(i=0, pLevel=pWInfo->a; i<pTabList->nSrc; i++, pLevel++){
int j;
int iCur = pTabItem->iCursor; /* The VDBE cursor for the table */
@@ -62803,7 +62803,7 @@ typedef union {
struct TrigEvent yy370;
SrcList* yy373;
Expr * yy386;
- struct {int value; int tqmask;} yy405;
+ struct {int value; int mask;} yy405;
Token yy410;
IdList* yy432;
int yy495;
@@ -64787,19 +64787,19 @@ static void yy_reduce(
{ yygotominor.yy46 = OE_Restrict * 0x010101; }
break;
case 66:
-{ yygotominor.yy46 = (yymsp[-1].minor.yy46 & yymsp[0].minor.yy405.tqmask) | yymsp[0].minor.yy405.value; }
+{ yygotominor.yy46 = (yymsp[-1].minor.yy46 & yymsp[0].minor.yy405.mask) | yymsp[0].minor.yy405.value; }
break;
case 67:
-{ yygotominor.yy405.value = 0; yygotominor.yy405.tqmask = 0x000000; }
+{ yygotominor.yy405.value = 0; yygotominor.yy405.mask = 0x000000; }
break;
case 68:
-{ yygotominor.yy405.value = yymsp[0].minor.yy46; yygotominor.yy405.tqmask = 0x0000ff; }
+{ yygotominor.yy405.value = yymsp[0].minor.yy46; yygotominor.yy405.mask = 0x0000ff; }
break;
case 69:
-{ yygotominor.yy405.value = yymsp[0].minor.yy46<<8; yygotominor.yy405.tqmask = 0x00ff00; }
+{ yygotominor.yy405.value = yymsp[0].minor.yy46<<8; yygotominor.yy405.mask = 0x00ff00; }
break;
case 70:
-{ yygotominor.yy405.value = yymsp[0].minor.yy46<<16; yygotominor.yy405.tqmask = 0xff0000; }
+{ yygotominor.yy405.value = yymsp[0].minor.yy46<<16; yygotominor.yy405.mask = 0xff0000; }
break;
case 71:
{ yygotominor.yy46 = OE_SetNull; }
diff --git a/amarok/src/statistics.cpp b/amarok/src/statistics.cpp
index 33b64113..1e1774ca 100644
--- a/amarok/src/statistics.cpp
+++ b/amarok/src/statistics.cpp
@@ -48,8 +48,8 @@
Statistics *Statistics::s_instance = 0;
-Statistics::Statistics( TQWidget *tqparent, const char *name )
- : KDialogBase( KDialogBase::Swallow, 0, tqparent, name, false, 0, Close )
+Statistics::Statistics( TQWidget *parent, const char *name )
+ : KDialogBase( KDialogBase::Swallow, 0, parent, name, false, 0, Close )
, m_timer( new TQTimer( this ) )
{
s_instance = this;
@@ -119,8 +119,8 @@ Statistics::slotSetFilter() //SLOT
/// CLASS StatisticsList
//////////////////////////////////////////////////////////////////////////////////////////
-StatisticsList::StatisticsList( TQWidget *tqparent, const char *name )
- : KListView( tqparent, name )
+StatisticsList::StatisticsList( TQWidget *parent, const char *name )
+ : KListView( parent, name )
, m_currentItem( 0 )
, m_expanded( false )
{
@@ -681,8 +681,8 @@ StatisticsList::showContextMenu( TQListViewItem *item, const TQPoint &p, int )
/// CLASS StatisticsItem
//////////////////////////////////////////////////////////////////////////////////////////
-StatisticsItem::StatisticsItem( TQString text, StatisticsList *tqparent, KListViewItem *after, const char *name )
- : KListViewItem( static_cast<KListView*>(tqparent), after, name )
+StatisticsItem::StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after, const char *name )
+ : KListViewItem( static_cast<KListView*>(parent), after, name )
, m_animTimer( new TQTimer( this ) )
, m_animCount( 0 )
, m_isActive( false )
@@ -857,9 +857,9 @@ StatisticsItem::blendColors( const TQColor& color1, const TQColor& color2, int p
/// CLASS StatisticsDetailedItem
//////////////////////////////////////////////////////////////////////////////////////////
-StatisticsDetailedItem::StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *tqparent,
+StatisticsDetailedItem::StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent,
StatisticsDetailedItem *after, const char *name )
- : KListViewItem( tqparent, after, name )
+ : KListViewItem( parent, after, name )
, m_type( NONE )
, m_subText( subtext )
{
diff --git a/amarok/src/statistics.h b/amarok/src/statistics.h
index 446556e2..4c043bec 100644
--- a/amarok/src/statistics.h
+++ b/amarok/src/statistics.h
@@ -35,7 +35,7 @@ class Statistics : public KDialogBase
TQ_OBJECT
public:
- Statistics( TQWidget *tqparent = 0, const char *name = 0 );
+ Statistics( TQWidget *parent = 0, const char *name = 0 );
~Statistics();
static Statistics *instance() { return s_instance; }
@@ -58,7 +58,7 @@ class StatisticsList : public KListView
TQ_OBJECT
public:
- StatisticsList( TQWidget *tqparent, const char *name=0 );
+ StatisticsList( TQWidget *parent, const char *name=0 );
~StatisticsList() {};
TQString filter() { return m_filter; }
@@ -97,7 +97,7 @@ class StatisticsItem : public TQObject, public KListViewItem
TQ_OBJECT
public:
- StatisticsItem( TQString text, StatisticsList *tqparent, KListViewItem *after=0, const char *name=0 );
+ StatisticsItem( TQString text, StatisticsList *parent, KListViewItem *after=0, const char *name=0 );
~StatisticsItem() {};
void paintCell( TQPainter *p, const TQColorGroup &cg, int column, int width, int align );
@@ -139,7 +139,7 @@ class StatisticsItem : public TQObject, public KListViewItem
class StatisticsDetailedItem : public KListViewItem
{
public:
- StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *tqparent,
+ StatisticsDetailedItem( const TQString &text, const TQString &subtext, StatisticsItem *parent,
StatisticsDetailedItem *after=0, const char *name=0 );
~StatisticsDetailedItem() {};
diff --git a/amarok/src/statusbar/overlayWidget.cpp b/amarok/src/statusbar/overlayWidget.cpp
index 05fcf2c0..3298056f 100644
--- a/amarok/src/statusbar/overlayWidget.cpp
+++ b/amarok/src/statusbar/overlayWidget.cpp
@@ -26,12 +26,12 @@
namespace KDE {
-OverlayWidget::OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char* name )
- : TQFrame( tqparent->parentWidget(), name )
+OverlayWidget::OverlayWidget( TQWidget *parent, TQWidget *anchor, const char* name )
+ : TQFrame( parent->parentWidget(), name )
, m_anchor( anchor )
- , m_tqparent( tqparent )
+ , m_parent( parent )
{
- tqparent->installEventFilter( this );
+ parent->installEventFilter( this );
hide();
}
diff --git a/amarok/src/statusbar/overlayWidget.h b/amarok/src/statusbar/overlayWidget.h
index 673099c5..bb1d8f4c 100644
--- a/amarok/src/statusbar/overlayWidget.h
+++ b/amarok/src/statusbar/overlayWidget.h
@@ -31,7 +31,7 @@ namespace KDE
* The widget is parented to the toplevelwidget of alignWidget,
* this could be an issue if that widget has an autoAdd Layout
*/
- OverlayWidget( TQWidget *tqparent, TQWidget *anchor, const char *name = 0 );
+ OverlayWidget( TQWidget *parent, TQWidget *anchor, const char *name = 0 );
virtual void reposition();
protected:
@@ -41,7 +41,7 @@ namespace KDE
private:
TQWidget *m_anchor;
- TQWidget *m_tqparent;
+ TQWidget *m_parent;
};
}
diff --git a/amarok/src/statusbar/popupMessage.cpp b/amarok/src/statusbar/popupMessage.cpp
index 136e01b9..58855c14 100644
--- a/amarok/src/statusbar/popupMessage.cpp
+++ b/amarok/src/statusbar/popupMessage.cpp
@@ -38,10 +38,10 @@
namespace KDE
{
-PopupMessage::PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout, const char *name )
- : OverlayWidget( tqparent, anchor, name )
+PopupMessage::PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout, const char *name )
+ : OverlayWidget( parent, anchor, name )
, m_anchor( anchor )
- , m_tqparent( tqparent )
+ , m_parent( parent )
, m_maskEffect( Slide )
, m_dissolveSize( 0 )
, m_dissolveDelta( -1 )
@@ -145,9 +145,9 @@ void PopupMessage::display() //SLOT
if( m_maskEffect == Dissolve )
{
- // necessary to create the tqmask
- m_tqmask.resize( width(), height() );
- // make the tqmask empty and hence will not show widget with show() called below
+ // necessary to create the mask
+ m_mask.resize( width(), height() );
+ // make the mask empty and hence will not show widget with show() called below
dissolveMask();
m_timerId = startTimer( 1000 / 30 );
}
@@ -214,13 +214,13 @@ void PopupMessage::dissolveMask()
if( m_stage == 1 )
{
tqrepaint( false );
- TQPainter maskPainter(&m_tqmask);
+ TQPainter maskPainter(&m_mask);
- m_tqmask.fill(TQt::black);
+ m_mask.fill(TQt::black);
maskPainter.setBrush(TQt::white);
maskPainter.setPen(TQt::white);
- maskPainter.drawRect( m_tqmask.rect() );
+ maskPainter.drawRect( m_mask.rect() );
m_dissolveSize += m_dissolveDelta;
@@ -257,7 +257,7 @@ void PopupMessage::dissolveMask()
}
}
- setMask(m_tqmask);
+ setMask(m_mask);
}
else if ( m_stage == 2 )
{
@@ -299,7 +299,7 @@ void PopupMessage::slideMask()
switch( m_stage )
{
case 1: //raise
- move( 0, m_tqparent->y() - m_offset );
+ move( 0, m_parent->y() - m_offset );
m_offset++;
if( m_offset > height() )
@@ -321,7 +321,7 @@ void PopupMessage::slideMask()
case 3: //lower
m_offset--;
- move( 0, m_tqparent->y() - m_offset );
+ move( 0, m_parent->y() - m_offset );
if( m_offset < 0 )
deleteLater();
diff --git a/amarok/src/statusbar/popupMessage.h b/amarok/src/statusbar/popupMessage.h
index dfad9080..e23b7a39 100644
--- a/amarok/src/statusbar/popupMessage.h
+++ b/amarok/src/statusbar/popupMessage.h
@@ -48,7 +48,7 @@ namespace KDE
* @param timeout : how long to wait before auto closing. A value of 0 means close
* only on pressing the closeButton or close() is called.
*/
- PopupMessage( TQWidget *tqparent, TQWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 );
+ PopupMessage( TQWidget *parent, TQWidget *anchor, int timeout = 5000 /*milliseconds*/, const char* name = 0 );
enum MaskEffect { Plain, Slide, Dissolve };
@@ -88,8 +88,8 @@ namespace KDE
TQVBoxLayout *m_tqlayout;
TQFrame *m_countdownFrame;
TQWidget *m_anchor;
- TQWidget *m_tqparent;
- TQBitmap m_tqmask;
+ TQWidget *m_parent;
+ TQBitmap m_mask;
MaskEffect m_maskEffect;
int m_dissolveSize;
diff --git a/amarok/src/statusbar/progressBar.cpp b/amarok/src/statusbar/progressBar.cpp
index 6b426f0d..2e69bf19 100644
--- a/amarok/src/statusbar/progressBar.cpp
+++ b/amarok/src/statusbar/progressBar.cpp
@@ -31,15 +31,15 @@
namespace KDE {
-ProgressBar::ProgressBar( TQWidget *tqparent, TQLabel *label )
- : TQProgressBar( tqparent )
+ProgressBar::ProgressBar( TQWidget *parent, TQLabel *label )
+ : TQProgressBar( parent )
, m_label( label )
, m_done( false )
{
DEBUG_FUNC_INFO
m_label->tqsetSizePolicy( TQSizePolicy::Minimum, TQSizePolicy::Minimum );
- m_abort = new KPushButton( KStdGuiItem::cancel(), tqparent );
+ m_abort = new KPushButton( KStdGuiItem::cancel(), parent );
m_abort->hide();
m_abort->setText( i18n("Abort") );
m_label->show();
diff --git a/amarok/src/statusbar/progressBar.h b/amarok/src/statusbar/progressBar.h
index 6e7972fe..a3f5f1b7 100644
--- a/amarok/src/statusbar/progressBar.h
+++ b/amarok/src/statusbar/progressBar.h
@@ -56,7 +56,7 @@ namespace KDE
TQString description() const { return m_description; }
protected:
- ProgressBar( TQWidget *tqparent, TQLabel *label );
+ ProgressBar( TQWidget *parent, TQLabel *label );
~ProgressBar();
virtual void hide();
diff --git a/amarok/src/statusbar/queueLabel.cpp b/amarok/src/statusbar/queueLabel.cpp
index 1309da98..d78869a0 100644
--- a/amarok/src/statusbar/queueLabel.cpp
+++ b/amarok/src/statusbar/queueLabel.cpp
@@ -39,8 +39,8 @@
static const uint MAX_TO_SHOW = 20;
-QueueLabel::QueueLabel( TQWidget *tqparent, const char *name )
- : TQLabel( tqparent, name )
+QueueLabel::QueueLabel( TQWidget *parent, const char *name )
+ : TQLabel( parent, name )
, m_timer( this )
, m_tooltip( 0 )
, m_tooltipShowing( false )
diff --git a/amarok/src/statusbar/queueLabel.h b/amarok/src/statusbar/queueLabel.h
index cc7b0873..7ded871f 100644
--- a/amarok/src/statusbar/queueLabel.h
+++ b/amarok/src/statusbar/queueLabel.h
@@ -32,7 +32,7 @@ class QueueLabel: public TQLabel //homonym, heh heh
TQ_OBJECT
public:
- QueueLabel( TQWidget *tqparent, const char *name = 0 );
+ QueueLabel( TQWidget *parent, const char *name = 0 );
signals:
void queueChanged( const PLItemList &, const PLItemList & );
diff --git a/amarok/src/statusbar/selectLabel.h b/amarok/src/statusbar/selectLabel.h
index f9d3fb3a..596834a4 100644
--- a/amarok/src/statusbar/selectLabel.h
+++ b/amarok/src/statusbar/selectLabel.h
@@ -46,8 +46,8 @@ class SelectLabel : public TQLabel
void activated( int );
public:
- SelectLabel( Amarok::SelectAction const*const action, TQWidget *tqparent )
- : TQLabel( tqparent )
+ SelectLabel( Amarok::SelectAction const*const action, TQWidget *parent )
+ : TQLabel( parent )
, m_action( action )
, m_tooltip( 0 )
, m_tooltipShowing( false )
diff --git a/amarok/src/statusbar/squeezedtextlabel.cpp b/amarok/src/statusbar/squeezedtextlabel.cpp
index 8f000def..caca939a 100644
--- a/amarok/src/statusbar/squeezedtextlabel.cpp
+++ b/amarok/src/statusbar/squeezedtextlabel.cpp
@@ -26,15 +26,15 @@
namespace KDE {
-SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+SqueezedTextLabel::SqueezedTextLabel( const TQString &text , TQWidget *parent, const char *name )
+ : TQLabel ( parent, name ) {
tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
fullText = text;
squeezeTextToLabel();
}
-SqueezedTextLabel::SqueezedTextLabel( TQWidget *tqparent, const char *name )
- : TQLabel ( tqparent, name ) {
+SqueezedTextLabel::SqueezedTextLabel( TQWidget *parent, const char *name )
+ : TQLabel ( parent, name ) {
tqsetSizePolicy(TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Fixed ));
}
diff --git a/amarok/src/statusbar/squeezedtextlabel.h b/amarok/src/statusbar/squeezedtextlabel.h
index 11e9bf08..a5cdbb0c 100644
--- a/amarok/src/statusbar/squeezedtextlabel.h
+++ b/amarok/src/statusbar/squeezedtextlabel.h
@@ -32,8 +32,8 @@ class SqueezedTextLabel : public TQLabel {
TQ_OBJECT
public:
- SqueezedTextLabel( TQWidget *tqparent, const char *name = 0 );
- SqueezedTextLabel( const TQString &text, TQWidget *tqparent, const char *name = 0 );
+ SqueezedTextLabel( TQWidget *parent, const char *name = 0 );
+ SqueezedTextLabel( const TQString &text, TQWidget *parent, const char *name = 0 );
virtual TQSize tqminimumSizeHint() const;
virtual TQSize tqsizeHint() const;
diff --git a/amarok/src/statusbar/statusBarBase.cpp b/amarok/src/statusbar/statusBarBase.cpp
index 645a9f19..e2373936 100644
--- a/amarok/src/statusbar/statusBarBase.cpp
+++ b/amarok/src/statusbar/statusBarBase.cpp
@@ -70,9 +70,9 @@ namespace SingleShotPool
timer->start( timeout, true );
}
- static inline bool isActive( TQObject *tqparent, const char *slot )
+ static inline bool isActive( TQObject *parent, const char *slot )
{
- TQTimer *timer = static_cast<TQTimer*>( tqparent->child( slot ) );
+ TQTimer *timer = static_cast<TQTimer*>( parent->child( slot ) );
return timer && timer->isA( TQTIMER_OBJECT_NAME_STRING ) && timer->isActive();
}
@@ -82,8 +82,8 @@ namespace SingleShotPool
//TODO allow for uncertain progress periods
-StatusBar::StatusBar( TQWidget *tqparent, const char *name )
- : TQWidget( tqparent, name )
+StatusBar::StatusBar( TQWidget *parent, const char *name )
+ : TQWidget( parent, name )
, m_logCounter( -1 )
{
TQBoxLayout *maintqlayout = new TQHBoxLayout( this, 2, /*spacing*/5 );
diff --git a/amarok/src/statusbar/statusBarBase.h b/amarok/src/statusbar/statusBarBase.h
index 56e7dc5c..e71f5071 100644
--- a/amarok/src/statusbar/statusBarBase.h
+++ b/amarok/src/statusbar/statusBarBase.h
@@ -32,7 +32,7 @@ class TQTimer;
namespace KIO { class Job; }
//TODO
-// * concept of a temporary message that is removed when a qobject tqparent is deleted
+// * concept of a temporary message that is removed when a qobject parent is deleted
namespace KDE
{
@@ -82,7 +82,7 @@ namespace KDE
TQ_OBJECT
public:
- StatusBar( TQWidget *tqparent, const char *name = "mainStatusBar" );
+ StatusBar( TQWidget *parent, const char *name = "mainStatusBar" );
enum MessageType { Information, Question, Sorry, Warning, Error, ShowAgainCheckBox, None };
@@ -186,7 +186,7 @@ namespace KDE
virtual bool event( TQEvent* );
/**
- * You must tqparent the widget to the statusbar, we won't do that
+ * You must parent the widget to the statusbar, we won't do that
* for you! The widget will be added to the right of the tqlayout.
* Currently you must add widgets before the statusbar gets shown
* for the first time, because we are not currently very flexible.
diff --git a/amarok/src/statusbar/statusbar.cpp b/amarok/src/statusbar/statusbar.cpp
index 8b210a84..6d2c1e37 100644
--- a/amarok/src/statusbar/statusbar.cpp
+++ b/amarok/src/statusbar/statusbar.cpp
@@ -55,8 +55,8 @@ KAction *action( const char *name ) { return Amarok::actionCollection()->action(
StatusBar* StatusBar::s_instance = 0;
-StatusBar::StatusBar( TQWidget *tqparent, const char *name )
- : KDE::StatusBar( tqparent, name )
+StatusBar::StatusBar( TQWidget *parent, const char *name )
+ : KDE::StatusBar( parent, name )
, EngineObserver( EngineController::instance() )
, m_timeLength( 9 )
, m_pauseTimer( new TQTimer( this ) )
diff --git a/amarok/src/statusbar/statusbar.h b/amarok/src/statusbar/statusbar.h
index d42cfca4..383b84cd 100644
--- a/amarok/src/statusbar/statusbar.h
+++ b/amarok/src/statusbar/statusbar.h
@@ -41,7 +41,7 @@ namespace Amarok
LIBAMAROK_EXPORT static StatusBar* s_instance;
public:
- StatusBar( TQWidget *tqparent, const char *name = 0 );
+ StatusBar( TQWidget *parent, const char *name = 0 );
static StatusBar* instance() { return s_instance; }
diff --git a/amarok/src/statusbar/timeLabel.h b/amarok/src/statusbar/timeLabel.h
index e3b7d975..1acd0d3b 100644
--- a/amarok/src/statusbar/timeLabel.h
+++ b/amarok/src/statusbar/timeLabel.h
@@ -25,7 +25,7 @@
class TimeLabel : public TQLabel
{
public:
- TimeLabel( TQWidget *tqparent ) : TQLabel( " 0:00:00 ", tqparent )
+ TimeLabel( TQWidget *parent ) : TQLabel( " 0:00:00 ", parent )
{
setFont( KGlobalSettings::fixedFont() );
tqsetSizePolicy( TQSizePolicy::Maximum, TQSizePolicy::Fixed );
diff --git a/amarok/src/statusbar/toggleLabel.h b/amarok/src/statusbar/toggleLabel.h
index 267550bb..f1ba257a 100644
--- a/amarok/src/statusbar/toggleLabel.h
+++ b/amarok/src/statusbar/toggleLabel.h
@@ -46,8 +46,8 @@ class ToggleLabel : public TQLabel
void toggled( bool );
public:
- ToggleLabel( KToggleAction const*const action, TQWidget *tqparent )
- : TQLabel( tqparent )
+ ToggleLabel( KToggleAction const*const action, TQWidget *parent )
+ : TQLabel( parent )
, m_action( action )
, m_tooltip( 0 )
, m_tooltipShowing( false )
diff --git a/amarok/src/tagdialog.cpp b/amarok/src/tagdialog.cpp
index 4f0a36a1..0f66a715 100644
--- a/amarok/src/tagdialog.cpp
+++ b/amarok/src/tagdialog.cpp
@@ -61,8 +61,8 @@ private:
TQStringList m_failedURLs;
};
-TagDialog::TagDialog( const KURL& url, TQWidget* tqparent )
- : TagDialogBase( tqparent )
+TagDialog::TagDialog( const KURL& url, TQWidget* parent )
+ : TagDialogBase( parent )
, m_bundle( url, true )
, m_playlistItem( 0 )
, m_currentCover( 0 )
@@ -71,8 +71,8 @@ TagDialog::TagDialog( const KURL& url, TQWidget* tqparent )
}
-TagDialog::TagDialog( const KURL::List list, TQWidget* tqparent )
- : TagDialogBase( tqparent )
+TagDialog::TagDialog( const KURL::List list, TQWidget* parent )
+ : TagDialogBase( parent )
, m_bundle()
, m_playlistItem( 0 )
, m_urlList( list )
@@ -82,8 +82,8 @@ TagDialog::TagDialog( const KURL::List list, TQWidget* tqparent )
}
-TagDialog::TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* tqparent )
- : TagDialogBase( tqparent )
+TagDialog::TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent )
+ : TagDialogBase( parent )
, m_bundle( mb )
, m_playlistItem( item )
, m_currentCover( 0 )
diff --git a/amarok/src/tagdialog.h b/amarok/src/tagdialog.h
index ecb7af1f..cfab2deb 100644
--- a/amarok/src/tagdialog.h
+++ b/amarok/src/tagdialog.h
@@ -40,9 +40,9 @@ class TagDialog : public TagDialogBase
enum Changes { NOCHANGE=0, SCORECHANGED=1, TAGSCHANGED=2, LYRICSCHANGED=4, RATINGCHANGED=8, LABELSCHANGED=16 };
enum Tabs { SUMMARYTAB, TAGSTAB, LYRICSTAB, STATSTAB, LABELSTAB };
- TagDialog( const KURL& url, TQWidget* tqparent = 0 );
- TagDialog( const KURL::List list, TQWidget* tqparent = 0 );
- TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* tqparent = 0 );
+ TagDialog( const KURL& url, TQWidget* parent = 0 );
+ TagDialog( const KURL::List list, TQWidget* parent = 0 );
+ TagDialog( const MetaBundle& mb, PlaylistItem* item, TQWidget* parent = 0 );
~TagDialog();
void setTab( int id );
diff --git a/amarok/src/threadmanager.h b/amarok/src/threadmanager.h
index 60c4bf6e..63c3d72d 100644
--- a/amarok/src/threadmanager.h
+++ b/amarok/src/threadmanager.h
@@ -376,7 +376,7 @@ public:
* It is only safe to have one dependent, if you depend on multiple objects
* that might get deleted while you are running you should instead try to
* make the multiple objects tqchildren of one TQObject and depend on the
- * top-most tqparent or best of all would be to make copies of the data you
+ * top-most parent or best of all would be to make copies of the data you
* need instead of being dependent.
*/
diff --git a/amarok/src/tooltip.cpp b/amarok/src/tooltip.cpp
index 76421182..c9bb2283 100644
--- a/amarok/src/tooltip.cpp
+++ b/amarok/src/tooltip.cpp
@@ -30,7 +30,7 @@
class Amarok::ToolTip::Manager: public TQObject
{
public:
- Manager( TQObject *tqparent ): TQObject( tqparent ) { tqApp->installEventFilter( this ); }
+ Manager( TQObject *parent ): TQObject( parent ) { tqApp->installEventFilter( this ); }
virtual ~Manager()
{
for( int n = Amarok::ToolTip::s_tooltips.count() - 1; n >= 0; --n )
@@ -69,11 +69,11 @@ TQString Amarok::ToolTip::s_text;
TQValueList<Amarok::ToolTip*> Amarok::ToolTip::s_tooltips;
int Amarok::ToolTip::s_hack = 0;
-void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *tqparent ) //static
+void Amarok::ToolTip::add( ToolTipClient *client, TQWidget *parent ) //static
{
if( !s_manager )
s_manager = new Amarok::ToolTip::Manager( TQT_TQOBJECT(tqApp) );
- new ToolTip( client, tqparent );
+ new ToolTip( client, parent );
}
void Amarok::ToolTip::remove( TQWidget *widget ) //static
@@ -116,9 +116,9 @@ void Amarok::ToolTip::updateTip() //static
}
}
-Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *tqparent )
+Amarok::ToolTip::ToolTip( ToolTipClient *client, TQWidget *parent )
: TQFrame( 0, 0, WStyle_Customize | WStyle_NoBorder | WStyle_Tool | WStyle_StaysOnTop | WX11BypassWM | WNoAutoErase ),
- TQToolTip( tqparent ),
+ TQToolTip( parent ),
m_client( client )
{
s_tooltips.append( this );
diff --git a/amarok/src/tooltip.h b/amarok/src/tooltip.h
index 49968a64..0ca9b92d 100644
--- a/amarok/src/tooltip.h
+++ b/amarok/src/tooltip.h
@@ -40,8 +40,8 @@ class ToolTip: public TQFrame, public TQToolTip
TQ_OBJECT
public:
- static void add( ToolTipClient *client, TQWidget *tqparent );
- static void remove( TQWidget *tqparent );
+ static void add( ToolTipClient *client, TQWidget *parent );
+ static void remove( TQWidget *parent );
static void hideTips();
static TQString textFor( TQWidget *widget, const TQPoint &pos = TQPoint() );
static void updateTip();
@@ -51,7 +51,7 @@ private slots:
void hideTip();
private:
- ToolTip( ToolTipClient *client, TQWidget *tqparent );
+ ToolTip( ToolTipClient *client, TQWidget *parent );
virtual ~ToolTip();
void position();
ToolTipClient *m_client;
diff --git a/amarok/src/trackpickerdialog.cpp b/amarok/src/trackpickerdialog.cpp
index 6de609e9..aa3c8eda 100644
--- a/amarok/src/trackpickerdialog.cpp
+++ b/amarok/src/trackpickerdialog.cpp
@@ -31,8 +31,8 @@
class TrackPickerItem : public KListViewItem
{
public:
- TrackPickerItem(KListView *tqparent, const KTRMResult &result) :
- KListViewItem(tqparent, tqparent->lastChild(),
+ TrackPickerItem(KListView *parent, const KTRMResult &result) :
+ KListViewItem(parent, parent->lastChild(),
result.title(), result.artist(), result.album(),
NUMBER(result.track()), NUMBER(result.year())),
m_result(result) {
@@ -51,8 +51,8 @@ private:
// public methods
////////////////////////////////////////////////////////////////////////////////
-TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *tqparent)
- : KDialogBase(tqparent, name.latin1(), true, TQString(), Ok | Cancel, Ok, true)
+TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *parent)
+ : KDialogBase(parent, name.latin1(), true, TQString(), Ok | Cancel, Ok, true)
{
kapp->setTopWidget( this );
setCaption( kapp->makeStdCaption( i18n("MusicBrainz Results") ) );
@@ -78,7 +78,7 @@ TrackPickerDialog::TrackPickerDialog(const TQString &name, const KTRMResultList
m_base->trackList->setSelected(m_base->trackList->firstChild(), true);
// m_base->trackList->triggerUpdate();
setMinimumWidth(kMax(300, width()));
- connect(this, TQT_SIGNAL( sigSelectionMade( KTRMResult ) ), tqparent, TQT_SLOT( fillSelected( KTRMResult ) ) );
+ connect(this, TQT_SIGNAL( sigSelectionMade( KTRMResult ) ), parent, TQT_SLOT( fillSelected( KTRMResult ) ) );
}
diff --git a/amarok/src/trackpickerdialog.h b/amarok/src/trackpickerdialog.h
index 889ca86c..2558638a 100644
--- a/amarok/src/trackpickerdialog.h
+++ b/amarok/src/trackpickerdialog.h
@@ -36,7 +36,7 @@ signals:
void sigSelectionMade( KTRMResult );
public:
- TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *tqparent = 0);
+ TrackPickerDialog(const TQString &name, const KTRMResultList &results, TQWidget *parent = 0);
KTRMResult result() const;
diff --git a/amarok/src/tracktooltip.cpp b/amarok/src/tracktooltip.cpp
index 54e3f039..c345e22e 100644
--- a/amarok/src/tracktooltip.cpp
+++ b/amarok/src/tracktooltip.cpp
@@ -293,7 +293,7 @@ void TrackToolTip::slotImageChanged( const TQString &remoteURL )
if( CollectionDB::instance()->getPodcastEpisodeBundle( m_tags.url().url(), &peb ) )
{
PodcastChannelBundle pcb;
- if( CollectionDB::instance()->getPodcastChannelBundle( peb.tqparent().url(), &pcb ) )
+ if( CollectionDB::instance()->getPodcastChannelBundle( peb.parent().url(), &pcb ) )
{
if( pcb.imageURL().url() == remoteURL )
{