From 93910780efc46524d0f2c6693784b3fa10d26985 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: rename the following methods: tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeadmin@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kdat/Archive.cpp | 28 +++++++------- kdat/Archive.h | 2 +- kdat/ArchiveInfoWidget.cpp | 4 +- kdat/ArchiveInfoWidget.h | 2 +- kdat/BackupDlg.cpp | 4 +- kdat/BackupDlg.h | 4 +- kdat/BackupOptDlg.cpp | 4 +- kdat/BackupOptDlg.h | 2 +- kdat/BackupProfileInfoWidget.cpp | 4 +- kdat/BackupProfileInfoWidget.h | 2 +- kdat/BackupProfileWidget.cpp | 4 +- kdat/BackupProfileWidget.h | 4 +- kdat/File.cpp | 12 +++--- kdat/File.h | 10 ++--- kdat/FileInfoWidget.cpp | 4 +- kdat/FileInfoWidget.h | 4 +- kdat/FormatOptDlg.cpp | 4 +- kdat/FormatOptDlg.h | 4 +- kdat/IndexDlg.cpp | 4 +- kdat/IndexDlg.h | 4 +- kdat/InfoShellWidget.cpp | 4 +- kdat/InfoShellWidget.h | 6 +-- kdat/KDat.kdoc | 2 +- kdat/KDatMainWindow.cpp | 16 ++++---- kdat/LoggerWidget.cpp | 4 +- kdat/LoggerWidget.h | 4 +- kdat/Node.cpp | 48 ++++++++++++------------ kdat/OptionsDlg.cpp | 4 +- kdat/OptionsDlg.h | 4 +- kdat/TapeFileInfoWidget.cpp | 4 +- kdat/TapeFileInfoWidget.h | 4 +- kdat/TapeInfoWidget.cpp | 4 +- kdat/TapeInfoWidget.h | 2 +- kdat/VerifyDlg.cpp | 4 +- kdat/VerifyDlg.h | 4 +- kdat/VerifyOptDlg.cpp | 4 +- kdat/VerifyOptDlg.h | 4 +- kdat/ktreeview.cpp | 80 ++++++++++++++++++++-------------------- kdat/ktreeview.h | 26 ++++++------- 39 files changed, 169 insertions(+), 169 deletions(-) (limited to 'kdat') diff --git a/kdat/Archive.cpp b/kdat/Archive.cpp index a6869ad..ad66dbd 100644 --- a/kdat/Archive.cpp +++ b/kdat/Archive.cpp @@ -289,40 +289,40 @@ File* Archive::addFile( int size, int mtime, int startRecord, int endRecord, con //path.remove(path.first()); path.remove(path.begin()); TQPtrListIterator i( getChildren() ); - File* tqparent = 0; + File* parent = 0; for ( ; i.current() ; ++i ) { if ( i.current()->getName() == dir ) { - tqparent = i.current(); + parent = i.current(); break; } } - if ( tqparent == 0 ) { - tqparent = new File( 0, 0, 0, startRecord, endRecord, dir ); - addChild( tqparent ); + if ( parent == 0 ) { + parent = new File( 0, 0, 0, startRecord, endRecord, dir ); + addChild( parent ); } for ( TQStringList::Iterator j = path.begin(); j != path.end(); ++j ) { TQString dir = *j; - File* ptqparent = tqparent; - TQPtrListIterator i( ptqparent->getChildren() ); - for ( tqparent = 0; i.current() ; ++i ) { + File* pparent = parent; + TQPtrListIterator i( pparent->getChildren() ); + for ( parent = 0; i.current() ; ++i ) { if ( i.current()->getName() == dir ) { - tqparent = i.current(); + parent = i.current(); break; } } - if ( tqparent == 0 ) { - tqparent = new File( ptqparent, 0, 0, 0, 0, dir ); - ptqparent->addChild( tqparent ); + if ( parent == 0 ) { + parent = new File( pparent, 0, 0, 0, 0, dir ); + pparent->addChild( parent ); } } - file = new File( tqparent, size, mtime, startRecord, endRecord, fn ); - tqparent->addChild( file ); + file = new File( parent, size, mtime, startRecord, endRecord, fn ); + parent->addChild( file ); return file; } diff --git a/kdat/Archive.h b/kdat/Archive.h index 4f593ab..7527073 100644 --- a/kdat/Archive.h +++ b/kdat/Archive.h @@ -159,7 +159,7 @@ public: /** * Create a new file entry, and add it to the archive. Based on the - * full path name of the file, an appropriate tqparent is found. The tqparent + * full path name of the file, an appropriate parent is found. The parent * may be this archive or another file entry. File entries will be created * on demand if some or all of the file's path does not yet exist in this * archive. diff --git a/kdat/ArchiveInfoWidget.cpp b/kdat/ArchiveInfoWidget.cpp index 754b701..875c21d 100644 --- a/kdat/ArchiveInfoWidget.cpp +++ b/kdat/ArchiveInfoWidget.cpp @@ -35,8 +35,8 @@ #include "ArchiveInfoWidget.moc" -ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), +ArchiveInfoWidget::ArchiveInfoWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), _archive( 0 ) { TQLabel* lbl1 = new TQLabel( i18n( "Archive name:" ), this ); diff --git a/kdat/ArchiveInfoWidget.h b/kdat/ArchiveInfoWidget.h index e9bc175..d48ade1 100644 --- a/kdat/ArchiveInfoWidget.h +++ b/kdat/ArchiveInfoWidget.h @@ -45,7 +45,7 @@ public: /** * Create a new archive info widget. */ - ArchiveInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + ArchiveInfoWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the archive info widget. diff --git a/kdat/BackupDlg.cpp b/kdat/BackupDlg.cpp index 1c66805..93bf65d 100644 --- a/kdat/BackupDlg.cpp +++ b/kdat/BackupDlg.cpp @@ -51,8 +51,8 @@ BackupDlg::BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental, const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape, - TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ), + TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ), _proc( NULL ), _tarParser( NULL ), _archiveName( archiveName ), diff --git a/kdat/BackupDlg.h b/kdat/BackupDlg.h index 0cbc61c..d98d91c 100644 --- a/kdat/BackupDlg.h +++ b/kdat/BackupDlg.h @@ -93,12 +93,12 @@ public: * @param removeSnapshot Remove the snapshot before backing up. * @param archiveSize The estimate size of the archive in kilobytes. * @param tape The tape index to add the archive to. - * @param tqparent The tqparent widget for this dialog. + * @param parent The parent widget for this dialog. * @param name The name of this widget. */ BackupDlg( const TQString & archiveName, const TQString & workingDir, const TQStringList& files, bool oneFilesystem, bool incremental, const TQString & snapshot, bool removeSnapshot, int archiveSize, Tape* tape, - TQWidget* tqparent = 0, const char* name = 0 ); + TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the backup dialog. diff --git a/kdat/BackupOptDlg.cpp b/kdat/BackupOptDlg.cpp index 86aa875..58ae673 100644 --- a/kdat/BackupOptDlg.cpp +++ b/kdat/BackupOptDlg.cpp @@ -30,8 +30,8 @@ #include "BackupOptDlg.moc" -BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ) +BackupOptDlg::BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ) { setIconText( i18n( "KDat: Backup Options" ) ); setCaption( i18n( "KDat: Backup Options" ) ); diff --git a/kdat/BackupOptDlg.h b/kdat/BackupOptDlg.h index 4a5e3dd..8b0603e 100644 --- a/kdat/BackupOptDlg.h +++ b/kdat/BackupOptDlg.h @@ -37,7 +37,7 @@ public: * * @param backupProfile The backup profile. */ - BackupOptDlg( BackupProfile* backupProfile, TQWidget* tqparent=0, const char* name=0 ); + BackupOptDlg( BackupProfile* backupProfile, TQWidget* parent=0, const char* name=0 ); /** * Destroy the backup options dialog. diff --git a/kdat/BackupProfileInfoWidget.cpp b/kdat/BackupProfileInfoWidget.cpp index ff0b541..a40b94c 100644 --- a/kdat/BackupProfileInfoWidget.cpp +++ b/kdat/BackupProfileInfoWidget.cpp @@ -36,8 +36,8 @@ #include "BackupProfileInfoWidget.moc" -BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), +BackupProfileInfoWidget::BackupProfileInfoWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), _backupProfile( 0 ) { TQLabel* lbl1 = new TQLabel( i18n( "Backup profile name:" ), this ); diff --git a/kdat/BackupProfileInfoWidget.h b/kdat/BackupProfileInfoWidget.h index 3366cd4..fe24177 100644 --- a/kdat/BackupProfileInfoWidget.h +++ b/kdat/BackupProfileInfoWidget.h @@ -45,7 +45,7 @@ public: /** * Create a new backup profile info widget. */ - BackupProfileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + BackupProfileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the backup profile widget. diff --git a/kdat/BackupProfileWidget.cpp b/kdat/BackupProfileWidget.cpp index 1cd3f4c..773a8bd 100644 --- a/kdat/BackupProfileWidget.cpp +++ b/kdat/BackupProfileWidget.cpp @@ -33,8 +33,8 @@ #include "BackupProfileWidget.moc" -BackupProfileWidget::BackupProfileWidget( TQWidget* tqparent, const char* name ) - : KTabCtl( tqparent, name ) +BackupProfileWidget::BackupProfileWidget( TQWidget* parent, const char* name ) + : KTabCtl( parent, name ) { TQWidget* one = new TQWidget( this ); addTab( one, i18n( "Backup" ) ); diff --git a/kdat/BackupProfileWidget.h b/kdat/BackupProfileWidget.h index 4458c38..11526fe 100644 --- a/kdat/BackupProfileWidget.h +++ b/kdat/BackupProfileWidget.h @@ -57,10 +57,10 @@ public: * * @param archiveName The default name for the new archive. * @param files The list of files to be archived. - * @param tqparent The tqparent widget of this dialog. + * @param parent The parent widget of this dialog. * @param name The widget name of this dialog. */ - BackupProfileWidget( TQWidget* tqparent=0, const char* name=0 ); + BackupProfileWidget( TQWidget* parent=0, const char* name=0 ); /** * Destroy the backup profile widget. diff --git a/kdat/File.cpp b/kdat/File.cpp index 01a1e13..ce05aeb 100644 --- a/kdat/File.cpp +++ b/kdat/File.cpp @@ -21,10 +21,10 @@ #include "File.h" -File::File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name ) +File::File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name ) : _stubbed( FALSE ), _name( name ), - _parent( tqparent ) + _parent( parent ) { assert( endRecord >= startRecord ); @@ -34,9 +34,9 @@ File::File( File* tqparent, int size, int mtime, int startRecord, int endRecord, _union._data._endRecord = endRecord; } -File::File( File* tqparent, FILE* fptr, int offset ) +File::File( File* parent, FILE* fptr, int offset ) : _stubbed( TRUE ), - _parent( tqparent ) + _parent( parent ) { _union._stub._fptr = fptr; _union._stub._offset = offset; @@ -236,8 +236,8 @@ TQString File::getName() TQString File::getFullPathName() { TQString tmp = _name.copy(); - for ( File* tqparent = getParent(); tqparent; tqparent = tqparent->getParent() ) { - tmp.prepend( tqparent->getName() ); + for ( File* parent = getParent(); parent; parent = parent->getParent() ) { + tmp.prepend( parent->getName() ); } return tmp; diff --git a/kdat/File.h b/kdat/File.h index 7bfcd3e..71167f2 100644 --- a/kdat/File.h +++ b/kdat/File.h @@ -52,7 +52,7 @@ public: /** * Create a new file entry. * - * @param tqparent The directory file entry that contains this file. + * @param parent The directory file entry that contains this file. * @param size The size of the file in bytes. * @param mtime The last modification time of the file in seconds since * the Epoch. @@ -63,21 +63,21 @@ public: * the file's path name should be passed in. The rest of the * path is determined by this file entry's ancestors. */ - File( File* tqparent, int size, int mtime, int startRecord, int endRecord, const TQString & name ); + File( File* parent, int size, int mtime, int startRecord, int endRecord, const TQString & name ); /** * Create a new stubbed instance of a file entry. The file pointer and * offset specify where the actual instance data can be found. The real * data is read on demand when one of the accessor functions is called. * - * @param tqparent The directory file entry that contains this file. + * @param parent The directory file entry that contains this file. * @param fptr The open index file containing this file entry. The file * must be left open so that the file entry information can * be read at a later time. * @param offset The offset that will be seeked to when reading the file * entry information. */ - File( File* tqparent, FILE* fptr, int offset ); + File( File* parent, FILE* fptr, int offset ); /** * Destroy the file entry and all of its tqchildren. @@ -163,7 +163,7 @@ public: TQString getFullPathName(); /** - * Get the file entry's tqparent. A NULL tqparent indicates that this is one + * Get the file entry's parent. A NULL parent indicates that this is one * of (possibly) many top level directories within the tar archive. * * @return A pointer to the file entry that contains this file entry. diff --git a/kdat/FileInfoWidget.cpp b/kdat/FileInfoWidget.cpp index bcb896d..e8991a8 100644 --- a/kdat/FileInfoWidget.cpp +++ b/kdat/FileInfoWidget.cpp @@ -36,8 +36,8 @@ #include "FileInfoWidget.moc" -FileInfoWidget::FileInfoWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +FileInfoWidget::FileInfoWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this ); TQLabel* lbl2 = new TQLabel( i18n( "Created on:" ), this ); diff --git a/kdat/FileInfoWidget.h b/kdat/FileInfoWidget.h index 5e7f9e2..0a36f61 100644 --- a/kdat/FileInfoWidget.h +++ b/kdat/FileInfoWidget.h @@ -40,10 +40,10 @@ public: /** * Create a new file info widget. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of this widget. */ - FileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + FileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the file info widget. diff --git a/kdat/FormatOptDlg.cpp b/kdat/FormatOptDlg.cpp index 3041be5..f6084de 100644 --- a/kdat/FormatOptDlg.cpp +++ b/kdat/FormatOptDlg.cpp @@ -34,8 +34,8 @@ #include "FormatOptDlg.moc" -FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ) +FormatOptDlg::FormatOptDlg( const TQString & def, TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ) { setIconText( i18n( "KDat: Format Options" ) ); setCaption( i18n( "KDat: Format Options" ) ); diff --git a/kdat/FormatOptDlg.h b/kdat/FormatOptDlg.h index db557e9..cdb2512 100644 --- a/kdat/FormatOptDlg.h +++ b/kdat/FormatOptDlg.h @@ -43,10 +43,10 @@ public: * Create a new format options dialog. * * @param def The default value for the tape name. - * @param tqparent The tqparent widget for the dialog. + * @param parent The parent widget for the dialog. * @param name The name for the dialog. */ - FormatOptDlg( const TQString & def, TQWidget* tqparent=0, const char* name=0 ); + FormatOptDlg( const TQString & def, TQWidget* parent=0, const char* name=0 ); /** * Destroy the format options dialog. diff --git a/kdat/IndexDlg.cpp b/kdat/IndexDlg.cpp index 2808f86..bd1f62c 100644 --- a/kdat/IndexDlg.cpp +++ b/kdat/IndexDlg.cpp @@ -41,8 +41,8 @@ #include "IndexDlg.moc" -IndexDlg::IndexDlg( Tape* tape, TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ), +IndexDlg::IndexDlg( Tape* tape, TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ), _tarParser( NULL ), _tape( tape ), _archive( NULL ), diff --git a/kdat/IndexDlg.h b/kdat/IndexDlg.h index 9dfd6ea..ffbc505 100644 --- a/kdat/IndexDlg.h +++ b/kdat/IndexDlg.h @@ -79,10 +79,10 @@ public: * Create a new tape index dialog. * * @param tape A pointer to the empty tape index to fill in. - * @param tqparent The tqparent widget for this dialog. + * @param parent The parent widget for this dialog. * @param name The name of this dialog. */ - IndexDlg( Tape* tape, TQWidget* tqparent = 0, const char* name = 0 ); + IndexDlg( Tape* tape, TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the tape index dialog. diff --git a/kdat/InfoShellWidget.cpp b/kdat/InfoShellWidget.cpp index bda2be9..4a3c1b3 100644 --- a/kdat/InfoShellWidget.cpp +++ b/kdat/InfoShellWidget.cpp @@ -23,8 +23,8 @@ #include "InfoShellWidget.moc" -InfoShellWidget::InfoShellWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +InfoShellWidget::InfoShellWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { } diff --git a/kdat/InfoShellWidget.h b/kdat/InfoShellWidget.h index ae8dd90..0f87585 100644 --- a/kdat/InfoShellWidget.h +++ b/kdat/InfoShellWidget.h @@ -22,7 +22,7 @@ #include /** - * @short A suitable tqparent for the info widgets. + * @short A suitable parent for the info widgets. */ class InfoShellWidget : public TQWidget { Q_OBJECT @@ -31,10 +31,10 @@ public: /** * Create a new info shell widget. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of this widget. */ - InfoShellWidget( TQWidget* tqparent = 0, const char* name = 0 ); + InfoShellWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the info shell widget. diff --git a/kdat/KDat.kdoc b/kdat/KDat.kdoc index d69f3eb..21b5a50 100644 --- a/kdat/KDat.kdoc +++ b/kdat/KDat.kdoc @@ -519,7 +519,7 @@ KTreeViewItem::delayedExpanding=KTreeViewItem.html#delayedExpanding KTreeViewItem::doTree=KTreeViewItem.html#doTree KTreeViewItem::doText=KTreeViewItem.html#doText KTreeViewItem::paint=KTreeViewItem.html#paint -KTreeViewItem::tqparent=KTreeViewItem.html#tqparent +KTreeViewItem::parent=KTreeViewItem.html#parent KTreeViewItem::sibling=KTreeViewItem.html#sibling KTreeViewItem::pixmap=KTreeViewItem.html#pixmap KTreeViewItem::text=KTreeViewItem.html#text diff --git a/kdat/KDatMainWindow.cpp b/kdat/KDatMainWindow.cpp index d3cf265..3bc2b6d 100644 --- a/kdat/KDatMainWindow.cpp +++ b/kdat/KDatMainWindow.cpp @@ -578,10 +578,10 @@ void KDatMainWindow::doVerify( bool restore ) if ( !archiveNode ) { if ( ((Node*)_tree->getCurrentItem())->isType( Node::RangeableNodeType ) ) { rangeableNode = (RangeableNode*)_tree->getCurrentItem(); - Node* tqparent = rangeableNode; - for ( ; !tqparent->isType( Node::MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ); - assert( tqparent ); - archive = ((MountedArchiveNode*)tqparent)->getArchive(); + Node* parent = rangeableNode; + for ( ; !parent->isType( Node::MountedArchiveNodeType ); parent = (Node*)parent->getParent() ); + assert( parent ); + archive = ((MountedArchiveNode*)parent)->getArchive(); } } @@ -1263,10 +1263,10 @@ void KDatMainWindow::configureUI( Tape* tape ) // even if sel==NULL when a child is selected (see loop above). if( sel != (Node *)0x0 ) { - for ( Node* tqparent = (Node*)sel->getParent(); - ( tqparent ) && ( tqparent->getParent() ); - tqparent = (Node*)tqparent->getParent() ) { - if ( tqparent->isType( Node::TapeNodeType ) ) { + for ( Node* parent = (Node*)sel->getParent(); + ( parent ) && ( parent->getParent() ); + parent = (Node*)parent->getParent() ) { + if ( parent->isType( Node::TapeNodeType ) ) { canRestore = FALSE; } } diff --git a/kdat/LoggerWidget.cpp b/kdat/LoggerWidget.cpp index 2412104..3505dfb 100644 --- a/kdat/LoggerWidget.cpp +++ b/kdat/LoggerWidget.cpp @@ -29,8 +29,8 @@ #include "LoggerWidget.moc" -LoggerWidget::LoggerWidget( const TQString & title, TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +LoggerWidget::LoggerWidget( const TQString & title, TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQLabel* lbl1 = new TQLabel( title, this ); lbl1->setFixedHeight( lbl1->tqsizeHint().height() ); diff --git a/kdat/LoggerWidget.h b/kdat/LoggerWidget.h index d649e65..1dd43e9 100644 --- a/kdat/LoggerWidget.h +++ b/kdat/LoggerWidget.h @@ -35,10 +35,10 @@ public: * Create a titled logging widget * * @param title The title text displayed above the logging window. - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of this widget. */ - LoggerWidget( const TQString & title, TQWidget* tqparent = 0, const char* name = 0 ); + LoggerWidget( const TQString & title, TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the logging widget. diff --git a/kdat/Node.cpp b/kdat/Node.cpp index 9ce9e03..006e978 100644 --- a/kdat/Node.cpp +++ b/kdat/Node.cpp @@ -655,10 +655,10 @@ void MountedArchiveNode::setSelected( bool select ) { if ( select ) { // Deselect all other archives. - Node* tqparent = (Node*)getParent(); - for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) { - if ( tqparent->tqchildAt( i ) != this ) { - ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE ); + Node* parent = (Node*)getParent(); + for ( int i = parent->childCount() - 1; i >= 0; i-- ) { + if ( parent->tqchildAt( i ) != this ) { + ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); } } } @@ -730,9 +730,9 @@ TQString MountedTapeDirectoryNode::getFullPath() { if ( _fullPath.length() == 0 ) { _fullPath = getText() + "/"; - for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) { + for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) { _fullPath.prepend( "/" ); - _fullPath.prepend( tqparent->getText() ); + _fullPath.prepend( parent->getText() ); } } @@ -748,17 +748,17 @@ void MountedTapeDirectoryNode::setSelected( bool select ) { if ( select ) { // Deselect all other archives. - Node* tqparent = (Node*)getParent(); + Node* parent = (Node*)getParent(); Node* arcNode = 0; - while ( !tqparent->isType( TapeDriveNodeType ) ) { - if ( tqparent->isType( MountedArchiveNodeType ) ) { - arcNode = tqparent; + while ( !parent->isType( TapeDriveNodeType ) ) { + if ( parent->isType( MountedArchiveNodeType ) ) { + arcNode = parent; } - tqparent = (Node*)tqparent->getParent(); + parent = (Node*)parent->getParent(); } - for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) { - if ( tqparent->tqchildAt( i ) != arcNode ) { - ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE ); + for ( int i = parent->childCount() - 1; i >= 0; i-- ) { + if ( parent->tqchildAt( i ) != arcNode ) { + ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); } } } @@ -836,9 +836,9 @@ TQString MountedTapeFileNode::getFullPath() { if ( _fullPath.length() == 0 ) { _fullPath = getText(); - for ( Node* tqparent = (Node*)getParent(); !tqparent->isType( MountedArchiveNodeType ); tqparent = (Node*)tqparent->getParent() ) { + for ( Node* parent = (Node*)getParent(); !parent->isType( MountedArchiveNodeType ); parent = (Node*)parent->getParent() ) { _fullPath.prepend( "/" ); - _fullPath.prepend( tqparent->getText() ); + _fullPath.prepend( parent->getText() ); } } @@ -854,17 +854,17 @@ void MountedTapeFileNode::setSelected( bool select ) { if ( select ) { // Deselect all other archives. - Node* tqparent = (Node*)getParent(); + Node* parent = (Node*)getParent(); Node* arcNode = 0; - while ( !tqparent->isType( TapeDriveNodeType ) ) { - if ( tqparent->isType( MountedArchiveNodeType ) ) { - arcNode = tqparent; + while ( !parent->isType( TapeDriveNodeType ) ) { + if ( parent->isType( MountedArchiveNodeType ) ) { + arcNode = parent; } - tqparent = (Node*)tqparent->getParent(); + parent = (Node*)parent->getParent(); } - for ( int i = tqparent->childCount() - 1; i >= 0; i-- ) { - if ( tqparent->tqchildAt( i ) != arcNode ) { - ((SelectableNode*)tqparent->tqchildAt( i ))->setSelected( FALSE ); + for ( int i = parent->childCount() - 1; i >= 0; i-- ) { + if ( parent->tqchildAt( i ) != arcNode ) { + ((SelectableNode*)parent->tqchildAt( i ))->setSelected( FALSE ); } } } diff --git a/kdat/OptionsDlg.cpp b/kdat/OptionsDlg.cpp index 31aec9c..f056bbf 100644 --- a/kdat/OptionsDlg.cpp +++ b/kdat/OptionsDlg.cpp @@ -34,9 +34,9 @@ #include #include "OptionsDlg.moc" -OptionsDlg::OptionsDlg( TQWidget* tqparent, const char* name ) +OptionsDlg::OptionsDlg( TQWidget* parent, const char* name ) : KDialogBase( Swallow, i18n ("Options"), Ok | Apply | Cancel, - Ok, tqparent, name, true, true ), apply (0) + Ok, parent, name, true, true ), apply (0) { _baseWidget = new OptionsDlgWidget ( 0 ); setMainWidget (_baseWidget); diff --git a/kdat/OptionsDlg.h b/kdat/OptionsDlg.h index b96fe8c..75d29a9 100644 --- a/kdat/OptionsDlg.h +++ b/kdat/OptionsDlg.h @@ -39,10 +39,10 @@ public: /** * Create a new options dialog. * - * @param tqparent The tqparent widget of the dialog. + * @param parent The parent widget of the dialog. * @param name The name of the dialog. */ - OptionsDlg( TQWidget* tqparent = 0, const char* name = 0 ); + OptionsDlg( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the options dialog. diff --git a/kdat/TapeFileInfoWidget.cpp b/kdat/TapeFileInfoWidget.cpp index 57ba85a..2a87862 100644 --- a/kdat/TapeFileInfoWidget.cpp +++ b/kdat/TapeFileInfoWidget.cpp @@ -30,8 +30,8 @@ #include "TapeFileInfoWidget.moc" -TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ) +TapeFileInfoWidget::TapeFileInfoWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ) { TQLabel* lbl1 = new TQLabel( i18n( "File name:" ), this ); TQLabel* lbl2 = new TQLabel( i18n( "Last modified:" ), this ); diff --git a/kdat/TapeFileInfoWidget.h b/kdat/TapeFileInfoWidget.h index e6f605e..60a9a1c 100644 --- a/kdat/TapeFileInfoWidget.h +++ b/kdat/TapeFileInfoWidget.h @@ -41,10 +41,10 @@ public: /** * Create a new tape file info widget. * - * @param tqparent The tqparent widget. + * @param parent The parent widget. * @param name The name of this widget. */ - TapeFileInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + TapeFileInfoWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the tape file info widget. diff --git a/kdat/TapeInfoWidget.cpp b/kdat/TapeInfoWidget.cpp index 933b504..3e94ae8 100644 --- a/kdat/TapeInfoWidget.cpp +++ b/kdat/TapeInfoWidget.cpp @@ -37,8 +37,8 @@ #include "TapeInfoWidget.moc" -TapeInfoWidget::TapeInfoWidget( TQWidget* tqparent, const char* name ) - : TQWidget( tqparent, name ), +TapeInfoWidget::TapeInfoWidget( TQWidget* parent, const char* name ) + : TQWidget( parent, name ), _tape( 0 ) { TQLabel* lbl1 = new TQLabel( i18n( "Tape name:" ), this ); diff --git a/kdat/TapeInfoWidget.h b/kdat/TapeInfoWidget.h index cf87aa7..b4e1c0d 100644 --- a/kdat/TapeInfoWidget.h +++ b/kdat/TapeInfoWidget.h @@ -54,7 +54,7 @@ public: /** * Create a new tape info widget. */ - TapeInfoWidget( TQWidget* tqparent = 0, const char* name = 0 ); + TapeInfoWidget( TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the tape info widget. diff --git a/kdat/VerifyDlg.cpp b/kdat/VerifyDlg.cpp index 520c050..209c177 100644 --- a/kdat/VerifyDlg.cpp +++ b/kdat/VerifyDlg.cpp @@ -45,8 +45,8 @@ VerifyDlg::VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges, - bool restore, TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ), + bool restore, TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ), _restore( restore ), _proc( NULL ), _workingDir( workingDir ), diff --git a/kdat/VerifyDlg.h b/kdat/VerifyDlg.h index bc11524..41df846 100644 --- a/kdat/VerifyDlg.h +++ b/kdat/VerifyDlg.h @@ -80,11 +80,11 @@ public: * @param fileno The tape file number of the archive to verify/restore. * @param ranges A list of tar block ranges to read. * @param restore TRUE means restore, FALSE means verify. - * @param tqparent The tqparent widget for the dialog. + * @param parent The parent widget for the dialog. * @param name The name of this widget. */ VerifyDlg( const TQString & workingDir, int fileno, const RangeList& ranges, - bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 ); + bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the verify/restore dialog. diff --git a/kdat/VerifyOptDlg.cpp b/kdat/VerifyOptDlg.cpp index 119c9f1..a1f1353 100644 --- a/kdat/VerifyOptDlg.cpp +++ b/kdat/VerifyOptDlg.cpp @@ -33,8 +33,8 @@ #include "VerifyOptDlg.moc" -VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* tqparent, const char* name ) - : TQDialog( tqparent, name, TRUE ), +VerifyOptDlg::VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore, TQWidget* parent, const char* name ) + : TQDialog( parent, name, TRUE ), _restore( restore ) { if ( _restore ) { diff --git a/kdat/VerifyOptDlg.h b/kdat/VerifyOptDlg.h index faa94a7..5c3915a 100644 --- a/kdat/VerifyOptDlg.h +++ b/kdat/VerifyOptDlg.h @@ -46,10 +46,10 @@ public: * @param def The default working directory. * @param files The list of files that will be verified/restored. * @param restore TRUE means we are doing a restore, FALSE means we are doing a verify. - * @param tqparent The tqparent widget for the dialog. + * @param parent The parent widget for the dialog. * @param name The name for the dialog. */ - VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* tqparent = 0, const char* name = 0 ); + VerifyOptDlg( const TQString & def, const TQStringList& files, bool restore = FALSE, TQWidget* parent = 0, const char* name = 0 ); /** * Destroy the verify/restore options dialog. diff --git a/kdat/ktreeview.cpp b/kdat/ktreeview.cpp index 2a31a19..516fb92 100644 --- a/kdat/ktreeview.cpp +++ b/kdat/ktreeview.cpp @@ -49,7 +49,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText) : doTree(true), doText(true), child(0), - tqparent(0), + parent(0), sibling(0), deleteChildren(false) { @@ -67,7 +67,7 @@ KTreeViewItem::KTreeViewItem(const TQString& theText, doTree(true), doText(true), child(0), - tqparent(0), + parent(0), sibling(0), deleteChildren(false) { @@ -92,7 +92,7 @@ KTreeViewItem::~KTreeViewItem() // appends a direct child void KTreeViewItem::appendChild(KTreeViewItem* newChild) { - newChild->tqparent = this; + newChild->parent = this; newChild->owner = owner; if (!getChild()) { child = newChild; @@ -169,10 +169,10 @@ KTreeViewItem* KTreeViewItem::getChild() const return child; } -// returns the tqparent of this item +// returns the parent of this item KTreeViewItem* KTreeViewItem::getParent() const { - return tqparent; + return parent; } // returns reference to the item pixmap @@ -199,10 +199,10 @@ bool KTreeViewItem::hasChild() const return child != 0; } -// indicates whether this item has a tqparent +// indicates whether this item has a parent bool KTreeViewItem::hasParent() const { - return tqparent != 0; + return parent != 0; } // indicates whether this item has a sibling below it @@ -234,7 +234,7 @@ void KTreeViewItem::insertChild(int index, KTreeViewItem* newChild) appendChild(newChild); return; } - newChild->tqparent = this; + newChild->parent = this; newChild->owner = owner; if (index == 0) { newChild->sibling = getChild(); @@ -393,9 +393,9 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const /* * If this is not the first item in the tree draw the line up - * towards tqparent or sibling. + * towards parent or sibling. */ - if (tqparent->tqparent != 0 || tqparent->getChild() != this) + if (parent->parent != 0 || parent->getChild() != this) p->drawLine(parentLeaderX, 0, parentLeaderX, cellCenterY); // draw the line down towards sibling @@ -408,12 +408,12 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const * item out to the left. */ if (sibling || (doExpandButton && (child || delayedExpanding)) || - tqparent->tqparent != 0 || + parent->parent != 0 || /* * The following handles the case of an item at the end of the * topmost level which doesn't have tqchildren. */ - tqparent->getChild() != this) + parent->getChild() != this) { p->drawLine(parentLeaderX, cellCenterY, itemLeaderX, cellCenterY); } @@ -422,7 +422,7 @@ void KTreeViewItem::paintTree(TQPainter* p, int indent, int cellHeight) const * If there are siblings of ancestors below, draw our portion of the * branches that extend through this cell. */ - KTreeViewItem* prevRoot = tqparent; + KTreeViewItem* prevRoot = parent; while (prevRoot->getParent() != 0) { /* while not root item */ if (prevRoot->hasSibling()) { int sibLeaderX = owner->indentation(prevRoot) - (22 / 2); @@ -573,10 +573,10 @@ int KTreeViewItem::width(int indent, const TQFontMetrics& fm) const */ // constructor -KTreeView::KTreeView(TQWidget *tqparent, +KTreeView::KTreeView(TQWidget *parent, const char *name, WFlags f) : - TQGridView(tqparent, name, f), + TQGridView(parent, name, f), clearing(false), current(-1), drawExpandButton(true), @@ -649,7 +649,7 @@ void KTreeView::appendChildItem(const TQString & theText, const TQPixmap& thePix // appends the given item to the tqchildren of the item at the given index void KTreeView::appendChildItem(KTreeViewItem* newItem, int index) { - /* find tqparent item and append new item to tqparent's sub tree */ + /* find parent item and append new item to parent's sub tree */ KTreeViewItem* parentItem = itemAt(index); if (!parentItem) return; @@ -660,7 +660,7 @@ void KTreeView::appendChildItem(KTreeViewItem* newItem, int index) // given path void KTreeView::appendChildItem(KTreeViewItem* newItem, const KPath& thePath) { - /* find tqparent item and append new item to tqparent's sub tree */ + /* find parent item and append new item to parent's sub tree */ KTreeViewItem* parentItem = itemAt(thePath); if (!parentItem) return; @@ -994,7 +994,7 @@ int KTreeView::itemRow(KTreeViewItem* item) /* * move the subtree at the specified index up one branch level (make root - * item a sibling of its current tqparent) + * item a sibling of its current parent) */ void KTreeView::join(int index) { @@ -1005,7 +1005,7 @@ void KTreeView::join(int index) /* * move the subtree at the specified index up one branch level (make root - * item a sibling of it's current tqparent) + * item a sibling of it's current parent) */ void KTreeView::join(const KPath& path) { @@ -1014,7 +1014,7 @@ void KTreeView::join(const KPath& path) join(item); } -/* move item at specified index one slot down in its tqparent's sub tree */ +/* move item at specified index one slot down in its parent's sub tree */ void KTreeView::lowerItem(int index) { KTreeViewItem *item = itemAt(index); @@ -1022,7 +1022,7 @@ void KTreeView::lowerItem(int index) lowerItem(item); } -/* move item at specified path one slot down in its tqparent's sub tree */ +/* move item at specified path one slot down in its parent's sub tree */ void KTreeView::lowerItem(const KPath& path) { KTreeViewItem* item = itemAt(path); @@ -1030,7 +1030,7 @@ void KTreeView::lowerItem(const KPath& path) lowerItem(item); } -/* move item at specified index one slot up in its tqparent's sub tree */ +/* move item at specified index one slot up in its parent's sub tree */ void KTreeView::raiseItem(int index) { KTreeViewItem* item = itemAt(index); @@ -1038,7 +1038,7 @@ void KTreeView::raiseItem(int index) raiseItem(item); } -/* move item at specified path one slot up in its tqparent's sub tree */ +/* move item at specified path one slot up in its parent's sub tree */ void KTreeView::raiseItem(const KPath& path) { KTreeViewItem* item = itemAt(path); @@ -1237,7 +1237,7 @@ bool KTreeView::treeDrawing() const } -// appends a child to the specified tqparent item (note: a child, not a sibling, is added!) +// appends a child to the specified parent item (note: a child, not a sibling, is added!) void KTreeView::appendChildItem(KTreeViewItem* theParent, KTreeViewItem* newItem) { @@ -1317,17 +1317,17 @@ bool KTreeView::countItem(KTreeViewItem*, void* total) } // if item is expanded, collapses it or vice-versa -void KTreeView::expandOrCollapse(KTreeViewItem* tqparent) +void KTreeView::expandOrCollapse(KTreeViewItem* parent) { bool autoU = autoUpdate(); setAutoUpdate(false); - int parentIndex = itemRow(tqparent); - if (tqparent->isExpanded()) { - collapseSubTree(tqparent); + int parentIndex = itemRow(parent); + if (parent->isExpanded()) { + collapseSubTree(parent); emit collapsed(parentIndex); } else { - expandSubTree(tqparent); + expandSubTree(parent); emit expanded(parentIndex); } if (autoU && isVisible()) @@ -1534,7 +1534,7 @@ void KTreeView::itemPath(KTreeViewItem* item, KPath& path) const /* * joins the item's branch into the tree, making the item a sibling of its - * tqparent + * parent */ void KTreeView::join(KTreeViewItem *item) { @@ -1632,15 +1632,15 @@ int KTreeView::level(KTreeViewItem* item) const assert(item->owner == this); assert(item != treeRoot); int l = 0; - item = item->tqparent->tqparent; /* since item != treeRoot, there is a tqparent */ + item = item->parent->parent; /* since item != treeRoot, there is a parent */ while (item != 0) { - item = item->tqparent; + item = item->parent; l++; } return l; } -/* move specified item down one slot in tqparent's subtree */ +/* move specified item down one slot in parent's subtree */ void KTreeView::lowerItem(KTreeViewItem *item) { KTreeViewItem *itemParent = item->getParent(); @@ -1866,7 +1866,7 @@ void KTreeView::paintCell(TQPainter* p, int row, int) p->setClipping(false); } -/* raise the specified item up one slot in tqparent's subtree */ +/* raise the specified item up one slot in parent's subtree */ void KTreeView::raiseItem(KTreeViewItem *item) { KTreeViewItem *itemParent = item->getParent(); @@ -1891,15 +1891,15 @@ KTreeViewItem* KTreeView::recursiveFind(KPath& path) // get the next key TQString* searchString = path.pop(); - // find the tqparent item - KTreeViewItem* tqparent = recursiveFind(path); - if (tqparent == 0) + // find the parent item + KTreeViewItem* parent = recursiveFind(path); + if (parent == 0) return 0; /* - * Iterate through the tqparent's tqchildren searching for searchString. + * Iterate through the parent's tqchildren searching for searchString. */ - KTreeViewItem* sibling = tqparent->getChild(); + KTreeViewItem* sibling = parent->getChild(); while (sibling != 0) { if (*searchString == sibling->getText()) { break; /* found it! */ @@ -1988,7 +1988,7 @@ void KTreeView::takeItem(KTreeViewItem* item) c = c->getParent(); } if (c != 0) { - // move current item to tqparent + // move current item to parent cur = item->getParent(); if (cur == treeRoot) cur = 0; diff --git a/kdat/ktreeview.h b/kdat/ktreeview.h index bd20d7c..d0af2d5 100644 --- a/kdat/ktreeview.h +++ b/kdat/ktreeview.h @@ -61,7 +61,7 @@ public: /** * Appends a new (direct) child item at the end. It does not update - * administrative data in newChild except for its tqparent (which is this + * administrative data in newChild except for its parent (which is this * item) and owner. */ void appendChild(KTreeViewItem* newChild); @@ -100,7 +100,7 @@ public: KTreeViewItem* getChild() const; /** - * Returns a pointer to the tqparent of this item, or 0 if none. + * Returns a pointer to the parent of this item, or 0 if none. */ KTreeViewItem* getParent() const; @@ -128,7 +128,7 @@ public: bool hasChild() const; /** - * Indicates whether this item has a tqparent. + * Indicates whether this item has a parent. */ bool hasParent() const; @@ -142,7 +142,7 @@ public: * Inserts the a new (direct) child in this item before the child at * the specified index (first child is index 0). If there is no child * at the specified index, the item is appended. It does not update - * administrative data in newChild except for its tqparent (which is this + * administrative data in newChild except for its parent (which is this * item) and owner. */ void insertChild(int index, KTreeViewItem* newChild); @@ -224,7 +224,7 @@ protected: virtual int height(const TQFontMetrics& fm) const; /** - * Paints the item: pixmap, text, expand button, tqparent branches + * Paints the item: pixmap, text, expand button, parent branches */ virtual void paint(TQPainter* p, int indent, const TQColorGroup& cg, bool highlighted) const; @@ -286,7 +286,7 @@ protected: bool doText; mutable TQRect expandButton; /* is set in paint() */ KTreeViewItem* child; - KTreeViewItem* tqparent; + KTreeViewItem* parent; KTreeViewItem* sibling; TQPixmap pixmap; TQString text; @@ -331,7 +331,7 @@ typedef bool (*KForEvery) by the programmer. * The list items can be returned by index or logical path and the tree - navigated by tqparent, child or sibling references contained in them. Also, + navigated by parent, child or sibling references contained in them. Also, item information such as text, pixmap, branch level can be obtained. * Items can be inserted, changed and removed either by index in the visible @@ -407,7 +407,7 @@ public: * current item to -1, and sets default values for scroll bars (both * auto). */ - KTreeView(TQWidget* tqparent = 0, const char* name = 0, WFlags f = 0); + KTreeView(TQWidget* parent = 0, const char* name = 0, WFlags f = 0); /* * Desctructor. Deletes all items from the topmost level that have been @@ -425,7 +425,7 @@ public: int index); /** - * Same as above except that the tqparent item is specified by a path. + * Same as above except that the parent item is specified by a path. */ void appendChildItem(const TQString & theText, const TQPixmap& thePixmap, const KPath& thePath); @@ -438,7 +438,7 @@ public: void appendChildItem(KTreeViewItem* newItem, int index); /** - * Same as above except that the tqparent item is specified by a path. + * Same as above except that the parent item is specified by a path. */ void appendChildItem(KTreeViewItem* newItem, const KPath& thePath); @@ -515,7 +515,7 @@ public: void expandItem(int index); /** - Returns the depth to which all tqparent items are automatically + Returns the depth to which all parent items are automatically expanded. */ int expandLevel() const; @@ -622,7 +622,7 @@ public: /** * Outdents the item at the given row one level so that it becomes a - * sibling of its tqparent. + * sibling of its parent. */ void join(int index); @@ -870,7 +870,7 @@ public: protected: virtual void updateCellWidth(); virtual void updateVisibleItems(); - void updateVisibleItemRec(KTreeViewItem* tqparent, int& count, int& width); + void updateVisibleItemRec(KTreeViewItem* parent, int& count, int& width); KTreeViewItem* treeRoot; bool clearing; -- cgit v1.2.1