rename the following methods:

tqparent parent
tqmask mask


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

4 files changed, 8 insertions, 8 deletions

diff --git a/konqueror/sidebar/konqsidebarplugin.cpp b/konqueror/sidebar/konqsidebarplugin.cpp
index 0f3fdddde..75e762d35 100644
--- a/konqueror/sidebar/konqsidebarplugin.cpp
+++ b/konqueror/sidebar/konqsidebarplugin.cpp
@@ -52,7 +52,7 @@ void KonqSidebarPlugin::handlePreviewOnMouseOver(const KFileItem& /*items*/) {}
 
 bool KonqSidebarPlugin::universalMode() {
 	if (!parent()) return false;
-	KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(tqparent()->qt_cast("KonqSidebarIface"));
+	KonqSidebarIface *ksi=static_cast<KonqSidebarIface*>(parent()->qt_cast("KonqSidebarIface"));
 	if (!ksi) return false;
 	kdDebug()<<"calling KonqSidebarIface->universalMode()"<<endl;
 	return ksi->universalMode();
diff --git a/konqueror/sidebar/sidebar_widget.cpp b/konqueror/sidebar/sidebar_widget.cpp
index 04358ddc4..e97c42c3f 100644
--- a/konqueror/sidebar/sidebar_widget.cpp
+++ b/konqueror/sidebar/sidebar_widget.cpp
@@ -1123,7 +1123,7 @@ void Sidebar_Widget::createNewWindow( const KURL &url, const KParts::URLArgs &ar
 
 void Sidebar_Widget::enableAction( const char * name, bool enabled )
 {
- 	if (TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo"))
+ 	if (TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo"))
 	{
 		ButtonInfo *btninfo = static_cast<ButtonInfo*>(sender()->parent());
 		if (btninfo)
@@ -1148,7 +1148,7 @@ void Sidebar_Widget::enableAction( const char * name, bool enabled )
 
 bool  Sidebar_Widget::doEnableActions()
 {
- 	if (!(TQT_TQOBJECT_CONST(sender())->tqparent()->isA("ButtonInfo")))
+ 	if (!(TQT_TQOBJECT_CONST(sender())->parent()->isA("ButtonInfo")))
 	{
 		kdDebug()<<"Couldn't set active module, aborting"<<endl;
 		return false;
@@ -1299,9 +1299,9 @@ void Sidebar_Widget::resizeEvent(TQResizeEvent* ev)
 TQSplitter *Sidebar_Widget::splitter() const
 {
 	if (m_universalMode) return 0;
-	TQObject *p = tqparent();
+	TQObject *p = parent();
 	if (!p) return 0;
-	p = p->tqparent();
+	p = p->parent();
 	return static_cast<TQSplitter*>(TQT_TQWIDGET(p));
 }
 
diff --git a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
index 1437d7f83..d1b5cc16e 100644
--- a/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
+++ b/konqueror/sidebar/trees/bookmark_module/bookmark_module.cpp
@@ -161,10 +161,10 @@ void KonqSidebarBookmarkModule::slotMoved(TQListViewItem *i, TQListViewItem*, TQ
     KBookmarkGroup parentGroup;
     // try to get the parent group (assume that the TQListViewItem has been reparented by KListView)...
     // if anything goes wrong, use the root.
-    if (item->tqparent()) {
+    if (item->parent()) {
         bool error = false;
 
-        KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->tqparent()) );
+        KonqSidebarBookmarkItem *parent = dynamic_cast<KonqSidebarBookmarkItem*>( (item->parent()) );
         if (!parent) {
             error = true;
         } else {
diff --git a/konqueror/sidebar/trees/history_module/history_item.cpp b/konqueror/sidebar/trees/history_module/history_item.cpp
index 57647c04c..02e77c526 100644
--- a/konqueror/sidebar/trees/history_module/history_item.cpp
+++ b/konqueror/sidebar/trees/history_module/history_item.cpp
@@ -29,7 +29,7 @@
 #include <kiconloader.h>
 
 #define MYMODULE static_cast<KonqSidebarHistoryModule*>(module())
-#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(tqparent())
+#define MYGROUP static_cast<KonqSidebarHistoryGroupItem*>(parent())
 
 KonqSidebarHistorySettings * KonqSidebarHistoryItem::s_settings = 0L;