rename the following methods:

tqparent parent
tqmask mask


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

24 files changed, 25 insertions, 25 deletions

diff --git a/kgeography/src/answersdialog.cpp b/kgeography/src/answersdialog.cpp
index fcc219dc..7ff19bde 100644
--- a/kgeography/src/answersdialog.cpp
+++ b/kgeography/src/answersdialog.cpp
@@ -17,7 +17,7 @@
 #include "answer.h"
 #include "answersdialog.h"
 
-answersDialog::answersDialog(TQWidget *tqparent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers) : KDialogBase(tqparent, 0, true, i18n("Your Answers Were"), Ok)
+answersDialog::answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers) : KDialogBase(parent, 0, true, i18n("Your Answers Were"), Ok)
 {
 	TQLabel *l1, *l2, *l3;
 	TQFont boldFont, bigFont;
diff --git a/kgeography/src/answersdialog.h b/kgeography/src/answersdialog.h
index 60686923..1b3b754d 100644
--- a/kgeography/src/answersdialog.h
+++ b/kgeography/src/answersdialog.h
@@ -23,7 +23,7 @@ class userAnswer;
 class answersDialog : public KDialogBase
 {
 	public:
-		answersDialog(TQWidget *tqparent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers);
+		answersDialog(TQWidget *parent, const TQValueVector<userAnswer> &userAnswers, TQString question, int correctAnswers);
 	
 	protected:
 		void showEvent(TQShowEvent *e);
diff --git a/kgeography/src/askwidget.cpp b/kgeography/src/askwidget.cpp
index 3a5fade6..95ca4fcd 100644
--- a/kgeography/src/askwidget.cpp
+++ b/kgeography/src/askwidget.cpp
@@ -16,7 +16,7 @@
 #include "askwidget.h"
 #include "map.h"
 
-askWidget::askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(tqparent), p_map(m), p_count(count)
+askWidget::askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel) : TQWidget(parent), p_map(m), p_count(count)
 {
 	if (showLabel)
 	{
diff --git a/kgeography/src/askwidget.h b/kgeography/src/askwidget.h
index 2627296c..ff9ad8fd 100644
--- a/kgeography/src/askwidget.h
+++ b/kgeography/src/askwidget.h
@@ -25,7 +25,7 @@ class askWidget : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		askWidget(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count, bool showLabel = true);
+		askWidget(TQWidget *parent, KGmap *m, TQWidget *w, uint count, bool showLabel = true);
 		virtual ~askWidget();
 		
 		virtual TQString getQuestionHook() const = 0;
diff --git a/kgeography/src/boxasker.cpp b/kgeography/src/boxasker.cpp
index d263e1f0..9fb0c90b 100644
--- a/kgeography/src/boxasker.cpp
+++ b/kgeography/src/boxasker.cpp
@@ -23,7 +23,7 @@
 #include "boxasker.h"
 #include "map.h"
 
-boxAsker::boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : askWidget(tqparent, m, w, count)
+boxAsker::boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : askWidget(parent, m, w, count)
 {
 	p_lay = new TQVBoxLayout(this);
 	
diff --git a/kgeography/src/boxasker.h b/kgeography/src/boxasker.h
index d4b2079a..7186d446 100644
--- a/kgeography/src/boxasker.h
+++ b/kgeography/src/boxasker.h
@@ -24,7 +24,7 @@ class boxAsker : public askWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		boxAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		boxAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 		~boxAsker();
 	
 	protected:
diff --git a/kgeography/src/capitaldivisionasker.cpp b/kgeography/src/capitaldivisionasker.cpp
index cd4c8a44..c2698eb0 100644
--- a/kgeography/src/capitaldivisionasker.cpp
+++ b/kgeography/src/capitaldivisionasker.cpp
@@ -15,7 +15,7 @@
 #include "capitaldivisionasker.h"
 #include "map.h"
 
-capitalDivisionAsker::capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+capitalDivisionAsker::capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }
diff --git a/kgeography/src/capitaldivisionasker.h b/kgeography/src/capitaldivisionasker.h
index 8d05b1cf..3d8a5e1c 100644
--- a/kgeography/src/capitaldivisionasker.h
+++ b/kgeography/src/capitaldivisionasker.h
@@ -18,7 +18,7 @@ class TQLabel;
 class capitalDivisionAsker : public boxAsker
 {
 	public:
-		capitalDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		capitalDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);
diff --git a/kgeography/src/divisioncapitalasker.cpp b/kgeography/src/divisioncapitalasker.cpp
index 5614efa0..2b136a58 100644
--- a/kgeography/src/divisioncapitalasker.cpp
+++ b/kgeography/src/divisioncapitalasker.cpp
@@ -15,7 +15,7 @@
 #include "divisioncapitalasker.h"
 #include "map.h"
 
-divisionCapitalAsker::divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+divisionCapitalAsker::divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }
diff --git a/kgeography/src/divisioncapitalasker.h b/kgeography/src/divisioncapitalasker.h
index 8ec236e9..e4bc5514 100644
--- a/kgeography/src/divisioncapitalasker.h
+++ b/kgeography/src/divisioncapitalasker.h
@@ -16,7 +16,7 @@
 class divisionCapitalAsker : public boxAsker
 {
 	public:
-		divisionCapitalAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		divisionCapitalAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);
diff --git a/kgeography/src/divisionflagasker.cpp b/kgeography/src/divisionflagasker.cpp
index ef90033d..0b5d72be 100644
--- a/kgeography/src/divisionflagasker.cpp
+++ b/kgeography/src/divisionflagasker.cpp
@@ -16,7 +16,7 @@
 #include "divisionflagasker.h"
 #include "map.h"
 
-divisionFlagAsker::divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+divisionFlagAsker::divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	init();
 }
diff --git a/kgeography/src/divisionflagasker.h b/kgeography/src/divisionflagasker.h
index 71d64149..5e1eaef2 100644
--- a/kgeography/src/divisionflagasker.h
+++ b/kgeography/src/divisionflagasker.h
@@ -16,7 +16,7 @@
 class divisionFlagAsker : public boxAsker
 {
 	public:
-		divisionFlagAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		divisionFlagAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 	
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);
diff --git a/kgeography/src/flagdivisionasker.cpp b/kgeography/src/flagdivisionasker.cpp
index 92f0b039..125fc64d 100644
--- a/kgeography/src/flagdivisionasker.cpp
+++ b/kgeography/src/flagdivisionasker.cpp
@@ -17,7 +17,7 @@
 #include "flagdivisionasker.h"
 #include "map.h"
 
-flagDivisionAsker::flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count) : boxAsker(tqparent, m, w, count)
+flagDivisionAsker::flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count) : boxAsker(parent, m, w, count)
 {
 	p_flag = new TQWidget(this);
 	p_lay -> insertWidget(0, p_flag);
diff --git a/kgeography/src/flagdivisionasker.h b/kgeography/src/flagdivisionasker.h
index 5d826835..dfd4f662 100644
--- a/kgeography/src/flagdivisionasker.h
+++ b/kgeography/src/flagdivisionasker.h
@@ -16,7 +16,7 @@
 class flagDivisionAsker : public boxAsker
 {
 	public:
-		flagDivisionAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, uint count);
+		flagDivisionAsker(TQWidget *parent, KGmap *m, TQWidget *w, uint count);
 	
 	protected:
 		bool nextBoxAskerQuestionHook(const TQString &division, int i, bool isAnswer);
diff --git a/kgeography/src/mapasker.cpp b/kgeography/src/mapasker.cpp
index 2fb7c380..47de1dff 100644
--- a/kgeography/src/mapasker.cpp
+++ b/kgeography/src/mapasker.cpp
@@ -20,7 +20,7 @@
 #include "mapasker.h"
 #include "mapwidget.h"
 
-mapAsker::mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(tqparent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true)
+mapAsker::mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count) : askWidget(parent, m, w, count, asker), p_popupManager(this), p_asker(asker), p_firstShow(true)
 {
 	TQGridLayout *lay = new TQGridLayout(this, 2, 2);
 
diff --git a/kgeography/src/mapasker.h b/kgeography/src/mapasker.h
index 2ce5d6f2..e70ead24 100644
--- a/kgeography/src/mapasker.h
+++ b/kgeography/src/mapasker.h
@@ -27,7 +27,7 @@ class mapAsker : public askWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapAsker(TQWidget *tqparent, KGmap *m, TQWidget *w, bool asker, uint count = 0);
+		mapAsker(TQWidget *parent, KGmap *m, TQWidget *w, bool asker, uint count = 0);
 		~mapAsker();
 
 		TQSize mapSize() const;
diff --git a/kgeography/src/mapchooser.cpp b/kgeography/src/mapchooser.cpp
index 1920e328..d1945e2d 100644
--- a/kgeography/src/mapchooser.cpp
+++ b/kgeography/src/mapchooser.cpp
@@ -19,7 +19,7 @@
 
 #include "mapchooser.h"
 
-mapChooser::mapChooser(TQWidget *tqparent) : KDialogBase(tqparent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
+mapChooser::mapChooser(TQWidget *parent) : KDialogBase(parent, 0, true, i18n("Choose Map to Use"), KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, true)
 {
 	TQHBox *mainHB;
 	TQStringList list;
diff --git a/kgeography/src/mapchooser.h b/kgeography/src/mapchooser.h
index 502adc4b..44f15567 100644
--- a/kgeography/src/mapchooser.h
+++ b/kgeography/src/mapchooser.h
@@ -23,7 +23,7 @@ class mapChooser : public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapChooser(TQWidget *tqparent);
+		mapChooser(TQWidget *parent);
 		~mapChooser();
 
 		KGmap *getMap();
diff --git a/kgeography/src/mapwidget.cpp b/kgeography/src/mapwidget.cpp
index 2560f11a..e039952c 100644
--- a/kgeography/src/mapwidget.cpp
+++ b/kgeography/src/mapwidget.cpp
@@ -19,7 +19,7 @@
 
 #include "mapwidget.h"
 
-mapWidget::mapWidget(TQWidget *tqparent) : TQWidget(tqparent)
+mapWidget::mapWidget(TQWidget *parent) : TQWidget(parent)
 {
 	p_wantZoom = false;
 	p_zooming = false;
diff --git a/kgeography/src/mapwidget.h b/kgeography/src/mapwidget.h
index 3f6561dc..a54463b1 100644
--- a/kgeography/src/mapwidget.h
+++ b/kgeography/src/mapwidget.h
@@ -20,7 +20,7 @@ class mapWidget : public TQWidget
 Q_OBJECT
   TQ_OBJECT
 	public:
-		mapWidget(TQWidget *tqparent);
+		mapWidget(TQWidget *parent);
 		
 		void init(const TQString &path, int scrollBarWidth, int scrollBarHeight);
 
diff --git a/kgeography/src/mypopup.cpp b/kgeography/src/mypopup.cpp
index d68e3a7e..b37264df 100644
--- a/kgeography/src/mypopup.cpp
+++ b/kgeography/src/mypopup.cpp
@@ -16,7 +16,7 @@
 #include "mypopup.h"
 
 
-myPopup::myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(tqparent)
+myPopup::myPopup(TQWidget *parent, const TQString &text, const TQString &text2, const TQString &flagFile) : TQFrame(parent)
 {
 	TQHBoxLayout *lay = new TQHBoxLayout(this);
 	lay -> setMargin(4);
diff --git a/kgeography/src/mypopup.h b/kgeography/src/mypopup.h
index d840eb49..71cc5555 100644
--- a/kgeography/src/mypopup.h
+++ b/kgeography/src/mypopup.h
@@ -20,7 +20,7 @@ Q_OBJECT
 	friend class popupManager;
 	
 	private:
-		myPopup(TQWidget *tqparent, const TQString &text, const TQString &text2 = TQString(), const TQString &flagFile = TQString());
+		myPopup(TQWidget *parent, const TQString &text, const TQString &text2 = TQString(), const TQString &flagFile = TQString());
 	
 	signals:
 		void deleteMe();
diff --git a/kgeography/src/popupmanager.cpp b/kgeography/src/popupmanager.cpp
index 1b19b44d..1a457f81 100644
--- a/kgeography/src/popupmanager.cpp
+++ b/kgeography/src/popupmanager.cpp
@@ -11,9 +11,9 @@
 #include "mypopup.h"
 #include "popupmanager.h"
 
-popupManager::popupManager(TQWidget *tqparent)
+popupManager::popupManager(TQWidget *parent)
 {
-	p_parent = tqparent;
+	p_parent = parent;
 	p_mp = 0;
 }
 
diff --git a/kgeography/src/popupmanager.h b/kgeography/src/popupmanager.h
index 57dd68c8..2da2a94b 100644
--- a/kgeography/src/popupmanager.h
+++ b/kgeography/src/popupmanager.h
@@ -22,7 +22,7 @@ class popupManager : public TQObject
 Q_OBJECT
   TQ_OBJECT
 	public:
-		popupManager(TQWidget *tqparent);
+		popupManager(TQWidget *parent);
 
 		// shows text at p and the flag
 		void show(const TQString &text, const TQString &text2, const TQPoint &p, const TQString &flagFile);