rename the following methods:

tqparent parent
tqmask mask


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

22 files changed, 35 insertions, 35 deletions

diff --git a/kmailcvt/README b/kmailcvt/README
index b97f783e8..dbdf247a8 100644
--- a/kmailcvt/README
+++ b/kmailcvt/README
@@ -23,7 +23,7 @@ the following methods that you may want to use:
     void setOverall( int percent = 0 ); // Set overall percentage
     void addLog( const QString& log ); // Add a message for the user to see
     void alert( const QString& message ); // Tell user something has gone wrong
-    QWidget *tqparent(); // The tqparent widget
+    QWidget *parent(); // The parent widget
     
     bool removeDupMsg; // true, if user selected 'remove duplicated messages'
     
diff --git a/kmailcvt/filter_evolution.cxx b/kmailcvt/filter_evolution.cxx
index 417dd8e58..713a1bf70 100644
--- a/kmailcvt/filter_evolution.cxx
+++ b/kmailcvt/filter_evolution.cxx
@@ -51,7 +51,7 @@ void FilterEvolution::import(FilterInfo *info)
         evolDir = TQDir::homeDirPath();
     }
 
-    mailDir = KFileDialog::getExistingDirectory(evolDir, info->tqparent());
+    mailDir = KFileDialog::getExistingDirectory(evolDir, info->parent());
 
     if (mailDir.isEmpty()) {
         info->alert(i18n("No directory selected."));
diff --git a/kmailcvt/filter_evolution_v2.cxx b/kmailcvt/filter_evolution_v2.cxx
index 29b636b90..e80d7a84a 100644
--- a/kmailcvt/filter_evolution_v2.cxx
+++ b/kmailcvt/filter_evolution_v2.cxx
@@ -54,7 +54,7 @@ void FilterEvolution_v2::import(FilterInfo *info)
         evolDir = TQDir::homeDirPath();
     }
 
-    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
+    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
     kfd = new KFileDialog( evolDir, "", 0, "kfiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
diff --git a/kmailcvt/filter_lnotes.cxx b/kmailcvt/filter_lnotes.cxx
index 0fcb345ea..648f361d4 100644
--- a/kmailcvt/filter_lnotes.cxx
+++ b/kmailcvt/filter_lnotes.cxx
@@ -53,7 +53,7 @@ void FilterLNotes::import(FilterInfo *info) {
     totalFiles = 0;
 
     TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("All Files (*)"),
-                                                           inf->tqparent() );
+                                                           inf->parent() );
     totalFiles = filenames.count();
     inf->setOverall(0);
 
diff --git a/kmailcvt/filter_mailapp.cxx b/kmailcvt/filter_mailapp.cxx
index d50f28c8a..ebc34fd60 100644
--- a/kmailcvt/filter_mailapp.cxx
+++ b/kmailcvt/filter_mailapp.cxx
@@ -45,7 +45,7 @@ void FilterMailApp::import(FilterInfo *info)
     int overall_status = 0;
     bool first_msg = true;
 
-    TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->tqparent() );
+    TQString directory = KFileDialog::getExistingDirectory( TQDir::homeDirPath(), info->parent() );
 
     //qDebug("starting by looking in directory: %s", directory.latin1());
     if ( directory.isEmpty() ) {
diff --git a/kmailcvt/filter_mbox.cxx b/kmailcvt/filter_mbox.cxx
index f456b1084..d77db9761 100644
--- a/kmailcvt/filter_mbox.cxx
+++ b/kmailcvt/filter_mbox.cxx
@@ -45,7 +45,7 @@ void FilterMBox::import(FilterInfo *info)
     int overall_status = 0;
     bool first_msg = true;
 
-    TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->tqparent() );
+    TQStringList filenames = KFileDialog::getOpenFileNames( TQDir::homeDirPath(), "*|" + i18n("mbox Files (*)"), info->parent() );
     info->setOverall(0);
 
     for ( TQStringList::Iterator filename = filenames.begin(); filename != filenames.end(); ++filename, ++currentFile) {
diff --git a/kmailcvt/filter_oe.cxx b/kmailcvt/filter_oe.cxx
index 5dd8c6e51..bc5d16fdf 100644
--- a/kmailcvt/filter_oe.cxx
+++ b/kmailcvt/filter_oe.cxx
@@ -55,7 +55,7 @@ FilterOE::~FilterOE()
 void FilterOE::import(FilterInfo *info)
 {
     // Select directory containing plain text emails
-    mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent());
+    mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent());
     if (mailDir.isEmpty()) { // No directory selected
         info->alert(i18n("No directory selected."));
         return;
@@ -231,7 +231,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 {
     
     if(info->shouldTerminate()) return;
-    TQ_UINT32 self, unknown, nextIndexPtr, tqparent, indexCount;
+    TQ_UINT32 self, unknown, nextIndexPtr, parent, indexCount;
     TQ_UINT8 unknown2, ptrCount;
     TQ_UINT16 unknown3;
     int wasAt = ds.tqdevice()->at();
@@ -239,7 +239,7 @@ void FilterOE::dbxReadIndex( FilterInfo *info, TQDataStream& ds, int filePos)
 
 
     kdDebug() << "Reading index of file " << folderName << endl;
-    ds >> self >> unknown >> nextIndexPtr >> tqparent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct
+    ds >> self >> unknown >> nextIndexPtr >> parent >> unknown2 >> ptrCount >> unknown3 >> indexCount; // _dbx_tableindexstruct
 
     kdDebug() << "This index has " << (int) ptrCount << " data pointers" << endl;
     for (int count = 0; count < ptrCount; count++) {
@@ -316,7 +316,7 @@ void FilterOE::dbxReadDataBlock( FilterInfo *info, TQDataStream& ds, int filePos
                 folderEntry[2] = TQString::number(value); 
                 
             } else if (type == 0x81) {
-                // kdDebug() << "**** FOLDER: tqparent ID ****" << endl;
+                // kdDebug() << "**** FOLDER: parent ID ****" << endl;
                 folderEntry[3] =  TQString::number(value);
             }
         }
diff --git a/kmailcvt/filter_oe.hxx b/kmailcvt/filter_oe.hxx
index e0e990c1d..821aa5dfa 100644
--- a/kmailcvt/filter_oe.hxx
+++ b/kmailcvt/filter_oe.hxx
@@ -68,7 +68,7 @@ private: // Private methods
         1. descriptive folder name 
         2. filename 
         3. ID of current folder
-        4. ID of tqparent folder 
+        4. ID of parent folder 
     */
     typedef FolderStructureBase<4> FolderStructure;
     /** matrix with information about the folder structure*/
diff --git a/kmailcvt/filter_opera.cxx b/kmailcvt/filter_opera.cxx
index b0f362474..37e19aa1e 100644
--- a/kmailcvt/filter_opera.cxx
+++ b/kmailcvt/filter_opera.cxx
@@ -48,7 +48,7 @@ void FilterOpera::import(FilterInfo *info)
         startdir = TQDir::homeDirPath();
     }
 
-    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
+    //TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     KFileDialog *kfd;
     kfd = new KFileDialog( startdir, "", 0, "kfiledialog", true );
     kfd->setMode(KFile::Directory | KFile::LocalOnly);
diff --git a/kmailcvt/filter_outlook.cxx b/kmailcvt/filter_outlook.cxx
index f222d88c7..7d6a9b8c4 100644
--- a/kmailcvt/filter_outlook.cxx
+++ b/kmailcvt/filter_outlook.cxx
@@ -50,7 +50,7 @@ void FilterOutlook::import(FilterInfo *info)
     info->addLog(i18n("No files found for import."));
 
     TQString outlookDir;
-    outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->tqparent());
+    outlookDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(), info->parent());
     TQDir importDir (outlookDir);
     TQStringList files = importDir.entryList("*.[pP][sS][tT]", TQDir::Files, TQDir::Name);
     for ( TQStringList::Iterator pstFile = files.begin(); pstFile != files.end(); ++pstFile) {
diff --git a/kmailcvt/filter_plain.cxx b/kmailcvt/filter_plain.cxx
index 2b3a3e823..a0dbad135 100644
--- a/kmailcvt/filter_plain.cxx
+++ b/kmailcvt/filter_plain.cxx
@@ -39,7 +39,7 @@ FilterPlain::~FilterPlain()
 void FilterPlain::import(FilterInfo *info)
 {
     // Select directory containing plain text emails
-    TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->tqparent());
+    TQString mailDir = KFileDialog::getExistingDirectory(TQDir::homeDirPath(),info->parent());
     if (mailDir.isEmpty()) { // No directory selected
         info->alert(i18n("No directory selected."));
         return;
diff --git a/kmailcvt/filter_pmail.cxx b/kmailcvt/filter_pmail.cxx
index 52c5c7fc6..982d713a9 100644
--- a/kmailcvt/filter_pmail.cxx
+++ b/kmailcvt/filter_pmail.cxx
@@ -81,13 +81,13 @@ void FilterPMail::import(FilterInfo *info)
     info->setOverall(100);
 }
 
-/** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
-void FilterPMail::processFiles(const TQString& tqmask, void(FilterPMail::* workFunc)(const TQString&) )
+/** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
+void FilterPMail::processFiles(const TQString& mask, void(FilterPMail::* workFunc)(const TQString&) )
 {
     if (inf->shouldTerminate()) return;
     
-    TQStringList files = dir.entryList(tqmask, TQDir::Files, TQDir::Name);
-    //kdDebug() << "Mask is " << tqmask << " count is " << files.count() << endl;
+    TQStringList files = dir.entryList(mask, TQDir::Files, TQDir::Name);
+    //kdDebug() << "Mask is " << mask << " count is " << files.count() << endl;
     for ( TQStringList::Iterator mailFile = files.begin(); mailFile != files.end(); ++mailFile ) {
         // Notify current file
         TQFileInfo mailfileinfo(*mailFile);
diff --git a/kmailcvt/filter_pmail.hxx b/kmailcvt/filter_pmail.hxx
index 86f08ce6d..664fdcc1b 100644
--- a/kmailcvt/filter_pmail.hxx
+++ b/kmailcvt/filter_pmail.hxx
@@ -32,8 +32,8 @@ public:
     void import(FilterInfo *info);
 
 protected:
-    /** this looks for all files with the filetqmask 'tqmask' and calls the 'workFunc' on each of them */
-    void processFiles(const TQString& tqmask,  void(FilterPMail::* workFunc)(const TQString&) );
+    /** this looks for all files with the filemask 'mask' and calls the 'workFunc' on each of them */
+    void processFiles(const TQString& mask,  void(FilterPMail::* workFunc)(const TQString&) );
     /** this function imports one *.CNM message */
     void importNewMessage(const TQString& file);
     /** this function imports one mail folder file (*.PMM) */
@@ -57,7 +57,7 @@ private:
 	1. type (2 for root-folder, 1 for folder, 0 for mailarchiv)
 	2. type (1 for root-folder, 3 for folder, 0 for mailarchiv)  
 	3. "ID:flag:filename" of folder/archiv   
-	4. "ID:name" of tqparent folder
+	4. "ID:name" of parent folder
 	5. name of folder/archiv
     */
     TQValueList<FolderStructure> folderMatrix;
diff --git a/kmailcvt/filter_thebat.cxx b/kmailcvt/filter_thebat.cxx
index 2ea7dc580..04dcdb127 100644
--- a/kmailcvt/filter_thebat.cxx
+++ b/kmailcvt/filter_thebat.cxx
@@ -213,7 +213,7 @@ void FilterTheBat::importFiles( FilterInfo *info, const TQString& FileName)
                 tmp.file()->writeBlock( input, endPos-lastPos );
                 tmp.close();
 
-                //KMessageBox::warningContinueCancel(info->tqparent(), "");
+                //KMessageBox::warningContinueCancel(info->parent(), "");
                 if(info->removeDupMsg)
                     addMessage( info, _path, tmp.name() );
                 else
diff --git a/kmailcvt/filters.cxx b/kmailcvt/filters.cxx
index aaaaa6da8..8feae7fd0 100644
--- a/kmailcvt/filters.cxx
+++ b/kmailcvt/filters.cxx
@@ -35,9 +35,9 @@
 
 bool FilterInfo::s_terminateASAP = false;
 
-FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* tqparent , bool _removeDupMsg)
+FilterInfo::FilterInfo( KImportPageDlg* dlg, TQWidget* parent , bool _removeDupMsg)
   : m_dlg( dlg ),
-    m_tqparent( tqparent )
+    m_parent( parent )
 {
   removeDupMsg = _removeDupMsg;
   s_terminateASAP = false;
@@ -99,7 +99,7 @@ void FilterInfo::clear()
 
 void FilterInfo::alert( const TQString& message )
 {
-  KMessageBox::information( m_tqparent, message );
+  KMessageBox::information( m_parent, message );
 }
 
 void FilterInfo::terminateASAP()
diff --git a/kmailcvt/filters.hxx b/kmailcvt/filters.hxx
index a5f468e43..db539428d 100644
--- a/kmailcvt/filters.hxx
+++ b/kmailcvt/filters.hxx
@@ -33,7 +33,7 @@
 class FilterInfo
 {
   public:
-    FilterInfo(KImportPageDlg *dlg, TQWidget *tqparent, bool _removeDupMsg);
+    FilterInfo(KImportPageDlg *dlg, TQWidget *parent, bool _removeDupMsg);
    ~FilterInfo();
 
     void seStatusMsg( const TQString& status );
@@ -48,12 +48,12 @@ class FilterInfo
     static void terminateASAP();
     bool shouldTerminate();
 
-    TQWidget *tqparent() { return m_tqparent; }
+    TQWidget *parent() { return m_parent; }
     bool removeDupMsg;
 
   private:
     KImportPageDlg *m_dlg;
-    TQWidget      *m_tqparent;
+    TQWidget      *m_parent;
     static bool s_terminateASAP;
 };
 
diff --git a/kmailcvt/kimportpage.cpp b/kmailcvt/kimportpage.cpp
index 5c62fb00c..62e5b7de7 100644
--- a/kmailcvt/kimportpage.cpp
+++ b/kmailcvt/kimportpage.cpp
@@ -21,7 +21,7 @@
 
 #include "kimportpage.h"
 
-KImportPage::KImportPage(TQWidget *tqparent, const char *name ) : KImportPageDlg(tqparent,name) {
+KImportPage::KImportPage(TQWidget *parent, const char *name ) : KImportPageDlg(parent,name) {
 
 	mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
 }
diff --git a/kmailcvt/kimportpage.h b/kmailcvt/kimportpage.h
index b7f4de53e..76a9844f2 100644
--- a/kmailcvt/kimportpage.h
+++ b/kmailcvt/kimportpage.h
@@ -24,7 +24,7 @@ class KImportPage : public KImportPageDlg  {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KImportPage(TQWidget *tqparent=0, const char *name=0);
+	KImportPage(TQWidget *parent=0, const char *name=0);
 	~KImportPage();
 };
 
diff --git a/kmailcvt/kmailcvt.cpp b/kmailcvt/kmailcvt.cpp
index 5334ac52d..cf10f7fb1 100644
--- a/kmailcvt/kmailcvt.cpp
+++ b/kmailcvt/kmailcvt.cpp
@@ -22,8 +22,8 @@
 #include <kdebug.h>
 #include "filters.hxx"
 
-KMailCVT::KMailCVT(TQWidget *tqparent, const char *name)
-	: KWizard(tqparent, name, true) {
+KMailCVT::KMailCVT(TQWidget *parent, const char *name)
+	: KWizard(parent, name, true) {
 
 	setCaption( i18n( "KMailCVT Import Tool" ) );
 
diff --git a/kmailcvt/kmailcvt.h b/kmailcvt/kmailcvt.h
index e5febb23e..63b2506ba 100644
--- a/kmailcvt/kmailcvt.h
+++ b/kmailcvt/kmailcvt.h
@@ -29,7 +29,7 @@ class KMailCVT : public KWizard {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMailCVT(TQWidget* tqparent=0, const char *name=0);
+	KMailCVT(TQWidget* parent=0, const char *name=0);
 	~KMailCVT();
 
 	virtual void next();
diff --git a/kmailcvt/kselfilterpage.cpp b/kmailcvt/kselfilterpage.cpp
index daac374fe..a562219a3 100644
--- a/kmailcvt/kselfilterpage.cpp
+++ b/kmailcvt/kselfilterpage.cpp
@@ -39,7 +39,7 @@
 
 #include "kselfilterpage.h"
 
-KSelFilterPage::KSelFilterPage(TQWidget *tqparent, const char *name ) : KSelFilterPageDlg(tqparent,name) {
+KSelFilterPage::KSelFilterPage(TQWidget *parent, const char *name ) : KSelFilterPageDlg(parent,name) {
 
 	mIntroSidebar->setPixmap(locate("data", "kmailcvt/pics/step1.png"));
 	mFilterList.setAutoDelete( TRUE );
diff --git a/kmailcvt/kselfilterpage.h b/kmailcvt/kselfilterpage.h
index 4dc4aa6df..a2a831453 100644
--- a/kmailcvt/kselfilterpage.h
+++ b/kmailcvt/kselfilterpage.h
@@ -27,7 +27,7 @@ class KSelFilterPage : public KSelFilterPageDlg  {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KSelFilterPage(TQWidget *tqparent=0, const char *name=0);
+	KSelFilterPage(TQWidget *parent=0, const char *name=0);
 	~KSelFilterPage();
 public:
 	void  addFilter(Filter *f);