From 32b67ac0690de411b26b1d5e715b188c27442248 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 10 Aug 2011 22:19:39 +0000 Subject: 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 --- languages/cpp/cppnewclassdlg.cpp | 72 ++++++++++++++++++++-------------------- 1 file changed, 36 insertions(+), 36 deletions(-) (limited to 'languages/cpp/cppnewclassdlg.cpp') diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index db4d0160..65fb9c76 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -57,8 +57,8 @@ TQString TQRegExp_escape( const TQString& str ) return TQRegExp::escape( str ); } -CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *tqparent, const char *name ) - : CppNewClassDialogBase( tqparent, name ), myModel( 0 ) +CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, const char *name ) + : CppNewClassDialogBase( parent, name ), myModel( 0 ) { headerModified = false; baseincludeModified = false; @@ -377,8 +377,8 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + - "(TQWidget *tqparent, const char *name):\n TQWidget(tqparent, name)\n{\n}\n"); - constructors_h_edit->append(classname_edit->text() + "(TQWidget *tqparent, const char *name);\n");*/ + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); + constructors_h_edit->append(classname_edit->text() + "(TQWidget *parent, const char *name);\n");*/ } if ( val && ( baseclasses_view->childCount() > 1 ) ) @@ -952,21 +952,21 @@ void CppNewClassDialog::addToConstructorsList( TQCheckListItem *myClass, Functio new PCheckListItem( method, myClass, m_part->formatModelItem( method.data() ), TQCheckListItem::RadioButton ); } -void CppNewClassDialog::addToMethodsList( TQListViewItem *tqparent, FunctionDom method ) +void CppNewClassDialog::addToMethodsList( TQListViewItem *parent, FunctionDom method ) { - PCheckListItem *it = new PCheckListItem( method, tqparent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); + PCheckListItem *it = new PCheckListItem( method, parent, m_part->formatModelItem( method.data() ), TQCheckListItem::CheckBox ); method->isAbstract() ? it->setText( 1, i18n( "replace" ) ) : it->setText( 1, i18n( "extend" ) ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, FunctionDom method, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, FunctionDom method, TQString modifier ) { - PListViewItem *it = new PListViewItem( method, tqparent, m_part->formatModelItem( method.data() ) ); + PListViewItem *it = new PListViewItem( method, parent, m_part->formatModelItem( method.data() ) ); it->setText( 1, modifier ); } -void CppNewClassDialog::addToUpgradeList( TQListViewItem *tqparent, VariableDom attr, TQString modifier ) +void CppNewClassDialog::addToUpgradeList( TQListViewItem *parent, VariableDom attr, TQString modifier ) { - PListViewItem *it = new PListViewItem( attr, tqparent, m_part->formatModelItem( attr.data() ) ); + PListViewItem *it = new PListViewItem( attr, parent, m_part->formatModelItem( attr.data() ) ); it->setText( 1, modifier ); } @@ -1244,13 +1244,13 @@ void CppNewClassDialog::to_constructors_list_clicked() PCheckListItem *curr; if ( ( curr = dynamic_cast* >( it.current() ) ) ) { - if ( curr->isOn() && curr->tqparent() ) + if ( curr->isOn() && curr->parent() ) { //fill the base classes list base += base.isEmpty() ? ": " : ", "; - base += curr->tqparent() ->text( 0 ); + base += curr->parent() ->text( 0 ); PCheckListItem *p; - if ( ( p = dynamic_cast* >( curr->tqparent() ) ) ) + if ( ( p = dynamic_cast* >( curr->parent() ) ) ) { base += p->templateAddition; } @@ -1507,7 +1507,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PCheckListItem *curr; if ( ( curr = dynamic_cast* >( it.current() ) ) ) { - if ( curr->isOn() && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( curr->isOn() && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->item() ->access() == CodeModelItem::Private ) @@ -1519,9 +1519,9 @@ void CppNewClassDialog::ClassGenerator::common_text() // if (advCpp.isEmpty()) advCpp += "\n\n"; - TQString bcName = curr->tqparent() ->tqparent() ->text( 0 ); + TQString bcName = curr->parent() ->parent() ->text( 0 ); PListViewItem *bc; - if ( ( bc = dynamic_cast* >( curr->tqparent() ->tqparent() ) ) ) + if ( ( bc = dynamic_cast* >( curr->parent() ->parent() ) ) ) { bcName += bc->templateAddition; } @@ -1540,7 +1540,7 @@ void CppNewClassDialog::ClassGenerator::common_text() PListViewItem *curr_m; if ( ( curr = dynamic_cast* >( ita.current() ) ) ) { - if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->tqparent() ) && ( curr->tqparent() ->tqparent() ) ) + if ( ( !curr->text( 2 ).isEmpty() ) && ( curr->parent() ) && ( curr->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr->text( 2 ) == "private" ) @@ -1553,12 +1553,12 @@ void CppNewClassDialog::ClassGenerator::common_text() /* if ((*adv_h).isEmpty()) *adv_h += "\n\n";*/ if ( adv_h ) - *adv_h += TQString( " using " ) + curr->tqparent() ->tqparent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; + *adv_h += TQString( " using " ) + curr->parent() ->parent() ->text( 0 ) + "::" + curr->item() ->name() + ";\n"; } } else if ( ( curr_m = dynamic_cast* >( ita.current() ) ) ) { - if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->tqparent() ) && ( curr_m->tqparent() ->tqparent() ) ) + if ( ( !curr_m->text( 2 ).isEmpty() ) && ( curr_m->parent() ) && ( curr_m->parent() ->parent() ) ) { TQString * adv_h = 0; if ( curr_m->text( 2 ) == "private" ) @@ -1574,7 +1574,7 @@ void CppNewClassDialog::ClassGenerator::common_text() TQString methodName = curr_m->item() ->name(); if ( !methodName.contains( TQRegExp( "^[a-zA-z_]" ) ) ) methodName = "operator" + methodName; - *adv_h += " using " + curr_m->tqparent() ->tqparent() ->text( 0 ) + "::" + methodName + ";\n"; + *adv_h += " using " + curr_m->parent() ->parent() ->text( 0 ) + "::" + methodName + ";\n"; } } ++ita; @@ -1707,26 +1707,26 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQWidget *tqparent = 0, const char *name = 0"; - argsCpp = "TQWidget *tqparent, const char *name"; + argsH = "TQWidget *parent = 0, const char *name = 0"; + argsCpp = "TQWidget *parent, const char *name"; } else { - argsH = "TQWidget *tqparent = 0"; - argsCpp = "TQWidget *tqparent"; + argsH = "TQWidget *parent = 0"; + argsCpp = "TQWidget *parent"; } } else if ( qobject ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) { - argsH = "TQObject *tqparent = 0, const char *name = 0"; - argsCpp = "TQObject *tqparent, const char *name"; + argsH = "TQObject *parent = 0, const char *name = 0"; + argsCpp = "TQObject *parent, const char *name"; } else { - argsH = "TQObject *tqparent = 0"; - argsCpp = "TQObject *tqparent"; + argsH = "TQObject *parent = 0"; + argsCpp = "TQObject *parent"; } } else @@ -1739,16 +1739,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQWidget(tqparent, name)"; + baseInitializer = " : TQWidget(parent, name)"; else - baseInitializer = " : TQWidget(tqparent)"; + baseInitializer = " : TQWidget(parent)"; } else if ( qobject && ( dlg.baseclasses_view->childCount() == 0 ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer = " : TQObject(tqparent, name)"; + baseInitializer = " : TQObject(parent, name)"; else - baseInitializer = " : TQObject(tqparent)"; + baseInitializer = " : TQObject(parent)"; } else if ( dlg.baseclasses_view->childCount() != 0 ) { @@ -1766,16 +1766,16 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() if ( childClass && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else if ( qobject && ( baseInitializer == " : " ) ) { if( dlg.m_part->qtBuildConfig()->version() == 3 ) - baseInitializer += it.current()->text( 0 ) + "(tqparent, name)"; + baseInitializer += it.current()->text( 0 ) + "(parent, name)"; else - baseInitializer += it.current()->text( 0 ) + "(tqparent)"; + baseInitializer += it.current()->text( 0 ) + "(parent)"; } else { -- cgit v1.2.1