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

This reverts commit 2b7143e0539396c75306f6e78bf0a5641ed1acfc.

1 files changed, 14 insertions, 14 deletions

diff --git a/src/gvcore/fileviewcontroller.cpp b/src/gvcore/fileviewcontroller.cpp
index 7222c27..bdacf01 100644
--- a/src/gvcore/fileviewcontroller.cpp
+++ b/src/gvcore/fileviewcontroller.cpp
@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 #include <tqcheckbox.h>
 #include <tqdatetimeedit.h>
 #include <tqhbox.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqpopupmenu.h>
 #include <tqpushbutton.h>
 #include <tqtooltip.h>
@@ -191,7 +191,7 @@ public:
 
 	void initFilterBar() {
 		mFilterBar=new FilterBar(that);
-		mFilterBar->setSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
+		mFilterBar->tqsetSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed);
 		mFilterBar->hide();
 
 		TQIconSet resetIS=BarIcon("locationbar_erase");
@@ -256,7 +256,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
 : TQWidget(parent)
 , mMode(FILE_LIST)
 , mPrefetch( NULL )
-, mChangeDirStatus(CHANGE_DIR_STATUS_NONE)
+, mChangeDirtqStatus(CHANGE_DIR_STATUS_NONE)
 , mBrowsing(false)
 , mSelecting(false)
 {
@@ -268,10 +268,10 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
 	d->initFilterCombo();
 	d->mStack=new TQWidgetStack(this);
 	
-	TQVBoxLayout *layout=new TQVBoxLayout(this);
-	layout->addWidget(d->mToolBar);
-	layout->addWidget(d->mFilterBar);
-	layout->addWidget(d->mStack);
+	TQVBoxLayout *tqlayout=new TQVBoxLayout(this);
+	tqlayout->addWidget(d->mToolBar);
+	tqlayout->addWidget(d->mFilterBar);
+	tqlayout->addWidget(d->mStack);
 
 	// Actions
 	mSelectFirst=new KAction(i18n("&First"),
@@ -338,7 +338,7 @@ FileViewController::FileViewController(TQWidget* parent,KActionCollection* actio
 
 	// Dir lister
 	mDirLister=new DirLister;
-	mDirLister->setMainWindow(topLevelWidget());
+	mDirLister->setMainWindow(tqtopLevelWidget());
 	connect(mDirLister,TQT_SIGNAL(clear()),
 		TQT_TQOBJECT(this),TQT_SLOT(dirListerClear()) );
 
@@ -575,13 +575,13 @@ void FileViewController::slotSelectNext() {
 }
 
 void FileViewController::slotSelectPreviousDir() {
-	mChangeDirStatus = CHANGE_DIR_STATUS_PREV;
+	mChangeDirtqStatus = CHANGE_DIR_STATUS_PREV;
 	mDirLister->clearError();
 	mDirLister->openURL(mDirURL.upURL());
 }
 
 void FileViewController::slotSelectNextDir() {
-	mChangeDirStatus = CHANGE_DIR_STATUS_NEXT;
+	mChangeDirtqStatus = CHANGE_DIR_STATUS_NEXT;
 	mDirLister->clearError();
 	mDirLister->openURL(mDirURL.upURL());
 }
@@ -747,7 +747,7 @@ void FileViewController::updateViewMode() {
 
 void FileViewController::updateThumbnailSize(int size) {
 	size*=SLIDER_RESOLUTION;
-	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").arg(size).arg(size));
+	d->mSliderTracker->setText(i18n("Thumbnail size: %1x%2").tqarg(size).tqarg(size));
 	FileViewConfig::setThumbnailSize(size);
 	mFileThumbnailView->setThumbnailSize(size);
 	Cache::instance()->checkThumbnailSize(size);
@@ -1102,12 +1102,12 @@ void FileViewController::delayedDirListerCompleted() {
 		mFileThumbnailView->sort(mFileThumbnailView->sortDirection());
 	}
 
-	if (mChangeDirStatus != CHANGE_DIR_STATUS_NONE) {
+	if (mChangeDirtqStatus != CHANGE_DIR_STATUS_NONE) {
 		KFileItem *item;
 		TQString fileName = mDirURL.filename();
 		for (item=currentFileView()->firstFileItem(); item; item=currentFileView()->nextItem(item) ) {
 			if (item->name() == fileName) {
-				if (mChangeDirStatus == CHANGE_DIR_STATUS_NEXT) {
+				if (mChangeDirtqStatus == CHANGE_DIR_STATUS_NEXT) {
 					do {
 						item=currentFileView()->nextItem(item);
 					} while (item && !Archive::fileItemIsDirOrArchive(item));
@@ -1119,7 +1119,7 @@ void FileViewController::delayedDirListerCompleted() {
 				break;
 			};
 		}
-		mChangeDirStatus = CHANGE_DIR_STATUS_NONE;
+		mChangeDirtqStatus = CHANGE_DIR_STATUS_NONE;
 		if (!item) {
 			mDirLister->openURL(mDirURL);
 		} else {