rename the following methods:

tqparent parent
tqmask mask


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

9 files changed, 35 insertions, 35 deletions

diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp
index f0a5146c..cbee692d 100644
--- a/kexi/kexiutils/debuggui.cpp
+++ b/kexi/kexiutils/debuggui.cpp
@@ -37,10 +37,10 @@ static KTabWidget* debugWindowTab = 0;
 static KListView* kexiDBDebugPage = 0;
 static KListView* kexiAlterTableActionDebugPage = 0;
 
-TQWidget *KexiUtils::createDebugWindow(TQWidget *tqparent)
+TQWidget *KexiUtils::createDebugWindow(TQWidget *parent)
 {
 	// (this is internal code - do not use i18n() here)
-	debugWindow = new DebugWindowDialog(tqparent);
+	debugWindow = new DebugWindowDialog(parent);
 	debugWindow->setSizeGripEnabled( true );
 	TQBoxLayout *lyr = new TQVBoxLayout(debugWindow, KDialogBase::marginHint());
 	debugWindowTab = new KTabWidget(debugWindow, "debugWindowTab");
@@ -127,7 +127,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	TQListViewItem * lastItem = kexiAlterTableActionDebugPage->lastItem();
 	//kdDebug() << "lastItem: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 	while (lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		availableNestingLevels++;
 	}
 	//kdDebug() << "availableNestingLevels: " << availableNestingLevels << endl;
@@ -135,7 +135,7 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	lastItem = kexiAlterTableActionDebugPage->lastItem();
 	int levelsToGoUp = availableNestingLevels - nestingLevel;
 	while (levelsToGoUp > 0 && lastItem) {
-		lastItem = lastItem->tqparent();
+		lastItem = lastItem->parent();
 		levelsToGoUp--;
 	}
 	//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
@@ -150,8 +150,8 @@ void KexiUtils::addAlterTableActionDebug(const TQString& text, int nestingLevel)
 	}
 	else {
 		lastItem = kexiAlterTableActionDebugPage->lastItem();
-		while (lastItem && lastItem->tqparent())
-			lastItem = lastItem->tqparent();
+		while (lastItem && lastItem->parent())
+			lastItem = lastItem->parent();
 		//kdDebug() << "lastItem2: " << (lastItem ? lastItem->text(0) : TQString()) << endl;
 		li = new KListViewItem( kexiAlterTableActionDebugPage, lastItem, text ); //after
 	}
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp
index 46e62b7b..da5f7f96 100644
--- a/kexi/kexiutils/identifier.cpp
+++ b/kexi/kexiutils/identifier.cpp
@@ -93,8 +93,8 @@ TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const T
 
 //--------------------------------------------------------------------------------
 
-IdentifierValidator::IdentifierValidator(TQObject * tqparent, const char * name)
-: Validator(tqparent,name)
+IdentifierValidator::IdentifierValidator(TQObject * parent, const char * name)
+: Validator(parent,name)
 {
 }
 
diff --git a/kexi/kexiutils/identifier.h b/kexi/kexiutils/identifier.h
index 2987019b..e8f6a294 100644
--- a/kexi/kexiutils/identifier.h
+++ b/kexi/kexiutils/identifier.h
@@ -48,7 +48,7 @@ namespace KexiUtils {
 	class KEXIUTILS_EXPORT IdentifierValidator : public Validator
 	{
 		public:
-			IdentifierValidator(TQObject * tqparent = 0, const char * name = 0);
+			IdentifierValidator(TQObject * parent = 0, const char * name = 0);
 			virtual ~IdentifierValidator();
 			virtual State validate( TQString & input, int & pos) const;
 
diff --git a/kexi/kexiutils/longlongvalidator.cpp b/kexi/kexiutils/longlongvalidator.cpp
index 7d985c32..ca3a42dd 100644
--- a/kexi/kexiutils/longlongvalidator.cpp
+++ b/kexi/kexiutils/longlongvalidator.cpp
@@ -25,15 +25,15 @@
 
 using namespace KexiUtils;
 
-LongLongValidator::LongLongValidator( TQWidget * tqparent, int base, const char * name )
- : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQWidget * parent, int base, const char * name )
+ : TQValidator(TQT_TQOBJECT(parent), name)
  , m_min(0), m_max(0)
 {
 	setBase(base);
 }
 
-LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base, const char * name )
-  : TQValidator(TQT_TQOBJECT(tqparent), name)
+LongLongValidator::LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base, const char * name )
+  : TQValidator(TQT_TQOBJECT(parent), name)
 {
 	setBase(base);
 	setRange( bottom, top );
diff --git a/kexi/kexiutils/longlongvalidator.h b/kexi/kexiutils/longlongvalidator.h
index bd211feb..e1853eec 100644
--- a/kexi/kexiutils/longlongvalidator.h
+++ b/kexi/kexiutils/longlongvalidator.h
@@ -38,8 +38,8 @@ namespace KexiUtils {
 class KEXIUTILS_EXPORT LongLongValidator : public TQValidator
 {
 	public:
-		LongLongValidator( TQWidget * tqparent, int base = 10, const char * name = 0 );
-		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * tqparent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQWidget * parent, int base = 10, const char * name = 0 );
+		LongLongValidator( TQ_LLONG bottom, TQ_LLONG top, TQWidget * parent, int base = 10, const char * name = 0 );
 		virtual ~LongLongValidator();
 
 		//! Validates the text, and returns the result.  Does not modify the parameters.
diff --git a/kexi/kexiutils/utils.h b/kexi/kexiutils/utils.h
index 118f2d64..d7bdbae8 100644
--- a/kexi/kexiutils/utils.h
+++ b/kexi/kexiutils/utils.h
@@ -30,23 +30,23 @@ class TQColor;
 //! @short General Utils
 namespace KexiUtils
 {
-	//! \return true if \a o has tqparent \a par.
+	//! \return true if \a o has parent \a par.
 	inline bool hasParent(TQObject* par, TQObject* o)
 	{
 		if (!o || !par)
 			return false;
 		while (o && o!=par)
-			o = o->tqparent();
+			o = o->parent();
 		return o==par;
 	}
 
-	//! \return tqparent object of \a o that inherits \a className or NULL if no such tqparent
+	//! \return parent object of \a o that inherits \a className or NULL if no such parent
 	template<class type>
 	inline type* findParent(TQT_BASE_OBJECT_NAME* o, const char* className)
 	{
 		if (!o || !className || className[0]=='\0')
 			return 0;
-		while ( ((o=TQT_TQOBJECT(o)->tqparent())) && !TQT_TQOBJECT(o)->inherits(className) )
+		while ( ((o=TQT_TQOBJECT(o)->parent())) && !TQT_TQOBJECT(o)->inherits(className) )
 			;
 		return static_cast<type*>(o);
 	}
@@ -58,7 +58,7 @@ namespace KexiUtils
 		const TQObject * obj = o;
 		if (!obj || !className || className[0]=='\0')
 			return 0;
-		while ( ((obj=obj->tqparent())) && !obj->inherits(className) )
+		while ( ((obj=obj->parent())) && !obj->inherits(className) )
 			;
 		return static_cast<const type*>(obj);
 	}
@@ -195,7 +195,7 @@ namespace KexiUtils
 
 #ifdef KEXI_DEBUG_GUI
 	//! Creates debug window for convenient debugging output
-	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *tqparent);
+	KEXIUTILS_EXPORT TQWidget *createDebugWindow(TQWidget *parent);
 
 	//! Adds debug line for for KexiDB database
 	KEXIUTILS_EXPORT void addKexiDBDebug(const TQString& text);
diff --git a/kexi/kexiutils/utils_p.h b/kexi/kexiutils/utils_p.h
index b91f2237..41d86425 100644
--- a/kexi/kexiutils/utils_p.h
+++ b/kexi/kexiutils/utils_p.h
@@ -44,8 +44,8 @@ class DelayedCursorHandler : public TQObject
 class DebugWindowDialog : public TQDialog
 {
 	public:
-		explicit DebugWindowDialog( TQWidget * tqparent )
-		 : TQDialog(tqparent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
+		explicit DebugWindowDialog( TQWidget * parent )
+		 : TQDialog(parent, 0, false, TQt::WType_Dialog|TQt::WStyle_MinMax|TQt::WStyle_StaysOnTop)
 		{
 			setWindowState( TQt::WindowMinimized );
 		}
diff --git a/kexi/kexiutils/validator.cpp b/kexi/kexiutils/validator.cpp
index 54af4ccd..bec7a1ec 100644
--- a/kexi/kexiutils/validator.cpp
+++ b/kexi/kexiutils/validator.cpp
@@ -21,8 +21,8 @@
 
 using namespace KexiUtils;
 
-Validator::Validator(TQObject * tqparent, const char * name)
-: TQValidator(tqparent,name)
+Validator::Validator(TQObject * parent, const char * name)
+: TQValidator(parent,name)
 , m_acceptsEmptyValue(false)
 {
 }
@@ -57,15 +57,15 @@ TQValidator::State Validator::validate ( TQString & , int & ) const
 
 //-----------------------------------------------------------
 
-MultiValidator::MultiValidator(TQObject* tqparent, const char * name)
- : Validator(tqparent, name)
+MultiValidator::MultiValidator(TQObject* parent, const char * name)
+ : Validator(parent, name)
 {
 	m_ownedSubValidators.setAutoDelete(true);
 }
 
 MultiValidator::MultiValidator(TQValidator *validator, 
-	TQObject * tqparent, const char * name)
- : Validator(tqparent, name)
+	TQObject * parent, const char * name)
+ : Validator(parent, name)
 {
 	addSubvalidator(validator);
 }
@@ -76,7 +76,7 @@ void MultiValidator::addSubvalidator( TQValidator* validator, bool owned )
 	if (!validator)
 		return;
 	m_subValidators.append(validator);
-	if (owned && !validator->tqparent())
+	if (owned && !validator->parent())
 		m_ownedSubValidators.append(validator);
 }
 
diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h
index b5c6e6cc..684a30fc 100644
--- a/kexi/kexiutils/validator.h
+++ b/kexi/kexiutils/validator.h
@@ -47,7 +47,7 @@ class KEXIUTILS_EXPORT Validator : public TQValidator
 	public:
 		typedef enum Result { Error = 0, Ok = 1, Warning = 2 };
 
-		Validator(TQObject * tqparent = 0, const char * name = 0);
+		Validator(TQObject * parent = 0, const char * name = 0);
 		virtual ~Validator();
 
 		/*! Sets accepting empty values on (true) or off (false). 
@@ -122,16 +122,16 @@ class KEXIUTILS_EXPORT MultiValidator : public Validator
 	public:
 		/*! Constructs multivalidator with no subvalidators defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQObject * parent = 0, const char * name = 0);
 
 		/*! Constructs multivalidator with one validator \a validator.
-		 It will be owned if has no tqparent defined.
+		 It will be owned if has no parent defined.
 		 You can add more validators with addSubvalidator(). */
-		MultiValidator(TQValidator *validator, TQObject * tqparent = 0, const char * name = 0);
+		MultiValidator(TQValidator *validator, TQObject * parent = 0, const char * name = 0);
 
 		/*! Adds validator \a validator as another subvalidator.
 		 Subvalidator will be owned by this multivalidator if \a owned is true
-		 and its tqparent is NULL. */
+		 and its parent is NULL. */
 		void addSubvalidator( TQValidator* validator, bool owned = true );
 
 		/*! Reimplemented to call validate() on subvalidators. */