rename the following methods:

tqparent parent
tqmask mask


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

12 files changed, 34 insertions, 34 deletions

diff --git a/kaboodle/controls.cpp b/kaboodle/controls.cpp
index b718b659..896d77cb 100644
--- a/kaboodle/controls.cpp
+++ b/kaboodle/controls.cpp
@@ -23,15 +23,15 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include "controls.h"
 
-Kaboodle::L33tSlider::L33tSlider(TQWidget * tqparent, const char * name) :
-	TQSlider(tqparent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(TQWidget * parent, const char * name) :
+	TQSlider(parent,name), pressed(false)
 {}
-Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * tqparent, const char * name) :
-	TQSlider(o,tqparent,name), pressed(false)
+Kaboodle::L33tSlider::L33tSlider(Qt::Orientation o, TQWidget * parent, const char * name) :
+	TQSlider(o,parent,name), pressed(false)
 {}
 Kaboodle::L33tSlider::L33tSlider(int minValue, int maxValue, int pageStep, int value,
-	                   Qt::Orientation o, TQWidget * tqparent, const char * name) :
-	TQSlider(minValue, maxValue, pageStep, value, o, tqparent,name), pressed(false)
+	                   Qt::Orientation o, TQWidget * parent, const char * name) :
+	TQSlider(minValue, maxValue, pageStep, value, o, parent,name), pressed(false)
 {}
 
 bool Kaboodle::L33tSlider::currentlyPressed() const
@@ -76,8 +76,8 @@ void Kaboodle::L33tSlider::wheelEvent(TQWheelEvent *e)
 }
 
 Kaboodle::SliderAction::SliderAction(const TQString& text, int accel, const TQObject *receiver,
-                                 const char *member, TQObject* tqparent, const char* name )
-	: KAction( text, accel, tqparent, name )
+                                 const char *member, TQObject* parent, const char* name )
+	: KAction( text, accel, parent, name )
 {
 	m_receiver = receiver;
 	m_member = member;
diff --git a/kaboodle/controls.h b/kaboodle/controls.h
index 19b11fde..d746df81 100644
--- a/kaboodle/controls.h
+++ b/kaboodle/controls.h
@@ -45,10 +45,10 @@ class L33tSlider : public TQSlider
 Q_OBJECT
   TQ_OBJECT
 public:
-	L33tSlider(TQWidget * tqparent, const char * name=0);
-	L33tSlider(Qt::Orientation, TQWidget * tqparent, const char * name=0);
+	L33tSlider(TQWidget * parent, const char * name=0);
+	L33tSlider(Qt::Orientation, TQWidget * parent, const char * name=0);
 	L33tSlider(int minValue, int maxValue, int pageStep, int value,
-	           Qt::Orientation, TQWidget * tqparent, const char * name=0);
+	           Qt::Orientation, TQWidget * parent, const char * name=0);
 
 	bool currentlyPressed() const;
 signals:
@@ -77,7 +77,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	SliderAction(const TQString& text, int accel, const TQObject *receiver,
-	             const char *member, TQObject* tqparent, const char* name );
+	             const char *member, TQObject* parent, const char* name );
 	virtual int plug( TQWidget *w, int index = -1 );
 	virtual void unplug( TQWidget *w );
 	TQSlider* slider() const { return m_slider; }
diff --git a/kaboodle/engine.cpp b/kaboodle/engine.cpp
index f103ca19..5909dbcd 100644
--- a/kaboodle/engine.cpp
+++ b/kaboodle/engine.cpp
@@ -71,8 +71,8 @@ public:
 	KURL file;
 };
 
-Kaboodle::Engine::Engine(TQObject *tqparent)
-	: TQObject(tqparent)
+Kaboodle::Engine::Engine(TQObject *parent)
+	: TQObject(parent)
 	, d(new EnginePrivate)
 {
 }
diff --git a/kaboodle/engine.h b/kaboodle/engine.h
index 5a1b51b3..c269a02d 100644
--- a/kaboodle/engine.h
+++ b/kaboodle/engine.h
@@ -48,7 +48,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	Engine(TQObject *tqparent=0);
+	Engine(TQObject *parent=0);
 	~Engine();
 
 	Arts::PlayObject playObject() const;
diff --git a/kaboodle/kaboodle_factory.cpp b/kaboodle/kaboodle_factory.cpp
index 0b842d53..99302702 100644
--- a/kaboodle/kaboodle_factory.cpp
+++ b/kaboodle/kaboodle_factory.cpp
@@ -42,15 +42,15 @@ Kaboodle::KaboodleFactory::~KaboodleFactory()
 	s_instance = 0;
 }
 
-KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent, const char *name, const char *className, const TQStringList &)
+KParts::Part *Kaboodle::KaboodleFactory::createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent, const char *name, const char *className, const TQStringList &)
 {
 	if(className == TQString("KMediaPlayer/Engine"))
 	{
-		return new Player(tqparent, name);
+		return new Player(parent, name);
 	}
 	else
 	{
-		return new Player(widgetParent, widgetName, tqparent, name);
+		return new Player(widgetParent, widgetName, parent, name);
 	}
 }
 
diff --git a/kaboodle/kaboodle_factory.h b/kaboodle/kaboodle_factory.h
index 46e02af6..11ce0cbf 100644
--- a/kaboodle/kaboodle_factory.h
+++ b/kaboodle/kaboodle_factory.h
@@ -41,7 +41,7 @@ public:
 	KaboodleFactory();
 	virtual ~KaboodleFactory();
 
-	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *tqparent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
+	virtual KParts::Part *createPartObject(TQWidget *widgetParent, const char *widgetName, TQObject *parent = 0, const char *name = 0, const char *classname = TQOBJECT_OBJECT_NAME_STRING, const TQStringList &args = TQStringList());
 
 	static const KAboutData *aboutData();
 	static KInstance *instance();
diff --git a/kaboodle/player.cpp b/kaboodle/player.cpp
index 32cc37d2..0d384ded 100644
--- a/kaboodle/player.cpp
+++ b/kaboodle/player.cpp
@@ -32,8 +32,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "player.h"
 #include "view.h"
 
-Kaboodle::Player::Player(TQObject *tqparent, const char *name)
-	: KMediaPlayer::Player(tqparent, name)
+Kaboodle::Player::Player(TQObject *parent, const char *name)
+	: KMediaPlayer::Player(parent, name)
 	, engine(new Engine(this))
 	, widget(0)
 	, uncompleted(true)
@@ -47,8 +47,8 @@ Kaboodle::Player::Player(TQObject *tqparent, const char *name)
 }
 
 Kaboodle::Player::Player(TQWidget *widgetParent, const char *widgetName,
-                         TQObject *tqparent, const char *name)
-	: KMediaPlayer::Player(widgetParent, widgetName, tqparent, name)
+                         TQObject *parent, const char *name)
+	: KMediaPlayer::Player(widgetParent, widgetName, parent, name)
 	, engine(new Engine(this))
 	, widget(new View(widgetParent, widgetName, this))
 	, uncompleted(true)
@@ -260,8 +260,8 @@ void Kaboodle::Player::updateTitle()
 	}
 }
 
-Kaboodle::BrowserExtension::BrowserExtension(Player *tqparent)
-	: KParts::BrowserExtension(tqparent, "Kaboodle Browser Extension")
+Kaboodle::BrowserExtension::BrowserExtension(Player *parent)
+	: KParts::BrowserExtension(parent, "Kaboodle Browser Extension")
 {
 }
 
diff --git a/kaboodle/player.h b/kaboodle/player.h
index ee7f1b0a..1fab8e3c 100644
--- a/kaboodle/player.h
+++ b/kaboodle/player.h
@@ -46,7 +46,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	BrowserExtension(Player *tqparent);
+	BrowserExtension(Player *parent);
 };
 
 class Player : public KMediaPlayer::Player
@@ -56,8 +56,8 @@ Q_OBJECT
 
 public:
 	Player(TQWidget *widgetParent, const char *widgetName,
-	       TQObject *tqparent, const char *name);
-	Player(TQObject *tqparent, const char *name);
+	       TQObject *parent, const char *name);
+	Player(TQObject *parent, const char *name);
 	virtual ~Player();
 
 	virtual bool openURL(const KURL &);
diff --git a/kaboodle/userinterface.cpp b/kaboodle/userinterface.cpp
index 5dd8bd70..10f7e56e 100644
--- a/kaboodle/userinterface.cpp
+++ b/kaboodle/userinterface.cpp
@@ -48,8 +48,8 @@
 #include "view.h"
 #include "userinterface.h"
 
-Kaboodle::UserInterface::UserInterface(TQWidget *tqparent, const KURL &initialFile)
-	: KParts::MainWindow(tqparent)
+Kaboodle::UserInterface::UserInterface(TQWidget *parent, const KURL &initialFile)
+	: KParts::MainWindow(parent)
 {
 	setAcceptDrops(true);
 	setStandardToolBarMenuEnabled(true);
diff --git a/kaboodle/userinterface.h b/kaboodle/userinterface.h
index 076a4eec..6b430815 100644
--- a/kaboodle/userinterface.h
+++ b/kaboodle/userinterface.h
@@ -44,7 +44,7 @@ class UserInterface : public KParts::MainWindow
 Q_OBJECT
   TQ_OBJECT
 public:
-	UserInterface(TQWidget *tqparent, const KURL &initialFile = KURL());
+	UserInterface(TQWidget *parent, const KURL &initialFile = KURL());
 	virtual ~UserInterface(void);
 
 	void load(const TQString& url);
diff --git a/kaboodle/view.cpp b/kaboodle/view.cpp
index 75171584..437af5b0 100644
--- a/kaboodle/view.cpp
+++ b/kaboodle/view.cpp
@@ -55,8 +55,8 @@ TQButton *createButton(const TQIconSet &_iconset, const TQString &_tip, TQObject
 }
 }
 
-Kaboodle::View::View(TQWidget *tqparent, const char *name, Player *p)
-	: KMediaPlayer::View(tqparent, name)
+Kaboodle::View::View(TQWidget *parent, const char *name, Player *p)
+	: KMediaPlayer::View(parent, name)
 	, state((KMediaPlayer::Player::State)p->state())
 	, autoPlay(false)
 	, quitAfterPlaying(false)
diff --git a/kaboodle/view.h b/kaboodle/view.h
index 5aa2a6b7..75ed28b4 100644
--- a/kaboodle/view.h
+++ b/kaboodle/view.h
@@ -48,7 +48,7 @@ Q_OBJECT
   TQ_OBJECT
 
 public:
-	View(TQWidget *tqparent, const char *name, Player *player);
+	View(TQWidget *parent, const char *name, Player *player);
 	virtual ~View(void);
 	
 	/**