rename the following methods:

tqparent parent
tqmask mask


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

19 files changed, 56 insertions, 56 deletions

diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp
index 7adef9e..8a267fb 100644
--- a/kicker-applets/kbinaryclock/datepicker.cpp
+++ b/kicker-applets/kbinaryclock/datepicker.cpp
@@ -29,8 +29,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <klocale.h>
 #include <kwin.h>
 
-DatePicker::DatePicker(TQWidget *tqparent, const TQDate& date)
-    : TQVBox( tqparent, 0, WType_TopLevel | WDestructiveClose |
+DatePicker::DatePicker(TQWidget *parent, const TQDate& date)
+    : TQVBox( parent, 0, WType_TopLevel | WDestructiveClose |
              WStyle_Customize | WStyle_StaysOnTop | WStyle_NoBorder )
 {
     setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised );
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 2e46273..2aaec6e 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -41,15 +41,15 @@
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init( TQWidget *tqparent, const TQString& configFile ) {
+	KDE_EXPORT KPanelApplet* init( TQWidget *parent, const TQString& configFile ) {
 		KGlobal::locale()->insertCatalogue( "kbinaryclock");
 		return new KBinaryClock( configFile, KPanelApplet::Normal,
-							KPanelApplet::Preferences, tqparent, "kbinaryclock");
+							KPanelApplet::Preferences, parent, "kbinaryclock");
 	}
 }
 
-KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) :
-		KConfigDialog(tqparent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal)
+KConfigDialogImp::KConfigDialogImp( TQWidget *parent, const char *name, KConfigSkeleton *prefs, KDialogBase::DialogType dialogType, KDialogBase::ButtonCode defaultButton, bool modal) :
+		KConfigDialog(parent, name, prefs, dialogType,(KDialogBase::ButtonCode) (KDialogBase::Default | KDialogBase::Ok | KDialogBase::Apply | KDialogBase::Cancel ), defaultButton, modal)
 {
 	// As a temporary mesure until the kicker applet's app name is set to the
 	// applets name so KDialogBase gets the right info.
@@ -61,7 +61,7 @@ KConfigDialogImp::KConfigDialogImp( TQWidget *tqparent, const char *name, KConfi
 	connect(this, TQT_SIGNAL(widgetModified()), settings, TQT_SLOT(updatePreview()));
 }
 
-SettingsImp::SettingsImp(TQWidget* tqparent, const char* name, WFlags fl): Settings(tqparent, name, fl){
+SettingsImp::SettingsImp(TQWidget* parent, const char* name, WFlags fl): Settings(parent, name, fl){
 }
 
 /**
@@ -116,8 +116,8 @@ void SettingsImp::updatePreview(){
 /**
  * Constructor, create LED's
  */
-KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *tqparent, const char *name)
-	: KPanelApplet(configFile, type, actions, tqparent, name), ledWidth(6),
+KBinaryClock::KBinaryClock(const TQString& configFile, Type type, int actions, TQWidget *parent, const char *name)
+	: KPanelApplet(configFile, type, actions, parent, name), ledWidth(6),
 	  _calendar(NULL), _disableCalendar(false), 
 		prefs( new Prefs(sharedConfig())), m_tooltip(this)
 {
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h
index cfa8422..1aae352 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.h
+++ b/kicker-applets/kbinaryclock/kbinaryclock.h
@@ -40,7 +40,7 @@ class SettingsImp : public Settings {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	SettingsImp(TQWidget* tqparent=0,
+	SettingsImp(TQWidget* parent=0,
 				const char* name=0,
 				WFlags fl=0);
 public slots:
@@ -50,7 +50,7 @@ public slots:
 
 class KConfigDialogImp : public KConfigDialog {
 public:
-	KConfigDialogImp(TQWidget *tqparent, const char *name,
+	KConfigDialogImp(TQWidget *parent, const char *name,
 		KConfigSkeleton *prefs,
 	KDialogBase::DialogType dialogType = KDialogBase::IconList,
 	KDialogBase::ButtonCode defaultButton = Ok,
@@ -74,7 +74,7 @@ class KBinaryClock : public KPanelApplet {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *tqparent = 0, const char *name = 0);
+	KBinaryClock(const TQString& configFile, Type t = Normal, int actions = 0, TQWidget *parent = 0, const char *name = 0);
 	~KBinaryClock();
 
 	virtual int	widthForHeight (int height) const;
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index 101bd42..fbce8cf 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -48,18 +48,18 @@ $Id$
 // Applet initialization function
 extern "C"
 {
-	KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+	KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
 	{
 		KGlobal::locale()->insertCatalogue("kolourpicker");
 		return new KolourPicker(configFile, KPanelApplet::Normal,
 			KPanelApplet::About,
-			tqparent, "kolourpicker");
+			parent, "kolourpicker");
 	}
 }
 
 KolourPicker::KolourPicker(const TQString& configFile, Type type,
-	int actions, TQWidget *tqparent, const char *name)
-	: KPanelApplet(configFile, type, actions, tqparent, name),
+	int actions, TQWidget *parent, const char *name)
+	: KPanelApplet(configFile, type, actions, parent, name),
 	  m_picking(0)
 {
 	KAboutData *about = new KAboutData("kolourpicker",
@@ -339,16 +339,16 @@ TQPixmap KolourPicker::colorPixmap(const TQColor &c) const
                 img.setPixel(x, y, tqRgba(128, 128, 128, 255));
         }
     
-    TQBitmap tqmask(16, 16);
-    tqmask.fill(TQt::color0);
-    TQPainter p(&tqmask);
+    TQBitmap mask(16, 16);
+    mask.fill(TQt::color0);
+    TQPainter p(&mask);
     p.setPen(TQt::NoPen);
     p.setBrush(TQt::color1);
     p.drawEllipse(0, 0, 15, 15);
     p.end();
     
     TQPixmap pm = TQPixmap(img.smoothScale(16, 16));
-    pm.setMask(tqmask);
+    pm.setMask(mask);
     
     return pm;
 }
diff --git a/kicker-applets/kolourpicker/kolourpicker.h b/kicker-applets/kolourpicker/kolourpicker.h
index c223339..c9870e2 100644
--- a/kicker-applets/kolourpicker/kolourpicker.h
+++ b/kicker-applets/kolourpicker/kolourpicker.h
@@ -37,7 +37,7 @@ class KolourPicker : public KPanelApplet
   TQ_OBJECT
 public:
 	KolourPicker(const TQString& configFile, Type t = Normal, int actions = 0,
-		TQWidget *tqparent = 0, const char *name = 0);
+		TQWidget *parent = 0, const char *name = 0);
     ~KolourPicker();
 	virtual int heightForWidth(int) const;
 	virtual int widthForHeight(int) const;
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index 8e6c8ec..f232377 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/simplebutton.cpp
@@ -32,8 +32,8 @@
 #include <kipc.h>
 #include <kstandarddirs.h>
 
-SimpleButton::SimpleButton(TQWidget *tqparent, const char *name)
-    : TQButton(tqparent, name),
+SimpleButton::SimpleButton(TQWidget *parent, const char *name)
+    : TQButton(parent, name),
       m_highlight(false),
       m_orientation(Qt::Horizontal)
 {
@@ -192,8 +192,8 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
 }
 
 
-SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name)
-    : SimpleButton(tqparent, name)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name)
+    : SimpleButton(parent, name)
 {
     setBackgroundOrigin(AncestorOrigin);
     _arrow = arrow;
diff --git a/kicker-applets/kolourpicker/simplebutton.h b/kicker-applets/kolourpicker/simplebutton.h
index 9b4e231..0cf11e5 100644
--- a/kicker-applets/kolourpicker/simplebutton.h
+++ b/kicker-applets/kolourpicker/simplebutton.h
@@ -32,7 +32,7 @@ class KDE_EXPORT SimpleButton : public TQButton
   TQ_OBJECT
 
     public:
-        SimpleButton(TQWidget *tqparent, const char *name = 0);
+        SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
         TQSize tqsizeHint() const;
@@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
   TQ_OBJECT
     
     public:
-        SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
+        SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
         TQSize tqsizeHint() const;
     
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index c13cfbc..2c78031 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -35,11 +35,11 @@
 
 extern "C"
 {
-    KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+    KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
     {
         KGlobal::locale()->insertCatalogue("ktimemon");
         KTimeMon *mon = new KTimeMon(configFile, KPanelApplet::Normal,
-                                     KPanelApplet::Preferences, tqparent, "ktimemon");
+                                     KPanelApplet::Preferences, parent, "ktimemon");
         return mon;
     }
 }
@@ -185,8 +185,8 @@ void KTimeMon::maybeTip(const TQPoint& p)
 // Initialise the member variables, read the configuration data base,
 // set up the widget, and start the timer.
 KTimeMon::KTimeMon(const TQString& configFile, Type type, int actions,
-               TQWidget *tqparent, const char *name)
-    : KPanelApplet(configFile, type, actions, tqparent, name, WRepaintNoErase), TQToolTip(this),
+               TQWidget *parent, const char *name)
+    : KPanelApplet(configFile, type, actions, parent, name, WRepaintNoErase), TQToolTip(this),
     configDialog(0), bgProcess(0),
     kernelColour("red1"), userColour("blue"),
     niceColour("yellow"), iowaitColour("darkgreen"),
diff --git a/kicker-applets/ktimemon/timemon.h b/kicker-applets/ktimemon/timemon.h
index 12fc6ba..7e023c5 100644
--- a/kicker-applets/ktimemon/timemon.h
+++ b/kicker-applets/ktimemon/timemon.h
@@ -51,7 +51,7 @@ public:
     enum MouseAction { NOTHING, SWITCH, MENU, COMMAND };
 
     KTimeMon(const TQString& configFile, Type t = Normal, int actions = 0,
-             TQWidget *tqparent = 0, const char *name = 0);
+             TQWidget *parent = 0, const char *name = 0);
     virtual ~KTimeMon();
 
     void writeConfiguration();	// write back the configuration data
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index 8274bb6..772afeb 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -49,16 +49,16 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 extern "C"
 {
-  KDE_EXPORT KPanelApplet* init(TQWidget *tqparent, const TQString& configFile)
+  KDE_EXPORT KPanelApplet* init(TQWidget *parent, const TQString& configFile)
   {
     KGlobal::locale()->insertCatalogue("kmathapplet");
-    return new MathApplet(configFile, KPanelApplet::Stretch, 0, tqparent, "kmathapplet");
+    return new MathApplet(configFile, KPanelApplet::Stretch, 0, parent, "kmathapplet");
   }
 }
 
 MathApplet::MathApplet(const TQString& configFile, Type type, int actions,
-                             TQWidget *tqparent, const char *name)
-  : KPanelApplet(configFile, type, actions, tqparent, name),
+                             TQWidget *parent, const char *name)
+  : KPanelApplet(configFile, type, actions, parent, name),
     m_hasFocus(false)
 {
   //  setBackgroundMode(X11ParentRelative);
diff --git a/kicker-applets/math/mathapplet.h b/kicker-applets/math/mathapplet.h
index 97e4270..e7e4235 100644
--- a/kicker-applets/math/mathapplet.h
+++ b/kicker-applets/math/mathapplet.h
@@ -42,7 +42,7 @@ class MathApplet : public KPanelApplet
 
 public:
     MathApplet(const TQString& configFile, Type t = Stretch, int actions = 0,
-	      TQWidget *tqparent = 0, const char *name = 0);
+	      TQWidget *parent = 0, const char *name = 0);
     virtual ~MathApplet();
 
     int widthForHeight(int height) const;
diff --git a/kicker-applets/mediacontrol/mcslider.cpp b/kicker-applets/mediacontrol/mcslider.cpp
index b67708c..7224d9c 100644
--- a/kicker-applets/mediacontrol/mcslider.cpp
+++ b/kicker-applets/mediacontrol/mcslider.cpp
@@ -19,8 +19,8 @@
 
 #include "mcslider.h"
 
-MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name )
-	 : TQSlider( orientation, tqparent, name )
+MCSlider::MCSlider( Qt::Orientation orientation, TQWidget *parent, const char *name )
+	 : TQSlider( orientation, parent, name )
 {
     setBackgroundOrigin(WidgetOrigin);
     setBackground();
diff --git a/kicker-applets/mediacontrol/mcslider.h b/kicker-applets/mediacontrol/mcslider.h
index 0c4a784..1d81b82 100644
--- a/kicker-applets/mediacontrol/mcslider.h
+++ b/kicker-applets/mediacontrol/mcslider.h
@@ -26,7 +26,7 @@ class MCSlider : public TQSlider
   TQ_OBJECT
 
 	public:
-		MCSlider( Qt::Orientation orientation, TQWidget *tqparent, const char *name = 0 );
+		MCSlider( Qt::Orientation orientation, TQWidget *parent, const char *name = 0 );
 		~MCSlider();
 		void setBackground();
 	private:
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index cb94759..a2bf77b 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -57,12 +57,12 @@ const int NO_BUTTONS = 4;
 
 extern "C"
 {
-	KDE_EXPORT KPanelApplet *init( TQWidget *tqparent, const TQString &configFile)
+	KDE_EXPORT KPanelApplet *init( TQWidget *parent, const TQString &configFile)
 	{
 		KGlobal::locale()->insertCatalogue("mediacontrol");
 		return new MediaControl(configFile, KPanelApplet::Normal,
 			KPanelApplet::About | KPanelApplet::Preferences |
-			KPanelApplet::ReportBug, tqparent, "mediacontrol");
+			KPanelApplet::ReportBug, parent, "mediacontrol");
 	}
 }
 
@@ -91,9 +91,9 @@ class MediaControlToolTip : public TQToolTip
 // =============================================================================
 
 MediaControl::MediaControl(const TQString &configFile, Type t, int actions,
-	TQWidget *tqparent, const char *name)
+	TQWidget *parent, const char *name)
 	: DCOPObject("MediaControl"),
-		KPanelApplet(configFile, t, actions, tqparent, name),
+		KPanelApplet(configFile, t, actions, parent, name),
 		mInstance(new KInstance("mediacontrol")),
 		mAboutData(new KAboutData("mediacontrol",
 			I18N_NOOP("MediaControl"),
@@ -600,8 +600,8 @@ void MediaControl::resizeEvent( TQResizeEvent* )
 
 // Our Button ========================================================================
 
-TrayButton::TrayButton(TQWidget* tqparent, const char* name)
-	: SimpleButton (tqparent, name)
+TrayButton::TrayButton(TQWidget* parent, const char* name)
+	: SimpleButton (parent, name)
 {
 	setBackgroundMode(PaletteBackground);
 	setBackgroundOrigin(AncestorOrigin);
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 887ebb4..161db39 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -56,7 +56,7 @@ class TrayButton : public SimpleButton
   TQ_OBJECT
 
 	public:
-		TrayButton(TQWidget* tqparent, const char* name);
+		TrayButton(TQWidget* parent, const char* name);
 		virtual ~TrayButton() {}
 		void setIconSet(const TQIconSet &iconSet);
 };
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index 2636398..6df8886 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -42,8 +42,8 @@
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
-MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *tqparent, const char* name)
-: KDialogBase( tqparent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false )
+MediaControlConfig::MediaControlConfig( ConfigFrontend *cfg, TQWidget *parent, const char* name)
+: KDialogBase( parent, name, false, i18n("MediaControl"), Ok | Apply | Cancel, Ok, false )
 {
 	_configFrontend = cfg;
 	if (!_configFrontend) // emergency!!!
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.h b/kicker-applets/mediacontrol/mediacontrolconfig.h
index 4d5c388..5ce463a 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.h
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.h
@@ -30,7 +30,7 @@ class MediaControlConfig: public KDialogBase
 Q_OBJECT
   TQ_OBJECT
 public:
-	MediaControlConfig(ConfigFrontend *cfg, TQWidget *tqparent = 0, const char* name = "MediaControlConfig");
+	MediaControlConfig(ConfigFrontend *cfg, TQWidget *parent = 0, const char* name = "MediaControlConfig");
 
 	void readSkinDir(const TQString &dir);
 	void load();
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index 8e6c8ec..f232377 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -32,8 +32,8 @@
 #include <kipc.h>
 #include <kstandarddirs.h>
 
-SimpleButton::SimpleButton(TQWidget *tqparent, const char *name)
-    : TQButton(tqparent, name),
+SimpleButton::SimpleButton(TQWidget *parent, const char *name)
+    : TQButton(parent, name),
       m_highlight(false),
       m_orientation(Qt::Horizontal)
 {
@@ -192,8 +192,8 @@ void SimpleButton::resizeEvent( TQResizeEvent * )
 }
 
 
-SimpleArrowButton::SimpleArrowButton(TQWidget *tqparent, TQt::ArrowType arrow, const char *name)
-    : SimpleButton(tqparent, name)
+SimpleArrowButton::SimpleArrowButton(TQWidget *parent, TQt::ArrowType arrow, const char *name)
+    : SimpleButton(parent, name)
 {
     setBackgroundOrigin(AncestorOrigin);
     _arrow = arrow;
diff --git a/kicker-applets/mediacontrol/simplebutton.h b/kicker-applets/mediacontrol/simplebutton.h
index 9b4e231..0cf11e5 100644
--- a/kicker-applets/mediacontrol/simplebutton.h
+++ b/kicker-applets/mediacontrol/simplebutton.h
@@ -32,7 +32,7 @@ class KDE_EXPORT SimpleButton : public TQButton
   TQ_OBJECT
 
     public:
-        SimpleButton(TQWidget *tqparent, const char *name = 0);
+        SimpleButton(TQWidget *parent, const char *name = 0);
         void setPixmap(const TQPixmap &pix);
         void setOrientation(Qt::Orientation orientaton);
         TQSize tqsizeHint() const;
@@ -67,7 +67,7 @@ class KDE_EXPORT SimpleArrowButton: public SimpleButton
   TQ_OBJECT
     
     public:
-        SimpleArrowButton(TQWidget *tqparent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
+        SimpleArrowButton(TQWidget *parent = 0, TQt::ArrowType arrow = TQt::UpArrow, const char *name = 0);
         virtual ~SimpleArrowButton() {};
         TQSize tqsizeHint() const;