rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/krusader@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

8 files changed, 29 insertions, 29 deletions

diff --git a/krusader/BookMan/kraddbookmarkdlg.cpp b/krusader/BookMan/kraddbookmarkdlg.cpp
index a84fecf..e6f5032 100644
--- a/krusader/BookMan/kraddbookmarkdlg.cpp
+++ b/krusader/BookMan/kraddbookmarkdlg.cpp
@@ -9,9 +9,9 @@
 #include <kiconloader.h>
 #include <kdebug.h>
 
-KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *tqparent, KURL url):
+KrAddBookmarkDlg::KrAddBookmarkDlg(TQWidget *parent, KURL url):
 	KDialogBase(KDialogBase::Swallow, i18n("Add Bookmark"),
-				 KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, tqparent) {
+				 KDialogBase::User1 | KDialogBase::Ok | KDialogBase::Cancel, KDialogBase::Ok, parent) {
 	// create the 'new folder' button
 	setButtonText(KDialogBase::User1, i18n("New Folder"));
 	showButton(KDialogBase::User1, false); // hide it until _createIn is shown
@@ -87,10 +87,10 @@ void KrAddBookmarkDlg::createInSelection(TQListViewItem *item) {
 	}
 }
 
-void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *tqparent) {
+void KrAddBookmarkDlg::populateCreateInWidget(KrBookmark *root, KListViewItem *parent) {
 	for (KrBookmark *bm = root->tqchildren().first(); bm; bm = root->tqchildren().next()) {
 		if (bm->isFolder()) {
-			KListViewItem *item = new KListViewItem(tqparent, bm->text());
+			KListViewItem *item = new KListViewItem(parent, bm->text());
 			item->setOpen(true);
 			_xr[item] = bm;
 			populateCreateInWidget(bm, item);
diff --git a/krusader/BookMan/kraddbookmarkdlg.h b/krusader/BookMan/kraddbookmarkdlg.h
index 24ec677..1b36814 100644
--- a/krusader/BookMan/kraddbookmarkdlg.h
+++ b/krusader/BookMan/kraddbookmarkdlg.h
@@ -14,14 +14,14 @@ class KrAddBookmarkDlg: public KDialogBase {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KrAddBookmarkDlg(TQWidget *tqparent, KURL url = 0);
+	KrAddBookmarkDlg(TQWidget *parent, KURL url = 0);
 	KURL url() const { return vfs::fromPathOrURL(_url->text()); }
 	TQString name() const { return _name->text(); }
 	KrBookmark *folder() const { return _xr[static_cast<KListViewItem*>(_createIn->selectedItem())]; }
 
 protected:
 	TQWidget *createInWidget();
-	void populateCreateInWidget(KrBookmark *root, KListViewItem *tqparent);
+	void populateCreateInWidget(KrBookmark *root, KListViewItem *parent);
 
 protected slots:
 	void toggleCreateIn(bool show);
diff --git a/krusader/BookMan/krbookmark.cpp b/krusader/BookMan/krbookmark.cpp
index f3dac9b..4b664c7 100644
--- a/krusader/BookMan/krbookmark.cpp
+++ b/krusader/BookMan/krbookmark.cpp
@@ -16,8 +16,8 @@ static const char* NAME_DEVICES = I18N_NOOP("Devices");
 static const char* NAME_VIRTUAL = I18N_NOOP("Virtual Filesystem");
 static const char* NAME_LAN = I18N_NOOP("Local Network");
 
-KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *tqparent, TQString icon, TQString actionName ):
-	KAction(name, 0, 0, 0, tqparent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), 
+KrBookmark::KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon, TQString actionName ):
+	KAction(name, 0, 0, 0, parent, actionName.isNull() ? BM_NAME(name).latin1() : BM_NAME(actionName).latin1()), 
 	_url(url), _folder(false), _separator(false) {
 	connect(this, TQT_SIGNAL(activated()), this, TQT_SLOT(activatedProxy()));
 	// do we have an icon?
diff --git a/krusader/BookMan/krbookmark.h b/krusader/BookMan/krbookmark.h
index e07e6aa..5f27094 100644
--- a/krusader/BookMan/krbookmark.h
+++ b/krusader/BookMan/krbookmark.h
@@ -11,7 +11,7 @@ class KrBookmark: public KAction {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KrBookmark(TQString name, KURL url, KActionCollection *tqparent, TQString icon = "", TQString actionName = TQString() );
+	KrBookmark(TQString name, KURL url, KActionCollection *parent, TQString icon = "", TQString actionName = TQString() );
 	KrBookmark(TQString name, TQString icon = ""); // creates a folder
 	// text() and setText() to change the name of the bookmark
 	// icon() and setIcon() to change icons (by name)
diff --git a/krusader/BookMan/krbookmarkbutton.cpp b/krusader/BookMan/krbookmarkbutton.cpp
index 4acbffd..913cf85 100644
--- a/krusader/BookMan/krbookmarkbutton.cpp
+++ b/krusader/BookMan/krbookmarkbutton.cpp
@@ -8,7 +8,7 @@
 #include <kpopupmenu.h>
 #include <kdebug.h>
 
-KrBookmarkButton::KrBookmarkButton(TQWidget *tqparent): TQToolButton(tqparent) {
+KrBookmarkButton::KrBookmarkButton(TQWidget *parent): TQToolButton(parent) {
 	TQPixmap icon = krLoader->loadIcon("bookmark", KIcon::Toolbar, 16);
 	setFixedSize(icon.width() + 4, icon.height() + 4);
 	setPixmap(icon);
diff --git a/krusader/BookMan/krbookmarkbutton.h b/krusader/BookMan/krbookmarkbutton.h
index 950f6c7..b1b8a30 100644
--- a/krusader/BookMan/krbookmarkbutton.h
+++ b/krusader/BookMan/krbookmarkbutton.h
@@ -8,7 +8,7 @@ class KrBookmarkButton: public TQToolButton {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	KrBookmarkButton(TQWidget *tqparent);
+	KrBookmarkButton(TQWidget *parent);
 	void openPopup();
 
 signals:
diff --git a/krusader/BookMan/krbookmarkhandler.cpp b/krusader/BookMan/krbookmarkhandler.cpp
index 551f283..6aba681 100644
--- a/krusader/BookMan/krbookmarkhandler.cpp
+++ b/krusader/BookMan/krbookmarkhandler.cpp
@@ -22,7 +22,7 @@
 #define CONNECT_BM(X)	{ disconnect(X, TQT_SIGNAL(activated(const KURL&)), 0, 0); connect(X, TQT_SIGNAL(activated(const KURL&)), this, TQT_SLOT(slotActivated(const KURL&))); }
 											
 KrBookmarkHandler::KrBookmarkHandler(): TQObject(0), _middleClick(false), _mainBookmarkPopup( 0 ), _specialBookmarkIDs(), _bookmarkIDTable() {
-	// create our own action collection and make the shortcuts apply only to tqparent
+	// create our own action collection and make the shortcuts apply only to parent
 	_privateCollection = new KActionCollection(krApp, "private collection");
 	_collection = krApp->actionCollection();
 
@@ -116,18 +116,18 @@ void KrBookmarkHandler::exportToFileBookmark(TQDomDocument &doc, TQDomElement &w
 	}
 }
 
-void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &tqparent, KrBookmark *folder) {
+void KrBookmarkHandler::exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder) {
 	for (KrBookmark *bm = folder->tqchildren().first(); bm; bm = folder->tqchildren().next()) {
 		if (bm->isFolder()) {
 			TQDomElement newFolder = doc.createElement("folder");
 			newFolder.setAttribute("icon", bm->icon());
-			tqparent.appendChild(newFolder);
+			parent.appendChild(newFolder);
 			TQDomElement title = doc.createElement("title");
 			title.appendChild(doc.createTextNode(bm->text()));
 			newFolder.appendChild(title);
 			exportToFileFolder(doc, newFolder, bm);
 		} else {
-			exportToFileBookmark(doc, tqparent, bm);
+			exportToFileBookmark(doc, parent, bm);
 		}
 	}
 }
@@ -173,7 +173,7 @@ void KrBookmarkHandler::exportToFile() {
 	}
 }
 
-bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *tqparent, TQString path, TQString *errorMsg) {
+bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *parent, TQString path, TQString *errorMsg) {
 	TQString url, name, icon;
 	// verify tag
 	if (e.tagName() != "bookmark") {
@@ -199,19 +199,19 @@ bool KrBookmarkHandler::importFromFileBookmark(TQDomElement &e, KrBookmark *tqpa
 	KrBookmark *bm = KrBookmark::getExistingBookmark(path+name, _collection);
 	if (!bm) {
 		bm = new KrBookmark(name, vfs::fromPathOrURL( url ), _collection, icon, path+name);
-	tqparent->tqchildren().append(bm);
+	parent->tqchildren().append(bm);
 	}
 
 	return true;
 }
 
-bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *tqparent, TQString path, TQString *errorMsg) {
+bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *parent, TQString path, TQString *errorMsg) {
 	TQString name;
 	TQDomNode n = first;
 	while (!n.isNull()) {
 		TQDomElement e = n.toElement();
 		if (e.tagName() == "bookmark") {
-			if (!importFromFileBookmark(e, tqparent, path, errorMsg))
+			if (!importFromFileBookmark(e, parent, path, errorMsg))
 				return false;
 		} else if (e.tagName() == "folder") {
 			TQString iconName = "";
@@ -223,13 +223,13 @@ bool KrBookmarkHandler::importFromFileFolder(TQDomNode &first, KrBookmark *tqpar
 				return false;
 			} else name = tmp.text();
 			KrBookmark *folder = new KrBookmark(name, iconName);
-			tqparent->tqchildren().append(folder);
+			parent->tqchildren().append(folder);
 
 			TQDomNode nextOne = tmp.nextSibling();
 			if (!importFromFileFolder(nextOne, folder, path + name + "/", errorMsg))
 				return false;
 		} else if (e.tagName() == "separator") {
-			tqparent->tqchildren().append(KrBookmark::separator());
+			parent->tqchildren().append(KrBookmark::separator());
 		}
 		n = n.nextSibling();
 	}
@@ -279,12 +279,12 @@ void KrBookmarkHandler::populate(KPopupMenu *menu) {
 	buildMenu(_root, menu);
 }
 
-void KrBookmarkHandler::buildMenu(KrBookmark *tqparent, KPopupMenu *menu) {
+void KrBookmarkHandler::buildMenu(KrBookmark *parent, KPopupMenu *menu) {
 	static int inSecondaryMenu = 0; // used to know if we're on the top 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 = tqparent->tqchildren().first(); bm; bm = tqparent->tqchildren().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 *tqparent, KPopupMenu *menu) {
 		buildMenu(bm, newMenu);
 		--inSecondaryMenu;
 	}
-	for (KrBookmark *bm = tqparent->tqchildren().first(); bm; bm = tqparent->tqchildren().next()) {
+	for (KrBookmark *bm = parent->tqchildren().first(); bm; bm = parent->tqchildren().next()) {
 		if (bm->isFolder()) continue;
 		if (bm->isSeparator() ) {
 			menu->insertSeparator();
diff --git a/krusader/BookMan/krbookmarkhandler.h b/krusader/BookMan/krbookmarkhandler.h
index 4d032d9..b4b058d 100644
--- a/krusader/BookMan/krbookmarkhandler.h
+++ b/krusader/BookMan/krbookmarkhandler.h
@@ -23,19 +23,19 @@ public:
 	KrBookmarkHandler();
 	~KrBookmarkHandler();
 	void populate(KPopupMenu *menu);
-	void addBookmark(KrBookmark *bm, KrBookmark *tqparent = 0);
+	void addBookmark(KrBookmark *bm, KrBookmark *parent = 0);
 	void bookmarkCurrent(KURL url);
 
 protected:
 	void deleteBookmark(KrBookmark *bm);
 	void importFromFile();
-	bool importFromFileBookmark(TQDomElement &e, KrBookmark *tqparent, TQString path, TQString *errorMsg);
-	bool importFromFileFolder(TQDomNode &first, KrBookmark *tqparent, TQString path, TQString *errorMsg);
+	bool importFromFileBookmark(TQDomElement &e, KrBookmark *parent, TQString path, TQString *errorMsg);
+	bool importFromFileFolder(TQDomNode &first, KrBookmark *parent, TQString path, TQString *errorMsg);
 	void exportToFile();
-	void exportToFileFolder(TQDomDocument &doc, TQDomElement &tqparent, KrBookmark *folder);
+	void exportToFileFolder(TQDomDocument &doc, TQDomElement &parent, KrBookmark *folder);
 	void exportToFileBookmark(TQDomDocument &doc, TQDomElement &where, KrBookmark *bm);
 	void clearBookmarks(KrBookmark *root);
-	void buildMenu(KrBookmark *tqparent, KPopupMenu *menu);
+	void buildMenu(KrBookmark *parent, KPopupMenu *menu);
 
 	bool eventFilter( TQObject *obj, TQEvent *ev );