rename the following methods:

tqparent parent
tqmask mask


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

23 files changed, 44 insertions, 44 deletions

diff --git a/lilo-config/kde-qt-common/EditWidget.cpp b/lilo-config/kde-qt-common/EditWidget.cpp
index e80cd19..3c80d2a 100644
--- a/lilo-config/kde-qt-common/EditWidget.cpp
+++ b/lilo-config/kde-qt-common/EditWidget.cpp
@@ -28,7 +28,7 @@
 */
 #include "EditWidget.moc"
 #include "ui.h"
-EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *tqparent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, tqparent, name, f)
+EditWidget::EditWidget(TQString const label, TQString const text, bool isFile, TQWidget *parent, const char *name, WFlags f, bool allowLines):TQHBox(allowLines, parent, name, f)
 {
 	setMargin(SPACE_MARGIN);
 	setSpacing(SPACE_INSIDE);
diff --git a/lilo-config/kde-qt-common/EditWidget.h b/lilo-config/kde-qt-common/EditWidget.h
index 0c0c97d..e0901f9 100644
--- a/lilo-config/kde-qt-common/EditWidget.h
+++ b/lilo-config/kde-qt-common/EditWidget.h
@@ -37,7 +37,7 @@ class EditWidget:public TQHBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *tqparent=0, const char *name=0, WFlags f=0, bool allowLines=true);
+	EditWidget(TQString const label="", TQString const text="", bool isFile=false, TQWidget *parent=0, const char *name=0, WFlags f=0, bool allowLines=true);
 	void setLabel(TQString const &label) { lbl->setText(label); };
 	TQString text() const { return line->text(); };
 	TQString displayText() const { return line->displayText(); };
diff --git a/lilo-config/kde-qt-common/expert.cpp b/lilo-config/kde-qt-common/expert.cpp
index d9e65e5..7140fd9 100644
--- a/lilo-config/kde-qt-common/expert.cpp
+++ b/lilo-config/kde-qt-common/expert.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <String.h>
 #include <strstream>
-Expert::Expert(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
+Expert::Expert(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
 	tqlayout=new TQHBoxLayout(this);
diff --git a/lilo-config/kde-qt-common/expert.h b/lilo-config/kde-qt-common/expert.h
index 7b39530..c2971a1 100644
--- a/lilo-config/kde-qt-common/expert.h
+++ b/lilo-config/kde-qt-common/expert.h
@@ -37,7 +37,7 @@ class Expert:public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Expert(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
+	Expert(liloconf *l=0, TQWidget *parent=0, const char *name=0);
 	~Expert();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
diff --git a/lilo-config/kde-qt-common/general.cpp b/lilo-config/kde-qt-common/general.cpp
index bdfd12f..e67dc1f 100644
--- a/lilo-config/kde-qt-common/general.cpp
+++ b/lilo-config/kde-qt-common/general.cpp
@@ -35,7 +35,7 @@
 
 #include <stdlib.h>
 
-General::General(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
+General::General(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	lilo=l;
 	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
diff --git a/lilo-config/kde-qt-common/general.h b/lilo-config/kde-qt-common/general.h
index 01d090b..074adda 100644
--- a/lilo-config/kde-qt-common/general.h
+++ b/lilo-config/kde-qt-common/general.h
@@ -38,7 +38,7 @@ class General:public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	General(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
+	General(liloconf *l=0, TQWidget *parent=0, const char *name=0);
     void makeReadOnly();
 signals:
 	void configChanged();
diff --git a/lilo-config/kde-qt-common/images.cpp b/lilo-config/kde-qt-common/images.cpp
index a4872c0..a0f1c37 100644
--- a/lilo-config/kde-qt-common/images.cpp
+++ b/lilo-config/kde-qt-common/images.cpp
@@ -40,7 +40,7 @@
 #include "tqt/Details.h"
 #endif
 
-Images::Images(liloconf *l, TQWidget *tqparent, const char *name):TQWidget(tqparent, name)
+Images::Images(liloconf *l, TQWidget *parent, const char *name):TQWidget(parent, name)
 {
 	current=""; previous=""; // Using TQString() gives problems!
 	lilo=l;
diff --git a/lilo-config/kde-qt-common/images.h b/lilo-config/kde-qt-common/images.h
index 8e8060d..898b95b 100644
--- a/lilo-config/kde-qt-common/images.h
+++ b/lilo-config/kde-qt-common/images.h
@@ -41,7 +41,7 @@ class Images:public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Images(liloconf *l=0, TQWidget *tqparent=0, const char *name=0);
+	Images(liloconf *l=0, TQWidget *parent=0, const char *name=0);
 	~Images();
 	void setCfg(liloconf *l) { lilo=l; };
     void makeReadOnly();
diff --git a/lilo-config/kde-qt-common/mainwidget.cpp b/lilo-config/kde-qt-common/mainwidget.cpp
index 7ea74a1..bb966f2 100644
--- a/lilo-config/kde-qt-common/mainwidget.cpp
+++ b/lilo-config/kde-qt-common/mainwidget.cpp
@@ -29,8 +29,8 @@
 #include "mainwidget.moc"
 #include "ui.h"
 
-MainWidget::MainWidget(TQWidget *tqparent, const char *name)
-  : TQTabWidget(tqparent, name)
+MainWidget::MainWidget(TQWidget *parent, const char *name)
+  : TQTabWidget(parent, name)
 {
 	l=new liloconf();
 	general=new General(l, this);
diff --git a/lilo-config/kde-qt-common/mainwidget.h b/lilo-config/kde-qt-common/mainwidget.h
index 28cc37d..1eb022b 100644
--- a/lilo-config/kde-qt-common/mainwidget.h
+++ b/lilo-config/kde-qt-common/mainwidget.h
@@ -40,7 +40,7 @@ class MainWidget: public TQTabWidget {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MainWidget(TQWidget *tqparent, const char *name=0);
+	MainWidget(TQWidget *parent, const char *name=0);
 	void arrangeWidgets();
     void makeReadOnly();
 public slots:
diff --git a/lilo-config/kde-qt-common/ui.h b/lilo-config/kde-qt-common/ui.h
index 9df62ae..6f65124 100644
--- a/lilo-config/kde-qt-common/ui.h
+++ b/lilo-config/kde-qt-common/ui.h
@@ -39,14 +39,14 @@
 #include <kdialog.h>
 #include <kfiledialog.h>
 #define _(x) i18n(x)
-#define WarningYesNo(tqparent, caption, text) \
-	KMessageBox::warningYesNo(tqparent, text, caption)
-#define ErrorOK(tqparent, caption, text) \
-	KMessageBox::sorry(tqparent, text, caption)
-#define InformationOK(tqparent, text, caption, dontShowAgainName) \
-	KMessageBox::information(tqparent, text, caption, dontShowAgainName)
-#define CriticalErrorOK(tqparent, text, caption) \
-	KMessageBox::error(tqparent, text, caption)
+#define WarningYesNo(parent, caption, text) \
+	KMessageBox::warningYesNo(parent, text, caption)
+#define ErrorOK(parent, caption, text) \
+	KMessageBox::sorry(parent, text, caption)
+#define InformationOK(parent, text, caption, dontShowAgainName) \
+	KMessageBox::information(parent, text, caption, dontShowAgainName)
+#define CriticalErrorOK(parent, text, caption) \
+	KMessageBox::error(parent, text, caption)
 #define TabBar KTabCtl
 #define FileDlg KFileDialog
 #define SPACE_MARGIN KDialog::marginHint()
@@ -57,14 +57,14 @@
 #include <tqdialog.h>
 #include <tqfiledialog.h>
 #define _(x) tr(x)
-#define WarningYesNo(tqparent, caption, text) \
-	TQMessageBox::warning(tqparent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
-#define ErrorOK(tqparent, caption, text) \
-	TQMessageBox::information(tqparent, caption, text)
-#define InformationOK(tqparent, text, caption, dontShowAgainName) \
-	TQMessageBox::information(tqparent, caption, text)
-#define CriticalErrorOK(tqparent, text, caption) \
-	TQMessageBox::critical(tqparent, caption, text)
+#define WarningYesNo(parent, caption, text) \
+	TQMessageBox::warning(parent, caption, text, TQMessageBox::Yes, TQMessageBox::No)
+#define ErrorOK(parent, caption, text) \
+	TQMessageBox::information(parent, caption, text)
+#define InformationOK(parent, text, caption, dontShowAgainName) \
+	TQMessageBox::information(parent, caption, text)
+#define CriticalErrorOK(parent, text, caption) \
+	TQMessageBox::critical(parent, caption, text)
 #define TabBar TQTabWidget
 #define FileDlg TQFileDialog
 #define SPACE_MARGIN 5
diff --git a/lilo-config/kde/Details.cpp b/lilo-config/kde/Details.cpp
index ae82090..86e47bb 100644
--- a/lilo-config/kde/Details.cpp
+++ b/lilo-config/kde/Details.cpp
@@ -33,8 +33,8 @@
 #include <tqlabel.h>
 #include <ui.h>
 
-Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags /* f */)
- : KDialogBase(tqparent, name, true, TQString(), Ok|Cancel, Ok, true)
+Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags /* f */)
+ : KDialogBase(parent, name, true, TQString(), Ok|Cancel, Ok, true)
 {
 	l=lilo;
 
diff --git a/lilo-config/kde/Details.h b/lilo-config/kde/Details.h
index 85cfe68..ee90550 100644
--- a/lilo-config/kde/Details.h
+++ b/lilo-config/kde/Details.h
@@ -39,7 +39,7 @@ class Details:public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+	Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
 	bool isReadOnly() const { return readonly->isChecked(); };
 	TQString vgaMode() const;
 	bool isUnsafe() const { return unsafe->isChecked(); };
diff --git a/lilo-config/kde/InputBox.cpp b/lilo-config/kde/InputBox.cpp
index 585874d..272feb4 100644
--- a/lilo-config/kde/InputBox.cpp
+++ b/lilo-config/kde/InputBox.cpp
@@ -31,8 +31,8 @@
 #include <tqwhatsthis.h>
 #include <ui.h>
 
-InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f)
-  : KDialogBase(tqparent, name, true, TQString(), hasCancel ? Ok | Cancel : Ok, Ok, true )
+InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f)
+  : KDialogBase(parent, name, true, TQString(), hasCancel ? Ok | Cancel : Ok, Ok, true )
 {
 	TQVBox *page = makeVBoxMainWidget();
 	for(entries::iterator it=e.begin(); it!=e.end(); it++) {
diff --git a/lilo-config/kde/InputBox.h b/lilo-config/kde/InputBox.h
index 50b9d10..e5ce2ec 100644
--- a/lilo-config/kde/InputBox.h
+++ b/lilo-config/kde/InputBox.h
@@ -43,7 +43,7 @@ class InputBox:public KDialogBase
 public:
 	typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
 	typedef std::list<entry> entries;
-	InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
+	InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
 	TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
 private:
 	std::list<EditWidget*> edit;
diff --git a/lilo-config/kde/kcontrol.cpp b/lilo-config/kde/kcontrol.cpp
index dbf2f40..75f514c 100644
--- a/lilo-config/kde/kcontrol.cpp
+++ b/lilo-config/kde/kcontrol.cpp
@@ -35,8 +35,8 @@
 #include <kaboutdata.h>
 #include <unistd.h>
 
-KControl::KControl(TQWidget *tqparent, const char *name)
-  : KCModule(tqparent, name)
+KControl::KControl(TQWidget *parent, const char *name)
+  : KCModule(parent, name)
 {
 	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
 	m=new MainWidget(this, name);
@@ -79,9 +79,9 @@ void KControl::configChanged() // SLOT
 
 extern "C"
 {
-  KDE_EXPORT KCModule *create_lilo(TQWidget *tqparent, const char *name)
+  KDE_EXPORT KCModule *create_lilo(TQWidget *parent, const char *name)
   {
-    return new KControl(tqparent, "kcmlilo");
+    return new KControl(parent, "kcmlilo");
   }
 }
 
diff --git a/lilo-config/kde/kcontrol.h b/lilo-config/kde/kcontrol.h
index 75d98dd..aa3c89a 100644
--- a/lilo-config/kde/kcontrol.h
+++ b/lilo-config/kde/kcontrol.h
@@ -40,7 +40,7 @@ class KControl: public KCModule {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KControl(TQWidget *tqparent, const char *name);
+	KControl(TQWidget *parent, const char *name);
 	void load();
 	void save();
 	void defaults();
diff --git a/lilo-config/qt/Details.cpp b/lilo-config/qt/Details.cpp
index f85216c..5abce8a 100644
--- a/lilo-config/qt/Details.cpp
+++ b/lilo-config/qt/Details.cpp
@@ -32,7 +32,7 @@
 #include <tqlabel.h>
 #include <ui.h>
 
-Details::Details(liloimage *lilo, TQWidget *tqparent, const char *name, WFlags f):TQDialog(tqparent, name, true, f)
+Details::Details(liloimage *lilo, TQWidget *parent, const char *name, WFlags f):TQDialog(parent, name, true, f)
 {
 	l=lilo;
 
diff --git a/lilo-config/qt/Details.h b/lilo-config/qt/Details.h
index 079a83a..79b7d6e 100644
--- a/lilo-config/qt/Details.h
+++ b/lilo-config/qt/Details.h
@@ -37,7 +37,7 @@ class Details:public TQDialog
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Details(liloimage *lilo, TQWidget *tqparent=0, const char *name=0, WFlags f=0);
+	Details(liloimage *lilo, TQWidget *parent=0, const char *name=0, WFlags f=0);
 	bool isReadOnly() const { return readonly->isChecked(); };
 	TQString vgaMode() const;
 	bool isUnsafe() const { return unsafe->isChecked(); };
diff --git a/lilo-config/qt/InputBox.cpp b/lilo-config/qt/InputBox.cpp
index a8aaa1d..ca1c557 100644
--- a/lilo-config/qt/InputBox.cpp
+++ b/lilo-config/qt/InputBox.cpp
@@ -31,7 +31,7 @@
 #include <tqwhatsthis.h>
 #include <ui.h>
 
-InputBox::InputBox(entries e, TQWidget *tqparent, const char *name, bool hasCancel, WFlags f):TQDialog(tqparent, name, true, f)
+InputBox::InputBox(entries e, TQWidget *parent, const char *name, bool hasCancel, WFlags f):TQDialog(parent, name, true, f)
 {
 	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
 	tqlayout->setMargin(SPACE_MARGIN);
diff --git a/lilo-config/qt/InputBox.h b/lilo-config/qt/InputBox.h
index 1a624c8..dde769c 100644
--- a/lilo-config/qt/InputBox.h
+++ b/lilo-config/qt/InputBox.h
@@ -40,7 +40,7 @@ class InputBox:public TQDialog
 public:
 	typedef struct { TQString label; TQString dflt; bool isFile; TQString help; } entry;
 	typedef std::list<entry> entries;
-	InputBox(entries e, TQWidget *tqparent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
+	InputBox(entries e, TQWidget *parent=0, const char *name=0, bool hasCancel=true, WFlags f=0);
 	TQStringList const text() const { TQStringList s; for(std::list<EditWidget*>::const_iterator it=edit.begin(); it!=edit.end(); it++) s << (*it)->text(); return s; };
 private:
 	std::list<EditWidget*> edit;
diff --git a/lilo-config/qt/standalone.cpp b/lilo-config/qt/standalone.cpp
index acab064..111ab40 100644
--- a/lilo-config/qt/standalone.cpp
+++ b/lilo-config/qt/standalone.cpp
@@ -33,7 +33,7 @@
 #include <ui.h>
 #include "standalone.moc"
 
-Standalone::Standalone(TQWidget *tqparent, const char *name):TQWidget(tqparent,name)
+Standalone::Standalone(TQWidget *parent, const char *name):TQWidget(parent,name)
 {
 	m=new MainWidget(this);
 	connect(m, TQT_SIGNAL(configChanged()), TQT_SLOT(configChanged()));
diff --git a/lilo-config/qt/standalone.h b/lilo-config/qt/standalone.h
index 2131b2a..75f0c54 100644
--- a/lilo-config/qt/standalone.h
+++ b/lilo-config/qt/standalone.h
@@ -37,7 +37,7 @@ class Standalone: public TQWidget
 	Q_OBJECT
   TQ_OBJECT
 public:
-	Standalone(TQWidget *tqparent=0, const char *name=0);
+	Standalone(TQWidget *parent=0, const char *name=0);
 	void resizeEvent(TQResizeEvent *e);
 public slots:
 	void whatsthis();