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

This reverts commit 83fbc82a101309e171089f0d5ed080f82a367345.

3 files changed, 13 insertions, 13 deletions

diff --git a/noatun/modules/splitplaylist/find.cpp b/noatun/modules/splitplaylist/find.cpp
index 54b5c7ae..d167e02e 100644
--- a/noatun/modules/splitplaylist/find.cpp
+++ b/noatun/modules/splitplaylist/find.cpp
@@ -1,5 +1,5 @@
 #include "find.h"
-#include <layout.h>
+#include <tqlayout.h>
 #include <kcombobox.h>
 #include <tqpushbutton.h>
 #include <tqcheckbox.h>
@@ -11,8 +11,8 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mainWidget->setMinimumWidth(320);
 	setMainWidget(mainWidget);
 
-	TQGridLayout *layout=new TQGridLayout(mainWidget);
-	layout->setSpacing(KDialog::spacingHint());
+	TQGridLayout *tqlayout=new TQGridLayout(mainWidget);
+	tqlayout->setSpacing(KDialog::spacingHint());
 
 	mText=new KHistoryCombo(mainWidget);
 	mText->setMaxCount(10);
@@ -22,9 +22,9 @@ Finder::Finder(TQWidget *parent) : KDialogBase(parent, 0, false, i18n("Find"), C
 	mRegexp=new TQCheckBox(i18n("&Regular expression"), mainWidget);
 	mBackwards=new TQCheckBox(i18n("Find &backwards"), mainWidget);
 
-	layout->addMultiCellWidget(mText, 0, 0, 0, 1);
-	layout->addWidget(mRegexp, 1, 0);
-	layout->addWidget(mBackwards, 1, 1);
+	tqlayout->addMultiCellWidget(mText, 0, 0, 0, 1);
+	tqlayout->addWidget(mRegexp, 1, 0);
+	tqlayout->addWidget(mBackwards, 1, 1);
 
 	connect(this, TQT_SIGNAL(user1Clicked()), TQT_SLOT(clicked()));
 
diff --git a/noatun/modules/splitplaylist/playlist.cpp b/noatun/modules/splitplaylist/playlist.cpp
index a08faa94..787791ac 100644
--- a/noatun/modules/splitplaylist/playlist.cpp
+++ b/noatun/modules/splitplaylist/playlist.cpp
@@ -217,14 +217,14 @@ void SplitPlaylist::setCurrent(const PlaylistItem &i, bool emitC)
 		if (now)
 			now->setPixmap(0, TQPixmap());
 
-		TQRect rect(view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data())));
+		TQRect rect(view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data())));
 		rect.setWidth(view->listView()->viewport()->width());
 		currentItem=i;
-		view->listView()->viewport()->repaint(rect,true);
+		view->listView()->viewport()->tqrepaint(rect,true);
 
 		view->listView()->ensureItemVisible(static_cast<SafeListViewItem*>(current().data()));
-		TQRect currentRect= view->listView()->itemRect(static_cast<SafeListViewItem*>(current().data()));
-		view->listView()->viewport()->repaint(currentRect);
+		TQRect currentRect= view->listView()->tqitemRect(static_cast<SafeListViewItem*>(current().data()));
+		view->listView()->viewport()->tqrepaint(currentRect);
 
 		now=static_cast<SafeListViewItem*>(current().data());
 		if(now)
diff --git a/noatun/modules/splitplaylist/view.cpp b/noatun/modules/splitplaylist/view.cpp
index 504344fe..693b57ce 100644
--- a/noatun/modules/splitplaylist/view.cpp
+++ b/noatun/modules/splitplaylist/view.cpp
@@ -12,10 +12,10 @@
 
 #include <tqdragobject.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqmap.h>
 #include <tqregexp.h>
-#include <textstream.h>
+#include <tqtextstream.h>
 #include <tqpainter.h>
 
 #include <kaction.h>
@@ -467,7 +467,7 @@ bool View::saveToURL(const KURL &url)
 	}
 	else
 	{
-		KMessageBox::error( this, i18n("Could not write to %1.").arg(url.prettyURL()) );
+		KMessageBox::error( this, i18n("Could not write to %1.").tqarg(url.prettyURL()) );
 		return false;
 	}
 }