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

12 files changed, 33 insertions, 33 deletions

diff --git a/lib/kpilotdevicelink.cc b/lib/kpilotdevicelink.cc
index e211eab..0cea610 100644
--- a/lib/kpilotdevicelink.cc
+++ b/lib/kpilotdevicelink.cc
@@ -527,9 +527,9 @@ void DeviceCommThread::run()
 	DEBUGKPILOT << fname << ": comm thread now done..." << endl;
 }
 
-KPilotDeviceLink::KPilotDeviceLink(TQObject * tqparent, const char *name,
+KPilotDeviceLink::KPilotDeviceLink(TQObject * parent, const char *name,
 		const TQString &tempDevice) :
-	KPilotLink(tqparent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
+	KPilotLink(parent, name), fLinktqStatus(Init), fWorkaroundUSB(false),
 			fPilotSocket(-1), fTempDevice(tempDevice), fMessages(new Messages(this)), fDeviceCommThread(0L)
 {
 	FUNCTIONSETUP;
diff --git a/lib/kpilotdevicelink.h b/lib/kpilotdevicelink.h
index b912c19..c4fb9f3 100644
--- a/lib/kpilotdevicelink.h
+++ b/lib/kpilotdevicelink.h
@@ -82,12 +82,12 @@ public:
 	* Constructor. Creates a link that can sync to a physical handheld.
 	* Call reset() on it to start looking for a device.
 	*
-	* @param tqparent Parent object.
+	* @param parent Parent object.
 	* @param name   Name of this object.
 	* @param tempDevice Path to device node to use as an alternative
 	*                   to the "normal" one set by KPilot.
 	*/
-	KPilotDeviceLink( TQObject *tqparent = 0,
+	KPilotDeviceLink( TQObject *parent = 0,
 		const char *name = 0,
 		const TQString &tempDevice = TQString() );
 
diff --git a/lib/kpilotdevicelinkPrivate.h b/lib/kpilotdevicelinkPrivate.h
index e945295..defdb86 100644
--- a/lib/kpilotdevicelinkPrivate.h
+++ b/lib/kpilotdevicelinkPrivate.h
@@ -109,8 +109,8 @@ private:
 class Messages
 {
 public:
-	Messages(KPilotDeviceLink *tqparent) :
-		fDeviceLink(tqparent)
+	Messages(KPilotDeviceLink *parent) :
+		fDeviceLink(parent)
 	{
 		reset();
 	}
diff --git a/lib/kpilotlink.cc b/lib/kpilotlink.cc
index 9ba4288..42e78ed 100644
--- a/lib/kpilotlink.cc
+++ b/lib/kpilotlink.cc
@@ -137,8 +137,8 @@ void TickleThread::run()
 
 
 
-KPilotLink::KPilotLink( TQObject *tqparent, const char *name ) :
-	TQObject( tqparent, name ),
+KPilotLink::KPilotLink( TQObject *parent, const char *name ) :
+	TQObject( parent, name ),
 	fPilotPath(TQString()),
 	fPilotUser(0L),
 	fPilotSysInfo(0L),
diff --git a/lib/kpilotlink.h b/lib/kpilotlink.h
index 3816094..7b00669 100644
--- a/lib/kpilotlink.h
+++ b/lib/kpilotlink.h
@@ -178,7 +178,7 @@ public:
 	typedef TQValueList<struct DBInfo> DBInfoList;
 
 	/** Constructor. Use reset() to start looking for a device. */
-	KPilotLink( TQObject *tqparent = 0, const char *name = 0 );
+	KPilotLink( TQObject *parent = 0, const char *name = 0 );
 
 	/** Destructor. This rudely interrupts any communication in progress.
 	* It is best to call endOfSync() or finishSync() before destroying
diff --git a/lib/kpilotlocallink.cc b/lib/kpilotlocallink.cc
index 30c2fe9..c944a53 100644
--- a/lib/kpilotlocallink.cc
+++ b/lib/kpilotlocallink.cc
@@ -118,8 +118,8 @@ unsigned int KPilotLocalLink::findAvailableDatabases( KPilotLocalLink::Private &
 }
 
 
-KPilotLocalLink::KPilotLocalLink( TQObject *tqparent, const char *name ) :
-	KPilotLink(tqparent,name),
+KPilotLocalLink::KPilotLocalLink( TQObject *parent, const char *name ) :
+	KPilotLink(parent,name),
 	fReady(false),
 	d( new Private )
 {
diff --git a/lib/kpilotlocallink.h b/lib/kpilotlocallink.h
index 99df9b9..05efdd5 100644
--- a/lib/kpilotlocallink.h
+++ b/lib/kpilotlocallink.h
@@ -45,7 +45,7 @@ class KDE_EXPORT KPilotLocalLink : public KPilotLink
 Q_OBJECT
   TQ_OBJECT
 public:
-	KPilotLocalLink( TQObject *tqparent=0L, const char *name=0L );
+	KPilotLocalLink( TQObject *parent=0L, const char *name=0L );
 	virtual ~KPilotLocalLink();
 
 	virtual TQString statusString() const;
diff --git a/lib/plugin.cc b/lib/plugin.cc
index 0149a85..c16f9a4 100644
--- a/lib/plugin.cc
+++ b/lib/plugin.cc
@@ -65,9 +65,9 @@
 
 #include "plugin.moc"
 
-ConduitConfigBase::ConduitConfigBase(TQWidget *tqparent,
+ConduitConfigBase::ConduitConfigBase(TQWidget *parent,
 	const char *name) :
-	TQObject(tqparent,name),
+	TQObject(parent,name),
 	fModified(false),
 	fWidget(0L),
 	fConduitName(i18n("Unnamed"))
@@ -108,11 +108,11 @@ ConduitConfigBase::~ConduitConfigBase()
 	return true;
 }
 
-TQWidget *ConduitConfigBase::aboutPage(TQWidget *tqparent, KAboutData *ad)
+TQWidget *ConduitConfigBase::aboutPage(TQWidget *parent, KAboutData *ad)
 {
 	FUNCTIONSETUP;
 
-	TQWidget *w = new TQWidget(tqparent, "aboutpage");
+	TQWidget *w = new TQWidget(parent, "aboutpage");
 
 	TQString s;
 	TQLabel *text;
diff --git a/lib/plugin.h b/lib/plugin.h
index 59322ac..b4eb59f 100644
--- a/lib/plugin.h
+++ b/lib/plugin.h
@@ -82,9 +82,9 @@ Q_OBJECT
 public:
 	/**
 	* Constructor. Creates a conduit configuration support object
-	* with the given tqparent @p tqparent and name (optional) @p n.
+	* with the given parent @p parent and name (optional) @p n.
 	*/
-	ConduitConfigBase(TQWidget *tqparent=0L, const char *n=0L);
+	ConduitConfigBase(TQWidget *parent=0L, const char *n=0L);
 
 	/** Destructor. */
 	virtual ~ConduitConfigBase();
@@ -152,10 +152,10 @@ public:
 	* application's icon. This widget can be used pretty much
 	* anywhere. Copied from KAboutDialog, mostly.
 	*
-	* @param tqparent The widget that holds the about widget.
+	* @param parent The widget that holds the about widget.
 	* @param data The KAboutData that is used to populate the widget.
 	*/
-	static TQWidget *aboutPage(TQWidget *tqparent, KAboutData *data=0L);
+	static TQWidget *aboutPage(TQWidget *parent, KAboutData *data=0L);
 
 protected:
 	/**
@@ -444,7 +444,7 @@ namespace PluginUtility
 *
 * <pre>
 * 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/lib/pluginfactory.h b/lib/pluginfactory.h
index 4fa2d6f..dbbe2ec 100644
--- a/lib/pluginfactory.h
+++ b/lib/pluginfactory.h
@@ -45,26 +45,26 @@ class KPilotLink;
 template <class Widget, class Action> class ConduitFactory : public KLibFactory
 {
 public:
-	ConduitFactory(TQObject *tqparent = 0, const char *name = 0) :
-		KLibFactory(tqparent,name)
+	ConduitFactory(TQObject *parent = 0, const char *name = 0) :
+		KLibFactory(parent,name)
 		{ fInstance = new KInstance(name); } ;
 	virtual ~ConduitFactory()
 		{ delete fInstance; } ;
 
 protected:
 	virtual TQObject *createObject(
-		TQObject* tqparent = 0,
+		TQObject* parent = 0,
 		const char* name = 0,
 		const char* classname = TQOBJECT_OBJECT_NAME_STRING,
 		const TQStringList &args = TQStringList() )
 	{
 		if (qstrcmp(classname,"ConduitConfigBase")==0)
 		{
-			TQWidget *w = dynamic_cast<TQWidget *>(tqparent);
+			TQWidget *w = dynamic_cast<TQWidget *>(parent);
 			if (w) return new Widget(w,name);
 			else
 			{
-				WARNINGKPILOT << "Could not cast tqparent to widget." << endl;
+				WARNINGKPILOT << "Could not cast parent to widget." << endl;
 				return 0L;
 			}
 		}
@@ -72,11 +72,11 @@ protected:
 		if (qstrcmp(classname,"SyncAction")==0)
 		{
 			KPilotLink *d = 0L;
-			if (tqparent) d = dynamic_cast<KPilotLink *>(tqparent);
+			if (parent) d = dynamic_cast<KPilotLink *>(parent);
 
-			if (d || !tqparent)
+			if (d || !parent)
 			{
-				if (!tqparent)
+				if (!parent)
 				{
 					kdDebug() << k_funcinfo << ": Using NULL device." << endl;
 				}
@@ -84,7 +84,7 @@ protected:
 			}
 			else
 			{
-				WARNINGKPILOT << "Could not cast tqparent to KPilotLink" << endl;
+				WARNINGKPILOT << "Could not cast parent to KPilotLink" << endl;
 				return 0L;
 			}
 		}
diff --git a/lib/syncAction.cc b/lib/syncAction.cc
index 6134b30..55278a1 100644
--- a/lib/syncAction.cc
+++ b/lib/syncAction.cc
@@ -65,11 +65,11 @@ SyncAction::SyncAction(KPilotLink  *p,
 }
 
 SyncAction::SyncAction(KPilotLink *p,
-	TQWidget * visibletqparent,
+	TQWidget * visibleparent,
 	const char *name) :
 	TQObject(p, name),
 	fHandle(p),
-	fParent(visibletqparent)
+	fParent(visibleparent)
 {
 	FUNCTIONSETUP;
 }
diff --git a/lib/syncAction.h b/lib/syncAction.h
index 5f493f4..42b1854 100644
--- a/lib/syncAction.h
+++ b/lib/syncAction.h
@@ -56,7 +56,7 @@ public:
 	SyncAction(KPilotLink *p,
 		const char *name=0L);
 	SyncAction(KPilotLink *p,
-		TQWidget *visibletqparent,
+		TQWidget *visibleparent,
 		const char *name=0L);
 	~SyncAction();