rename the following methods:

tqparent parent tqmask mask git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kaffeine@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
author: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
committer: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> 2011-08-10 22:19:39 +0000
commit: 585ba225bf48a286fd6ce8f40384d0a0b4283375 (patch)
tree: 3021c14d7ecc0fcc62dd16f2d58b15c7be5fe7e3
parent: f2418d2c076f47e5552bd365e14bc705fa449545 (diff)
download: kaffeine-585ba225.tar.gz
kaffeine-585ba225.zip
88 files changed, 252 insertions, 252 deletions
diff --git a/kaffeine/src/drivescombo.cpp b/kaffeine/src/drivescombo.cpp
index ff02d30..7d3faf7 100644
--- a/kaffeine/src/drivescombo.cpp
+++ b/kaffeine/src/drivescombo.cpp
@@ -28,8 +28,8 @@
 
 #include <tqfile.h>
 
-DrivesCombo::DrivesCombo(TQWidget* tqparent, const char* name)
- : KComboBox(tqparent, name)
+DrivesCombo::DrivesCombo(TQWidget* parent, const char* name)
+ : KComboBox(parent, name)
 {
   setEditable(true);
 
diff --git a/kaffeine/src/drivescombo.h b/kaffeine/src/drivescombo.h
index cb3cc47..4d59c92 100644
--- a/kaffeine/src/drivescombo.h
+++ b/kaffeine/src/drivescombo.h
@@ -35,7 +35,7 @@ Let user choose the disc drive. Takes presets from /etc/fstab.
 class DrivesCombo : public KComboBox
 {
 public:
-    DrivesCombo(TQWidget* tqparent, const char* name = 0);
+    DrivesCombo(TQWidget* parent, const char* name = 0);
     virtual ~DrivesCombo();
 
 };
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index fa6a2f4..5bb169e 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
@@ -37,8 +37,8 @@ GoogleFetcherDialog::GoogleFetcherDialog(const TQString &name,
                                          const GoogleImageList &imageList,
                                          const TQString &artist,
                                          const TQString &album,
-                                         TQWidget *tqparent) :
-    KDialogBase(tqparent, name.latin1(), true, TQString(),
+                                         TQWidget *parent) :
+    KDialogBase(parent, name.latin1(), true, TQString(),
                 Ok | Cancel | User1 , NoDefault, true),
     m_pixmap(TQPixmap()),
     m_imageList(imageList),
@@ -203,8 +203,8 @@ TQPixmap GoogleFetcherDialog::pixmapFromURL(const KURL &url) const
 // CoverIconViewItem
 ////////////////////////////////////////////////////////////////////////////////
 
-CoverIconViewItem::CoverIconViewItem(TQIconView *tqparent, const GoogleImage &image) :
-    TQObject(tqparent), KIconViewItem(tqparent, tqparent->lastItem(), image.size()), m_job(0)
+CoverIconViewItem::CoverIconViewItem(TQIconView *parent, const GoogleImage &image) :
+    TQObject(parent), KIconViewItem(parent, parent->lastItem(), image.size()), m_job(0)
 {
     // Set up the iconViewItem
 
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
index f0de193..d53ca09 100644
--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
+++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.h
@@ -38,7 +38,7 @@ public:
                         const GoogleImageList &urlList,
                         const TQString &artist,
                         const TQString &album,
-                        TQWidget *tqparent = 0);
+                        TQWidget *parent = 0);
 
     virtual ~GoogleFetcherDialog();
 
@@ -85,7 +85,7 @@ class CoverIconViewItem : public TQObject, public KIconViewItem
   TQ_OBJECT
 
 public:
-    CoverIconViewItem(TQIconView *tqparent, const GoogleImage &image);
+    CoverIconViewItem(TQIconView *parent, const GoogleImage &image);
     ~CoverIconViewItem();
 
 private slots:
diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
index 1b1abcb..9c418a1 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -73,7 +73,7 @@
 
 
 
-RollTitle::RollTitle( TQWidget *tqparent ) : TQLabel( "I", tqparent )
+RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
 {
 	TQColorGroup cg = parentWidget()->tqcolorGroup();
 	TQColor base = cg.base();
@@ -184,7 +184,7 @@ struct CoverPopup : public TQWidget
     virtual void mouseReleaseEvent(TQMouseEvent *) { close(); }
 };
 
-CoverFrame::CoverFrame( TQWidget *tqparent ) : TQFrame( tqparent )
+CoverFrame::CoverFrame( TQWidget *parent ) : TQFrame( parent )
 {
 	imagePath = "";
 	TQString path = locate("appdata", "nocover.png");
@@ -275,14 +275,14 @@ void CoverFrame::mousePressEvent( TQMouseEvent *e )
 }
 
 
-PlayList::PlayList( TQWidget* tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name),
+PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name),
 		m_playTime(0), m_playTimeVisible(0), m_countVisible(0), m_searchSelection(false),
 		m_metaOnLoading(true), m_sortAscending(true), m_currentEntry(NULL), m_currentRandomListEntry(-1),
 		m_endless(false), m_random(false), m_useAlternateEncoding(false), m_alternateEncoding("ISO 8859-1")
 {
 	google = NULL;
 
-	mainWidget = new TQVBox( tqparent );
+	mainWidget = new TQVBox( parent );
 	//mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	hSplit = new TQSplitter( mainWidget );
 	hSplit->setOpaqueResize( true );
@@ -1610,8 +1610,8 @@ void PlayList::mergeMeta(const MRL& mrl)
 	setCover( mrl.artist().stripWhiteSpace(), mrl.album().stripWhiteSpace() );
 }
 
-GalleryDialog::GalleryDialog( TQWidget *tqparent, GoogleFetcher *goog )
-	: KDialogBase( tqparent, TQString(i18n("Gallery")).latin1(), true, TQString(), Ok, NoDefault, true )
+GalleryDialog::GalleryDialog( TQWidget *parent, GoogleFetcher *goog )
+	: KDialogBase( parent, TQString(i18n("Gallery")).latin1(), true, TQString(), Ok, NoDefault, true )
 {
 	google = goog;
 	hbox = new TQHBox(this);
@@ -2322,8 +2322,8 @@ bool PlayList::startsWith(TQString s1, TQString s2, bool caseSensitive )
 	return true;
 }
 
-SubtitleChooser::SubtitleChooser(TQStringList values, TQString filename,TQWidget *tqparent, const char * name) :
-		KDialogBase(tqparent,name,true,i18n("Select Subtitle"), Ok|Cancel, Ok, true)
+SubtitleChooser::SubtitleChooser(TQStringList values, TQString filename,TQWidget *parent, const char * name) :
+		KDialogBase(parent,name,true,i18n("Select Subtitle"), Ok|Cancel, Ok, true)
 {
 	TQVBox *page = makeVBoxMainWidget();
 	TQLabel *label =  new TQLabel(page);
@@ -2343,8 +2343,8 @@ TQString SubtitleChooser::getSelection()
 	return table->selectedItem()->text();
 }
 
-MovieChooser::MovieChooser(TQStringList values, TQString filename,TQWidget *tqparent, const char * name) :
-		KDialogBase(tqparent,name,true,i18n("Select Movie"), Ok|Cancel, Ok, true)
+MovieChooser::MovieChooser(TQStringList values, TQString filename,TQWidget *parent, const char * name) :
+		KDialogBase(parent,name,true,i18n("Select Movie"), Ok|Cancel, Ok, true)
 {
 	TQVBox *page = makeVBoxMainWidget();
 	TQLabel *label =  new TQLabel(page);
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 08c5a9c..7f0a89a 100644
--- a/kaffeine/src/input/audiobrowser/playlist.h
+++ b/kaffeine/src/input/audiobrowser/playlist.h
@@ -61,7 +61,7 @@ class GalleryDialog : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	GalleryDialog( TQWidget *tqparent, GoogleFetcher *goog );
+	GalleryDialog( TQWidget *parent, GoogleFetcher *goog );
 protected slots:
 	void slotOk();
 	void slotNext();
@@ -80,7 +80,7 @@ class RollTitle : public TQLabel
   TQ_OBJECT
 
 public:
-	RollTitle( TQWidget *tqparent );
+	RollTitle( TQWidget *parent );
 	void setTitle( MRL mrl );
 
 private:
@@ -106,7 +106,7 @@ class CoverFrame : public TQFrame
   TQ_OBJECT
 
 public:
-	CoverFrame( TQWidget *tqparent );
+	CoverFrame( TQWidget *parent );
 	~CoverFrame();
 	void setCoverPixmap( const TQString &path );
 
@@ -131,7 +131,7 @@ class PlayList : public KaffeineInput
   TQ_OBJECT
 
 public:
-	PlayList(TQWidget *tqparent, TQObject *objParent, const char *name=0);
+	PlayList(TQWidget *parent, TQObject *objParent, const char *name=0);
 	~PlayList();
 
 	// Reimplemented from KaffeineInput
@@ -316,7 +316,7 @@ class SubtitleChooser : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	SubtitleChooser(TQStringList, TQString, TQWidget *tqparent=0, const char *name = 0);
+	SubtitleChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
 	virtual ~SubtitleChooser();
 
 	TQString getSelection();
@@ -330,7 +330,7 @@ class MovieChooser : public KDialogBase
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MovieChooser(TQStringList, TQString, TQWidget *tqparent=0, const char *name = 0);
+	MovieChooser(TQStringList, TQString, TQWidget *parent=0, const char *name = 0);
 	virtual ~MovieChooser();
 
 	TQString getSelection();
diff --git a/kaffeine/src/input/audiobrowser/urllistview.cpp b/kaffeine/src/input/audiobrowser/urllistview.cpp
index 57cd9a7..dd4ad2d 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.cpp
+++ b/kaffeine/src/input/audiobrowser/urllistview.cpp
@@ -37,7 +37,7 @@
 #include "urllistview.moc"
 
 
-UrlListView::UrlListView(TQWidget *tqparent, const char *name ) : KListView(tqparent,name),
+UrlListView::UrlListView(TQWidget *parent, const char *name ) : KListView(parent,name),
  m_listCleared(true), m_itemOfContextMenu(NULL)
 {
   m_contextMenu = new KPopupMenu(this);
diff --git a/kaffeine/src/input/audiobrowser/urllistview.h b/kaffeine/src/input/audiobrowser/urllistview.h
index 95ac717..8f745a7 100644
--- a/kaffeine/src/input/audiobrowser/urllistview.h
+++ b/kaffeine/src/input/audiobrowser/urllistview.h
@@ -39,7 +39,7 @@ class UrlListView : public KListView
    Q_OBJECT
   TQ_OBJECT
 public:
- UrlListView(TQWidget *tqparent=0, const char *name=0);
+ UrlListView(TQWidget *parent=0, const char *name=0);
  ~UrlListView();
 
  void setCleared(bool);
diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
index 97b3ff4..62dc3a5 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -42,7 +42,7 @@
 #include "disc.h"
 #include "disc.moc"
 
-MLabel::MLabel( TQWidget *tqparent ) : TQLabel( tqparent )
+MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
 {
 	setText("<center><font size=\"6\"><b>"+i18n("Audio CD")+"</b></font></center>");
 }
@@ -59,7 +59,7 @@ void MLabel::paintEvent( TQPaintEvent *pe )
 	setPaletteBackgroundColor( TQColor(r, g, b) );
 }
 
-MListView::MListView( TQWidget *tqparent ) : KListView( tqparent )
+MListView::MListView( TQWidget *parent ) : KListView( parent )
 {
 }
 
@@ -73,9 +73,9 @@ void MListView::resizeEvent( TQResizeEvent *rev )
 	KListView::resizeEvent(rev);
 }
 
-Disc::Disc( TQWidget* tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
+Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
 {
-	mainWidget = new TQVBox( tqparent );
+	mainWidget = new TQVBox( parent );
 	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
diff --git a/kaffeine/src/input/disc/disc.h b/kaffeine/src/input/disc/disc.h
index fe1a1ad..129041d 100644
--- a/kaffeine/src/input/disc/disc.h
+++ b/kaffeine/src/input/disc/disc.h
@@ -46,7 +46,7 @@ class MLabel : public TQLabel
   TQ_OBJECT
 
 public:
-	MLabel( TQWidget *tqparent );
+	MLabel( TQWidget *parent );
 	~MLabel() {}
 
 protected:
@@ -61,7 +61,7 @@ class MListView : public KListView
   TQ_OBJECT
 
 public:
-	MListView( TQWidget *tqparent );
+	MListView( TQWidget *parent );
 	~MListView() {}
 
 protected:
@@ -76,7 +76,7 @@ class Disc : public KaffeineInput
   TQ_OBJECT
 
 public:
-	Disc(TQWidget *tqparent, TQObject *objParent, const char *name=0);
+	Disc(TQWidget *parent, TQObject *objParent, const char *name=0);
 	~Disc();
 
 	// Reimplemented from KaffeineInput
diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
index ce07604..03f39fa 100644
--- a/kaffeine/src/input/disc/paranoia.cpp
+++ b/kaffeine/src/input/disc/paranoia.cpp
@@ -50,7 +50,7 @@
 
 #define DEFAULT_DRIVE "/dev/cdrom"
 
-KiloConfig::KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( tqparent )
+KiloConfig::KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders ) : ParanoiaSettings( parent )
 {
 	int i;
 
@@ -227,14 +227,14 @@ void Paranoia::setMode( int mode )
 	paranoia_modeset( p, mode );
 }
 
-bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent )
+bool Paranoia::encode( const TQStringList &list, TQWidget *parent )
 {
 	TQStringList desktop;
 	TQStringList encoderName;
 
 	encodingList.clear();
 	encodingList = list;
-	myParent = tqparent;
+	myParent = parent;
 
 	// check for encoders
 	KTrader::OfferList offers = KTrader::self()->query("KaffeineAudioEncoder");
@@ -282,20 +282,20 @@ bool Paranoia::encode( const TQStringList &list, TQWidget *tqparent )
 	return true;
 }
 
-bool Paranoia::loadEncoder( TQWidget *tqparent )
+bool Paranoia::loadEncoder( TQWidget *parent )
 {
 	int error = 0;
 
 	KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
 	if (!service) {
-		KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 		return false;
 	}
 
 	if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
 		currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
 		if (error > 0) {
-			KMessageBox::error( tqparent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
+			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 			return false;
 		}
 		else
diff --git a/kaffeine/src/input/disc/paranoia.h b/kaffeine/src/input/disc/paranoia.h
index 0957ffe..f54d010 100644
--- a/kaffeine/src/input/disc/paranoia.h
+++ b/kaffeine/src/input/disc/paranoia.h
@@ -43,7 +43,7 @@ class KiloConfig : public ParanoiaSettings
 
 public:
 
-	KiloConfig( TQWidget *tqparent, KConfig *confile, const TQStringList &encoders );
+	KiloConfig( TQWidget *parent, KConfig *confile, const TQStringList &encoders );
 	~KiloConfig();
 
 	TQString getEncoder();
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
index 85b9f7a..5d545da 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.cpp
@@ -21,7 +21,7 @@
 #include "kaffeineaudioencoder.h"
 #include "kaffeineaudioencoder.moc"
 
-KaffeineAudioEncoder::KaffeineAudioEncoder(TQObject* tqparent, const char* name) : KParts::Part( tqparent, name )
+KaffeineAudioEncoder::KaffeineAudioEncoder(TQObject* parent, const char* name) : KParts::Part( parent, name )
 {
 }
 
diff --git a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
index 3cfc570..f7f3c42 100644
--- a/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
+++ b/kaffeine/src/input/disc/plugins/kaffeineaudioencoder.h
@@ -36,7 +36,7 @@ class KDE_EXPORT KaffeineAudioEncoder : public KParts::Part
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeineAudioEncoder(TQObject* tqparent, const char* name);
+	KaffeineAudioEncoder(TQObject* parent, const char* name);
 	virtual ~KaffeineAudioEncoder();
 
 	// return false if the user's canceled.
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
index 19f3737..fc7dda2 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.cpp
@@ -29,7 +29,7 @@
 #include "klameenc.h"
 #include "klameenc.moc"
 
-LameSettings::LameSettings( TQWidget *tqparent, KConfig *confile ) : LameConfig( tqparent )
+LameSettings::LameSettings( TQWidget *parent, KConfig *confile ) : LameConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -79,8 +79,8 @@ bool LameSettings::isVBR()
 
 K_EXPORT_COMPONENT_FACTORY (libkaffeinemp3lame, KParts::GenericFactory<KLameEnc>)
 
-KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& )
-	: KaffeineAudioEncoder(tqparent,name)
+KLameEnc::KLameEnc( TQWidget*, const char*, TQObject* parent, const char* name, const TQStringList& )
+	: KaffeineAudioEncoder(parent,name)
 {
 	setInstance(KParts::GenericFactory<KLameEnc>::instance());
 }
@@ -101,9 +101,9 @@ TQString KLameEnc::getExtension()
 	return TQString(".mp3");
 }
 
-bool KLameEnc::options( TQWidget *tqparent, KConfig *conf )
+bool KLameEnc::options( TQWidget *parent, KConfig *conf )
 {
-	LameSettings dlg( tqparent, conf );
+	LameSettings dlg( parent, conf );
 	int ret = dlg.exec();
 	if ( ret!=TQDialog::Accepted )
 		return false;
diff --git a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
index faa944e..033f448 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
+++ b/kaffeine/src/input/disc/plugins/mp3lame/klameenc.h
@@ -33,7 +33,7 @@ class LameSettings : public LameConfig
 	Q_OBJECT
   TQ_OBJECT
 public:
-	LameSettings( TQWidget *tqparent, KConfig *confile );
+	LameSettings( TQWidget *parent, KConfig *confile );
 	~LameSettings();
 
 	int getBitrate();
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
index a96898c..bd16963 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.cpp
@@ -27,7 +27,7 @@
 #include "koggenc.h"
 #include "koggenc.moc"
 
-OggSettings::OggSettings( TQWidget *tqparent, KConfig *confile ) : OggConfig( tqparent )
+OggSettings::OggSettings( TQWidget *parent, KConfig *confile ) : OggConfig( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 	okBtn->setGuiItem( KGuiItem(i18n("OK"), icon->loadIconSet("ok", KIcon::Small) ) );
@@ -56,8 +56,8 @@ int OggSettings::getQuality()
 
 K_EXPORT_COMPONENT_FACTORY (libkaffeineoggvorbis, KParts::GenericFactory<KOggEnc>)
 
-KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* tqparent, const char* name, const TQStringList& )
-	: KaffeineAudioEncoder(tqparent,name)
+KOggEnc::KOggEnc( TQWidget*, const char*, TQObject* parent, const char* name, const TQStringList& )
+	: KaffeineAudioEncoder(parent,name)
 {
 	setInstance(KParts::GenericFactory<KOggEnc>::instance());
 	encodingQuality = 0.4;
@@ -81,9 +81,9 @@ TQString KOggEnc::getExtension()
 	return TQString(".ogg");
 }
 
-bool KOggEnc::options( TQWidget *tqparent, KConfig *conf )
+bool KOggEnc::options( TQWidget *parent, KConfig *conf )
 {
-	OggSettings dlg( tqparent, conf );
+	OggSettings dlg( parent, conf );
 	int ret = dlg.exec();
 	if ( ret!=TQDialog::Accepted )
 		return false;
diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
index be2c9b6..f495cbf 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/koggenc.h
@@ -41,7 +41,7 @@ class OggSettings : public OggConfig
 	Q_OBJECT
   TQ_OBJECT
 public:
-	OggSettings( TQWidget *tqparent, KConfig *confile );
+	OggSettings( TQWidget *parent, KConfig *confile );
 	~OggSettings();
 
 	int getQuality();
diff --git a/kaffeine/src/input/dvb/audioeditor.cpp b/kaffeine/src/input/dvb/audioeditor.cpp
index 0f3e8c9..c9bb391 100644
--- a/kaffeine/src/input/dvb/audioeditor.cpp
+++ b/kaffeine/src/input/dvb/audioeditor.cpp
@@ -29,7 +29,7 @@
 
 #include "audioeditor.h"
 
-AudioEditor::AudioEditor( ChannelDesc *chan, TQWidget *tqparent ) : AudioEditorUI( tqparent )
+AudioEditor::AudioEditor( ChannelDesc *chan, TQWidget *parent ) : AudioEditorUI( parent )
 {
 	TQString s, t;
 	int i;
diff --git a/kaffeine/src/input/dvb/audioeditor.h b/kaffeine/src/input/dvb/audioeditor.h
index 2422264..0e1c83a 100644
--- a/kaffeine/src/input/dvb/audioeditor.h
+++ b/kaffeine/src/input/dvb/audioeditor.h
@@ -31,7 +31,7 @@ class AudioEditor : public AudioEditorUI
 	
 public:
 
-	AudioEditor( ChannelDesc *chan, TQWidget *tqparent );
+	AudioEditor( ChannelDesc *chan, TQWidget *parent );
 	~AudioEditor();
 
 private slots:
diff --git a/kaffeine/src/input/dvb/broadcasteditor.cpp b/kaffeine/src/input/dvb/broadcasteditor.cpp
index 9e3c86c..3e73c55 100644
--- a/kaffeine/src/input/dvb/broadcasteditor.cpp
+++ b/kaffeine/src/input/dvb/broadcasteditor.cpp
@@ -27,7 +27,7 @@
 
 #include "broadcasteditor.h"
 
-BroadcastEditor::BroadcastEditor( TQWidget *tqparent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret ) : BroadcastEditorUI( tqparent )
+BroadcastEditor::BroadcastEditor( TQWidget *parent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret ) : BroadcastEditorUI( parent )
 {
 	KIconLoader *icon = new KIconLoader();
 
diff --git a/kaffeine/src/input/dvb/broadcasteditor.h b/kaffeine/src/input/dvb/broadcasteditor.h
index 86d5fad..daddc52 100644
--- a/kaffeine/src/input/dvb/broadcasteditor.h
+++ b/kaffeine/src/input/dvb/broadcasteditor.h
@@ -35,7 +35,7 @@ class BroadcastEditor : public BroadcastEditorUI
 
 public:
 
-	BroadcastEditor( TQWidget *tqparent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret );
+	BroadcastEditor( TQWidget *parent, TQPtrList<ChannelDesc> *ch, TQPtrList<ChannelDesc> *ret );
 	~BroadcastEditor();
 
 	TQPtrList<ChannelDesc> *chan;
diff --git a/kaffeine/src/input/dvb/channeleditor.cpp b/kaffeine/src/input/dvb/channeleditor.cpp
index 61ab9f0..e87e171 100644
--- a/kaffeine/src/input/dvb/channeleditor.cpp
+++ b/kaffeine/src/input/dvb/channeleditor.cpp
@@ -34,7 +34,7 @@
 #include "audioeditor.h"
 #include "subeditor.h"
 
-ChannelEditor::ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *tqparent ) : ChannelEditorUI( tqparent )
+ChannelEditor::ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *parent ) : ChannelEditorUI( parent )
 {
 	int i;
 	channel = chan;
diff --git a/kaffeine/src/input/dvb/channeleditor.h b/kaffeine/src/input/dvb/channeleditor.h
index 69221b1..772e36a 100644
--- a/kaffeine/src/input/dvb/channeleditor.h
+++ b/kaffeine/src/input/dvb/channeleditor.h
@@ -33,7 +33,7 @@ class ChannelEditor : public ChannelEditorUI
 
 public:
 
-	ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *tqparent );
+	ChannelEditor( TQStringList src, bool m, ChannelDesc *chan, TQPtrList<ChannelDesc> *cdesc, TQWidget *parent );
 	~ChannelEditor();
 
 protected:
diff --git a/kaffeine/src/input/dvb/crontimer.cpp b/kaffeine/src/input/dvb/crontimer.cpp
index 677c306..f6ccec3 100644
--- a/kaffeine/src/input/dvb/crontimer.cpp
+++ b/kaffeine/src/input/dvb/crontimer.cpp
@@ -25,7 +25,7 @@
 
 #include "crontimer.h"
 
-CronTimer::CronTimer( int m, TQWidget *tqparent ) : CronTimerUI( tqparent )
+CronTimer::CronTimer( int m, TQWidget *parent ) : CronTimerUI( parent )
 {
 	connect( cronBtnGrp, TQT_SIGNAL(clicked(int)), this, TQT_SLOT(modeSelected(int)) );
 	mode = m;
diff --git a/kaffeine/src/input/dvb/crontimer.h b/kaffeine/src/input/dvb/crontimer.h
index d46262f..c029abe 100644
--- a/kaffeine/src/input/dvb/crontimer.h
+++ b/kaffeine/src/input/dvb/crontimer.h
@@ -36,7 +36,7 @@ class CronTimer : public CronTimerUI
 
 public:
 
-	CronTimer( int m, TQWidget *tqparent );
+	CronTimer( int m, TQWidget *parent );
 	~CronTimer();
 	int getMode() const;
 
diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp
index e4cd749..b430b38 100644
--- a/kaffeine/src/input/dvb/dvbcam.cpp
+++ b/kaffeine/src/input/dvb/dvbcam.cpp
@@ -707,8 +707,8 @@ int CamService::createSectionFilter(uint16_t pid, uint8_t table_id)
 
 	// create a section filter
 	uint8_t filter[18] = {table_id};
-	uint8_t tqmask[18] = {0xff};
-	if(dvbdemux_set_section_filter(demux_fd, pid, filter, tqmask, 1, 1)) { // crc check on
+	uint8_t mask[18] = {0xff};
+	if(dvbdemux_set_section_filter(demux_fd, pid, filter, mask, 1, 1)) { // crc check on
 		close(demux_fd);
 		return -1;
 	}
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index e74d8d9..c920090 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -42,7 +42,7 @@
 
 
 
-MSpinBox::MSpinBox( TQWidget *tqparent, int devNum ) : TQSpinBox( 1, 4, 1, tqparent )
+MSpinBox::MSpinBox( TQWidget *parent, int devNum ) : TQSpinBox( 1, 4, 1, parent )
 {
 	deviceNumber = devNum;
 	connect( this, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotValueChanged(int)) );
@@ -57,7 +57,7 @@ void MSpinBox::slotValueChanged( int value )
 
 
 
-MPushButton::MPushButton( TQWidget *tqparent, int devNum, int lnbNum ) : KPushButton( tqparent )
+MPushButton::MPushButton( TQWidget *parent, int devNum, int lnbNum ) : KPushButton( parent )
 {
 	deviceNumber = devNum;
 	lnbNumber = lnbNum;
@@ -73,7 +73,7 @@ void MPushButton::isClicked()
 
 
 
-MCAMButton::MCAMButton( TQWidget *tqparent, int devNum ) : TQPushButton( i18n("CAM"), tqparent )
+MCAMButton::MCAMButton( TQWidget *parent, int devNum ) : TQPushButton( i18n("CAM"), parent )
 {
 	deviceNumber = devNum;
 	connect( this, TQT_SIGNAL(clicked()), this, TQT_SLOT(isClicked()) );
@@ -88,7 +88,7 @@ void MCAMButton::isClicked()
 
 
 
-MComboBox::MComboBox( TQWidget *tqparent, int devNum, int lnbNum ) : TQComboBox( tqparent )
+MComboBox::MComboBox( TQWidget *parent, int devNum, int lnbNum ) : TQComboBox( parent )
 {
 	deviceNumber = devNum;
 	lnbNumber = lnbNum;
@@ -275,14 +275,14 @@ void DVBconfig::setDownloadPercent( Job *job, unsigned long percent )
 
 
 
-bool DVBconfig::loadDvbData( TQWidget *tqparent )
+bool DVBconfig::loadDvbData( TQWidget *parent )
 {
 	TQString s="";
 	FileCopyJob *job;
 	TQFile f( dvbConfigDir+"dvbdata.tar.gz" );
 
 	//if ( f.exists() ) f.remove();
-	downProgress = new KProgressDialog( tqparent, "progress", i18n("Downloading... "), i18n("Copying data files..."), true );
+	downProgress = new KProgressDialog( parent, "progress", i18n("Downloading... "), i18n("Copying data files..."), true );
 	downProgress->progressBar()->setTotalSteps( 100 );
 	//job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
 	job = file_copy( KURL( "http://hftom.free.fr/kaxtv/dvbdata.tar.gz" ), KURL( dvbConfigDir+"dvbdata.tar.gz" ), -1, true, false, false );
@@ -565,8 +565,8 @@ bool DVBconfig::firstRun()
 
 
 
-DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *tqparent, KaffeineDvbPlugin *p ) :
-	KDialogBase ( IconList, i18n("DVB Settings"), Ok|Cancel, Ok, tqparent, "dvbConfigDialog", true, true )
+DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent, KaffeineDvbPlugin *p ) :
+	KDialogBase ( IconList, i18n("DVB Settings"), Ok|Cancel, Ok, parent, "dvbConfigDialog", true, true )
 {
 	TQLabel *lab;
 	KIconLoader *icon = new KIconLoader();
@@ -1271,8 +1271,8 @@ DvbConfigDialog::~DvbConfigDialog()
 
 
 
-LnbConfig::LnbConfig( LNB *b, TQWidget *tqparent ) :
-	KDialogBase ( tqparent, "lnbConfigDialog", true, i18n("LNB Settings"), Ok|Cancel, Ok, true )
+LnbConfig::LnbConfig( LNB *b, TQWidget *parent ) :
+	KDialogBase ( parent, "lnbConfigDialog", true, i18n("LNB Settings"), Ok|Cancel, Ok, true )
 {
 	TQGridLayout *grid;
 
@@ -1463,8 +1463,8 @@ void LnbConfig::accept()
 
 
 
-RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *tqparent ) :
-	KDialogBase ( tqparent, "rotorConfigDialog", true, i18n("Rotor Settings"), Ok|Cancel, Ok, true )
+RotorConfig::RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *parent ) :
+	KDialogBase ( parent, "rotorConfigDialog", true, i18n("Rotor Settings"), Ok|Cancel, Ok, true )
 {
 	int i;
 
diff --git a/kaffeine/src/input/dvb/dvbconfig.h b/kaffeine/src/input/dvb/dvbconfig.h
index f44756e..89f4adb 100644
--- a/kaffeine/src/input/dvb/dvbconfig.h
+++ b/kaffeine/src/input/dvb/dvbconfig.h
@@ -47,7 +47,7 @@ class MSpinBox : public TQSpinBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MSpinBox( TQWidget *tqparent, int devNum );
+	MSpinBox( TQWidget *parent, int devNum );
 public slots:
 	void slotValueChanged( int value );
 signals:
@@ -63,7 +63,7 @@ class MPushButton : public KPushButton
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MPushButton( TQWidget *tqparent, int devNum, int lnbNum );
+	MPushButton( TQWidget *parent, int devNum, int lnbNum );
 private slots:
 	void isClicked();
 signals:
@@ -80,7 +80,7 @@ class MCAMButton : public TQPushButton
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MCAMButton( TQWidget *tqparent, int devNum );
+	MCAMButton( TQWidget *parent, int devNum );
 private slots:
 	void isClicked();
 signals:
@@ -96,7 +96,7 @@ class MComboBox : public TQComboBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	MComboBox( TQWidget *tqparent, int devNum, int lnbNum );
+	MComboBox( TQWidget *parent, int devNum, int lnbNum );
 private slots:
 	void isActivated( int index );
 signals:
@@ -174,7 +174,7 @@ public:
 	void saveDvbChanOrder( int s, int col );
 	void startup();
 	static bool haveDvbDevice();
-	bool loadDvbData( TQWidget *tqparent );
+	bool loadDvbData( TQWidget *parent );
 	bool localData();
 	TQStringList getSourcesList( fe_type_t type );
 	bool haveData();
@@ -224,7 +224,7 @@ class DvbConfigDialog : public KDialogBase
 
 public:
 
-	DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *tqparent, KaffeineDvbPlugin *p );
+	DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent, KaffeineDvbPlugin *p );
 	~DvbConfigDialog();
 	void setSource( TQComboBox *box, TQString s );
 
@@ -284,7 +284,7 @@ class LnbConfig : public KDialogBase
 
 public:
 
-	LnbConfig( LNB *b, TQWidget *tqparent );
+	LnbConfig( LNB *b, TQWidget *parent );
 
 protected slots:
 
@@ -314,7 +314,7 @@ class RotorConfig : public KDialogBase
 
 public:
 
-	RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *tqparent );
+	RotorConfig( Device *d, DVBconfig *c, int lnb, TQWidget *parent );
 
 protected slots:
 
diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
index 39c6822..3623d7f 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -63,8 +63,8 @@
 
 
 
-DIconViewItem::DIconViewItem( DvbPanel *pan, TQIconView *tqparent, const TQString &text, const TQPixmap &icon )
-	: KIconViewItem( tqparent, text, icon )
+DIconViewItem::DIconViewItem( DvbPanel *pan, TQIconView *parent, const TQString &text, const TQPixmap &icon )
+	: KIconViewItem( parent, text, icon )
 {
 	panel = pan;
 }
@@ -83,7 +83,7 @@ void DIconViewItem::dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> &
 
 
 
-DListView::DListView( TQWidget *tqparent ) : KListView( tqparent )
+DListView::DListView( TQWidget *parent ) : KListView( parent )
 {
 	visibleItems = 0;
 }
@@ -100,7 +100,7 @@ TQDragObject* DListView::dragObject()
 
 
 
-DvbPanel::DvbPanel( TQWidget *tqparent, TQObject *objParent, const char *name ) : KaffeineInput(objParent,name)
+DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent,name)
 {
 	browseDvbStream = -1;
 	plug = NULL;
@@ -113,7 +113,7 @@ DvbPanel::DvbPanel( TQWidget *tqparent, TQObject *objParent, const char *name )
 	timers.setAutoDelete( true );
 	dvb.setAutoDelete( true );
 
-	mainWidget = new TQVBox( tqparent );
+	mainWidget = new TQVBox( parent );
 	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
index 18dcfc0..d126bb6 100644
--- a/kaffeine/src/input/dvb/dvbpanel.h
+++ b/kaffeine/src/input/dvb/dvbpanel.h
@@ -58,7 +58,7 @@ class DListView : public KListView
 	Q_OBJECT
   TQ_OBJECT
 public:
-	DListView( TQWidget *tqparent );
+	DListView( TQWidget *parent );
 
 	int visibleItems;
 
@@ -71,7 +71,7 @@ protected:
 class DIconViewItem : public KIconViewItem
 {
 public:
-	DIconViewItem( DvbPanel *pan, TQIconView *tqparent, const TQString &text, const TQPixmap &icon );
+	DIconViewItem( DvbPanel *pan, TQIconView *parent, const TQString &text, const TQPixmap &icon );
 protected:
 	void dropped( TQDropEvent *e, const TQValueList<TQIconDragItem> & );
 private:
@@ -87,7 +87,7 @@ class DvbPanel : public KaffeineInput
 
 public:
 
-	DvbPanel( TQWidget *tqparent, TQObject *objParent, const char *name=0);
+	DvbPanel( TQWidget *parent, TQObject *objParent, const char *name=0);
 	~DvbPanel();
 	bool getChannelList();
 	bool saveChannelList();
diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp
index 61a1047..e47bb60 100644
--- a/kaffeine/src/input/dvb/kevents.cpp
+++ b/kaffeine/src/input/dvb/kevents.cpp
@@ -37,7 +37,7 @@
 
 
 
-EListViewItem::EListViewItem( TQListView *tqparent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ) : KListViewItem( tqparent, chanName, eBegin, eDuration, eTitle )
+EListViewItem::EListViewItem( TQListView *parent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc ) : KListViewItem( parent, chanName, eBegin, eDuration, eTitle )
 {
 	event = desc;
 }
@@ -60,7 +60,7 @@ int EListViewItem::compare( TQListViewItem *i, int col, bool ascending ) const
 
 
 
-KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *tqparent, TQSize size ) : TQDialog( tqparent )
+KEvents::KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *parent, TQSize size ) : TQDialog( parent )
 {
 	dvb = d;
 	events = t;
diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h
index 20828f5..d960575 100644
--- a/kaffeine/src/input/dvb/kevents.h
+++ b/kaffeine/src/input/dvb/kevents.h
@@ -41,7 +41,7 @@ class EListViewItem : public KListViewItem
 
 public:
 
-	EListViewItem( TQListView *tqparent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc );
+	EListViewItem( TQListView *parent, TQString chanName, TQString eBegin, TQString eDuration, TQString eTitle, EventDesc *desc );
 	virtual int compare( TQListViewItem *i, int col, bool ascending ) const;
 
 	EventDesc *event;
@@ -56,7 +56,7 @@ class KEvents : public TQDialog
 
 public:
 
-	KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *tqparent, TQSize size );
+	KEvents( TQPtrList<ChannelDesc> *chans, TQPtrList<DvbStream> *d, EventTable *t, TQWidget *parent, TQSize size );
 	~KEvents();
 
 private slots:
diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
index 350566a..d81f671 100644
--- a/kaffeine/src/input/dvb/kgradprogress.cpp
+++ b/kaffeine/src/input/dvb/kgradprogress.cpp
@@ -25,7 +25,7 @@
 
 
 
-KGradProgress::KGradProgress( TQWidget *tqparent ) : TQLabel( tqparent )
+KGradProgress::KGradProgress( TQWidget *parent ) : TQLabel( parent )
 {
 	barPix = 0;
 	colorUp = TQColor( 0, 255, 0 );
diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h
index f2365d9..887019d 100644
--- a/kaffeine/src/input/dvb/kgradprogress.h
+++ b/kaffeine/src/input/dvb/kgradprogress.h
@@ -34,7 +34,7 @@ class KGradProgress : public TQLabel
 	
 public: 
 
-	KGradProgress( TQWidget *tqparent );
+	KGradProgress( TQWidget *parent );
 	~KGradProgress();
 	virtual void paintEvent(TQPaintEvent *event);
 	virtual TQSize tqsizeHint();
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index a9a59a1..e6d5b9b 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -32,7 +32,7 @@
 
 
 
-KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *tqparent, TQSize size ) : TQDialog( tqparent )
+KRecord::KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *parent, TQSize size ) : TQDialog( parent )
 {
 	timers = t;
 	channelsList = chanList;
diff --git a/kaffeine/src/input/dvb/krecord.h b/kaffeine/src/input/dvb/krecord.h
index 5ba399e..e374baf 100644
--- a/kaffeine/src/input/dvb/krecord.h
+++ b/kaffeine/src/input/dvb/krecord.h
@@ -39,7 +39,7 @@ class KRecord : public TQDialog
 
 public:
 
-	KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *tqparent, TQSize size );
+	KRecord( TQStringList chanList, TQPtrList<RecTimer> *t, TQWidget *parent, TQSize size );
 	~KRecord();
 
 	TQStringList channelsList;
diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp
index 821992d..c66c5d1 100644
--- a/kaffeine/src/input/dvb/ktimereditor.cpp
+++ b/kaffeine/src/input/dvb/ktimereditor.cpp
@@ -29,7 +29,7 @@
 
 
 
-KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *tqparent ) : TQDialog( tqparent )
+KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *parent ) : TQDialog( parent )
 {
 	int i;
 
diff --git a/kaffeine/src/input/dvb/ktimereditor.h b/kaffeine/src/input/dvb/ktimereditor.h
index 774a982..7d294f9 100644
--- a/kaffeine/src/input/dvb/ktimereditor.h
+++ b/kaffeine/src/input/dvb/ktimereditor.h
@@ -42,7 +42,7 @@ class KTimerEditor : public TQDialog
 
 public:
 
-	KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *tqparent );
+	KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQWidget *parent );
 	~KTimerEditor();
 
 	KPushButton *okBtn, *cancelBtn, *repeatBtn;
diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
index beb5645..f05ff3a 100644
--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
@@ -477,7 +477,7 @@ EventDesc *EventTable::getEventDesc( TQString src, int nid, int tsid, int sid, i
 
 
 
-KaffeineEpgPlugin::KaffeineEpgPlugin( TQObject* tqparent, const char* name ) : KParts::Part( tqparent, name )
+KaffeineEpgPlugin::KaffeineEpgPlugin( TQObject* parent, const char* name ) : KParts::Part( parent, name )
 {
 }
 
diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
index 1553786..78874ca 100644
--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
+++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.h
@@ -162,7 +162,7 @@ class KDE_EXPORT KaffeineEpgPlugin : public KParts::Part,  public KaffeineDVBsec
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeineEpgPlugin( TQObject* tqparent, const char* name );
+	KaffeineEpgPlugin( TQObject* parent, const char* name );
 	virtual ~KaffeineEpgPlugin();
 	virtual bool go( TQString /*src*/, int /*freqKhz*/ ) { return false; }
 	virtual void stop() {}
diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp
index 124bc3a..6a3be1a 100644
--- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp
+++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.cpp
@@ -21,7 +21,7 @@
 #include "kaffeinedvbplugin.h"
 #include "kaffeinedvbplugin.moc"
 
-KaffeineDvbPlugin::KaffeineDvbPlugin(TQObject* tqparent, const char* name) : KParts::Part( tqparent, name )
+KaffeineDvbPlugin::KaffeineDvbPlugin(TQObject* parent, const char* name) : KParts::Part( parent, name )
 {
 }
 
diff --git a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
index 8737297..7784fc3 100644
--- a/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
+++ b/kaffeine/src/input/dvb/plugins/stream/kaffeinedvbplugin.h
@@ -36,7 +36,7 @@ class KDE_EXPORT KaffeineDvbPlugin : public KParts::Part
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeineDvbPlugin(TQObject* tqparent, const char* name);
+	KaffeineDvbPlugin(TQObject* parent, const char* name);
 	virtual ~KaffeineDvbPlugin();
 	virtual TQString pluginName() { return TQString(); }
 
diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
index e736282..f433054 100644
--- a/kaffeine/src/input/dvb/scandialog.cpp
+++ b/kaffeine/src/input/dvb/scandialog.cpp
@@ -41,8 +41,8 @@
 
 
 
-DListViewItem::DListViewItem( TQListView *tqparent, ChannelDesc *desc, TQString label1, TQString label2 )
-	: TQListViewItem( tqparent, label1, label2 )
+DListViewItem::DListViewItem( TQListView *parent, ChannelDesc *desc, TQString label1, TQString label2 )
+	: TQListViewItem( parent, label1, label2 )
 {
 	chan = desc;
 }
diff --git a/kaffeine/src/input/dvb/scandialog.h b/kaffeine/src/input/dvb/scandialog.h
index d4eb034..e3dee76 100644
--- a/kaffeine/src/input/dvb/scandialog.h
+++ b/kaffeine/src/input/dvb/scandialog.h
@@ -41,7 +41,7 @@ class DListViewItem : public TQListViewItem
 
 public:
 
-	DListViewItem( TQListView *tqparent, ChannelDesc *desc, TQString label1, TQString label2 );
+	DListViewItem( TQListView *parent, ChannelDesc *desc, TQString label1, TQString label2 );
 
 	ChannelDesc *chan;
 };
diff --git a/kaffeine/src/input/dvb/subeditor.cpp b/kaffeine/src/input/dvb/subeditor.cpp
index 314cb29..3995ee3 100644
--- a/kaffeine/src/input/dvb/subeditor.cpp
+++ b/kaffeine/src/input/dvb/subeditor.cpp
@@ -31,7 +31,7 @@
 
 
 
-SubEditor::SubEditor( ChannelDesc *chan, TQWidget *tqparent ) : SubEditorUI( tqparent )
+SubEditor::SubEditor( ChannelDesc *chan, TQWidget *parent ) : SubEditorUI( parent )
 {
 	TQString s, t;
 	int i;
diff --git a/kaffeine/src/input/dvb/subeditor.h b/kaffeine/src/input/dvb/subeditor.h
index 8b2c57c..71b07a8 100644
--- a/kaffeine/src/input/dvb/subeditor.h
+++ b/kaffeine/src/input/dvb/subeditor.h
@@ -33,7 +33,7 @@ class SubEditor : public SubEditorUI
 
 public:
 
-	SubEditor( ChannelDesc *chan, TQWidget *tqparent );
+	SubEditor( ChannelDesc *chan, TQWidget *parent );
 	~SubEditor();
 
 private slots:
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index 7c80c88..19e82ed 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -29,10 +29,10 @@
 
 
 
-CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name )
+CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *parent, TQObject *objParent, const char *name )
 	: KaffeineInput( objParent, name )
 {
-	mainWidget = new TQVBox( tqparent );
+	mainWidget = new TQVBox( parent );
 	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
diff --git a/kaffeine/src/input/dvbclient/cdwidget.h b/kaffeine/src/input/dvbclient/cdwidget.h
index 51d70fa..16d01b8 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.h
+++ b/kaffeine/src/input/dvbclient/cdwidget.h
@@ -43,7 +43,7 @@ class CdWidget : public KaffeineInput
 
 public:
 
-	CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *tqparent, TQObject *objParent, const char *name );
+	CdWidget( const TQString &ad, int port, int info, const TQString &tspath, TQWidget *parent, TQObject *objParent, const char *name );
 	~CdWidget();
 	void setParam( const TQString &ad, int port, int info, const TQString &tspath );
 	void enableLive( bool b );
diff --git a/kaffeine/src/input/kaffeineinput.cpp b/kaffeine/src/input/kaffeineinput.cpp
index 0547c1c..3049b45 100644
--- a/kaffeine/src/input/kaffeineinput.cpp
+++ b/kaffeine/src/input/kaffeineinput.cpp
@@ -20,7 +20,7 @@
 
 #include "kaffeineinput.h"
 
-KaffeineInput::KaffeineInput(TQObject* tqparent, const char* name) : TQObject( tqparent, name )
+KaffeineInput::KaffeineInput(TQObject* parent, const char* name) : TQObject( parent, name )
 {
 }
 
diff --git a/kaffeine/src/input/kaffeineinput.h b/kaffeine/src/input/kaffeineinput.h
index 6b327f9..02ae996 100644
--- a/kaffeine/src/input/kaffeineinput.h
+++ b/kaffeine/src/input/kaffeineinput.h
@@ -33,7 +33,7 @@ class KaffeineInput : public TQObject, public KXMLGUIClient
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeineInput(TQObject* tqparent, const char* name);
+	KaffeineInput(TQObject* parent, const char* name);
 	virtual ~KaffeineInput();
 
 	// if you want the player window to be displayed on one of your widgets, return a pointer to that one.
diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp
index b578449..0e9dcdf 100644
--- a/kaffeine/src/inputmanager.cpp
+++ b/kaffeine/src/inputmanager.cpp
@@ -52,10 +52,10 @@ InputPlugin::~InputPlugin()
 
 
 
-InputManager::InputManager( Kaffeine *tqparent, TQWidgetStack *ws, KMultiTabBar *mt )
-	: TQObject(tqparent)
+InputManager::InputManager( Kaffeine *parent, TQWidgetStack *ws, KMultiTabBar *mt )
+	: TQObject(parent)
 {
-	kaffeine = tqparent;
+	kaffeine = parent;
 	stack = ws;
 	mtBar = mt;
 	plugs.setAutoDelete( true );
@@ -555,7 +555,7 @@ void InputManager::fullscreen( bool b )
 
 
 /********/
-PlayerContainer::PlayerContainer(TQWidget* tqparent, const char* name) : TQVBox(tqparent, name)
+PlayerContainer::PlayerContainer(TQWidget* parent, const char* name) : TQVBox(parent, name)
 {
 	setAcceptDrops(true);
 	setMouseTracking( true );
diff --git a/kaffeine/src/inputmanager.h b/kaffeine/src/inputmanager.h
index 97e5449..bc6cf7e 100644
--- a/kaffeine/src/inputmanager.h
+++ b/kaffeine/src/inputmanager.h
@@ -44,7 +44,7 @@ class PlayerContainer : public TQVBox
   TQ_OBJECT
 
 public:
-	PlayerContainer(TQWidget* tqparent = 0, const char* name = 0);
+	PlayerContainer(TQWidget* parent = 0, const char* name = 0);
 	virtual ~PlayerContainer() {}
 
 signals:
@@ -76,7 +76,7 @@ class InputManager : public TQObject
 	Q_OBJECT
   TQ_OBJECT
 public:
-	InputManager( Kaffeine *tqparent, TQWidgetStack *ws, KMultiTabBar *mt );
+	InputManager( Kaffeine *parent, TQWidgetStack *ws, KMultiTabBar *mt );
 	~InputManager();
 
 	void add( KaffeineInput *p, const TQPixmap &icon, const TQString &name );
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 506db25..1c32cae 100644
--- a/kaffeine/src/kmultitabbar.cpp
+++ b/kaffeine/src/kmultitabbar.cpp
@@ -48,7 +48,7 @@ public:
 };
 
 
-KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *tqparent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(tqparent)
+KMultiTabBarInternal::KMultiTabBarInternal(TQWidget *parent, KMultiTabBar::KMultiTabBarMode bm):TQScrollView(parent)
 {
 	m_expandedTabSize=-1;
 	m_showActiveTabTexts=false;
@@ -384,8 +384,8 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
 
 
 KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,parent),m_style(style)
 {
 	setIconSet(pic);
 	setText(text);
@@ -400,8 +400,8 @@ KMultiTabBarButton::KMultiTabBarButton(const TQPixmap& pic,const TQString& text,
 }
 
 KMultiTabBarButton::KMultiTabBarButton(const TQString& text, TQPopupMenu *popup,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
-	:TQPushButton(TQIconSet(),text,tqparent),m_style(style)
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style)
+	:TQPushButton(TQIconSet(),text,parent),m_style(style)
 {
 	setText(text);
 	m_position=pos;
@@ -499,9 +499,9 @@ TQSize KMultiTabBarButton::tqsizeHint() const
 
 
 KMultiTabBarTab::KMultiTabBarTab(const TQPixmap& pic, const TQString& text,
-		int id,TQWidget *tqparent,KMultiTabBar::KMultiTabBarPosition pos,
+		int id,TQWidget *parent,KMultiTabBar::KMultiTabBarPosition pos,
 		KMultiTabBar::KMultiTabBarStyle style)
-	:KMultiTabBarButton(text,0,id,tqparent,pos,style),
+	:KMultiTabBarButton(text,0,id,parent,pos,style),
  	m_showActiveTabText(false)
 {
 	down = false;
@@ -836,7 +836,7 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 
 
 
-KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *tqparent,const char *name):TQWidget(tqparent,name)
+KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *name):TQWidget(parent,name)
 {
 	m_buttons.setAutoDelete(false);
 	if (bm==Vertical)
diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index 0b3df44..25aa255 100644
--- a/kaffeine/src/kmultitabbar.h
+++ b/kaffeine/src/kmultitabbar.h
@@ -66,7 +66,7 @@ public:
 	 */
 	enum KMultiTabBarStyle{VSNET=0, KDEV3=1, KONTQSBC=2, KDEV3ICON=3,STYLELAST=0xffff};
 
-	KMultiTabBar(KMultiTabBarMode bm,TQWidget *tqparent=0,const char *name=0);
+	KMultiTabBar(KMultiTabBarMode bm,TQWidget *parent=0,const char *name=0);
 	virtual ~KMultiTabBar();
 
 	/**
@@ -159,9 +159,9 @@ class /*KUTILS_EXPORT*/ KMultiTabBarButton: public TQPushButton
   TQ_OBJECT
 public:
 	KMultiTabBarButton(const TQPixmap& pic,const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	KMultiTabBarButton(const TQString&, TQPopupMenu *popup,
-		int id,TQWidget *tqparent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
+		int id,TQWidget *parent, KMultiTabBar::KMultiTabBarPosition pos, KMultiTabBar::KMultiTabBarStyle style);
 	virtual  ~KMultiTabBarButton();
 	int id() const;
 
@@ -211,7 +211,7 @@ class /*KUTILS_EXPORT*/ KMultiTabBarTab: public KMultiTabBarButton
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *tqparent,
+	KMultiTabBarTab(const TQPixmap& pic,const TQString&,int id,TQWidget *parent,
 		KMultiTabBar::KMultiTabBarPosition pos,KMultiTabBar::KMultiTabBarStyle style);
 	virtual ~KMultiTabBarTab();
 	/**
diff --git a/kaffeine/src/kmultitabbar_p.h b/kaffeine/src/kmultitabbar_p.h
index f0dfa8d..4a5ce77 100644
--- a/kaffeine/src/kmultitabbar_p.h
+++ b/kaffeine/src/kmultitabbar_p.h
@@ -33,7 +33,7 @@ class KMultiTabBarInternal: public TQScrollView
         Q_OBJECT
   TQ_OBJECT
 public:
-        KMultiTabBarInternal(TQWidget *tqparent,KMultiTabBar::KMultiTabBarMode bm);
+        KMultiTabBarInternal(TQWidget *parent,KMultiTabBar::KMultiTabBarMode bm);
         int appendTab(const TQPixmap &,int=-1,const TQString& =TQString());
         KMultiTabBarTab *tab(int) const;
         void removeTab(int);
@@ -59,7 +59,7 @@ protected:
         /**
          * [contentsM|m]ousePressEvent are reimplemented from TQScrollView
          * in order to ignore all mouseEvents on the viewport, so that the
-         * tqparent can handle them.
+         * parent can handle them.
          */
         virtual void contentsMousePressEvent(TQMouseEvent *);
         virtual void mousePressEvent(TQMouseEvent *);
diff --git a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
index a481054..51fa53a 100644
--- a/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
+++ b/kaffeine/src/player-parts/dummy-part/dummy_part.cpp
@@ -27,8 +27,8 @@ typedef KParts::GenericFactory<DummyPart> DummyPartFactory;
 K_EXPORT_COMPONENT_FACTORY (libdummypart, DummyPartFactory);
 
 
-DummyPart::DummyPart(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& /*args*/)
-: KaffeinePart(tqparent, name ? name : "DummyPart")
+DummyPart::DummyPart(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, const TQStringList& /*args*/)
+: KaffeinePart(parent, name ? name : "DummyPart")
 {
   // we need an instance
   setInstance(DummyPartFactory::instance());
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index b7c27c6..2255e67 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
@@ -53,9 +53,9 @@ typedef KParts::GenericFactory<GStreamerPart> GStreamerPartFactory;
 K_EXPORT_COMPONENT_FACTORY (libgstreamerpart, GStreamerPartFactory);
 
 
-GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/, TQObject* tqparent, const char* name,
+GStreamerPart::GStreamerPart( TQWidget* parentWidget, const char* /*widgetName*/, TQObject* parent, const char* name,
                              const TQStringList& /*args*/ )
-		: KaffeinePart( tqparent, name ? name : "GStreamerPart" ),
+		: KaffeinePart( parent, name ? name : "GStreamerPart" ),
 		m_play(NULL), m_videosink(NULL), m_audiosink(NULL), m_visual(NULL), m_videoSettings(NULL),
 		m_gstConfig(NULL), m_mute(false), m_logoPath(TQString()), m_posToolbar(NULL)
 {
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
index 84fec34..eb6203f 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
@@ -42,8 +42,8 @@
 
 
 
-VideoWindow::VideoWindow( TQWidget *tqparent, GstElement *_element )
-		: TQWidget (tqparent), m_width(0), m_height(0), m_aspectRatio(AUTO)
+VideoWindow::VideoWindow( TQWidget *parent, GstElement *_element )
+		: TQWidget (parent), m_width(0), m_height(0), m_aspectRatio(AUTO)
 {
 	m_play = NULL;
 
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
index a5d5263..5782936 100644
--- a/kaffeine/src/player-parts/gstreamer-part/video.h
+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
@@ -39,7 +39,7 @@ class VideoWindow : public TQWidget
   TQ_OBJECT
 
 public:
-	VideoWindow( TQWidget *tqparent, GstElement *element );
+	VideoWindow( TQWidget *parent, GstElement *element );
 	~VideoWindow ();
 
 	enum AspectRatio {
diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
index 099b546..29d8587 100644
--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
@@ -29,8 +29,8 @@
 #include "videosettings.moc"
 
 
-VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *tqparent, const char *name)
-         : KDialogBase(KDialogBase::Plain, i18n("Video Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, tqparent, name, false)
+VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *parent, const char *name)
+         : KDialogBase(KDialogBase::Plain, i18n("Video Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, parent, name, false)
 {
   setInitialSize(TQSize(450,200), true);
   TQWidget* page = plainPage();
diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.h b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
index e2bf6c9..f1be1ef 100644
--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.h
+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.h
@@ -36,7 +36,7 @@ class VideoSettings : public KDialogBase
   TQ_OBJECT
 
 public:
-  VideoSettings(int hue, int sat, int contr, int bright, TQWidget *tqparent=0, const char *name=0);
+  VideoSettings(int hue, int sat, int contr, int bright, TQWidget *parent=0, const char *name=0);
  ~VideoSettings();
 
 signals:
diff --git a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.cpp b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.cpp
index 9e3ad00..33fb1ca 100644
--- a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.cpp
+++ b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.cpp
@@ -22,8 +22,8 @@
 
 #include "kaffeinepart.moc"
 
-KaffeinePart::KaffeinePart(TQObject* tqparent, const char* name)
- : KParts::ReadOnlyPart(tqparent, name)
+KaffeinePart::KaffeinePart(TQObject* parent, const char* name)
+ : KParts::ReadOnlyPart(parent, name)
 {
 }
 
diff --git a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
index 7acc956..6b9e2aa 100644
--- a/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
+++ b/kaffeine/src/player-parts/kaffeine-part/kaffeinepart.h
@@ -29,7 +29,7 @@
  * Base-Class for Kaffeine-Parts. Derive from this class if you want to develop a player part for Kaffeine.
  * At least you have to reimplement openURL(const MRL&) and to emit signalTrackFinished()!
  *
- * IMPORTANT: Forward the double-click, middle-click and wheel mouse-events to the tqparent widget (don't use
+ * IMPORTANT: Forward the double-click, middle-click and wheel mouse-events to the parent widget (don't use
  * TQMouseEvent::accept())!
  *
  * @author Jürgen Kofler
@@ -40,7 +40,7 @@ class KDE_EXPORT KaffeinePart : public KParts::ReadOnlyPart
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KaffeinePart(TQObject* tqparent, const char* name);
+	KaffeinePart(TQObject* parent, const char* name);
 	virtual ~KaffeinePart();
 
 	/*
diff --git a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp b/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
index afa0702..c6b3a16 100644
--- a/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
+++ b/kaffeine/src/player-parts/kaffeine-part/playlistimport.cpp
@@ -416,7 +416,7 @@ uint PlaylistImport::extractIndex( const TQString &str )
 	return ret;
 }
 
-bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget* tqparent)
+bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget* parent)
 {
 	TQ_ULONG result;
 	char buf[10];
@@ -449,12 +449,12 @@ bool PlaylistImport::ram(const MRL& playlist, TQValueList<MRL>& mrls, TQWidget*
 	kdDebug() << "PlaylistImport: Seems to be a ram playlist!" << endl;
 
 	TQString localFile, url;
-	if (KIO::NetAccess::mimetype(playlist.kurl(), tqparent) == "application/vnd.rn-realmedia") {
+	if (KIO::NetAccess::mimetype(playlist.kurl(), parent) == "application/vnd.rn-realmedia") {
 		kdDebug() << "PlaylistImport: Seems to be a real media file" << endl;
 		return false;
 	}
 
-	if (KIO::NetAccess::download(playlist.kurl(), localFile, tqparent))
+	if (KIO::NetAccess::download(playlist.kurl(), localFile, parent))
 	{
 		TQFile plFile(localFile);
 		if (!plFile.open(IO_ReadOnly)) return false;
diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
index 5331c0f..9abb266 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
@@ -33,8 +33,8 @@
 #include "deinterlacequality.moc"
 
 
-DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *tqparent, const char *name)
-:KDialogBase(tqparent, name, true, i18n("Deinterlace Quality"), KDialogBase::Close)
+DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent, const char *name)
+:KDialogBase(parent, name, true, i18n("Deinterlace Quality"), KDialogBase::Close)
 {
   m_configStrings << "tvtime:method=Greedy2Frame,enabled=1,pulldown=vektor,framerate_mode=full,judder_correction=1,use_progressive_frame_flag=1,chroma_filter=1,cheap_mode=0";
   m_configStrings << "tvtime:method=Greedy2Frame,enabled=1,pulldown=vektor,framerate_mode=full,judder_correction=0,use_progressive_frame_flag=1,chroma_filter=0,cheap_mode=0";
diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
index 6c289f2..536a998 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
@@ -38,8 +38,8 @@ class DeinterlacerConfigDialog : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  DeinterlacerConfigDialog(TQWidget *tqparent=0, const char *name=0)
-  : KDialogBase( tqparent, name, true, i18n("Configure tvtime Deinterlace Plugin"), KDialogBase::Close )
+  DeinterlacerConfigDialog(TQWidget *parent=0, const char *name=0)
+  : KDialogBase( parent, name, true, i18n("Configure tvtime Deinterlace Plugin"), KDialogBase::Close )
   {
     setInitialSize(TQSize(450,400), true);
 
@@ -57,7 +57,7 @@ class DeinterlaceQuality : public KDialogBase  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-  DeinterlaceQuality(TQWidget* filterDialog, TQWidget *tqparent=0, const char *name=0);
+  DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent=0, const char *name=0);
   ~DeinterlaceQuality();  
 
   void setQuality(uint);
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.cpp b/kaffeine/src/player-parts/xine-part/equalizer.cpp
index ea60bf7..9834a17 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.cpp
+++ b/kaffeine/src/player-parts/xine-part/equalizer.cpp
@@ -28,11 +28,11 @@
 #include "equalizer.h"
 #include "equalizer.moc"
 
-Equalizer::Equalizer(TQWidget *tqparent, const char *name)
-            : KDialogBase(KDialogBase::Plain, i18n("Equalizer Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, tqparent, name, false)
+Equalizer::Equalizer(TQWidget *parent, const char *name)
+            : KDialogBase(KDialogBase::Plain, i18n("Equalizer Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, parent, name, false)
 {
   setInitialSize(TQSize(450,250), true);
-  reparent(tqparent, pos(), false);
+  reparent(parent, pos(), false);
   TQWidget* page = plainPage();
 
   TQGridLayout* mainGrid = new TQGridLayout( page, 3, 1 );
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
index e2ce9a1..50ee8e9 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.h
+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
@@ -37,7 +37,7 @@ class Equalizer : public KDialogBase  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-  Equalizer(TQWidget *tqparent=0, const char *name=0);
+  Equalizer(TQWidget *parent=0, const char *name=0);
   ~Equalizer();
 
   void ReadValues(KConfig* config);
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
index 0729377..9281527 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
@@ -35,10 +35,10 @@
 #include "filterdialog.moc"
 
 
-FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList& videoFilters, TQWidget *tqparent, const char *name) :
-  KDialogBase(KDialogBase::IconList, i18n("Effect Plugins"), KDialogBase::Ok, KDialogBase::Ok, tqparent, name, false)
+FilterDialog::FilterDialog(const TQStringList& audioFilters, const TQStringList& videoFilters, TQWidget *parent, const char *name) :
+  KDialogBase(KDialogBase::IconList, i18n("Effect Plugins"), KDialogBase::Ok, KDialogBase::Ok, parent, name, false)
 {
-  reparent(tqparent, pos(), false);
+  reparent(parent, pos(), false);
   setInitialSize(TQSize(400,350), true);
 
 /****** Audio Filters ******/  
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.h b/kaffeine/src/player-parts/xine-part/filterdialog.h
index 0506c01..7b28fa4 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.h
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.h
@@ -37,14 +37,14 @@ class FilterDialog : public KDialogBase
    Q_OBJECT
   TQ_OBJECT
 public: 
-  FilterDialog(const TQStringList& audiofilters, const TQStringList& videofilters, TQWidget *tqparent=0, const char *name=0);
+  FilterDialog(const TQStringList& audiofilters, const TQStringList& videofilters, TQWidget *parent=0, const char *name=0);
   ~FilterDialog();
 
 signals:
-  void signalCreateAudioFilter(const TQString& name, TQWidget* tqparent);
+  void signalCreateAudioFilter(const TQString& name, TQWidget* parent);
   void signalRemoveAllAudioFilters();
   void signalUseAudioFilters(bool);
-  void signalCreateVideoFilter(const TQString& name, TQWidget* tqparent);
+  void signalCreateVideoFilter(const TQString& name, TQWidget* parent);
   void signalRemoveAllVideoFilters();
   void signalUseVideoFilters(bool);
   
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
index a30637b..9385759 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -61,11 +61,11 @@
 #define TIMER_EVENT_RESIZE_PARENT       300
 
 
-KXineWidget::KXineWidget(TQWidget* tqparent, const char* name,
+KXineWidget::KXineWidget(TQWidget* parent, const char* name,
                          const TQString& pathToConfigFile, const TQString& pathToLogoFile,
                          const TQString& audioDriver, const TQString& videoDriver,
                          bool startManual, bool verbose)
-		: TQWidget(tqparent,name), m_startXineManual(startManual), m_xineReady(false),
+		: TQWidget(parent,name), m_startXineManual(startManual), m_xineReady(false),
 		m_logoFile(pathToLogoFile), m_preferedAudio(audioDriver), m_preferedVideo(videoDriver), m_xineVerbose(verbose),
 		m_xineEngine(NULL), m_audioDriver(NULL), m_videoDriver(NULL), m_xineStream(NULL), connection(NULL),
 		m_eventQueue(NULL), m_osd(NULL), m_osdUnscaled(false), m_osdShow(false), m_osdSize(0), m_osdFont(NULL),
@@ -337,7 +337,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
 		vw->m_videoAspect = video_aspect;
 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_FRAME_FORMAT_CHANGE));
 
-		/* auto-resize tqparent widget */
+		/* auto-resize parent widget */
 		if ((vw->m_autoresizeEnabled) && (vw->parentWidget()) && (vw->m_posTimer.isActive()) && (!vw->parentWidget()->isFullScreen())
 		        && (video_width > 0) && (video_height > 0))
 		{
@@ -2336,34 +2336,34 @@ TQStringList KXineWidget::getAudioFilterNames() const
 }
 #endif
 
-void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* tqparent)
+void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent)
 {
 #ifndef USE_TQT_ONLY
 	unwireVideoFilters();
 
-	PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, tqparent);
+	PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent);
 	connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteVideoFilter(PostFilter*)));
 	m_videoFilterList.append(filter);
 
 	wireVideoFilters();
 #else
-	tqparent = tqparent;
+	parent = parent;
 	warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name));
 #endif
 }
 
-void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* tqparent)
+void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
 {
 #ifndef USE_TQT_ONLY
 	unwireAudioFilters();
 
-	PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, tqparent);
+	PostFilter* filter = new PostFilter(name, m_xineEngine, m_audioDriver, m_videoDriver, parent);
 	connect(filter, TQT_SIGNAL(signalDeleteMe(PostFilter*)), this, TQT_SLOT(slotDeleteAudioFilter(PostFilter*)));
 	m_audioFilterList.append(filter);
 
 	wireAudioFilters();
 #else
-	tqparent = tqparent;
+	parent = parent;
 	warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name));
 #endif
 }
@@ -2804,7 +2804,7 @@ void KXineWidget::mousePressEvent(TQMouseEvent* mev)
 		input.x           = rect.x;
 		input.y           = rect.y;
 		xine_event_send (m_xineStream, &event);
-		mev->accept(); /* don't send event to tqparent */
+		mev->accept(); /* don't send event to parent */
 	}
 }
 
@@ -3279,9 +3279,9 @@ void KXineWidget::slotEnableAutoresize(bool enable)
  ***************************************/
 
 #ifndef USE_TQT_ONLY
-void KXineWidget::createDeinterlacePlugin(const TQString& config, TQWidget* tqparent)
+void KXineWidget::createDeinterlacePlugin(const TQString& config, TQWidget* parent)
 {
-	m_deinterlaceFilter = new PostFilter(config.section(':',0,0), m_xineEngine, m_audioDriver, m_videoDriver, tqparent);
+	m_deinterlaceFilter = new PostFilter(config.section(':',0,0), m_xineEngine, m_audioDriver, m_videoDriver, parent);
 	if( !m_deinterlaceFilter->getInput() || !m_deinterlaceFilter->getOutput() )
 	{
 		delete m_deinterlaceFilter;
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
index 3456902..1ec989a 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.h
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h
@@ -27,7 +27,7 @@
 
 /* Usage:
  *
- * KXineWidget m_xine = new KXineWidget(tqparent);
+ * KXineWidget m_xine = new KXineWidget(parent);
  * m_xine->appendToQueue("the_best_song_of_the_world.mp3");
  *
  * You should at least connect to signalXineFatal(const TQString&)!
@@ -79,7 +79,7 @@ class KXineWidget : public TQWidget, public TQThread
   TQ_OBJECT
 
 public:
-	KXineWidget(TQWidget *tqparent=0, const char *name=0,
+	KXineWidget(TQWidget *parent=0, const char *name=0,
 	            const TQString& pathToConfigFile = TQString(), const TQString& pathToLogoFile = TQString(),
 	            const TQString& audioDriver = TQString(), const TQString& videoDriver = TQString(),
 	            bool startManual = false, bool verbose = false);
@@ -141,7 +141,7 @@ public:
 	TQStringList getVisualPlugins() const;
 
 #ifndef USE_TQT_ONLY
-	void createDeinterlacePlugin(const TQString& configString, TQWidget* tqparent);
+	void createDeinterlacePlugin(const TQString& configString, TQWidget* parent);
 	const TQString getDeinterlaceConfig() const;
 	TQStringList getVideoFilterNames() const;
 	TQStringList getAudioFilterNames() const;
@@ -186,7 +186,7 @@ public:
 	void startMouseHideTimer();
 	void stopMouseHideTimer();
 
-	void globalPosChanged();  /* call this if global pos of tqparent was changed */
+	void globalPosChanged();  /* call this if global pos of parent was changed */
 
 signals:
 	void signalXineFatal(const TQString& message);   /** initXine() not successfull! **/
@@ -293,8 +293,8 @@ public slots:
 	void slotDVDMenuSelect();
 
 	/***** postprocess filters ****/
-	void slotCreateVideoFilter(const TQString& name, TQWidget* tqparent);
-	void slotCreateAudioFilter(const TQString& name, TQWidget* tqparent);
+	void slotCreateVideoFilter(const TQString& name, TQWidget* parent);
+	void slotCreateAudioFilter(const TQString& name, TQWidget* parent);
 	void slotDeleteVideoFilter(PostFilter* filter);
 	void slotDeleteAudioFilter(PostFilter* filter);
 	void slotRemoveAllVideoFilters();
diff --git a/kaffeine/src/player-parts/xine-part/positionslider.cpp b/kaffeine/src/player-parts/xine-part/positionslider.cpp
index 6cc815f..16b3978 100644
--- a/kaffeine/src/player-parts/xine-part/positionslider.cpp
+++ b/kaffeine/src/player-parts/xine-part/positionslider.cpp
@@ -26,8 +26,8 @@
 #include "positionslider.moc"
 
 
-PositionSlider::PositionSlider(Qt::Orientation o, TQWidget *tqparent, const char* name) :
-           TQSlider(o, tqparent, name), m_userChange(false)
+PositionSlider::PositionSlider(Qt::Orientation o, TQWidget *parent, const char* name) :
+           TQSlider(o, parent, name), m_userChange(false)
 {
 	connect(this, TQT_SIGNAL(sliderPressed()), this ,TQT_SLOT(slotSliderPressed()));
 	connect(this, TQT_SIGNAL(sliderReleased()), this, TQT_SLOT(slotSliderReleased()));
diff --git a/kaffeine/src/player-parts/xine-part/positionslider.h b/kaffeine/src/player-parts/xine-part/positionslider.h
index 654c716..805b0b3 100644
--- a/kaffeine/src/player-parts/xine-part/positionslider.h
+++ b/kaffeine/src/player-parts/xine-part/positionslider.h
@@ -31,7 +31,7 @@ class PositionSlider : public TQSlider
   TQ_OBJECT
 
  public:
-  PositionSlider(Qt::Orientation, TQWidget * tqparent = 0, const char* name = 0);
+  PositionSlider(Qt::Orientation, TQWidget * parent = 0, const char* name = 0);
   virtual ~PositionSlider();
 
   void setPosition(int, bool);
diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp
index ac6cbdc..a54cdd5 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
+++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
@@ -37,7 +37,7 @@
 #include "postfilter.h"
 
 PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* audioDriver,
-              xine_video_port_t* videoDriver, TQWidget *tqparent) : TQObject(tqparent), m_data(NULL), m_groupBox(NULL)
+              xine_video_port_t* videoDriver, TQWidget *parent) : TQObject(parent), m_data(NULL), m_groupBox(NULL)
 {
   m_filterName = name;
   kdDebug() << "PostFilter: Create Postprocessing Filter: " << m_filterName << endl;
@@ -49,7 +49,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
   {
     xine_post_in_t* inputAPI = NULL;
 
-    m_groupBox = new TQGroupBox(name, tqparent);
+    m_groupBox = new TQGroupBox(name, parent);
     m_groupBox->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
     TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2);
     grid->setMargin( 20 );
@@ -169,7 +169,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
       grid->addWidget(helpButton, row, 1);
     }
 
-    if (tqparent)
+    if (parent)
       m_groupBox->show();
   }
 }
@@ -329,35 +329,35 @@ void PostFilter::setConfig(const TQString &configString)
   }
 }
 
-PostFilterParameterInt::PostFilterParameterInt(const TQString& name, int offset, int value, int min, int max, TQWidget* tqparent)
-  : PostFilterParameter (name, offset, tqparent )
+PostFilterParameterInt::PostFilterParameterInt(const TQString& name, int offset, int value, int min, int max, TQWidget* parent)
+  : PostFilterParameter (name, offset, parent )
 {
-  m_numInput = new KIntNumInput(value, tqparent);
+  m_numInput = new KIntNumInput(value, parent);
   m_numInput->setRange( min, max, 1, false);
   connect(m_numInput, TQT_SIGNAL(valueChanged(int)), this, TQT_SLOT(slotIntValue(int)));
 }
 
-PostFilterParameterDouble::PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* tqparent)
-  : PostFilterParameter (name, offset, tqparent )
+PostFilterParameterDouble::PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* parent)
+  : PostFilterParameter (name, offset, parent )
 {
-  m_numInput = new KDoubleNumInput(tqparent);
+  m_numInput = new KDoubleNumInput(parent);
   m_numInput->setValue(value);
   m_numInput->setRange(min, max, 0.01, false);
   connect(m_numInput, TQT_SIGNAL(valueChanged( double)), this, TQT_SLOT(slotDoubleValue( double)));
 }
 
-PostFilterParameterChar::PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* tqparent)
-  : PostFilterParameter (name, offset, tqparent )
+PostFilterParameterChar::PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent)
+  : PostFilterParameter (name, offset, parent )
 {
-  m_charInput = new KLineEdit(value, tqparent);
+  m_charInput = new KLineEdit(value, parent);
   m_charInput->setMaxLength(size);
   connect(m_charInput, TQT_SIGNAL(returnPressed(const TQString&)), this, TQT_SLOT(slotCharValue(const TQString&)));
 }
 
-PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* tqparent)
-  : PostFilterParameter (name, offset, tqparent)
+PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent)
+  : PostFilterParameter (name, offset, parent)
 {
-  m_comboBox = new KComboBox(tqparent);
+  m_comboBox = new KComboBox(parent);
   for (int i = 0; enums[i]; i++)
   {
     m_comboBox->insertItem(enums[i]);
@@ -366,16 +366,16 @@ PostFilterParameterCombo::PostFilterParameterCombo(const TQString& name, int off
   connect(m_comboBox, TQT_SIGNAL( activated(int)), this, TQT_SLOT( slotIntValue(int)));
 }
 
-PostFilterParameterBool::PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* tqparent)
-  : PostFilterParameter (name, offset, tqparent )
+PostFilterParameterBool::PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent)
+  : PostFilterParameter (name, offset, parent )
 {
-  m_checkBox = new TQCheckBox(tqparent);
+  m_checkBox = new TQCheckBox(parent);
   m_checkBox->setChecked(value);
   connect(m_checkBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotBoolValue( bool)));
 }
 
-PostFilterHelp::PostFilterHelp(TQWidget *tqparent, const char *name, const TQString& text)
- : KDialogBase( tqparent, name, true, TQString(name) + " - " + i18n("Help"), KDialogBase::Close )
+PostFilterHelp::PostFilterHelp(TQWidget *parent, const char *name, const TQString& text)
+ : KDialogBase( parent, name, true, TQString(name) + " - " + i18n("Help"), KDialogBase::Close )
 {
   setInitialSize( TQSize(500,500) );
 
diff --git a/kaffeine/src/player-parts/xine-part/postfilter.h b/kaffeine/src/player-parts/xine-part/postfilter.h
index 50be7ef..5dabb39 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.h
+++ b/kaffeine/src/player-parts/xine-part/postfilter.h
@@ -45,8 +45,8 @@ class PostFilterParameter : public TQObject
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameter(const TQString& name, int offset, TQWidget* tqparent)
-                      : TQObject(tqparent, name.ascii()), m_offset(offset)
+  PostFilterParameter(const TQString& name, int offset, TQWidget* parent)
+                      : TQObject(parent, name.ascii()), m_offset(offset)
   {}
   ~PostFilterParameter() {};
 
@@ -64,7 +64,7 @@ class PostFilterParameterInt : public PostFilterParameter
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameterInt(const TQString& name, int offset, int value, int min, int max, TQWidget* tqparent);
+  PostFilterParameterInt(const TQString& name, int offset, int value, int min, int max, TQWidget* parent);
   ~PostFilterParameterInt() {};
 
   void setValue( const TQString &value )
@@ -89,7 +89,7 @@ class PostFilterParameterDouble : public PostFilterParameter
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* tqparent);
+  PostFilterParameterDouble(const TQString& name, int offset, double value, double min, double max, TQWidget* parent);
   ~PostFilterParameterDouble() {};
 
   void setValue( const TQString &value )
@@ -114,7 +114,7 @@ class PostFilterParameterChar : public PostFilterParameter
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* tqparent);
+  PostFilterParameterChar(const TQString& name, int offset, char *value, int size, TQWidget* parent);
   ~PostFilterParameterChar() {};
 
   void setValue(const TQString &value)
@@ -138,7 +138,7 @@ class PostFilterParameterCombo : public PostFilterParameter
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* tqparent);
+  PostFilterParameterCombo(const TQString& name, int offset, int value, char **enums, TQWidget* parent);
   ~PostFilterParameterCombo() {};
 
   void setValue(const TQString &value) { m_comboBox->setCurrentItem(value); slotIntValue(m_comboBox->currentItem()); }
@@ -161,7 +161,7 @@ class PostFilterParameterBool : public PostFilterParameter
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* tqparent);
+  PostFilterParameterBool(const TQString& name, int offset, bool value, TQWidget* parent);
   ~PostFilterParameterBool() {};
 
   void setValue(const TQString &value)
@@ -186,7 +186,7 @@ class PostFilterHelp : public KDialogBase
   Q_OBJECT
   TQ_OBJECT
 public:
-  PostFilterHelp(TQWidget *tqparent=0, const char *name=0, const TQString& text = TQString());
+  PostFilterHelp(TQWidget *parent=0, const char *name=0, const TQString& text = TQString());
   ~PostFilterHelp();
 
 private:
@@ -200,7 +200,7 @@ class PostFilter : public TQObject
   TQ_OBJECT
 public:
    PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t* audioDriver,
-              xine_video_port_t* videoDriver, TQWidget *tqparent);
+              xine_video_port_t* videoDriver, TQWidget *parent);
   ~PostFilter();
 
   xine_post_in_t* getInput() const;
diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp
index a4b64d1..14e757d 100644
--- a/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp
+++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.cpp
@@ -28,8 +28,8 @@
 #include "screenshotpreview.moc"
 
 
-ScreenshotPreview::ScreenshotPreview(const TQImage& img, TQWidget *tqparent, const char *name )
-  : KPreviewWidgetBase(tqparent,name)
+ScreenshotPreview::ScreenshotPreview(const TQImage& img, TQWidget *parent, const char *name )
+  : KPreviewWidgetBase(parent,name)
 {
   setMinimumWidth(200);
   m_previewImg = img.copy(); /* deep copy */
diff --git a/kaffeine/src/player-parts/xine-part/screenshotpreview.h b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
index 030059a..239e011 100644
--- a/kaffeine/src/player-parts/xine-part/screenshotpreview.h
+++ b/kaffeine/src/player-parts/xine-part/screenshotpreview.h
@@ -35,7 +35,7 @@ class ScreenshotPreview : public KPreviewWidgetBase
    Q_OBJECT
   TQ_OBJECT
 public: 
-  ScreenshotPreview(const TQImage& img, TQWidget *tqparent=0, const char *name=0);
+  ScreenshotPreview(const TQImage& img, TQWidget *parent=0, const char *name=0);
   ~ScreenshotPreview();
 
 public slots:
diff --git a/kaffeine/src/player-parts/xine-part/videosettings.cpp b/kaffeine/src/player-parts/xine-part/videosettings.cpp
index 5768219..955efcf 100644
--- a/kaffeine/src/player-parts/xine-part/videosettings.cpp
+++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp
@@ -31,10 +31,10 @@
 
 
 VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
-        int avOffset, int spuOffset, TQWidget *tqparent, const char *name)
-         : KDialogBase(KDialogBase::Plain, i18n("Video Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, tqparent, name, false)
+        int avOffset, int spuOffset, TQWidget *parent, const char *name)
+         : KDialogBase(KDialogBase::Plain, i18n("Video Settings"), KDialogBase::Default | KDialogBase::Close, KDialogBase::Close, parent, name, false)
 {
-  reparent(tqparent, pos(), false);
+  reparent(parent, pos(), false);
   setInitialSize(TQSize(450,250), true);
   TQWidget* page = plainPage();
 
diff --git a/kaffeine/src/player-parts/xine-part/videosettings.h b/kaffeine/src/player-parts/xine-part/videosettings.h
index 2eff45a..12d367e 100644
--- a/kaffeine/src/player-parts/xine-part/videosettings.h
+++ b/kaffeine/src/player-parts/xine-part/videosettings.h
@@ -37,7 +37,7 @@ class VideoSettings : public KDialogBase
    
 public: 
   VideoSettings(int hue, int sat, int contrast, int bright, int avOffset,
-                int spuOffset, TQWidget *tqparent=0, const char *name=0);
+                int spuOffset, TQWidget *parent=0, const char *name=0);
  ~VideoSettings();
 
 signals:
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
index 2dcabd0..9991f1c 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -66,9 +66,9 @@ typedef KParts::GenericFactory<XinePart> XinePartFactory;
 K_EXPORT_COMPONENT_FACTORY (libxinepart, XinePartFactory)
 
 
-XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* tqparent, const char* name, const TQStringList& args)
+XinePart::XinePart(TQWidget* parentWidget, const char* widgetName, TQObject* parent, const char* name, const TQStringList& args)
 		: DCOPObject("XinePartIface"),
-		KaffeinePart(tqparent, name ? name : "XinePart"),
+		KaffeinePart(parent, name ? name : "XinePart"),
 		m_current(0), m_xine(NULL), m_pictureSettings(NULL), m_deinterlacerConfigWidget(NULL),
 		m_filterDialog(NULL), m_embeddedContext(NULL)
 {
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
index f91e7e6..277a850 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -51,7 +51,7 @@
 
 #define NON_EXPERT_OPTIONS NON_EXPERT_OPTIONS_NEW NON_EXPERT_OPTIONS_DEPRECATED
 
-XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry) :
+XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry) :
 		m_valueChanged(false), m_key(TQString(entry->key)), m_numValue(entry->num_value),
 		m_numDefault(entry->num_default), m_stringValue(entry->str_value), m_stringDefault(entry->str_default),
 		m_stringEdit(NULL), m_enumEdit(NULL), m_numEdit(NULL), m_boolEdit(NULL)
@@ -62,7 +62,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 		break;
 		case XINE_CONFIG_TYPE_STRING:
 		{
-			m_stringEdit = new KLineEdit(entry->str_value, tqparent);
+			m_stringEdit = new KLineEdit(entry->str_value, parent);
 			if (!strcmp(entry->str_value,entry->str_default))
 				m_stringEdit->setPaletteForegroundColor(TQColor(darkMagenta));
 			else
@@ -73,7 +73,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 		}
 		case XINE_CONFIG_TYPE_ENUM:
 		{
-			m_enumEdit = new KComboBox(tqparent);
+			m_enumEdit = new KComboBox(parent);
 			int i = 0;
 			while (entry->enum_values[i])
 			{
@@ -91,7 +91,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 		}
 		case XINE_CONFIG_TYPE_NUM:
 		{
-			m_numEdit = new TQSpinBox(-999999, 999999, 1, tqparent);
+			m_numEdit = new TQSpinBox(-999999, 999999, 1, parent);
 			m_numEdit->setValue(entry->num_value);
 			if (entry->num_value == entry->num_default)
 				m_numEdit->setPaletteForegroundColor(TQColor(darkMagenta));
@@ -103,7 +103,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 		}
 		case XINE_CONFIG_TYPE_RANGE:
 		{
-			m_numEdit = new TQSpinBox(tqparent);
+			m_numEdit = new TQSpinBox(parent);
 			m_numEdit->setValue(entry->num_value);
 			m_numEdit->setRange(entry->range_min, entry->range_max);
 			if (entry->num_value == entry->num_default)
@@ -116,7 +116,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 		}
 		case XINE_CONFIG_TYPE_BOOL:
 		{
-			m_boolEdit = new TQCheckBox(tqparent);
+			m_boolEdit = new TQCheckBox(parent);
 			m_boolEdit->setChecked(entry->num_value);
 			if (entry->num_value == entry->num_default)
 				m_boolEdit->setPaletteForegroundColor(TQColor(darkMagenta));
@@ -131,11 +131,11 @@ XineConfigEntry::XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row
 	TQString m_keyName(entry->key);
 	m_keyName.remove( 0, m_keyName.find(".") + 1 );
 
-	TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), tqparent);
+	TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent);
 	description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
 	grid->addWidget(description, row, 1);
 
-	KSeparator* separator = new KSeparator(Qt::Horizontal, tqparent);
+	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
 	grid->addMultiCellWidget(separator, row+1, row+1, 0, 1);
 }
 
@@ -298,16 +298,16 @@ XineConfig::~XineConfig()
 	kdDebug() << "XineConfig: destructed" << endl;
 }
 
-void XineConfig::createPage(const TQString& cat, bool expert, TQWidget* tqparent)
+void XineConfig::createPage(const TQString& cat, bool expert, TQWidget* parent)
 {
 	xine_cfg_entry_t* ent;
 
-	TQScrollView* sv = new TQScrollView(tqparent);
+	TQScrollView* sv = new TQScrollView(parent);
 	sv->setResizePolicy(TQScrollView::AutoOneFit);
-	tqparent = new TQWidget(sv->viewport());
-	sv->addChild(tqparent);
+	parent = new TQWidget(sv->viewport());
+	sv->addChild(parent);
 
-	TQGridLayout* grid = new TQGridLayout(tqparent, 20 ,2);
+	TQGridLayout* grid = new TQGridLayout(parent, 20 ,2);
 	grid->setColStretch(1,8);
 	grid->setSpacing(10);
 	grid->setMargin(10);
@@ -328,7 +328,7 @@ void XineConfig::createPage(const TQString& cat, bool expert, TQWidget* tqparent
 			if (((!expert) && (TQString(NON_EXPERT_OPTIONS).contains(ent->key))) ||
 			        ((expert) && (!TQString(NON_EXPERT_OPTIONS).contains(ent->key))))
 			{
-				m_entries.append(new XineConfigEntry(tqparent, grid, row, ent));
+				m_entries.append(new XineConfigEntry(parent, grid, row, ent));
 				delete ent;
 				ent = new xine_cfg_entry_t;
 				row += 2;
diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.h b/kaffeine/src/player-parts/xine-part/xineconfig.h
index 65d019a..f6e1487 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.h
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.h
@@ -42,7 +42,7 @@ class XineConfigEntry : public TQHBox
 	Q_OBJECT
   TQ_OBJECT
 public:
-	XineConfigEntry(TQWidget* tqparent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry);
+	XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row, xine_cfg_entry_t* entry);
 	~XineConfigEntry();
 
 	bool valueChanged() const;  /* was the value changed by user? */
@@ -87,7 +87,7 @@ private slots:
 	void slotApplyPressed();
 
 private:
-	void createPage(const TQString& cat, bool expert, TQWidget* tqparent);
+	void createPage(const TQString& cat, bool expert, TQWidget* parent);
 	const TQStringList getCategories();
 
 private:
diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
index 038522c..20a5941 100644
--- a/kaffeine/src/startwindow.cpp
+++ b/kaffeine/src/startwindow.cpp
@@ -40,7 +40,7 @@
 
 
 
-MToolButton::MToolButton( TQWidget *tqparent, const TQString& targ ) : TQToolButton( tqparent )
+MToolButton::MToolButton( TQWidget *parent, const TQString& targ ) : TQToolButton( parent )
 {
 	target = targ;
 	connect( this, TQT_SIGNAL(clicked()), TQT_SLOT(mClicked()) );
@@ -57,7 +57,7 @@ void MToolButton::mClicked()
 
 
 
-SLabel::SLabel( TQWidget *tqparent ) : TQLabel( tqparent )
+SLabel::SLabel( TQWidget *parent ) : TQLabel( parent )
 {
 }
 
@@ -77,7 +77,7 @@ void SLabel::paintEvent( TQPaintEvent *pe )
 
 
 
-StartWindow::StartWindow(TQWidget* tqparent, const char* name) : TQWidget(tqparent, name)
+StartWindow::StartWindow(TQWidget* parent, const char* name) : TQWidget(parent, name)
 {
 	TQVBoxLayout* mainLayout = new TQVBoxLayout(this);
 	mainLayout->setAutoAdd(true);
diff --git a/kaffeine/src/startwindow.h b/kaffeine/src/startwindow.h
index 76b35ee..f470b3c 100644
--- a/kaffeine/src/startwindow.h
+++ b/kaffeine/src/startwindow.h
@@ -37,7 +37,7 @@ class MToolButton : public TQToolButton
   TQ_OBJECT
 
 public:
-	MToolButton( TQWidget *tqparent, const TQString& targ );
+	MToolButton( TQWidget *parent, const TQString& targ );
 	~MToolButton();
 
 	TQString target;
@@ -57,7 +57,7 @@ class SLabel : public TQLabel
   TQ_OBJECT
 
 public:
-	SLabel( TQWidget *tqparent );
+	SLabel( TQWidget *parent );
 	~SLabel() {}
 
 protected:
@@ -72,7 +72,7 @@ class StartWindow : public TQWidget
   TQ_OBJECT
 
 public:
-	StartWindow( TQWidget *tqparent = 0, const char *name = 0 );
+	StartWindow( TQWidget *parent = 0, const char *name = 0 );
 	virtual ~StartWindow();
 
 	void registerTarget( const TQString& uiName, const TQString& pixName, const TQString& targetName );
diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
index 1485eed..79028aa 100644
--- a/kaffeine/src/systemtray.cpp
+++ b/kaffeine/src/systemtray.cpp
@@ -52,7 +52,7 @@ protected:
 	}
 };
 
-SystemTray::SystemTray(TQWidget *tqparent, const char *name ) : KSystemTray(tqparent,name)
+SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent,name)
 {
 	kdDebug() << "SystemTray: Create System Tray" << endl;
 
diff --git a/kaffeine/src/systemtray.h b/kaffeine/src/systemtray.h
index 27bfc39..5787fd4 100644
--- a/kaffeine/src/systemtray.h
+++ b/kaffeine/src/systemtray.h
@@ -41,7 +41,7 @@ class SystemTray : public KSystemTray  {
    Q_OBJECT
   TQ_OBJECT
 public: 
-  SystemTray(TQWidget *tqparent = 0, const char *name = 0);
+  SystemTray(TQWidget *parent = 0, const char *name = 0);
   virtual ~SystemTray();
   
   void showTitle(const TQString&, uint secs = 5);
author	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
committer	tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>	2011-08-10 22:19:39 +0000
commit	585ba225bf48a286fd6ce8f40384d0a0b4283375 (patch)
tree	3021c14d7ecc0fcc62dd16f2d58b15c7be5fe7e3
parent	f2418d2c076f47e5552bd365e14bc705fa449545 (diff)
download	kaffeine-585ba225.tar.gz kaffeine-585ba225.zip