diff options
Diffstat (limited to 'languages/cpp/cppsupportpart.cpp')
| -rw-r--r-- | languages/cpp/cppsupportpart.cpp | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index f02b967b..35739045 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -25,11 +25,11 @@ #include "ast_utils.h" #include "cppcodecompletion.h" #include "ccconfigwidget.h" -#include "TDevCppSupportIface.h" +#include "KDevCppSupportIface.h" #include "cppsupportfactory.h" #include "catalog.h" #include "cpp_tags.h" -#include "tdevdriver.h" +#include "kdevdriver.h" #include "cppcodecompletionconfig.h" #include "cppsplitheadersourceconfig.h" #include "tag_creator.h" @@ -37,10 +37,10 @@ #include "classgeneratorconfig.h" #include "urlutil.h" #include "creategettersetterconfiguration.h" -#include "tdevsourceformatter.h" -#include "tdevcreatefile.h" +#include "kdevsourceformatter.h" +#include "kdevcreatefile.h" #include "qtbuildconfig.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include <tdetexteditor/viewcursorinterface.h> #include <tdepopupmenu.h> // wizards @@ -93,14 +93,14 @@ #include <tdetexteditor/clipboardinterface.h> #include <tdetexteditor/texthintinterface.h> -#include <tdevcore.h> -#include <tdevproject.h> -#include <tdevmainwindow.h> -#include <tdevpartcontroller.h> -#include <tdevmakefrontend.h> -#include <tdevcoderepository.h> +#include <kdevcore.h> +#include <kdevproject.h> +#include <kdevmainwindow.h> +#include <kdevpartcontroller.h> +#include <kdevmakefrontend.h> +#include <kdevcoderepository.h> #include <codemodel_utils.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include <domutil.h> #include <config.h> @@ -116,10 +116,10 @@ TQStringList CppSupportPart::m_headerMimeTypes = TQStringList() << "text/x-chdr" TQStringList CppSupportPart::m_sourceExtensions = TQStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); TQStringList CppSupportPart::m_headerExtensions = TQStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); -class CppDriver: public TDevDriver +class CppDriver: public KDevDriver { public: - CppDriver( CppSupportPart* cppSupport ) : TDevDriver( cppSupport, true ) + CppDriver( CppSupportPart* cppSupport ) : KDevDriver( cppSupport, true ) {} void fileParsed( ParsedFile& fileName ) @@ -192,7 +192,7 @@ public: CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) -: TDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "TDevCppSupport" ), m_backgroundParser(0), +: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), _jd(0) @@ -232,7 +232,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); - setXMLFile( "tdevcppsupport.rc" ); + setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); @@ -309,7 +309,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - new TDevCppSupportIface( this ); + new KDevCppSupportIface( this ); //(void) dcopClient(); m_lockupTester = new UIBlockTester( 100 ); @@ -611,7 +611,7 @@ void CppSupportPart::projectClosed( ) } DomUtil::writeListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs", enabledPCSs ); - for ( TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*>::const_iterator it = m_designers.begin(); + for ( TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*>::const_iterator it = m_designers.begin(); it != m_designers.end(); ++it ) { kdDebug( 9007 ) << "calling save settings fro designer integration" << endl; @@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_contextFileName = url.path(); int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); - popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated TDevDesigner." ) ); + popup->setWhatsThis( id, i18n( "<b>Create or select implementation</b><p>Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } @@ -1342,7 +1342,7 @@ void CppSupportPart::jumpToCodeModelItem( const ItemDom& item, bool scrollOnly ) lastSyncedUrl = url; } -TDevLanguageSupport::Features CppSupportPart::features() +KDevLanguageSupport::Features CppSupportPart::features() { if ( withcpp ) return Features( Classes | Structs | Functions | Variables | Namespaces | Declarations @@ -2065,7 +2065,7 @@ void CppSupportPart::codeCompletionConfigStored( ) /* m_backgroundParser->updateParserConfiguration(); - TDevDriver* d = dynamic_cast<TDevDriver*>( m_driver ); //The foreground-parse isn't used anymore, and could be removed + KDevDriver* d = dynamic_cast<KDevDriver*>( m_driver ); //The foreground-parse isn't used anymore, and could be removed if( d ) { d->setup(); d->makeMacrosPersistent(); @@ -2144,7 +2144,7 @@ TQString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortD return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } void CppSupportPart::addClass() @@ -2677,7 +2677,7 @@ void CppSupportPart::slotCursorPositionChanged() { unsigned int line = 0; unsigned int column = 0; - if ( TDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) ) + if ( KDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ) ) { TQString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); mainWindow()->statusBar()->message( typeInfoString ); @@ -2738,7 +2738,7 @@ void CppSupportPart::updateParserConfiguration() TQString conf_file_name = specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); - dynamic_cast<TDevDriver*>(m_driver)->setup(); + dynamic_cast<KDevDriver*>(m_driver)->setup(); m_driver->parseFile( conf_file_name, true, true, true ); m_buildSafeFileSetTimer->start( 500, true ); @@ -2753,9 +2753,9 @@ Driver* CppSupportPart::driver() { return m_driver; } -TDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type ) +KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type ) { - TDevDesignerIntegration * des = 0; + KDevDesignerIntegration * des = 0; switch ( type ) { case KInterfaceDesigner::Glade: @@ -2847,7 +2847,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS TQFileInfo info( aClass->fileName() ); TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; TQFileInfo fileInfo( implementationFile ); - TDevCreateFile* createFileSupport = extension<TDevCreateFile>( "TDevelop/CreateFile" ); + KDevCreateFile* createFileSupport = extension<KDevCreateFile>( "TDevelop/CreateFile" ); if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); |