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

18 files changed, 60 insertions, 60 deletions

diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index 797dcc2a..a9a2a316 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -101,8 +101,8 @@ public:
 /*================================================================*/
 
 KexiConnSelectorWidget::KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
-	const TQString& startDirOrVariable, TQWidget* tqparent, const char* name )
-	: TQWidget( tqparent, name )
+	const TQString& startDirOrVariable, TQWidget* parent, const char* name )
+	: TQWidget( parent, name )
 	,d(new KexiConnSelectorWidgetPrivate())
 {
 	d->conn_set = &conn_set;
diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h
index 2f4a9fe9..c42fc536 100644
--- a/kexi/main/startup/KexiConnSelector.h
+++ b/kexi/main/startup/KexiConnSelector.h
@@ -67,7 +67,7 @@ class KEXIMAIN_EXPORT KexiConnSelectorWidget : public TQWidget
 		 in KRecentDirs documentation). */
 		KexiConnSelectorWidget( KexiDBConnectionSet& conn_set, 
 			const TQString& startDirOrVariable, 
-			TQWidget* tqparent = 0, const char* name = 0 );
+			TQWidget* parent = 0, const char* name = 0 );
 
 		virtual ~KexiConnSelectorWidget();
 		
diff --git a/kexi/main/startup/KexiDBTitlePage.cpp b/kexi/main/startup/KexiDBTitlePage.cpp
index 4d686039..7c97440c 100644
--- a/kexi/main/startup/KexiDBTitlePage.cpp
+++ b/kexi/main/startup/KexiDBTitlePage.cpp
@@ -21,8 +21,8 @@
 
 #include <tqlabel.h>
 
-KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent, const char* name )
- : KexiDBTitlePageBase( tqparent, name )
+KexiDBTitlePage::KexiDBTitlePage( const TQString& labelText, TQWidget* parent, const char* name )
+ : KexiDBTitlePageBase( parent, name )
 {
 	if (!labelText.isEmpty())
 		label->setText(labelText);
diff --git a/kexi/main/startup/KexiDBTitlePage.h b/kexi/main/startup/KexiDBTitlePage.h
index 15030c7b..4ac59bc0 100644
--- a/kexi/main/startup/KexiDBTitlePage.h
+++ b/kexi/main/startup/KexiDBTitlePage.h
@@ -31,7 +31,7 @@ class KEXIMAIN_EXPORT KexiDBTitlePage : public KexiDBTitlePageBase
 public:
 	//! Constructs title page. \a labelText can be provided to change default 
 	//! "Project caption:" label.
-	KexiDBTitlePage( const TQString& labelText, TQWidget* tqparent = 0, const char* name = 0 );
+	KexiDBTitlePage( const TQString& labelText, TQWidget* parent = 0, const char* name = 0 );
 	~KexiDBTitlePage();
 	
 protected slots:
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 9e897e8f..b24a66ab 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -84,8 +84,8 @@ class KexiNewProjectWizardPrivate
 };
 
 KexiNewProjectWizard::KexiNewProjectWizard(KexiDBConnectionSet& conn_set,
-	TQWidget *tqparent, const char *name, bool modal, WFlags f)
-: KWizard(tqparent, name, modal, f)
+	TQWidget *parent, const char *name, bool modal, WFlags f)
+: KWizard(parent, name, modal, f)
 , d(new KexiNewProjectWizardPrivate() )
 {
 	d->msgHandler = new KexiGUIMessageHandler(this);
diff --git a/kexi/main/startup/KexiNewProjectWizard.h b/kexi/main/startup/KexiNewProjectWizard.h
index 18dab257..ff16b996 100644
--- a/kexi/main/startup/KexiNewProjectWizard.h
+++ b/kexi/main/startup/KexiNewProjectWizard.h
@@ -39,7 +39,7 @@ class KEXIMAIN_EXPORT KexiNewProjectWizard : public KWizard
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *tqparent=0, 
+		KexiNewProjectWizard(KexiDBConnectionSet& conn_set, TQWidget *parent=0, 
 			const char *name=0, bool modal=false, WFlags f=0);
 		~KexiNewProjectWizard();
 	
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index 55aa930f..9353e3a6 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -91,14 +91,14 @@ public:
 /*================================================================*/
 
 /*!
- *  Constructs a KexiProjectSelector which is a child of 'tqparent', with the 
+ *  Constructs a KexiProjectSelector which is a child of 'parent', with the 
  *  name 'name' and widget flags set to 'f' 
  */
 KexiProjectSelectorWidget::KexiProjectSelectorWidget( 
-	TQWidget* tqparent, const char* name, 
+	TQWidget* parent, const char* name, 
 	KexiProjectSet* prj_set, bool showProjectNameColumn,
 	bool showConnectionColumns )
-    : KexiProjectSelectorBase( tqparent, name )
+    : KexiProjectSelectorBase( parent, name )
 	,m_prj_set(prj_set)
 	,d(new KexiProjectSelectorWidgetPrivate())
 {
@@ -217,19 +217,19 @@ bool KexiProjectSelectorWidget::isSelectable() const
 
 /*================================================================*/
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiProjectSet* prj_set, bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( Plain, i18n("Open Recent Project"), 
 #ifndef KEXI_NO_UNFINISHED 
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name )
+	Ok | Cancel, Ok, parent, name )
 {
 	init(prj_set, showProjectNameColumn, showConnectionColumns);
 }
 
-KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 	KexiDB::ConnectionData* cdata, 
 	bool showProjectNameColumn, bool showConnectionColumns)
 	: KDialogBase( 
@@ -238,7 +238,7 @@ KexiProjectSelectorDialog::KexiProjectSelectorDialog( TQWidget *tqparent, const
 	//! @todo re-add Help when doc is available
 	Help | 
 #endif
-	Ok | Cancel, Ok, tqparent, name, true/*modal*/, false/*sep*/ )
+	Ok | Cancel, Ok, parent, name, true/*modal*/, false/*sep*/ )
 {
 	setButtonGuiItem(Ok, KGuiItem(i18n("&Open"), "fileopen", i18n("Open Database Connection")));
 	assert(cdata);
diff --git a/kexi/main/startup/KexiProjectSelector.h b/kexi/main/startup/KexiProjectSelector.h
index 91c13712..43c6a6b5 100644
--- a/kexi/main/startup/KexiProjectSelector.h
+++ b/kexi/main/startup/KexiProjectSelector.h
@@ -45,7 +45,7 @@ public:
 	 information about database driver and connection columns are added.
 	 \a prj_set may be NULL - you can assign a set later with setProjectSet().
 	*/
-	KexiProjectSelectorWidget( TQWidget* tqparent = 0, const char* name = 0, 
+	KexiProjectSelectorWidget( TQWidget* parent = 0, const char* name = 0, 
 		KexiProjectSet* prj_set = 0, bool showProjectNameColumn = true,
 		bool showConnectionColumns = true );
     
@@ -99,7 +99,7 @@ public:
 	/*! Constructor 1, used for displaying recent projects list
 	 Label "there are recently opened projects" is displayed automatically
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiProjectSet* prj_set, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 
@@ -107,7 +107,7 @@ public:
 	 Label "Select one of these existing projects on server" is displayed automatically
 	 You should test if project set was properly loaded using projectSet()->error().
 	*/
-	KexiProjectSelectorDialog( TQWidget *tqparent, const char *name,
+	KexiProjectSelectorDialog( TQWidget *parent, const char *name,
 		KexiDB::ConnectionData* cdata, 
 		bool showProjectNameColumn = true, bool showConnectionColumns = true);
 	
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 13becfc8..61746d5c 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -134,9 +134,9 @@ void updateProgressBar(KProgressDialog *pd, char *buffer, int buflen)
 
 //---------------------------------
 
-KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
+KexiDBPasswordDialog::KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton)
  : KPasswordDialog( KPasswordDialog::Password, false/*keep*/, 
-	showDetailsButton ? (int)KDialogBase::User1 : 0, tqparent )
+	showDetailsButton ? (int)KDialogBase::User1 : 0, parent )
  , m_cdata(&cdata)
  , m_showConnectionDetailsRequested(false)
 {
@@ -739,7 +739,7 @@ tristate KexiStartupHandler::init(int /*argc*/, char ** /*argv*/)
 
 tristate KexiStartupHandler::detectActionForFile( 
 	KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
-	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *tqparent, int options )
+	const TQString& _suggestedDriverName, const TQString &dbFileName, TQWidget *parent, int options )
 {
 	detectedImportAction = KexiStartupData::Import(); //clear
 	TQString suggestedDriverName(_suggestedDriverName); //safe
@@ -747,7 +747,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	TQFileInfo finfo(dbFileName);
 	if (dbFileName.isEmpty() || !finfo.isReadable()) {
 		if (!(options & SkipMessages))
-			KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+			KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 				+i18n("<p>The file <nobr>\"%1\"</nobr> does not exist or is not readable.</p>")
 				.tqarg(TQDir::convertSeparators(dbFileName))
 				+i18n("Check the file's permissions and whether it is already opened "
@@ -779,7 +779,7 @@ tristate KexiStartupHandler::detectActionForFile(
 		if (!f.open(IO_ReadOnly)) {
 			// BTW: similar error msg is provided in SQLiteConnection::drv_useDatabase()
 			if (!(options & SkipMessages))
-				KMessageBox::sorry(tqparent, i18n("<p>Could not open project.</p>")
+				KMessageBox::sorry(parent, i18n("<p>Could not open project.</p>")
 					+i18n("<p>The file <nobr>\"%1\"</nobr> is not readable.</p>")
 					.tqarg(TQDir::convertSeparators(dbFileName))
 					+i18n("Check the file's permissions and whether it is already opened "
@@ -802,7 +802,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (ptr.data()) {
 		if (mimename=="application/x-msaccess") {
 			if ((options & SkipMessages) || KMessageBox::Yes != KMessageBox::questionYesNo(
-				tqparent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
+				parent, i18n("\"%1\" is an external file of type:\n\"%2\".\n"
 				"Do you want to import the file as a Kexi project?")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(ptr.data()->comment()),
 				i18n("Open External File"), KGuiItem(i18n("Import...")), KStdGuiItem::cancel() ) )
@@ -826,7 +826,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	if (!useDetectedDriver) {
 		int res = KMessageBox::Yes;
 		if (!(options & SkipMessages))
-			res = KMessageBox::warningYesNoCancel(tqparent, i18n(
+			res = KMessageBox::warningYesNoCancel(parent, i18n(
 			 "The project file \"%1\" is recognized as compatible with \"%2\" database driver, "
 			 "while you have asked for \"%3\" database driver to be used.\n"
 			 "Do you want to use \"%4\" database driver?")
@@ -848,7 +848,7 @@ tristate KexiStartupHandler::detectActionForFile(
 	const TQString newFileFormat = "SQLite3";
 	if (!(options & DontConvert || options & SkipMessages) 
 		&& detectedDriverName.lower()=="sqlite2" && detectedDriverName.lower()!=suggestedDriverName.lower()
-		&& KMessageBox::Yes == KMessageBox::questionYesNo(tqparent, i18n(
+		&& KMessageBox::Yes == KMessageBox::questionYesNo(parent, i18n(
 			"Previous version of database file format (\"%1\") is detected in the \"%2\" "
 			"project file.\nDo you want to convert the project to a new \"%3\" format (recommended)?")
 			.tqarg(detectedDriverName).tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat)) )
@@ -859,7 +859,7 @@ tristate KexiStartupHandler::detectActionForFile(
 //		kdDebug() << "--- migr.run() END ---" <<endl;
 		if (!res) {
 			//TODO msg
-			KMessageBox::sorry(tqparent, i18n(
+			KMessageBox::sorry(parent, i18n(
 				"Failed to convert project file \"%1\" to a new \"%2\" format.\n"
 				"The file format remains unchanged.")
 				.tqarg(TQDir::convertSeparators(dbFileName)).tqarg(newFileFormat) );
@@ -876,7 +876,7 @@ tristate KexiStartupHandler::detectActionForFile(
 			possibleProblemsInfoMsg += TQString::tqfromLatin1("</p>");
 		}
 		if (!(options & SkipMessages))
-			KMessageBox::detailedSorry(tqparent, 
+			KMessageBox::detailedSorry(parent, 
 				i18n( "The file \"%1\" is not recognized as being supported by Kexi.")
 					.tqarg(TQDir::convertSeparators(dbFileName)),
 				TQString::tqfromLatin1("<p>")
@@ -892,7 +892,7 @@ tristate KexiStartupHandler::detectActionForFile(
 }
 
 KexiProjectData*
-KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent)
+KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent)
 {
 	cleartqStatus();
 	cancelled = false;
@@ -911,7 +911,7 @@ KexiStartupHandler::selectProject(KexiDB::ConnectionData *cdata, bool& cancelled
 	}
 	KexiProjectData* projectData = 0;
 	//dialog for selecting a project
-	KexiProjectSelectorDialog prjdlg( tqparent, "prjdlg", cdata, true, false );
+	KexiProjectSelectorDialog prjdlg( parent, "prjdlg", cdata, true, false );
 	if (!prjdlg.projectSet() || prjdlg.projectSet()->error()) {
 		KexiGUIMessageHandler msgh;
 		if (prjdlg.projectSet())
diff --git a/kexi/main/startup/KexiStartup.h b/kexi/main/startup/KexiStartup.h
index 22c55440..fe1b3cf0 100644
--- a/kexi/main/startup/KexiStartup.h
+++ b/kexi/main/startup/KexiStartup.h
@@ -42,7 +42,7 @@ class KEXIMAIN_EXPORT KexiDBPasswordDialog : public KPasswordDialog
 	Q_OBJECT
   TQ_OBJECT
 	public:
-		KexiDBPasswordDialog(TQWidget *tqparent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
+		KexiDBPasswordDialog(TQWidget *parent, KexiDB::ConnectionData& cdata, bool showDetailsButton = false);
 		virtual ~KexiDBPasswordDialog();
 
 		bool showConnectionDetailsRequested() const { return m_showConnectionDetailsRequested; }
@@ -73,12 +73,12 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 	#if 0
 		/*! Used for opening existing projects. 
 		 Detects project file type by mime type and returns project data, if it can be detected,
-		 otherwise - NULL. \a tqparent is passed as tqparent for potential error message boxes.
+		 otherwise - NULL. \a parent is passed as parent for potential error message boxes.
 		 Also uses \a cdata connection data for server-based projects.
 		 cdata.driverName is adjusted, if a file-based project has been detected.
 		*/
 		static KexiProjectData* detectProjectData( 
-			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *tqparent);
+			KexiDB::ConnectionData& cdata, const TQString &dbname, TQWidget *parent);
 	#endif
 
 		/*! Options for detectDriverForFile() */
@@ -103,20 +103,20 @@ class KEXIMAIN_EXPORT KexiStartupHandler
 		 - "shortcut" if the file looks like a shortcut to a project/connection file
 		 - "connection" if the file looks like a connection data file.
 
-		 \a tqparent is passed as a tqparent for potential error message boxes.
+		 \a parent is passed as a parent for potential error message boxes.
 		 \a driverName is a preferred driver name. 
 		 \a options should be a combination of DetectDriverForFileOptions enum values. */
 		static tristate detectActionForFile( 
 			KexiStartupData::Import& detectedImportAction, TQString& detectedDriverName,
 			const TQString& _suggestedDriverName, 
-			const TQString &dbFileName, TQWidget *tqparent = 0, int options = 0 );
+			const TQString &dbFileName, TQWidget *parent = 0, int options = 0 );
 
 		/*! Allows user to select a project with KexiProjectSelectorDialog.
 			\return selected project's data
 			Returns NULL and sets cancelled to true if the dialog was cancelled.
 			Returns NULL and sets cancelled to false if there was an error.
 		*/
-		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *tqparent = 0);
+		KexiProjectData* selectProject(KexiDB::ConnectionData *cdata, bool& cancelled, TQWidget *parent = 0);
 
 	protected slots:
 		void slotSaveShortcutFileChanges();
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 40ced9b1..43666706 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -142,21 +142,21 @@ TQString captionForDialogType(int type)
 }
 
 /*================================================================*/
-/*KexiStartupDialog::KexiStartupDialog(TQWidget *tqparent, const char *name, KInstance* global,
+/*KexiStartupDialog::KexiStartupDialog(TQWidget *parent, const char *name, KInstance* global,
 	const TQCString &format, const TQString &nativePattern,
 	const TQString &nativeName, const DialogType &dialogType,
 	const TQCString& templateType) :
-	KDialogBase(tqparent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
+	KDialogBase(parent, name, true, i18n("Open Document"), KDialogBase::Ok | KDialogBase::Cancel,
 	KDialogBase::Ok) {
 */
 KexiStartupDialog::KexiStartupDialog(
 	int dialogType, int dialogOptions,
 	KexiDBConnectionSet& connSet, KexiProjectSet& recentProjects,
-	TQWidget *tqparent, const char *name )
+	TQWidget *parent, const char *name )
  : KDialogBase(
  	dlgSinglePage(dialogType) ? Plain : Tabbed
 	,captionForDialogType(dialogType)
- 	,Help | Ok | Cancel, Ok, tqparent, name )
+ 	,Help | Ok | Cancel, Ok, parent, name )
  , d(new KexiStartupDialogPrivate())
 {
 	d->recentProjects = &recentProjects;
diff --git a/kexi/main/startup/KexiStartupDialog.h b/kexi/main/startup/KexiStartupDialog.h
index 0f994ff3..aad9ec9e 100644
--- a/kexi/main/startup/KexiStartupDialog.h
+++ b/kexi/main/startup/KexiStartupDialog.h
@@ -89,7 +89,7 @@ public:
 	 @param recentProjects a set of recent projects' info, used for "Open recent" tab
 	 @param connSet conenction set used to present available conenctions
 	  in "Open Existing" tab. Pass an empty object is this tab is not used.
-	 @param tqparent tqparent widget, if any.
+	 @param parent parent widget, if any.
 	 @param name name of this object.
 	 */
 	KexiStartupDialog(
@@ -97,7 +97,7 @@ public:
 		int dialogOptions,
 		KexiDBConnectionSet& connSet,
 		KexiProjectSet& recentProjects,
-		TQWidget *tqparent = 0, const char *name = 0 );
+		TQWidget *parent = 0, const char *name = 0 );
 	~KexiStartupDialog();
 
 	/*! \return true if startup dialog should be shown (info is taken from kexi config)
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
index 52fe0870..429499f4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.cpp
@@ -52,10 +52,10 @@
 class TemplateItem : public KListViewItem
 {
 	public:
-		TemplateItem(TQListView* tqparent, const TQString& aFilename, 
+		TemplateItem(TQListView* parent, const TQString& aFilename, 
 			const TQString& name, const TQString& description, const TQPixmap& icon, 
 			const TQValueList<KexiProjectData::ObjectInfo>& aAutoopenObjects)
-		: KListViewItem(tqparent, name + "\n" + description)
+		: KListViewItem(parent, name + "\n" + description)
 		, autoopenObjects(aAutoopenObjects)
 		, filename(aFilename)
 		{
@@ -69,8 +69,8 @@ class TemplateItem : public KListViewItem
 
 //-----------------------
 
-KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * tqparent )
-	: KListView(tqparent, "KexiStartupDialogTemplatesPage")
+KexiStartupDialogTemplatesPage::KexiStartupDialogTemplatesPage( TQWidget * parent )
+	: KListView(parent, "KexiStartupDialogTemplatesPage")
 	, m_popuplated(false)
 {
 	addColumn(TQString());
diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
index 2cf50b7b..2c7058d4 100644
--- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h
+++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h
@@ -30,7 +30,7 @@ class KEXIMAIN_EXPORT KexiStartupDialogTemplatesPage : public KListView
   TQ_OBJECT
 	
 	public:
-		KexiStartupDialogTemplatesPage( TQWidget * tqparent = 0 );
+		KexiStartupDialogTemplatesPage( TQWidget * parent = 0 );
 		~KexiStartupDialogTemplatesPage(); 
 //		void addItem(const TQString& key, const TQString& name, 
 //			const TQString& description, const TQPixmap& icon);
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index ed4dcd40..cd54602b 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -37,8 +37,8 @@
 
 KexiStartupFileDialog::KexiStartupFileDialog(
 		const TQString& startDirOrVariable, int mode,
-		TQWidget *tqparent, const char *name)
-	:  KexiStartupFileDialogBase(startDirOrVariable, "", tqparent, name, 0)
+		TQWidget *parent, const char *name)
+	:  KexiStartupFileDialogBase(startDirOrVariable, "", parent, name, 0)
 	, m_confirmOverwrites(true)
 	, m_filtersUpdated(false)
 {
@@ -323,12 +323,12 @@ bool KexiStartupFileDialog::checkFileName()
 }
 
 //static 
-bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *tqparent)
+bool KexiStartupFileDialog::askForOverwriting(const TQString& filePath, TQWidget *parent)
 {
 	TQFileInfo fi(filePath);
 	if (!fi.exists())
 		return true;
-	const int res = KMessageBox::warningYesNo( tqparent, i18n( "The file \"%1\" already exists.\n"
+	const int res = KMessageBox::warningYesNo( parent, i18n( "The file \"%1\" already exists.\n"
 		"Do you want to overwrite it?").tqarg( TQDir::convertSeparators(filePath) ), TQString(), 
 			i18n("Overwrite"), KStdGuiItem::no() );
 	if (res == KMessageBox::Yes)
diff --git a/kexi/main/startup/KexiStartupFileDialog.h b/kexi/main/startup/KexiStartupFileDialog.h
index 12fc3ef4..c85797db 100644
--- a/kexi/main/startup/KexiStartupFileDialog.h
+++ b/kexi/main/startup/KexiStartupFileDialog.h
@@ -50,15 +50,15 @@ public:
 	};
 	
 	KexiStartupFileDialog(
-		const TQString& startDirOrVariable, int mode, TQWidget *tqparent=0, const char *name=0);
+		const TQString& startDirOrVariable, int mode, TQWidget *parent=0, const char *name=0);
 
 	virtual ~KexiStartupFileDialog();
 
 	/*! Helper. Displays "The file %1 already exists. Do you want to overwrite it?" yes/no message box.
-	 \a tqparent is used as a tqparent of the KMessageBox.
+	 \a parent is used as a parent of the KMessageBox.
 	 \return true if \a filePath file does not exists or user has agreed on overwriting,
 	 false in user do not want to overwrite. */
-	static bool askForOverwriting(const TQString& filePath, TQWidget *tqparent = 0);
+	static bool askForOverwriting(const TQString& filePath, TQWidget *parent = 0);
 
 	void setMode(int mode);
 
diff --git a/kexi/main/startup/KexiStartupFileDialogBase_win.h b/kexi/main/startup/KexiStartupFileDialogBase_win.h
index 00742c69..9231b744 100644
--- a/kexi/main/startup/KexiStartupFileDialogBase_win.h
+++ b/kexi/main/startup/KexiStartupFileDialogBase_win.h
@@ -33,7 +33,7 @@ class KexiStartupFileDialogBase : public TQFileDialog
 {
 public:
 	KexiStartupFileDialogBase(const TQString & dirName, const TQString & filter = TQString(), 
-		TQWidget * tqparent = 0, const char * name = 0, bool modal = false );
+		TQWidget * parent = 0, const char * name = 0, bool modal = false );
 	~KexiStartupFileDialogBase();
 
 	TQPushButton * okButton() const { return m_okBtn; }
diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp
index e716a607..c81de131 100644
--- a/kexi/main/startup/KexiStartupFileDialog_win.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp
@@ -47,8 +47,8 @@ class KexiStartupFileDialogBasePrivate
 
 KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	const TQString & dirName, const TQString & filter, 
-	TQWidget * tqparent, const char * name, bool modal )
- : TQFileDialog( realStartDir(dirName), filter, tqparent, name, modal )
+	TQWidget * parent, const char * name, bool modal )
+ : TQFileDialog( realStartDir(dirName), filter, parent, name, modal )
  , d(new KexiStartupFileDialogBasePrivate())
 {
 //	TQString _dirName = dirName;
@@ -58,7 +58,7 @@ KexiStartupFileDialogBase::KexiStartupFileDialogBase(
 	if (_dirName.isEmpty())
 		_dirName = KGlobalSettings::documentPath();
 
-	init(_dirName, filter, tqparent);
+	init(_dirName, filter, parent);
 
 	//find "OK" button
 	TQObjectList *l = queryList( TQPUSHBUTTON_OBJECT_NAME_STRING, "OK", false );
@@ -183,7 +183,7 @@ void KexiStartupFileDialogBase::init(const TQString& startDir, const TQString& f
 
     // plug nav items into the toolbar
     coll->action( "up" )->plug( toolbar );
-    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the tqparent directory.<p>"
+    coll->action( "up" )->setWhatsThis(i18n("<qt>Click this button to enter the parent directory.<p>"
                                             "For instance, if the current location is file:/home/%1 clicking this "
                                             "button will take you to file:/home.</qt>").tqarg(getlogin()));
     coll->action( "back" )->plug( toolbar );