rename the following methods:

tqparent parent
tqmask mask


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

8 files changed, 11 insertions, 11 deletions

diff --git a/conduits/docconduit/DOC-converter.cc b/conduits/docconduit/DOC-converter.cc
index 2e25b61..cff8f19 100644
--- a/conduits/docconduit/DOC-converter.cc
+++ b/conduits/docconduit/DOC-converter.cc
@@ -145,7 +145,7 @@ int docRegExpBookmark::findMatches(TQString doctext, bmkList &fBookmarks)
  *********************************************************************/
 
 
-DOCConverter::DOCConverter(TQObject *tqparent, const char *name):TQObject(tqparent,name) {
+DOCConverter::DOCConverter(TQObject *parent, const char *name):TQObject(parent,name) {
 	FUNCTIONSETUP;
 	docdb=0L;
 	eSortBookmarks=eSortNone;
diff --git a/conduits/docconduit/DOC-converter.h b/conduits/docconduit/DOC-converter.h
index 27198cb..68eca2b 100644
--- a/conduits/docconduit/DOC-converter.h
+++ b/conduits/docconduit/DOC-converter.h
@@ -122,7 +122,7 @@ public:
 	} eSortBookmarks;
 
 public:
-	 DOCConverter(TQObject *tqparent=0L, const char *name=0L);
+	 DOCConverter(TQObject *parent=0L, const char *name=0L);
 	 virtual ~ DOCConverter();
 
 	TQString readText();
diff --git a/conduits/docconduit/doc-conflictdialog.cc b/conduits/docconduit/doc-conflictdialog.cc
index 5ea646b..8d1e211 100644
--- a/conduits/docconduit/doc-conflictdialog.cc
+++ b/conduits/docconduit/doc-conflictdialog.cc
@@ -39,8 +39,8 @@
 #include <tqscrollview.h>
 
 
-ResolutionDialog::ResolutionDialog( TQWidget* tqparent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
-    : KDialogBase( tqparent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
+ResolutionDialog::ResolutionDialog( TQWidget* parent, const TQString& caption, syncInfoList*sinfo, KPilotLink*lnk )
+    : KDialogBase( parent, "resolutionDialog", true, caption, KDialogBase::Ok|KDialogBase::Cancel, KDialogBase::Ok, true), tickleTimer(0L), fHandle(lnk) {
 	FUNCTIONSETUP;
 	syncInfo=sinfo;
 	hasConflicts=false;
diff --git a/conduits/docconduit/doc-conflictdialog.h b/conduits/docconduit/doc-conflictdialog.h
index 83cb8d4..e59c17c 100644
--- a/conduits/docconduit/doc-conflictdialog.h
+++ b/conduits/docconduit/doc-conflictdialog.h
@@ -57,7 +57,7 @@ class ResolutionDialog : public KDialogBase
   TQ_OBJECT
 
 public:
-	ResolutionDialog( TQWidget* tqparent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
+	ResolutionDialog( TQWidget* parent=0, const TQString& caption=i18n("Resolution Dialog"), syncInfoList*sinfo=0L, KPilotLink*lnk=0L);
 	~ResolutionDialog();
 
 	bool hasConflicts;
diff --git a/conduits/docconduit/doc-factory.cc b/conduits/docconduit/doc-factory.cc
index 47e1d40..cfab20f4d 100644
--- a/conduits/docconduit/doc-factory.cc
+++ b/conduits/docconduit/doc-factory.cc
@@ -94,7 +94,7 @@ DOCConduitFactory::~DOCConduitFactory()
 		}
 		else
 		{
-			WARNINGKPILOT << "Couldn't cast tqparent to widget." << endl;
+			WARNINGKPILOT << "Couldn't cast parent to widget." << endl;
 			return 0L;
 		}
 	}
@@ -107,7 +107,7 @@ DOCConduitFactory::~DOCConduitFactory()
 		}
 		else
 		{
-			WARNINGKPILOT << "Couldn't cast tqparent to KPilotLink" <<endl;
+			WARNINGKPILOT << "Couldn't cast parent to KPilotLink" <<endl;
 			return 0L;
 		}
 	}
diff --git a/conduits/docconduit/doc-factory.h b/conduits/docconduit/doc-factory.h
index d1e0d72..a91faa6 100644
--- a/conduits/docconduit/doc-factory.h
+++ b/conduits/docconduit/doc-factory.h
@@ -55,7 +55,7 @@ public:
  
 
 protected:
-	virtual TQObject * createObject(TQObject * tqparent = 0, 
+	virtual TQObject * createObject(TQObject * parent = 0, 
 		const char *name = 0, 
 		const char *classname = TQOBJECT_OBJECT_NAME_STRING, 
 		const TQStringList & args = TQStringList());
diff --git a/conduits/docconduit/kpalmdoc_dlg.cc b/conduits/docconduit/kpalmdoc_dlg.cc
index 0958c17..58ca0aa 100644
--- a/conduits/docconduit/kpalmdoc_dlg.cc
+++ b/conduits/docconduit/kpalmdoc_dlg.cc
@@ -54,8 +54,8 @@
 #include "kpalmdocSettings.h"
 
 
-ConverterDlg::ConverterDlg( TQWidget *tqparent, const TQString& caption)
-   : KDialogBase( tqparent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
+ConverterDlg::ConverterDlg( TQWidget *parent, const TQString& caption)
+   : KDialogBase( parent, "converterdialog", false, caption, KDialogBase::Close|KDialogBase::Help|KDialogBase::User1,
 	   KDialogBase::Close, true, i18n("&About"))
 {
 	TQWidget *page = makeHBoxMainWidget();
diff --git a/conduits/docconduit/kpalmdoc_dlg.h b/conduits/docconduit/kpalmdoc_dlg.h
index 6fe6e57..ac33ca7 100644
--- a/conduits/docconduit/kpalmdoc_dlg.h
+++ b/conduits/docconduit/kpalmdoc_dlg.h
@@ -38,7 +38,7 @@ class ConverterDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	ConverterDlg( TQWidget *tqparent=0, const TQString& caption=0);
+	ConverterDlg( TQWidget *parent=0, const TQString& caption=0);
 	~ConverterDlg();
 
 protected slots: