rename the following methods:

tqparent parent
tqmask mask


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

23 files changed, 70 insertions, 70 deletions

diff --git a/ark/arch.cpp b/ark/arch.cpp
index 9b9aa00..5ff9a61 100644
--- a/ark/arch.cpp
+++ b/ark/arch.cpp
@@ -390,37 +390,37 @@ bool Arch::processLine( const TQCString &line )
 
 
 Arch *Arch::archFactory( ArchType aType,
-                         ArkWidget *tqparent, const TQString &filename,
+                         ArkWidget *parent, const TQString &filename,
                          const TQString &openAsMimeType )
 {
   switch( aType )
   {
     case TAR_FORMAT:
-      return new TarArch( tqparent, filename, openAsMimeType );
+      return new TarArch( parent, filename, openAsMimeType );
 
     case ZIP_FORMAT:
-      return new ZipArch( tqparent, filename );
+      return new ZipArch( parent, filename );
 
     case LHA_FORMAT:
-      return new LhaArch( tqparent, filename );
+      return new LhaArch( parent, filename );
 
     case COMPRESSED_FORMAT:
-      return new CompressedFile( tqparent, filename, openAsMimeType );
+      return new CompressedFile( parent, filename, openAsMimeType );
 
     case ZOO_FORMAT:
-      return new ZooArch( tqparent, filename );
+      return new ZooArch( parent, filename );
 
     case RAR_FORMAT:
-      return new RarArch( tqparent, filename );
+      return new RarArch( parent, filename );
 
     case AA_FORMAT:
-      return new ArArch( tqparent, filename );
+      return new ArArch( parent, filename );
 
     case SEVENZIP_FORMAT:
-      return new SevenZipArch( tqparent, filename );
+      return new SevenZipArch( parent, filename );
 
     case ACE_FORMAT:
-      return new AceArch( tqparent, filename );
+      return new AceArch( parent, filename );
 
     case UNKNOWN_FORMAT:
     default:
diff --git a/ark/arch.h b/ark/arch.h
index 05642fc..9b28319 100644
--- a/ark/arch.h
+++ b/ark/arch.h
@@ -147,7 +147,7 @@ class Arch : public TQObject
     void clearShellOutput() { m_lastShellOutput.truncate( 0 ); }
     const TQString& getLastShellOutput() const { return m_lastShellOutput; }
 
-    static Arch *archFactory( ArchType aType, ArkWidget *tqparent,
+    static Arch *archFactory( ArchType aType, ArkWidget *parent,
                               const TQString &filename,
                               const TQString &openAsMimeType = TQString() );
 
diff --git a/ark/archiveformatdlg.cpp b/ark/archiveformatdlg.cpp
index 68c0d3f..18f4102 100644
--- a/ark/archiveformatdlg.cpp
+++ b/ark/archiveformatdlg.cpp
@@ -28,8 +28,8 @@
 #include <tqlabel.h>
 #include <tqvbox.h>
 
-ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType )
-                        :KDialogBase( tqparent, "archiveformatdialog", true,
+ArchiveFormatDlg::ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType )
+                        :KDialogBase( parent, "archiveformatdialog", true,
                           i18n( "Choose Archive Format" ),
                           KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok),
                           m_combo( 0 )
diff --git a/ark/archiveformatdlg.h b/ark/archiveformatdlg.h
index 1a1cefa..d87da74 100644
--- a/ark/archiveformatdlg.h
+++ b/ark/archiveformatdlg.h
@@ -30,7 +30,7 @@ class ArchiveFormatDlg: public KDialogBase
     Q_OBJECT
   TQ_OBJECT
 public:
-    ArchiveFormatDlg( TQWidget * tqparent, const TQString & defaultType );
+    ArchiveFormatDlg( TQWidget * parent, const TQString & defaultType );
     TQString mimeType();
 
 private:
diff --git a/ark/ark_part.cpp b/ark/ark_part.cpp
index ca6c24c..20ac169 100644
--- a/ark/ark_part.cpp
+++ b/ark/ark_part.cpp
@@ -63,9 +63,9 @@ KAboutData *ArkPart::createAboutData()
 
 
 
-ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *tqparent,
+ArkPart::ArkPart( TQWidget *parentWidget, const char * /*widgetName*/, TQObject *parent,
                   const char *name, const TQStringList &, bool readWrite )
-        : KParts::ReadWritePart(tqparent, name)
+        : KParts::ReadWritePart(parent, name)
 {
     kdDebug(1601)<<"ArkPart::ArkPart"<<endl;
     setInstance(ArkFactory::instance());
@@ -372,8 +372,8 @@ void ArkPart::cancelTransfer()
     }
 }
 
-ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name )
-                : KParts::BrowserExtension( tqparent, name )
+ArkBrowserExtension::ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name )
+                : KParts::BrowserExtension( parent, name )
 {
 }
 
@@ -382,8 +382,8 @@ void ArkBrowserExtension::slotOpenURLRequested( const KURL & url )
     emit openURLRequest( url, KParts::URLArgs() );
 }
 
-ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * tqparent )
-                : KParts::StatusBarExtension( tqparent ),
+ArkStatusBarExtension::ArkStatusBarExtension( KParts::ReadWritePart * parent )
+                : KParts::StatusBarExtension( parent ),
                   m_bBusy( false ),
                   m_pStatusLabelSelect( 0 ),
                   m_pStatusLabelTotal( 0 ),
diff --git a/ark/ark_part.h b/ark/ark_part.h
index 5cbd758..ac5a8bd 100644
--- a/ark/ark_part.h
+++ b/ark/ark_part.h
@@ -48,7 +48,7 @@ class ArkBrowserExtension: public KParts::BrowserExtension
     Q_OBJECT
   TQ_OBJECT
 public:
-    ArkBrowserExtension( KParts::ReadOnlyPart * tqparent, const char * name = 0L );
+    ArkBrowserExtension( KParts::ReadOnlyPart * parent, const char * name = 0L );
 public slots:
     void slotOpenURLRequested( const KURL & url );
 };
@@ -58,7 +58,7 @@ class ArkStatusBarExtension: public KParts::StatusBarExtension
     Q_OBJECT
   TQ_OBJECT
 public:
-    ArkStatusBarExtension( KParts::ReadWritePart * tqparent );
+    ArkStatusBarExtension( KParts::ReadWritePart * parent );
     ~ArkStatusBarExtension();
 
     void setProgress( unsigned long progress );
@@ -90,7 +90,7 @@ class ArkPart: public KParts::ReadWritePart
     Q_OBJECT
   TQ_OBJECT
 public:
-    ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *tqparent,
+    ArkPart( TQWidget *parentWidget, const char *widgetName, TQObject *parent,
              const char *name, const TQStringList &, bool readWrite );
     virtual ~ArkPart();
 
diff --git a/ark/arkapp.h b/ark/arkapp.h
index 71cd573..dc376e9 100644
--- a/ark/arkapp.h
+++ b/ark/arkapp.h
@@ -79,7 +79,7 @@ class ArkApplication : public KUniqueApplication
 		ArkApplication();
 
 	private:
-		TQWidget *m_mainwidget;  // to be the tqparent of all ArkWidgets
+		TQWidget *m_mainwidget;  // to be the parent of all ArkWidgets
 		int m_windowCount;
 
 		TQStringList openArksList;
diff --git a/ark/arkfactory.cpp b/ark/arkfactory.cpp
index a511f63..3e17e7a 100644
--- a/ark/arkfactory.cpp
+++ b/ark/arkfactory.cpp
@@ -39,7 +39,7 @@ ArkFactory::~ArkFactory()
 }
 
 KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
-                  const char *widgetName, TQObject *tqparent,
+                  const char *widgetName, TQObject *parent,
                   const char *name, const char *classname,
                   const TQStringList &args )
 {
@@ -49,7 +49,7 @@ KParts::Part * ArkFactory::createPartObject( TQWidget *parentWidget,
     {
             readWrite = true;
     }
-    ArkPart* obj = new ArkPart( parentWidget, widgetName, tqparent, name,
+    ArkPart* obj = new ArkPart( parentWidget, widgetName, parent, name,
                                 args, readWrite );
         //kdDebug( 1601 ) << "classname is: " << TQCString( classname ) << endl;
         return obj;
diff --git a/ark/arkfactory.h b/ark/arkfactory.h
index d9021b6..2b5514b 100644
--- a/ark/arkfactory.h
+++ b/ark/arkfactory.h
@@ -30,7 +30,7 @@ public:
     virtual ~ArkFactory();
     virtual KParts::Part *createPartObject(
         TQWidget *parentWidget = 0,const char *widgetName = 0,
-        TQObject *tqparent = 0, const char *name = 0,
+        TQObject *parent = 0, const char *name = 0,
         const char *classname = "KParts::Part",
         const TQStringList &args = TQStringList() );
     static KInstance* instance();
diff --git a/ark/arkviewer.cpp b/ark/arkviewer.cpp
index 1e70ce5..b2ae335 100644
--- a/ark/arkviewer.cpp
+++ b/ark/arkviewer.cpp
@@ -36,8 +36,8 @@
 #include <tqurl.h>
 
 
-ArkViewer::ArkViewer( TQWidget * tqparent, const char * name )
-	: KDialogBase( tqparent, name, false, TQString(), Close ), m_part( 0 )
+ArkViewer::ArkViewer( TQWidget * parent, const char * name )
+	: KDialogBase( parent, name, false, TQString(), Close ), m_part( 0 )
 {
 	m_widget = new TQVBox( this );
 	m_widget->tqlayout()->setSpacing( 10 );
diff --git a/ark/arkviewer.h b/ark/arkviewer.h
index c601eab..70a09d5 100644
--- a/ark/arkviewer.h
+++ b/ark/arkviewer.h
@@ -31,7 +31,7 @@ class ArkViewer : public KDialogBase
   TQ_OBJECT
 
 	public:
-		ArkViewer( TQWidget* tqparent = 0, const char * name = 0 );
+		ArkViewer( TQWidget* parent = 0, const char * name = 0 );
 		~ArkViewer();
 
 		bool view( const KURL& filename );
diff --git a/ark/arkwidget.cpp b/ark/arkwidget.cpp
index f070d4d..a83cb14 100644
--- a/ark/arkwidget.cpp
+++ b/ark/arkwidget.cpp
@@ -81,7 +81,7 @@
 #include "searchbar.h"
 #include "arkviewer.h"
 
-static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename )
+static void viewInExternalViewer( ArkWidget* parent, const KURL& filename )
 {
     TQString mimetype = KMimeType::findByURL( filename )->name();
     bool view = true;
@@ -89,7 +89,7 @@ static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename )
     if ( KRun::isExecutable( mimetype ) )
     {
         TQString text = i18n( "The file you're trying to view may be an executable. Running untrusted executables may compromise your system's security.\nAre you sure you want to run that file?" );
-        view = ( KMessageBox::warningContinueCancel( tqparent, text, TQString(), i18n("Run Nevertheless") ) == KMessageBox::Continue );
+        view = ( KMessageBox::warningContinueCancel( parent, text, TQString(), i18n("Run Nevertheless") ) == KMessageBox::Continue );
     }
 
     if ( view )
@@ -103,8 +103,8 @@ static void viewInExternalViewer( ArkWidget* tqparent, const KURL& filename )
 //
 //----------------------------------------------------------------------
 
-ArkWidget::ArkWidget( TQWidget *tqparent, const char *name )
-   : TQVBox(tqparent, name), m_bBusy( false ), m_bBusyHold( false ),
+ArkWidget::ArkWidget( TQWidget *parent, const char *name )
+   : TQVBox(parent, name), m_bBusy( false ), m_bBusyHold( false ),
      m_extractOnly( false ), m_extractRemote(false),
      m_openAsMimeType(TQString()), m_pTempAddList(NULL),
      m_bArchivePopupEnabled( false ),
diff --git a/ark/arkwidget.h b/ark/arkwidget.h
index 1ea203f..f174f9c 100644
--- a/ark/arkwidget.h
+++ b/ark/arkwidget.h
@@ -61,7 +61,7 @@ class ArkWidget : public TQVBox
     Q_OBJECT
   TQ_OBJECT
 public:
-    ArkWidget( TQWidget *tqparent=0, const char *name=0 );
+    ArkWidget( TQWidget *parent=0, const char *name=0 );
     virtual ~ArkWidget();
 
     bool isArchiveOpen() const { return m_bIsArchiveOpen; }
diff --git a/ark/extractiondialog.cpp b/ark/extractiondialog.cpp
index 87df006..923f108 100644
--- a/ark/extractiondialog.cpp
+++ b/ark/extractiondialog.cpp
@@ -51,12 +51,12 @@
 #include "arkutils.h"
 #include "settings.h"
 
-ExtractionDialog::ExtractionDialog( TQWidget *tqparent, const char *name,
+ExtractionDialog::ExtractionDialog( TQWidget *parent, const char *name,
                                     bool enableSelected,
                                     const KURL& defaultExtractionDir,
                                     const TQString &prefix,
                                     const TQString &archiveName )
-	: KDialogBase( tqparent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ),
+	: KDialogBase( parent, name, true, i18n( "Extract" ), Ok | Cancel, Ok ),
 	  m_selectedButton( 0 ), m_allButton( 0 ),
 	  m_selectedOnly( enableSelected ), m_extractionDirectory( defaultExtractionDir ),
 	  m_defaultExtractionDir( defaultExtractionDir.prettyURL() ), m_prefix( prefix )
diff --git a/ark/extractiondialog.h b/ark/extractiondialog.h
index b881770..0fc3100 100644
--- a/ark/extractiondialog.h
+++ b/ark/extractiondialog.h
@@ -46,7 +46,7 @@ class ExtractionDialog : public KDialogBase
 		/**
 		 * Constructor.
 		 */
-		ExtractionDialog( TQWidget *tqparent = 0, const char *name = 0,
+		ExtractionDialog( TQWidget *parent = 0, const char *name = 0,
 		                  bool enableSelected = true,
 		                  const KURL &defaultExtractionDir = KURL(),
 		                  const TQString &prefix = TQString(),
diff --git a/ark/filelistview.cpp b/ark/filelistview.cpp
index a4e2f02..5aa1122 100644
--- a/ark/filelistview.cpp
+++ b/ark/filelistview.cpp
@@ -170,9 +170,9 @@ void FileLVI::setText( int column, const TQString &text )
 		TQListViewItem::setText(column, text);
 }
 
-static FileLVI* folderLVI( KListViewItem *tqparent, const TQString& name )
+static FileLVI* folderLVI( KListViewItem *parent, const TQString& name )
 {
-	FileLVI *folder = new FileLVI( tqparent );
+	FileLVI *folder = new FileLVI( parent );
 
 	folder->setText( 0, name );
 
@@ -181,9 +181,9 @@ static FileLVI* folderLVI( KListViewItem *tqparent, const TQString& name )
 	return folder;
 }
 
-static FileLVI* folderLVI( KListView *tqparent, const TQString& name )
+static FileLVI* folderLVI( KListView *parent, const TQString& name )
 {
-	FileLVI *folder = new FileLVI( tqparent );
+	FileLVI *folder = new FileLVI( parent );
 	folder->setText( 0, name );
 	folder->setPixmap( 0, KMimeType::mimeType( "inode/directory" )->pixmap( KIcon::Small ) );
 	return folder;
@@ -194,8 +194,8 @@ static FileLVI* folderLVI( KListView *tqparent, const TQString& name )
 /////////////////////////////////////////////////////////////////////
 
 
-FileListView::FileListView(TQWidget *tqparent, const char* name)
-	: KListView(tqparent, name)
+FileListView::FileListView(TQWidget *parent, const char* name)
+	: KListView(parent, name)
 {
 	TQWhatsThis::add( this,
 	                 i18n( "This area is for displaying information about the files contained within an archive." )
@@ -274,14 +274,14 @@ TQStringList FileListView::selectedFilenames()
 				 * is a bit different: as we already dealt with all the tqchildren,
 				 * the "next item" is the next sibling of the current item, not
 				 * its first child. If the current item has no siblings, then
-				 * the next item is the next sibling of its tqparent, and so on.
+				 * the next item is the next sibling of its parent, and so on.
 				 */
 				FileLVI *nitem = static_cast<FileLVI*>( item->nextSibling() );
-				while ( !nitem && item->tqparent() )
+				while ( !nitem && item->parent() )
 				{
-					item = static_cast<FileLVI*>( item->tqparent() );
-					if ( item->tqparent() )
-						nitem = static_cast<FileLVI*>( item->tqparent()->nextSibling() );
+					item = static_cast<FileLVI*>( item->parent() );
+					if ( item->parent() )
+						nitem = static_cast<FileLVI*>( item->parent()->nextSibling() );
 				}
 				item = nitem;
 				continue;
@@ -385,9 +385,9 @@ FileListView::item(const TQString& filename) const
 
 void FileListView::addItem( const TQStringList & entries )
 {
-	FileLVI *flvi, *tqparent = findParent( entries[0] );
-	if ( tqparent )
-		flvi = new FileLVI( tqparent );
+	FileLVI *flvi, *parent = findParent( entries[0] );
+	if ( parent )
+		flvi = new FileLVI( parent );
 	else
 		flvi = new FileLVI( this );
 
@@ -508,7 +508,7 @@ FileLVI* FileListView::findParent( const TQString& fullname )
 		name = name.left( name.length() -1 );
 	if ( name.startsWith( "/" ) )
 		name = name.mid( 1 );
-	// Checks if this entry needs a tqparent
+	// Checks if this entry needs a parent
 	if ( !name.contains( '/' ) )
 		return static_cast< FileLVI* >( 0 );
 
@@ -538,8 +538,8 @@ FileLVI* FileListView::findParent( const TQString& fullname )
 	{
 		TQString name = ancestorList[0];
 
-		FileLVI *tqparent = static_cast< FileLVI*>( item );
-		item = tqparent->firstChild();
+		FileLVI *parent = static_cast< FileLVI*>( item );
+		item = parent->firstChild();
 		while ( item )
 		{
 			if ( item->text(0) == name )
@@ -549,7 +549,7 @@ FileLVI* FileListView::findParent( const TQString& fullname )
 
 		if ( !item )
 		{
-			item = folderLVI( tqparent, name );
+			item = folderLVI( parent, name );
 		}
 
 		ancestorList.pop_front();
@@ -559,12 +559,12 @@ FileLVI* FileListView::findParent( const TQString& fullname )
 	return static_cast< FileLVI* >( item );
 }
 
-TQStringList FileListView::tqchildrenOf( FileLVI* tqparent )
+TQStringList FileListView::tqchildrenOf( FileLVI* parent )
 {
-	Q_ASSERT( tqparent );
+	Q_ASSERT( parent );
 	TQStringList tqchildren;
 
-	FileLVI *item = static_cast<FileLVI*>( tqparent->firstChild() );
+	FileLVI *item = static_cast<FileLVI*>( parent->firstChild() );
 
 	while ( item )
 	{
diff --git a/ark/filelistview.h b/ark/filelistview.h
index e2546e5..7605e01 100644
--- a/ark/filelistview.h
+++ b/ark/filelistview.h
@@ -76,7 +76,7 @@ class FileListView: public KListView
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		FileListView( TQWidget *tqparent = 0, const char* name = 0 );
+		FileListView( TQWidget *parent = 0, const char* name = 0 );
 
 		FileLVI *currentItem() {return ((FileLVI *) KListView::currentItem());}
 
@@ -153,7 +153,7 @@ class FileListView: public KListView
 
 	private:
 		FileLVI* findParent( const TQString& fullname );
-		TQStringList tqchildrenOf( FileLVI* tqparent );
+		TQStringList tqchildrenOf( FileLVI* parent );
 
 		TQMap<int, columnName> m_columnMap;
 		bool m_pressed;
diff --git a/ark/mainwindow.cpp b/ark/mainwindow.cpp
index 6434bca..8541e1a 100644
--- a/ark/mainwindow.cpp
+++ b/ark/mainwindow.cpp
@@ -45,7 +45,7 @@
 #include "archiveformatinfo.h"
 #include "arkwidget.h"
 
-MainWindow::MainWindow( TQWidget * /*tqparent*/, const char *name )
+MainWindow::MainWindow( TQWidget * /*parent*/, const char *name )
 	: KParts::MainWindow(), progressDialog( 0 )
 {
     setXMLFile( "arkui.rc" );
diff --git a/ark/mainwindow.h b/ark/mainwindow.h
index 28989c0..e620b40 100644
--- a/ark/mainwindow.h
+++ b/ark/mainwindow.h
@@ -43,7 +43,7 @@ MainWindow: public KParts::MainWindow
     Q_OBJECT
   TQ_OBJECT
 public:
-    MainWindow( TQWidget *tqparent=0, const char *name=0 );
+    MainWindow( TQWidget *parent=0, const char *name=0 );
     virtual ~MainWindow();
 
     void setExtractOnly ( bool b );
diff --git a/ark/searchbar.cpp b/ark/searchbar.cpp
index fce4576..3efc79a 100644
--- a/ark/searchbar.cpp
+++ b/ark/searchbar.cpp
@@ -32,12 +32,12 @@
 #include <tqapplication.h>
 #include <tqvaluelist.h>
 
-SearchBar::SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name )
-	: KListViewSearchLine( tqparent, 0, name )
+SearchBar::SearchBar( TQWidget* parent, KActionCollection* aC, const char * name )
+	: KListViewSearchLine( parent, 0, name )
 {
 	KAction *resetSearch = new KAction( i18n( "Reset Search" ), TQApplication::reverseLayout() ? "clear_left" : "locationbar_erase", 0, TQT_TQOBJECT(this), TQT_SLOT( clear() ), aC, "reset_search" );
 
-	resetSearch->plug( tqparent );
+	resetSearch->plug( parent );
 	resetSearch->setWhatsThis( i18n( "Reset Search\n"
 	                                 "Resets the search bar, so that all archive entries are shown again." ) );
 }
diff --git a/ark/searchbar.h b/ark/searchbar.h
index 2e245ab..7a024bf 100644
--- a/ark/searchbar.h
+++ b/ark/searchbar.h
@@ -34,7 +34,7 @@ class SearchBar: public KListViewSearchLine
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		SearchBar( TQWidget* tqparent, KActionCollection* aC, const char * name = 0 );
+		SearchBar( TQWidget* parent, KActionCollection* aC, const char * name = 0 );
 		~SearchBar();
 };
 
diff --git a/ark/tarlistingthread.cpp b/ark/tarlistingthread.cpp
index 4b09bfd..83154c4 100644
--- a/ark/tarlistingthread.cpp
+++ b/ark/tarlistingthread.cpp
@@ -78,8 +78,8 @@ static char *makeAccessString(mode_t mode)
 	return buffer;
 }
 
-TarListingThread::TarListingThread( TQObject *tqparent, const TQString& filename )
-	: TQThread(), m_parent( tqparent )
+TarListingThread::TarListingThread( TQObject *parent, const TQString& filename )
+	: TQThread(), m_parent( parent )
 {
 	Q_ASSERT( m_parent );
 	m_archive = new KTar( filename );
diff --git a/ark/tarlistingthread.h b/ark/tarlistingthread.h
index b6f1dea..6dcdbe5 100644
--- a/ark/tarlistingthread.h
+++ b/ark/tarlistingthread.h
@@ -47,7 +47,7 @@ class ListingEvent: public TQCustomEvent
 class TarListingThread: public TQThread
 {
 	public:
-		TarListingThread( TQObject *tqparent, const TQString& filename );
+		TarListingThread( TQObject *parent, const TQString& filename );
 		~TarListingThread();
 	
 	protected: