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 /languages/bash | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/bash')
-rw-r--r-- | languages/bash/CMakeLists.txt | 8 | ||||
-rw-r--r-- | languages/bash/Makefile.am | 14 | ||||
-rw-r--r-- | languages/bash/app_templates/bashhello/CMakeLists.txt | 6 | ||||
-rw-r--r-- | languages/bash/app_templates/bashhello/Makefile.am | 4 | ||||
-rw-r--r-- | languages/bash/app_templates/bashhello/app.tdevelop | 18 | ||||
-rw-r--r-- | languages/bash/app_templates/bashhello/bashhello.kdevtemplate (renamed from languages/bash/app_templates/bashhello/bashhello.tdevtemplate) | 0 | ||||
-rw-r--r-- | languages/bash/bashsupport_part.cpp | 30 | ||||
-rw-r--r-- | languages/bash/bashsupport_part.h | 10 | ||||
-rw-r--r-- | languages/bash/doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | languages/bash/doc/Makefile.am | 2 | ||||
-rw-r--r-- | languages/bash/kdevbashsupport.desktop (renamed from languages/bash/tdevbashsupport.desktop) | 2 | ||||
-rw-r--r-- | languages/bash/kdevbashsupport.rc (renamed from languages/bash/tdevbashsupport.rc) | 0 |
12 files changed, 48 insertions, 48 deletions
diff --git a/languages/bash/CMakeLists.txt b/languages/bash/CMakeLists.txt index eca8c096..9998693d 100644 --- a/languages/bash/CMakeLists.txt +++ b/languages/bash/CMakeLists.txt @@ -29,13 +29,13 @@ link_directories( ##### other data ################################ -install( FILES tdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevbashsupport ) +install( FILES kdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevbashsupport ) -##### libtdevbashsupport (module) ############### +##### libkdevbashsupport (module) ############### -tde_add_kpart( libtdevbashsupport AUTOMOC +tde_add_kpart( libkdevbashsupport AUTOMOC SOURCES bashsupport_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/bash/Makefile.am b/languages/bash/Makefile.am index 2f750d63..5916563a 100644 --- a/languages/bash/Makefile.am +++ b/languages/bash/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = app_templates doc -kde_module_LTLIBRARIES = libtdevbashsupport.la -libtdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevbashsupport.la +libkdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevbashsupport_la_SOURCES = bashsupport_part.cpp +libkdevbashsupport_la_SOURCES = bashsupport_part.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevbashsupport.desktop +service_DATA = kdevbashsupport.desktop -rcdir = $(kde_datadir)/tdevbashsupport -rc_DATA = tdevbashsupport.rc +rcdir = $(kde_datadir)/kdevbashsupport +rc_DATA = kdevbashsupport.rc diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt index 0c002f83..69abf15c 100644 --- a/languages/bash/app_templates/bashhello/CMakeLists.txt +++ b/languages/bash/app_templates/bashhello/CMakeLists.txt @@ -15,8 +15,8 @@ add_custom_target( bashhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - bashhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + bashhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am index ed84d271..b26692b4 100644 --- a/languages/bash/app_templates/bashhello/Makefile.am +++ b/languages/bash/app_templates/bashhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.sh app.tdevelop templateName = bashhello ### no need to change below: -template_DATA = $(templateName).tdevtemplate +template_DATA = $(templateName).kdevtemplate templatedir = ${appwizarddatadir}/templates -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard $(templateName).tar.gz: ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/bash/app_templates/bashhello/app.tdevelop b/languages/bash/app_templates/bashhello/app.tdevelop index bbc04992..cab08799 100644 --- a/languages/bash/app_templates/bashhello/app.tdevelop +++ b/languages/bash/app_templates/bashhello/app.tdevelop @@ -11,22 +11,22 @@ </keywords> <ignoreparts> <part>KDevdistpart</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir>src</activedir> <includepatterns>*.sh</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.sh" name="Scripts" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -73,10 +73,10 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="sh"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/bash/app_templates/bashhello/bashhello.tdevtemplate b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate index b9e7bd11..b9e7bd11 100644 --- a/languages/bash/app_templates/bashhello/bashhello.tdevtemplate +++ b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 7cfd9889..9f1be201 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -14,7 +14,7 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kprocess.h> #include <kdebug.h> #include <tdeaction.h> @@ -22,25 +22,25 @@ #include <kdialogbase.h> -#include <tdevcore.h> -#include <tdevmainwindow.h> -#include <tdevlanguagesupport.h> -#include <tdevpartcontroller.h> -#include <tdevproject.h> -#include <tdevappfrontend.h> -#include <tdevplugininfo.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> +#include <kdevlanguagesupport.h> +#include <kdevpartcontroller.h> +#include <kdevproject.h> +#include <kdevappfrontend.h> +#include <kdevplugininfo.h> #include <domutil.h> #include <codemodel.h> -typedef TDevGenericFactory<BashSupportPart> BashSupportFactory; -static const TDevPluginInfo data("tdevbashsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevbashsupport, BashSupportFactory( data ) ) +typedef KDevGenericFactory<BashSupportPart> BashSupportFactory; +static const KDevPluginInfo data("kdevbashsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) +: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) { setInstance(BashSupportFactory::instance()); - setXMLFile("tdevbashsupport.rc"); + setXMLFile("kdevbashsupport.rc"); TDEAction *action; action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -182,12 +182,12 @@ void BashSupportPart::savedFile(const KURL &fileName) void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, TRUE); } -TDevLanguageSupport::Features BashSupportPart::features() +KDevLanguageSupport::Features BashSupportPart::features() { return Features(Variables | Functions); } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index b1fff80e..284e4f4c 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -3,8 +3,8 @@ */ -#ifndef __TDEVPART_BASHSUPPORT_H__ -#define __TDEVPART_BASHSUPPORT_H__ +#ifndef __KDEVPART_BASHSUPPORT_H__ +#define __KDEVPART_BASHSUPPORT_H__ #include <tqguardedptr.h> @@ -13,8 +13,8 @@ #include <kdialogbase.h> #include <codemodel.h> -#include <tdevplugin.h> -#include <tdevlanguagesupport.h> +#include <kdevplugin.h> +#include <kdevlanguagesupport.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/viewcursorinterface.h> @@ -47,7 +47,7 @@ class BashCodeCompletion : TQObject KTextEditor::ViewCursorInterface *m_cursorInterface; }; -class BashSupportPart : public TDevLanguageSupport +class BashSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/bash/doc/CMakeLists.txt b/languages/bash/doc/CMakeLists.txt index 09ad4e33..0d2d2a83 100644 --- a/languages/bash/doc/CMakeLists.txt +++ b/languages/bash/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES bash.toc bash_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/bash/doc/Makefile.am b/languages/bash/doc/Makefile.am index ab1c4f52..1474d939 100644 --- a/languages/bash/doc/Makefile.am +++ b/languages/bash/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = bash.toc bash_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/bash/tdevbashsupport.desktop b/languages/bash/kdevbashsupport.desktop index 854201e7..91a98e3e 100644 --- a/languages/bash/tdevbashsupport.desktop +++ b/languages/bash/kdevbashsupport.desktop @@ -80,6 +80,6 @@ GenericName[tr]=Bash Desteği GenericName[zh_CN]=Bash 支持 GenericName[zh_TW]=Bash 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevbashsupport +X-TDE-Library=libkdevbashsupport X-TDevelop-Version=5 X-TDevelop-Language=Bash diff --git a/languages/bash/tdevbashsupport.rc b/languages/bash/kdevbashsupport.rc index d4592d6b..d4592d6b 100644 --- a/languages/bash/tdevbashsupport.rc +++ b/languages/bash/kdevbashsupport.rc |