rename the following methods:

tqparent parent
tqmask mask


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

1 files changed, 20 insertions, 20 deletions

diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp
index 4baf0b6b..e4294f0a 100644
--- a/buildtools/qmake/trollprojectwidget.cpp
+++ b/buildtools/qmake/trollprojectwidget.cpp
@@ -545,7 +545,7 @@ void TrollProjectWidget::cleanDetailView( QMakeScopeItem *item )
 //         {
 //             // After AddTargetDialog, it can happen that an
 //             // item is not yet in the list view, so better check...
-//             if ( it1.data() ->tqparent() )
+//             if ( it1.data() ->parent() )
 //                 while ( it1.data() ->firstChild() )
 //                     it1.data() ->takeItem( it1.data() ->firstChild() );
 //             details->takeItem( it1.data() );
@@ -628,7 +628,7 @@ void TrollProjectWidget::slotDetailsExecuted( TQListViewItem *item )
     TQString filePath;
     if( m_shownSubproject->scope->scopeType() == Scope::IncludeScope )
     {
-        filePath = m_shownSubproject->scope->tqparent()->projectDir();
+        filePath = m_shownSubproject->scope->parent()->projectDir();
     }else
     {
         filePath = m_shownSubproject->scope->projectDir();
@@ -942,7 +942,7 @@ void TrollProjectWidget::slotRemoveSubproject( QMakeScopeItem *spitem )
 {
     if ( spitem == 0 && m_shownSubproject == 0 )
         return ;
-    else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->tqparent() ) ) != NULL )
+    else if ( ( spitem = dynamic_cast<QMakeScopeItem *>( m_shownSubproject->parent() ) ) != NULL )
     {
 
         m_filesCached = false;
@@ -991,7 +991,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
     int idAddScope = -2;
 
 
-    if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->tqparent() || spitem->scope->tqparent()->scopeType() == Scope::ProjectScope ) )
+    if ( spitem->scope->scopeType() == Scope::ProjectScope && ( !spitem->scope->parent() || spitem->scope->parent()->scopeType() == Scope::ProjectScope ) )
     {
         idBuild = popup.insertItem( SmallIcon( "make_kdevelop" ), i18n( "Build" ) );
         popup.tqsetWhatsThis( idBuild, i18n( "<b>Build</b><p>Runs <b>make</b> from the selected subproject directory.<br>"
@@ -1030,7 +1030,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
             popup.setItemEnabled( idAddSubproject, false );
         idRemoveSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Remove Subproject..." ) );
         popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Remove subproject</b><p>Removes currently selected subproject. Does not delete any file from disk. Deleted subproject can be later added by calling 'Add Subproject' action." ) );
-        if ( spitem->tqparent() == NULL )
+        if ( spitem->parent() == NULL )
             popup.setItemEnabled( idRemoveSubproject, false );
         idAddScope = popup.insertItem( SmallIcon( "qmake_scopenew" ), i18n( "Create Scope..." ) );
         popup.tqsetWhatsThis( idAddScope, i18n( "<b>Create scope</b><p>Creates TQMake scope in the project file of the currently selected subproject." ) );
@@ -1055,7 +1055,7 @@ void TrollProjectWidget::slotOverviewContextMenu( KListView *, TQListViewItem *i
             popup.setItemEnabled( idAddSubproject, false );
         idDisableSubproject = popup.insertItem( SmallIcon( "remove_subdir" ), i18n( "Disable Subproject..." ) );
         popup.tqsetWhatsThis( idRemoveSubproject, i18n( "<b>Disable subproject</b><p>Disables the currently selected subproject when this scope is active. Does not delete the directory from disk. The deleted subproject can be later added by using the 'Add Subproject' action." ) );
-        if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->tqparent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
+        if( spitem->scope->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 && spitem->scope->parent()->variableValues( "TEMPLATE" ).findIndex( "subdirs" ) == -1 )
             popup.setItemEnabled( idDisableSubproject, false );
         popup.insertSeparator();
         idProjectConfiguration = popup.insertItem( SmallIcon( "configure" ), i18n( "Scope Settings" ) );
@@ -1363,7 +1363,7 @@ void TrollProjectWidget::slotNewFile()
 
     if( !gitem )
     {
-        gitem = dynamic_cast<GroupItem*>( details->currentItem()->tqparent() );
+        gitem = dynamic_cast<GroupItem*>( details->currentItem()->parent() );
     }
 
     if ( gitem )
@@ -1469,7 +1469,7 @@ void TrollProjectWidget::slotExcludeFileFromScopeButton()
         return ;
     FileItem *fitem = static_cast<FileItem*>( pvitem );
 
-    GroupItem *gitem = static_cast<GroupItem*>( fitem->tqparent() );
+    GroupItem *gitem = static_cast<GroupItem*>( fitem->parent() );
 
     gitem->removeFileFromScope( fitem->text( 0 ) );
 }
@@ -1744,7 +1744,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
             m_part->appFrontend() ->startAppCommand( m_shownSubproject->scope->projectDir(), cmd, false );
         }else if( r == idRemoveFile )
         {
-            static_cast<GroupItem*>(titem->tqparent())->removeInstallObject( titem );
+            static_cast<GroupItem*>(titem->parent())->removeInstallObject( titem );
             slotOverviewSelectionChanged( m_shownSubproject );
         }
     }
@@ -1753,7 +1753,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
         removefileButton->setEnabled( true );
         FileItem *fitem = static_cast<FileItem*>( pvitem );
-        GroupItem* gitem = static_cast<GroupItem*>( item->tqparent() );
+        GroupItem* gitem = static_cast<GroupItem*>( item->parent() );
 
         KPopupMenu popup( this );
         if ( !( gitem->groupType == GroupItem::InstallObject ) )
@@ -1898,7 +1898,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
         }
         else if ( r == idEditInstallPattern )
         {
-            GroupItem * titem = static_cast<GroupItem*>( item->tqparent() );
+            GroupItem * titem = static_cast<GroupItem*>( item->parent() );
 
             bool ok = FALSE;
             TQString filepattern = KInputDialog::getText(
@@ -1923,7 +1923,7 @@ void TrollProjectWidget::slotDetailsContextMenu( KListView *, TQListViewItem *it
 
 void TrollProjectWidget::removeFile( QMakeScopeItem *spitem, FileItem *fitem )
 {
-    GroupItem * gitem = static_cast<GroupItem*>( fitem->tqparent() );
+    GroupItem * gitem = static_cast<GroupItem*>( fitem->parent() );
 
     m_filesCached = false;
     m_allFilesCache.clear();
@@ -2265,7 +2265,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
         m_filesCached = false;
         m_allFilesCache.clear();
 
-        QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->tqparent() );
+        QMakeScopeItem* pitem = dynamic_cast<QMakeScopeItem *>( spitem->parent() );
         if ( pitem != 0 )
         {
             switch ( spitem->scope->scopeType() )
@@ -2287,7 +2287,7 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
                     //                     pitem->scopes.remove( spitem );
                     delete spitem;
                     spitem = pitem;
-                    pitem = dynamic_cast<QMakeScopeItem *>( pitem->tqparent() );
+                    pitem = dynamic_cast<QMakeScopeItem *>( pitem->parent() );
                     //                     pitem->scopes.remove(spitem);
                     break;
                 case Scope::SimpleScope:
@@ -2313,11 +2313,11 @@ void TrollProjectWidget::slotRemoveScope( QMakeScopeItem * spitem )
 
 QMakeScopeItem * TrollProjectWidget::findSubprojectForScope( QMakeScopeItem * scope )
 {
-    if ( ( scope == 0 ) || ( scope->tqparent() == 0 ) )
+    if ( ( scope == 0 ) || ( scope->parent() == 0 ) )
         return 0;
     if ( scope->scope->scopeType() == Scope::ProjectScope )
         return scope;
-    return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->tqparent() ) );
+    return findSubprojectForScope( dynamic_cast<QMakeScopeItem *>( scope->parent() ) );
 }
 
 void TrollProjectWidget::focusInEvent( TQFocusEvent * /*e*/ )
@@ -2447,11 +2447,11 @@ void TrollProjectWidget::slotDisableSubproject( QMakeScopeItem* spitem )
         }
     }else
     {
-        QMakeScopeItem* tqparent = static_cast<QMakeScopeItem*>(spitem->tqparent());
-        tqparent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) );
+        QMakeScopeItem* parent = static_cast<QMakeScopeItem*>(spitem->parent());
+        parent->disableSubprojects( TQStringList( spitem->scope->scopeName() ) );
         delete spitem;
-        tqparent->scope->saveToFile();
-        m_shownSubproject = tqparent;
+        parent->scope->saveToFile();
+        m_shownSubproject = parent;
         slotOverviewSelectionChanged( m_shownSubproject );
     }
 }