RHEL/Fedora: updates kaffeine

8 files changed, 3639 insertions, 112 deletions

diff --git a/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff b/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
deleted file mode 100644
index 111f11b9c..000000000
--- a/redhat/applications/kaffeine/1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-commit fd68e4c4940afb4529b16e2c3e3d0f379ac7b161
-Author: Darrell Anderson <humanreadable@yahoo.com>
-Date:   1331343133 -0600
-
-    Fix nominal "tqt" typos and fix slow DVB start.
-    This closes bug reports 729 and 899.
-
-diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-index 96752aa..32c8817 100644
---- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
-+++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
-@@ -232,7 +232,7 @@ void VideoWindow::correctByAspectRatio( TQSize& frame )
- 		case FOURBYTHREE: factor = 4.0 / 3.0; break;
- 		case ANAMORPHIC: factor = 16.0 / 9.0; break;
- 		case DVB:	factor = 2.11; break;
--		case STQUARE: factor = 1.0; break;
-+		case SQUARE: factor = 1.0; break;
- 	}
- 
- 	float frameAspect = (float)frame.width() / (float)frame.height();
-@@ -291,7 +291,7 @@ void VideoWindow::slotAspectRatioDVB()
- 
- void VideoWindow::slotAspectRatioSquare()
- {
--	m_aspectRatio = STQUARE;
-+	m_aspectRatio = SQUARE;
- 	TQSize frame = getFrameSize();
- 	correctByAspectRatio( frame );
- 	emit signalNewFrameSize( frame );
-diff --git a/kaffeine/src/player-parts/gstreamer-part/video.h b/kaffeine/src/player-parts/gstreamer-part/video.h
-index c4d9f74..f7c5180 100644
---- a/kaffeine/src/player-parts/gstreamer-part/video.h
-+++ b/kaffeine/src/player-parts/gstreamer-part/video.h
-@@ -47,7 +47,7 @@ public:
- 		FOURBYTHREE,
- 		ANAMORPHIC,
- 		DVB,
--		STQUARE
-+		SQUARE
- 	};
- 
- 	void newState();
-diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.h b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-index edc2fa9..6987de3 100644
---- a/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.h
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#ifndef DEINTERLACETQUALITY_H
--#define DEINTERLACETQUALITY_H
-+#ifndef DEINTERLACEQUALITY_H
-+#define DEINTERLACEQUALITY_H
- 
- #include <kdialogbase.h>
- 
-@@ -77,4 +77,4 @@ private:
-   KPushButton* m_customConfigButton;
- };
- 
--#endif /* DEINTERLACETQUALITY_H */
-+#endif /* DEINTERLACEQUALITY_H */
-diff --git a/kaffeine/src/player-parts/xine-part/equalizer.h b/kaffeine/src/player-parts/xine-part/equalizer.h
-index 7d43ec0..2e81096 100644
---- a/kaffeine/src/player-parts/xine-part/equalizer.h
-+++ b/kaffeine/src/player-parts/xine-part/equalizer.h
-@@ -18,8 +18,8 @@
-  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
-  */
- 
--#ifndef ETQUALIZER_H
--#define ETQUALIZER_H
-+#ifndef EQUALIZER_H
-+#define EQUALIZER_H
- 
- #include <kdialogbase.h>
- #include <kconfig.h>
-@@ -77,4 +77,4 @@ private:
-   TQSlider* eq16kSlider;
- };
- 
--#endif /* ETQUALIZER_H */
-+#endif /* EQUALIZER_H */
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch
new file mode 100644
index 000000000..175998916
--- /dev/null
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_localization_files.patch
@@ -0,0 +1,28 @@
+diff -aruN kaffeine-trinity-3.5.13.orig/admin/am_edit kaffeine-trinity-3.5.13/admin/am_edit
+--- kaffeine-trinity-3.5.13.orig/admin/am_edit	2011-05-28 07:48:53.000000000 +0200
++++ kaffeine-trinity-3.5.13/admin/am_edit	2012-02-26 19:05:36.000000000 +0100
+@@ -1643,6 +1643,10 @@
+ 
+   $target_adds{"install-data-am"} .= "install-nls ";
+ 
++  if (!$lang) {
++    $tmp = "PACKAGE_BASE=`echo \"\$(PACKAGE)\" | sed \"s|-trinity-.*||\"`\n";
++    appendLines ($tmp);
++  }
+   $tmp = "install-nls:\n";
+   if ($lang) {
+     $tmp  .= "\t\$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES\n";
+@@ -1661,10 +1665,10 @@
+     $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/$lang/LC_MESSAGES/\$\$base.mo ;\\\n";
+     $tmp .= "\t  fi ;\\\n";
+   } else {
+-    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
++    $tmp .= "\t  echo \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
+     $tmp .= "\t  \$(mkinstalldirs) \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES ; \\\n";
+-    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
+-    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE).mo ;\\\n";
++    $tmp .= "\t  if test -f \$\$base.gmo; then \$(INSTALL_DATA) \$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
++    $tmp .= "\t  elif test -f \$(srcdir)/\$\$base.gmo; then \$(INSTALL_DATA) \$(srcdir)/\$\$base.gmo \$(DESTDIR)\$(kde_locale)/\$\$base/LC_MESSAGES/\$(PACKAGE_BASE).mo ;\\\n";
+     $tmp .= "\t  fi ;\\\n";
+   }
+   $tmp .= "\tdone\n\n";
diff --git a/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
index 07d58235a..07d58235a 100644
--- a/redhat/applications/kaffeine/1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_temporary_location.patch
diff --git a/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
index fd5d6aea0..144e4bb1c 100644
--- a/redhat/applications/kaffeine/1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-fix_typos_branding_tqt.patch
@@ -41,6 +41,49 @@ index 2b1d2e7..57b9254 100644
   * @return 0 on success, -1 on failure.
   */
  typedef int (*en50221_app_auth_request_callback) (void *arg,
+diff --git a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
+index b5b85f1..ce6ef42 100644
+--- a/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
++++ b/kaffeine/src/input/dvb/lib/libdvben50221/en50221_app_teletext.h
+@@ -42,7 +42,7 @@ extern "C" {
+  * @param slot_id Slot id concerned.
+  * @param session_number Session number concerned.
+  * @param teletext_data Data for the request.
+- * @param teletext_data_lenghth Number of bytes.
++ * @param teletext_data_length Number of bytes.
+  * @return 0 on success, -1 on failure.
+  */
+ typedef int (*en50221_app_teletext_callback) (void *arg,
+diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
+index 2294956..6679b97 100644
+--- a/kaffeine/src/kaffeine.cpp
++++ b/kaffeine/src/kaffeine.cpp
+@@ -238,13 +238,13 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
+ 	}
+ #endif
+ 
+-	/** KWin are you there? **/
++	/** TWin are you there? **/
+ 
+ 	m_haveKWin = KApplication::dcopClient()->isApplicationRegistered("twin");
+ 	if (m_haveKWin)
+-		kdDebug() << "Window manager: KWin found" << endl;
++		kdDebug() << "Window manager: TWin found" << endl;
+ 	else
+-		kdDebug() << "Window manager: not KWin - using save fullscreen mode" << endl;
++		kdDebug() << "Window manager: not TWin - using save fullscreen mode" << endl;
+ 
+ 	connect(&m_screensaverTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotFakeKeyEvent()));
+ 	m_screensaverTimer.start( 55000 );
+@@ -1261,7 +1261,7 @@ void Kaffeine::mouseDoubleClickEvent(TQMouseEvent*)
+ void Kaffeine::mousePressEvent(TQMouseEvent* mev)
+ {
+ 	kdDebug() << "Kaffeine: Mouse press event" << endl;
+-	if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == Qt::MidButton) ) {
++	if ( m_minimal->isChecked() && !m_fullscreen->isChecked() && (mev->button() == MidButton) ) {
+ 		if (topDock()->isVisible()) {
+ 			hideToolbars(true);
+ 			//menuBar()->hide;
 diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
 index 8d85e01..e8148a7 100644
 --- a/kaffeine/src/kmultitabbar.cpp
@@ -83,11 +126,11 @@ index 8d85e01..e8148a7 100644
  	m_btnTabSep->setFixedHeight(4);
 diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
 index 72fa884..2932cc2 100644
---- kaffeine/kaffeine/src/kmultitabbar.h.orig	2011-08-17 23:23:42.000000000 +0200
-+++ kaffeine/kaffeine/src/kmultitabbar.h	2012-04-25 23:51:09.339505891 +0200
-@@ -55,16 +55,16 @@
+--- a/kaffeine/src/kmultitabbar.h
++++ b/kaffeine/src/kmultitabbar.h
+@@ -55,16 +55,16 @@ class /*KUTILS_EXPORT*/ KMultiTabBar: public TQWidget
  	Q_OBJECT
-   TQ_OBJECT
+   
  public:
 -	enum KMultiTabBarMode{Horizontal,Vertical};
 +	enum KMultiTabBarMode{Horizontal, Vertical};
@@ -111,28 +154,28 @@ index ccb56f3..b7e88c7 100644
 +++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
 @@ -54,7 +54,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
  	label = new TQLabel(i18n("Prefered audio driver"), frame);
- 	tqlayout->addWidget(label, 1, 0);
- 	tqlayout->addWidget(m_audioDriverBox, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
+ 	layout->addWidget(label, 1, 0);
+ 	layout->addWidget(m_audioDriverBox, 1, 1);
+-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
++	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
  
  	//Video Page
  	frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
 @@ -67,7 +67,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
  	label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
- 	tqlayout->addWidget(label, 1, 0);
- 	tqlayout->addWidget(m_videoDriverBox, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
- 	tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
+ 	layout->addWidget(label, 1, 0);
+ 	layout->addWidget(m_videoDriverBox, 1, 1);
+-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
++	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
+ 	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
  
  	//Media page
 @@ -80,7 +80,7 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
  	label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
- 	tqlayout->addWidget(label, 1, 0);
- 	tqlayout->addWidget(m_driveEdit, 1, 1);
--	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-+	tqlayout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
+ 	layout->addWidget(label, 1, 0);
+ 	layout->addWidget(m_driveEdit, 1, 1);
+-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
++	layout->addMultiCellWidget(new KSeparator(KSeparator::Horizontal, frame), 2, 2, 0, 1);
  }
  
  GStreamerConfig::~GStreamerConfig()
@@ -214,10 +257,10 @@ index 98ff969..9fc18e6 100644
  		if (TQApplication::reverseLayout())
 diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
 index 6d6a2d4..1281911 100644
---- kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp.orig	2011-08-17 23:23:40.000000000 +0200
-+++ kaffeine/kaffeine/src/player-parts/xine-part/xineconfig.cpp	2012-04-25 23:53:25.094399051 +0200
-@@ -135,7 +135,7 @@
- 	description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+@@ -135,7 +135,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
+ 	description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
  	grid->addWidget(description, row, 1);
  
 -	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch
new file mode 100644
index 000000000..ace85881f
--- /dev/null
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-remove_additional_tq_conversions.patch
@@ -0,0 +1,1403 @@
+commit 701a124908ec0072b12cd3884589a86431f36080
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1324316159 -0600
+
+    Remove additional unneeded tq method conversions
+
+diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+index c74317d..0e76b88 100644
+--- a/kaffeine/src/input/audiobrowser/googlefetcher.cpp
++++ b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
+@@ -108,7 +108,7 @@ void GoogleFetcher::slotLoadImageURLs(GoogleFetcher::ImageSize size)
+ 
+     kdDebug() << "Performing Google Search: " << url << endl;
+ 
+-    search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) );
++    search.load(url.url()+TQString("&start=%1&sa=N").arg(galleryPage*20) );
+ 
+     TQString text = search.toString().string();
+ 
+diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+index 5bb169e..ccfea35 100644
+--- a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
++++ b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
+@@ -87,9 +87,9 @@ GoogleFetcherDialog::~GoogleFetcherDialog()
+ void GoogleFetcherDialog::setLayout()
+ {
+     setCaption(TQString("%1 - %2 (%3)")
+-              .tqarg(m_artist)
+-              .tqarg(m_album)
+-              .tqarg(m_imageList.size()));
++              .arg(m_artist)
++              .arg(m_album)
++              .arg(m_imageList.size()));
+ 
+     m_iconWidget->clear();
+     for(uint i = 0; i < m_imageList.size(); i++)
+@@ -237,7 +237,7 @@ CoverIconViewItem::~CoverIconViewItem()
+ void CoverIconViewItem::imageData(KIO::Job *, const TQByteArray &data)
+ {
+     int currentSize = m_buffer.size();
+-    m_buffer.tqresize(currentSize + data.size(), TQGArray::SpeedOptim);
++    m_buffer.resize(currentSize + data.size(), TQGArray::SpeedOptim);
+     memcpy(&(m_buffer.data()[currentSize]), data.data(), data.size());
+ }
+ 
+diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
+index 3735b61..e67603e 100644
+--- a/kaffeine/src/input/audiobrowser/playlist.cpp
++++ b/kaffeine/src/input/audiobrowser/playlist.cpp
+@@ -1774,14 +1774,14 @@ void PlayList::updateStatus()
+ 		TQValueList<MRL>::ConstIterator end(m_queue.end());
+ 		for (TQValueList<MRL>::ConstIterator it = m_queue.begin(); it != end; ++it)
+ 			total = total.addSecs(TQTime().secsTo((*it).length()));
+-		status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss"));
++		status = i18n("Queue: %1 Entries, Playtime: %2").arg(m_queue.count()).arg(total.toString("h:mm:ss"));
+ 	}
+ 	else
+ 	{
+-		//status = i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible)).tqarg(TQString::number(m_list->childCount())).tqarg(msToTimeString(m_playTime));
++		//status = i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible)).arg(TQString::number(m_list->childCount())).arg(msToTimeString(m_playTime));
+ 
+ 
+-		status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(msToTimeString(m_playTimeVisible));
++		status = i18n("Entries: %1, Playtime: %2").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible));
+ 	}
+ 	emit statusBarMessage(status);
+ }
+@@ -1886,7 +1886,7 @@ void PlayList::saveCurrentPlaylist()
+ 
+ void PlayList::removeCurrentPlaylist()
+ {
+-	int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
++	int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
+ 	if (code == KMessageBox::Continue)
+ 	{
+ 		TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
+diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp
+index 9581651..231e008 100644
+--- a/kaffeine/src/input/disc/cddb.cpp
++++ b/kaffeine/src/input/disc/cddb.cpp
+@@ -302,7 +302,7 @@ bool CDDB::parse_read_resp(TQTextStream *stream, TQTextStream *write_stream)
+   for (int i = 0; i < m_tracks; i++)
+     {
+       if (m_names[i].isEmpty())
+-        m_names[i] += i18n("Track %1").tqarg(i);
++        m_names[i] += i18n("Track %1").arg(i);
+       m_names[i].replace(TQRegExp("/"), "%2f");
+       kdDebug(7101) << "CDDB: found Track " << i+1 << ": `" << m_names[i]
+         << "'" << endl;
+@@ -328,7 +328,7 @@ bool CDDB::searchLocal(unsigned int id, TQFile *ret_file)
+ {
+   TQDir dir;
+   TQString filename;
+-  filename = TQString("%1").tqarg(id, 0, 16).rightJustify(8, '0');
++  filename = TQString("%1").arg(id, 0, 16).rightJustify(8, '0');
+   TQStringList::ConstIterator it;
+   for (it = cddb_dirs.begin(); it != cddb_dirs.end(); ++it)
+     {
+diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
+index e392dca..31bba0c 100644
+--- a/kaffeine/src/input/disc/disc.cpp
++++ b/kaffeine/src/input/disc/disc.cpp
+@@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it )
+ 	if ( !it )
+ 		return;
+ 
+-	MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++	MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 	mrl.setTitle( it->text(1) );
+ 	mrl.setArtist( artistLab->text() );
+ 	mrl.setAlbum( albumLab->text() );
+@@ -465,7 +465,7 @@ void Disc::startCD( const TQString &device, bool rip )
+ 			for ( i=0; i<para->getTracks(); i++ ) {
+ 				it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
+ 				if ( i==0 ) {
+-					mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
++					mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
+ 					mrl.setTitle( cddb->track(i) );
+ 					mrl.setArtist( artistLab->text() );
+ 					mrl.setAlbum( albumLab->text() );
+@@ -481,7 +481,7 @@ void Disc::startCD( const TQString &device, bool rip )
+ 				for ( i=0; i<para->getTracks(); i++ ) {
+ 					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), cddb->track( i ), para->trackTime(i) );
+ 					if ( i==0 ) {
+-						mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
++						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
+ 						mrl.setTitle( cddb->track(i) );
+ 						mrl.setArtist( artistLab->text() );
+ 						mrl.setAlbum( albumLab->text() );
+@@ -495,7 +495,7 @@ void Disc::startCD( const TQString &device, bool rip )
+ 				for ( i=0; i<para->getTracks(); i++ ) {
+ 					it = new KListViewItem( list, TQString().sprintf("%02d", i+1), i18n("Track")+TQString().sprintf("%02d", i+1), para->trackTime(i) );
+ 					if ( i==0 ) {
+-						mrl.setURL( TQString("cdda://%1/1").tqarg( currentDevice ) );
++						mrl.setURL( TQString("cdda://%1/1").arg( currentDevice ) );
+ 						mrl.setTitle( i18n("Track")+TQString().sprintf("%02d", i+1) );
+ 						mrl.setArtist( artistLab->text() );
+ 						mrl.setAlbum( albumLab->text() );
+@@ -531,7 +531,7 @@ void Disc::startDVD( const TQString &device )
+ 	bool ok=false;
+ 
+ 	if ( !device.isEmpty() )
+-		mrl.setURL( TQString("dvd://%1").tqarg(device) );
++		mrl.setURL( TQString("dvd://%1").arg(device) );
+ 	else {
+ 		DCOPRef mediamanager("kded","mediamanager");
+ 		DCOPReply reply = mediamanager.call("fullList()");
+@@ -555,12 +555,12 @@ void Disc::startDVD( const TQString &device )
+ 				TQString choice = KInputDialog::getItem( i18n("DVD Video"), i18n("Several DVD Video found. Choose one:"),
+ 					devList, 0, false, &ok );
+ 				if ( ok )
+-					mrl.setURL( TQString("dvd://%1").tqarg(choice) );
++					mrl.setURL( TQString("dvd://%1").arg(choice) );
+ 				else
+ 					return;
+ 			}
+ 			else if ( devList.count()==1 )
+-				mrl.setURL( TQString("dvd://%1").tqarg(devList[0]) );
++				mrl.setURL( TQString("dvd://%1").arg(devList[0]) );
+ 			else {
+ 				//KMessageBox::information( 0, i18n("No DVD Video found."), i18n("Warning") );
+ 				//return;
+@@ -591,7 +591,7 @@ void Disc::startVCD( const TQString &device )
+ 	bool ok=false;
+ 
+ 	if ( !device.isEmpty() )
+-		mrl.setURL( TQString("vcd://%1").tqarg(device) );
++		mrl.setURL( TQString("vcd://%1").arg(device) );
+ 	else {
+ 		DCOPRef mediamanager("kded","mediamanager");
+ 		DCOPReply reply = mediamanager.call("fullList()");
+@@ -609,12 +609,12 @@ void Disc::startVCD( const TQString &device )
+ 				TQString choice = KInputDialog::getItem( i18n("VCD-SVCD"), i18n("Several (S)VCD found. Choose one:"),
+ 					devList, 0, false, &ok );
+ 				if ( ok )
+-					mrl.setURL( TQString("vcd://%1").tqarg(choice) );
++					mrl.setURL( TQString("vcd://%1").arg(choice) );
+ 				else
+ 					return;
+ 			}
+ 			else if ( devList.count()==1 )
+-				mrl.setURL( TQString("vcd://%1").tqarg(devList[0]) );
++				mrl.setURL( TQString("vcd://%1").arg(devList[0]) );
+ 			else {
+ 				//KMessageBox::information( 0, i18n("No (S)VCD found."), i18n("Warning") );
+ 				//return;
+@@ -649,7 +649,7 @@ bool Disc::currentTrack( MRL &mrl )
+ 		return false;
+ 	while ( it!=0 ) {
+ 		if ( it->text(0).toInt()==trackCurrent ) {
+-			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 			mrl.setTitle( it->text(1) );
+ 			mrl.setArtist( artistLab->text() );
+ 			mrl.setAlbum( albumLab->text() );
+@@ -681,7 +681,7 @@ bool Disc::nextTrack( MRL &mrl )
+ 		return false;
+ 	while ( it!=0 ) {
+ 		if ( it->text(0).toInt()==trackCurrent+1 ) {
+-			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 			mrl.setTitle( it->text(1) );
+ 			mrl.setArtist( artistLab->text() );
+ 			mrl.setAlbum( albumLab->text() );
+@@ -695,7 +695,7 @@ bool Disc::nextTrack( MRL &mrl )
+ 	}
+ 
+ 	it = list->firstChild();
+-	mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++	mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 	mrl.setTitle( it->text(1) );
+ 	mrl.setArtist( artistLab->text() );
+ 	mrl.setAlbum( albumLab->text() );
+@@ -718,7 +718,7 @@ bool Disc::previousTrack( MRL &mrl )
+ 		return false;
+ 	while ( it!=0 ) {
+ 		if ( it->text(0).toInt()==trackCurrent-1 ) {
+-			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 			mrl.setTitle( it->text(1) );
+ 			mrl.setArtist( artistLab->text() );
+ 			mrl.setAlbum( albumLab->text() );
+@@ -746,7 +746,7 @@ bool Disc::trackNumber( int number, MRL &mrl )
+ 		return false;
+ 	while ( it!=0 ) {
+ 		if ( it->text(0).toInt()==number ) {
+-			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( it->text(0).toInt() ) );
++			mrl.setURL( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+ 			mrl.setTitle( it->text(1) );
+ 			mrl.setArtist( artistLab->text() );
+ 			mrl.setAlbum( albumLab->text() );
+diff --git a/kaffeine/src/input/disc/paranoia.cpp b/kaffeine/src/input/disc/paranoia.cpp
+index 03f39fa..36b052a 100644
+--- a/kaffeine/src/input/disc/paranoia.cpp
++++ b/kaffeine/src/input/disc/paranoia.cpp
+@@ -288,14 +288,14 @@ bool Paranoia::loadEncoder( TQWidget *parent )
+ 
+ 	KService::Ptr service = KService::serviceByDesktopName( encoderDesktop );
+ 	if (!service) {
+-		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
++		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(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( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
++			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
+ 			return false;
+ 		}
+ 		else
+diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp
+index b430b38..41e9895 100644
+--- a/kaffeine/src/input/dvb/dvbcam.cpp
++++ b/kaffeine/src/input/dvb/dvbcam.cpp
+@@ -79,7 +79,7 @@ int DvbCam::probe( int adapter, int ca_device )
+ 	int fdCa;
+ 	ca_caps_t cap;
+ 	ca_slot_info_t info;
+-	TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( ca_device );
++	TQString s = TQString("/dev/dvb/adapter%1/ca%2").arg( adapter ).arg( ca_device );
+ 
+ 	if ( (fdCa = open( s.ascii(), O_RDWR )) < 0) {
+ 		fprintf(stderr, "DvbCam::probe(): %s:", s.ascii());
+@@ -413,11 +413,11 @@ int DvbCam::aiCallback(void *arg, uint8_t slot_id, uint16_t session_number, uint
+ 	(void)session_number;
+ 
+ 	fprintf(stderr, "CAM Application type: %02x\n", application_type);
+-	std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) );
++	std->dvbcam->setAppType( TQString("0x%1").arg(application_type, 0, 16 ) );
+ 	fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer);
+-	std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) );
++	std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) );
+ 	fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code);
+-	std->dvbcam->setManuCode( TQString("0x%1").tqarg(manufacturer_code, 0, 16 ) );
++	std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) );
+ 	fprintf(stderr, "CAM Menu string: %.*s\n", menu_string_length, menu_string);
+ 	TQString s = (const char*)menu_string;
+ 	s.truncate( menu_string_length );
+@@ -531,7 +531,7 @@ int DvbCam::mmi_menu_callback(void *arg, uint8_t slot_id, uint16_t session_numbe
+ 		fprintf(stderr, "%i. %.*s\n", i+1, items[i].text_length, items[i].text);
+ 		s = (const char*)items[i].text;
+ 		s.truncate( items[i].text_length );
+-		std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) );
++		std->menuList.append( TQString("%1. %2").arg(i+1).arg(s) );
+ 
+ 	}
+ 
+diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
+index c920090..5f9e228 100644
+--- a/kaffeine/src/input/dvb/dvbconfig.cpp
++++ b/kaffeine/src/input/dvb/dvbconfig.cpp
+@@ -187,10 +187,10 @@ bool DVBconfig::haveDvbDevice()
+ 		d.setPath( "/dev/dvb/"+list[i]+"/" );
+ 		flist = d.entryList( "frontend*", TQDir::System, TQDir::Name );
+ 		for ( j=0; j<(int)flist.count(); j++ ) {
+-			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( flist[j] ).ascii(), O_RDWR);
++			fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR);
+ 			if ( fdFrontend>0 ) {
+ 				if ( (res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) )
+-					perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( flist[j] ).ascii() );
++					perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").arg( list[i] ).arg( flist[j] ).ascii() );
+ 				else {
+ 					close( fdFrontend );
+ 					return true;
+@@ -229,7 +229,7 @@ void DVBconfig::startup()
+ 			if ( !probeMfe && t!="frontend0" )
+ 				continue;
+ 			t1 = TQTime::currentTime();
+-			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( t ).ascii(), O_RDWR);
++			fdFrontend = open( TQString("/dev/dvb/%1/%2").arg( s ).arg( t ).ascii(), O_RDWR);
+ 			if ( fdFrontend>0 ) {
+ 				if ( !(res = ioctl( fdFrontend, FE_GET_INFO, &info ) < 0) ) {
+ 					if ( (info.type==FE_OFDM)
+@@ -247,7 +247,7 @@ void DVBconfig::startup()
+ 				close( fdFrontend );
+ 			}
+ 			else {
+-				perror( TQString("/dev/dvb/%1/%2  %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -EBUSY ).ascii() );
++				perror( TQString("/dev/dvb/%1/%2  %3/%4").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() );
+ 			}
+ 		}
+ 	}
+@@ -450,30 +450,30 @@ void DVBconfig::readConfig()
+ 		shiftDir+= "/";
+ 	filenameFormat = config->readEntry( "filenameFormat", "%name" );
+ 	for ( i=0; i<(int)devList.count(); i++ ) {
+-		devList.at(i)->source = config->readEntry( TQString("DVB%1").tqarg(i), "" );
+-		devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").tqarg(i), 1500 );
+-		devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").tqarg(i), 1 );
+-		devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").tqarg(i), 10 );
++		devList.at(i)->source = config->readEntry( TQString("DVB%1").arg(i), "" );
++		devList.at(i)->tuningTimeout = config->readNumEntry( TQString("DVB%1_TIMEOUT").arg(i), 1500 );
++		devList.at(i)->camMaxService = config->readNumEntry( TQString("DVB%1_CAM_MAX").arg(i), 1 );
++		devList.at(i)->priority = config->readNumEntry( TQString("DVB%1_PRIORITY").arg(i), 10 );
+ 		if ( devList.at(i)->type!=FE_QPSK )
+ 			continue;
+-		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(i), 1 );
++		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 );
+ 		for ( j=0; j<devList.at(i)->numLnb; j++ ) {
+-			devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), 11700 );
+-			devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), 9750 );
+-			devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), 10600 );
+-			devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), 0 );
+-			devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j) );
+-			devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j) );
+-			devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), 2.5 );
+-			devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), 1.5 );
++			devList.at(i)->lnb[j].switchFreq = config->readNumEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), 11700 );
++			devList.at(i)->lnb[j].loFreq = config->readNumEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), 9750 );
++			devList.at(i)->lnb[j].hiFreq = config->readNumEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), 10600 );
++			devList.at(i)->lnb[j].rotorType = config->readNumEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), 0 );
++			devList.at(i)->lnb[j].source = config->readListEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j) );
++			devList.at(i)->lnb[j].position = config->readIntListEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j) );
++			devList.at(i)->lnb[j].speed13v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), 2.5 );
++			devList.at(i)->lnb[j].speed18v = config->readDoubleNumEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), 1.5 );
+ 		}
+-		devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").tqarg(i), 0 );
+-		devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), 0 );
+-		devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").tqarg(i), 0 );
++		devList.at(i)->secMini = config->readNumEntry( TQString("DVB%1_SEC_MINI").arg(i), 0 );
++		devList.at(i)->secTwice = config->readNumEntry( TQString("DVB%1_SEC_TWICE").arg(i), 0 );
++		devList.at(i)->doS2 = config->readNumEntry( TQString("DVB%1_DOS2").arg(i), 0 );
+ 	}
+ 	j = config->readNumEntry( "NumCategories", 0 );
+ 	for ( i=0; i<j; i++ )
+-		categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(i), "kaffeine" ) ) );
++		categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) );
+ 	allIcon = config->readEntry( "AllIcon", "kaffeine" );
+ 	tvIcon = config->readEntry( "TvIcon", "kdvbtv" );
+ 	radioIcon = config->readEntry( "RadioIcon", "kdvbra" );
+@@ -512,31 +512,31 @@ void DVBconfig::saveConfig()
+ 	config->writeEntry( "SenderPort", senderPort );
+ 	config->writeEntry( "ProbeMFE", probeMfe );
+ 	for ( i=0; i<(int)devList.count(); i++ ) {
+-		config->writeEntry( TQString("DVB%1").tqarg(i), devList.at(i)->source );
+-		config->writeEntry( TQString("DVB%1_TIMEOUT").tqarg(i), devList.at(i)->tuningTimeout );
+-		config->writeEntry( TQString("DVB%1_PRIORITY").tqarg(i), devList.at(i)->priority );
+-		config->writeEntry( TQString("DVB%1_CAM_MAX").tqarg(i), devList.at(i)->camMaxService );
++		config->writeEntry( TQString("DVB%1").arg(i), devList.at(i)->source );
++		config->writeEntry( TQString("DVB%1_TIMEOUT").arg(i), devList.at(i)->tuningTimeout );
++		config->writeEntry( TQString("DVB%1_PRIORITY").arg(i), devList.at(i)->priority );
++		config->writeEntry( TQString("DVB%1_CAM_MAX").arg(i), devList.at(i)->camMaxService );
+ 		if ( devList.at(i)->type!=FE_QPSK )
+ 			continue;
+-		config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb );
++		config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb );
+ 		for ( j=0; j<devList.at(i)->numLnb; j++ ) {
+-			config->writeEntry( TQString("DVB%1_LNB%2_switch").tqarg(i).tqarg(j), devList.at(i)->lnb[j].switchFreq );
+-			config->writeEntry( TQString("DVB%1_LNB%2_lo").tqarg(i).tqarg(j), devList.at(i)->lnb[j].loFreq );
+-			config->writeEntry( TQString("DVB%1_LNB%2_hi").tqarg(i).tqarg(j), devList.at(i)->lnb[j].hiFreq );
+-			config->writeEntry( TQString("DVB%1_LNB%2_rotor").tqarg(i).tqarg(j), devList.at(i)->lnb[j].rotorType );
+-			config->writeEntry( TQString("DVB%1_LNB%2_source").tqarg(i).tqarg(j), devList.at(i)->lnb[j].source );
+-			config->writeEntry( TQString("DVB%1_LNB%2_position").tqarg(i).tqarg(j), devList.at(i)->lnb[j].position );
+-			config->writeEntry( TQString("DVB%1_LNB%2_speed13v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed13v );
+-			config->writeEntry( TQString("DVB%1_LNB%2_speed18v").tqarg(i).tqarg(j), devList.at(i)->lnb[j].speed18v );
++			config->writeEntry( TQString("DVB%1_LNB%2_switch").arg(i).arg(j), devList.at(i)->lnb[j].switchFreq );
++			config->writeEntry( TQString("DVB%1_LNB%2_lo").arg(i).arg(j), devList.at(i)->lnb[j].loFreq );
++			config->writeEntry( TQString("DVB%1_LNB%2_hi").arg(i).arg(j), devList.at(i)->lnb[j].hiFreq );
++			config->writeEntry( TQString("DVB%1_LNB%2_rotor").arg(i).arg(j), devList.at(i)->lnb[j].rotorType );
++			config->writeEntry( TQString("DVB%1_LNB%2_source").arg(i).arg(j), devList.at(i)->lnb[j].source );
++			config->writeEntry( TQString("DVB%1_LNB%2_position").arg(i).arg(j), devList.at(i)->lnb[j].position );
++			config->writeEntry( TQString("DVB%1_LNB%2_speed13v").arg(i).arg(j), devList.at(i)->lnb[j].speed13v );
++			config->writeEntry( TQString("DVB%1_LNB%2_speed18v").arg(i).arg(j), devList.at(i)->lnb[j].speed18v );
+ 		}
+-		config->writeEntry( TQString("DVB%1_SEC_MINI").tqarg(i), devList.at(i)->secMini );
+-		config->writeEntry( TQString("DVB%1_SEC_TWICE").tqarg(i), devList.at(i)->secTwice );
+-		config->writeEntry( TQString("DVB%1_DOS2").tqarg(i), devList.at(i)->doS2 );
++		config->writeEntry( TQString("DVB%1_SEC_MINI").arg(i), devList.at(i)->secMini );
++		config->writeEntry( TQString("DVB%1_SEC_TWICE").arg(i), devList.at(i)->secTwice );
++		config->writeEntry( TQString("DVB%1_DOS2").arg(i), devList.at(i)->doS2 );
+ 	}
+ 	config->writeEntry( "NumCategories", categories.count() );
+ 	for ( i=0; i<(int)categories.count(); i++ ) {
+-		config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name );
+-		config->writeEntry( TQString("CategoryIcon%1").tqarg(i), categories.at(i)->icon );
++		config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name );
++		config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon );
+ 	}
+ 	config->writeEntry( "AllIcon", allIcon );
+ 	config->writeEntry( "TvIcon", tvIcon );
+@@ -589,7 +589,7 @@ DvbConfigDialog::DvbConfigDialog( DvbPanel *pan, DVBconfig *dc, TQWidget *parent
+ 	timeoutSpin.setAutoDelete( true );
+ 
+ 	for ( i=0; i<(int)dvbConfig->devList.count(); i++ ) {
+-		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
++		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
+ 			KGlobal::instance()->iconLoader()->loadIcon( "hwinfo", KIcon::NoGroup, KIcon::SizeMedium ) );
+ 		vb = new TQVBoxLayout( page, 6, 6 );
+ 		gb = new TQGroupBox( "", page );
+diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
+index 1b54229..365b7ac 100644
+--- a/kaffeine/src/input/dvb/dvbpanel.cpp
++++ b/kaffeine/src/input/dvb/dvbpanel.cpp
+@@ -307,7 +307,7 @@ void DvbPanel::diskStatus()
+ 
+ 	freemb = (double)(((double)(buf.f_bavail)*(double)(buf.f_bsize))/(1024.0*1024.0));
+ 	if ( freemb<300 )
+-		emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 );
++		emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").arg((int)freemb)+i18n("MB")+")", 5000, 3 );
+ }
+ 
+ 
+@@ -649,15 +649,15 @@ void DvbPanel::dumpEvents()
+ 		for( i=0; i<events.getNSource(); i++ ) {
+ 			if ( !(esrc=events.getNEventSource( i )) )
+ 				continue;
+-			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() );
++			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() );
+ 			for ( m=0; m<esrc->getNTsid(); m++ ) {
+ 				if ( !(et=esrc->getNEventTsid( m )) )
+ 					continue;
+-				tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() );
++				tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() );
+ 				for ( n=0; n<et->getNSid(); n++ ) {
+ 					if ( !(es=et->getNEventSid( n )) )
+ 						continue;
+-					tt << TQString("     SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( es->getNDesc() );
++					tt << TQString("     SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() );
+ 					k+= es->getNDesc();
+ 				}
+ 			}
+@@ -681,10 +681,10 @@ void DvbPanel::dumpEvents()
+ 						if ( !(desc=esEvents->at( j )) )
+ 							continue;
+ 						tt << "Source: "+desc->source+"\n";
+-						tt << TQString("Network ID: %1\n").tqarg(desc->nid);
+-						tt << TQString("Transport Stream ID: %1\n").tqarg(desc->tsid);
+-						tt << TQString("Service ID: %1\n").tqarg(desc->sid);
+-						tt << TQString("Event ID: %1\n").tqarg(desc->eid);
++						tt << TQString("Network ID: %1\n").arg(desc->nid);
++						tt << TQString("Transport Stream ID: %1\n").arg(desc->tsid);
++						tt << TQString("Service ID: %1\n").arg(desc->sid);
++						tt << TQString("Event ID: %1\n").arg(desc->eid);
+ 						tt << "Title: "+desc->title+"\n";
+ 						tt << "Subtitle: "+desc->subtitle+"\n";
+ 						tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
+diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
+index cce9d0c..7fd8669 100644
+--- a/kaffeine/src/input/dvb/dvbsi.cpp
++++ b/kaffeine/src/input/dvb/dvbsi.cpp
+@@ -620,7 +620,7 @@ bool DVBsi::tablePAT( unsigned char *buf )
+ 			desc->tp.tsid = tsid;
+ 			desc->sid = sid;
+ 			desc->pmtpid = pmt;
+-			desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(sid);
++			desc->name = TQString("TSID:%1-SID:%2").arg(tsid).arg(sid);
+ 		}
+ 	}
+ 
+@@ -854,7 +854,7 @@ bool DVBsi::parseVCT( int pid, int tid, int timeout, int sid )
+ 
+ 		ChannelDesc *desc = new ChannelDesc();
+ 		desc->tp.tsid = channel_tsid;
+-		desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(short_name);
++		desc->name = TQString("%1-%2 %3").arg(major_channel_num).arg(minor_channel_num).arg(short_name);
+ 		desc->sid = program_number;
+ 		if (access_controlled == 1)
+ 			desc->fta = 1;
+diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
+index 4ef290b..be8ae7d 100644
+--- a/kaffeine/src/input/dvb/dvbstream.cpp
++++ b/kaffeine/src/input/dvb/dvbstream.cpp
+@@ -65,9 +65,9 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
+ 	fdFrontend = fdDvr = 0;
+ 	ndmx = 0;
+ 	currentTransponder = Transponder();
+-	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
+-	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
+-	demuxName = TQString("/dev/dvb/adapter%1/demux%2").tqarg( dvbDevice->adapter ).tqarg( dvbDevice->tuner );
++	frontendName = TQString("/dev/dvb/adapter%1/frontend%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
++	dvrName = TQString("/dev/dvb/adapter%1/dvr%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
++	demuxName = TQString("/dev/dvb/adapter%1/demux%2").arg( dvbDevice->adapter ).arg( dvbDevice->tuner );
+ 
+ 	out.setAutoDelete( true );
+ 
+diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
+index 7898f84..07030e4 100644
+--- a/kaffeine/src/input/dvb/kgradprogress.cpp
++++ b/kaffeine/src/input/dvb/kgradprogress.cpp
+@@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress )
+ {
+ 	current = progress;
+ 	draw();
+-	tqrepaint(false);
++	repaint(false);
+ }
+ 
+ 
+diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
+index 44619b7..3c49848 100644
+--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
++++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
+@@ -70,7 +70,7 @@ KaffeineDVBsection::~KaffeineDVBsection()
+ bool KaffeineDVBsection::setFilter( int pid, int tid, int timeout, bool checkcrc )
+ {
+ 	struct dmx_sct_filter_params sctfilter;
+-	TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( tuner );
++	TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").arg( adapter ).arg( tuner );
+ 
+ 	if ((fdDemux = open( demuxer.ascii(), O_RDWR | O_NONBLOCK )) < 0) {
+ 		perror ("open failed");
+diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
+index 7f760e6..9b68d93 100644
+--- a/kaffeine/src/input/dvb/scandialog.cpp
++++ b/kaffeine/src/input/dvb/scandialog.cpp
+@@ -71,7 +71,7 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
+ 		tmp = dvb->at(i)->getSources( true );
+ 		for ( j=0; j<(int)tmp.count(); j++ ) {
+ 			if ( tmp[j].startsWith( "AUTO" ) )
+-				list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) );
++				list.append( TQString("AUTO(%1:%2)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) );
+ 			else
+ 				list.append( tmp[j] );
+ 		}
+@@ -614,25 +614,25 @@ bool ScanDialog::getTransData()
+ 		int i;
+ 		for ( i=177; i<227; i+=7 ) {
+ 			if ( offset07->isChecked() ) {
+-				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 );
++				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000 );
+ 				parseTp( s, ds->getType(), "" );
+ 			}
+ 			if ( offset125p->isChecked() ) {
+-				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000+125000 );
++				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 );
+ 				parseTp( s, ds->getType(), "" );
+ 			}
+ 		}
+ 		for ( i=474; i<859; i+=8 ) {
+ 			if ( offset167m->isChecked() ) {
+-				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 );
++				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)-167000 );
+ 				parseTp( s, ds->getType(), "" );
+ 			}
+ 			if ( offset0->isChecked() ) {
+-				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 );
++				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 );
+ 				parseTp( s, ds->getType(), "" );
+ 			}
+ 			if ( offset167p->isChecked() ) {
+-				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+167000 );
++				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 );
+ 				parseTp( s, ds->getType(), "" );
+ 			}
+ 		}
+@@ -1010,7 +1010,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
+ 	int i;
+ 	DListViewItem *it;
+ 
+-	it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( chan->tp.snr ), chan->name );
++	it = new DListViewItem( foundList, chan, TQString( "%1").arg( chan->tp.snr ), chan->name );
+ 
+ 	if ( chan->type==1 ) {
+ 		if ( scan )
+@@ -1030,7 +1030,7 @@ void ScanDialog::addFound( ChannelDesc *chan, bool scan )
+ 	}
+ 
+ 	if ( scan )
+-		progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) );
++		progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).arg(ntv).arg(nradio) );
+ 	if ( chan->provider.isEmpty() )
+ 		return;
+ 	for ( i=0; i<providerComb->count(); i++ ) {
+diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
+index 8e2f412..0bc4a31 100644
+--- a/kaffeine/src/instwizard.cpp
++++ b/kaffeine/src/instwizard.cpp
+@@ -49,7 +49,7 @@
+ 
+ void InstWizard::internalWizard()
+ {
+-	setCaption(i18n("Kaffeine %1 Installation Wizard").tqarg(KAFFEINE_VERSION));
++	setCaption(i18n("Kaffeine %1 Installation Wizard").arg(KAFFEINE_VERSION));
+ 	resize(400,400);
+ 
+ 	/************** installation check ************************/
+@@ -79,7 +79,7 @@ void InstWizard::internalWizard()
+ 	if (KDE::version() >= KDE_MAKE_VERSION(3,2,0))
+ 		info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
+ 	else
+-		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").tqarg("3.2") << "</font>";
++		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").arg("3.2") << "</font>";
+ 
+ 	//XINE-LIB
+ 	//Should engine depending stuff be here?
+@@ -96,13 +96,13 @@ void InstWizard::internalWizard()
+ 
+ 		if ((major == 1) && (minor == 0) && (sub == 0) && (xineVersion.contains("rc", false)))
+ 		{
+-			info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
++			info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0") << " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
+ 		}
+ 		else
+ 			info << "<font color=\"DarkGreen\">" << i18n("Ok.") << "</font>";
+ 	}
+ 	else
+-		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").tqarg("1.0")
++		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires xine-lib >= %1. Download the latest version here:").arg("1.0")
+ 		<< " <a href=\"http://www.xinehq.de\">http://www.xinehq.de</a>.</font>";
+ 	*/
+ 	//WIN32-CODECS
+diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
+index 5b188da..9efebc9 100644
+--- a/kaffeine/src/kaffeine.cpp
++++ b/kaffeine/src/kaffeine.cpp
+@@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
+ 	//createStandardStatusBarAction();
+ 	createGUI("kaffeineui.rc");
+ 
+-	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").tqarg("0").tqarg("00:00:00").tqarg("0").tqarg("00:00:00"), 9, 0, true);
+-	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").tqarg("0").tqarg("0:00:00"), 9, 0, true);
++	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2  (Total: %3, %4)").arg("0").arg("00:00:00").arg("0").arg("00:00:00"), 9, 0, true);
++	//statusBar()->insertItem(i18n("Entries: %1, Playtime: %2").arg("0").arg("0:00:00"), 9, 0, true);
+ 	//statusBar()->insertItem(i18n("No player"), 10, 0, true);
+ 
+ 	TQString stamp =  locateLocal("appdata", "wizard_stamp_v0.7.1");
+@@ -367,7 +367,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
+ 	KService::Ptr service = KService::serviceByDesktopName(desktopName);
+ 	if (!service)
+ 	{
+-		KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(TQString(desktopName)+ ".desktop"));
++		KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop"));
+ 		return;
+ 	}
+ 
+@@ -387,7 +387,7 @@ void Kaffeine::slotLoadPart(const TQString& desktopName)
+ 		int error = 0;
+ 		m_mediaPart = KParts::ComponentFactory::createPartInstanceFromService<KaffeinePart>(service, m_playerContainer, service->name().ascii(), TQT_TQOBJECT(this), 0, m_engineParameters, &error);
+ 		if (error > 0) {
+-			KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(service->name()), KLibLoader::self()->lastErrorMessage());
++			KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
+ 		}
+ 		else {
+ 			connect(m_mediaPart, TQT_SIGNAL(setWindowCaption(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotChangeCaption(const TQString&)));
+@@ -455,7 +455,7 @@ void Kaffeine::slotLoadingCanceled(const TQString& message)
+ 		delete m_mediaPart;
+ 		m_mediaPart = NULL;
+ 	}
+-	KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message);
++	KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").arg(name), message);
+ }
+ 
+ void Kaffeine::slotPlaybackFailed()
+@@ -1439,7 +1439,7 @@ TQString Kaffeine::askForOtherDevice(const TQString& type)
+ 	TQVBox* page = dialog->makeVBoxMainWidget();
+ 	page->setSpacing(5);
+ 	page->setMargin(5);
+-	new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page);
++	new TQLabel(i18n("No %1 in drive, or wrong path to device.").arg(type), page);
+ 	new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page);
+ 	DrivesCombo* drives = new DrivesCombo(page);
+ 
+diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
+index 308bfa5..ecfa2c5 100644
+--- a/kaffeine/src/kmultitabbar.cpp
++++ b/kaffeine/src/kmultitabbar.cpp
+@@ -111,7 +111,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
+ 		mainLayout->setAutoAdd(true);
+ 
+ 	}
+-        viewport()->tqrepaint();
++        viewport()->repaint();
+ }
+ 
+ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
+@@ -189,8 +189,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
+ 
+ void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
+ /*	kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
+-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
+-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<endl;*/
++	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
++	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
+ 	if (ev) TQScrollView::resizeEvent(ev);
+ 
+ 	if ( (m_style==KMultiTabBar::KDEV3) ||
+@@ -379,7 +379,7 @@ void KMultiTabBarInternal::setPosition(enum KMultiTabBar::KMultiTabBarPosition p
+ 	m_position=pos;
+ 	for (uint i=0;i<m_tabs.count();i++)
+ 		m_tabs.at(i)->setTabsPosition(m_position);
+-	viewport()->tqrepaint();
++	viewport()->repaint();
+ }
+ 
+ 
+@@ -436,13 +436,13 @@ void KMultiTabBarButton::slotClicked()
+ void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
+ {
+ 	m_position=pos;
+-	tqrepaint();
++	repaint();
+ }
+ 
+ void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
+ {
+ 	m_style=style;
+-	tqrepaint();
++	repaint();
+ }
+ 
+ void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
+@@ -528,7 +528,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
+ 	}
+ 
+ 	setPosition(pos);
+-//	tqrepaint();
++//	repaint();
+ }
+ 
+ void KMultiTabBarTab::setIcon(const TQString& icon)
+@@ -992,7 +992,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
+ {
+ 	for (uint i=0;i<tabs()->count();i++)
+ 		tabs()->at(i)->resize();
+-	tqrepaint();
++	repaint();
+ }
+ 
+ TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
+diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+index 2255e67..fb6e7a3 100644
+--- a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
++++ b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
+@@ -737,7 +737,7 @@ void GStreamerPart::setAudioSink( TQString sinkName )
+ {
+ 	GstElement* sink = gst_element_factory_make(sinkName.ascii(), "audiosink");
+ 	if ( !sink ) {
+-		KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(sinkName).tqarg(m_audioSinkName));
++		KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(sinkName).arg(m_audioSinkName));
+ 		return;
+ 	}
+ 
+@@ -785,7 +785,7 @@ bool GStreamerPart::initGStreamer()
+ 	 */
+ 	m_audiosink = gst_element_factory_make( m_audioSinkName.ascii(), "audiosink" );
+ 	if ( !m_audiosink ) {
+-		KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").tqarg(m_audioSinkName));
++		KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").arg(m_audioSinkName));
+ 		if ( (m_audiosink = gst_element_factory_make("alsasink", "audiosink")) != NULL )
+ 			kdDebug() << "GStreamerPart: Using audio-driver: alsasink" << endl;
+ 		else {
+@@ -809,7 +809,7 @@ bool GStreamerPart::initGStreamer()
+ 	 */
+ 	m_videosink = gst_element_factory_make( m_videoSinkName.ascii(), "videosink" );
+ 	if ( !m_videosink ) {
+-		KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").tqarg(m_videoSinkName));
++		KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").arg(m_videoSinkName));
+ 		if ((m_videosink = gst_element_factory_make("xvimagesink", "videosink")) != NULL)
+ 			kdDebug() << "GStreamerPart: Using video-driver: xvimagesink" << endl;
+ 		else {
+diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
+index eb6203f..96752aa 100644
+--- a/kaffeine/src/player-parts/gstreamer-part/video.cpp
++++ b/kaffeine/src/player-parts/gstreamer-part/video.cpp
+@@ -134,7 +134,7 @@ void VideoWindow::newCapsset( const GstCaps *caps )
+ 	TQSize frame = getFrameSize();
+ 	correctByAspectRatio( frame );
+ 	emit signalNewFrameSize( frame );
+-	//set correct tqgeometry
++	//set correct geometry
+ 	setGeometry();
+ }
+ 
+@@ -177,7 +177,7 @@ void VideoWindow::newState()
+ 	TQSize frame = getFrameSize();
+ 	correctByAspectRatio( frame );
+ 	emit signalNewFrameSize( frame );
+-	//set correct tqgeometry
++	//set correct geometry
+ 	setGeometry();
+ }
+ 
+diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+index 58a9818..acc9937 100644
+--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+@@ -153,14 +153,14 @@ KXineWidget::~KXineWidget()
+ 	{
+ 		debugOut("Unwire audio filters");
+ 		unwireAudioFilters();
+-		debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName ));
++		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName ));
+ 		delete m_visualPlugin;
+ 		m_visualPlugin = NULL;
+ 	}
+ #else
+ 	if (m_xinePost)
+ 	{
+-		debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
++		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
+ 		m_postAudioSource = xine_get_audio_source(m_xineStream);
+ 		xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
+ 		xine_post_dispose(m_xineEngine, m_xinePost);
+@@ -279,7 +279,7 @@ void KXineWidget::saveXineConfig()
+ 		xine_config_update_entry (m_xineEngine, &config);
+ 	}
+ 
+-	debugOut(TQString("Save xine config to: %1").tqarg(m_configFilePath));
++	debugOut(TQString("Save xine config to: %1").arg(m_configFilePath));
+ 	xine_config_save(m_xineEngine, m_configFilePath.ascii());
+ }
+ 
+@@ -331,7 +331,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
+ 	/* frame size changed */
+ 	if ( (video_width != vw->m_videoFrameWidth) || (video_height != vw->m_videoFrameHeight) )
+ 	{
+-		debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").tqarg(video_width).tqarg(video_height).tqarg(video_aspect));
++		debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").arg(video_width).arg(video_height).arg(video_aspect));
+ 		vw->m_videoFrameWidth = video_width;
+ 		vw->m_videoFrameHeight = video_height;
+ 		vw->m_videoAspect = video_aspect;
+@@ -343,7 +343,7 @@ void KXineWidget::frameOutputCallback(void* p, int video_width, int video_height
+ 		{
+ 			vw->m_newParentSize = vw->parentWidget()->size() - TQSize((vw->width() - video_width), vw->height() - video_height);
+ 
+-			debugOut(TQString("Resize video window to: %1x%2").tqarg(vw->m_newParentSize.width()).tqarg(vw->m_newParentSize.height()));
++			debugOut(TQString("Resize video window to: %1x%2").arg(vw->m_newParentSize.width()).arg(vw->m_newParentSize.height()));
+ 
+ 			/* we should not do a resize() inside a xine thread,
+ 			   but post an event to the main thread */
+@@ -391,7 +391,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
+ 			channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_AUDIO_CHANNEL);
+ 			for(i = 0; i < channels; i++)
+ 			{
+-				slang = TQString("%1.").tqarg(i+1);
++				slang = TQString("%1.").arg(i+1);
+ 				if (xine_get_audio_lang(vw->m_xineStream, i, lang))
+ 					slang += lang;
+ 				tmp << slang;
+@@ -415,7 +415,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
+ 			channels = xine_get_stream_info(vw->m_xineStream, XINE_STREAM_INFO_MAX_SPU_CHANNEL);
+ 			for(i = 0; i<channels; i++)
+ 			{
+-				slang = TQString("%1.").tqarg(i+1);
++				slang = TQString("%1.").arg(i+1);
+ 				if (xine_get_spu_lang(vw->m_xineStream, i, lang))
+ 					slang += lang;
+ 				tmp << slang;
+@@ -472,7 +472,7 @@ void KXineWidget::xineEventListener(void *p, const xine_event_t* xineEvent)
+ 			debugOut("xine event: dropped frames");
+ 			xine_dropped_frames_t* dropped = (xine_dropped_frames_t*)xineEvent->data;
+ 
+-			warningOut(TQString("Skipped frames: %1 - discarded frames: %2").tqarg(dropped->skipped_frames/10).tqarg(dropped->discarded_frames/10));
++			warningOut(TQString("Skipped frames: %1 - discarded frames: %2").arg(dropped->skipped_frames/10).arg(dropped->discarded_frames/10));
+ 
+ 			break;
+ 		}
+@@ -752,7 +752,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
+ 			else
+ 			{
+ 				//restart
+-				warningOut(TQString("Message: '%1' was blocked!").tqarg(m_xineMessage));
++				warningOut(TQString("Message: '%1' was blocked!").arg(m_xineMessage));
+ 				m_recentMessagesTimer.start(1500);
+ 			}
+ 			break;
+@@ -795,7 +795,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 
+ 	int pos, time, length;
+ 
+-	debugOut(TQString("New video driver: %1").tqarg(entry->enum_values[entry->num_value]));
++	debugOut(TQString("New video driver: %1").arg(entry->enum_values[entry->num_value]));
+ 
+ 	if (vw->m_osd)
+ 	{
+@@ -835,7 +835,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 	vw->unwireAudioFilters();
+ 	if (vw->m_visualPlugin)
+ 	{
+-		debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName));
++		debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
+ 		delete vw->m_visualPlugin;
+ 		vw->m_visualPlugin = NULL;
+ 	}
+@@ -855,7 +855,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 
+ 	if (!vw->m_videoDriver)
+ 	{
+-		vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_videoDriverName);
++		vw->m_xineError = i18n("Error: Can't init new Video Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_videoDriverName);
+ 		TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
+ 		playing = false;
+ 		vw->m_videoDriver = xine_open_video_driver(vw->m_xineEngine,
+@@ -869,7 +869,7 @@ void KXineWidget::videoDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 	else
+ 	{
+ 		vw->m_videoDriverName = entry->enum_values[entry->num_value];
+-		vw->m_statusString = i18n("Using Video Driver: %1").tqarg(vw->m_videoDriverName);
++		vw->m_statusString = i18n("Using Video Driver: %1").arg(vw->m_videoDriverName);
+ 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
+ 	}
+ 
+@@ -902,7 +902,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 
+ 	int pos, time, length;
+ 
+-	debugOut(TQString("New audio driver: %1").tqarg(entry->enum_values[entry->num_value]));
++	debugOut(TQString("New audio driver: %1").arg(entry->enum_values[entry->num_value]));
+ 
+ 	if (vw->m_osd)
+ 	{
+@@ -931,7 +931,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 	vw->unwireAudioFilters();
+ 	if (vw->m_visualPlugin)
+ 	{
+-		debugOut(TQString("Dispose visual plugin: %1").tqarg(vw->m_visualPluginName));
++		debugOut(TQString("Dispose visual plugin: %1").arg(vw->m_visualPluginName));
+ 		delete vw->m_visualPlugin;
+ 		vw->m_visualPlugin = NULL;
+ 	}
+@@ -945,7 +945,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 
+ 	if (!vw->m_audioDriver)
+ 	{
+-		vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(entry->enum_values[entry->num_value]).tqarg(vw->m_audioDriverName);
++		vw->m_xineError = i18n("Error: Can't init new Audio Driver %1 - using %2!").arg(entry->enum_values[entry->num_value]).arg(vw->m_audioDriverName);
+ 		TQApplication::postEvent(vw, new TQTimerEvent( TIMER_EVENT_NEW_XINE_ERROR));
+ 		playing = false;
+ 		vw->m_audioDriver = xine_open_audio_driver(vw->m_xineEngine, vw->m_audioDriverName.ascii(), NULL);
+@@ -953,7 +953,7 @@ void KXineWidget::audioDriverChangedCallback(void* p, xine_cfg_entry_t* entry)
+ 	else
+ 	{
+ 		vw->m_audioDriverName = entry->enum_values[entry->num_value];
+-		vw->m_statusString = i18n("Using Audio Driver: %1").tqarg(vw->m_audioDriverName);
++		vw->m_statusString = i18n("Using Audio Driver: %1").arg(vw->m_audioDriverName);
+ 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
+ 	}
+ 
+@@ -1148,18 +1148,18 @@ bool KXineWidget::initXine()
+ 		int count = 1;
+ 		debugOut("Xinerama extension present");
+ 		XineramaQueryScreens(x11Display(), &count);
+-		debugOut(TQString("%1 screens detected").tqarg(count));
++		debugOut(TQString("%1 screens detected").arg(count));
+ 		if (count > 1)
+ 			// multihead -> assuming square pixels
+ 			m_displayRatio = 1.0;
+ 	}
+ #endif
+ 
+-	debugOut(TQString("Display aspect ratio (v/h): %1").tqarg(m_displayRatio));*/
++	debugOut(TQString("Display aspect ratio (v/h): %1").arg(m_displayRatio));*/
+ 
+ 	/**** INIT XINE ENGINE ****/
+ 
+-	debugOut(TQString("Using xine version %1").tqarg(xine_get_version_string()));
++	debugOut(TQString("Using xine version %1").arg(xine_get_version_string()));
+ 
+ 	m_xineEngine = xine_new();
+ 	if (!m_xineEngine)
+@@ -1209,7 +1209,7 @@ bool KXineWidget::initXine()
+ 	else
+ 		m_audioDriverName = m_audioChoices[i];
+ 
+-	debugOut(TQString("Use audio driver %1").tqarg(m_audioDriverName));
++	debugOut(TQString("Use audio driver %1").arg(m_audioDriverName));
+ 
+ 	drivers = xine_list_video_output_plugins(m_xineEngine);
+ 	i = 0;
+@@ -1235,7 +1235,7 @@ bool KXineWidget::initXine()
+ 	else
+ 		m_videoDriverName = m_videoChoices[i];
+ 
+-	debugOut(TQString("Use video driver %1").tqarg(m_videoDriverName));
++	debugOut(TQString("Use video driver %1").arg(m_videoDriverName));
+ 
+ 	m_mixerInfo = strdup(i18n("Use software audio mixer").local8Bit());
+ 	m_softwareMixer = (bool)xine_config_register_bool(m_xineEngine, "audio.mixer_software", 1, m_mixerInfo,
+@@ -1307,7 +1307,7 @@ bool KXineWidget::initXine()
+ 
+ 	if (!m_videoDriver && m_videoDriverName != "auto")
+ 	{
+-		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").tqarg(m_videoDriverName));
++		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").arg(m_videoDriverName));
+ 		m_videoDriverName = "auto";
+ 		m_videoDriver = xine_open_video_driver(m_xineEngine,
+ #ifndef HAVE_XCB
+@@ -1331,7 +1331,7 @@ bool KXineWidget::initXine()
+ 
+ 	if (!m_audioDriver && m_audioDriverName != "auto")
+ 	{
+-		emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").tqarg(m_audioDriverName));
++		emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").arg(m_audioDriverName));
+ 		m_audioDriverName = "auto";
+ 		m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL);
+ 	}
+@@ -1395,12 +1395,12 @@ void KXineWidget::initOSD()
+ 	{
+ 		if (!xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]))
+ 		{
+-			debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").tqarg(m_osdFont));
++			debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").arg(m_osdFont));
+ 			free(m_osdFont);
+ 			m_osdFont = strdup("sans");
+ 			xine_osd_set_font(m_osd, m_osdFont, fontsizetable[m_osdSize]);
+ 		}
+-		debugOut(TQString("Font for OSD: %1").tqarg(m_osdFont));
++		debugOut(TQString("Font for OSD: %1").arg(m_osdFont));
+ 		xine_osd_set_text_palette(m_osd, XINE_TEXTPALETTE_WHITE_BLACK_TRANSPARENT, XINE_OSD_TEXT1);
+ 		m_osdUnscaled = (xine_osd_get_capabilities(m_osd) & XINE_OSD_CAP_UNSCALED);
+ 		if (m_osdUnscaled)
+@@ -1428,7 +1428,7 @@ bool KXineWidget::playDvb()
+ 	{
+ 		if (!m_visualPlugin)
+ 		{
+-			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
+ 			m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
+ 		}
+ 
+@@ -1438,7 +1438,7 @@ bool KXineWidget::playDvb()
+ 	{
+ 		if (m_visualPlugin)
+ 		{
+-			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
+ 			delete m_visualPlugin;
+ 			m_visualPlugin = NULL;
+ 		}
+@@ -1978,7 +1978,7 @@ void KXineWidget::slotPlay()
+ 	if ( turl.startsWith("/") )
+ 		turl.prepend("file://");
+ 
+-	debugOut(TQString("Playing: %1").tqarg(turl.local8Bit().data()));
++	debugOut(TQString("Playing: %1").arg(turl.local8Bit().data()));
+ 
+ 	xine_set_param( m_xineStream, XINE_PARAM_METRONOM_PREBUFFER, 12000 );
+ 	if (!xine_open(m_xineStream, TQFile::encodeName(turl))) {
+@@ -2002,7 +2002,7 @@ void KXineWidget::slotPlay()
+ 	{
+ 		if (m_visualPluginName && (!m_xinePost))
+ 		{
+-			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
+ 			m_xinePost = xine_post_init(m_xineEngine, m_visualPluginName, 0,
+ 			                            &m_audioDriver,
+ 			                            &m_videoDriver);
+@@ -2016,7 +2016,7 @@ void KXineWidget::slotPlay()
+ 	{
+ 		if (m_xinePost)
+ 		{
+-			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
+ 			m_postAudioSource = xine_get_audio_source(m_xineStream);
+ 			xine_post_wire_audio_port(m_postAudioSource, m_audioDriver);
+ 			xine_post_dispose(m_xineEngine, m_xinePost);
+@@ -2248,7 +2248,7 @@ void KXineWidget::sendXineError()
+ 	else
+ 	{
+ 		errorOut(error);
+-		errorOut(TQString("Can't play: %1 - trying next").tqarg(m_trackURL));
++		errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL));
+ 		TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
+ 	}
+ }
+@@ -2290,7 +2290,7 @@ void KXineWidget::showOSDMessage(const TQString& message, uint duration, int pri
+ 		return;
+ 	prevOsdPriority = priority;
+ 
+-	//debugOut(TQString("OSD: draw text: %1").tqarg(message));
++	//debugOut(TQString("OSD: draw text: %1").arg(message));
+ 	xine_osd_clear(m_osd);
+ 	xine_osd_draw_text(m_osd, 0, 0, message.local8Bit(), XINE_OSD_TEXT1);
+ 
+@@ -2348,7 +2348,7 @@ void KXineWidget::slotCreateVideoFilter(const TQString& name, TQWidget* parent)
+ 	wireVideoFilters();
+ #else
+ 	parent = parent;
+-	warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name));
++	warningOut(TQString("Not implemented [CreateVideoFilter %1]").arg(name));
+ #endif
+ }
+ 
+@@ -2364,7 +2364,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
+ 	wireAudioFilters();
+ #else
+ 	parent = parent;
+-	warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name));
++	warningOut(TQString("Not implemented [CreateAudioFilter %1]").arg(name));
+ #endif
+ }
+ 
+@@ -2478,7 +2478,7 @@ void KXineWidget::wireAudioFilters()
+ 	{
+ 		if (!m_visualPlugin)
+ 		{
+-			debugOut(TQString("Init visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
+ 			m_visualPlugin = new PostFilter(m_visualPluginName, m_xineEngine, m_audioDriver, m_videoDriver, NULL);
+ 		}
+ 
+@@ -2488,7 +2488,7 @@ void KXineWidget::wireAudioFilters()
+ 	{
+ 		if (m_visualPlugin)
+ 		{
+-			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
++			debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
+ 			delete m_visualPlugin;
+ 			m_visualPlugin = NULL;
+ 		}
+@@ -2571,7 +2571,7 @@ TQStringList KXineWidget::getVisualPlugins() const
+ void KXineWidget::slotSetVisualPlugin(const TQString& visual)
+ {
+ 	if (m_visualPluginName == visual) return;
+-	debugOut(TQString("New visualization plugin: %1").tqarg(visual));
++	debugOut(TQString("New visualization plugin: %1").arg(visual));
+ 
+ #ifndef USE_TQT_ONLY
+ 	unwireAudioFilters();
+@@ -2660,7 +2660,7 @@ void KXineWidget::slotSetVolume(int vol)
+ 	if (!isXineReady()) return;
+ 	if (m_softwareMixer)
+ 	{
+-		//debugOut(TQString("Set software amplification level: %1").tqarg(vol));
++		//debugOut(TQString("Set software amplification level: %1").arg(vol));
+ 		if (m_volumeGain)
+ 			xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2);
+ 		else
+@@ -2668,7 +2668,7 @@ void KXineWidget::slotSetVolume(int vol)
+ 	}
+ 	else
+ 	{
+-		//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol));
++		//debugOut(TQString("Set audio mixer volume: %1").arg(vol));
+ 		xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
+ 	}
+ 	emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
+@@ -2872,7 +2872,7 @@ void KXineWidget::slotStop()
+ 
+ void KXineWidget::slotSetAudiocdDevice(const TQString& device)
+ {
+-	debugOut(TQString("Set AudioCD device to %1").tqarg(device));
++	debugOut(TQString("Set AudioCD device to %1").arg(device));
+ 
+ 	xine_cfg_entry_t config;
+ 	xine_config_lookup_entry(m_xineEngine, "input.cdda_device", &config);
+@@ -2884,7 +2884,7 @@ void KXineWidget::slotSetAudiocdDevice(const TQString& device)
+ 
+ void KXineWidget::slotSetVcdDevice(const TQString& device)
+ {
+-	debugOut(TQString("Set VCD device to %1").tqarg(device));
++	debugOut(TQString("Set VCD device to %1").arg(device));
+ 
+ 	xine_cfg_entry_t config;
+ 	xine_config_lookup_entry(m_xineEngine, "input.vcd_device", &config);
+@@ -2896,7 +2896,7 @@ void KXineWidget::slotSetVcdDevice(const TQString& device)
+ 
+ void KXineWidget::slotSetDvdDevice(const TQString& device)
+ {
+-	debugOut(TQString("Set DVD device to %1").tqarg(device));
++	debugOut(TQString("Set DVD device to %1").arg(device));
+ 
+ 	xine_cfg_entry_t config;
+ 	xine_config_lookup_entry(m_xineEngine, "input.dvd_device", &config);
+@@ -2966,7 +2966,7 @@ void KXineWidget::setStreamSaveDir(const TQString& dir)
+ 
+ 	if (!xine_config_lookup_entry(m_xineEngine, "misc.save_dir", &config)) return; /* older xine-lib */
+ 
+-	debugOut(TQString("Set misc.save_dir to: %1").tqarg(dir));
++	debugOut(TQString("Set misc.save_dir to: %1").arg(dir));
+ 	config.str_value = TQFile::encodeName(dir).data();
+ 	xine_config_update_entry (m_xineEngine, &config);
+ }
+@@ -2982,7 +2982,7 @@ const TQString KXineWidget::getStreamSaveDir()
+ 
+ void KXineWidget::setBroadcasterPort(const uint port)
+ {
+-	debugOut(TQString("Set broadcaster port to %1").tqarg(port));
++	debugOut(TQString("Set broadcaster port to %1").arg(port));
+ 	xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port);
+ }
+ 
+@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4);
+ 			m_currentSpeed = Fast2;
+-			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2"));
++			emit signalXineStatus(i18n("Fast Forward %1").arg("x2"));
+ 			break;
+ 		}
+ 		case Fast2:
+@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
+ 			m_currentSpeed = Slow1;
+-			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
+ 			break;
+ 		}
+ 		default:
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
+ 			m_currentSpeed = Fast1;
+-			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
+ 			break;
+ 		}
+ 	}
+@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
+ 			m_currentSpeed = Slow2;
+-			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2"));
++			emit signalXineStatus(i18n("Slow Motion %1").arg("x2"));
+ 			break;
+ 		}
+ 		case Slow2:
+@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
+ 			m_currentSpeed = Fast1;
+-			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
+ 			break;
+ 		}
+ 		default:
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
+ 			m_currentSpeed = Slow1;
+-			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
+ 			break;
+ 		}
+ 	}
+@@ -3093,14 +3093,14 @@ TQString KXineWidget::getSupportedExtensions() const
+ 
+ void KXineWidget::slotSetAudioChannel(int ch)
+ {
+-	debugOut(TQString("Switch to audio channel %1").tqarg(ch-1));
++	debugOut(TQString("Switch to audio channel %1").arg(ch-1));
+ 	xine_set_param(m_xineStream, XINE_PARAM_AUDIO_CHANNEL_LOGICAL, ch-1);
+ }
+ 
+ 
+ void KXineWidget::slotSetSubtitleChannel(int ch)
+ {
+-	debugOut(TQString("Switch to subtitle channel %1").tqarg(ch-1));
++	debugOut(TQString("Switch to subtitle channel %1").arg(ch-1));
+ 	xine_set_param(m_xineStream, XINE_PARAM_SPU_CHANNEL, ch-1);
+ }
+ 
+@@ -3306,7 +3306,7 @@ void KXineWidget::slotSetDeinterlaceConfig(const TQString& config)
+ 	if (m_deinterlaceFilter)
+ 		m_deinterlaceFilter->setConfig(config);
+ #else
+-	warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").tqarg(config));
++	warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").arg(config));
+ #endif
+ }
+ 
+@@ -3318,7 +3318,7 @@ void KXineWidget::slotToggleDeinterlace()
+ 	if (m_deinterlaceFilter)
+ 	{
+ 		m_deinterlaceEnabled = !m_deinterlaceEnabled;
+-		debugOut(TQString("Deinterlace enabled: %1").tqarg(m_deinterlaceEnabled));
++		debugOut(TQString("Deinterlace enabled: %1").arg(m_deinterlaceEnabled));
+ 		if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on");
+ 		else s = i18n("Deinterlace: off");
+ 		showOSDMessage( s, 2000 );
+@@ -3786,7 +3786,7 @@ TQImage KXineWidget::getScreenshot() const
+ 	else
+ 		height = (int)((double) height / scaleFactor + 0.5);
+ 
+-	debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").tqarg(screenShot.width()).tqarg(screenShot.height()).tqarg(width).tqarg(height));
++	debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").arg(screenShot.width()).arg(screenShot.height()).arg(width).arg(height));
+ 	screenShot = screenShot.smoothScale(width, height);
+ 
+ 	delete []rgbPile;
+@@ -3849,7 +3849,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
+ 		break;
+ 		default:
+ 		{
+-			warningOut(TQString("Screenshot: Format %1 not supportet!").tqarg((char*)&format));
++			warningOut(TQString("Screenshot: Format %1 not supportet!").arg((char*)&format));
+ 			delete [] yuv;
+ 			return;
+ 		}
+@@ -3880,7 +3880,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
+ 	      desired_ratio = 4.0 / 3.0;
+ 	      break;
+ 	    default:
+-	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").tqarg(ratio));
++	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").arg(ratio));
+ 	    case XINE_VO_ASPECT_STQUARE:
+ 	      debugOut("Screenshot: got video aspect: 1:1");
+ 	      desired_ratio = image_ratio;
+@@ -3888,7 +3888,7 @@ void KXineWidget::getScreenshot(uchar*& rgb32BitData, int& videoWidth, int& vide
+ 	  }
+ 	*/
+ 
+-	debugOut(TQString("Screenshot: using scale factor: %1").tqarg(m_videoAspect));
++	debugOut(TQString("Screenshot: using scale factor: %1").arg(m_videoAspect));
+ 	scaleFactor = m_videoAspect;
+ 
+ 	delete [] yuv;
+diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
+index f9b3fb1..1b9c123 100644
+--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
+@@ -304,7 +304,7 @@ void XinePart::slotPlay(bool forcePlay)
+ 	{
+ 		TQString sub;
+ 		if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1))
+-			sub = TQString("#subtitle:%1").tqarg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
++			sub = TQString("#subtitle:%1").arg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
+ 
+ 		m_xine->clearQueue();
+ 		m_xine->appendToQueue(mrl.url() + sub );
+@@ -786,7 +786,7 @@ void XinePart::slotNewPosition(int pos, const TQTime& playtime)
+ 		}
+ 		else
+ 		{
+-			timeMessage = i18n("%1 of %2").tqarg(calcLength.toString("h:mm:ss")).tqarg(length.toString("h:mm:ss"));
++			timeMessage = i18n("%1 of %2").arg(calcLength.toString("h:mm:ss")).arg(length.toString("h:mm:ss"));
+ 			m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY);
+ 		}
+ 	}
+@@ -1623,7 +1623,7 @@ void XinePart::audiocdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQS
+ 	for (uint i = 0; i < list.count(); i++)
+ 	{
+ 		mrl = MRL(list[i]);
+-		mrl.setTitle(i18n("AudioCD Track %1").tqarg(i+1));
++		mrl.setTitle(i18n("AudioCD Track %1").arg(i+1));
+ 		mrl.setTrack(TQString::number(i+1));
+ 		if (xine_open(xineStreamForMeta, TQFile::encodeName(mrl.url())))
+ 		{
+@@ -1698,7 +1698,7 @@ void XinePart::vcdMRLS(MRL::List& mrls, bool& ok, bool& supported, const TQStrin
+ 		mrl = MRL(list[i]);
+ 		mrl.setMime("video/vcd");
+ 		mrl.setTrack(TQString::number(i+1));
+-		mrl.setTitle(i18n("VCD Track %1").tqarg(i+1));
++		mrl.setTitle(i18n("VCD Track %1").arg(i+1));
+ 		mrls.append(mrl);
+ 	}
+ 	if (mrls.count())
+diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+index 74076e4..6d6a2d4 100644
+--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+@@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) :
+ 		else
+ 			icon = "edit";
+ 
+-		xineFrame = addPage(*it, i18n("%1 Options").tqarg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
++		xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
+ 		                    KIcon::SizeMedium));
+ 		xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint());
+ 		tabWidget = new TQTabWidget(xineFrame);
+diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
+index a86696e..67948a9 100644
+--- a/kaffeine/src/startwindow.cpp
++++ b/kaffeine/src/startwindow.cpp
+@@ -113,7 +113,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
+ 	//f.setPointSize( f.pointSize()+2 );
+ 	//f.setBold(true);
+ 	//btn->setFont( f );
+-	btn->setTextLabel( TQString("&%1 %2").tqarg(buttons.count() + 1).tqarg(uiName));
++	btn->setTextLabel( TQString("&%1 %2").arg(buttons.count() + 1).arg(uiName));
+ 	TQToolTip::add(btn, uiName);
+ 	btn->setTextPosition( TQToolButton::Under );
+ 	btn->setUsesTextLabel( true );
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch
new file mode 100644
index 000000000..84d5945b8
--- /dev/null
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-rename_old_tq_methods.patch
@@ -0,0 +1,2103 @@
+commit 60ed202f8065829574473fdfc20f53281d274ceb
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1324253348 -0600
+
+    Rename old tq methods that no longer need a unique name
+
+diff --git a/kaffeine/src/input/audiobrowser/playlist.cpp b/kaffeine/src/input/audiobrowser/playlist.cpp
+index 9c418a1..3735b61 100644
+--- a/kaffeine/src/input/audiobrowser/playlist.cpp
++++ b/kaffeine/src/input/audiobrowser/playlist.cpp
+@@ -75,14 +75,14 @@
+ 
+ RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
+ {
+-	TQColorGroup cg = parentWidget()->tqcolorGroup();
++	TQColorGroup cg = parentWidget()->colorGroup();
+ 	TQColor base = cg.base();
+ 	TQColor selection = cg.highlight();
+ 	int r = (base.red() + selection.red()) / 2;
+ 	int b = (base.blue() + selection.blue()) / 2;
+ 	int g = (base.green() + selection.green()) / 2;
+ 	back = TQColor(r, g, b);
+-	fore = parentWidget()->tqcolorGroup().text();
++	fore = parentWidget()->colorGroup().text();
+ 	setPaletteBackgroundColor( back );
+ 	setPaletteForegroundColor( fore );
+ 	setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
+@@ -115,7 +115,7 @@ void RollTitle::setTitle( TQString t )
+ {
+ 	TQLabel *lab = new TQLabel( t, this );
+ 	lab->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken );
+-	lab->resize( lab->tqsizeHint() );
++	lab->resize( lab->sizeHint() );
+ 	int x = 2*lab->frameWidth();
+ 	titlePix = TQPixmap( lab->width()-x, height()-x, -1, TQPixmap::BestOptim );
+ 	delete lab;
+@@ -149,7 +149,7 @@ void RollTitle::rollTitle()
+ void RollTitle::paintEvent( TQPaintEvent *pe )
+ {
+ 	TQLabel::paintEvent( pe );
+-	TQColorGroup cg = parentWidget()->tqcolorGroup();
++	TQColorGroup cg = parentWidget()->colorGroup();
+ 	TQColor base = cg.base();
+ 	TQColor selection = cg.highlight();
+ 	int r = (base.red() + selection.red()) / 2;
+@@ -157,7 +157,7 @@ void RollTitle::paintEvent( TQPaintEvent *pe )
+ 	int g = (base.green() + selection.green()) / 2;
+ 	back=TQColor(r,g,b);
+ 	setPaletteBackgroundColor( back );
+-	fore = parentWidget()->tqcolorGroup().text();
++	fore = parentWidget()->colorGroup().text();
+ 	setPaletteForegroundColor( fore );
+ 	setTitle( title );
+ }
+@@ -283,7 +283,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
+ 	google = NULL;
+ 
+ 	mainWidget = new TQVBox( parent );
+-	//mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
++	//mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+ 	hSplit = new TQSplitter( mainWidget );
+ 	hSplit->setOpaqueResize( true );
+ 	panel = new TQVBox( hSplit );
+@@ -404,7 +404,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
+ 	h2->addWidget(playlistLabel);
+ 	m_playlistSelector = new KComboBox( playlist );
+ 	m_playlistSelector->setMinimumWidth(10);
+-	m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
++	m_playlistSelector->setSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
+ 	m_playlistSelector->setEditable(true);
+ 	m_playlistSelector->setDuplicatesEnabled(false);
+ 	m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
+@@ -706,7 +706,7 @@ MRL PlayList::getCurrent()
+ 	if (isQueueMode())
+ 	{
+ 		m_queue.clear();
+-		updatetqStatus();
++		updateStatus();
+ 	}
+ 
+ 	if (m_random)
+@@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl )
+ 	{
+ 		mrl = m_queue.first();
+ 		m_queue.remove(m_queue.begin());
+-		updatetqStatus();
++		updateStatus();
+ 		return true;
+ 	}
+ 
+@@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl )
+ 	if (isQueueMode())
+ 	{
+ 		m_queue.clear();
+-		updatetqStatus();
++		updateStatus();
+ 	}
+ 
+ 	if (!m_currentEntry) {
+@@ -1349,7 +1349,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
+ 
+ 	delete progress;
+ 	if (m_random) createRandomList();
+-	updatetqStatus();
++	updateStatus();
+ }
+ 
+ void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
+@@ -1357,7 +1357,7 @@ void PlayList::add(const TQValueList<MRL>& mrlList, TQListViewItem* after)
+ 	TQValueList<MRL>::ConstIterator end(mrlList.end());
+ 	for (TQValueList<MRL>::ConstIterator it = mrlList.begin(); it != end; ++it)
+ 		after = insertItem(after, *it);
+-	updatetqStatus();
++	updateStatus();
+ 	if (m_random) createRandomList();
+ }
+ 
+@@ -1419,7 +1419,7 @@ void PlayList::clearList()
+ 		m_playlistFilter->clear();
+ 		m_searchSelection = false;
+ 	}
+-	updatetqStatus();
++	updateStatus();
+ 	m_currentEntry = NULL;
+ 	m_currentRandomListEntry = -1;
+ }
+@@ -1435,7 +1435,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
+ 		{
+ 			for (uint i=0; i < urls.count() ;i++)
+ 			{
+-				//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i]));
++				//KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
+ 				//newurls << url.path(-1);
+ 				//kdDebug() << "PlayList: Dropped " << url.path() << endl;
+ 				newurls << urls[i];
+@@ -1453,7 +1453,7 @@ void PlayList::slotDropEvent(TQDropEvent* dev, TQListViewItem* after)
+ 	else
+ 		if (strcmp(dev->format(), "text/x-moz-url") == 0)    /* for mozilla drops */
+ 		{
+-			TQByteArray data = dev->tqencodedData("text/plain");
++			TQByteArray data = dev->encodedData("text/plain");
+ 			TQString md(data);
+ 			add(md, after);
+ 		}
+@@ -1602,7 +1602,7 @@ void PlayList::mergeMeta(const MRL& mrl)
+ 			if (tmp->isVisible())
+ 				m_playTimeVisible += timeStringToMs(tmp->length());
+ 
+-			updatetqStatus();
++			updateStatus();
+ 		}
+ 	}
+ 
+@@ -1762,10 +1762,10 @@ void PlayList::slotRemoveSelected()
+ 	}
+ 
+ 	if (m_random) createRandomList();
+-	updatetqStatus();
++	updateStatus();
+ }
+ 
+-void PlayList::updatetqStatus()
++void PlayList::updateStatus()
+ {
+ 	TQString status;
+ 	if (isQueueMode())
+@@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const TQString& text)
+ 		m_searchSelection = true;
+ 
+ 	if (m_random) createRandomList();
+-	updatetqStatus();
++	updateStatus();
+ }
+ 
+ 
+@@ -2170,7 +2170,7 @@ void PlayList::slotCopy()
+ 
+ 	for (uint i=0; i<selected.count(); i++)
+ 	{
+-		urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
++		urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
+ 	}
+ 
+ 	TQApplication::tqclipboard()->setData(new TQUriDrag(urlList));
+@@ -2209,7 +2209,7 @@ void PlayList::slotPlaylistFromSelected()
+ void PlayList::slotAddToQueue(MRL mrl)
+ {
+ 	m_queue.append(mrl);
+-	updatetqStatus();
++	updateStatus();
+ }
+ 
+ /**** helper ****/
+diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
+index 7f0a89a..7be7a6d 100644
+--- a/kaffeine/src/input/audiobrowser/playlist.h
++++ b/kaffeine/src/input/audiobrowser/playlist.h
+@@ -239,7 +239,7 @@ private slots:
+ 
+ private:
+ 	TQListViewItem* insertItem(TQListViewItem* after, const MRL&);
+-	void updatetqStatus();
++	void updateStatus();
+ 	void createRandomList();
+ 	void getMetaInfo(MRL& mrl, const TQString& mimeName);
+ 	void setupActions();
+diff --git a/kaffeine/src/input/audiobrowser/playlistitem.cpp b/kaffeine/src/input/audiobrowser/playlistitem.cpp
+index 813f5c2..fe5a494 100644
+--- a/kaffeine/src/input/audiobrowser/playlistitem.cpp
++++ b/kaffeine/src/input/audiobrowser/playlistitem.cpp
+@@ -249,10 +249,10 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
+ {
+ 	if (isCurrent)
+ 	{
+-		TQColorGroup tqcolorGroup = cg;
++		TQColorGroup colorGroup = cg;
+ 
+-		TQColor base = tqcolorGroup.base();
+-		TQColor selection = tqcolorGroup.highlight();
++		TQColor base = colorGroup.base();
++		TQColor selection = colorGroup.highlight();
+ 
+ 		int r = (base.red() + selection.red()) / 2;
+ 		int b = (base.blue() + selection.blue()) / 2;
+@@ -260,8 +260,8 @@ void PlaylistItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, i
+ 
+ 		TQColor c(r, g, b);
+ 
+-		tqcolorGroup.setColor(TQColorGroup::Base, c);
+-		TQListViewItem::paintCell(p, tqcolorGroup, column, width, align);
++		colorGroup.setColor(TQColorGroup::Base, c);
++		TQListViewItem::paintCell(p, colorGroup, column, width, align);
+ 	}
+ 	else
+ 		return KListViewItem::paintCell(p, cg, column, width, align);
+diff --git a/kaffeine/src/input/disc/disc.cpp b/kaffeine/src/input/disc/disc.cpp
+index 62dc3a5..e392dca 100644
+--- a/kaffeine/src/input/disc/disc.cpp
++++ b/kaffeine/src/input/disc/disc.cpp
+@@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
+ void MLabel::paintEvent( TQPaintEvent *pe )
+ {
+ 	TQLabel::paintEvent( pe );
+-	TQColorGroup cg = parentWidget()->tqcolorGroup();
++	TQColorGroup cg = parentWidget()->colorGroup();
+ 	TQColor base = cg.base();
+ 	TQColor selection = cg.highlight();
+ 	int r = (base.red() + selection.red()) / 2;
+@@ -76,22 +76,22 @@ void MListView::resizeEvent( TQResizeEvent *rev )
+ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : KaffeineInput(objParent , name)
+ {
+ 	mainWidget = new TQVBox( parent );
+-	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
++	mainWidget->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+ 	split = new TQSplitter( mainWidget );
+ 	split->setOpaqueResize( true );
+ 	widg = new TQWidget( split );
+ 	widg->setMinimumWidth( 200 );
+-	widg->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
++	widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+ 	TQVBoxLayout *wb = new TQVBoxLayout( widg, 0, 0 );
+ 	discLab = new MLabel( widg );
+ 	wb->addWidget( discLab );
+ 	playerBox = new TQVBox( widg );
+ 	wb->addWidget( playerBox );
+ 	playerBox->setMinimumWidth( 200 );
+-	playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
++	playerBox->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+ 	panel = new TQFrame( split );
+ 	split->moveToFirst( panel );
+-	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
++	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+ 	split->setResizeMode( panel, TQSplitter::KeepSize );
+ 
+ 	TQVBoxLayout *vb = new TQVBoxLayout( panel, 3, 3 );
+@@ -99,13 +99,13 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
+ 	cdBtn->setTextLabel( i18n("Play CD") );
+ 	cdBtn->setTextPosition( TQToolButton::Under );
+ 	cdBtn->setUsesTextLabel( true );
+-	cdBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
++	cdBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+ 	TQToolTip::add( cdBtn, i18n("Play CD"));
+ 	ripBtn = new TQToolButton( panel );
+ 	ripBtn->setTextLabel( i18n("Rip CD") );
+ 	ripBtn->setTextPosition( TQToolButton::Under );
+ 	ripBtn->setUsesTextLabel( true );
+-	ripBtn->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
++	ripBtn->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+ 	TQToolTip::add( ripBtn, i18n("Rip CD"));
+ 
+ 	TQHBoxLayout *h1 = new TQHBoxLayout();
+@@ -124,7 +124,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
+ 	artistLab = new TQLabel( "", panel );
+ 	artistLab->setLineWidth(1);
+ 	artistLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
+-	artistLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
++	artistLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ 	h1->addWidget( artistLab );
+ 	vb->addLayout( h1 );
+ 	h1 = new TQHBoxLayout();
+@@ -132,7 +132,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
+ 	albumLab = new TQLabel( "", panel );
+ 	albumLab->setLineWidth(1);
+ 	albumLab->setFrameStyle(TQFrame::Panel|TQFrame::Sunken);
+-	albumLab->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
++	albumLab->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+ 	h1->addWidget( albumLab );
+ 	vb->addLayout( h1 );
+ 
+@@ -161,7 +161,7 @@ Disc::Disc( TQWidget* parent, TQObject *objParent, const char *name ) : Kaffeine
+ 	enc->setTextPosition( TQToolButton::Under );
+ 	enc->setUsesTextLabel( true );
+ 	enc->setIconSet( KGlobal::iconLoader()->loadIconSet("kilogram", KIcon::Small) );
+-	enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
++	enc->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
+ 	vb->addWidget( encodeWidget );
+ 	encodeWidget->hide();
+diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
+index e20c98f..1d163d3 100644
+--- a/kaffeine/src/input/disc/paranoiasettings.ui
++++ b/kaffeine/src/input/disc/paranoiasettings.ui
+@@ -165,7 +165,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>20</width>
+                             <height>60</height>
+@@ -190,7 +190,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>152</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
+index 09a2a87..d956e5b 100644
+--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
++++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
+@@ -108,7 +108,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>20</width>
+                             <height>16</height>
+@@ -133,7 +133,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>107</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
+index b07342a..b243300 100644
+--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
++++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
+@@ -98,7 +98,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>20</width>
+                             <height>81</height>
+@@ -123,7 +123,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>157</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui
+index 2324983..1131eec 100644
+--- a/kaffeine/src/input/dvb/audioeditorui.ui
++++ b/kaffeine/src/input/dvb/audioeditorui.ui
+@@ -118,7 +118,7 @@
+                                             <property name="sizeType">
+                                                 <enum>Expanding</enum>
+                                             </property>
+-                                            <property name="tqsizeHint">
++                                            <property name="sizeHint">
+                                                 <size>
+                                                     <width>40</width>
+                                                     <height>20</height>
+@@ -137,7 +137,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>20</width>
+                                             <height>40</height>
+@@ -274,7 +274,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>40</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui
+index 86da4cf..a0939a2 100644
+--- a/kaffeine/src/input/dvb/broadcasteditorui.ui
++++ b/kaffeine/src/input/dvb/broadcasteditorui.ui
+@@ -117,7 +117,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>20</width>
+                                             <height>20</height>
+@@ -150,7 +150,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>20</width>
+                                             <height>20</height>
+@@ -244,7 +244,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>20</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui
+index 24abfbb..ceb3d62 100644
+--- a/kaffeine/src/input/dvb/channeleditorui.ui
++++ b/kaffeine/src/input/dvb/channeleditorui.ui
+@@ -72,7 +72,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>40</width>
+                                     <height>20</height>
+@@ -633,7 +633,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>20</width>
+                             <height>166</height>
+@@ -666,7 +666,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>150</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui
+index 5b7a3bd..87baff7 100644
+--- a/kaffeine/src/input/dvb/crontimerui.ui
++++ b/kaffeine/src/input/dvb/crontimerui.ui
+@@ -45,7 +45,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>32</width>
+                                     <height>20</height>
+@@ -138,7 +138,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>20</width>
+                                             <height>67</height>
+@@ -157,7 +157,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>39</width>
+                                     <height>20</height>
+@@ -243,7 +243,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>32</width>
+                                     <height>20</height>
+@@ -262,7 +262,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>20</width>
+                             <height>95</height>
+@@ -295,7 +295,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>177</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp
+index b842018..a777f79 100644
+--- a/kaffeine/src/input/dvb/dvbevents.cpp
++++ b/kaffeine/src/input/dvb/dvbevents.cpp
+@@ -170,7 +170,7 @@ bool DVBevents::tableEIT( unsigned char* buffer )
+ 	TQPtrList<EventDesc> *currentEvents;
+ 	bool nodesc, parse;
+ 	TQDateTime start, cur, dt;
+-	unsigned int cdt = TQDateTime::tqcurrentDateTime().toTime_t();
++	unsigned int cdt = TQDateTime::currentDateTime().toTime_t();
+ 
+ 	tid = getBits(buf,0,8);
+ 	length = getBits(buf,12,12);
+@@ -298,7 +298,7 @@ ifend:
+ 		if ( parse )
+ 			++(desc->sn);
+ 		if ( nodesc ) {
+-			cur = TQDateTime::tqcurrentDateTime();
++			cur = TQDateTime::currentDateTime();
+ 			dt = desc->startDateTime;
+ 			sec = desc->duration.hour()*3600+desc->duration.minute()*60+desc->duration.second();
+ 			if ( dt.addSecs( sec )<cur || desc->title.length()<3 ) {
+diff --git a/kaffeine/src/input/dvb/dvbout.cpp b/kaffeine/src/input/dvb/dvbout.cpp
+index bd94126..1f392a8 100644
+--- a/kaffeine/src/input/dvb/dvbout.cpp
++++ b/kaffeine/src/input/dvb/dvbout.cpp
+@@ -402,7 +402,7 @@ bool DVBout::goRec( const TQString &name, int maxsize, RecTimer *t )
+ 
+ 	haveRec = true;
+ 	if ( recTimer ) {
+-		TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().secsTo(recTimer->begin) );
++		TQTime t = recTimer->duration.addSecs( TQDateTime::currentDateTime().secsTo(recTimer->begin) );
+ 		stopRecTimer.start( TQTime().msecsTo( t ), true );
+ 	}
+ 	else
+diff --git a/kaffeine/src/input/dvb/dvbpanel.cpp b/kaffeine/src/input/dvb/dvbpanel.cpp
+index 3623d7f..1b54229 100644
+--- a/kaffeine/src/input/dvb/dvbpanel.cpp
++++ b/kaffeine/src/input/dvb/dvbpanel.cpp
+@@ -114,7 +114,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	dvb.setAutoDelete( true );
+ 
+ 	mainWidget = new TQVBox( parent );
+-	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
++	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+ 	split = new TQSplitter( mainWidget );
+ 	split->setOpaqueResize( true );
+ 	pbox = new TQVBox( split );
+@@ -129,7 +129,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	iconView->setSpacing(0);
+ 	iconView->setItemsMovable(false);
+ 	iconView->setResizeMode(TQIconView::Adjust);
+-	iconView->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
++	iconView->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ 	playerBox = new TQVBox( pbox );
+ 	playerBox->setMinimumWidth( 200 );
+ 	panel = new TQFrame( split );
+@@ -192,7 +192,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	channelsCb->addColumn( i18n("Name") );
+ 	channelsCb->addColumn( i18n("Source") );
+ 	channelsCb->setAllColumnsShowFocus( true );
+-	channelsCb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
++	channelsCb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
+ 	//channelsCb->setEnabled( false );
+ 	vb->addWidget( channelsCb );
+ 
+@@ -209,14 +209,14 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	h1 = new TQHBoxLayout();
+ 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ 	shiftLed = new KLed( panel );
+-	shiftLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
++	shiftLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ 	shiftLed->setDarkFactor( 500 );
+ 	shiftLed->off();
+ 	TQToolTip::add( shiftLed, i18n("Time shifting") );
+ 	h1->addWidget( shiftLed );
+ 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ 	recordLed = new KLed( panel );
+-	recordLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
++	recordLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ 	recordLed->setColor( TQColor( 255,0,0 ) );
+ 	recordLed->setDarkFactor( 500 );
+ 	recordLed->off();
+@@ -224,7 +224,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	h1->addWidget( recordLed );
+ 	h1->addItem( new TQSpacerItem( 1, 1, TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+ 	broadcastLed = new KLed( panel );
+-	broadcastLed->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
++	broadcastLed->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+ 	broadcastLed->setColor( TQColor( 255,128,0 ) );
+ 	broadcastLed->setDarkFactor( 500 );
+ 	broadcastLed->off();
+@@ -272,7 +272,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
+ 	connect( &showOsdTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(dvbOSD()) );
+ 	connect( &tuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) );
+ 	connect( &stopTuningTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(setTuning()) );
+-	connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disktqStatus()) );
++	connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(diskStatus()) );
+ 
+ 	setConfig();
+ 
+@@ -295,7 +295,7 @@ void DvbPanel::togglePanel()
+ 
+ 
+ 
+-void DvbPanel::disktqStatus()
++void DvbPanel::diskStatus()
+ {
+ 	double freemb;
+ 	struct statvfs buf;
+@@ -644,7 +644,7 @@ void DvbPanel::dumpEvents()
+ 	if ( f.open(IO_WriteOnly|IO_Truncate) ) {
+ 		fprintf( stderr, "Creating events file.\n");
+ 		TQTextStream tt( &f );
+-		tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
++		tt << "Saved: "+TQDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
+ 		k= 0;
+ 		for( i=0; i<events.getNSource(); i++ ) {
+ 			if ( !(esrc=events.getNEventSource( i )) )
+@@ -956,7 +956,7 @@ void DvbPanel::dvbOSD(ChannelDesc liveChannel, DvbStream *d, int timeShift /* =
+ 			s = s+" - ";
+ 			s = s+desc->title;
+ 			if ( !osdMode && !first && !myshift ) {
+-				TQDateTime dt = TQDateTime::tqcurrentDateTime();
++				TQDateTime dt = TQDateTime::currentDateTime();
+ 				int secs = desc->startDateTime.secsTo( dt );
+ 				i = TQTime().secsTo( desc->duration );
+ 				if ( i!=0 )
+@@ -1131,7 +1131,7 @@ void DvbPanel::camClicked( int devNum )
+ 
+ 
+ 
+-TQPtrList<Transponder> DvbPanel::getSourcestqStatus()
++TQPtrList<Transponder> DvbPanel::getSourcesStatus()
+ {
+ 	int i, j;
+ 	TQStringList list;
+@@ -1163,7 +1163,7 @@ void DvbPanel::fillChannelList( ChannelDesc *ch )
+ 	ChannelDesc *chan;
+ 	KListViewItem *it, *visible=0;
+ 	bool cont=false;
+-	TQPtrList<Transponder> trans = getSourcestqStatus();
++	TQPtrList<Transponder> trans = getSourcesStatus();
+ 	trans.setAutoDelete( true );
+ 
+ 	searchLE->clear();
+@@ -1320,7 +1320,7 @@ void DvbPanel::checkTimers()
+ 	bool live=false;
+ 	RecTimer *t;
+ 	ChannelDesc *chan;
+-	TQDateTime cur=TQDateTime::tqcurrentDateTime();
++	TQDateTime cur=TQDateTime::currentDateTime();
+ 	DvbStream *d;
+ 
+ 	for ( i=0; i<(int)timers.count(); i++ ) {
+@@ -1409,13 +1409,13 @@ void DvbPanel::setRecord()
+ 		if ( !dvbConfig->filenameFormat.contains("%chan") )
+ 			s = curchan.name;
+ 		if ( !dvbConfig->filenameFormat.contains("%date") )
+-			s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" );
++			s+="_"+TQDateTime::currentDateTime().toString( "yyyyMMdd-hhmmss" );
+ 	}
+ 
+ 	rt = new RecTimer();
+ 	rt->name = s;
+ 	rt->channel = curchan.name;
+-	rt->begin = TQDateTime::tqcurrentDateTime();
++	rt->begin = TQDateTime::currentDateTime();
+ 	rt->duration = TQTime( 0,0,0).addSecs( dvbConfig->instantDuration*60 ) ;
+ 	rt->running = 1;
+ 	rt->mode = 0;
+@@ -2074,7 +2074,7 @@ void DvbPanel::pauseLiveTV()
+ 	if ( !d )
+ 		return;
+ 
+-	timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().toString("yyyyMMddThhmmss")+".m2t";
++	timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::currentDateTime().toString("yyyyMMddThhmmss")+".m2t";
+ 	if ( d->doPause( timeShiftFileName ) )
+ 		emit setTimeShiftFilename( timeShiftFileName );
+ }
+diff --git a/kaffeine/src/input/dvb/dvbpanel.h b/kaffeine/src/input/dvb/dvbpanel.h
+index d126bb6..4dbf554 100644
+--- a/kaffeine/src/input/dvb/dvbpanel.h
++++ b/kaffeine/src/input/dvb/dvbpanel.h
+@@ -154,7 +154,7 @@ public slots:
+ 
+ 	void dvbNewTimer( TQString name, TQString channel, TQString datetime, TQString duration );
+ 	int getSNR( int device );
+-	void disktqStatus();
++	void diskStatus();
+ 	void camClicked( int devNum );
+ 
+ private:
+@@ -163,7 +163,7 @@ private:
+ 	bool getTimerList();
+ 	bool saveTimerList();
+ 	void fillChannelList( ChannelDesc *ch=0 );
+-	TQPtrList<Transponder> getSourcestqStatus();
++	TQPtrList<Transponder> getSourcesStatus();
+ 	void updateModeTimer( RecTimer *t );
+ 	DvbStream* getWorkingDvb( int mode, ChannelDesc *chan );
+ 
+diff --git a/kaffeine/src/input/dvb/dvbstream.cpp b/kaffeine/src/input/dvb/dvbstream.cpp
+index b3ca31d..4ef290b 100644
+--- a/kaffeine/src/input/dvb/dvbstream.cpp
++++ b/kaffeine/src/input/dvb/dvbstream.cpp
+@@ -84,7 +84,7 @@ DvbStream::DvbStream( Device *d, const TQString &charset, EventTable *et )
+ 	cam = NULL;
+ 	plug = NULL;
+ 
+-	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) );
++	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checkStatus()) );
+ }
+ 
+ 
+@@ -221,7 +221,7 @@ bool DvbStream::closeFe()
+ 
+ 
+ 
+-void DvbStream::connecttqStatus( bool con )
++void DvbStream::connectStatus( bool con )
+ {
+ 	if ( con )
+ 		statusTimer.start( 1000 );
+@@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o )
+ 
+ 
+ 
+-bool DvbStream::checktqStatus()
++bool DvbStream::checkStatus()
+ {
+ 	int32_t strength;
+ 	fe_status_t festatus;
+@@ -887,19 +887,19 @@ bool DvbStream::checktqStatus()
+ 
+        strength=0;
+ 	ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength);
+-	emit signaltqStatus(strength*100/65535);
++	emit signalStatus(strength*100/65535);
+ 
+ 	strength=0;
+ 	ioctl(fdFrontend,FE_READ_SNR,&strength);
+-	emit snrtqStatus(strength*100/65535);
++	emit snrStatus(strength*100/65535);
+ 
+ 	memset( &festatus, 0, sizeof(festatus) );
+ 	ioctl(fdFrontend,FE_READ_STATUS,&festatus);
+ 
+ 	if (festatus & FE_HAS_LOCK)
+-		emit locktqStatus( true );
++		emit lockStatus( true );
+ 	else {
+-		emit locktqStatus( false );
++		emit lockStatus( false );
+ 		ret = false;
+ 	}
+ 
+@@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend()
+ 
+ void DvbStream::setScanning( bool b )
+ {
+-	connecttqStatus( b );
++	connectStatus( b );
+ }
+ 
+ 
+diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h
+index f793aa0..1d2d780 100644
+--- a/kaffeine/src/input/dvb/dvbstream.h
++++ b/kaffeine/src/input/dvb/dvbstream.h
+@@ -99,7 +99,7 @@ public :
+ 
+ public slots:
+ 
+-	bool checktqStatus();
++	bool checkStatus();
+ 	void receivePlayDvb();
+ 	void recordEnded( DVBout *o, RecTimer *t, bool kill );
+ 	void receiveShifting( bool b );
+@@ -125,7 +125,7 @@ private :
+ 	void startReading();
+ 	bool openFe();
+ 	bool closeFe();
+-	void connecttqStatus( bool con );
++	void connectStatus( bool con );
+ 
+ 	TQFile liveFile;
+ 	bool timeShifting;
+@@ -157,9 +157,9 @@ signals:
+ 	void timerEnded(RecTimer*);
+ 
+ 	void errorMsg( TQString );
+-	void snrtqStatus( int );
+-	void signaltqStatus( int );
+-	void locktqStatus( bool );
++	void snrStatus( int );
++	void signalStatus( int );
++	void lockStatus( bool );
+ 	void shifting( bool );
+ 
+ };
+diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
+index d81f671..7898f84 100644
+--- a/kaffeine/src/input/dvb/kgradprogress.cpp
++++ b/kaffeine/src/input/dvb/kgradprogress.cpp
+@@ -34,7 +34,7 @@ KGradProgress::KGradProgress( TQWidget *parent ) : TQLabel( parent )
+ 	setFrameStyle( TQFrame::Box | TQFrame::Plain );
+ 	setLineWidth(1);
+ 	setMidLineWidth(0);
+-	tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
++	setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+ }
+ 
+ 
+@@ -113,7 +113,7 @@ void KGradProgress::paintEvent(TQPaintEvent *event)
+ 
+ 
+ 
+-TQSize KGradProgress::tqsizeHint()
++TQSize KGradProgress::sizeHint()
+ {
+ 	TQLabel lab( "This is a progress bar.", 0 );
+ 	return TQSize( lab.width(), int(font().pointSize()*1.2) );
+diff --git a/kaffeine/src/input/dvb/kgradprogress.h b/kaffeine/src/input/dvb/kgradprogress.h
+index 887019d..84aeee0 100644
+--- a/kaffeine/src/input/dvb/kgradprogress.h
++++ b/kaffeine/src/input/dvb/kgradprogress.h
+@@ -37,7 +37,7 @@ public:
+ 	KGradProgress( TQWidget *parent );
+ 	~KGradProgress();
+ 	virtual void paintEvent(TQPaintEvent *event);
+-	virtual TQSize tqsizeHint();
++	virtual TQSize sizeHint();
+ 	virtual TQSizePolicy sizePolicy();
+ 
+ public slots:
+diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp
+index c66c5d1..be5c5af 100644
+--- a/kaffeine/src/input/dvb/ktimereditor.cpp
++++ b/kaffeine/src/input/dvb/ktimereditor.cpp
+@@ -85,7 +85,7 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
+ 	channelComb->insertStringList( chanList );
+ 
+ 	if ( newone ) {
+-		begin->setDateTime( TQDateTime::tqcurrentDateTime() );
++		begin->setDateTime( TQDateTime::currentDateTime() );
+ 		duration->setTime( TQTime(2,0,0) );
+ 	}
+ 	else {
+diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
+index f05ff3a..ea00f76 100644
+--- a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
++++ b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbevents.cpp
+@@ -297,7 +297,7 @@ void EventTable::loadEpg()
+ 	char buf[EPGBUFSIZE];
+ 	int num=0;
+ 	unsigned char sync;
+-	TQDateTime cur=TQDateTime::tqcurrentDateTime();
++	TQDateTime cur=TQDateTime::currentDateTime();
+ 	TQTime t1=TQTime::currentTime();
+ 
+ 	if ( epgLoaded )
+@@ -416,7 +416,7 @@ void EventTable::run()
+ 
+ 	setpriority(PRIO_PROCESS, 0, 19);
+ 
+-	cur = TQDateTime::tqcurrentDateTime();
++	cur = TQDateTime::currentDateTime();
+ 	for( k=0; k<getNSource(); k++ ) {
+ 		if ( !(esrc=getNEventSource( k )) )
+ 			continue;
+diff --git a/kaffeine/src/input/dvb/scandialog.cpp b/kaffeine/src/input/dvb/scandialog.cpp
+index f433054..7f760e6 100644
+--- a/kaffeine/src/input/dvb/scandialog.cpp
++++ b/kaffeine/src/input/dvb/scandialog.cpp
+@@ -148,9 +148,9 @@ ScanDialog::ScanDialog( TQPtrList<DvbStream> *d, TQPtrList<ChannelDesc> *ch, TQS
+ 		offsetGroup->hide();
+ 	bool ok=false;
+ 	dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
+-	connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
+-	connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
+-	connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
++	connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
++	connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
++	connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
+ 	connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
+ 
+ 	connect( &checkTimer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( checkNewChannel() ) );
+@@ -209,9 +209,9 @@ void ScanDialog::setDvb( int index )
+ 				checkTimer.stop();
+ 			if ( progressTimer.isActive() )
+ 				progressTimer.stop();
+-			disconnect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
+-			disconnect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
+-			disconnect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
++			disconnect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
++			disconnect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
++			disconnect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
+ 			disconnect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
+ 			ds->setScanning( false );
+ 			dvbsi->stop();
+@@ -219,9 +219,9 @@ void ScanDialog::setDvb( int index )
+ 			ds = dvb->at(i);
+ 			ds->setScanning( true );
+ 			dvbsi = new DVBsi( &ok, ds->getAdapter(), ds->getTuner(), ds, defaultCharset );
+-			connect( ds, TQT_SIGNAL(snrtqStatus(int)), snr, TQT_SLOT(setProgress(int)) );
+-			connect( ds, TQT_SIGNAL(signaltqStatus(int)), signal, TQT_SLOT(setProgress(int)) );
+-			connect( ds, TQT_SIGNAL(locktqStatus(bool)), this, TQT_SLOT(setLock(bool)) );
++			connect( ds, TQT_SIGNAL(snrStatus(int)), snr, TQT_SLOT(setProgress(int)) );
++			connect( ds, TQT_SIGNAL(signalStatus(int)), signal, TQT_SLOT(setProgress(int)) );
++			connect( ds, TQT_SIGNAL(lockStatus(bool)), this, TQT_SLOT(setLock(bool)) );
+ 			connect( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
+ 			break;
+ 		}
+diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui
+index d85d58f..dbcff8b 100644
+--- a/kaffeine/src/input/dvb/scandialogui.ui
++++ b/kaffeine/src/input/dvb/scandialogui.ui
+@@ -118,7 +118,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>40</width>
+                                             <height>20</height>
+@@ -257,7 +257,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>20</width>
+                                             <height>18</height>
+@@ -282,7 +282,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>21</width>
+                                             <height>19</height>
+@@ -503,7 +503,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>40</width>
+                                     <height>20</height>
+diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui
+index 3935e78..fb8d391 100644
+--- a/kaffeine/src/input/dvb/subeditorui.ui
++++ b/kaffeine/src/input/dvb/subeditorui.ui
+@@ -51,7 +51,7 @@
+                     <property name="sizeType">
+                         <enum>Expanding</enum>
+                     </property>
+-                    <property name="tqsizeHint">
++                    <property name="sizeHint">
+                         <size>
+                             <width>40</width>
+                             <height>20</height>
+@@ -159,7 +159,7 @@
+                                     <property name="sizeType">
+                                         <enum>Expanding</enum>
+                                     </property>
+-                                    <property name="tqsizeHint">
++                                    <property name="sizeHint">
+                                         <size>
+                                             <width>40</width>
+                                             <height>20</height>
+@@ -178,7 +178,7 @@
+                             <property name="sizeType">
+                                 <enum>Expanding</enum>
+                             </property>
+-                            <property name="tqsizeHint">
++                            <property name="sizeHint">
+                                 <size>
+                                     <width>20</width>
+                                     <height>180</height>
+diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
+index 19e82ed..ede428f 100644
+--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
++++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
+@@ -33,14 +33,14 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
+ 	: KaffeineInput( objParent, name )
+ {
+ 	mainWidget = new TQVBox( parent );
+-	mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
++	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+ 	split = new TQSplitter( mainWidget );
+ 	split->setOpaqueResize( true );
+ 	playerBox = new TQVBox( split );
+ 	playerBox->setMinimumWidth( 200 );
+ 	channelsLb = new TQListBox( split );
+ 	split->moveToFirst( channelsLb );
+-	channelsLb->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
++	channelsLb->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
+ 	split->setResizeMode( channelsLb, TQSplitter::KeepSize );
+ 
+ 	cdAddress = ad;
+@@ -324,7 +324,7 @@ void CdWidget::pauseLiveTV()
+ 	if ( !dump )
+ 		return;
+ 	if ( dump->running() ) {
+-		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts";
++		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::currentDateTime().toString( Qt::ISODate )+".ts";
+ 		if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName );
+ 	}
+ }
+diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp
+index 0e9dcdf..a110a0a 100644
+--- a/kaffeine/src/inputmanager.cpp
++++ b/kaffeine/src/inputmanager.cpp
+@@ -323,7 +323,7 @@ bool InputManager::playbackFinished( MRL &mrl )
+ 
+ void InputManager::statusBarMessage( const TQString &msg )
+ {
+-	kaffeine->slotChangePlaylisttqStatus( msg );
++	kaffeine->slotChangePlaylistStatus( msg );
+ }
+ 
+ 
+@@ -530,13 +530,13 @@ void InputManager::fullscreen( bool b )
+ 	int id=0;
+ 
+ 	if ( b ) {
+-		stack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
++		stack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
+ 		oldMainWidget = currentMainWidget;
+ 		show( 2 );
+ 		mtBar->hide();
+ 	}
+ 	else {
+-		stack->tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
++		stack->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+ 		mtBar->show();
+ 		if ( oldMainWidget==startWindow )
+ 			id = 1;
+@@ -578,7 +578,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
+ 		{
+ 			for (uint i=0; i < urls.count() ;i++)
+ 			{
+-				//KURL url(TQUriDrag::tqunicodeUriToUri(urls[i]));
++				//KURL url(TQUriDrag::unicodeUriToUri(urls[i]));
+ 				//newurls << url.path(-1);
+ 				//kdDebug() << "Kaffeine: Dropped " << url.path() << endl;
+ 				newurls << urls[i];
+@@ -596,7 +596,7 @@ void PlayerContainer::dropEvent(TQDropEvent* dev)
+ 	else
+ 		if (strcmp(dev->format(), "text/x-moz-url") == 0)    // for mozilla drops
+ 		{
+-			TQByteArray data = dev->tqencodedData("text/plain");
++			TQByteArray data = dev->encodedData("text/plain");
+ 			TQString md(data);
+ 			emit signalURLDropEvent(md);
+ 		}
+diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
+index c8cca22..8e2f412 100644
+--- a/kaffeine/src/instwizard.cpp
++++ b/kaffeine/src/instwizard.cpp
+@@ -272,7 +272,7 @@ void InstWizard::internalWizard()
+ 
+ void InstWizard::slotStdout(KProcess *, char *buffer, int buflen)
+ {
+-	TQString output = TQString::tqfromLatin1(buffer, buflen);
++	TQString output = TQString::fromLatin1(buffer, buflen);
+ 	kdDebug() << "WizardDialog: got from hdparm: " << output << "\n";
+ 	stdout.append(output);
+ }
+diff --git a/kaffeine/src/kaffeine.cpp b/kaffeine/src/kaffeine.cpp
+index 9a83567..5b188da 100644
+--- a/kaffeine/src/kaffeine.cpp
++++ b/kaffeine/src/kaffeine.cpp
+@@ -653,7 +653,7 @@ void Kaffeine::dropEvent(TQDropEvent* dev)
+   else
+   if (strcmp(dev->format(), "text/x-moz-url") == 0)    // for mozilla drops
+   {
+-    TQByteArray data = dev->tqencodedData("text/plain");
++    TQByteArray data = dev->encodedData("text/plain");
+     TQString md(data);
+     load(md);
+   }
+@@ -1087,7 +1087,7 @@ void Kaffeine::slotOpenFile()
+ 	KURL::List kurlList = KFileDialog::getOpenURLs(":kaffeine_openFile", fileFilter, 0, i18n("Open File(s)"));
+ 
+ 	for (KURL::List::Iterator it = kurlList.begin(); it != kurlList.end(); ++it)
+-		if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false))
++		if ((*it).isLocalFile() && (*it).path().endsWith(".iso", false))
+ 			(*it).setProtocol("dvd");
+ 
+ 	TQStringList urlList = kurlList.toStringList();
+@@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& )
+ }
+ 
+ 
+-void Kaffeine::slotChangePlaylisttqStatus(const TQString& )
++void Kaffeine::slotChangePlaylistStatus(const TQString& )
+ {
+ 	//statusBar()->changeItem(text, 9);
+ }
+diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h
+index 79ad0cc..4496d93 100644
+--- a/kaffeine/src/kaffeine.h
++++ b/kaffeine/src/kaffeine.h
+@@ -128,7 +128,7 @@ public slots:
+ 	void slotLoadURLS(const TQStringList&);
+ 	void slotSwitchToPlayerWindow();
+ 	void slotChangeStatusbar(const TQString&);
+-	void slotChangePlaylisttqStatus(const TQString&);
++	void slotChangePlaylistStatus(const TQString&);
+ 	void slotStop();
+ 	void slotPlayUnPause();
+ 
+diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
+index 1c32cae..308bfa5 100644
+--- a/kaffeine/src/kmultitabbar.cpp
++++ b/kaffeine/src/kmultitabbar.cpp
+@@ -121,9 +121,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
+ 	if (m_position==KMultiTabBar::Right)
+ 	{
+ 
+-                paint->setPen(tqcolorGroup().shadow());
++                paint->setPen(colorGroup().shadow());
+                 paint->drawLine(0,0,0,viewport()->height());
+-                paint->setPen(tqcolorGroup().background().dark(120));
++                paint->setPen(colorGroup().background().dark(120));
+                 paint->drawLine(1,0,1,viewport()->height());
+ 
+ 
+@@ -131,28 +131,28 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
+ 	else
+ 	if (m_position==KMultiTabBar::Left)
+ 	{
+-                paint->setPen(tqcolorGroup().light());
++                paint->setPen(colorGroup().light());
+ 		paint->drawLine(23,0,23,viewport()->height());
+                 paint->drawLine(22,0,22,viewport()->height());
+ 
+-                paint->setPen(tqcolorGroup().shadow());
++                paint->setPen(colorGroup().shadow());
+                 paint->drawLine(0,0,0,viewport()->height());
+ 	}
+ 	else
+ 	if (m_position==KMultiTabBar::Bottom)
+ 	{
+-		paint->setPen(tqcolorGroup().shadow());
++		paint->setPen(colorGroup().shadow());
+ 		paint->drawLine(0,0,viewport()->width(),0);
+-                paint->setPen(tqcolorGroup().background().dark(120));
++                paint->setPen(colorGroup().background().dark(120));
+                 paint->drawLine(0,1,viewport()->width(),1);
+ 	}
+ 	else
+ 	{
+-	        paint->setPen(tqcolorGroup().light());
++	        paint->setPen(colorGroup().light());
+ 		paint->drawLine(0,23,viewport()->width(),23);
+                 paint->drawLine(0,22,viewport()->width(),22);
+ 
+-/*                paint->setPen(tqcolorGroup().shadow());
++/*                paint->setPen(colorGroup().shadow());
+                 paint->drawLine(0,0,0,viewport()->height());*/
+ 
+ 	}
+@@ -458,7 +458,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
+ }
+ 
+ 
+-TQSize KMultiTabBarButton::tqsizeHint() const
++TQSize KMultiTabBarButton::sizeHint() const
+ {
+     constPolish();
+ 
+@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
+     }
+ #endif
+     if ( isMenuButton() )
+-        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
++        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+ 
+     if ( pixmap() ) {
+         TQPixmap *pm = (TQPixmap *)pixmap();
+@@ -484,7 +484,7 @@ TQSize KMultiTabBarButton::tqsizeHint() const
+         TQString s( text() );
+         bool empty = s.isEmpty();
+         if ( empty )
+-            s = TQString::tqfromLatin1("XXXX");
++            s = TQString::fromLatin1("XXXX");
+         TQFontMetrics fm = fontMetrics();
+         TQSize sz = fm.size( ShowPrefix, s );
+         if(!empty || !w)
+@@ -581,12 +581,12 @@ void KMultiTabBarTab::updateState()
+ 		if ((m_position==KMultiTabBar::Right || m_position==KMultiTabBar::Left)) {
+ 			setFixedWidth(24);
+ 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
+-				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
++				setFixedHeight(KMultiTabBarButton::sizeHint().width());
+ 			} else setFixedHeight(36);
+ 		} else {
+ 			setFixedHeight(24);
+ 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
+-				setFixedWidth(KMultiTabBarButton::tqsizeHint().width());
++				setFixedWidth(KMultiTabBarButton::sizeHint().width());
+ 			} else setFixedWidth(36);
+ 		}
+ 	} else {
+@@ -637,7 +637,7 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
+ 	const int height = 24;
+ 	if ((m_style==KMultiTabBar::KDEV3) || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
+ 		 if ((m_position==KMultiTabBar::Left) || (m_position==KMultiTabBar::Right))
+-			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
++			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::sizeHint();
+ 			else sh=TQSize(this->width(),this->height());
+ 	}
+ 	else
+@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
+ 
+ 	if (down) st|=TQStyle::Style_On;
+ 
+-	tqstyle().tqdrawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
+-	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), tqcolorGroup(),st);
++	tqstyle().drawControl(TQStyle::CE_PushButton,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
++	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,&painter,this, TQRect(0,0,pixmap.width(),pixmap.height()), colorGroup(),st);
+ 
+ 	switch (m_position) {
+ 		case KMultiTabBar::Left:
+@@ -671,8 +671,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
+ 			paint->drawPixmap(0,0,pixmap);
+ 			break;
+ 	}
+-//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+-//		tqcolorGroup(),TQStyle::Style_Enabled);
++//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
++//		colorGroup(),TQStyle::Style_Enabled);
+ 
+ 
+ }
+@@ -682,58 +682,58 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+         TQPixmap pixmap;
+ 	if ( iconSet())
+         	pixmap = iconSet()->pixmap( TQIconSet::Small, TQIconSet::Normal );
+-	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
++	paint->fillRect(0, 0, 24, 24, colorGroup().background());
+ 
+ 	if (!down)
+ 	{
+ 
+ 		if (m_position==KMultiTabBar::Right)
+ 		{
+-			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
++			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
+ 
+-			paint->setPen(tqcolorGroup().background().dark(150));
++			paint->setPen(colorGroup().background().dark(150));
+ 			paint->drawLine(0,22,23,22);
+ 
+ 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
+ 
+-			paint->setPen(tqcolorGroup().shadow());
++			paint->setPen(colorGroup().shadow());
+ 			paint->drawLine(0,0,0,23);
+-			paint->setPen(tqcolorGroup().background().dark(120));
++			paint->setPen(colorGroup().background().dark(120));
+ 			paint->drawLine(1,0,1,23);
+ 
+ 		}
+ 		else
+ 		if ((m_position==KMultiTabBar::Bottom) || (m_position==KMultiTabBar::Top))
+ 		{
+-                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
++                        paint->fillRect(0,1,23,22,TQBrush(colorGroup().background()));
+ 
+                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
+ 
+-                        paint->setPen(tqcolorGroup().background().dark(120));
++                        paint->setPen(colorGroup().background().dark(120));
+                         paint->drawLine(23,0,23,23);
+ 
+ 
+-                        paint->setPen(tqcolorGroup().light());
++                        paint->setPen(colorGroup().light());
+                         paint->drawLine(0,22,23,22);
+                         paint->drawLine(0,23,23,23);
+-                	paint->setPen(tqcolorGroup().shadow());
++                	paint->setPen(colorGroup().shadow());
+                 	paint->drawLine(0,0,23,0);
+-                        paint->setPen(tqcolorGroup().background().dark(120));
++                        paint->setPen(colorGroup().background().dark(120));
+                         paint->drawLine(0,1,23,1);
+ 
+ 		}
+ 		else
+ 		{
+-			paint->setPen(tqcolorGroup().background().dark(120));
++			paint->setPen(colorGroup().background().dark(120));
+ 			paint->drawLine(0,23,23,23);
+-			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
++			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
+ 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
+ 
+-			paint->setPen(tqcolorGroup().light());
++			paint->setPen(colorGroup().light());
+ 			paint->drawLine(23,0,23,23);
+ 			paint->drawLine(22,0,22,23);
+ 
+-			paint->setPen(tqcolorGroup().shadow());
++			paint->setPen(colorGroup().shadow());
+ 			paint->drawLine(0,0,0,23);
+ 
+ 		}
+@@ -744,12 +744,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+ 	{
+ 		if (m_position==KMultiTabBar::Right)
+ 		{
+-			paint->setPen(tqcolorGroup().shadow());
++			paint->setPen(colorGroup().shadow());
+ 			paint->drawLine(0,height()-1,23,height()-1);
+ 			paint->drawLine(0,height()-2,23,height()-2);
+ 			paint->drawLine(23,0,23,height()-1);
+ 			paint->drawLine(22,0,22,height()-1);
+-			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().light()));
++			paint->fillRect(0,0,21,height()-3,TQBrush(colorGroup().light()));
+ 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
+ 
+ 			if (m_showActiveTabText)
+@@ -759,9 +759,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+ 				TQPixmap tpixmap(height()-25-3, width()-2);
+ 				TQPainter painter(&tpixmap);
+ 
+-				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
++				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+ 
+-				painter.setPen(tqcolorGroup().text());
++				painter.setPen(colorGroup().text());
+ 				painter.drawText(0,+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
+ 
+ 				paint->rotate(90);
+@@ -773,25 +773,25 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+ 		else
+ 		if (m_position==KMultiTabBar::Top)
+ 		{
+-			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
++			paint->fillRect(0,0,width()-1,23,TQBrush(colorGroup().light()));
+ 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
+ 			if (m_showActiveTabText)
+ 			{
+-				paint->setPen(tqcolorGroup().text());
++				paint->setPen(colorGroup().text());
+ 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
+ 			}
+ 		}
+ 		else
+ 		if (m_position==KMultiTabBar::Bottom)
+ 		{
+-			paint->setPen(tqcolorGroup().shadow());
++			paint->setPen(colorGroup().shadow());
+ 			paint->drawLine(0,23,width()-1,23);
+ 			paint->drawLine(0,22,width()-1,22);
+-			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
++			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
+ 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
+ 			if (m_showActiveTabText)
+ 			{
+-				paint->setPen(tqcolorGroup().text());
++				paint->setPen(colorGroup().text());
+ 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
+ 			}
+ 
+@@ -800,10 +800,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+ 		{
+ 
+ 
+-			paint->setPen(tqcolorGroup().shadow());
++			paint->setPen(colorGroup().shadow());
+ 			paint->drawLine(0,height()-1,23,height()-1);
+ 			paint->drawLine(0,height()-2,23,height()-2);
+-			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().light()));
++			paint->fillRect(0,0,23,height()-3,TQBrush(colorGroup().light()));
+ 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
+ 			if (m_showActiveTabText)
+ 			{
+@@ -813,9 +813,9 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
+                                 TQPixmap tpixmap(height()-25-3, width()-2);
+                                 TQPainter painter(&tpixmap);
+ 
+-                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
++                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(colorGroup().light()));
+ 
+-                                painter.setPen(tqcolorGroup().text());
++                                painter.setPen(colorGroup().text());
+                                 painter.drawText(tpixmap.width()-TQFontMetrics(TQFont()).width(m_text),+width()/2+TQFontMetrics(TQFont()).height()/2,m_text);
+ 
+                                 paint->rotate(-90);
+@@ -842,13 +842,13 @@ KMultiTabBar::KMultiTabBar(KMultiTabBarMode bm, TQWidget *parent,const char *nam
+ 	if (bm==Vertical)
+ 	{
+ 		m_l=new TQVBoxLayout(this);
+-		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
++		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+ //		setFixedWidth(24);
+ 	}
+ 	else
+ 	{
+ 		m_l=new TQHBoxLayout(this);
+-		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
++		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+ //		setFixedHeight(24);
+ 	}
+ 	m_l->setMargin(0);
+diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
+index 25aa255..bc9a615 100644
+--- a/kaffeine/src/kmultitabbar.h
++++ b/kaffeine/src/kmultitabbar.h
+@@ -182,7 +182,7 @@ public slots:
+          */
+ 	void setText(const TQString &);
+ 
+-	TQSize tqsizeHint() const;
++	TQSize sizeHint() const;
+ 
+ protected:
+ 	KMultiTabBar::KMultiTabBarPosition m_position;
+diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
+index 29d8587..2d0244a 100644
+--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
++++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
+@@ -39,7 +39,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
+   grid->setSpacing(5);
+ 
+   TQLabel* hueText = new TQLabel(i18n("Hue"), page);
+-  hueText->tqsetAlignment(AlignRight);
++  hueText->setAlignment(AlignRight);
+   m_hueSlider = new TQSlider(Qt::Horizontal, page);
+   m_hueSlider->setRange(-1000, 1000);
+   m_hueSlider->setSteps(10, 100);
+@@ -49,7 +49,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
+   grid->addWidget(m_hueSlider, 0, 1);
+ 
+   TQLabel* satText = new TQLabel(i18n("Saturation"), page);
+-  satText->tqsetAlignment(AlignRight);
++  satText->setAlignment(AlignRight);
+   m_satSlider = new TQSlider(Qt::Horizontal, page);
+   m_satSlider->setRange(-1000, 1000);
+   m_satSlider->setSteps(10, 100);
+@@ -59,7 +59,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
+   grid->addWidget(m_satSlider, 1, 1);
+ 
+   TQLabel* contrastText = new TQLabel(i18n("Contrast"), page);
+-  contrastText->tqsetAlignment(AlignRight);
++  contrastText->setAlignment(AlignRight);
+   m_contrastSlider = new TQSlider(Qt::Horizontal, page);
+   m_contrastSlider->setRange(-1000, 1000);
+   m_contrastSlider->setSteps(10, 100);
+@@ -69,7 +69,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contr, int bright, TQWidget *
+   grid->addWidget(m_contrastSlider, 2, 1);
+ 
+   TQLabel* brightText = new TQLabel(i18n("Brightness"), page);
+-  brightText->tqsetAlignment(AlignRight);
++  brightText->setAlignment(AlignRight);
+   m_brightSlider = new TQSlider(Qt::Horizontal, page);
+   m_brightSlider->setRange(-1000, 1000);
+   m_brightSlider->setSteps(10, 100);
+diff --git a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
+index 9abb266..c8d253c 100644
+--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
++++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
+@@ -78,12 +78,12 @@ DeinterlaceQuality::DeinterlaceQuality(TQWidget* filterDialog, TQWidget *parent,
+   connect(m_customBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotCustomBoxToggled(bool)));
+ 
+   m_customConfigButton = new KPushButton(i18n("Configure tvtime Deinterlace Plugin..."), mainWidget);
+-  m_customConfigButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
++  m_customConfigButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+   grid->addWidget(m_customConfigButton, 7, 1);
+   connect(m_customConfigButton, TQT_SIGNAL(clicked()), filterDialog, TQT_SLOT(show()));
+ 
+   TQLabel* note = new TQLabel(i18n("* <i>May require a patched 2.4 kernel (like RedHat one) or 2.6 kernel.</i>"), mainWidget);
+-  note->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
++  note->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
+   grid->addMultiCellWidget(note, 9, 9, 0, 1);
+ }
+ 
+diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+index 9385759..58a9818 100644
+--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+@@ -721,7 +721,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
+ 		}
+ 		case TIMER_EVENT_NEW_STATUS:
+ 		{
+-			emit signalXinetqStatus(m_statusString);
++			emit signalXineStatus(m_statusString);
+ 			break;
+ 		}
+ 		case TIMER_EVENT_CHANGE_CURSOR:
+@@ -1109,7 +1109,7 @@ bool KXineWidget::initXine()
+ 	if (isXineReady())
+ 		return true;
+ 
+-	emit signalXinetqStatus(i18n("Init xine..."));
++	emit signalXineStatus(i18n("Init xine..."));
+ 	globalPosChanged(); /* get global pos of the window */
+ 
+ 	/**** INIT XINE DISPLAY  ****/
+@@ -1377,7 +1377,7 @@ bool KXineWidget::initXine()
+ 
+ 	debugOut("xine init successful");
+ 
+-	emit signalXinetqStatus(i18n("Ready"));
++	emit signalXineStatus(i18n("Ready"));
+ 	emit signalXineReady();
+ 
+ 	/** something to play? **/
+@@ -1508,7 +1508,7 @@ bool KXineWidget::playDvb()
+ 	m_posTimer.start(1000);
+ 
+ 	emit signalXinePlaying();
+-	emit signalXinetqStatus(i18n("Playing"));
++	emit signalXineStatus(i18n("Playing"));
+ 
+ 	return true;
+ }
+@@ -1882,7 +1882,7 @@ bool KXineWidget::openDvb()
+ 	}
+ 	else fprintf(stderr,"xine pipe opened %s\n", m_trackURL.ascii());
+ 	m_trackURL = "DVB";
+-	emit signalXinetqStatus(i18n("DVB: opening..."));
++	emit signalXineStatus(i18n("DVB: opening..."));
+ 	TQTimer::singleShot( 0, this, TQT_SLOT(playDvb()) );
+ 
+ 	return true;
+@@ -1936,7 +1936,7 @@ void KXineWidget::slotPlay()
+ 	m_queue.remove(m_queue.find(m_trackURL));
+ 
+ 	if (m_trackURL != m_logoFile)
+-		emit signalXinetqStatus(i18n("Opening..."));
++		emit signalXineStatus(i18n("Opening..."));
+ 
+ 	/* check for external subtitle file or save url */
+ 	m_trackSubtitleURL = TQString();
+@@ -2053,7 +2053,7 @@ void KXineWidget::slotPlay()
+ 	CodecUtf8 = TQTextCodec::codecForName("UTF-8");
+ 
+ 	TQString infotag;
+-	infotag = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
++	infotag = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
+ 
+ 	if (currentUtf8Locale)
+ 		m_trackTitle = infotag;
+@@ -2068,9 +2068,9 @@ void KXineWidget::slotPlay()
+ 		TQString trackArtist=NULL;
+ 		TQString trackAlbum=NULL;
+ 		TQString trackComment=NULL;
+-		trackArtist = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST));
+-		trackAlbum = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM));
+-		trackComment = TQString::tqfromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT));
++		trackArtist = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ARTIST));
++		trackAlbum = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_ALBUM));
++		trackComment = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_COMMENT));
+ 		if (currentUtf8Locale)
+ 		{
+ 			m_trackArtist = trackArtist;
+@@ -2157,9 +2157,9 @@ void KXineWidget::slotPlay()
+ 	{
+ 		emit signalXinePlaying();
+ 		if (hasSaveURL())
+-			emit signalXinetqStatus(i18n("Recording"));
++			emit signalXineStatus(i18n("Recording"));
+ 		else
+-			emit signalXinetqStatus(i18n("Playing"));
++			emit signalXineStatus(i18n("Playing"));
+ 	}
+ }
+ 
+@@ -2239,7 +2239,7 @@ void KXineWidget::sendXineError()
+ 	{
+ 		if (m_trackURL != m_logoFile)
+ 		{
+-			emit signalXinetqStatus(i18n("Error"));
++			emit signalXineStatus(i18n("Error"));
+ 			emit signalXineError(error);
+ 		}
+ 		else
+@@ -2671,7 +2671,7 @@ void KXineWidget::slotSetVolume(int vol)
+ 		//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol));
+ 		xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
+ 	}
+-	emit signalXinetqStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
++	emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
+ }
+ 
+ uint KXineWidget::getVolume() const
+@@ -2707,12 +2707,12 @@ void KXineWidget::slotToggleMute()
+ 	if (xine_get_param(m_xineStream, muteParam))
+ 	{
+ 		xine_set_param(m_xineStream, muteParam, 0); /* mute off */
+-		emit signalXinetqStatus(i18n("Mute Off"));
++		emit signalXineStatus(i18n("Mute Off"));
+ 	}
+ 	else
+ 	{
+ 		xine_set_param(m_xineStream, muteParam, 1); /* mute on */
+-		emit signalXinetqStatus(i18n("Mute On"));
++		emit signalXineStatus(i18n("Mute On"));
+ 	}
+ }
+ 
+@@ -2867,7 +2867,7 @@ void KXineWidget::slotStop()
+ 		TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
+ 	}
+ 
+-	emit signalXinetqStatus(i18n("Stop"));
++	emit signalXineStatus(i18n("Stop"));
+ }
+ 
+ void KXineWidget::slotSetAudiocdDevice(const TQString& device)
+@@ -2997,7 +2997,7 @@ void KXineWidget::slotSpeedPause()
+ 		xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_PAUSE);
+ 		m_posTimer.stop();
+ 		if (m_currentSpeed != Undefined)
+-			emit signalXinetqStatus(i18n("Pause"));
++			emit signalXineStatus(i18n("Pause"));
+ 		m_currentSpeed = Pause;
+ 	}
+ }
+@@ -3007,7 +3007,7 @@ void KXineWidget::slotSpeedNormal()
+ 	xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_NORMAL);
+ 	m_posTimer.start(200);
+ 	m_currentSpeed = Normal;
+-	emit signalXinetqStatus(i18n("Playing") + " ");
++	emit signalXineStatus(i18n("Playing") + " ");
+ }
+ 
+ void KXineWidget::slotSpeedFaster()
+@@ -3018,7 +3018,7 @@ void KXineWidget::slotSpeedFaster()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_4);
+ 			m_currentSpeed = Fast2;
+-			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x2"));
++			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x2"));
+ 			break;
+ 		}
+ 		case Fast2:
+@@ -3035,14 +3035,14 @@ void KXineWidget::slotSpeedFaster()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
+ 			m_currentSpeed = Slow1;
+-			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
+ 			break;
+ 		}
+ 		default:
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
+ 			m_currentSpeed = Fast1;
+-			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
+ 			break;
+ 		}
+ 	}
+@@ -3056,7 +3056,7 @@ void KXineWidget::slotSpeedSlower()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_4);
+ 			m_currentSpeed = Slow2;
+-			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x2"));
++			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x2"));
+ 			break;
+ 		}
+ 		case Slow2:
+@@ -3073,14 +3073,14 @@ void KXineWidget::slotSpeedSlower()
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
+ 			m_currentSpeed = Fast1;
+-			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Fast Forward %1").tqarg("x1"));
+ 			break;
+ 		}
+ 		default:
+ 		{
+ 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
+ 			m_currentSpeed = Slow1;
+-			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
++			emit signalXineStatus(i18n("Slow Motion %1").tqarg("x1"));
+ 			break;
+ 		}
+ 	}
+@@ -3343,31 +3343,31 @@ void KXineWidget::slotToggleDeinterlace()
+ void KXineWidget::slotAspectRatioAuto()
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_AUTO);
+-	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
++	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
+ }
+ 
+ void KXineWidget::slotAspectRatio4_3()
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_4_3);
+-	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
++	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
+ }
+ 
+ void KXineWidget::slotAspectRatioAnamorphic()
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC);
+-	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
++	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
+ }
+ 
+ void KXineWidget::slotAspectRatioSquare()
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE);
+-	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
++	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
+ }
+ 
+ void KXineWidget::slotAspectRatioDVB()
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB);
+-	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
++	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
+ }
+ 
+ void KXineWidget::slotZoomOutX()
+@@ -3376,7 +3376,7 @@ void KXineWidget::slotZoomOutX()
+ 	{
+ 		m_currentZoomX -= 5;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
+-		emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
++		emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
+ 	}
+ }
+ 
+@@ -3386,7 +3386,7 @@ void KXineWidget::slotZoomInX()
+ 	{
+ 		m_currentZoomX += 5;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoomX);
+-		emit signalXinetqStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
++		emit signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
+ 	}
+ }
+ 
+@@ -3396,7 +3396,7 @@ void KXineWidget::slotZoomOutY()
+ 	{
+ 		m_currentZoomY -= 5;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
+-		emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
++		emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
+ 	}
+ }
+ 
+@@ -3406,7 +3406,7 @@ void KXineWidget::slotZoomInY()
+ 	{
+ 		m_currentZoomY += 5;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoomY);
+-		emit signalXinetqStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
++		emit signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
+ 	}
+ }
+ 
+@@ -3418,7 +3418,7 @@ void KXineWidget::slotZoomOut()
+ 		m_currentZoomX = m_currentZoomY = m_currentZoom;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
+-		emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
++		emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+ 	}
+ }
+ 
+@@ -3430,7 +3430,7 @@ void KXineWidget::slotZoomIn()
+ 		m_currentZoomX = m_currentZoomY = m_currentZoom;
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_X, m_currentZoom);
+ 		xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, m_currentZoom);
+-		emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
++		emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+ 	}
+ }
+ 
+@@ -3440,7 +3440,7 @@ void KXineWidget::slotZoomOff()
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_ZOOM_Y, 100);
+ 	m_currentZoom = 100;
+ 	m_currentZoomX = m_currentZoomY = m_currentZoom;
+-	emit signalXinetqStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
++	emit signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+ }
+ 
+ TQTime KXineWidget::getLengthInfo()
+@@ -3513,37 +3513,37 @@ void KXineWidget::getspuOffset(int& spuOffset) const
+ void KXineWidget::slotSetHue(int hue)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_HUE, hue);
+-	emit signalXinetqStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
++	emit signalXineStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
+ }
+ 
+ void KXineWidget::slotSetSaturation(int sat)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat);
+-	emit signalXinetqStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
++	emit signalXineStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
+ }
+ 
+ void KXineWidget::slotSetContrast(int contrast)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast);
+-	emit signalXinetqStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
++	emit signalXineStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
+ }
+ 
+ void KXineWidget::slotSetBrightness(int bright)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright);
+-	emit signalXinetqStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
++	emit signalXineStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
+ }
+ 
+ void KXineWidget::slotSetAVOffset(int av)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av);
+-	emit signalXinetqStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
++	emit signalXineStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
+ }
+ 
+ void KXineWidget::slotSetSpuOffset(int spu)
+ {
+ 	xine_set_param(m_xineStream, XINE_PARAM_SPU_OFFSET, spu);
+-	emit signalXinetqStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
++	emit signalXineStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
+ }
+ 
+ 
+diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
+index 1ec989a..62fef7c 100644
+--- a/kaffeine/src/player-parts/xine-part/kxinewidget.h
++++ b/kaffeine/src/player-parts/xine-part/kxinewidget.h
+@@ -192,7 +192,7 @@ signals:
+ 	void signalXineFatal(const TQString& message);   /** initXine() not successfull! **/
+ 	void signalXineError(const TQString& message);
+ 	void signalXineMessage(const TQString& message);
+-	void signalXinetqStatus(const TQString& status);
++	void signalXineStatus(const TQString& status);
+ 	void signalXineReady();
+ 	void signalXinePlaying();
+ 
+diff --git a/kaffeine/src/player-parts/xine-part/postfilter.cpp b/kaffeine/src/player-parts/xine-part/postfilter.cpp
+index a54cdd5..8a691b8 100644
+--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
++++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
+@@ -50,7 +50,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
+     xine_post_in_t* inputAPI = NULL;
+ 
+     m_groupBox = new TQGroupBox(name, parent);
+-    m_groupBox->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
++    m_groupBox->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+     TQGridLayout* grid = new TQGridLayout(m_groupBox, 2, 2);
+     grid->setMargin( 20 );
+     grid->setSpacing( 5 );
+@@ -147,7 +147,7 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
+         }
+ 
+         descr = new TQLabel(TQString::fromUtf8(m_xinePostParameter->description ), m_groupBox);
+-        descr->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
++        descr->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
+         grid->addWidget(descr, row, 1);
+         row++;
+         m_xinePostParameter++;
+@@ -157,14 +157,14 @@ PostFilter::PostFilter(const TQString& name, xine_t* engine, xine_audio_port_t*
+     grid->addMultiCellWidget(sep, row, row, 0, 1);
+     row++;
+     KPushButton* deleteButton = new KPushButton(i18n("Delete Filter"), m_groupBox);
+-    deleteButton->tqsetSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
++    deleteButton->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+     connect(deleteButton, TQT_SIGNAL(clicked()), this, TQT_SLOT( slotDeletePressed()));
+     grid->addWidget(deleteButton, row, 0);
+ 
+     if(inputAPI)
+     {
+       KPushButton* helpButton = new KPushButton(i18n("Help"), m_groupBox);
+-      helpButton->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
++      helpButton->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+       connect(helpButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotHelpPressed()));
+       grid->addWidget(helpButton, row, 1);
+     }
+diff --git a/kaffeine/src/player-parts/xine-part/videosettings.cpp b/kaffeine/src/player-parts/xine-part/videosettings.cpp
+index 955efcf..c64f627 100644
+--- a/kaffeine/src/player-parts/xine-part/videosettings.cpp
++++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp
+@@ -48,7 +48,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->setMargin(10);
+ 
+   TQLabel* hueText = new TQLabel(i18n("Hue"), videoGroup);
+-  hueText->tqsetAlignment(AlignRight);
++  hueText->setAlignment(AlignRight);
+   m_hueSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_hueSlider->setRange(0, 65535);
+   m_hueSlider->setSteps(10, 1000);
+@@ -58,7 +58,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->addWidget(m_hueSlider, 0, 1);
+ 
+   TQLabel* satText = new TQLabel(i18n("Saturation"), videoGroup);
+-  satText->tqsetAlignment(AlignRight);
++  satText->setAlignment(AlignRight);
+   m_satSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_satSlider->setRange(0, 65535);
+   m_satSlider->setSteps(10, 1000);
+@@ -68,7 +68,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->addWidget(m_satSlider, 1, 1);
+ 
+   TQLabel* contrastText = new TQLabel(i18n("Contrast"), videoGroup);
+-  contrastText->tqsetAlignment(AlignRight);
++  contrastText->setAlignment(AlignRight);
+   m_contrastSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_contrastSlider->setRange(0, 65535);
+   m_contrastSlider->setSteps(10, 1000);
+@@ -78,7 +78,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->addWidget(m_contrastSlider, 2, 1);
+ 
+   TQLabel* brightText = new TQLabel(i18n("Brightness"), videoGroup);
+-  brightText->tqsetAlignment(AlignRight);
++  brightText->setAlignment(AlignRight);
+   m_brightSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_brightSlider->setRange(0, 65535);
+   m_brightSlider->setSteps(10, 1000);
+@@ -88,7 +88,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->addWidget(m_brightSlider, 3, 1);
+ 
+   TQLabel* avOffsetText = new TQLabel(i18n("Audio/Video Offset"), videoGroup);
+-  avOffsetText->tqsetAlignment(AlignRight);
++  avOffsetText->setAlignment(AlignRight);
+   m_avOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_avOffsetSlider->setRange(-90000, 90000); // +/- 1 sec
+   m_avOffsetSlider->setSteps(100, 10000);
+@@ -98,7 +98,7 @@ VideoSettings::VideoSettings(int hue, int sat, int contrast, int bright,
+   videoGrid->addWidget(m_avOffsetSlider, 4, 1);
+ 
+   TQLabel* spuOffsetText = new TQLabel(i18n("Subtitle Offset"), videoGroup);
+-  spuOffsetText->tqsetAlignment(AlignRight);
++  spuOffsetText->setAlignment(AlignRight);
+   m_spuOffsetSlider = new TQSlider(Qt::Horizontal, videoGroup);
+   m_spuOffsetSlider->setRange(-90000, 90000);  // +/- 1 sec
+   m_spuOffsetSlider->setSteps(100, 10000);
+diff --git a/kaffeine/src/player-parts/xine-part/xine_part.cpp b/kaffeine/src/player-parts/xine-part/xine_part.cpp
+index 9991f1c..f9b3fb1 100644
+--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
++++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
+@@ -1058,7 +1058,7 @@ void XinePart::slotMessage(const TQString& message)
+ 	KMessageBox::information(0, msg, i18n("xine Message"));
+ }
+ 
+-void XinePart::slottqStatus(const TQString& status)
++void XinePart::slotStatus(const TQString& status)
+ {
+ 	emit setStatusBarText(status);
+ 	if ((status != i18n("Ready")) && (status != i18n("Playing")))
+@@ -1442,7 +1442,7 @@ void XinePart::initActions()
+ 		(m_playTime, i18n("Short click: Toggle Timer Forward/Backward\nLong click: Toggle Timer OSD"));
+ 	TQFontMetrics met(KGlobalSettings::generalFont());
+ 	m_playTime->setFixedWidth(met.width("-55:55:55") + 6);
+-	m_playTime->tqsetSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
++	m_playTime->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+ 	m_playTime->setFocusPolicy(TQ_NoFocus);
+ 	new KWidgetAction(m_playTime, i18n("Playtime"), 0, 0, 0, actionCollection(), "player_playtime");
+ 	connect(m_playTime, TQT_SIGNAL(pressed()), TQT_TQOBJECT(this), TQT_SLOT(slotButtonTimerPressed()));
+@@ -1473,7 +1473,7 @@ void XinePart::initConnections()
+ 	        this, TQT_SLOT(slotChannelInfo(const TQStringList&, const TQStringList&, int, int )));
+ 	connect(m_xine, TQT_SIGNAL(signalXinePlaying()), TQT_TQOBJECT(this), TQT_SLOT(slotTrackPlaying()));
+ 	connect(m_xine, TQT_SIGNAL(signalNewPosition(int, const TQTime&)), TQT_TQOBJECT(this), TQT_SLOT(slotNewPosition(int, const TQTime&)));
+-	connect(m_xine, TQT_SIGNAL(signalXinetqStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slottqStatus(const TQString&)));
++	connect(m_xine, TQT_SIGNAL(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&)));
+ 	connect(m_xine, TQT_SIGNAL(signalXineError(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotError(const TQString&)));
+ 	connect(m_xine, TQT_SIGNAL(signalXineMessage(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotMessage(const TQString&)));
+ 	connect(m_xine, TQT_SIGNAL(signalPlaybackFinished()), TQT_TQOBJECT(this), TQT_SLOT(slotPlaybackFinished()));
+diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
+index 78c809e..07bf027 100644
+--- a/kaffeine/src/player-parts/xine-part/xine_part.h
++++ b/kaffeine/src/player-parts/xine-part/xine_part.h
+@@ -169,7 +169,7 @@ private slots:
+ 	void slotConfigXine();
+ 	void slotError(const TQString&);
+ 	void slotMessage(const TQString&);
+-	void slottqStatus(const TQString&);
++	void slotStatus(const TQString&);
+ 	void slotNewTitle();
+ 	void slotNewLength();
+ 	void slotNewFrameSize();
+@@ -206,7 +206,7 @@ private:
+ 	TQPoint m_oldPosition;
+ 	TQTimer m_posCheckTimer;
+ 	TQTimer m_osdTimerEnabler;  /* Provide Long click on timer button */
+-	bool m_isOsdTimer;  /* tqStatus of Osd Timer (on/off) */
++	bool m_isOsdTimer;  /* Status of Osd Timer (on/off) */
+ 	int m_timerDirection;  /* Counting Up or Down */
+ 	int m_brightness, m_hue, m_contrast, m_saturation;
+ 
+diff --git a/kaffeine/src/player-parts/xine-part/xineconfig.cpp b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+index 277a850..74076e4 100644
+--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
++++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+@@ -132,7 +132,7 @@ XineConfigEntry::XineConfigEntry(TQWidget* parent, TQGridLayout* grid, int row,
+ 	m_keyName.remove( 0, m_keyName.find(".") + 1 );
+ 
+ 	TQLabel* description = new TQLabel(m_keyName + "\n" + TQString::fromLocal8Bit(entry->description), parent);
+-	description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
++	description->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+ 	grid->addWidget(description, row, 1);
+ 
+ 	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
+diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
+index 0544d35..4359f15 100644
+--- a/kaffeine/src/pref.cpp
++++ b/kaffeine/src/pref.cpp
+@@ -141,7 +141,7 @@ KaffeinePreferences::KaffeinePreferences() : KDialogBase(IconList,i18n("Kaffeine
+ 	gb = new TQGroupBox( "", misc );
+ 	grid = new TQGridLayout( gb, 1, 1, 20, 6 );
+ 	KPushButton* clearRecent = new KPushButton( i18n("Clear"), gb);
+-	clearRecent->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
++	clearRecent->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+ 	connect(clearRecent, TQT_SIGNAL(clicked()), this, TQT_SIGNAL(signalClearRecent()));
+ 	grid->addWidget(clearRecent, 0, 0);
+ 	TQLabel* clearLabel = new TQLabel(i18n("Clear recent files list"), gb);
+diff --git a/kaffeine/src/startwindow.cpp b/kaffeine/src/startwindow.cpp
+index 20a5941..a86696e 100644
+--- a/kaffeine/src/startwindow.cpp
++++ b/kaffeine/src/startwindow.cpp
+@@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *parent ) : TQLabel( parent )
+ void SLabel::paintEvent( TQPaintEvent *pe )
+ {
+ 	TQLabel::paintEvent( pe );
+-	TQColorGroup cg = parentWidget()->tqcolorGroup();
++	TQColorGroup cg = parentWidget()->colorGroup();
+ 	TQColor base = cg.base();
+ 	TQColor selection = cg.highlight();
+ 	int r = (base.red() + selection.red()) / 2;
+@@ -92,7 +92,7 @@ StartWindow::StartWindow(TQWidget* parent, const char* name) : TQWidget(parent,
+ 
+ 	panel = new TQWidget( this );
+ 	panel->setPaletteBackgroundColor(TQColor("White"));
+-	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
++	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+ 
+ 	buttons.setAutoDelete( true );
+ }
+@@ -118,7 +118,7 @@ void StartWindow::registerTarget( const TQString& uiName, const TQString& pixNam
+ 	btn->setTextPosition( TQToolButton::Under );
+ 	btn->setUsesTextLabel( true );
+ 	btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) );
+-	TQSize size = btn->tqsizeHint();
++	TQSize size = btn->sizeHint();
+ 	size.setHeight( size.height()+5 );
+ 	btn->resize( size );
+ 	connect( btn, TQT_SIGNAL(executed(const TQString&)), this, TQT_SIGNAL(execTarget(const TQString&)) );
+diff --git a/kaffeine/src/systemtray.cpp b/kaffeine/src/systemtray.cpp
+index 79028aa..745360f 100644
+--- a/kaffeine/src/systemtray.cpp
++++ b/kaffeine/src/systemtray.cpp
+@@ -72,7 +72,7 @@ SystemTray::SystemTray(TQWidget *parent, const char *name ) : KSystemTray(parent
+ 	m_osd = new TitleLabel;
+ 	m_osd->setFrameStyle(TQFrame::Panel | TQFrame::Plain);
+ 	m_osd->setLineWidth(1);
+-	m_osd->tqsetAlignment(SingleLine);
++	m_osd->setAlignment(SingleLine);
+ 	connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD()));
+ 
+ 	setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22));
diff --git a/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch b/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch
new file mode 100644
index 000000000..51948d795
--- /dev/null
+++ b/redhat/applications/kaffeine/kaffeine-3.5.13-work_around_xine_crash.patch
@@ -0,0 +1,14 @@
+commit 508cb342d8f88e9a1d25d6aec78a43b7050b4e85
+Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>
+Date:   1330032748 -0600
+
+    Work around Xine crash when displaying still logo image by creating a small movie file to replace it
+    This closes Bug 559
+
+diff --git a/kaffeine/images/logo b/kaffeine/images/logo
+index f3d53e2..7b76dfe 100644
+Binary files a/kaffeine/images/logo and b/kaffeine/images/logo differ
+diff --git a/kaffeine/images/logo.still b/kaffeine/images/logo.still
+new file mode 100644
+index 0000000..f3d53e2
+Binary files /dev/null and b/kaffeine/images/logo.still differ
diff --git a/redhat/applications/kaffeine/trinity-kaffeine.spec b/redhat/applications/kaffeine/trinity-kaffeine.spec
index bab8aa4ab..0d404cd9d 100644
--- a/redhat/applications/kaffeine/trinity-kaffeine.spec
+++ b/redhat/applications/kaffeine/trinity-kaffeine.spec
@@ -1,7 +1,7 @@
 # Default version for this component
 %define kdecomp kaffeine
 %define version 0.8.8
-%define release 1
+%define release 2
 
 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
 %if "%{?_prefix}" != "/usr"
@@ -33,12 +33,28 @@ Source2:	kaffeine.1
 # [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #511, #559]
 Source1:		508cb342-logo
 
-# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. This closes bug reports 729 and 899.
-Patch1:			1331343133:fd68e4c4940afb4529b16e2c3e3d0f379ac7b161.diff
-# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $KDEHOME/tmp-$HOSTNAME.
-Patch2:			1331957353:b480e3db3a01b75376fa6b83e5b01efe104ccaec.diff
-# [kaffeine] Fix typos, branding, and inadvertent tqt changes.
-Patch3:			1333649519:0e3d0ed603c6c8065fdcb77bc79b59a768fc6a5b.diff
+
+
+# [kaffeine] Rename old tq methods that no longer need a unique name[Commit #60ed202f]
+Patch1:			kaffeine-3.5.13-rename_old_tq_methods.patch
+# [kaffeine] Remove additional unneeded tq method conversions [Commit #701a1249]
+Patch2:			kaffeine-3.5.13-remove_additional_tq_conversions.patch
+# [kaffeine] Rename obsolete tq methods to standard names [Commit #66805baf]
+Patch3:			kdebase-3.5.13-rename_obsolete_tq_methods.patch
+# [kaffeine] Rename a few stragglers [Commit #89b5fd35]
+Patch4:			kdebase-3.5.13-renames_a_few_stragglers.patch
+# [kaffeine] Error out if critical OSD-related defines are not set [Commit #25b89439]
+Patch5:			kdebase-3.5.13-error_out_if_critical_osd_defines_not_set.patch
+# [kaffeine] Work around Xine crash when displaying still logo image by creating a small movie file to replace it [Bug #559, #511] [Commit #508cb342]
+Patch6:			kaffeine-3.5.13-work_around_xine_crash.patch
+# [kaffeine] Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899] [Commit #fd68e4c4]
+Patch7:			kdebase-3.5.13-fix_slow_dvb_start.patch
+# [kaffeine] Change location where Kaffeine stores temporary pipe files from $HOME to the more appropriate $TDEHOME/tmp-$HOSTNAME. [Commit #b480e3db]
+Patch8:			kaffeine-3.5.13-fix_temporary_location.patch
+# [kaffeine] Fix typos, branding, and inadvertent tqt changes. [Commit #0e3d0ed6]
+Patch9:			kaffeine-3.5.13-fix_typos_branding_tqt.patch
+# [kaffeine] Fix installation of localization files [Bug #858]
+Patch10:		kaffeine-3.5.13-fix_localization_files.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -212,6 +228,10 @@ update-desktop-database >& /dev/null ||:
 
 
 %changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-2
+- Rebuilt for Fedora 17
+- Adds more patches from GIT.
+
 * Mon Apr 23 2012 Francois Andriot <francois.andriot@free.fr> - 0.8.8-1
 - Updates version to 0.8.8
 - Fix nominal "tqt" typos and fix slow DVB start. [Bug #729, #899]