diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /parts/ctags2 | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'parts/ctags2')
-rw-r--r-- | parts/ctags2/CMakeLists.txt | 8 | ||||
-rw-r--r-- | parts/ctags2/Makefile.am | 14 | ||||
-rw-r--r-- | parts/ctags2/ctags2_part.cpp | 34 | ||||
-rw-r--r-- | parts/ctags2/ctags2_part.h | 8 | ||||
-rw-r--r-- | parts/ctags2/ctags2_settingswidget.cpp | 4 | ||||
-rw-r--r-- | parts/ctags2/ctags2_widget.cpp | 4 | ||||
-rw-r--r-- | parts/ctags2/kdevctags2.desktop (renamed from parts/ctags2/tdevctags2.desktop) | 2 | ||||
-rw-r--r-- | parts/ctags2/kdevpart_ctags2.rc (renamed from parts/ctags2/tdevpart_ctags2.rc) | 2 |
8 files changed, 38 insertions, 38 deletions
diff --git a/parts/ctags2/CMakeLists.txt b/parts/ctags2/CMakeLists.txt index a88415d6..a8f4b582 100644 --- a/parts/ctags2/CMakeLists.txt +++ b/parts/ctags2/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES tdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/tdevctags2 ) +install( FILES kdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/kdevctags2 ) -##### libtdevctags2 (module) #################### +##### libkdevctags2 (module) #################### -tde_add_kpart( libtdevctags2 AUTOMOC +tde_add_kpart( libkdevctags2 AUTOMOC SOURCES ctags2_part.cpp readtags.c ctags2_widgetbase.ui ctags2_widget.cpp tags.cpp ctagskinds.cpp diff --git a/parts/ctags2/Makefile.am b/parts/ctags2/Makefile.am index f12fdada..f92a819c 100644 --- a/parts/ctags2/Makefile.am +++ b/parts/ctags2/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevctags2.la -libtdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevctags2.la +libkdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ +libkdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ ctags2_widget.cpp tags.cpp ctagskinds.cpp ctags2_settingswidgetbase.ui \ ctags2_settingswidget.cpp ctags2_selecttagfilebase.ui ctags2_selecttagfile.cpp \ ctags2_createtagfilebase.ui ctags2_createtagfile.cpp @@ -13,10 +13,10 @@ libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevctags2.desktop +service_DATA = kdevctags2.desktop -rc_DATA = tdevpart_ctags2.rc -rcdir = $(kde_datadir)/tdevctags2 +rc_DATA = kdevpart_ctags2.rc +rcdir = $(kde_datadir)/kdevctags2 noinst_HEADERS = ctags2_widget.h tags.h readtags.h ctagskinds.h \ ctags2_settingswidget.h diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 371ff7e5..324ded8a 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -31,16 +31,16 @@ #include <tdeconfig.h> #include <tdeaction.h> -#include "tdevappfrontend.h" -#include <tdevgenericfactory.h> -#include <tdevcore.h> -#include <tdevmainwindow.h> -#include <tdevproject.h> -#include <tdevpartcontroller.h> -#include <tdevplugininfo.h> +#include "kdevappfrontend.h" +#include <kdevgenericfactory.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> +#include <kdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevplugininfo.h> #include "configwidgetproxy.h" #include "domutil.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include "ctags2_settingswidget.h" #include "ctags2_widget.h" @@ -54,15 +54,15 @@ namespace ctags #include "readtags.h" } -typedef TDevGenericFactory<CTags2Part> CTags2Factory; -static const TDevPluginInfo data("tdevctags2"); -K_EXPORT_COMPONENT_FACTORY( libtdevctags2, CTags2Factory( data ) ) +typedef KDevGenericFactory<CTags2Part> CTags2Factory; +static const KDevPluginInfo data("kdevctags2"); +K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "ctags2Part" ) + : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); - setXMLFile("tdevpart_ctags2.rc"); + setXMLFile("kdevpart_ctags2.rc"); TQDomDocument & dom = *projectDom(); TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); @@ -164,7 +164,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) commandline += " "; commandline += dir; - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(dir, commandline, false); return true; @@ -330,7 +330,7 @@ int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & patte void CTags2Part::slotLookupDeclaration( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoDeclaration(); @@ -339,7 +339,7 @@ void CTags2Part::slotLookupDeclaration( ) void CTags2Part::slotLookupDefinition( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoDefinition(); @@ -348,7 +348,7 @@ void CTags2Part::slotLookupDefinition( ) void CTags2Part::slotLookup( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast<KTextEditor::Document*>( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoTag(); diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index ca33e801..93af5f7f 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -9,13 +9,13 @@ * * ***************************************************************************/ -#ifndef __TDEVPART_CTAGS2_H__ -#define __TDEVPART_CTAGS2_H__ +#ifndef __KDEVPART_CTAGS2_H__ +#define __KDEVPART_CTAGS2_H__ #include <tqguardedptr.h> #include <tqstring.h> -#include <tdevplugin.h> +#include <kdevplugin.h> #include "tags.h" class TQPopupMenu; @@ -26,7 +26,7 @@ class CTags2Widget; class ConfigWidgetProxy; class KDialogBase; -class CTags2Part : public TDevPlugin +class CTags2Part : public KDevPlugin { Q_OBJECT diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index c44f91d6..b45a41be 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -15,13 +15,13 @@ #include <klineedit.h> #include <tdelistview.h> -#include <tdevproject.h> +#include <kdevproject.h> #include <tdeapplication.h> #include <kurlcompletion.h> #include <kurlrequester.h> #include <tdeconfig.h> #include <kurl.h> -#include <tdevplugin.h> +#include <kdevplugin.h> #include <domutil.h> #include "ctags2_settingswidget.h" diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index cb44937d..bd1b138d 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -22,8 +22,8 @@ #include <kurl.h> #include <tdeapplication.h> -#include <tdevproject.h> -#include <tdevpartcontroller.h> +#include <kdevproject.h> +#include <kdevpartcontroller.h> #include "ctags2_widget.h" #include "tags.h" diff --git a/parts/ctags2/tdevctags2.desktop b/parts/ctags2/kdevctags2.desktop index 86720c8e..db79f503 100644 --- a/parts/ctags2/tdevctags2.desktop +++ b/parts/ctags2/kdevctags2.desktop @@ -77,6 +77,6 @@ GenericName[zh_CN]=CTags前端 GenericName[zh_TW]=CTags 前端介面 ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Project -X-TDE-Library=libtdevctags2 +X-TDE-Library=libkdevctags2 X-TDevelop-Version=5 X-TDevelop-Properties=CodeNavigation diff --git a/parts/ctags2/tdevpart_ctags2.rc b/parts/ctags2/kdevpart_ctags2.rc index c217c256..e8745b3b 100644 --- a/parts/ctags2/tdevpart_ctags2.rc +++ b/parts/ctags2/kdevpart_ctags2.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui>
-<kpartplugin name="ctags" library="libtdevctags2" version="3">
+<kpartplugin name="ctags" library="libkdevctags2" version="3">
<MenuBar>
</MenuBar>
<Menu name="hidden">
|