diff --git a/src/app/historyAction.cpp b/src/app/historyAction.cpp index 0013cfe..9d27ef1 100644 --- a/src/app/historyAction.cpp +++ b/src/app/historyAction.cpp @@ -40,8 +40,8 @@ HistoryAction::pop() -HistoryCollection::HistoryCollection( KActionCollection *ac, TQObject *tqparent, const char *name ) - : TQObject( tqparent, name ) +HistoryCollection::HistoryCollection( KActionCollection *ac, TQObject *parent, const char *name ) + : TQObject( parent, name ) , m_b( new HistoryAction( i18n( "Back" ), "back", KStdAccel::back(), ac, "go_back" ) ) , m_f( new HistoryAction( i18n( "Forward" ), "forward", KStdAccel::forward(), ac, "go_forward" ) ) , m_receiver( 0 ) diff --git a/src/app/historyAction.h b/src/app/historyAction.h index dbbf19e..0e5ad28 100644 --- a/src/app/historyAction.h +++ b/src/app/historyAction.h @@ -43,7 +43,7 @@ Q_OBJECT TQ_OBJECT public: - HistoryCollection( KActionCollection *ac, TQObject *tqparent, const char *name ); + HistoryCollection( KActionCollection *ac, TQObject *parent, const char *name ); void save( KConfig *config ); void restore( KConfig *config ); diff --git a/src/part/fileTree.cpp b/src/part/fileTree.cpp index fc2a4c9..cab0a04 100644 --- a/src/part/fileTree.cpp +++ b/src/part/fileTree.cpp @@ -20,7 +20,7 @@ File::fullPath( const Directory *root /*= 0*/ ) const if( root == this ) root = 0; //prevent returning empty string when there is something we could return - for( const Directory *d = (Directory*)this; d != root && d; d = d->tqparent() ) + for( const Directory *d = (Directory*)this; d != root && d; d = d->parent() ) path.prepend( d->name() ); return path; diff --git a/src/part/fileTree.h b/src/part/fileTree.h index eb0cad2..1ca2f4b 100644 --- a/src/part/fileTree.h +++ b/src/part/fileTree.h @@ -168,7 +168,7 @@ public: File( const char *name, FileSize size ) : m_parent( 0 ), m_name( qstrdup( name ) ), m_size( size ) {} virtual ~File() { delete [] m_name; } - const Directory *tqparent() const { return m_parent; } + const Directory *parent() const { return m_parent; } const char *name8Bit() const { return m_name; } const FileSize size() const { return m_size; } TQString name() const { return TQFile::decodeName( m_name ); } @@ -182,7 +182,7 @@ public: static TQString humanReadableSize( uint size, UnitPrefix Key = mega ); protected: - File( const char *name, FileSize size, Directory *tqparent ) : m_parent( tqparent ), m_name( qstrdup( name ) ), m_size( size ) {} + File( const char *name, FileSize size, Directory *parent ) : m_parent( parent ), m_name( qstrdup( name ) ), m_size( size ) {} Directory *m_parent; //0 if this is treeRoot char *m_name; diff --git a/src/part/localLister.cpp b/src/part/localLister.cpp index d022eae..81fd3bc 100644 --- a/src/part/localLister.cpp +++ b/src/part/localLister.cpp @@ -22,11 +22,11 @@ namespace Filelight TQStringList LocalLister::s_remoteMounts; TQStringList LocalLister::s_localMounts; - LocalLister::LocalLister( const TQString &path, Chain *cachedTrees, TQObject *tqparent ) + LocalLister::LocalLister( const TQString &path, Chain *cachedTrees, TQObject *parent ) : TQThread() , m_path( path ) , m_trees( cachedTrees ) - , m_parent( tqparent ) + , m_parent( parent ) { //add empty directories for any mount points that are in the path //TODO empty directories is not ideal as adds to fileCount incorrectly diff --git a/src/part/localLister.h b/src/part/localLister.h index d9c8d84..a9a0482 100644 --- a/src/part/localLister.h +++ b/src/part/localLister.h @@ -14,7 +14,7 @@ namespace Filelight class LocalLister : public TQThread { public: - LocalLister( const TQString &path, Chain *cachedTrees, TQObject *tqparent ); + LocalLister( const TQString &path, Chain *cachedTrees, TQObject *parent ); static bool readMounts(); diff --git a/src/part/part.cpp b/src/part/part.cpp index b8f3b69..a04f5f3 100644 --- a/src/part/part.cpp +++ b/src/part/part.cpp @@ -33,13 +33,13 @@ typedef KParts::GenericFactory Factory; K_EXPORT_COMPONENT_FACTORY( libfilelight, Filelight::Factory ) -BrowserExtension::BrowserExtension( Part *tqparent, const char *name ) - : KParts::BrowserExtension( tqparent, name ) +BrowserExtension::BrowserExtension( Part *parent, const char *name ) + : KParts::BrowserExtension( parent, name ) {} -Part::Part( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent, const char *name, const TQStringList& ) - : ReadOnlyPart( tqparent, name ) +Part::Part( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList& ) + : ReadOnlyPart( parent, name ) , m_ext( new BrowserExtension( this ) ) , m_statusbar( new StatusBarExtension( this ) ) , m_map( 0 ) diff --git a/src/part/progressBox.cpp b/src/part/progressBox.cpp index b608ae6..68c3349 100644 --- a/src/part/progressBox.cpp +++ b/src/part/progressBox.cpp @@ -10,8 +10,8 @@ #include "progressBox.h" -ProgressBox::ProgressBox( TQWidget *tqparent, TQObject *part ) - : TQLabel( tqparent, "ProgressBox" ) +ProgressBox::ProgressBox( TQWidget *parent, TQObject *part ) + : TQLabel( parent, "ProgressBox" ) { hide(); diff --git a/src/part/radialMap/labels.cpp b/src/part/radialMap/labels.cpp index 402a7f7..482110f 100644 --- a/src/part/radialMap/labels.cpp +++ b/src/part/radialMap/labels.cpp @@ -80,7 +80,7 @@ RadialMap::Widget::paintExplodedLabels( TQPainter &paint ) const //find the range of levels we will be potentially drawing labels for //startLevel is the level above whatever m_focus is in for( const Directory *p = (const Directory*)m_focus->file(); p != m_tree; ++startLevel ) - p = p->tqparent(); + p = p->parent(); //range=2 means 2 levels to draw labels for diff --git a/src/part/radialMap/widget.cpp b/src/part/radialMap/widget.cpp index 66014b4..101d8f0 100644 --- a/src/part/radialMap/widget.cpp +++ b/src/part/radialMap/widget.cpp @@ -17,8 +17,8 @@ -RadialMap::Widget::Widget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name, TQt::WNoAutoErase ) +RadialMap::Widget::Widget( TQWidget *parent, const char *name ) + : TQWidget( parent, name, TQt::WNoAutoErase ) , m_tree( 0 ) , m_focus( 0 ) , m_rootSegment( 0 ) //TODO we don't delete it, *shrug* diff --git a/src/part/radialMap/widgetEvents.cpp b/src/part/radialMap/widgetEvents.cpp index 1ad304e..4152098 100644 --- a/src/part/radialMap/widgetEvents.cpp +++ b/src/part/radialMap/widgetEvents.cpp @@ -131,7 +131,7 @@ RadialMap::Widget::mouseMoveEvent( TQMouseEvent *e ) tqrepaint( false ); } - m_tip->moveTo( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-trantqparent background + m_tip->moveTo( e->globalPos(), *this, ( p.y() < 0 ) ); //updates tooltip psuedo-tranparent background } else if( oldFocus && oldFocus->file() != m_tree ) { diff --git a/src/part/remoteLister.cpp b/src/part/remoteLister.cpp index fa80b4b..f18691a 100644 --- a/src/part/remoteLister.cpp +++ b/src/part/remoteLister.cpp @@ -24,15 +24,15 @@ namespace Filelight const KURL url; /// the directory on which we are operating Directory *directory; - /// so we can reference the tqparent store - Store *tqparent; + /// so we can reference the parent store + Store *parent; /// directories in this directory that need to be scanned before we can propagate() List stores; Store() - : directory( 0 ), tqparent( 0 ) {} + : directory( 0 ), parent( 0 ) {} Store( const KURL &u, const TQString &name, Store *s ) - : url( u ), directory( new Directory( name.local8Bit() + '/' ) ), tqparent( s ) {} + : url( u ), directory( new Directory( name.local8Bit() + '/' ) ), parent( s ) {} Store* @@ -42,13 +42,13 @@ namespace Filelight debug() << "propagate: " << url << endl; - if( tqparent ) { - tqparent->directory->append( directory ); - if( tqparent->stores.isEmpty() ) { - return tqparent->propagate(); + if( parent ) { + parent->directory->append( directory ); + if( parent->stores.isEmpty() ) { + return parent->propagate(); } else - return tqparent; + return parent; } //we reached the root, let's get our next directory scanned @@ -61,14 +61,14 @@ namespace Filelight }; - RemoteLister::RemoteLister( const KURL &url, TQWidget *tqparent ) + RemoteLister::RemoteLister( const KURL &url, TQWidget *parent ) : KDirLister( true /*don't fetch mimetypes*/ ) , m_root( new Store( url, url.url(), 0 ) ) , m_store( m_root ) { setAutoUpdate( false ); //don't use KDirWatchers setShowingDotFiles( true ); //stupid KDirLister API function names - setMainWindow( tqparent ); + setMainWindow( parent ); //use TQT_SIGNAL(result(KIO::Job*)) instead and then use Job::error() connect( this, TQT_SIGNAL(completed()), TQT_SLOT(completed()) ); @@ -84,7 +84,7 @@ namespace Filelight TQCustomEvent *e = new TQCustomEvent( 1000 ); e->setData( tree ); - TQApplication::postEvent( tqparent(), e ); + TQApplication::postEvent( parent(), e ); delete m_root; } @@ -126,7 +126,7 @@ namespace Filelight if( m_store->stores.isEmpty() ) - //no directories to scan, so we need to append ourselves to the tqparent directory + //no directories to scan, so we need to append ourselves to the parent directory //propagate() will return the next ancestor that has stores left to be scanned, or root if we are done m_store = m_store->propagate(); diff --git a/src/part/remoteLister.h b/src/part/remoteLister.h index 3a8a6f3..88fa24b 100644 --- a/src/part/remoteLister.h +++ b/src/part/remoteLister.h @@ -13,7 +13,7 @@ namespace Filelight Q_OBJECT TQ_OBJECT public: - RemoteLister( const KURL &url, TQWidget *tqparent ); + RemoteLister( const KURL &url, TQWidget *parent ); ~RemoteLister(); private slots: diff --git a/src/part/scan.cpp b/src/part/scan.cpp index 77a0cef..4a606ff 100644 --- a/src/part/scan.cpp +++ b/src/part/scan.cpp @@ -15,8 +15,8 @@ namespace Filelight bool ScanManager::s_abort = false; uint ScanManager::s_files = 0; - ScanManager::ScanManager( TQObject *tqparent ) - : TQObject( tqparent ) + ScanManager::ScanManager( TQObject *parent ) + : TQObject( parent ) , m_thread( 0 ) , m_cache( new Chain ) { @@ -144,7 +144,7 @@ namespace Filelight m_url = url; TQApplication::setOverrideCursor( KCursor::workingCursor() ); //will start listing straight away - TQObject *o = new Filelight::RemoteLister( url, (TQWidget*)tqparent() ); + TQObject *o = new Filelight::RemoteLister( url, (TQWidget*)parent() ); insertChild( o ); o->setName( "remote_lister" ); return true; diff --git a/src/part/scan.h b/src/part/scan.h index 275ea61..acd17dc 100644 --- a/src/part/scan.h +++ b/src/part/scan.h @@ -22,7 +22,7 @@ namespace Filelight friend class RemoteLister; public: - ScanManager( TQObject *tqparent ); + ScanManager( TQObject *parent ); virtual ~ScanManager(); bool start( const KURL& ); diff --git a/src/part/settingsDialog.cpp b/src/part/settingsDialog.cpp index 2b6aa42..585d0b5 100644 --- a/src/part/settingsDialog.cpp +++ b/src/part/settingsDialog.cpp @@ -18,8 +18,8 @@ #include "Config.h" -SettingsDialog::SettingsDialog( TQWidget *tqparent, const char *name ) - : Dialog( tqparent, name, false ) //3rd param => modal +SettingsDialog::SettingsDialog( TQWidget *parent, const char *name ) + : Dialog( parent, name, false ) //3rd param => modal { colourSchemeGroup->setFrameShape( TQFrame::NoFrame ); diff --git a/src/part/summaryWidget.cpp b/src/part/summaryWidget.cpp index d583d4d..5f6deee 100644 --- a/src/part/summaryWidget.cpp +++ b/src/part/summaryWidget.cpp @@ -45,8 +45,8 @@ struct DiskList : TQValueList class MyRadialMap : public RadialMap::Widget { public: - MyRadialMap( TQWidget *tqparent ) - : RadialMap::Widget( tqparent ) + MyRadialMap( TQWidget *parent ) + : RadialMap::Widget( parent ) {} virtual void setCursor( const TQCursor &c ) @@ -76,8 +76,8 @@ public: -SummaryWidget::SummaryWidget( TQWidget *tqparent, const char *name ) - : TQWidget( tqparent, name ) +SummaryWidget::SummaryWidget( TQWidget *parent, const char *name ) + : TQWidget( parent, name ) { tqApp->setOverrideCursor( KCursor::waitCursor() ); diff --git a/src/part/summaryWidget.h b/src/part/summaryWidget.h index 0c4bb51..bc3a3e7 100644 --- a/src/part/summaryWidget.h +++ b/src/part/summaryWidget.h @@ -13,7 +13,7 @@ class SummaryWidget : public TQWidget TQ_OBJECT public: - SummaryWidget( TQWidget *tqparent, const char *name ); + SummaryWidget( TQWidget *parent, const char *name ); ~SummaryWidget(); signals: