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/ada | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/ada')
-rw-r--r-- | languages/ada/CMakeLists.txt | 8 | ||||
-rw-r--r-- | languages/ada/Makefile.am | 14 | ||||
-rw-r--r-- | languages/ada/adasupportpart.cpp | 24 | ||||
-rw-r--r-- | languages/ada/adasupportpart.h | 4 | ||||
-rw-r--r-- | languages/ada/app_templates/adahello/CMakeLists.txt | 6 | ||||
-rw-r--r-- | languages/ada/app_templates/adahello/Makefile.am | 4 | ||||
-rw-r--r-- | languages/ada/app_templates/adahello/adahello.kdevtemplate (renamed from languages/ada/app_templates/adahello/adahello.tdevtemplate) | 2 | ||||
-rw-r--r-- | languages/ada/app_templates/adahello/app.tdevelop | 14 | ||||
-rw-r--r-- | languages/ada/doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | languages/ada/doc/Makefile.am | 2 | ||||
-rw-r--r-- | languages/ada/file_templates/CMakeLists.txt | 2 | ||||
-rw-r--r-- | languages/ada/file_templates/Makefile.am | 2 | ||||
-rw-r--r-- | languages/ada/kdevadasupport.desktop (renamed from languages/ada/tdevadasupport.desktop) | 2 | ||||
-rw-r--r-- | languages/ada/kdevadasupport.rc (renamed from languages/ada/tdevadasupport.rc) | 0 | ||||
-rw-r--r-- | languages/ada/problemreporter.cpp | 4 |
15 files changed, 45 insertions, 45 deletions
diff --git a/languages/ada/CMakeLists.txt b/languages/ada/CMakeLists.txt index 5b5d412b..e8d351b9 100644 --- a/languages/ada/CMakeLists.txt +++ b/languages/ada/CMakeLists.txt @@ -33,13 +33,13 @@ link_directories( ##### other data ################################ -install( FILES tdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadasupport ) +install( FILES kdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadasupport ) -##### libtdevadasupport (module) ################ +##### libkdevadasupport (module) ################ -tde_add_kpart( libtdevadasupport AUTOMOC +tde_add_kpart( libkdevadasupport AUTOMOC SOURCES adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am index 61536e92..d45a2add 100644 --- a/languages/ada/Makefile.am +++ b/languages/ada/Makefile.am @@ -7,11 +7,11 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevadasupport.la -libtdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) -libtdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la +kde_module_LTLIBRARIES = libkdevadasupport.la +libkdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la -libtdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp +libkdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp METASOURCES = AUTO @@ -33,9 +33,9 @@ genparser: antlr ada.g && antlr ada.tree.g && antlr -glib ada.tree.g ada.store.g servicedir = $(kde_servicesdir) -service_DATA = tdevadasupport.desktop +service_DATA = kdevadasupport.desktop -rcdir = $(kde_datadir)/tdevadasupport -rc_DATA = tdevadasupport.rc +rcdir = $(kde_datadir)/kdevadasupport +rc_DATA = kdevadasupport.rc KDE_OPTIONS = nofinal diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 53c4af48..aac02610 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -18,11 +18,11 @@ #include <fstream> #include <sstream> -#include "tdevgenericfactory.h" -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" +#include "kdevgenericfactory.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" #include "codemodel.h" #include "adasupportpart.h" #include "problemreporter.h" @@ -33,15 +33,15 @@ #include "AdaStoreWalker.hpp" #include "AdaAST.hpp" -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> enum { KDEV_DB_VERSION = 6 }; enum { KDEV_PCS_VERSION = 6 }; -typedef TDevGenericFactory<AdaSupportPart> AdaSupportPartFactory; +typedef KDevGenericFactory<AdaSupportPart> AdaSupportPartFactory; -static const TDevPluginInfo data("tdevadasupport"); -K_EXPORT_COMPONENT_FACTORY (libtdevadasupport, AdaSupportPartFactory (data)) +static const KDevPluginInfo data("kdevadasupport"); +K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data)) struct AdaSupportPartData { @@ -51,7 +51,7 @@ struct AdaSupportPartData { }; AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) + : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); @@ -93,9 +93,9 @@ AdaSupportPart::~AdaSupportPart () } -TDevLanguageSupport::Features AdaSupportPart::features () +KDevLanguageSupport::Features AdaSupportPart::features () { - return TDevLanguageSupport::Features + return KDevLanguageSupport::Features ( // TBD: Classes | Functions | Namespaces); } diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index 32160b38..eb9e2630 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -2,7 +2,7 @@ #ifndef __ADASUPPORTPART_H__ #define __ADASUPPORTPART_H__ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include <tqwaitcondition.h> @@ -10,7 +10,7 @@ class AdaSupportPartData; class KDialogBase; class TQStringList; -class AdaSupportPart : public TDevLanguageSupport +class AdaSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt index ba3a3eb5..cbd00e6e 100644 --- a/languages/ada/app_templates/adahello/CMakeLists.txt +++ b/languages/ada/app_templates/adahello/CMakeLists.txt @@ -15,8 +15,8 @@ add_custom_target( adahello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - adahello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + adahello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am index 5cc49953..5a970c91 100644 --- a/languages/ada/app_templates/adahello/Makefile.am +++ b/languages/ada/app_templates/adahello/Makefile.am @@ -1,10 +1,10 @@ dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist ### no need to change below: -template_DATA = adahello.tdevtemplate +template_DATA = adahello.kdevtemplate templatedir = ${appwizarddatadir}/templates -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard adahello.tar.gz: $(TAR) -cf adahello.tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 adahello.tar diff --git a/languages/ada/app_templates/adahello/adahello.tdevtemplate b/languages/ada/app_templates/adahello/adahello.kdevtemplate index 810315a6..0cc09da2 100644 --- a/languages/ada/app_templates/adahello/adahello.tdevtemplate +++ b/languages/ada/app_templates/adahello/adahello.kdevtemplate @@ -70,7 +70,7 @@ Archive=adahello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/ada/app_templates/adahello/app.tdevelop b/languages/ada/app_templates/adahello/app.tdevelop index 83815aa1..a94f7e34 100644 --- a/languages/ada/app_templates/adahello/app.tdevelop +++ b/languages/ada/app_templates/adahello/app.tdevelop @@ -4,14 +4,14 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>Ada</primarylanguage> <keywords> <keyword>Ada</keyword> <keyword>Code</keyword> </keywords> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <directoryradio>build</directoryradio> <customdirectory>/</customdirectory> @@ -25,8 +25,8 @@ <buildtool>make</buildtool> <builddir/> </build> - </tdevcustomproject> - <tdevdoctreeview> + </kdevcustomproject> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -73,12 +73,12 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="ads"/> <type ext="adb"/> <type ext="ada"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/ada/doc/CMakeLists.txt b/languages/ada/doc/CMakeLists.txt index 32d4281c..62b3ef26 100644 --- a/languages/ada/doc/CMakeLists.txt +++ b/languages/ada/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES ada.toc ada_bugs_gcc.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/ada/doc/Makefile.am b/languages/ada/doc/Makefile.am index da0655f6..ff5f8a32 100644 --- a/languages/ada/doc/Makefile.am +++ b/languages/ada/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = ada.toc ada_bugs_gcc.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/ada/file_templates/CMakeLists.txt b/languages/ada/file_templates/CMakeLists.txt index 7eb47fdc..21d16b69 100644 --- a/languages/ada/file_templates/CMakeLists.txt +++ b/languages/ada/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES adb ads - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/ada/file_templates/Makefile.am b/languages/ada/file_templates/Makefile.am index 4635979e..58bbd907 100644 --- a/languages/ada/file_templates/Makefile.am +++ b/languages/ada/file_templates/Makefile.am @@ -1,3 +1,3 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = adb ads diff --git a/languages/ada/tdevadasupport.desktop b/languages/ada/kdevadasupport.desktop index 6bee2461..f1ae3bf1 100644 --- a/languages/ada/tdevadasupport.desktop +++ b/languages/ada/kdevadasupport.desktop @@ -82,6 +82,6 @@ GenericName[tr]=Ada Dil Desteği GenericName[zh_CN]=Ada 语言支持 GenericName[zh_TW]=Ada 語言支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevadasupport +X-TDE-Library=libkdevadasupport X-TDevelop-Version=5 X-TDevelop-Language=Ada diff --git a/languages/ada/tdevadasupport.rc b/languages/ada/kdevadasupport.rc index 23b705db..23b705db 100644 --- a/languages/ada/tdevadasupport.rc +++ b/languages/ada/kdevadasupport.rc diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index cfd9acc7..6bac0253 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -19,8 +19,8 @@ #include "problemreporter.h" #include "adasupportpart.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "configproblemreporter.h" #include "backgroundparser.h" |