Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit 18f2e55a9d248d16a07ee2ab882fae9c8b461be3.

61 files changed, 530 insertions, 530 deletions

diff --git a/kaffeine/src/input/audiobrowser/googlefetcher.cpp b/kaffeine/src/input/audiobrowser/googlefetcher.cpp
index 0e76b88..c74317d 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").arg(galleryPage*20) );
+    search.load(url.url()+TQString("&start=%1&sa=N").tqarg(galleryPage*20) );
 
     TQString text = search.toString().string();
 
diff --git a/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp b/kaffeine/src/input/audiobrowser/googlefetcherdialog.cpp
index ccfea35..5bb169e 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)")
-              .arg(m_artist)
-              .arg(m_album)
-              .arg(m_imageList.size()));
+              .tqarg(m_artist)
+              .tqarg(m_album)
+              .tqarg(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.resize(currentSize + data.size(), TQGArray::SpeedOptim);
+    m_buffer.tqresize(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 49f1f18..9c418a1 100644
--- a/kaffeine/src/input/audiobrowser/playlist.cpp
+++ b/kaffeine/src/input/audiobrowser/playlist.cpp
@@ -46,18 +46,18 @@
 #include <kurlcompletion.h>
 
 #include <tqlabel.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
 #include <tqdragobject.h>
 #include <tqstringlist.h>
 #include <tqdom.h>
 #include <tqxml.h>
 #include <tqregexp.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpixmap.h>
 #include <tqvbox.h>
 #include <tqlistbox.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqtooltip.h>
 #include <tqinputdialog.h>
 #include <tqtimer.h>
@@ -75,14 +75,14 @@
 
 RollTitle::RollTitle( TQWidget *parent ) : TQLabel( "I", parent )
 {
-	TQColorGroup cg = parentWidget()->colorGroup();
+	TQColorGroup cg = parentWidget()->tqcolorGroup();
 	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()->colorGroup().text();
+	fore = parentWidget()->tqcolorGroup().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->sizeHint() );
+	lab->resize( lab->tqsizeHint() );
 	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()->colorGroup();
+	TQColorGroup cg = parentWidget()->tqcolorGroup();
 	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()->colorGroup().text();
+	fore = parentWidget()->tqcolorGroup().text();
 	setPaletteForegroundColor( fore );
 	setTitle( title );
 }
@@ -169,10 +169,10 @@ struct CoverPopup : public TQWidget
     CoverPopup(const TQPixmap &image, const TQPoint &p) :
         TQWidget(0, 0, WDestructiveClose | WX11BypassWM)
     {
-        TQHBoxLayout *layout = new TQHBoxLayout(this);
+        TQHBoxLayout *tqlayout = new TQHBoxLayout(this);
         TQLabel *label = new TQLabel(this);
 
-        layout->addWidget(label);
+        tqlayout->addWidget(label);
         label->setFrameStyle(TQFrame::Box | TQFrame::Raised);
         label->setLineWidth(1);
         label->setPixmap(image);
@@ -283,7 +283,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	google = NULL;
 
 	mainWidget = new TQVBox( parent );
-	//mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	//mainWidget->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	hSplit = new TQSplitter( mainWidget );
 	hSplit->setOpaqueResize( true );
 	panel = new TQVBox( hSplit );
@@ -342,7 +342,7 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	KIO::NetAccess::mkdir(m_playlistDirectory, mainWidget);
 	kdDebug() << "PLAYLIST" << endl;
 
-	TQGridLayout* layout = new TQGridLayout( playlist, 4, 2, 3 );
+	TQGridLayout* tqlayout = new TQGridLayout( playlist, 4, 2, 3 );
 
 	m_list = new UrlListView(playlist);
 	mainWidget->setAcceptDrops(true);
@@ -379,12 +379,12 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	m_list->setRenameable(TRACK_COLUMN);
 	m_list->setAllColumnsShowFocus(true);
 	m_list->setShowSortIndicator(true);
-	layout->addMultiCellWidget(m_list, 3, 3, 0, 1);
+	tqlayout->addMultiCellWidget(m_list, 3, 3, 0, 1);
 
 	coverFrame = new CoverFrame( playlist );
 	coverFrame->setFixedWidth( 80 );
 	coverFrame->setFixedHeight( 80 );
-	layout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
+	tqlayout->addMultiCellWidget(coverFrame, 0, 2, 0, 0);
 
 	TQHBoxLayout *h1 = new TQHBoxLayout();
 	searchBtn = new TQToolButton( playlist );
@@ -397,23 +397,23 @@ PlayList::PlayList( TQWidget* parent, TQObject *objParent, const char *name ) :
 	m_playlistFilter = new KLineEdit(playlist);
 	m_playlistFilter->setFocusPolicy(TQ_ClickFocus);
 	h1->addWidget(m_playlistFilter);
-	layout->addLayout( h1, 2, 1 );
+	tqlayout->addLayout( h1, 2, 1 );
 
 	TQHBoxLayout *h2 = new TQHBoxLayout();
 	TQLabel* playlistLabel = new TQLabel(i18n("Playlist:"), playlist);
 	h2->addWidget(playlistLabel);
 	m_playlistSelector = new KComboBox( playlist );
 	m_playlistSelector->setMinimumWidth(10);
-	m_playlistSelector->setSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
+	m_playlistSelector->tqsetSizePolicy( TQSizePolicy (TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred) );
 	m_playlistSelector->setEditable(true);
 	m_playlistSelector->setDuplicatesEnabled(false);
 	m_playlistSelector->setFocusPolicy(TQ_ClickFocus);
 	TQToolTip::add(m_playlistSelector, i18n("Select the active playlist. To change playlist name edit it and confirm with 'Return'."));
 	h2->addWidget(m_playlistSelector);
-	layout->addLayout( h2, 1, 1 );
+	tqlayout->addLayout( h2, 1, 1 );
 
 	roller = new RollTitle( playlist );
-	layout->addWidget( roller, 0, 1 );
+	tqlayout->addWidget( roller, 0, 1 );
 
 	KAccel* accel = new KAccel(mainWidget);
 	accel->insert("Delete selected", TQt::Key_Delete, this, TQT_SLOT(slotRemoveSelected()));
@@ -706,7 +706,7 @@ MRL PlayList::getCurrent()
 	if (isQueueMode())
 	{
 		m_queue.clear();
-		updateStatus();
+		updatetqStatus();
 	}
 
 	if (m_random)
@@ -747,7 +747,7 @@ bool PlayList::nextTrack( MRL &mrl )
 	{
 		mrl = m_queue.first();
 		m_queue.remove(m_queue.begin());
-		updateStatus();
+		updatetqStatus();
 		return true;
 	}
 
@@ -802,7 +802,7 @@ bool PlayList::previousTrack( MRL &mrl )
 	if (isQueueMode())
 	{
 		m_queue.clear();
-		updateStatus();
+		updatetqStatus();
 	}
 
 	if (!m_currentEntry) {
@@ -1349,7 +1349,7 @@ void PlayList::add(const TQStringList& urlList, TQListViewItem* after)
 
 	delete progress;
 	if (m_random) createRandomList();
-	updateStatus();
+	updatetqStatus();
 }
 
 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);
-	updateStatus();
+	updatetqStatus();
 	if (m_random) createRandomList();
 }
 
@@ -1419,7 +1419,7 @@ void PlayList::clearList()
 		m_playlistFilter->clear();
 		m_searchSelection = false;
 	}
-	updateStatus();
+	updatetqStatus();
 	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::unicodeUriToUri(urls[i]));
+				//KURL url(TQUriDrag::tqunicodeUriToUri(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->encodedData("text/plain");
+			TQByteArray data = dev->tqencodedData("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());
 
-			updateStatus();
+			updatetqStatus();
 		}
 	}
 
@@ -1762,10 +1762,10 @@ void PlayList::slotRemoveSelected()
 	}
 
 	if (m_random) createRandomList();
-	updateStatus();
+	updatetqStatus();
 }
 
-void PlayList::updateStatus()
+void PlayList::updatetqStatus()
 {
 	TQString status;
 	if (isQueueMode())
@@ -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").arg(m_queue.count()).arg(total.toString("h:mm:ss"));
+		status = i18n("Queue: %1 Entries, Playtime: %2").tqarg(m_queue.count()).tqarg(total.toString("h:mm:ss"));
 	}
 	else
 	{
-		//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  (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").arg(TQString::number(m_countVisible)).arg(msToTimeString(m_playTimeVisible));
+		status = i18n("Entries: %1, Playtime: %2").tqarg(TQString::number(m_countVisible)).tqarg(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?").arg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
+	int code = KMessageBox::warningContinueCancel(0, i18n("Remove '%1' from list and from disk?").tqarg(m_playlistSelector->text(m_currentPlaylist)),TQString(),KStdGuiItem::del());
 	if (code == KMessageBox::Continue)
 	{
 		TQString pl = m_playlistDirectory + m_playlistSelector->text(m_currentPlaylist) + ".kaffeine";
@@ -2121,7 +2121,7 @@ void PlayList::slotFindText(const TQString& text)
 		m_searchSelection = true;
 
 	if (m_random) createRandomList();
-	updateStatus();
+	updatetqStatus();
 }
 
 
@@ -2145,7 +2145,7 @@ void PlayList::slotPaste()
 
 	TQStrList list;
 
-	if (TQUriDrag::decode(TQApplication::clipboard()->data(), list))
+	if (TQUriDrag::decode(TQApplication::tqclipboard()->data(), list))
 	{
 		TQStringList urls;
 		for (TQStrListIterator it(list); *it; ++it)
@@ -2155,7 +2155,7 @@ void PlayList::slotPaste()
 	}
 	/** try to decode as text **/
 	TQString text;
-	if (TQTextDrag::decode(TQApplication::clipboard()->data(), text))
+	if (TQTextDrag::decode(TQApplication::tqclipboard()->data(), text))
 	{
 		add(text, lastSelected);
 	}
@@ -2170,10 +2170,10 @@ void PlayList::slotCopy()
 
 	for (uint i=0; i<selected.count(); i++)
 	{
-		urlList.append(TQUriDrag::unicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
+		urlList.append(TQUriDrag::tqunicodeUriToUri(dynamic_cast<PlaylistItem *>(selected.at(i))->url()));
 	}
 
-	TQApplication::clipboard()->setData(new TQUriDrag(urlList));
+	TQApplication::tqclipboard()->setData(new TQUriDrag(urlList));
 }
 
 void PlayList::slotSelectAll()
@@ -2209,7 +2209,7 @@ void PlayList::slotPlaylistFromSelected()
 void PlayList::slotAddToQueue(MRL mrl)
 {
 	m_queue.append(mrl);
-	updateStatus();
+	updatetqStatus();
 }
 
 /**** helper ****/
diff --git a/kaffeine/src/input/audiobrowser/playlist.h b/kaffeine/src/input/audiobrowser/playlist.h
index 7be7a6d..7f0a89a 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 updateStatus();
+	void updatetqStatus();
 	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 fe5a494..813f5c2 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 colorGroup = cg;
+		TQColorGroup tqcolorGroup = cg;
 
-		TQColor base = colorGroup.base();
-		TQColor selection = colorGroup.highlight();
+		TQColor base = tqcolorGroup.base();
+		TQColor selection = tqcolorGroup.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);
 
-		colorGroup.setColor(TQColorGroup::Base, c);
-		TQListViewItem::paintCell(p, colorGroup, column, width, align);
+		tqcolorGroup.setColor(TQColorGroup::Base, c);
+		TQListViewItem::paintCell(p, tqcolorGroup, column, width, align);
 	}
 	else
 		return KListViewItem::paintCell(p, cg, column, width, align);
diff --git a/kaffeine/src/input/disc/cddb.cpp b/kaffeine/src/input/disc/cddb.cpp
index 46efa37..9581651 100644
--- a/kaffeine/src/input/disc/cddb.cpp
+++ b/kaffeine/src/input/disc/cddb.cpp
@@ -25,7 +25,7 @@
 #include <errno.h>
 #include <unistd.h>
 #include <tqdir.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqregexp.h>
 #include <tqapplication.h>
 #include <tqstring.h>
@@ -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").arg(i);
+        m_names[i] += i18n("Track %1").tqarg(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").arg(id, 0, 16).rightJustify(8, '0');
+  filename = TQString("%1").tqarg(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 f4facf6..62dc3a5 100644
--- a/kaffeine/src/input/disc/disc.cpp
+++ b/kaffeine/src/input/disc/disc.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqstringlist.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqvaluelist.h>
 #include <tqcursor.h>
@@ -50,7 +50,7 @@ MLabel::MLabel( TQWidget *parent ) : TQLabel( parent )
 void MLabel::paintEvent( TQPaintEvent *pe )
 {
 	TQLabel::paintEvent( pe );
-	TQColorGroup cg = parentWidget()->colorGroup();
+	TQColorGroup cg = parentWidget()->tqcolorGroup();
 	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->setSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	mainWidget->tqsetSizePolicy( TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
 	split = new TQSplitter( mainWidget );
 	split->setOpaqueResize( true );
 	widg = new TQWidget( split );
 	widg->setMinimumWidth( 200 );
-	widg->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	widg->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	playerBox->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
 	panel = new TQFrame( split );
 	split->moveToFirst( panel );
-	panel->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	panel->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+	cdBtn->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed ) );
+	ripBtn->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+	artistLab->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Preferred ) );
+	albumLab->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	enc->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
 	connect( enc, TQT_SIGNAL(clicked()), this, TQT_SLOT(encode()) );
 	vb->addWidget( encodeWidget );
 	encodeWidget->hide();
@@ -370,7 +370,7 @@ void Disc::trackSelected( TQListViewItem *it )
 	if ( !it )
 		return;
 
-	MRL mrl( TQString("cdda://%1/%2").arg( currentDevice ).arg( it->text(0).toInt() ) );
+	MRL mrl( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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").arg( currentDevice ) );
+					mrl.setURL( TQString("cdda://%1/1").tqarg( 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").arg( currentDevice ) );
+						mrl.setURL( TQString("cdda://%1/1").tqarg( 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").arg( currentDevice ) );
+						mrl.setURL( TQString("cdda://%1/1").tqarg( 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").arg(device) );
+		mrl.setURL( TQString("dvd://%1").tqarg(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").arg(choice) );
+					mrl.setURL( TQString("dvd://%1").tqarg(choice) );
 				else
 					return;
 			}
 			else if ( devList.count()==1 )
-				mrl.setURL( TQString("dvd://%1").arg(devList[0]) );
+				mrl.setURL( TQString("dvd://%1").tqarg(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").arg(device) );
+		mrl.setURL( TQString("vcd://%1").tqarg(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").arg(choice) );
+					mrl.setURL( TQString("vcd://%1").tqarg(choice) );
 				else
 					return;
 			}
 			else if ( devList.count()==1 )
-				mrl.setURL( TQString("vcd://%1").arg(devList[0]) );
+				mrl.setURL( TQString("vcd://%1").tqarg(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").arg( currentDevice ).arg( it->text(0).toInt() ) );
+			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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").arg( currentDevice ).arg( it->text(0).toInt() ) );
+			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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").arg( currentDevice ).arg( it->text(0).toInt() ) );
+	mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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").arg( currentDevice ).arg( it->text(0).toInt() ) );
+			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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").arg( currentDevice ).arg( it->text(0).toInt() ) );
+			mrl.setURL( TQString("cdda://%1/%2").tqarg( currentDevice ).tqarg( 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 36b052a..03f39fa 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.").arg(encoderDesktop) );
+		KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 		return false;
 	}
 
 	if ( service->serviceTypes().contains("KaffeineAudioEncoder") ) {
 		currentEncoder = KParts::ComponentFactory::createPartInstanceFromService<KaffeineAudioEncoder>(service, 0, service->name().ascii(), 0, 0, 0, &error);
 		if (error > 0) {
-			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").arg(encoderDesktop) );
+			KMessageBox::error( parent, i18n("Loading of encoder '%1' failed.").tqarg(encoderDesktop) );
 			return false;
 		}
 		else
diff --git a/kaffeine/src/input/disc/paranoiasettings.ui b/kaffeine/src/input/disc/paranoiasettings.ui
index 30bbe54..e20c98f 100644
--- a/kaffeine/src/input/disc/paranoiasettings.ui
+++ b/kaffeine/src/input/disc/paranoiasettings.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout3</cstring>
+                <cstring>tqlayout3</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -165,7 +165,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>60</height>
@@ -174,7 +174,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -190,7 +190,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <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 03485cf..09a2a87 100644
--- a/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
+++ b/kaffeine/src/input/disc/plugins/mp3lame/lameconfig.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -51,7 +51,7 @@
                         </widget>
                         <widget class="TQLayoutWidget" row="0" column="0">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -108,7 +108,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>16</height>
@@ -117,7 +117,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout4</cstring>
+                        <cstring>tqlayout4</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -133,7 +133,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <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 f414545..b07342a 100644
--- a/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
+++ b/kaffeine/src/input/disc/plugins/oggvorbis/oggconfig.ui
@@ -24,7 +24,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -98,7 +98,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>81</height>
@@ -107,7 +107,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout7</cstring>
+                        <cstring>tqlayout7</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -123,7 +123,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>157</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/audioeditorui.ui b/kaffeine/src/input/dvb/audioeditorui.ui
index ab94806..2324983 100644
--- a/kaffeine/src/input/dvb/audioeditorui.ui
+++ b/kaffeine/src/input/dvb/audioeditorui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout24</cstring>
+                <cstring>tqlayout24</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout23</cstring>
+                        <cstring>tqlayout23</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -60,7 +60,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout21</cstring>
+                                <cstring>tqlayout21</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -68,7 +68,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout16</cstring>
+                                        <cstring>tqlayout16</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -76,7 +76,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout15</cstring>
+                                                <cstring>tqlayout15</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -118,7 +118,7 @@
                                             <property name="sizeType">
                                                 <enum>Expanding</enum>
                                             </property>
-                                            <property name="sizeHint">
+                                            <property name="tqsizeHint">
                                                 <size>
                                                     <width>40</width>
                                                     <height>20</height>
@@ -137,7 +137,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>40</height>
@@ -146,7 +146,7 @@
                                 </spacer>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout14</cstring>
+                                        <cstring>tqlayout14</cstring>
                                     </property>
                                     <hbox>
                                         <property name="name">
@@ -154,7 +154,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout13</cstring>
+                                                <cstring>tqlayout13</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -258,7 +258,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout19</cstring>
+                        <cstring>tqlayout19</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -274,7 +274,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/broadcasteditorui.ui b/kaffeine/src/input/dvb/broadcasteditorui.ui
index a0939a2..86da4cf 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="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -150,7 +150,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>20</height>
@@ -244,7 +244,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/camdialog.ui b/kaffeine/src/input/dvb/camdialog.ui
index c255575..9463cee 100644
--- a/kaffeine/src/input/dvb/camdialog.ui
+++ b/kaffeine/src/input/dvb/camdialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout5</cstring>
+                <cstring>tqlayout5</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kaffeine/src/input/dvb/cammenudialog.ui b/kaffeine/src/input/dvb/cammenudialog.ui
index 022993a..f6b5a00 100644
--- a/kaffeine/src/input/dvb/cammenudialog.ui
+++ b/kaffeine/src/input/dvb/cammenudialog.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -34,7 +34,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
diff --git a/kaffeine/src/input/dvb/channeleditorui.ui b/kaffeine/src/input/dvb/channeleditorui.ui
index add07e2..24abfbb 100644
--- a/kaffeine/src/input/dvb/channeleditorui.ui
+++ b/kaffeine/src/input/dvb/channeleditorui.ui
@@ -35,7 +35,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout7</cstring>
+                <cstring>tqlayout7</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -43,7 +43,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -72,7 +72,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
@@ -83,7 +83,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -138,7 +138,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -261,7 +261,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout7</cstring>
+                                        <cstring>tqlayout7</cstring>
                                     </property>
                                     <grid>
                                         <property name="name">
@@ -633,7 +633,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>166</height>
@@ -642,7 +642,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout14</cstring>
+                        <cstring>tqlayout14</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -666,7 +666,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>150</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/crontimerui.ui b/kaffeine/src/input/dvb/crontimerui.ui
index 5441bee..5b7a3bd 100644
--- a/kaffeine/src/input/dvb/crontimerui.ui
+++ b/kaffeine/src/input/dvb/crontimerui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -45,7 +45,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>32</width>
                                     <height>20</height>
@@ -54,7 +54,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -138,7 +138,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>67</height>
@@ -157,7 +157,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>39</width>
                                     <height>20</height>
@@ -243,7 +243,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>32</width>
                                     <height>20</height>
@@ -262,7 +262,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>95</height>
@@ -271,7 +271,7 @@
                 </spacer>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <grid>
                         <property name="name">
@@ -295,7 +295,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>177</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/dvbcam.cpp b/kaffeine/src/input/dvb/dvbcam.cpp
index 8800fef..b430b38 100644
--- a/kaffeine/src/input/dvb/dvbcam.cpp
+++ b/kaffeine/src/input/dvb/dvbcam.cpp
@@ -35,7 +35,7 @@
 #include <tqstring.h>
 #include <tqspinbox.h>
 #include <tqlabel.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 #include <tqlineedit.h>
 #include <tqpushbutton.h>
 
@@ -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").arg( adapter ).arg( ca_device );
+	TQString s = TQString("/dev/dvb/adapter%1/ca%2").tqarg( adapter ).tqarg( 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").arg(application_type, 0, 16 ) );
+	std->dvbcam->setAppType( TQString("0x%1").tqarg(application_type, 0, 16 ) );
 	fprintf(stderr, "CAM Application manufacturer: %04x\n", application_manufacturer);
-	std->dvbcam->setAppManu( TQString("0x%1").arg(application_manufacturer, 0, 16 ) );
+	std->dvbcam->setAppManu( TQString("0x%1").tqarg(application_manufacturer, 0, 16 ) );
 	fprintf(stderr, "CAM Manufacturer code: %04x\n", manufacturer_code);
-	std->dvbcam->setManuCode( TQString("0x%1").arg(manufacturer_code, 0, 16 ) );
+	std->dvbcam->setManuCode( TQString("0x%1").tqarg(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").arg(i+1).arg(s) );
+		std->menuList.append( TQString("%1. %2").tqarg(i+1).tqarg(s) );
 
 	}
 
diff --git a/kaffeine/src/input/dvb/dvbconfig.cpp b/kaffeine/src/input/dvb/dvbconfig.cpp
index 2cbace8..c920090 100644
--- a/kaffeine/src/input/dvb/dvbconfig.cpp
+++ b/kaffeine/src/input/dvb/dvbconfig.cpp
@@ -24,7 +24,7 @@
 #include <errno.h>
 
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 #include <tqradiobutton.h>
@@ -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").arg( list[i] ).arg( flist[j] ).ascii(), O_RDWR);
+			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( list[i] ).tqarg( 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: ").arg( list[i] ).arg( flist[j] ).ascii() );
+					perror( TQString("/dev/dvb/%1/%2 FE_GET_INFO: ").tqarg( list[i] ).tqarg( 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").arg( s ).arg( t ).ascii(), O_RDWR);
+			fdFrontend = open( TQString("/dev/dvb/%1/%2").tqarg( s ).tqarg( 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").arg( s ).arg( t ).arg( errno ).arg( -EBUSY ).ascii() );
+				perror( TQString("/dev/dvb/%1/%2  %3/%4").tqarg( s ).tqarg( t ).tqarg( errno ).tqarg( -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").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 );
+		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 );
 		if ( devList.at(i)->type!=FE_QPSK )
 			continue;
-		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").arg(i), 1 );
+		devList.at(i)->numLnb = config->readNumEntry( TQString("DVB%1_NLNB").tqarg(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").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)->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)->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 );
+		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 );
 	}
 	j = config->readNumEntry( "NumCategories", 0 );
 	for ( i=0; i<j; i++ )
-		categories.append( new Category( config->readEntry( TQString("CategoryName%1").arg(i), "" ), config->readEntry( TQString("CategoryIcon%1").arg(i), "kaffeine" ) ) );
+		categories.append( new Category( config->readEntry( TQString("CategoryName%1").tqarg(i), "" ), config->readEntry( TQString("CategoryIcon%1").tqarg(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").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 );
+		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 );
 		if ( devList.at(i)->type!=FE_QPSK )
 			continue;
-		config->writeEntry( TQString("DVB%1_NLNB").arg(i), devList.at(i)->numLnb );
+		config->writeEntry( TQString("DVB%1_NLNB").tqarg(i), devList.at(i)->numLnb );
 		for ( j=0; j<devList.at(i)->numLnb; j++ ) {
-			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_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_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( 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( "NumCategories", categories.count() );
 	for ( i=0; i<(int)categories.count(); i++ ) {
-		config->writeEntry( TQString("CategoryName%1").arg(i), categories.at(i)->name );
-		config->writeEntry( TQString("CategoryIcon%1").arg(i), categories.at(i)->icon );
+		config->writeEntry( TQString("CategoryName%1").tqarg(i), categories.at(i)->name );
+		config->writeEntry( TQString("CategoryIcon%1").tqarg(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").arg(dvbConfig->devList.at(i)->adapter).arg(dvbConfig->devList.at(i)->tuner), i18n("Device Settings"),
+		page = addPage( i18n("DVB Device")+" "+TQString("%1:%2").tqarg(dvbConfig->devList.at(i)->adapter).tqarg(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/dvbevents.cpp b/kaffeine/src/input/dvb/dvbevents.cpp
index a777f79..b842018 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::currentDateTime().toTime_t();
+	unsigned int cdt = TQDateTime::tqcurrentDateTime().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::currentDateTime();
+			cur = TQDateTime::tqcurrentDateTime();
 			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 1f392a8..bd94126 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::currentDateTime().secsTo(recTimer->begin) );
+		TQTime t = recTimer->duration.addSecs( TQDateTime::tqcurrentDateTime().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 54d6614..3623d7f 100644
--- a/kaffeine/src/input/dvb/dvbpanel.cpp
+++ b/kaffeine/src/input/dvb/dvbpanel.cpp
@@ -20,7 +20,7 @@
 
 #include <sys/statvfs.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqstringlist.h>
@@ -114,7 +114,7 @@ DvbPanel::DvbPanel( TQWidget *parent, TQObject *objParent, const char *name ) :
 	dvb.setAutoDelete( true );
 
 	mainWidget = new TQVBox( parent );
-	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	mainWidget->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Minimum ) );
+	iconView->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
+	channelsCb->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	shiftLed->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	recordLed->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Fixed ) );
+	broadcastLed->tqsetSizePolicy( 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(diskStatus()) );
+	connect( &diskTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(disktqStatus()) );
 
 	setConfig();
 
@@ -295,7 +295,7 @@ void DvbPanel::togglePanel()
 
 
 
-void DvbPanel::diskStatus()
+void DvbPanel::disktqStatus()
 {
 	double freemb;
 	struct statvfs buf;
@@ -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").arg((int)freemb)+i18n("MB")+")", 5000, 3 );
+		emit showOSD( i18n("Warning: low disc space")+TQString(" (%1").tqarg((int)freemb)+i18n("MB")+")", 5000, 3 );
 }
 
 
@@ -644,20 +644,20 @@ void DvbPanel::dumpEvents()
 	if ( f.open(IO_WriteOnly|IO_Truncate) ) {
 		fprintf( stderr, "Creating events file.\n");
 		TQTextStream tt( &f );
-		tt << "Saved: "+TQDateTime::currentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
+		tt << "Saved: "+TQDateTime::tqcurrentDateTime().toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
 		k= 0;
 		for( i=0; i<events.getNSource(); i++ ) {
 			if ( !(esrc=events.getNEventSource( i )) )
 				continue;
-			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").arg( esrc->getNTsid() );
+			tt << esrc->getSource()+TQString(" : %1 TS with events.\n").tqarg( esrc->getNTsid() );
 			for ( m=0; m<esrc->getNTsid(); m++ ) {
 				if ( !(et=esrc->getNEventTsid( m )) )
 					continue;
-				tt << TQString("TSID %1 : %2 services with events\n").arg( et->getTsid() ).arg( et->getNSid() );
+				tt << TQString("TSID %1 : %2 services with events\n").tqarg( et->getTsid() ).tqarg( et->getNSid() );
 				for ( n=0; n<et->getNSid(); n++ ) {
 					if ( !(es=et->getNEventSid( n )) )
 						continue;
-					tt << TQString("     SID %1 : %2 events\n").arg( es->getSid() ).arg( es->getNDesc() );
+					tt << TQString("     SID %1 : %2 events\n").tqarg( es->getSid() ).tqarg( 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").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 << 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 << "Title: "+desc->title+"\n";
 						tt << "Subtitle: "+desc->subtitle+"\n";
 						tt << desc->startDateTime.toString( "dd-MM-yyyy hh:mm:ss" )+"\n";
@@ -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::currentDateTime();
+				TQDateTime dt = TQDateTime::tqcurrentDateTime();
 				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::getSourcesStatus()
+TQPtrList<Transponder> DvbPanel::getSourcestqStatus()
 {
 	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 = getSourcesStatus();
+	TQPtrList<Transponder> trans = getSourcestqStatus();
 	trans.setAutoDelete( true );
 
 	searchLE->clear();
@@ -1320,7 +1320,7 @@ void DvbPanel::checkTimers()
 	bool live=false;
 	RecTimer *t;
 	ChannelDesc *chan;
-	TQDateTime cur=TQDateTime::currentDateTime();
+	TQDateTime cur=TQDateTime::tqcurrentDateTime();
 	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::currentDateTime().toString( "yyyyMMdd-hhmmss" );
+			s+="_"+TQDateTime::tqcurrentDateTime().toString( "yyyyMMdd-hhmmss" );
 	}
 
 	rt = new RecTimer();
 	rt->name = s;
 	rt->channel = curchan.name;
-	rt->begin = TQDateTime::currentDateTime();
+	rt->begin = TQDateTime::tqcurrentDateTime();
 	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::currentDateTime().toString("yyyyMMddThhmmss")+".m2t";
+	timeShiftFileName = dvbConfig->shiftDir+"DVBLive-"+TQDateTime::tqcurrentDateTime().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 4dbf554..d126bb6 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 diskStatus();
+	void disktqStatus();
 	void camClicked( int devNum );
 
 private:
@@ -163,7 +163,7 @@ private:
 	bool getTimerList();
 	bool saveTimerList();
 	void fillChannelList( ChannelDesc *ch=0 );
-	TQPtrList<Transponder> getSourcesStatus();
+	TQPtrList<Transponder> getSourcestqStatus();
 	void updateModeTimer( RecTimer *t );
 	DvbStream* getWorkingDvb( int mode, ChannelDesc *chan );
 
diff --git a/kaffeine/src/input/dvb/dvbsi.cpp b/kaffeine/src/input/dvb/dvbsi.cpp
index 7fd8669..cce9d0c 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").arg(tsid).arg(sid);
+			desc->name = TQString("TSID:%1-SID:%2").tqarg(tsid).tqarg(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").arg(major_channel_num).arg(minor_channel_num).arg(short_name);
+		desc->name = TQString("%1-%2 %3").tqarg(major_channel_num).tqarg(minor_channel_num).tqarg(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 be8ae7d..b3ca31d 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").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 );
+	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 );
 
 	out.setAutoDelete( true );
 
@@ -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(checkStatus()) );
+	connect( &statusTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(checktqStatus()) );
 }
 
 
@@ -221,7 +221,7 @@ bool DvbStream::closeFe()
 
 
 
-void DvbStream::connectStatus( bool con )
+void DvbStream::connecttqStatus( bool con )
 {
 	if ( con )
 		statusTimer.start( 1000 );
@@ -879,7 +879,7 @@ void DvbStream::removeOut( DVBout *o )
 
 
 
-bool DvbStream::checkStatus()
+bool DvbStream::checktqStatus()
 {
 	int32_t strength;
 	fe_status_t festatus;
@@ -887,19 +887,19 @@ bool DvbStream::checkStatus()
 
        strength=0;
 	ioctl(fdFrontend,FE_READ_SIGNAL_STRENGTH,&strength);
-	emit signalStatus(strength*100/65535);
+	emit signaltqStatus(strength*100/65535);
 
 	strength=0;
 	ioctl(fdFrontend,FE_READ_SNR,&strength);
-	emit snrStatus(strength*100/65535);
+	emit snrtqStatus(strength*100/65535);
 
 	memset( &festatus, 0, sizeof(festatus) );
 	ioctl(fdFrontend,FE_READ_STATUS,&festatus);
 
 	if (festatus & FE_HAS_LOCK)
-		emit lockStatus( true );
+		emit locktqStatus( true );
 	else {
-		emit lockStatus( false );
+		emit locktqStatus( false );
 		ret = false;
 	}
 
@@ -1481,7 +1481,7 @@ void DvbStream::stopFrontend()
 
 void DvbStream::setScanning( bool b )
 {
-	connectStatus( b );
+	connecttqStatus( b );
 }
 
 
diff --git a/kaffeine/src/input/dvb/dvbstream.h b/kaffeine/src/input/dvb/dvbstream.h
index 1d2d780..f793aa0 100644
--- a/kaffeine/src/input/dvb/dvbstream.h
+++ b/kaffeine/src/input/dvb/dvbstream.h
@@ -99,7 +99,7 @@ public :
 
 public slots:
 
-	bool checkStatus();
+	bool checktqStatus();
 	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 connectStatus( bool con );
+	void connecttqStatus( bool con );
 
 	TQFile liveFile;
 	bool timeShifting;
@@ -157,9 +157,9 @@ signals:
 	void timerEnded(RecTimer*);
 
 	void errorMsg( TQString );
-	void snrStatus( int );
-	void signalStatus( int );
-	void lockStatus( bool );
+	void snrtqStatus( int );
+	void signaltqStatus( int );
+	void locktqStatus( bool );
 	void shifting( bool );
 
 };
diff --git a/kaffeine/src/input/dvb/kevents.cpp b/kaffeine/src/input/dvb/kevents.cpp
index d38cd21..e47bb60 100644
--- a/kaffeine/src/input/dvb/kevents.cpp
+++ b/kaffeine/src/input/dvb/kevents.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqpopupmenu.h>
diff --git a/kaffeine/src/input/dvb/kevents.h b/kaffeine/src/input/dvb/kevents.h
index 746e232..d960575 100644
--- a/kaffeine/src/input/dvb/kevents.h
+++ b/kaffeine/src/input/dvb/kevents.h
@@ -24,7 +24,7 @@
 #include <tqtimer.h>
 #include <tqdialog.h>
 #include <tqdatetime.h>
-#include <textbrowser.h>
+#include <tqtextbrowser.h>
 
 #include <klistview.h>
 #include <kpushbutton.h>
diff --git a/kaffeine/src/input/dvb/kgradprogress.cpp b/kaffeine/src/input/dvb/kgradprogress.cpp
index 07030e4..d81f671 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);
-	setSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
+	tqsetSizePolicy( TQSizePolicy::MinimumExpanding, TQSizePolicy::Preferred );
 }
 
 
@@ -43,7 +43,7 @@ void KGradProgress::setProgress( int progress )
 {
 	current = progress;
 	draw();
-	repaint(false);
+	tqrepaint(false);
 }
 
 
@@ -113,7 +113,7 @@ void KGradProgress::paintEvent(TQPaintEvent *event)
 
 
 
-TQSize KGradProgress::sizeHint()
+TQSize KGradProgress::tqsizeHint()
 {
 	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 84aeee0..887019d 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 sizeHint();
+	virtual TQSize tqsizeHint();
 	virtual TQSizePolicy sizePolicy();
 
 public slots:
diff --git a/kaffeine/src/input/dvb/krecord.cpp b/kaffeine/src/input/dvb/krecord.cpp
index 0355cde..e6d5b9b 100644
--- a/kaffeine/src/input/dvb/krecord.cpp
+++ b/kaffeine/src/input/dvb/krecord.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqfile.h>
 #include <tqdir.h>
diff --git a/kaffeine/src/input/dvb/ktimereditor.cpp b/kaffeine/src/input/dvb/ktimereditor.cpp
index 6a5b00f..c66c5d1 100644
--- a/kaffeine/src/input/dvb/ktimereditor.cpp
+++ b/kaffeine/src/input/dvb/ktimereditor.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include <klocale.h>
@@ -85,7 +85,7 @@ KTimerEditor::KTimerEditor( bool newone, TQStringList &chanList, RecTimer t, TQW
 	channelComb->insertStringList( chanList );
 
 	if ( newone ) {
-		begin->setDateTime( TQDateTime::currentDateTime() );
+		begin->setDateTime( TQDateTime::tqcurrentDateTime() );
 		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 ea00f76..f05ff3a 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::currentDateTime();
+	TQDateTime cur=TQDateTime::tqcurrentDateTime();
 	TQTime t1=TQTime::currentTime();
 
 	if ( epgLoaded )
@@ -416,7 +416,7 @@ void EventTable::run()
 
 	setpriority(PRIO_PROCESS, 0, 19);
 
-	cur = TQDateTime::currentDateTime();
+	cur = TQDateTime::tqcurrentDateTime();
 	for( k=0; k<getNSource(); k++ ) {
 		if ( !(esrc=getNEventSource( k )) )
 			continue;
diff --git a/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp b/kaffeine/src/input/dvb/plugins/epg/kaffeinedvbsection.cpp
index 3c49848..44619b7 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").arg( adapter ).arg( tuner );
+	TQString demuxer = TQString("/dev/dvb/adapter%1/demux%2").tqarg( adapter ).tqarg( 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 5138936..f433054 100644
--- a/kaffeine/src/input/dvb/scandialog.cpp
+++ b/kaffeine/src/input/dvb/scandialog.cpp
@@ -18,7 +18,7 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -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)").arg(dvb->at(i)->getAdapter()).arg(dvb->at(i)->getTuner()) );
+				list.append( TQString("AUTO(%1:%2)").tqarg(dvb->at(i)->getAdapter()).tqarg(dvb->at(i)->getTuner()) );
 			else
 				list.append( tmp[j] );
 		}
@@ -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(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( 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( 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(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( 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( 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(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( 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( dvbsi, TQT_SIGNAL(end(bool)), this, TQT_SLOT(siEnded(bool)) );
 			break;
 		}
@@ -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").arg( (i*1000000)+500000 );
+				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)+500000 );
 				parseTp( s, ds->getType(), "" );
 			}
 			if ( offset125p->isChecked() ) {
-				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+500000+125000 );
+				s = TQString("T %1 7MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (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").arg( (i*1000000)-167000 );
+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (i*1000000)-167000 );
 				parseTp( s, ds->getType(), "" );
 			}
 			if ( offset0->isChecked() ) {
-				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( i*1000000 );
+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( i*1000000 );
 				parseTp( s, ds->getType(), "" );
 			}
 			if ( offset167p->isChecked() ) {
-				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").arg( (i*1000000)+167000 );
+				s = TQString("T %1 8MHz AUTO AUTO AUTO AUTO AUTO AUTO").tqarg( (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").arg( chan->tp.snr ), chan->name );
+	it = new DListViewItem( foundList, chan, TQString( "%1").tqarg( 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") ).arg(ntv).arg(nradio) );
+		progressLab->setText( TQString( i18n("Found: %1 TV - %2 radio") ).tqarg(ntv).tqarg(nradio) );
 	if ( chan->provider.isEmpty() )
 		return;
 	for ( i=0; i<providerComb->count(); i++ ) {
diff --git a/kaffeine/src/input/dvb/scandialogui.ui b/kaffeine/src/input/dvb/scandialogui.ui
index 654e762..d85d58f 100644
--- a/kaffeine/src/input/dvb/scandialogui.ui
+++ b/kaffeine/src/input/dvb/scandialogui.ui
@@ -21,7 +21,7 @@
         </property>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout9</cstring>
+                <cstring>tqlayout9</cstring>
             </property>
             <vbox>
                 <property name="name">
@@ -29,7 +29,7 @@
                 </property>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout8</cstring>
+                        <cstring>tqlayout8</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -118,7 +118,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -129,7 +129,7 @@
                         </widget>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout7</cstring>
+                                <cstring>tqlayout7</cstring>
                             </property>
                             <vbox>
                                 <property name="name">
@@ -257,7 +257,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>20</width>
                                             <height>18</height>
@@ -282,7 +282,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>21</width>
                                             <height>19</height>
@@ -487,7 +487,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout9</cstring>
+                        <cstring>tqlayout9</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -503,7 +503,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>40</width>
                                     <height>20</height>
diff --git a/kaffeine/src/input/dvb/subeditorui.ui b/kaffeine/src/input/dvb/subeditorui.ui
index 857cdc5..3935e78 100644
--- a/kaffeine/src/input/dvb/subeditorui.ui
+++ b/kaffeine/src/input/dvb/subeditorui.ui
@@ -35,7 +35,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="2" column="0">
             <property name="name">
-                <cstring>layout19</cstring>
+                <cstring>tqlayout19</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -51,7 +51,7 @@
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>40</width>
                             <height>20</height>
@@ -70,7 +70,7 @@
         </widget>
         <widget class="TQLayoutWidget" row="0" column="0">
             <property name="name">
-                <cstring>layout13</cstring>
+                <cstring>tqlayout13</cstring>
             </property>
             <hbox>
                 <property name="name">
@@ -101,7 +101,7 @@
                 </widget>
                 <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout12</cstring>
+                        <cstring>tqlayout12</cstring>
                     </property>
                     <vbox>
                         <property name="name">
@@ -109,7 +109,7 @@
                         </property>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout16</cstring>
+                                <cstring>tqlayout16</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -117,7 +117,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout15</cstring>
+                                        <cstring>tqlayout15</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -159,7 +159,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -178,7 +178,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>180</height>
@@ -187,7 +187,7 @@
                         </spacer>
                         <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout11</cstring>
+                                <cstring>tqlayout11</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -195,7 +195,7 @@
                                 </property>
                                 <widget class="TQLayoutWidget">
                                     <property name="name">
-                                        <cstring>layout13</cstring>
+                                        <cstring>tqlayout13</cstring>
                                     </property>
                                     <vbox>
                                         <property name="name">
@@ -232,7 +232,7 @@
                                         </property>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout10</cstring>
+                                                <cstring>tqlayout10</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
@@ -274,7 +274,7 @@
                                         </widget>
                                         <widget class="TQLayoutWidget">
                                             <property name="name">
-                                                <cstring>layout9</cstring>
+                                                <cstring>tqlayout9</cstring>
                                             </property>
                                             <vbox>
                                                 <property name="name">
diff --git a/kaffeine/src/input/dvbclient/cdwidget.cpp b/kaffeine/src/input/dvbclient/cdwidget.cpp
index d1293ba..19e82ed 100644
--- a/kaffeine/src/input/dvbclient/cdwidget.cpp
+++ b/kaffeine/src/input/dvbclient/cdwidget.cpp
@@ -19,7 +19,7 @@
  */
 
 #include <tqapplication.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqdir.h>
 
 #include <kiconloader.h>
@@ -33,14 +33,14 @@ CdWidget::CdWidget( const TQString &ad, int port, int info, const TQString &tspa
 	: KaffeineInput( objParent, name )
 {
 	mainWidget = new TQVBox( parent );
-	mainWidget->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::Preferred) );
+	mainWidget->tqsetSizePolicy( 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->setSizePolicy( TQSizePolicy (TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding) );
+	channelsLb->tqsetSizePolicy( 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::currentDateTime().toString( Qt::ISODate )+".ts";
+		timeShiftFileName = cdShiftDir+"DVBClient-"+TQDateTime::tqcurrentDateTime().toString( Qt::ISODate )+".ts";
 		if ( dump->doPause( timeShiftFileName ) ) emit setTimeShiftFilename( timeShiftFileName );
 	}
 }
diff --git a/kaffeine/src/inputmanager.cpp b/kaffeine/src/inputmanager.cpp
index a110a0a..0e9dcdf 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->slotChangePlaylistStatus( msg );
+	kaffeine->slotChangePlaylisttqStatus( msg );
 }
 
 
@@ -530,13 +530,13 @@ void InputManager::fullscreen( bool b )
 	int id=0;
 
 	if ( b ) {
-		stack->setSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
+		stack->tqsetSizePolicy(TQSizePolicy::Ignored, TQSizePolicy::Ignored);
 		oldMainWidget = currentMainWidget;
 		show( 2 );
 		mtBar->hide();
 	}
 	else {
-		stack->setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Expanding);
+		stack->tqsetSizePolicy(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::unicodeUriToUri(urls[i]));
+				//KURL url(TQUriDrag::tqunicodeUriToUri(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->encodedData("text/plain");
+			TQByteArray data = dev->tqencodedData("text/plain");
 			TQString md(data);
 			emit signalURLDropEvent(md);
 		}
diff --git a/kaffeine/src/instwizard.cpp b/kaffeine/src/instwizard.cpp
index 0bc4a31..c8cca22 100644
--- a/kaffeine/src/instwizard.cpp
+++ b/kaffeine/src/instwizard.cpp
@@ -49,7 +49,7 @@
 
 void InstWizard::internalWizard()
 {
-	setCaption(i18n("Kaffeine %1 Installation Wizard").arg(KAFFEINE_VERSION));
+	setCaption(i18n("Kaffeine %1 Installation Wizard").tqarg(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.").arg("3.2") << "</font>";
+		info << "<font color=\"DarkRed\">" << i18n("Kaffeine requires KDE >= %1.").tqarg("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:").arg("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:").tqarg("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:").arg("1.0")
+		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>";
 	*/
 	//WIN32-CODECS
@@ -272,7 +272,7 @@ void InstWizard::internalWizard()
 
 void InstWizard::slotStdout(KProcess *, char *buffer, int buflen)
 {
-	TQString output = TQString::fromLatin1(buffer, buflen);
+	TQString output = TQString::tqfromLatin1(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 3c725df..9a83567 100644
--- a/kaffeine/src/kaffeine.cpp
+++ b/kaffeine/src/kaffeine.cpp
@@ -59,7 +59,7 @@
 #include <tdeversion.h>
 
 #include <tqdir.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqinputdialog.h>
 #include <kurldrag.h>
@@ -154,8 +154,8 @@ Kaffeine::Kaffeine() : DCOPObject("KaffeineIface"),
 	//createStandardStatusBarAction();
 	createGUI("kaffeineui.rc");
 
-	//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("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("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.").arg(desktopName), i18n("%1 not found in search path.").arg(TQString(desktopName)+ ".desktop"));
+		KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(desktopName), i18n("%1 not found in search path.").tqarg(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.").arg(service->name()), KLibLoader::self()->lastErrorMessage());
+			KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(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.").arg(name), message);
+	KMessageBox::detailedError(this, i18n("Loading of player part '%1' failed.").tqarg(name), message);
 }
 
 void Kaffeine::slotPlaybackFailed()
@@ -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->encodedData("text/plain");
+    TQByteArray data = dev->tqencodedData("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().endsWith(".iso", false))
+		if ((*it).isLocalFile() && (*it).path().tqendsWith(".iso", false))
 			(*it).setProtocol("dvd");
 
 	TQStringList urlList = kurlList.toStringList();
@@ -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.").arg(type), page);
+	new TQLabel(i18n("No %1 in drive, or wrong path to device.").tqarg(type), page);
 	new TQLabel(TQString("\n") + i18n("Please select correct drive:"), page);
 	DrivesCombo* drives = new DrivesCombo(page);
 
@@ -1557,7 +1557,7 @@ void Kaffeine::slotChangeStatusbar(const TQString& )
 }
 
 
-void Kaffeine::slotChangePlaylistStatus(const TQString& )
+void Kaffeine::slotChangePlaylisttqStatus(const TQString& )
 {
 	//statusBar()->changeItem(text, 9);
 }
@@ -1591,7 +1591,7 @@ void Kaffeine::slotFakeKeyEvent()
 		}
 }
 
-/** slots for meta to unicode encoding **/
+/** slots for meta to tqunicode encoding **/
 
 void Kaffeine::slotUseAlternateEncoding(bool useEncoding)
 {
diff --git a/kaffeine/src/kaffeine.h b/kaffeine/src/kaffeine.h
index 4496d93..79ad0cc 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 slotChangePlaylistStatus(const TQString&);
+	void slotChangePlaylisttqStatus(const TQString&);
 	void slotStop();
 	void slotPlayUnPause();
 
diff --git a/kaffeine/src/kmultitabbar.cpp b/kaffeine/src/kmultitabbar.cpp
index 4c8c2b0..1c32cae 100644
--- a/kaffeine/src/kmultitabbar.cpp
+++ b/kaffeine/src/kmultitabbar.cpp
@@ -29,7 +29,7 @@
 #include "kmultitabbar_p.moc"
 #include <tqbutton.h>
 #include <tqpopupmenu.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpainter.h>
 #include <tqtooltip.h>
 #include <tqfontmetrics.h>
@@ -111,7 +111,7 @@ void KMultiTabBarInternal::setStyle(enum KMultiTabBar::KMultiTabBarStyle style)
 		mainLayout->setAutoAdd(true);
 
 	}
-        viewport()->repaint();
+        viewport()->tqrepaint();
 }
 
 void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clipy, int clipw, int cliph )
@@ -121,9 +121,9 @@ void KMultiTabBarInternal::drawContents ( TQPainter * paint, int clipx, int clip
 	if (m_position==KMultiTabBar::Right)
 	{
 
-                paint->setPen(colorGroup().shadow());
+                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
-                paint->setPen(colorGroup().background().dark(120));
+                paint->setPen(tqcolorGroup().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(colorGroup().light());
+                paint->setPen(tqcolorGroup().light());
 		paint->drawLine(23,0,23,viewport()->height());
                 paint->drawLine(22,0,22,viewport()->height());
 
-                paint->setPen(colorGroup().shadow());
+                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());
 	}
 	else
 	if (m_position==KMultiTabBar::Bottom)
 	{
-		paint->setPen(colorGroup().shadow());
+		paint->setPen(tqcolorGroup().shadow());
 		paint->drawLine(0,0,viewport()->width(),0);
-                paint->setPen(colorGroup().background().dark(120));
+                paint->setPen(tqcolorGroup().background().dark(120));
                 paint->drawLine(0,1,viewport()->width(),1);
 	}
 	else
 	{
-	        paint->setPen(colorGroup().light());
+	        paint->setPen(tqcolorGroup().light());
 		paint->drawLine(0,23,viewport()->width(),23);
                 paint->drawLine(0,22,viewport()->width(),22);
 
-/*                paint->setPen(colorGroup().shadow());
+/*                paint->setPen(tqcolorGroup().shadow());
                 paint->drawLine(0,0,0,viewport()->height());*/
 
 	}
@@ -189,8 +189,8 @@ void KMultiTabBarInternal::mousePressEvent(TQMouseEvent *ev)
 
 void KMultiTabBarInternal::resizeEvent(TQResizeEvent *ev) {
 /*	kdDebug()<<"KMultiTabBarInternal::resizeEvent"<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box geometry"<<box->geometry()<<endl;
-	kdDebug()<<"KMultiTabBarInternal::resizeEvent - geometry"<<geometry()<<endl;*/
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - box tqgeometry"<<box->tqgeometry()<<endl;
+	kdDebug()<<"KMultiTabBarInternal::resizeEvent - tqgeometry"<<tqgeometry()<<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()->repaint();
+	viewport()->tqrepaint();
 }
 
 
@@ -436,13 +436,13 @@ void KMultiTabBarButton::slotClicked()
 void KMultiTabBarButton::setPosition(KMultiTabBar::KMultiTabBarPosition pos)
 {
 	m_position=pos;
-	repaint();
+	tqrepaint();
 }
 
 void KMultiTabBarButton::setStyle(KMultiTabBar::KMultiTabBarStyle style)
 {
 	m_style=style;
-	repaint();
+	tqrepaint();
 }
 
 void KMultiTabBarButton::hideEvent( TQHideEvent* he) {
@@ -458,7 +458,7 @@ void KMultiTabBarButton::showEvent( TQShowEvent* he) {
 }
 
 
-TQSize KMultiTabBarButton::sizeHint() const
+TQSize KMultiTabBarButton::tqsizeHint() const
 {
     constPolish();
 
@@ -474,7 +474,7 @@ TQSize KMultiTabBarButton::sizeHint() const
     }
 #endif
     if ( isMenuButton() )
-        w += tqstyle().pixelMetric(TQStyle::PM_MenuButtonIndicator, this);
+        w += tqstyle().tqpixelMetric(TQStyle::PM_MenuButtonIndicator, this);
 
     if ( pixmap() ) {
         TQPixmap *pm = (TQPixmap *)pixmap();
@@ -484,7 +484,7 @@ TQSize KMultiTabBarButton::sizeHint() const
         TQString s( text() );
         bool empty = s.isEmpty();
         if ( empty )
-            s = TQString::fromLatin1("XXXX");
+            s = TQString::tqfromLatin1("XXXX");
         TQFontMetrics fm = fontMetrics();
         TQSize sz = fm.size( ShowPrefix, s );
         if(!empty || !w)
@@ -528,7 +528,7 @@ void KMultiTabBarTab::setTabsPosition(KMultiTabBar::KMultiTabBarPosition pos)
 	}
 
 	setPosition(pos);
-//	repaint();
+//	tqrepaint();
 }
 
 void KMultiTabBarTab::setIcon(const TQString& icon)
@@ -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::sizeHint().width());
+				setFixedHeight(KMultiTabBarButton::tqsizeHint().width());
 			} else setFixedHeight(36);
 		} else {
 			setFixedHeight(24);
 			if ((m_style==KMultiTabBar::KDEV3)  || (m_style==KMultiTabBar::KDEV3ICON) || (down)) {
-				setFixedWidth(KMultiTabBarButton::sizeHint().width());
+				setFixedWidth(KMultiTabBarButton::tqsizeHint().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::sizeHint();
+			sh=TQSize(this->height(),this->width());//KMultiTabBarButton::tqsizeHint();
 			else sh=TQSize(this->width(),this->height());
 	}
 	else
@@ -654,8 +654,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 
 	if (down) st|=TQStyle::Style_On;
 
-	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);
+	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);
 
 	switch (m_position) {
 		case KMultiTabBar::Left:
@@ -671,8 +671,8 @@ void KMultiTabBarTab::drawButtonStyled(TQPainter *paint) {
 			paint->drawPixmap(0,0,pixmap);
 			break;
 	}
-//	tqstyle().drawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
-//		colorGroup(),TQStyle::Style_Enabled);
+//	tqstyle().tqdrawControl(TQStyle::CE_PushButtonLabel,painter,this, TQRect(0,0,pixmap.width(),pixmap.height()),
+//		tqcolorGroup(),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, colorGroup().background());
+	paint->fillRect(0, 0, 24, 24, tqcolorGroup().background());
 
 	if (!down)
 	{
 
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->fillRect(0,0,21,21,TQBrush(colorGroup().background()));
+			paint->fillRect(0,0,21,21,TQBrush(tqcolorGroup().background()));
 
-			paint->setPen(colorGroup().background().dark(150));
+			paint->setPen(tqcolorGroup().background().dark(150));
 			paint->drawLine(0,22,23,22);
 
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,0,0,23);
-			paint->setPen(colorGroup().background().dark(120));
+			paint->setPen(tqcolorGroup().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(colorGroup().background()));
+                        paint->fillRect(0,1,23,22,TQBrush(tqcolorGroup().background()));
 
                         paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-                        paint->setPen(colorGroup().background().dark(120));
+                        paint->setPen(tqcolorGroup().background().dark(120));
                         paint->drawLine(23,0,23,23);
 
 
-                        paint->setPen(colorGroup().light());
+                        paint->setPen(tqcolorGroup().light());
                         paint->drawLine(0,22,23,22);
                         paint->drawLine(0,23,23,23);
-                	paint->setPen(colorGroup().shadow());
+                	paint->setPen(tqcolorGroup().shadow());
                 	paint->drawLine(0,0,23,0);
-                        paint->setPen(colorGroup().background().dark(120));
+                        paint->setPen(tqcolorGroup().background().dark(120));
                         paint->drawLine(0,1,23,1);
 
 		}
 		else
 		{
-			paint->setPen(colorGroup().background().dark(120));
+			paint->setPen(tqcolorGroup().background().dark(120));
 			paint->drawLine(0,23,23,23);
-			paint->fillRect(0,0,23,21,TQBrush(colorGroup().background()));
+			paint->fillRect(0,0,23,21,TQBrush(tqcolorGroup().background()));
 			paint->drawPixmap(12-pixmap.width()/2,12-pixmap.height()/2,pixmap);
 
-			paint->setPen(colorGroup().light());
+			paint->setPen(tqcolorGroup().light());
 			paint->drawLine(23,0,23,23);
 			paint->drawLine(22,0,22,23);
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,0,0,23);
 
 		}
@@ -744,12 +744,12 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 	{
 		if (m_position==KMultiTabBar::Right)
 		{
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().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(colorGroup().light()));
+			paint->fillRect(0,0,21,height()-3,TQBrush(tqcolorGroup().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(colorGroup().light()));
+				painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
 
-				painter.setPen(colorGroup().text());
+				painter.setPen(tqcolorGroup().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(colorGroup().light()));
+			paint->fillRect(0,0,width()-1,23,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(colorGroup().text());
+				paint->setPen(tqcolorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 		}
 		else
 		if (m_position==KMultiTabBar::Bottom)
 		{
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().shadow());
 			paint->drawLine(0,23,width()-1,23);
 			paint->drawLine(0,22,width()-1,22);
-			paint->fillRect(0,0,width()-1,21,TQBrush(colorGroup().light()));
+			paint->fillRect(0,0,width()-1,21,TQBrush(tqcolorGroup().light()));
 			paint->drawPixmap(10-pixmap.width()/2,10-pixmap.height()/2,pixmap);
 			if (m_showActiveTabText)
 			{
-				paint->setPen(colorGroup().text());
+				paint->setPen(tqcolorGroup().text());
 				paint->drawText(25,height()/2+TQFontMetrics(TQFont()).height()/2,m_text);
 			}
 
@@ -800,10 +800,10 @@ void KMultiTabBarTab::drawButtonClassic(TQPainter *paint)
 		{
 
 
-			paint->setPen(colorGroup().shadow());
+			paint->setPen(tqcolorGroup().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(colorGroup().light()));
+			paint->fillRect(0,0,23,height()-3,TQBrush(tqcolorGroup().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(colorGroup().light()));
+                                painter.fillRect(0,0,tpixmap.width(),tpixmap.height(),TQBrush(tqcolorGroup().light()));
 
-                                painter.setPen(colorGroup().text());
+                                painter.setPen(tqcolorGroup().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);
-		setSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
+		tqsetSizePolicy(TQSizePolicy::Fixed, TQSizePolicy::Expanding, true);
 //		setFixedWidth(24);
 	}
 	else
 	{
 		m_l=new TQHBoxLayout(this);
-		setSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
+		tqsetSizePolicy(TQSizePolicy::Expanding, TQSizePolicy::Fixed, true);
 //		setFixedHeight(24);
 	}
 	m_l->setMargin(0);
@@ -992,7 +992,7 @@ void KMultiTabBar::fontChange(const TQFont& /* oldFont */)
 {
 	for (uint i=0;i<tabs()->count();i++)
 		tabs()->at(i)->resize();
-	repaint();
+	tqrepaint();
 }
 
 TQPtrList<KMultiTabBarTab>* KMultiTabBar::tabs() {return m_internal->tabs();}
diff --git a/kaffeine/src/kmultitabbar.h b/kaffeine/src/kmultitabbar.h
index 412932d..25aa255 100644
--- a/kaffeine/src/kmultitabbar.h
+++ b/kaffeine/src/kmultitabbar.h
@@ -29,7 +29,7 @@
 #include <tqscrollview.h>
 #include <tqvbox.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqstring.h>
 #include <tqptrlist.h>
 #include <tqpushbutton.h>
@@ -182,7 +182,7 @@ public slots:
          */
 	void setText(const TQString &);
 
-	TQSize sizeHint() const;
+	TQSize tqsizeHint() const;
 
 protected:
 	KMultiTabBar::KMultiTabBarPosition m_position;
diff --git a/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamer_part.cpp
index fb6e7a3..2255e67 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!").arg(sinkName).arg(m_audioSinkName));
+		KMessageBox::error(0, i18n("Error: Can't init new Audio Driver %1 - using %2!").tqarg(sinkName).tqarg(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...").arg(m_audioSinkName));
+		KMessageBox::error(0, i18n("Can't init Audio Driver '%1' - trying another one...").tqarg(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...").arg(m_videoSinkName));
+		KMessageBox::error(0, i18n("Can't init Video Driver '%1' - trying another one...").tqarg(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/gstreamerconfig.cpp b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
index bbcf634..dd843f5 100644
--- a/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/gstreamerconfig.cpp
@@ -25,7 +25,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 
 #include "gstreamerconfig.h"
@@ -40,47 +40,47 @@ GStreamerConfig::GStreamerConfig(const TQStringList& audioDrivers, const TQStrin
 	setInitialSize(TQSize(400,300), true);
 
 	TQFrame* frame = NULL;
-	TQGridLayout* layout = NULL;
+	TQGridLayout* tqlayout = NULL;
 	TQLabel* label = NULL;
 
 	//Audio Page
 	frame = addPage(i18n("Audio"), i18n("Audio Options"), KGlobal::iconLoader()->loadIcon("sound", KIcon::Panel,
 	                KIcon::SizeMedium));
-	layout = new TQGridLayout(frame, 10, 2);
-	layout->setMargin(10);
-	layout->setSpacing(10);
+	tqlayout = new TQGridLayout(frame, 10, 2);
+	tqlayout->setMargin(10);
+	tqlayout->setSpacing(10);
 	m_audioDriverBox = new KComboBox(frame);
 	m_audioDriverBox->insertStringList(audioDrivers);
 	label = new TQLabel(i18n("Prefered audio driver"), frame);
-	layout->addWidget(label, 1, 0);
-	layout->addWidget(m_audioDriverBox, 1, 1);
-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+	tqlayout->addWidget(label, 1, 0);
+	tqlayout->addWidget(m_audioDriverBox, 1, 1);
+	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
 
 	//Video Page
 	frame = addPage(i18n("Video"), i18n("Video Options"), KGlobal::iconLoader()->loadIcon("video", KIcon::Panel,
 	                KIcon::SizeMedium));
-	layout = new TQGridLayout(frame, 10, 2);
-	layout->setMargin(10);
-	layout->setSpacing(10);
+	tqlayout = new TQGridLayout(frame, 10, 2);
+	tqlayout->setMargin(10);
+	tqlayout->setSpacing(10);
 	m_videoDriverBox = new KComboBox(frame);
 	m_videoDriverBox->insertStringList(videoDrivers);
 	label = new TQLabel(i18n("Prefered video driver")+ "*", frame);
-	layout->addWidget(label, 1, 0);
-	layout->addWidget(m_videoDriverBox, 1, 1);
-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
-	layout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
+	tqlayout->addWidget(label, 1, 0);
+	tqlayout->addWidget(m_videoDriverBox, 1, 1);
+	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+	tqlayout->addWidget(new TQLabel(TQString("<small>") + i18n("* Restart required!") + "</small>", frame), 10, 1);
 
 	//Media page
 	frame = addPage(i18n("Media"), i18n("Media Options"), KGlobal::iconLoader()->loadIcon("cdrom_unmount", KIcon::Panel,
 	                KIcon::SizeMedium));
-	layout = new TQGridLayout(frame, 10, 2);
-	layout->setMargin(10);
-	layout->setSpacing(10);
+	tqlayout = new TQGridLayout(frame, 10, 2);
+	tqlayout->setMargin(10);
+	tqlayout->setSpacing(10);
 	m_driveEdit = new KLineEdit(frame);
 	label = new TQLabel(i18n("CD, VCD, DVD drive"), frame);
-	layout->addWidget(label, 1, 0);
-	layout->addWidget(m_driveEdit, 1, 1);
-	layout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
+	tqlayout->addWidget(label, 1, 0);
+	tqlayout->addWidget(m_driveEdit, 1, 1);
+	tqlayout->addMultiCellWidget(new KSeparator(Qt::Horizontal, frame), 2, 2, 0, 1);
 }
 
 GStreamerConfig::~GStreamerConfig()
diff --git a/kaffeine/src/player-parts/gstreamer-part/video.cpp b/kaffeine/src/player-parts/gstreamer-part/video.cpp
index 96752aa..eb6203f 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 geometry
+	//set correct tqgeometry
 	setGeometry();
 }
 
@@ -177,7 +177,7 @@ void VideoWindow::newState()
 	TQSize frame = getFrameSize();
 	correctByAspectRatio( frame );
 	emit signalNewFrameSize( frame );
-	//set correct geometry
+	//set correct tqgeometry
 	setGeometry();
 }
 
diff --git a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
index 5ca441e..29d8587 100644
--- a/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
+++ b/kaffeine/src/player-parts/gstreamer-part/videosettings.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqnamespace.h>
 
@@ -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->setAlignment(AlignRight);
+  hueText->tqsetAlignment(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->setAlignment(AlignRight);
+  satText->tqsetAlignment(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->setAlignment(AlignRight);
+  contrastText->tqsetAlignment(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->setAlignment(AlignRight);
+  brightText->tqsetAlignment(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 8e05811..9abb266 100644
--- a/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
+++ b/kaffeine/src/player-parts/xine-part/deinterlacequality.cpp
@@ -27,7 +27,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 #include <tqlabel.h>
-#include <layout.h>
+#include <tqlayout.h>
  
 #include "deinterlacequality.h"
 #include "deinterlacequality.moc"
@@ -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->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+  m_customConfigButton->tqsetSizePolicy(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->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
+  note->tqsetAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
   grid->addMultiCellWidget(note, 9, 9, 0, 1);
 }
 
diff --git a/kaffeine/src/player-parts/xine-part/equalizer.cpp b/kaffeine/src/player-parts/xine-part/equalizer.cpp
index 5d736bd..9834a17 100644
--- a/kaffeine/src/player-parts/xine-part/equalizer.cpp
+++ b/kaffeine/src/player-parts/xine-part/equalizer.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtooltip.h>
 #include <tqlabel.h>
 
diff --git a/kaffeine/src/player-parts/xine-part/filterdialog.cpp b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
index 145ba8e..9281527 100644
--- a/kaffeine/src/player-parts/xine-part/filterdialog.cpp
+++ b/kaffeine/src/player-parts/xine-part/filterdialog.cpp
@@ -28,7 +28,7 @@
 #include <tqvbox.h>
 #include <tqstringlist.h>
 #include <tqcheckbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqscrollview.h>
  
 #include "filterdialog.h"
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
index 5ac5ec9..9385759 100644
--- a/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
+++ b/kaffeine/src/player-parts/xine-part/kxinewidget.cpp
@@ -29,7 +29,7 @@
 #include <tqcursor.h>
 #include <tqimage.h>
 #include <tqdatetime.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <xine/xineutils.h>
 
@@ -153,14 +153,14 @@ KXineWidget::~KXineWidget()
 	{
 		debugOut("Unwire audio filters");
 		unwireAudioFilters();
-		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName ));
+		debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName ));
 		delete m_visualPlugin;
 		m_visualPlugin = NULL;
 	}
 #else
 	if (m_xinePost)
 	{
-		debugOut(TQString("Dispose visual plugin: %1").arg(m_visualPluginName));
+		debugOut(TQString("Dispose visual plugin: %1").tqarg(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").arg(m_configFilePath));
+	debugOut(TQString("Save xine config to: %1").tqarg(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").arg(video_width).arg(video_height).arg(video_aspect));
+		debugOut(TQString("New video frame size: %1x%2 - aspect ratio: %3").tqarg(video_width).tqarg(video_height).tqarg(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").arg(vw->m_newParentSize.width()).arg(vw->m_newParentSize.height()));
+			debugOut(TQString("Resize video window to: %1x%2").tqarg(vw->m_newParentSize.width()).tqarg(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.").arg(i+1);
+				slang = TQString("%1.").tqarg(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.").arg(i+1);
+				slang = TQString("%1.").tqarg(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").arg(dropped->skipped_frames/10).arg(dropped->discarded_frames/10));
+			warningOut(TQString("Skipped frames: %1 - discarded frames: %2").tqarg(dropped->skipped_frames/10).tqarg(dropped->discarded_frames/10));
 
 			break;
 		}
@@ -721,7 +721,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
 		}
 		case TIMER_EVENT_NEW_STATUS:
 		{
-			emit signalXineStatus(m_statusString);
+			emit signalXinetqStatus(m_statusString);
 			break;
 		}
 		case TIMER_EVENT_CHANGE_CURSOR:
@@ -752,7 +752,7 @@ void KXineWidget::timerEvent( TQTimerEvent* tevent )
 			else
 			{
 				//restart
-				warningOut(TQString("Message: '%1' was blocked!").arg(m_xineMessage));
+				warningOut(TQString("Message: '%1' was blocked!").tqarg(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").arg(entry->enum_values[entry->num_value]));
+	debugOut(TQString("New video driver: %1").tqarg(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").arg(vw->m_visualPluginName));
+		debugOut(TQString("Dispose visual plugin: %1").tqarg(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!").arg(entry->enum_values[entry->num_value]).arg(vw->m_videoDriverName);
+		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);
 		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").arg(vw->m_videoDriverName);
+		vw->m_statusString = i18n("Using Video Driver: %1").tqarg(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").arg(entry->enum_values[entry->num_value]));
+	debugOut(TQString("New audio driver: %1").tqarg(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").arg(vw->m_visualPluginName));
+		debugOut(TQString("Dispose visual plugin: %1").tqarg(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!").arg(entry->enum_values[entry->num_value]).arg(vw->m_audioDriverName);
+		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);
 		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").arg(vw->m_audioDriverName);
+		vw->m_statusString = i18n("Using Audio Driver: %1").tqarg(vw->m_audioDriverName);
 		TQApplication::postEvent(vw, new TQTimerEvent(TIMER_EVENT_NEW_STATUS));
 	}
 
@@ -1109,7 +1109,7 @@ bool KXineWidget::initXine()
 	if (isXineReady())
 		return true;
 
-	emit signalXineStatus(i18n("Init xine..."));
+	emit signalXinetqStatus(i18n("Init xine..."));
 	globalPosChanged(); /* get global pos of the window */
 
 	/**** INIT XINE DISPLAY  ****/
@@ -1148,18 +1148,18 @@ bool KXineWidget::initXine()
 		int count = 1;
 		debugOut("Xinerama extension present");
 		XineramaQueryScreens(x11Display(), &count);
-		debugOut(TQString("%1 screens detected").arg(count));
+		debugOut(TQString("%1 screens detected").tqarg(count));
 		if (count > 1)
 			// multihead -> assuming square pixels
 			m_displayRatio = 1.0;
 	}
 #endif
 
-	debugOut(TQString("Display aspect ratio (v/h): %1").arg(m_displayRatio));*/
+	debugOut(TQString("Display aspect ratio (v/h): %1").tqarg(m_displayRatio));*/
 
 	/**** INIT XINE ENGINE ****/
 
-	debugOut(TQString("Using xine version %1").arg(xine_get_version_string()));
+	debugOut(TQString("Using xine version %1").tqarg(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").arg(m_audioDriverName));
+	debugOut(TQString("Use audio driver %1").tqarg(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").arg(m_videoDriverName));
+	debugOut(TQString("Use video driver %1").tqarg(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'...").arg(m_videoDriverName));
+		emit signalXineError(i18n("Can't init Video Driver '%1' - trying 'auto'...").tqarg(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'...").arg(m_audioDriverName));
+		emit signalXineError(i18n("Can't init Audio Driver '%1' - trying 'auto'...").tqarg(m_audioDriverName));
 		m_audioDriverName = "auto";
 		m_audioDriver = xine_open_audio_driver (m_xineEngine, m_audioDriverName.ascii(), NULL);
 	}
@@ -1377,7 +1377,7 @@ bool KXineWidget::initXine()
 
 	debugOut("xine init successful");
 
-	emit signalXineStatus(i18n("Ready"));
+	emit signalXinetqStatus(i18n("Ready"));
 	emit signalXineReady();
 
 	/** something to play? **/
@@ -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.").arg(m_osdFont));
+			debugOut(TQString("Font ->%1<- specified for OSD doesn't exists.").tqarg(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").arg(m_osdFont));
+		debugOut(TQString("Font for OSD: %1").tqarg(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").arg(m_visualPluginName));
+			debugOut(TQString("Init visual plugin: %1").tqarg(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").arg(m_visualPluginName));
+			debugOut(TQString("Dispose visual plugin: %1").tqarg(m_visualPluginName));
 			delete m_visualPlugin;
 			m_visualPlugin = NULL;
 		}
@@ -1508,7 +1508,7 @@ bool KXineWidget::playDvb()
 	m_posTimer.start(1000);
 
 	emit signalXinePlaying();
-	emit signalXineStatus(i18n("Playing"));
+	emit signalXinetqStatus(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 signalXineStatus(i18n("DVB: opening..."));
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Opening..."));
+		emit signalXinetqStatus(i18n("Opening..."));
 
 	/* check for external subtitle file or save url */
 	m_trackSubtitleURL = TQString();
@@ -1978,7 +1978,7 @@ void KXineWidget::slotPlay()
 	if ( turl.startsWith("/") )
 		turl.prepend("file://");
 
-	debugOut(TQString("Playing: %1").arg(turl.local8Bit().data()));
+	debugOut(TQString("Playing: %1").tqarg(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").arg(m_visualPluginName));
+			debugOut(TQString("Init visual plugin: %1").tqarg(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").arg(m_visualPluginName));
+			debugOut(TQString("Dispose visual plugin: %1").tqarg(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);
@@ -2053,7 +2053,7 @@ void KXineWidget::slotPlay()
 	CodecUtf8 = TQTextCodec::codecForName("UTF-8");
 
 	TQString infotag;
-	infotag = TQString::fromLatin1(xine_get_meta_info(m_xineStream, XINE_META_INFO_TITLE));
+	infotag = TQString::tqfromLatin1(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::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));
+		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));
 		if (currentUtf8Locale)
 		{
 			m_trackArtist = trackArtist;
@@ -2157,9 +2157,9 @@ void KXineWidget::slotPlay()
 	{
 		emit signalXinePlaying();
 		if (hasSaveURL())
-			emit signalXineStatus(i18n("Recording"));
+			emit signalXinetqStatus(i18n("Recording"));
 		else
-			emit signalXineStatus(i18n("Playing"));
+			emit signalXinetqStatus(i18n("Playing"));
 	}
 }
 
@@ -2239,7 +2239,7 @@ void KXineWidget::sendXineError()
 	{
 		if (m_trackURL != m_logoFile)
 		{
-			emit signalXineStatus(i18n("Error"));
+			emit signalXinetqStatus(i18n("Error"));
 			emit signalXineError(error);
 		}
 		else
@@ -2248,7 +2248,7 @@ void KXineWidget::sendXineError()
 	else
 	{
 		errorOut(error);
-		errorOut(TQString("Can't play: %1 - trying next").arg(m_trackURL));
+		errorOut(TQString("Can't play: %1 - trying next").tqarg(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").arg(message));
+	//debugOut(TQString("OSD: draw text: %1").tqarg(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]").arg(name));
+	warningOut(TQString("Not implemented [CreateVideoFilter %1]").tqarg(name));
 #endif
 }
 
@@ -2364,7 +2364,7 @@ void KXineWidget::slotCreateAudioFilter(const TQString& name, TQWidget* parent)
 	wireAudioFilters();
 #else
 	parent = parent;
-	warningOut(TQString("Not implemented [CreateAudioFilter %1]").arg(name));
+	warningOut(TQString("Not implemented [CreateAudioFilter %1]").tqarg(name));
 #endif
 }
 
@@ -2478,7 +2478,7 @@ void KXineWidget::wireAudioFilters()
 	{
 		if (!m_visualPlugin)
 		{
-			debugOut(TQString("Init visual plugin: %1").arg(m_visualPluginName));
+			debugOut(TQString("Init visual plugin: %1").tqarg(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").arg(m_visualPluginName));
+			debugOut(TQString("Dispose visual plugin: %1").tqarg(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").arg(visual));
+	debugOut(TQString("New visualization plugin: %1").tqarg(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").arg(vol));
+		//debugOut(TQString("Set software amplification level: %1").tqarg(vol));
 		if (m_volumeGain)
 			xine_set_param(m_xineStream, XINE_PARAM_AUDIO_AMP_LEVEL, vol*2);
 		else
@@ -2668,10 +2668,10 @@ void KXineWidget::slotSetVolume(int vol)
 	}
 	else
 	{
-		//debugOut(TQString("Set audio mixer volume: %1").arg(vol));
+		//debugOut(TQString("Set audio mixer volume: %1").tqarg(vol));
 		xine_set_param(m_xineStream, XINE_PARAM_AUDIO_VOLUME, vol);
 	}
-	emit signalXineStatus(i18n("Volume") + ": " + TQString::number(vol) +"%");
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Mute Off"));
+		emit signalXinetqStatus(i18n("Mute Off"));
 	}
 	else
 	{
 		xine_set_param(m_xineStream, muteParam, 1); /* mute on */
-		emit signalXineStatus(i18n("Mute On"));
+		emit signalXinetqStatus(i18n("Mute On"));
 	}
 }
 
@@ -2867,12 +2867,12 @@ void KXineWidget::slotStop()
 		TQTimer::singleShot(0, this, TQT_SLOT(slotPlay()));
 	}
 
-	emit signalXineStatus(i18n("Stop"));
+	emit signalXinetqStatus(i18n("Stop"));
 }
 
 void KXineWidget::slotSetAudiocdDevice(const TQString& device)
 {
-	debugOut(TQString("Set AudioCD device to %1").arg(device));
+	debugOut(TQString("Set AudioCD device to %1").tqarg(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").arg(device));
+	debugOut(TQString("Set VCD device to %1").tqarg(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").arg(device));
+	debugOut(TQString("Set DVD device to %1").tqarg(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").arg(dir));
+	debugOut(TQString("Set misc.save_dir to: %1").tqarg(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").arg(port));
+	debugOut(TQString("Set broadcaster port to %1").tqarg(port));
 	xine_set_param(m_xineStream, XINE_PARAM_BROADCASTER_PORT, port);
 }
 
@@ -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 signalXineStatus(i18n("Pause"));
+			emit signalXinetqStatus(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 signalXineStatus(i18n("Playing") + " ");
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Fast Forward %1").arg("x2"));
+			emit signalXinetqStatus(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 signalXineStatus(i18n("Slow Motion %1").arg("x1"));
+			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
 			break;
 		}
 		default:
 		{
 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_FAST_2);
 			m_currentSpeed = Fast1;
-			emit signalXineStatus(i18n("Fast Forward %1").arg("x1"));
+			emit signalXinetqStatus(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 signalXineStatus(i18n("Slow Motion %1").arg("x2"));
+			emit signalXinetqStatus(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 signalXineStatus(i18n("Fast Forward %1").arg("x1"));
+			emit signalXinetqStatus(i18n("Fast Forward %1").tqarg("x1"));
 			break;
 		}
 		default:
 		{
 			xine_set_param(m_xineStream, XINE_PARAM_SPEED, XINE_SPEED_SLOW_2);
 			m_currentSpeed = Slow1;
-			emit signalXineStatus(i18n("Slow Motion %1").arg("x1"));
+			emit signalXinetqStatus(i18n("Slow Motion %1").tqarg("x1"));
 			break;
 		}
 	}
@@ -3093,14 +3093,14 @@ TQString KXineWidget::getSupportedExtensions() const
 
 void KXineWidget::slotSetAudioChannel(int ch)
 {
-	debugOut(TQString("Switch to audio channel %1").arg(ch-1));
+	debugOut(TQString("Switch to audio channel %1").tqarg(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").arg(ch-1));
+	debugOut(TQString("Switch to subtitle channel %1").tqarg(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]").arg(config));
+	warningOut(TQString ("Not implemented [SetDeinterlaceConfig %1]").tqarg(config));
 #endif
 }
 
@@ -3318,7 +3318,7 @@ void KXineWidget::slotToggleDeinterlace()
 	if (m_deinterlaceFilter)
 	{
 		m_deinterlaceEnabled = !m_deinterlaceEnabled;
-		debugOut(TQString("Deinterlace enabled: %1").arg(m_deinterlaceEnabled));
+		debugOut(TQString("Deinterlace enabled: %1").tqarg(m_deinterlaceEnabled));
 		if ( m_deinterlaceEnabled ) s = i18n("Deinterlace: on");
 		else s = i18n("Deinterlace: off");
 		showOSDMessage( s, 2000 );
@@ -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 signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("Auto"));
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
+	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("4:3"));
 }
 
 void KXineWidget::slotAspectRatioAnamorphic()
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_ANAMORPHIC);
-	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
+	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("16:9"));
 }
 
 void KXineWidget::slotAspectRatioSquare()
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_SQUARE);
-	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
+	emit signalXinetqStatus(i18n("Aspect Ratio") + ": " + i18n("1:1"));
 }
 
 void KXineWidget::slotAspectRatioDVB()
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_ASPECT_RATIO, XINE_VO_ASPECT_DVB);
-	emit signalXineStatus(i18n("Aspect Ratio") + ": " + i18n("2.11:1"));
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom X") + ": " + TQString::number(m_currentZoomX) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom Y") + ": " + TQString::number(m_currentZoomY) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+		emit signalXinetqStatus(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 signalXineStatus(i18n("Zoom") + ": " + TQString::number(m_currentZoom) + "%");
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
+	emit signalXinetqStatus(i18n("Hue") + ": " + TQString::number((hue*100)/65535) + "%");
 }
 
 void KXineWidget::slotSetSaturation(int sat)
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_SATURATION, sat);
-	emit signalXineStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
+	emit signalXinetqStatus(i18n("Saturation") + ": " + TQString::number((sat*100)/65535) + "%");
 }
 
 void KXineWidget::slotSetContrast(int contrast)
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_CONTRAST, contrast);
-	emit signalXineStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
+	emit signalXinetqStatus(i18n("Contrast") + ": " + TQString::number((contrast*100)/65535) + "%");
 }
 
 void KXineWidget::slotSetBrightness(int bright)
 {
 	xine_set_param(m_xineStream, XINE_PARAM_VO_BRIGHTNESS, bright);
-	emit signalXineStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
+	emit signalXinetqStatus(i18n("Brightness") + ": " + TQString::number((bright*100)/65535) + "%");
 }
 
 void KXineWidget::slotSetAVOffset(int av)
 {
 	xine_set_param(m_xineStream, XINE_PARAM_AV_OFFSET, av);
-	emit signalXineStatus(i18n("Audio/Video Offset") + ": " + TQString::number(av/90) + i18n("msec"));
+	emit signalXinetqStatus(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 signalXineStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
+	emit signalXinetqStatus(i18n("Subtitle Offset") + ": " + TQString::number(spu/90) + i18n("msec"));
 }
 
 
@@ -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").arg(screenShot.width()).arg(screenShot.height()).arg(width).arg(height));
+	debugOut(TQString("Screenshot: scale picture from %1x%2 to %3x%4").tqarg(screenShot.width()).tqarg(screenShot.height()).tqarg(width).tqarg(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!").arg((char*)&format));
+			warningOut(TQString("Screenshot: Format %1 not supportet!").tqarg((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").arg(ratio));
+	      warningOut(TQString("Screenshot: Unknown aspect ratio: %1 - using 4:3").tqarg(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").arg(m_videoAspect));
+	debugOut(TQString("Screenshot: using scale factor: %1").tqarg(m_videoAspect));
 	scaleFactor = m_videoAspect;
 
 	delete [] yuv;
diff --git a/kaffeine/src/player-parts/xine-part/kxinewidget.h b/kaffeine/src/player-parts/xine-part/kxinewidget.h
index 62fef7c..1ec989a 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 signalXineStatus(const TQString& status);
+	void signalXinetqStatus(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 87598fe..a54cdd5 100644
--- a/kaffeine/src/player-parts/xine-part/postfilter.cpp
+++ b/kaffeine/src/player-parts/xine-part/postfilter.cpp
@@ -24,13 +24,13 @@
 #include <klocale.h>
 #include <kdebug.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqwidget.h>
 #include <tqobject.h>
 #include <tqstring.h>
 #include <tqgroupbox.h>
-#include <textedit.h>
+#include <tqtextedit.h>
 
 #include <stdio.h>
 
@@ -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->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    m_groupBox->tqsetSizePolicy(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->setAlignment(TQLabel::WordBreak | TQLabel::AlignVCenter);
+        descr->tqsetAlignment(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->setSizePolicy (TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+    deleteButton->tqsetSizePolicy (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->setSizePolicy(TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+      helpButton->tqsetSizePolicy(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 5c01ef3..955efcf 100644
--- a/kaffeine/src/player-parts/xine-part/videosettings.cpp
+++ b/kaffeine/src/player-parts/xine-part/videosettings.cpp
@@ -21,7 +21,7 @@
 #include <klocale.h>
 
 #include <tqslider.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqnamespace.h>
 #include <tqgroupbox.h>
@@ -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->setAlignment(AlignRight);
+  hueText->tqsetAlignment(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->setAlignment(AlignRight);
+  satText->tqsetAlignment(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->setAlignment(AlignRight);
+  contrastText->tqsetAlignment(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->setAlignment(AlignRight);
+  brightText->tqsetAlignment(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->setAlignment(AlignRight);
+  avOffsetText->tqsetAlignment(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->setAlignment(AlignRight);
+  spuOffsetText->tqsetAlignment(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 98ff969..9991f1c 100644
--- a/kaffeine/src/player-parts/xine-part/xine_part.cpp
+++ b/kaffeine/src/player-parts/xine-part/xine_part.cpp
@@ -212,7 +212,7 @@ bool XinePart::openURL(const MRL& mrl)
 			if (firstLine.contains("smil", false))
 			{
 				kdDebug() << "XinePart: Try loading smil playlist\n";
-				if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any layout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
+				if (KMessageBox::warningYesNo(0, i18n("SMIL (Synchronized Multimedia Integration Language) support is rudimentary!\nXinePart can now try to playback contained video sources without any tqlayout. Proceed?"), TQString(), KStdGuiItem::yes(), KStdGuiItem::no(), "smil_warning") == KMessageBox::Yes)
 				{
 					if (!PlaylistImport::smil(localFile, m_mrl, m_playlist))
 					{
@@ -304,7 +304,7 @@ void XinePart::slotPlay(bool forcePlay)
 	{
 		TQString sub;
 		if ((!mrl.subtitleFiles().isEmpty()) && (mrl.currentSubtitle() > -1))
-			sub = TQString("#subtitle:%1").arg(mrl.subtitleFiles()[mrl.currentSubtitle()]);
+			sub = TQString("#subtitle:%1").tqarg(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").arg(calcLength.toString("h:mm:ss")).arg(length.toString("h:mm:ss"));
+			timeMessage = i18n("%1 of %2").tqarg(calcLength.toString("h:mm:ss")).tqarg(length.toString("h:mm:ss"));
 			m_xine->showOSDMessage(timeMessage, 600, OSD_MESSAGE_LOW_PRIORITY);
 		}
 	}
@@ -1058,7 +1058,7 @@ void XinePart::slotMessage(const TQString& message)
 	KMessageBox::information(0, msg, i18n("xine Message"));
 }
 
-void XinePart::slotStatus(const TQString& status)
+void XinePart::slottqStatus(const TQString& status)
 {
 	emit setStatusBarText(status);
 	if ((status != i18n("Ready")) && (status != i18n("Playing")))
@@ -1240,7 +1240,7 @@ void XinePart::slotInfo()
 	if (m_xine->hasSaveURL())
 		ts << "<tr><td><b>" << i18n("Save Stream as") << ":</b></td><td> " << m_xine->getSaveURL() << "</td></tr>";
 
-	ts << "<tr><td></td><td></td></tr>"; // added for better layout
+	ts << "<tr><td></td><td></td></tr>"; // added for better tqlayout
 	ts << "</table></qt>";
 	KMessageBox::information(0, info, i18n("Track info") );
 }
@@ -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->setSizePolicy(TQSizePolicy (TQSizePolicy::Fixed, TQSizePolicy::Fixed));
+	m_playTime->tqsetSizePolicy(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(signalXineStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotStatus(const TQString&)));
+	connect(m_xine, TQT_SIGNAL(signalXinetqStatus(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slottqStatus(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()));
@@ -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").arg(i+1));
+		mrl.setTitle(i18n("AudioCD Track %1").tqarg(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").arg(i+1));
+		mrl.setTitle(i18n("VCD Track %1").tqarg(i+1));
 		mrls.append(mrl);
 	}
 	if (mrls.count())
diff --git a/kaffeine/src/player-parts/xine-part/xine_part.h b/kaffeine/src/player-parts/xine-part/xine_part.h
index 07bf027..78c809e 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 slotStatus(const TQString&);
+	void slottqStatus(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;  /* Status of Osd Timer (on/off) */
+	bool m_isOsdTimer;  /* tqStatus 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 3a9221f..277a850 100644
--- a/kaffeine/src/player-parts/xine-part/xineconfig.cpp
+++ b/kaffeine/src/player-parts/xine-part/xineconfig.cpp
@@ -31,7 +31,7 @@
 #include <tqcolor.h>
 #include <tqfont.h>
 #include <tqwidget.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqtabwidget.h>
 #include <tqvbox.h>
 #include <tqcheckbox.h>
@@ -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->setAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
+	description->tqsetAlignment( TQLabel::WordBreak | TQLabel::AlignVCenter );
 	grid->addWidget(description, row, 1);
 
 	KSeparator* separator = new KSeparator(Qt::Horizontal, parent);
@@ -272,7 +272,7 @@ XineConfig::XineConfig(const xine_t* const xine) :
 		else
 			icon = "edit";
 
-		xineFrame = addPage(*it, i18n("%1 Options").arg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
+		xineFrame = addPage(*it, i18n("%1 Options").tqarg(*it), KGlobal::iconLoader()->loadIcon(icon, KIcon::Panel,
 		                    KIcon::SizeMedium));
 		xineLayout = new TQVBoxLayout(xineFrame, marginHint(), spacingHint());
 		tabWidget = new TQTabWidget(xineFrame);
diff --git a/kaffeine/src/pref.cpp b/kaffeine/src/pref.cpp
index 08816c7..0544d35 100644
--- a/kaffeine/src/pref.cpp
+++ b/kaffeine/src/pref.cpp
@@ -33,7 +33,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqspinbox.h>
 #include <tqcheckbox.h>
@@ -41,7 +41,7 @@
 #include <tqgroupbox.h>
 #include <tqlineedit.h>
 
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kcharsets.h>
 
@@ -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->setSizePolicy( TQSizePolicy (TQSizePolicy::Minimum, TQSizePolicy::Fixed));
+	clearRecent->tqsetSizePolicy( 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 f592b88..20a5941 100644
--- a/kaffeine/src/startwindow.cpp
+++ b/kaffeine/src/startwindow.cpp
@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <klocale.h>
 
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <tqhbox.h>
 #include <tqcolor.h>
@@ -66,7 +66,7 @@ SLabel::SLabel( TQWidget *parent ) : TQLabel( parent )
 void SLabel::paintEvent( TQPaintEvent *pe )
 {
 	TQLabel::paintEvent( pe );
-	TQColorGroup cg = parentWidget()->colorGroup();
+	TQColorGroup cg = parentWidget()->tqcolorGroup();
 	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->setSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
+	panel->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::MinimumExpanding ) );
 
 	buttons.setAutoDelete( true );
 }
@@ -113,12 +113,12 @@ 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").arg(buttons.count() + 1).arg(uiName));
+	btn->setTextLabel( TQString("&%1 %2").tqarg(buttons.count() + 1).tqarg(uiName));
 	TQToolTip::add(btn, uiName);
 	btn->setTextPosition( TQToolButton::Under );
 	btn->setUsesTextLabel( true );
 	btn->setIconSet( KGlobal::iconLoader()->loadIconSet(pixName, KIcon::Panel) );
-	TQSize size = btn->sizeHint();
+	TQSize size = btn->tqsizeHint();
 	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 745360f..79028aa 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->setAlignment(SingleLine);
+	m_osd->tqsetAlignment(SingleLine);
 	connect(&m_hideTimer, TQT_SIGNAL(timeout()), TQT_TQOBJECT(this), TQT_SLOT(slotHideOSD()));
 
 	setPixmap(KGlobal::iconLoader()->loadIcon("kaffeine", KIcon::Panel, 22));