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

49 files changed, 114 insertions, 114 deletions

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.