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

23 files changed, 37 insertions, 37 deletions

diff --git a/conduits/abbrowserconduit/resolutionDialog.cc b/conduits/abbrowserconduit/resolutionDialog.cc
index ca61afe..34e1fb4 100644
--- a/conduits/abbrowserconduit/resolutionDialog.cc
+++ b/conduits/abbrowserconduit/resolutionDialog.cc
@@ -43,15 +43,15 @@
  *  as well as its child radio buttons. There are two different constructors
  *  for them.
  *  Each controller has three child radio buttons, and if any of them is
- *  activated (stateChange), it sets the text of its tqparent (which is the
+ *  activated (stateChange), it sets the text of its parent (which is the
  *  controller, which is an instance of ResolutionCheckListItem, too).
  **/
 class ResolutionCheckListItem : TQCheckListItem {
 public:
 	ResolutionCheckListItem(ResolutionItem*it, ResolutionTable*tb,
-		TQListView*tqparent);
+		TQListView*parent);
 	ResolutionCheckListItem(TQString header, TQString text,
-		ResolutionCheckListItem*tqparent);
+		ResolutionCheckListItem*parent);
 	~ResolutionCheckListItem() {};
 	virtual void stateChange(bool newstate);
 	virtual void setValue(TQString text);
@@ -73,8 +73,8 @@ protected:
 
 
 ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
-		ResolutionTable*tb, TQListView*tqparent) :
-	TQCheckListItem(tqparent, TQString(), TQCheckListItem::Controller),
+		ResolutionTable*tb, TQListView*parent) :
+	TQCheckListItem(parent, TQString(), TQCheckListItem::Controller),
 	fResItem(it),
 	isController(true),
 	fCaption(it?(it->fName):(TQString())),
@@ -119,8 +119,8 @@ ResolutionCheckListItem::ResolutionCheckListItem(ResolutionItem*it,
 }
 
 ResolutionCheckListItem::ResolutionCheckListItem(TQString text, TQString header,
-		ResolutionCheckListItem*tqparent) :
-	TQCheckListItem(tqparent, TQString(), TQCheckListItem::RadioButton),
+		ResolutionCheckListItem*parent) :
+	TQCheckListItem(parent, TQString(), TQCheckListItem::RadioButton),
 	fResItem(0L),
 	isController(false),
 	fCaption(header),
@@ -133,7 +133,7 @@ void ResolutionCheckListItem::stateChange(bool newstate)
 {
 	if (newstate && !isController)
 	{
-		ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(tqparent());
+		ResolutionCheckListItem*par=static_cast<ResolutionCheckListItem*>(parent());
 		{
 			par->setValue(fText);
 		}
@@ -171,9 +171,9 @@ void ResolutionCheckListItem::updateText()
  *
  *****************************************************************/
 
-ResolutionDlg::ResolutionDlg( TQWidget* tqparent, KPilotLink*fH,
+ResolutionDlg::ResolutionDlg( TQWidget* parent, KPilotLink*fH,
 	const TQString &caption, const TQString &helpText, ResolutionTable*tab) :
-	KDialogBase( tqparent, "ResolutionDlg", false, caption, Apply|Cancel, Apply),
+	KDialogBase( parent, "ResolutionDlg", false, caption, Apply|Cancel, Apply),
 	tickleTimer(0L),
 	fHandle(fH),
 	fTable(tab)
diff --git a/conduits/abbrowserconduit/resolutionDialog.h b/conduits/abbrowserconduit/resolutionDialog.h
index 68a1d58..9f0edeb 100644
--- a/conduits/abbrowserconduit/resolutionDialog.h
+++ b/conduits/abbrowserconduit/resolutionDialog.h
@@ -43,7 +43,7 @@ class ResolutionDlg : public KDialogBase
   TQ_OBJECT
 
 public:
-	ResolutionDlg( TQWidget* tqparent=0, 
+	ResolutionDlg( TQWidget* parent=0, 
 		KPilotLink*fH=0L, 
 		const TQString &caption=TQString(), 
 		const TQString &helpText=TQString(), 
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:
diff --git a/conduits/knotes/knotes-factory.cc b/conduits/knotes/knotes-factory.cc
index 0abc76a..9601e81 100644
--- a/conduits/knotes/knotes-factory.cc
+++ b/conduits/knotes/knotes-factory.cc
@@ -123,7 +123,7 @@ KNotesConduitFactory::~KNotesConduitFactory()
 		else
 		{
 			WARNINGKPILOT
-				<< "Couldn't cast tqparent to KPilotDeviceLink"
+				<< "Couldn't cast parent to KPilotDeviceLink"
 				<< endl;
 			return 0L;
 		}
diff --git a/conduits/knotes/knotes-factory.h b/conduits/knotes/knotes-factory.h
index b8c8311..035d238 100644
--- a/conduits/knotes/knotes-factory.h
+++ b/conduits/knotes/knotes-factory.h
@@ -51,7 +51,7 @@ public:
 	// break its value. We store group and entry keys in here.
 
 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/knotes/knotes-setup.h b/conduits/knotes/knotes-setup.h
index 96f008c..652f222 100644
--- a/conduits/knotes/knotes-setup.h
+++ b/conduits/knotes/knotes-setup.h
@@ -36,7 +36,7 @@ class KNotesWidget;
 class KNotesConfigBase : public ConduitConfigBase
 {
 public:
-	KNotesConfigBase(TQWidget *tqparent, const char *name);
+	KNotesConfigBase(TQWidget *parent, const char *name);
 
 	virtual void commit();
 	virtual void load();
diff --git a/conduits/malconduit/mal-factory.cc b/conduits/malconduit/mal-factory.cc
index 3206822..3e363d2 100644
--- a/conduits/malconduit/mal-factory.cc
+++ b/conduits/malconduit/mal-factory.cc
@@ -115,7 +115,7 @@ MALConduitFactory::~MALConduitFactory()
 		else 
 		{
 			WARNINGKPILOT
-				<< "Couldn't cast tqparent to widget."
+				<< "Couldn't cast parent to widget."
 				<< endl;
 			return 0L;
 		}
@@ -132,7 +132,7 @@ MALConduitFactory::~MALConduitFactory()
 		else
 		{
 			WARNINGKPILOT
-				<< "Couldn't cast tqparent to KPilotLink"
+				<< "Couldn't cast parent to KPilotLink"
 				<< endl;
 			return 0L;
 		}
diff --git a/conduits/malconduit/mal-factory.h b/conduits/malconduit/mal-factory.h
index 7db6bb6..8c95acf 100644
--- a/conduits/malconduit/mal-factory.h
+++ b/conduits/malconduit/mal-factory.h
@@ -49,7 +49,7 @@ public:
 	static KAboutData *about() { return fAbout; } ;
 
 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/memofileconduit/memofile-factory.cc b/conduits/memofileconduit/memofile-factory.cc
index 8b2d9df..795edc3 100644
--- a/conduits/memofileconduit/memofile-factory.cc
+++ b/conduits/memofileconduit/memofile-factory.cc
@@ -46,7 +46,7 @@
 class MemofileConduitConfig : public ConduitConfigBase
 {
 public:
-	MemofileConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
+	MemofileConduitConfig(TQWidget *parent=0L, const char *n=0L);
 	virtual void commit();
 	virtual void load();
 protected:
diff --git a/conduits/notepadconduit/notepad-conduit.cc b/conduits/notepadconduit/notepad-conduit.cc
index c33bd41..942dbd3 100644
--- a/conduits/notepadconduit/notepad-conduit.cc
+++ b/conduits/notepadconduit/notepad-conduit.cc
@@ -115,8 +115,8 @@ bool NotepadConduit::event(TQEvent *e)
 // NotepadActionThread
 //-----------------------------------------------------------------------------
 
-NotepadActionThread::NotepadActionThread(TQObject *tqparent, KPilotLink *link) :
-	fParent(tqparent), fLink(link), notSaved(0), saved(0)
+NotepadActionThread::NotepadActionThread(TQObject *parent, KPilotLink *link) :
+	fParent(parent), fLink(link), notSaved(0), saved(0)
 {
 	FUNCTIONSETUP;
 }
diff --git a/conduits/notepadconduit/notepad-conduit.h b/conduits/notepadconduit/notepad-conduit.h
index 6f76768..add7f03 100644
--- a/conduits/notepadconduit/notepad-conduit.h
+++ b/conduits/notepadconduit/notepad-conduit.h
@@ -62,7 +62,7 @@ private:
 class NotepadActionThread : public TQThread
 {
 public:
-	NotepadActionThread(TQObject *tqparent, KPilotLink *link);
+	NotepadActionThread(TQObject *parent, KPilotLink *link);
 
 	virtual void run();
 	int	getFailed() { return notSaved; }
diff --git a/conduits/notepadconduit/notepad-factory.cc b/conduits/notepadconduit/notepad-factory.cc
index fdb0841..0e1094b 100644
--- a/conduits/notepadconduit/notepad-factory.cc
+++ b/conduits/notepadconduit/notepad-factory.cc
@@ -47,7 +47,7 @@
 class NotepadConduitConfig : public ConduitConfigBase
 {
 public:
-	NotepadConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
+	NotepadConduitConfig(TQWidget *parent=0L, const char *n=0L);
 	virtual void commit();
 	virtual void load();
 	static ConduitConfigBase *create(TQWidget *p, const char *n)
diff --git a/conduits/null/null-factory.cc b/conduits/null/null-factory.cc
index 6b80615..c2d381d 100644
--- a/conduits/null/null-factory.cc
+++ b/conduits/null/null-factory.cc
@@ -47,7 +47,7 @@
 class NullConduitConfig : public ConduitConfigBase
 {
 public:
-	NullConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
+	NullConduitConfig(TQWidget *parent=0L, const char *n=0L);
 	virtual void commit();
 	virtual void load();
 protected:
diff --git a/conduits/recordconduit/factory.cc b/conduits/recordconduit/factory.cc
index 76b790e..8337733 100644
--- a/conduits/recordconduit/factory.cc
+++ b/conduits/recordconduit/factory.cc
@@ -48,7 +48,7 @@
 class ConduitConfig : public ConduitConfigBase
 {
 public:
-	ConduitConfig(TQWidget *tqparent=0L, const char *n=0L);
+	ConduitConfig(TQWidget *parent=0L, const char *n=0L);
 	virtual void commit();
 	virtual void load();
 protected:
diff --git a/conduits/sysinfoconduit/sysinfo-setup.h b/conduits/sysinfoconduit/sysinfo-setup.h
index ae15b51..400dea3 100644
--- a/conduits/sysinfoconduit/sysinfo-setup.h
+++ b/conduits/sysinfoconduit/sysinfo-setup.h
@@ -36,7 +36,7 @@ class SysInfoWidget;
 class SysInfoWidgetConfig : public ConduitConfigBase
 {
 public:
-	SysInfoWidgetConfig(TQWidget *tqparent, const char *);
+	SysInfoWidgetConfig(TQWidget *parent, const char *);
 	virtual void commit();
 	virtual void load();
 	virtual bool isModified() const;
diff --git a/conduits/timeconduit/time-setup.h b/conduits/timeconduit/time-setup.h
index e662532..d1ed262 100644
--- a/conduits/timeconduit/time-setup.h
+++ b/conduits/timeconduit/time-setup.h
@@ -39,7 +39,7 @@ class TimeWidgetConfig : public ConduitConfigBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	TimeWidgetConfig(TQWidget *tqparent, const char *);
+	TimeWidgetConfig(TQWidget *parent, const char *);
 	virtual void commit();
 	virtual void load();
 	static ConduitConfigBase *create(TQWidget *,const char *);