rename the following methods:

tqparent parent
tqmask mask


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

19 files changed, 41 insertions, 41 deletions

diff --git a/src/app/bookmarkdialog.cpp b/src/app/bookmarkdialog.cpp
index d446d22..11507df 100644
--- a/src/app/bookmarkdialog.cpp
+++ b/src/app/bookmarkdialog.cpp
@@ -39,8 +39,8 @@ public:
 	BookmarkDialog::Mode mMode;
 };
 
-BookmarkDialog::BookmarkDialog(TQWidget* tqparent, BookmarkDialog::Mode mode)
-: KDialogBase(tqparent,"folderconfig",true,TQString(),Ok|Cancel)
+BookmarkDialog::BookmarkDialog(TQWidget* parent, BookmarkDialog::Mode mode)
+: KDialogBase(parent,"folderconfig",true,TQString(),Ok|Cancel)
 {
 	d=new BookmarkDialogPrivate;
 	d->mContent=new BookmarkDialogBase(this);
diff --git a/src/app/bookmarkdialog.h b/src/app/bookmarkdialog.h
index 17f43a3..973d210 100644
--- a/src/app/bookmarkdialog.h
+++ b/src/app/bookmarkdialog.h
@@ -32,7 +32,7 @@ Q_OBJECT
   TQ_OBJECT
 public:
 	enum Mode { BOOKMARK_GROUP, BOOKMARK };
-	BookmarkDialog(TQWidget* tqparent, Mode mode);
+	BookmarkDialog(TQWidget* parent, Mode mode);
 	~BookmarkDialog();
 
 
diff --git a/src/app/bookmarkowner.cpp b/src/app/bookmarkowner.cpp
index 986a7ca..55dc593 100644
--- a/src/app/bookmarkowner.cpp
+++ b/src/app/bookmarkowner.cpp
@@ -27,8 +27,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 namespace Gwenview {
 
 
-BookmarkOwner::BookmarkOwner(TQWidget* tqparent)
-: TQObject(tqparent)
+BookmarkOwner::BookmarkOwner(TQWidget* parent)
+: TQObject(parent)
 {}
 
 
diff --git a/src/app/bookmarkowner.h b/src/app/bookmarkowner.h
index e2a6feb..3aacc92 100644
--- a/src/app/bookmarkowner.h
+++ b/src/app/bookmarkowner.h
@@ -32,7 +32,7 @@ class BookmarkOwner : public TQObject, public KBookmarkOwner {
 Q_OBJECT
   TQ_OBJECT
 public:
-	BookmarkOwner(TQWidget* tqparent);
+	BookmarkOwner(TQWidget* parent);
 
 	// KBookmarkOwner interface
 	void openBookmarkURL(const TQString&);
diff --git a/src/app/bookmarkviewcontroller.cpp b/src/app/bookmarkviewcontroller.cpp
index 664688b..7bf9cbd 100644
--- a/src/app/bookmarkviewcontroller.cpp
+++ b/src/app/bookmarkviewcontroller.cpp
@@ -52,8 +52,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 namespace Gwenview {
 
 // URLDropListView	
-URLDropListView::URLDropListView(TQWidget* tqparent)
-: KListView(tqparent) {
+URLDropListView::URLDropListView(TQWidget* parent)
+: KListView(parent) {
 	setAcceptDrops(true);
 }
 
@@ -71,8 +71,8 @@ void URLDropListView::contentsDragMoveEvent(TQDragMoveEvent* event) {
 
 struct BookmarkItem : public KListViewItem {
 	template <class ItemParent>
-	BookmarkItem(ItemParent* tqparent, const KBookmark& bookmark)
-	: KListViewItem(tqparent)
+	BookmarkItem(ItemParent* parent, const KBookmark& bookmark)
+	: KListViewItem(parent)
 	, mBookmark(bookmark)
 	{
 		refresh();
@@ -173,13 +173,13 @@ void URLDropListView::contentsDropEvent(TQDropEvent* event) {
 }
 
 
-BookmarkViewController::BookmarkViewController(TQWidget* tqparent)
-: TQObject(tqparent)
+BookmarkViewController::BookmarkViewController(TQWidget* parent)
+: TQObject(parent)
 {
 	d=new Private;
 	d->mManager=0;
 
-	d->mBox=new TQVBox(tqparent);
+	d->mBox=new TQVBox(parent);
 	
 	// Init listview
 	d->mListView=new URLDropListView(d->mBox);
diff --git a/src/app/bookmarkviewcontroller.h b/src/app/bookmarkviewcontroller.h
index ab47051..21c92de 100644
--- a/src/app/bookmarkviewcontroller.h
+++ b/src/app/bookmarkviewcontroller.h
@@ -45,7 +45,7 @@ class URLDropListView : public KListView {
 Q_OBJECT
   TQ_OBJECT
 public:
-	URLDropListView(TQWidget* tqparent);
+	URLDropListView(TQWidget* parent);
 
 signals:
 	void urlDropped(TQDropEvent*, const KURL::List&);
diff --git a/src/app/configdialog.cpp b/src/app/configdialog.cpp
index 7bd9f5e..2940167 100644
--- a/src/app/configdialog.cpp
+++ b/src/app/configdialog.cpp
@@ -106,13 +106,13 @@ T* addConfigPage(KDialogBase* dialog, const TQString& header, const TQString& na
 }
 
 
-ConfigDialog::ConfigDialog(TQWidget* tqparent, KIPI::PluginLoader* pluginLoader)
+ConfigDialog::ConfigDialog(TQWidget* parent, KIPI::PluginLoader* pluginLoader)
 : KDialogBase(
 	KDialogBase::IconList,
 	i18n("Configure"),
 	KDialogBase::Ok | KDialogBase::Cancel | KDialogBase::Apply,
 	KDialogBase::Ok,
-	tqparent,
+	parent,
 	"ConfigDialog",
 	true,
 	true)
diff --git a/src/app/dirviewcontroller.cpp b/src/app/dirviewcontroller.cpp
index 2826915..2bf34f1 100644
--- a/src/app/dirviewcontroller.cpp
+++ b/src/app/dirviewcontroller.cpp
@@ -53,12 +53,12 @@ struct DirViewController::Private {
 };
 
 
-DirViewController::DirViewController(TQWidget* tqparent)
-: TQObject(tqparent)
+DirViewController::DirViewController(TQWidget* parent)
+: TQObject(parent)
 {
 	d=new Private;
 
-	d->mTreeView=new TreeView(tqparent);
+	d->mTreeView=new TreeView(parent);
 
 	connect(d->mTreeView, TQT_SIGNAL(selectionChanged(TQListViewItem*)),
 		this, TQT_SLOT(slotTreeViewSelectionChanged(TQListViewItem*)) );
@@ -130,7 +130,7 @@ void DirViewController::removeDir() {
 	
 	TQListViewItem* item=d->mTreeView->currentItem();
 	if (!item) return;
-	item=item->tqparent();
+	item=item->parent();
 	if (!item) return;
 	d->mTreeView->setCurrentItem(item);
 }
diff --git a/src/app/dirviewcontroller.h b/src/app/dirviewcontroller.h
index 9d95c41..00b6e38 100644
--- a/src/app/dirviewcontroller.h
+++ b/src/app/dirviewcontroller.h
@@ -41,7 +41,7 @@ class DirViewController : public TQObject {
 	Q_OBJECT
   TQ_OBJECT
 public:
-	DirViewController(TQWidget* tqparent);
+	DirViewController(TQWidget* parent);
 	virtual ~DirViewController();
 	TQWidget* widget() const;
 
diff --git a/src/app/kipiinterface.cpp b/src/app/kipiinterface.cpp
index bae833f..9a35ef3 100644
--- a/src/app/kipiinterface.cpp
+++ b/src/app/kipiinterface.cpp
@@ -119,8 +119,8 @@ struct KIPIInterfacePrivate {
 };
 
 
-KIPIInterface::KIPIInterface( TQWidget* tqparent, FileViewController* fileView)
-:KIPI::Interface(TQT_TQOBJECT(tqparent), "Gwenview kipi interface") {
+KIPIInterface::KIPIInterface( TQWidget* parent, FileViewController* fileView)
+:KIPI::Interface(TQT_TQOBJECT(parent), "Gwenview kipi interface") {
 	d=new KIPIInterfacePrivate;
 	d->mFileView=fileView;
 
diff --git a/src/app/kipiinterface.h b/src/app/kipiinterface.h
index 1a2ef5e..2003cf4 100644
--- a/src/app/kipiinterface.h
+++ b/src/app/kipiinterface.h
@@ -41,7 +41,7 @@ class KIPIInterface :public KIPI::Interface {
   TQ_OBJECT
 
 public:
-	KIPIInterface( TQWidget* tqparent, FileViewController*);
+	KIPIInterface( TQWidget* parent, FileViewController*);
 	virtual ~KIPIInterface();
 
 	KIPI::ImageCollection currentAlbum();
diff --git a/src/app/mainwindow.cpp b/src/app/mainwindow.cpp
index d8da0bb..04b4c02 100644
--- a/src/app/mainwindow.cpp
+++ b/src/app/mainwindow.cpp
@@ -139,7 +139,7 @@ const int HISTORY_MAX_COUNT=20;
 enum { StackIDBrowse, StackIDView };
 
 
-static bool urlIsDirectory(TQWidget* tqparent, const KURL& url) {
+static bool urlIsDirectory(TQWidget* parent, const KURL& url) {
 	if( url.filename( false ).isEmpty()) return true; // file:/somewhere/<nothing here>
 	// Do direct stat instead of using KIO if the file is local (faster)
 	if( url.isLocalFile()
@@ -150,7 +150,7 @@ static bool urlIsDirectory(TQWidget* tqparent, const KURL& url) {
 		}
 	}
 	KIO::UDSEntry entry;
-	if( KIO::NetAccess::stat( url, entry, tqparent)) {
+	if( KIO::NetAccess::stat( url, entry, parent)) {
 		KIO::UDSEntry::ConstIterator it;
 		for(it=entry.begin();it!=entry.end();++it) {
 			if ((*it).m_uds==KIO::UDS_FILE_TYPE) {
@@ -715,7 +715,7 @@ void MainWindow::slotDirRenamed(const KURL& oldURL, const KURL& newURL) {
 
 	KURL url(mFileViewController->dirURL());
 	if (!oldURL.isParentOf(url) ) {
-		LOG(oldURL.prettyURL() << " is not a tqparent of " << url.prettyURL());
+		LOG(oldURL.prettyURL() << " is not a parent of " << url.prettyURL());
 		return;
 	}
 
diff --git a/src/app/metaedit.cpp b/src/app/metaedit.cpp
index 0d37135..8e0897d 100644
--- a/src/app/metaedit.cpp
+++ b/src/app/metaedit.cpp
@@ -32,8 +32,8 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 namespace Gwenview {
 
 // FIXME: Why doesn't MetaEdit inherits from TQTextEdit rather than TQVBox?
-MetaEdit::MetaEdit(TQWidget *tqparent, Document *gvp, const char *name)
-: TQVBox(tqparent, name)
+MetaEdit::MetaEdit(TQWidget *parent, Document *gvp, const char *name)
+: TQVBox(parent, name)
 , mEmpty(true)
 , mDocument(gvp)
 {
diff --git a/src/app/metaedit.h b/src/app/metaedit.h
index 57b1054..8b2a537 100644
--- a/src/app/metaedit.h
+++ b/src/app/metaedit.h
@@ -35,7 +35,7 @@ class MetaEdit : public TQVBox {
 Q_OBJECT
   TQ_OBJECT
 public:
-	MetaEdit(TQWidget *tqparent, Document*, const char *name="");
+	MetaEdit(TQWidget *parent, Document*, const char *name="");
 	~MetaEdit();
 protected:
 	bool eventFilter(TQObject *, TQEvent *);
diff --git a/src/app/treeview.cpp b/src/app/treeview.cpp
index a8c7b59..3ee9e4a 100644
--- a/src/app/treeview.cpp
+++ b/src/app/treeview.cpp
@@ -55,10 +55,10 @@ struct TreeView::Private {
 	KFileTreeViewItem* mDropTarget;
 	TQTimer* mAutoOpenTimer;
 
-	KFileTreeViewItem* findViewItem(KFileTreeViewItem* tqparent,const TQString& text) {
+	KFileTreeViewItem* findViewItem(KFileTreeViewItem* parent,const TQString& text) {
 		TQListViewItem* item;
 
-		for (item=tqparent->firstChild();item;item=item->nextSibling()) {
+		for (item=parent->firstChild();item;item=item->nextSibling()) {
 			if (item->text(0)==text) {
 				return static_cast<KFileTreeViewItem*>(item);
 			}
@@ -114,8 +114,8 @@ struct TreeView::Private {
 };
 
 
-TreeView::TreeView(TQWidget* tqparent)
-: KFileTreeView(tqparent) {
+TreeView::TreeView(TQWidget* parent)
+: KFileTreeView(parent) {
 	d=new Private;
 	d->mView=this;
 	d->mBranch=0;
@@ -180,7 +180,7 @@ void TreeView::slotTreeViewPopulateFinished(KFileTreeViewItem* item) {
 		return;
 	}
 
-	// This URL is not a tqparent of a wanted URL, get out
+	// This URL is not a parent of a wanted URL, get out
 	if (!url.isParentOf(m_nextUrlToSelect)) return;
 
 	// Find the next child item and open it
diff --git a/src/app/treeview.h b/src/app/treeview.h
index eea709b..bc023b7 100644
--- a/src/app/treeview.h
+++ b/src/app/treeview.h
@@ -34,7 +34,7 @@ class TreeView : public KFileTreeView {
 Q_OBJECT
   TQ_OBJECT
 public:
-	TreeView(TQWidget* tqparent);
+	TreeView(TQWidget* parent);
 	~TreeView();
 
 public slots:
diff --git a/src/app/truncatedtextlabel.h b/src/app/truncatedtextlabel.h
index d9c1b88..8e126ed 100644
--- a/src/app/truncatedtextlabel.h
+++ b/src/app/truncatedtextlabel.h
@@ -36,8 +36,8 @@ namespace Gwenview {
  */
 class TruncatedTextLabel : public TQLabel {
 public:
-	TruncatedTextLabel(TQWidget* tqparent)
-	: TQLabel(tqparent) {}
+	TruncatedTextLabel(TQWidget* parent)
+	: TQLabel(parent) {}
 
 	TQSize tqminimumSizeHint() const {
 		TQSize size=TQLabel::tqminimumSizeHint();
diff --git a/src/app/vtabwidget.cpp b/src/app/vtabwidget.cpp
index 190ed47..66e9b9e 100644
--- a/src/app/vtabwidget.cpp
+++ b/src/app/vtabwidget.cpp
@@ -38,8 +38,8 @@ struct VTabWidget::Private {
 };
 
 	
-VTabWidget::VTabWidget(TQWidget* tqparent)
-: TQWidget(tqparent)
+VTabWidget::VTabWidget(TQWidget* parent)
+: TQWidget(parent)
 {
 	d=new Private;
 	d->mEmpty=true;
diff --git a/src/app/vtabwidget.h b/src/app/vtabwidget.h
index 0683258..55e1478 100644
--- a/src/app/vtabwidget.h
+++ b/src/app/vtabwidget.h
@@ -34,7 +34,7 @@ class VTabWidget : public TQWidget {
 Q_OBJECT
   TQ_OBJECT
 public:
-	VTabWidget(TQWidget* tqparent);
+	VTabWidget(TQWidget* parent);
 	virtual ~VTabWidget();
 	void addTab(TQWidget*, const TQPixmap&, const TQString& label);