diff options
Diffstat (limited to 'languages/cpp/cppnewclassdlg.cpp')
-rw-r--r-- | languages/cpp/cppnewclassdlg.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index dda53df7..514974fe 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -79,20 +79,20 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co accessMenu = new TQPopupMenu( this ); accessMenu->insertItem( i18n( "Use as Private" ), - this, TQT_SLOT( changeToPrivate() ), 0, 1 ); + this, TQ_SLOT( changeToPrivate() ), 0, 1 ); accessMenu->insertItem( i18n( "Use as Protected" ), - this, TQT_SLOT( changeToProtected() ), 0, 2 ); + this, TQ_SLOT( changeToProtected() ), 0, 2 ); accessMenu->insertItem( i18n( "Use as Public" ), - this, TQT_SLOT( changeToPublic() ), 0, 3 ); + this, TQ_SLOT( changeToPublic() ), 0, 3 ); accessMenu->insertSeparator(); accessMenu->insertItem( i18n( "Unset" ), - this, TQT_SLOT( changeToInherited() ), 0, 5 ); + this, TQ_SLOT( changeToInherited() ), 0, 5 ); overMenu = new TQPopupMenu( this ); overMenu->insertItem( i18n( "Extend Base Class Functionality" ), - this, TQT_SLOT( extendFunctionality() ), 0, 11 ); + this, TQ_SLOT( extendFunctionality() ), 0, 11 ); overMenu->insertItem( i18n( "Replace Base Class Method" ), - this, TQT_SLOT( replaceFunctionality() ), 0, 12 ); + this, TQ_SLOT( replaceFunctionality() ), 0, 12 ); compBasename = basename_edit->completionObject(); setCompletionBasename( m_part->codeModel() ); @@ -374,7 +374,7 @@ void CppNewClassDialog::checkTQWidgetInheritance( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQWIDGET_OBJECT_NAME_STRING ); + basename_edit->setText( "TQWidget" ); } /* constructors_cpp_edit->append(classname_edit->text() + "::" + classname_edit->text() + "(TQWidget *parent, const char *name):\n TQWidget(parent, name)\n{\n}\n"); @@ -396,7 +396,7 @@ void CppNewClassDialog::qobject_box_stateChanged( int val ) if ( baseclasses_view->childCount() == 0 ) { addBaseClass(); - basename_edit->setText( TQOBJECT_OBJECT_NAME_STRING ); + basename_edit->setText( "TQObject" ); } @@ -1171,7 +1171,7 @@ void CppNewClassDialog::setAccessForBase( TQString baseclass, TQString newAccess void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewItem * item, const TQPoint &p, int /*c*/ ) { - if ( item && ( ( button == Qt::LeftButton ) || ( button == Qt::RightButton ) ) && ( item->depth() > 1 ) ) + if ( item && ( ( button == TQt::LeftButton ) || ( button == TQt::RightButton ) ) && ( item->depth() > 1 ) ) { accessMenu->setItemEnabled( 1, true ); accessMenu->setItemEnabled( 2, true ); @@ -1196,7 +1196,7 @@ void CppNewClassDialog::access_view_mouseButtonPressed( int button, TQListViewIt void CppNewClassDialog::methods_view_mouseButtonPressed( int button , TQListViewItem * item, const TQPoint&p , int /*c*/ ) { - if ( item && ( button == Qt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) + if ( item && ( button == TQt::RightButton ) && ( item->depth() > 1 ) && ( ! item->text( 1 ).isEmpty() ) ) { overMenu->exec( p ); } @@ -1437,7 +1437,7 @@ void CppNewClassDialog::ClassGenerator::common_text() headeronly = dlg.headeronly_box->isChecked(); if ( ( dlg.baseclasses_view->childCount() == 0 ) && childClass ) - new TQListViewItem( dlg.baseclasses_view, TQWIDGET_OBJECT_NAME_STRING, "public" ); + new TQListViewItem( dlg.baseclasses_view, "TQWidget", "public" ); if ( objc && ( dlg.baseclasses_view->childCount() == 0 ) ) new TQListViewItem( dlg.baseclasses_view, "NSObject", "public" ); @@ -1962,7 +1962,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() { if ( !it.current() ->text( 0 ).isEmpty() ) if ( !it.current() ->text( 3 ).isEmpty() ) - // if ((!childClass) || (it.current()->text(0) != TQWIDGET_OBJECT_NAME_STRING)) + // if ((!childClass) || (it.current()->text(0) != "TQWidget")) includeBaseHeader += ( includeBaseHeader.isEmpty() ? TQString( "" ) : TQString( "\n" ) ) + TQString::fromLatin1( "#include " ) + ( it.current() ->text( 2 ).toInt() == 0 ? TQString( "<" ) : TQString( "\"" ) ) + it.current() ->text( 3 ) @@ -2013,7 +2013,7 @@ void CppNewClassDialog::ClassGenerator::gen_interface() TQString qobjectStr; if ( childClass || qobject ) - qobjectStr = "Q_OBJECT\n"; + qobjectStr = "TQ_OBJECT\n"; TQString baseclass; |