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

This reverts commit 44ec35d6f3ec0bf8067f31896d7721ac3082f66f.

4 files changed, 30 insertions, 30 deletions

diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp
index fbbab35..e6f5032 100644
--- a/krusader/BookMan/kraddbookmarkdlg.cpp
+++ b/krusader/BookMan/kraddbookmarkdlg.cpp
@@ -3,7 +3,7 @@
 #include "krbookmarkhandler.h"
 #include <klocale.h>
 #include <tqheader.h>
-#include <layout.h>
+#include <tqlayout.h>
 #include <tqlabel.h>
 #include <kinputdialog.h>
 #include <kiconloader.h>
@@ -21,33 +21,33 @@ KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *parent, KURL url):
 	TQWidget *page = new TQWidget(this);
 	setMainWidget(page);
 
-	TQGridLayout *layout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding
+	TQGridLayout *tqlayout = new TQGridLayout(page, 1, 1, 0, spacingHint()); // expanding
 	// name and url
 	TQLabel *lb1 = new TQLabel(i18n("Name:"), page);
 	_name = new KLineEdit(page);
 	_name->setText(url.prettyURL()); // default name is the url
 	_name->selectAll(); // make the text selected
-	layout->addWidget(lb1, 0, 0);	
-	layout->addWidget(_name, 0, 1);
+	tqlayout->addWidget(lb1, 0, 0);	
+	tqlayout->addWidget(_name, 0, 1);
 	
 	TQLabel *lb2 = new TQLabel(i18n("URL:"), page);
 	_url = new KLineEdit(page);
-	layout->addWidget(lb2, 1, 0);	
-	layout->addWidget(_url, 1, 1);
+	tqlayout->addWidget(lb2, 1, 0);	
+	tqlayout->addWidget(_url, 1, 1);
 	_url->setText(url.prettyURL()); // set the url in the field
 
 	// create in linedit and button
 	TQLabel *lb3 = new TQLabel(i18n("Create in:"), page);
 	_folder = new KLineEdit(page);
-	layout->addWidget(lb3, 2, 0);
-	layout->addWidget(_folder, 2, 1);
+	tqlayout->addWidget(lb3, 2, 0);
+	tqlayout->addWidget(_folder, 2, 1);
 	_folder->setReadOnly(true);
 
 	_createInBtn = new TQToolButton(page);
 	_createInBtn->setPixmap(krLoader->loadIcon("down", KIcon::Small));
 	_createInBtn->setToggleButton(true);
 	connect(_createInBtn, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(toggleCreateIn(bool )));
-	layout->addWidget(_createInBtn, 2, 2);
+	tqlayout->addWidget(_createInBtn, 2, 2);
 
 	setDetailsWidget(createInWidget());
 	
@@ -88,7 +88,7 @@ void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) {
 }
 
 void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) {
-	for (KrBookmark *bm = root->children().first(); bm; bm = root->children().next()) {
+	for (KrBookmark *bm = root->tqchildren().first(); bm; bm = root->tqchildren().next()) {
 		if (bm->isFolder()) {
 			KListViewItem *item = new KListViewItem(parent, bm->text());
 			item->setOpen(true);
diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp
index 6a05606..4b664c7 100644
--- a/krusader/BookMan/krbookmark.cpp
+++ b/krusader/BookMan/krbookmark.cpp
@@ -34,7 +34,7 @@ KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQStr
 		}
 	}
 
-	_children.setAutoDelete(true);
+	_tqchildren.setAutoDelete(true);
 }
 
 KrBookmark::KrBookmark(TQString name, TQString icon):
diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h
index 1cf5c71..5f27094 100644
--- a/krusader/BookMan/krbookmark.h
+++ b/krusader/BookMan/krbookmark.h
@@ -19,7 +19,7 @@ public:
 	inline void setURL(const KURL& url) { _url = url; }
 	inline bool isFolder() const { return _folder; }
 	inline bool isSeparator() const { return _separator; }
-	TQPtrList<KrBookmark>& children() { return _children; }
+	TQPtrList<KrBookmark>& tqchildren() { return _tqchildren; }
 
 	static KrBookmark* getExistingBookmark(TQString actionName, KActionCollection *collection);	
 	// ----- special bookmarks
@@ -40,7 +40,7 @@ private:
 	TQString _icon;
 	bool _folder;
 	bool _separator;
-	TQPtrList<KrBookmark> _children;
+	TQPtrList<KrBookmark> _tqchildren;
 };
 
 #endif // KRBOOKMARK_H
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
index 980f049..b6e7a99 100644
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -68,7 +68,7 @@ void KrBookmarkHandler::addBookmark(KrBookmark *bm, KrBookmark *folder) {
 		folder = _root;
 		
 	// add to the list (bottom)
-	folder->children().append(bm);
+	folder->tqchildren().append(bm);
 
 	exportToFile();
 }
@@ -84,15 +84,15 @@ void KrBookmarkHandler::deleteBookmark(KrBookmark *bm) {
 }
 
 void KrBookmarkHandler::removeReferences( KrBookmark *root, KrBookmark *bmToRemove ) {
-	int index = root->children().find( bmToRemove );
+	int index = root->tqchildren().find( bmToRemove );
 	if( index >= 0 )
-		root->children().take( index );
+		root->tqchildren().take( index );
 	
-	KrBookmark *bm = root->children().first();
+	KrBookmark *bm = root->tqchildren().first();
 	while (bm) {
 		if (bm->isFolder())
 			removeReferences(bm, bmToRemove);
-		bm = root->children().next();
+		bm = root->tqchildren().next();
 	}
 }
 
@@ -117,7 +117,7 @@ void KrBookmarkHandler::exportToFileBookmark(TQDomDocument &doc, TQDomElement &w
 }
 
 void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder) {
-	for (KrBookmark *bm = folder->children().first(); bm; bm = folder->children().next()) {
+	for (KrBookmark *bm = folder->tqchildren().first(); bm; bm = folder->tqchildren().next()) {
 		if (bm->isFolder()) {
 			TQDomElement newFolder = doc.createElement("folder");
 			newFolder.setAttribute("icon", bm->icon());
@@ -169,7 +169,7 @@ void KrBookmarkHandler::exportToFile() {
 		stream << doc.toString();
 		file.close();
 	} else {
-		KMessageBox::error(krApp, i18n("Unable to write to %1").arg(filename), i18n("Error"));
+		KMessageBox::error(krApp, i18n("Unable to write to %1").tqarg(filename), i18n("Error"));
 	}
 }
 
@@ -199,7 +199,7 @@ bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *pare
 	KrBookmark *bm = KrBookmark::getExistingBookmark(path+name, _collection);
 	if (!bm) {
 		bm = new KrBookmark(name, vfs::fromPathOrURL( url ), _collection, icon, path+name);
-	parent->children().append(bm);
+	parent->tqchildren().append(bm);
 	}
 
 	return true;
@@ -223,13 +223,13 @@ bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *paren
 				return false;
 			} else name = tmp.text();
 			KrBookmark *folder = new KrBookmark(name, iconName);
-			parent->children().append(folder);
+			parent->tqchildren().append(folder);
 
 			TQDomNode nextOne = tmp.nextSibling();
 			if (!importFromFileFolder(nextOne, folder, path + name + "/", errorMsg))
 				return false;
 		} else if (e.tagName() == "separator") {
-			parent->children().append(KrBookmark::separator());
+			parent->tqchildren().append(KrBookmark::separator());
 		}
 		n = n.nextSibling();
 	}
@@ -258,14 +258,14 @@ void KrBookmarkHandler::importFromFile() {
 		n = n.nextSibling();
 
 	if (n.isNull() || n.toElement().tagName()!="xbel") {
-		errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").arg(filename);
+		errorMsg = i18n("%1 doesn't seem to be a valid Bookmarks file").tqarg(filename);
 		goto ERROR;
 	} else n = n.firstChild(); // skip the xbel part
 	importFromFileFolder(n, _root, "", &errorMsg);
 	goto SUCCESS;
 	
 ERROR:
-	KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").arg(errorMsg), i18n( "Error" ));
+	KMessageBox::error(krApp, i18n("Error reading bookmarks file: %1").tqarg(errorMsg), i18n( "Error" ));
 
 SUCCESS:
 	file.close();
@@ -284,7 +284,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
 
 	// run the loop twice, in order to put the folders on top. stupid but easy :-)
 	// note: this code drops the separators put there by the user
-	for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) {
+	for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) {
 		if (!bm->isFolder()) continue;
 		KPopupMenu *newMenu = new KPopupMenu(menu);
 		int id = menu->insertItem(TQIconSet(krLoader->loadIcon(bm->icon(), KIcon::Small)),
@@ -298,7 +298,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
 		buildMenu(bm, newMenu);
 		--inSecondaryMenu;
 	}
-	for (KrBookmark *bm = parent->children().first(); bm; bm = parent->children().next()) {
+	for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) {
 		if (bm->isFolder()) continue;
 		if (bm->isSeparator() ) {
 			menu->insertSeparator();
@@ -411,7 +411,7 @@ void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
 }
 
 void KrBookmarkHandler::clearBookmarks(KrBookmark *root) {
-	KrBookmark *bm = root->children().first();
+	KrBookmark *bm = root->tqchildren().first();
 	while (bm) {	
 		if (bm->isFolder())
 			clearBookmarks(bm);
@@ -420,9 +420,9 @@ void KrBookmarkHandler::clearBookmarks(KrBookmark *root) {
 			delete bm;
 		}
 
-		bm = root->children().next();
+		bm = root->tqchildren().next();
 	}
-	root->children().clear();
+	root->tqchildren().clear();
 }
 
 void KrBookmarkHandler::bookmarksChanged(const TQString&, const TQString&) {