diff options
Diffstat (limited to 'languages')
750 files changed, 3079 insertions, 3079 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" 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 diff --git a/languages/cpp/CMakeLists.txt b/languages/cpp/CMakeLists.txt index 3da1e579..8d1c569a 100644 --- a/languages/cpp/CMakeLists.txt +++ b/languages/cpp/CMakeLists.txt @@ -45,17 +45,17 @@ link_directories( ##### other data ################################ -install( FILES tdevcppsupport.desktop tdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport ) -install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) -install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport ) +install( FILES kdevcppsupport.desktop kdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport ) +install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) +install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport ) -##### libtdevcppsupport (module) ################ +##### libkdevcppsupport (module) ################ -tde_add_kpart( libtdevcppsupport AUTOMOC +tde_add_kpart( libkdevcppsupport AUTOMOC SOURCES - TDevCppSupportIface.cpp TDevCppSupportIface.skel + KDevCppSupportIface.cpp KDevCppSupportIface.skel addattributedialog.cpp addattributedialogbase.ui addmethoddialog.cpp addmethoddialogbase.ui ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp @@ -72,7 +72,7 @@ tde_add_kpart( libtdevcppsupport AUTOMOC creategettersetterdialog.cpp creategettersetterdialog.h createpcsdialog.cpp createpcsdialogbase.ui doxydoc.cpp includefiles.cpp includepathresolver.cpp - tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp + kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp qtdesignercppintegration.cpp setuphelper.cpp simplecontext.cpp simpletype.cpp simpletypecatalog.cpp simpletypefunction.cpp simpletypenamespace.cpp @@ -80,7 +80,7 @@ tde_add_kpart( libtdevcppsupport AUTOMOC subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp typedesc.cpp LINK - lang_interfaces-shared tdevcppparser-shared - tdevcatalog-shared designerintegration-shared + lang_interfaces-shared kdevcppparser-shared + kdevcatalog-shared designerintegration-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/KDevCppSupportIface.cpp b/languages/cpp/KDevCppSupportIface.cpp new file mode 100644 index 00000000..793516ca --- /dev/null +++ b/languages/cpp/KDevCppSupportIface.cpp @@ -0,0 +1,24 @@ + +#include "KDevCppSupportIface.h" +#include "cppsupportpart.h" + +KDevCppSupportIface::KDevCppSupportIface( CppSupportPart* cppSupport ) + : TQObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) +{ +} + +KDevCppSupportIface::~KDevCppSupportIface() +{ +} + +void KDevCppSupportIface::addClass() +{ + m_cppSupport->slotNewClass(); +} + +void KDevCppSupportIface::parseProject() +{ + m_cppSupport->parseProject(); +} + +#include "KDevCppSupportIface.moc" diff --git a/languages/cpp/TDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h index c94509ba..cbf8b4f9 100644 --- a/languages/cpp/TDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -1,20 +1,20 @@ -#ifndef TDEVCPPSUPPORTIFACE_H -#define TDEVCPPSUPPORTIFACE_H +#ifndef KDEVCPPSUPPORTIFACE_H +#define KDEVCPPSUPPORTIFACE_H #include <tqobject.h> #include <dcopobject.h> class CppSupportPart; -class TDevCppSupportIface : public TQObject, public DCOPObject +class KDevCppSupportIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevCppSupportIface( CppSupportPart* cppSupport ); - ~TDevCppSupportIface(); + KDevCppSupportIface( CppSupportPart* cppSupport ); + ~KDevCppSupportIface(); k_dcop: void addClass(); diff --git a/languages/cpp/Makefile.am b/languages/cpp/Makefile.am index dc4974c3..7c506ac1 100644 --- a/languages/cpp/Makefile.am +++ b/languages/cpp/Makefile.am @@ -10,14 +10,14 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \ -I$(top_builddir)/languages/lib/designer_integration -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include \ $(all_includes) -kde_module_LTLIBRARIES = libtdevcppsupport.la -libtdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la \ +kde_module_LTLIBRARIES = libkdevcppsupport.la +libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \ - $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libtdevinterfaces.la + $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libkdevinterfaces.la -libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel \ +libkdevcppsupport_la_SOURCES = KDevCppSupportIface.cpp KDevCppSupportIface.skel \ addattributedialog.cpp addattributedialogbase.ui addmethoddialog.cpp addmethoddialogbase.ui \ ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp ccconfigwidgetbase.ui \ classgeneratorconfig.cpp classgeneratorconfigbase.ui codeinformationrepository.cpp \ @@ -27,7 +27,7 @@ libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel cppsupportfactory.cpp cppsupportpart.cpp creategettersetter.ui \ creategettersetterconfiguration.cpp creategettersetterconfiguration.h creategettersetterdialog.cpp \ creategettersetterdialog.h createpcsdialog.cpp createpcsdialogbase.ui doxydoc.cpp includefiles.cpp \ - includepathresolver.cpp tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \ + includepathresolver.cpp kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \ qtdesignercppintegration.cpp setuphelper.cpp simplecontext.cpp simpletype.cpp simpletypecatalog.cpp \ simpletypefunction.cpp simpletypenamespace.cpp store_walker.cpp storeconverter.cpp \ stringhelpers.cpp subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp typedesc.cpp @@ -35,15 +35,15 @@ libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcppsupport.desktop tdevcsupport.desktop +service_DATA = kdevcppsupport.desktop kdevcsupport.desktop -rcdir = $(kde_datadir)/tdevcppsupport -rc_DATA = tdevcppsupport.rc +rcdir = $(kde_datadir)/kdevcppsupport +rc_DATA = kdevcppsupport.rc -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = cpptemplates -configurationdir = ${kde_datadir}/tdevcppsupport +configurationdir = ${kde_datadir}/kdevcppsupport configuration_DATA = configuration AM_CXXFLAGS = -DAST_DEBUG @@ -51,8 +51,8 @@ AM_CXXFLAGS = -DAST_DEBUG #bin_PROGRAMS = r++ #r___LDFLAGS = $(all_libraries) #r___SOURCES = main.cpp -#r___DEPENDENCIES = libtdevcppsupport.la -#r___LDADD = libtdevcppsupport.la $(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la +#r___DEPENDENCIES = libkdevcppsupport.la +#r___LDADD = libkdevcppsupport.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la noinst_HEADERS = cppevaluation.h cppimplementationwidget.h \ cppsplitheadersourceconfig.h declarationinfo.h expressioninfo.h includefiles.h includepathresolver.h \ qtdesignercppintegration.h setuphelper.h simplecontext.h simpletypecatalog.h simpletypefunction.h \ diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox index 527e50ab..460c4cc7 100644 --- a/languages/cpp/README.dox +++ b/languages/cpp/README.dox @@ -4,7 +4,7 @@ Provides C/C++ language support for KDevelop. Well the first thing you should read is lib/catalog it contains the source of the persistant class store after that languages/cpp/tag_creator.* it is the component that stores the informations collected by the c++ parser into the PCS -then you can play with TDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/* +then you can play with KDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/* and of course lib/interfaces/kdevpcsimporter.* and if you want play with the c++ parser go to lib/cppparser/, the best is to start to read driver.* diff --git a/languages/cpp/TDevCppSupportIface.cpp b/languages/cpp/TDevCppSupportIface.cpp deleted file mode 100644 index 54977c4c..00000000 --- a/languages/cpp/TDevCppSupportIface.cpp +++ /dev/null @@ -1,24 +0,0 @@ - -#include "TDevCppSupportIface.h" -#include "cppsupportpart.h" - -TDevCppSupportIface::TDevCppSupportIface( CppSupportPart* cppSupport ) - : TQObject( cppSupport ), DCOPObject( "TDevCppSupport" ), m_cppSupport( cppSupport ) -{ -} - -TDevCppSupportIface::~TDevCppSupportIface() -{ -} - -void TDevCppSupportIface::addClass() -{ - m_cppSupport->slotNewClass(); -} - -void TDevCppSupportIface::parseProject() -{ - m_cppSupport->parseProject(); -} - -#include "TDevCppSupportIface.moc" diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 705678cd..6a9a1fbc 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -23,7 +23,7 @@ #include "backgroundparser.h" #include "cppsupport_utils.h" -#include <tdevpartcontroller.h> +#include <kdevpartcontroller.h> #include <codemodel.h> diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index f9e9c602..c9593844 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -24,8 +24,8 @@ #include "cppsupport_utils.h" #include "domutil.h" -#include <tdevpartcontroller.h> -#include <tdevcreatefile.h> +#include <kdevpartcontroller.h> +#include <kdevcreatefile.h> #include <tdelocale.h> #include <tdefiledialog.h> @@ -236,7 +236,7 @@ void AddMethodDialog::accept() TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) { - if ( TDevCreateFile * createFileSupp = m_cppSupport->extension<TDevCreateFile>( "TDevelop/CreateFile" ) ) + if ( KDevCreateFile * createFileSupp = m_cppSupport->extension<KDevCreateFile>( "TDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); } diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 2ed5ec56..52229fc6 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -9,14 +9,14 @@ # ################################################# -add_subdirectory( tdeapp ) +add_subdirectory( kapp ) add_subdirectory( kpartapp ) add_subdirectory( kpartplugin ) add_subdirectory( tdecmodule ) add_subdirectory( kicker ) add_subdirectory( tdeioslave ) -add_subdirectory( tdevpart ) -add_subdirectory( tdevpart2 ) +add_subdirectory( kdevpart ) +add_subdirectory( kdevpart2 ) add_subdirectory( chello ) add_subdirectory( cpphello ) add_subdirectory( tdescreensaver ) @@ -32,11 +32,11 @@ add_subdirectory( khello2 ) add_subdirectory( kateplugin ) add_subdirectory( kateplugin2 ) add_subdirectory( qtopiaapp ) -add_subdirectory( tdedcop ) +add_subdirectory( kdedcop ) add_subdirectory( wxhello ) add_subdirectory( cppsdlhello ) add_subdirectory( tdeconfig35 ) -add_subdirectory( tdevlang ) +add_subdirectory( kdevlang ) add_subdirectory( noatunvisual ) add_subdirectory( noatunui ) add_subdirectory( kmod ) @@ -64,7 +64,7 @@ add_subdirectory( qmakeempty ) add_subdirectory( automakeempty ) add_subdirectory( makefileempty ) add_subdirectory( qtopia4app ) -add_subdirectory( tde4app ) +add_subdirectory( kde4app ) install( FILES c.appwizard @@ -75,5 +75,5 @@ install( FILES DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE ) install( FILES - tdecpp.appwizard + kdecpp.appwizard DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index e594ce4e..8350118d 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tdeapp kpartapp kpartplugin tdecmodule kicker tdeioslave tdevpart tdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp tdedcop wxhello cppsdlhello tdeconfig35 tdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app tde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard @@ -6,5 +6,5 @@ profilesc_DATA = c.appwizard profilescppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE profilescpp_DATA = cpp.appwizard -profilestdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE -profilestdecpp_DATA = tdecpp.appwizard +profileskdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE +profileskdecpp_DATA = kdecpp.appwizard diff --git a/languages/cpp/app_templates/automakeempty/CMakeLists.txt b/languages/cpp/app_templates/automakeempty/CMakeLists.txt index 8757cdce..6785106a 100644 --- a/languages/cpp/app_templates/automakeempty/CMakeLists.txt +++ b/languages/cpp/app_templates/automakeempty/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( automakeempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/automakeempty.tar.gz automakeempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - automakeempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + automakeempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/automakeempty/Makefile.am b/languages/cpp/app_templates/automakeempty/Makefile.am index 8c6ceb16..06f9a94c 100644 --- a/languages/cpp/app_templates/automakeempty/Makefile.am +++ b/languages/cpp/app_templates/automakeempty/Makefile.am @@ -3,10 +3,10 @@ dataFiles = automakeempty-Makefile.am automakeempty-Makefile.cvs \ templateName = automakeempty ### 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/cpp/app_templates/automakeempty/app.tdevelop b/languages/cpp/app_templates/automakeempty/app.tdevelop index f30a3dfc..ab12095d 100644 --- a/languages/cpp/app_templates/automakeempty/app.tdevelop +++ b/languages/cpp/app_templates/automakeempty/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> </general> <run> @@ -33,8 +33,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -79,23 +79,23 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate index 6581b4fa..a1ced086 100644 --- a/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate +++ b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate @@ -53,11 +53,11 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE2] Type=install diff --git a/languages/cpp/app_templates/chello/CMakeLists.txt b/languages/cpp/app_templates/chello/CMakeLists.txt index 9df341e8..5d792072 100644 --- a/languages/cpp/app_templates/chello/CMakeLists.txt +++ b/languages/cpp/app_templates/chello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( chello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/chello.tar.gz chello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - chello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + chello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/chello/Makefile.am b/languages/cpp/app_templates/chello/Makefile.am index 3c77d4fb..0a51e6fd 100644 --- a/languages/cpp/app_templates/chello/Makefile.am +++ b/languages/cpp/app_templates/chello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.c src-Makefile.am c-Makefile.am c-Makefile.cvs \ templateName = chello ### 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} ${dataFiles} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/chello/app.tdevelop b/languages/cpp/app_templates/chello/app.tdevelop index 825cf9a3..41866d9f 100644 --- a/languages/cpp/app_templates/chello/app.tdevelop +++ b/languages/cpp/app_templates/chello/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -37,8 +37,8 @@ <cflags>-O0 -g3 %{CFLAGS}</cflags> </debug> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -85,23 +85,23 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="c"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.c" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/chello/chello.tdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate index 1368d851..6dc5fb77 100644 --- a/languages/cpp/app_templates/chello/chello.tdevtemplate +++ b/languages/cpp/app_templates/chello/chello.kdevtemplate @@ -211,11 +211,11 @@ Archive=chello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt index 6810ed53..b11230fe 100644 --- a/languages/cpp/app_templates/chello_gba/CMakeLists.txt +++ b/languages/cpp/app_templates/chello_gba/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( chellogba.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/chellogba.tar.gz chellogba.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - chellogba.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + chellogba.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/chello_gba/Makefile.am b/languages/cpp/app_templates/chello_gba/Makefile.am index afaf8c0b..fbc6c2b4 100644 --- a/languages/cpp/app_templates/chello_gba/Makefile.am +++ b/languages/cpp/app_templates/chello_gba/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.c font.raw.c master.pal.c src-Makefile.am c-Makefile.am \ templateName = chellogba ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop index 3c38bcf4..2f59c978 100644 --- a/languages/cpp/app_templates/chello_gba/app.tdevelop +++ b/languages/cpp/app_templates/chello_gba/app.tdevelop @@ -11,10 +11,10 @@ <keyword>GBA</keyword> </keywords> <ignoreparts> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> </general> @@ -33,11 +33,11 @@ <cflags>-nostartfiles</cflags> </default> </configurations> - </tdevautoproject> - <tdevvisualadvance> + </kdevautoproject> + <kdevvisualadvance> <binary>src/%{APPNAMELC}.gba</binary> - </tdevvisualadvance> - <tdevdoctreeview> + </kdevvisualadvance> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -84,17 +84,17 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="c"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate index e6ea8c90..ef89357f 100644 --- a/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate +++ b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate @@ -68,11 +68,11 @@ Archive=chellogba.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/clanlib/CMakeLists.txt b/languages/cpp/app_templates/clanlib/CMakeLists.txt index c8fdfe2d..e0b99cc2 100644 --- a/languages/cpp/app_templates/clanlib/CMakeLists.txt +++ b/languages/cpp/app_templates/clanlib/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( clanlib.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clanlib.tar.gz clanlib.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - clanlib.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + clanlib.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/clanlib/Makefile.am b/languages/cpp/app_templates/clanlib/Makefile.am index b6aa9150..84e0459b 100644 --- a/languages/cpp/app_templates/clanlib/Makefile.am +++ b/languages/cpp/app_templates/clanlib/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app-Makefile.am main.cpp app.tdevelop \ templateName = clanlib ### 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/cpp/app_templates/clanlib/app.tdevelop b/languages/cpp/app_templates/clanlib/app.tdevelop index 15418279..d2e9e430 100644 --- a/languages/cpp/app_templates/clanlib/app.tdevelop +++ b/languages/cpp/app_templates/clanlib/app.tdevelop @@ -12,7 +12,7 @@ <keyword>ClanLib</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -43,8 +43,8 @@ <ldflags></ldflags> </default> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -90,17 +90,17 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate index 89243557..1b39badc 100644 --- a/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate +++ b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate @@ -68,7 +68,7 @@ Archive=clanlib.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt index df6ec7b7..841853d8 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cmakelibc.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakelibc.tar.gz cmakelibc.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakelibc.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakelibc.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakelibc/Makefile.am b/languages/cpp/app_templates/cmakelibc/Makefile.am index f4fb8bb2..c10e704a 100644 --- a/languages/cpp/app_templates/cmakelibc/Makefile.am +++ b/languages/cpp/app_templates/cmakelibc/Makefile.am @@ -2,10 +2,10 @@ dataFiles = test.c lib.h lib.c cmakelibc.png CMakeLists.txt CMakeLists.txt.src templateName = cmakelibc ### 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/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate index c05eaec4..c05eaec4 100644 --- a/languages/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate +++ b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt index cbd6bd5f..26d7f3e2 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt @@ -18,10 +18,10 @@ add_custom_target( cmakelibcpp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakelibcpp.tar.gz cmakelibcpp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakelibcpp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakelibcpp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakelibcpp/Makefile.am b/languages/cpp/app_templates/cmakelibcpp/Makefile.am index 0c3b275e..395bb107 100644 --- a/languages/cpp/app_templates/cmakelibcpp/Makefile.am +++ b/languages/cpp/app_templates/cmakelibcpp/Makefile.am @@ -2,10 +2,10 @@ dataFiles = test.cpp lib.h lib.cpp cmakelibcpp.png CMakeLists.txt CMakeLists.txt templateName = cmakelibcpp ### 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/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate index 653a5ec0..653a5ec0 100644 --- a/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate +++ b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt index 88bb2d36..b69d898f 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( cmakeqt3app.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakeqt3app.tar.gz cmakeqt3app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakeqt3app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakeqt3app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakeqt3app/Makefile.am b/languages/cpp/app_templates/cmakeqt3app/Makefile.am index e42bdcbf..24bd6c35 100644 --- a/languages/cpp/app_templates/cmakeqt3app/Makefile.am +++ b/languages/cpp/app_templates/cmakeqt3app/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp cmakeqt3app.cpp cmakeqt3app.h cmakeqt3app.png \ templateName = cmakeqt3app ### 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/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate index 50afb48a..50afb48a 100644 --- a/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate +++ b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate diff --git a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt index d5e417c3..621dd48a 100644 --- a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( cmakesimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakesimple.tar.gz cmakesimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakesimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakesimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakesimple/Makefile.am b/languages/cpp/app_templates/cmakesimple/Makefile.am index e6ff1e4d..243ed01d 100644 --- a/languages/cpp/app_templates/cmakesimple/Makefile.am +++ b/languages/cpp/app_templates/cmakesimple/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp cmakesimple.png CMakeLists.txt README templateName = cmakesimple ### 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/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate index 14df4c4c..14df4c4c 100644 --- a/languages/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate +++ b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate diff --git a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt index 70e65075..4d07a4d6 100644 --- a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( cmakesimplec.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakesimplec.tar.gz cmakesimplec.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakesimplec.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakesimplec.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakesimplec/Makefile.am b/languages/cpp/app_templates/cmakesimplec/Makefile.am index df69719d..f5a1c3e7 100644 --- a/languages/cpp/app_templates/cmakesimplec/Makefile.am +++ b/languages/cpp/app_templates/cmakesimplec/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.c cmakesimplec.png CMakeLists.txt templateName = cmakesimplec ### 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/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate index 25837634..25837634 100644 --- a/languages/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate +++ b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate diff --git a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt index bfdd6d10..ccb2dd4a 100644 --- a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt +++ b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cppcurseshello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cppcurseshello.tar.gz cppcurseshello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cppcurseshello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cppcurseshello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cppcurseshello/Makefile.am b/languages/cpp/app_templates/cppcurseshello/Makefile.am index 17175bfa..ef3623f6 100644 --- a/languages/cpp/app_templates/cppcurseshello/Makefile.am +++ b/languages/cpp/app_templates/cppcurseshello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs\ templateName = cppcurseshello ### 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/cpp/app_templates/cppcurseshello/app.tdevelop b/languages/cpp/app_templates/cppcurseshello/app.tdevelop index d771aedf..98919071 100644 --- a/languages/cpp/app_templates/cppcurseshello/app.tdevelop +++ b/languages/cpp/app_templates/cppcurseshello/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -37,8 +37,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -83,23 +83,23 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate index 5bd7ebe2..27f85c21 100644 --- a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate +++ b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate @@ -68,11 +68,11 @@ Archive=cppcurseshello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cpphello/CMakeLists.txt b/languages/cpp/app_templates/cpphello/CMakeLists.txt index 9227cfcd..d77effea 100644 --- a/languages/cpp/app_templates/cpphello/CMakeLists.txt +++ b/languages/cpp/app_templates/cpphello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cpphello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cpphello.tar.gz cpphello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cpphello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cpphello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cpphello/Makefile.am b/languages/cpp/app_templates/cpphello/Makefile.am index 930a46e5..2ba017c2 100644 --- a/languages/cpp/app_templates/cpphello/Makefile.am +++ b/languages/cpp/app_templates/cpphello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs \ templateName = cpphello ### 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/cpp/app_templates/cpphello/app.tdevelop b/languages/cpp/app_templates/cpphello/app.tdevelop index d771aedf..98919071 100644 --- a/languages/cpp/app_templates/cpphello/app.tdevelop +++ b/languages/cpp/app_templates/cpphello/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -37,8 +37,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -83,23 +83,23 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate index 1b4fc2fc..ee529159 100644 --- a/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate +++ b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate @@ -69,11 +69,11 @@ Archive=cpphello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt index 46e4a57f..b5e16259 100644 --- a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt +++ b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cppsdlhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cppsdlhello.tar.gz cppsdlhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cppsdlhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cppsdlhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cppsdlhello/Makefile.am b/languages/cpp/app_templates/cppsdlhello/Makefile.am index 3743cf77..c0357370 100644 --- a/languages/cpp/app_templates/cppsdlhello/Makefile.am +++ b/languages/cpp/app_templates/cppsdlhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs configur templateName = cppsdlhello ### 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/cpp/app_templates/cppsdlhello/app.tdevelop b/languages/cpp/app_templates/cppsdlhello/app.tdevelop index 39760184..3a60526f 100644 --- a/languages/cpp/app_templates/cppsdlhello/app.tdevelop +++ b/languages/cpp/app_templates/cppsdlhello/app.tdevelop @@ -12,7 +12,7 @@ <keyword>SDL</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -43,8 +43,8 @@ <ldflags>-lSDL</ldflags> </default> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -87,17 +87,17 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate index e99f52ab..5e559acb 100644 --- a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate +++ b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate @@ -69,11 +69,11 @@ Archive=cppsdlhello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/dcopservice/CMakeLists.txt b/languages/cpp/app_templates/dcopservice/CMakeLists.txt index d2e5458b..c3a2397b 100644 --- a/languages/cpp/app_templates/dcopservice/CMakeLists.txt +++ b/languages/cpp/app_templates/dcopservice/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( dcopservice.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dcopservice.tar.gz dcopservice.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - dcopservice.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + dcopservice.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/dcopservice/Makefile.am b/languages/cpp/app_templates/dcopservice/Makefile.am index 35b114d2..dddb4916 100644 --- a/languages/cpp/app_templates/dcopservice/Makefile.am +++ b/languages/cpp/app_templates/dcopservice/Makefile.am @@ -4,10 +4,10 @@ dataFiles = dcopservice.desktop dcopservice.png dcopservice.h \ templateName = dcopservice ### 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/cpp/app_templates/dcopservice/dcopservice.tdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate index 0174747d..a4c08a28 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevtemplate +++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate @@ -69,11 +69,11 @@ Archive=dcopservice.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop index dfdea3b8..59569583 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop +++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop @@ -14,15 +14,15 @@ <keyword>tdeioslave</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> - <tdevautoproject> + </kdevcppsupport> + <kdevautoproject> <general> <useconfiguration>debug</useconfiguration> </general> @@ -43,15 +43,15 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -88,22 +88,22 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am index 5f5bf6ed..75bad862 100644 --- a/languages/cpp/app_templates/generichello/Makefile.am +++ b/languages/cpp/app_templates/generichello/Makefile.am @@ -5,10 +5,10 @@ templateName = cppgenerichello # png-filename differs from archive file name ### 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/cpp/app_templates/generichello/app.prj b/languages/cpp/app_templates/generichello/app.prj index c6466824..a1eeca82 100644 --- a/languages/cpp/app_templates/generichello/app.prj +++ b/languages/cpp/app_templates/generichello/app.prj @@ -1,8 +1,8 @@ -<tdevproject> +<kdevproject> <group name = "src"> <target name = "cpphello"> <file name = "%{APPNAMELC}.cpp"/> <attribute name = "buildscript">gcc -o %{APPNAMELC} %{APPNAMELC}.cpp</attribute> </target> </group> -</tdevproject> +</kdevproject> diff --git a/languages/cpp/app_templates/generichello/app.tdevelop b/languages/cpp/app_templates/generichello/app.tdevelop index a719a726..63f5ce16 100644 --- a/languages/cpp/app_templates/generichello/app.tdevelop +++ b/languages/cpp/app_templates/generichello/app.tdevelop @@ -4,14 +4,14 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevGenericProject</projectmanagement> + <projectmanagement>KDevGenericProject</projectmanagement> <primarylanguage>C++</primarylanguage> <keywords> <keyword>C++</keyword> <keyword>Code</keyword> </keywords> </general> - <tdevgenericproject> + <kdevgenericproject> <backend>ShellScript</backend> <project>%{APPNAMELC}.prj</project> <general> @@ -39,23 +39,23 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevgenericproject> - <tdevfilecreate> + </kdevgenericproject> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/generichello/generichello.tdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate index 27f78afe..f30eea5b 100644 --- a/languages/cpp/app_templates/generichello/generichello.tdevtemplate +++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate @@ -68,7 +68,7 @@ Archive=generichello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am index a0d9505e..9d73ddd6 100644 --- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am @@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \ templateName = gnome2mmapp ### 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/cpp/app_templates/gnome2mmapp/app.tdevelop b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop index 177611f0..19fbacb7 100644 --- a/languages/cpp/app_templates/gnome2mmapp/app.tdevelop +++ b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop @@ -12,7 +12,7 @@ <keyword>GNOME</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -39,8 +39,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.h" name="Sources" /> <group pattern="*.glade" name="User Interface" /> @@ -48,22 +48,22 @@ <group pattern="*.po" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdebugger> + </kdevfileview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate index 363ffd5a..f692d342 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate @@ -67,15 +67,15 @@ Archive=gnome2mmapp.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNOME2] Type=include -File=%{tdevelop}/template-common/gnome2.tdevtemplate +File=%{tdevelop}/template-common/gnome2.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt index 75d52e80..45544ac9 100644 --- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt +++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( gtk2mmapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gtk2mmapp.tar.gz gtk2mmapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - gtk2mmapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + gtk2mmapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am index 422f7b00..c44ba568 100644 --- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am @@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \ templateName = gtk2mmapp ### 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/cpp/app_templates/gtk2mmapp/app.tdevelop b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop index f9335dad..6f691439 100644 --- a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop +++ b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop @@ -12,7 +12,7 @@ <keyword>GTK</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -39,8 +39,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.h" name="Sources" /> <group pattern="*.glade" name="User Interface" /> @@ -48,8 +48,8 @@ <group pattern="*.po" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,22 +92,22 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate index 4559f2d8..a8948d26 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate @@ -59,11 +59,11 @@ Archive=gtk2mmapp.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/tdeapp/CMakeLists.txt b/languages/cpp/app_templates/kapp/CMakeLists.txt index 10c09f9f..bfe6d93d 100644 --- a/languages/cpp/app_templates/tdeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/kapp/CMakeLists.txt @@ -9,19 +9,19 @@ # ################################################# -add_custom_target( tdeapp.tar.gz ALL - COMMAND tar zcf tdeapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( kapp.tar.gz ALL + COMMAND tar zcf kapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.cpp app.h pref.cpp pref.h appview.cpp appview.h appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am - tdeapp.png app.tdevelop subdirs README + kapp.png app.tdevelop subdirs README ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdeapp.tar.gz tdeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + ${CMAKE_CURRENT_BINARY_DIR}/kapp.tar.gz kapp.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am index 6adf4430..145551d3 100644 --- a/languages/cpp/app_templates/tdeapp/Makefile.am +++ b/languages/cpp/app_templates/kapp/Makefile.am @@ -1,14 +1,14 @@ dataFiles = app.cpp app.h pref.cpp pref.h appview.cpp appview.h \ appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am \ - tdeapp.png app.tdevelop subdirs README + kapp.png app.tdevelop subdirs README -templateName = tdeapp +templateName = kapp ### 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/cpp/app_templates/tdeapp/README b/languages/cpp/app_templates/kapp/README index 7720e6b4..7720e6b4 100644 --- a/languages/cpp/app_templates/tdeapp/README +++ b/languages/cpp/app_templates/kapp/README diff --git a/languages/cpp/app_templates/tdeapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp index 774efe8e..774efe8e 100644 --- a/languages/cpp/app_templates/tdeapp/app.cpp +++ b/languages/cpp/app_templates/kapp/app.cpp diff --git a/languages/cpp/app_templates/tdeapp/app.desktop b/languages/cpp/app_templates/kapp/app.desktop index 5c7ab928..5c7ab928 100644 --- a/languages/cpp/app_templates/tdeapp/app.desktop +++ b/languages/cpp/app_templates/kapp/app.desktop diff --git a/languages/cpp/app_templates/tdeapp/app.h b/languages/cpp/app_templates/kapp/app.h index 5f39dd11..5f39dd11 100644 --- a/languages/cpp/app_templates/tdeapp/app.h +++ b/languages/cpp/app_templates/kapp/app.h diff --git a/languages/cpp/app_templates/tdeapp/app.tdevses b/languages/cpp/app_templates/kapp/app.kdevses index dcd1c8c1..dcd1c8c1 100644 --- a/languages/cpp/app_templates/tdeapp/app.tdevses +++ b/languages/cpp/app_templates/kapp/app.kdevses diff --git a/languages/cpp/app_templates/tdeapp/app.tdevelop b/languages/cpp/app_templates/kapp/app.tdevelop index e1523988..6a53f237 100644 --- a/languages/cpp/app_templates/tdeapp/app.tdevelop +++ b/languages/cpp/app_templates/kapp/app.tdevelop @@ -17,15 +17,15 @@ <description/> <ignoreparts/> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> - <tdevautoproject> + </kdevcppsupport> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -61,8 +61,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -74,8 +74,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -110,8 +110,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -125,16 +125,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -143,7 +143,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -155,14 +155,14 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdeapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp index ce92c875..ce92c875 100644 --- a/languages/cpp/app_templates/tdeapp/app_client.cpp +++ b/languages/cpp/app_templates/kapp/app_client.cpp diff --git a/languages/cpp/app_templates/tdeapp/appiface.h b/languages/cpp/app_templates/kapp/appiface.h index 9fa7cd1b..9fa7cd1b 100644 --- a/languages/cpp/app_templates/tdeapp/appiface.h +++ b/languages/cpp/app_templates/kapp/appiface.h diff --git a/languages/cpp/app_templates/tdeapp/appui.rc b/languages/cpp/app_templates/kapp/appui.rc index ceb4f14e..ceb4f14e 100644 --- a/languages/cpp/app_templates/tdeapp/appui.rc +++ b/languages/cpp/app_templates/kapp/appui.rc diff --git a/languages/cpp/app_templates/tdeapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp index 16c05a3f..16c05a3f 100644 --- a/languages/cpp/app_templates/tdeapp/appview.cpp +++ b/languages/cpp/app_templates/kapp/appview.cpp diff --git a/languages/cpp/app_templates/tdeapp/appview.h b/languages/cpp/app_templates/kapp/appview.h index 79513a9d..79513a9d 100644 --- a/languages/cpp/app_templates/tdeapp/appview.h +++ b/languages/cpp/app_templates/kapp/appview.h diff --git a/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate b/languages/cpp/app_templates/kapp/kapp.kdevtemplate index 0902455d..86675a50 100644 --- a/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate +++ b/languages/cpp/app_templates/kapp/kapp.kdevtemplate @@ -30,7 +30,7 @@ Name[sv]=Programramverk Name[tr]=Uygulama Çatısı Name[zh_CN]=应用程序框架 Name[zh_TW]=應用程式框架 -Icon=tdeapp.png +Icon=kapp.png Category=C++/TDE Comment=Generates a simple TDE application with one toplevel window, menus and toolbars. A DCOP interface is also provided, so that your application can provide a scripting interface Comment[ca]=Genera una simple aplicació per al TDE amb una finestra principal, menús i barres d'eines. També es proveeix la interfície DCOP, de manera que la vostra aplicació podrà proveir d'una interfície per a scripts @@ -67,11 +67,11 @@ Archive=kapp.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tde4app/tde4app.png b/languages/cpp/app_templates/kapp/kapp.png Binary files differindex a421a664..a421a664 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.png +++ b/languages/cpp/app_templates/kapp/kapp.png diff --git a/languages/cpp/app_templates/tdeapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp index 8c2cc07f..8c2cc07f 100644 --- a/languages/cpp/app_templates/tdeapp/main.cpp +++ b/languages/cpp/app_templates/kapp/main.cpp diff --git a/languages/cpp/app_templates/tdeapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp index 669f591c..669f591c 100644 --- a/languages/cpp/app_templates/tdeapp/pref.cpp +++ b/languages/cpp/app_templates/kapp/pref.cpp diff --git a/languages/cpp/app_templates/tdeapp/pref.h b/languages/cpp/app_templates/kapp/pref.h index b2aae436..b2aae436 100644 --- a/languages/cpp/app_templates/tdeapp/pref.h +++ b/languages/cpp/app_templates/kapp/pref.h diff --git a/languages/cpp/app_templates/tdeapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am index 8125665b..8125665b 100644 --- a/languages/cpp/app_templates/tdeapp/src-Makefile.am +++ b/languages/cpp/app_templates/kapp/src-Makefile.am diff --git a/languages/cpp/app_templates/tdeapp/subdirs b/languages/cpp/app_templates/kapp/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/tdeapp/subdirs +++ b/languages/cpp/app_templates/kapp/subdirs diff --git a/languages/cpp/app_templates/kateplugin/CMakeLists.txt b/languages/cpp/app_templates/kateplugin/CMakeLists.txt index 2361b5e9..354218ad 100644 --- a/languages/cpp/app_templates/kateplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/kateplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kateplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kateplugin.tar.gz kateplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kateplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kateplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kateplugin/Makefile.am b/languages/cpp/app_templates/kateplugin/Makefile.am index 75b44829..81c1a586 100644 --- a/languages/cpp/app_templates/kateplugin/Makefile.am +++ b/languages/cpp/app_templates/kateplugin/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h\ plugin.tdevelop subdirs plugin.desktop ### 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/cpp/app_templates/kateplugin/kateplugin.tdevtemplate b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate index a3dc2dc8..3c308223 100644 --- a/languages/cpp/app_templates/kateplugin/kateplugin.tdevtemplate +++ b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate @@ -67,11 +67,11 @@ Archive=kateplugin.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kateplugin/plugin.tdevelop b/languages/cpp/app_templates/kateplugin/plugin.tdevelop index c96d48cc..799ac6d5 100644 --- a/languages/cpp/app_templates/kateplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/kateplugin/plugin.tdevelop @@ -13,15 +13,15 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> -<tdevautoproject> + </kdevcppsupport> +<kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}plugin.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -43,8 +43,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -52,8 +52,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -90,24 +90,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt index 1546b2b7..c4a47fba 100644 --- a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt +++ b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kateplugin2.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kateplugin2.tar.gz kateplugin2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kateplugin2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kateplugin2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kateplugin2/Makefile.am b/languages/cpp/app_templates/kateplugin2/Makefile.am index 99969725..b12a6477 100644 --- a/languages/cpp/app_templates/kateplugin2/Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \ templateName = kateplugin2 ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate index 236c6a9a..3da42f23 100644 --- a/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate +++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate @@ -68,11 +68,11 @@ Archive=kateplugin2.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop index 01c48bfc..831365dc 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop +++ b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop @@ -13,15 +13,15 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> -<tdevautoproject> + </kdevcppsupport> +<kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}plugin.la</activetarget> @@ -44,8 +44,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -53,8 +53,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -91,24 +91,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt new file mode 100644 index 00000000..0399f045 --- /dev/null +++ b/languages/cpp/app_templates/kde4app/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kde4app.tar.gz ALL + COMMAND tar zcf kde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp + kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc + kde4app-CMakeLists.txt kapp4.desktop kapp4.kcfg + settings.kcfgc kde4app.png README kde4app.tdevelop + kde4app.tdevelop.filelist +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kde4app.tar.gz kde4app.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kde4app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am new file mode 100644 index 00000000..455acd8d --- /dev/null +++ b/languages/cpp/app_templates/kde4app/Makefile.am @@ -0,0 +1,19 @@ +dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \ + main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \ + kde4app.png README kde4app.tdevelop kde4app.tdevelop.filelist + +templateName = kde4app + +### no need to change below: +template_DATA = $(templateName).kdevtemplate +templatedir = ${appwizarddatadir}/templates + +appwizarddatadir = ${kde_datadir}/kdevappwizard +$(templateName).tar.gz: ${dataFiles} + $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} + $(GZIP_COMMAND) -f9 $(templateName).tar + +archivedir = ${appwizarddatadir} +archive_DATA = $(templateName).tar.gz ${templateName}.png + +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/tde4app/README b/languages/cpp/app_templates/kde4app/README index 8180d28c..8180d28c 100644 --- a/languages/cpp/app_templates/tde4app/README +++ b/languages/cpp/app_templates/kde4app/README diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp index d224123c..d224123c 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4.cpp diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop index 63b359c5..18cdcbe5 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4.desktop +++ b/languages/cpp/app_templates/kde4app/kapp4.desktop @@ -3,7 +3,7 @@ Name=KApp4 Name[nds]=KProg4 Name[sv]=KDE 4-program Name[zh_TW]=KApp4 程式 -Exec=tdeapp4 %i -caption "%c" +Exec=kapp4 %i -caption "%c" Icon=kapp4 Type=Application DocPath=kapp4/kapp4.html diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h index 3c209de2..3c209de2 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4.h +++ b/languages/cpp/app_templates/kde4app/kapp4.h diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.kcfg b/languages/cpp/app_templates/kde4app/kapp4.kcfg index 6040f769..6040f769 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4.kcfg +++ b/languages/cpp/app_templates/kde4app/kapp4.kcfg diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp index af95aa15..af95aa15 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4view.cpp +++ b/languages/cpp/app_templates/kde4app/kapp4view.cpp diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h index 855a2144..855a2144 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4view.h +++ b/languages/cpp/app_templates/kde4app/kapp4view.h diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui index 6738a789..6738a789 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4view_base.ui +++ b/languages/cpp/app_templates/kde4app/kapp4view_base.ui diff --git a/languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt index db1f4bab..db1f4bab 100644 --- a/languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt +++ b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate index 1516e92e..1516e92e 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.tdevtemplate +++ b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate diff --git a/languages/cpp/app_templates/tdeapp/tdeapp.png b/languages/cpp/app_templates/kde4app/kde4app.png Binary files differindex a421a664..a421a664 100644 --- a/languages/cpp/app_templates/tdeapp/tdeapp.png +++ b/languages/cpp/app_templates/kde4app/kde4app.png diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.tdevelop index 87554ffc..d332fa06 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.tdevelop +++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop @@ -4,7 +4,7 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <keywords> <keyword>C++</keyword> @@ -18,7 +18,7 @@ <description/> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -30,8 +30,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -66,8 +66,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -81,16 +81,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -99,7 +99,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -111,7 +111,7 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>%{dest}/build/%{APPNAMELC}</mainprogram> <programargs/> @@ -181,8 +181,8 @@ <blacklist> <path>build</path> </blacklist> - </tdevcustomproject> - <tdevcppsupport> + </kdevcustomproject> + <kdevcppsupport> <qt> <used>true</used> <version>4</version> @@ -191,15 +191,15 @@ <designer>/usr/bin/designer-qt4</designer> <root>/usr/lib/qt4</root> </qt> - </tdevcppsupport> - <tdevclassview> + </kdevcppsupport> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist index 50a0a4f0..5235563f 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist +++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist @@ -1,4 +1,4 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List CMakeLists.txt main.cpp prefs_base.ui diff --git a/languages/cpp/app_templates/tde4app/tde4appui.rc b/languages/cpp/app_templates/kde4app/kde4appui.rc index 406bccc6..406bccc6 100644 --- a/languages/cpp/app_templates/tde4app/tde4appui.rc +++ b/languages/cpp/app_templates/kde4app/kde4appui.rc diff --git a/languages/cpp/app_templates/tde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp index 5c83921b..5c83921b 100644 --- a/languages/cpp/app_templates/tde4app/main.cpp +++ b/languages/cpp/app_templates/kde4app/main.cpp diff --git a/languages/cpp/app_templates/tde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui index 87a191f1..87a191f1 100644 --- a/languages/cpp/app_templates/tde4app/prefs_base.ui +++ b/languages/cpp/app_templates/kde4app/prefs_base.ui diff --git a/languages/cpp/app_templates/tde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc index 402fad09..402fad09 100644 --- a/languages/cpp/app_templates/tde4app/settings.kcfgc +++ b/languages/cpp/app_templates/kde4app/settings.kcfgc diff --git a/languages/cpp/app_templates/tdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard index c4f7b2ac..14bcbeaa 100644 --- a/languages/cpp/app_templates/tdecpp.appwizard +++ b/languages/cpp/app_templates/kdecpp.appwizard @@ -1,2 +1,2 @@ [General] -List=kdedcop,tdeioslave,kxt,tdevlang,kmake,kapp,tdeconfig35,tdevlang,tdevpart,kateplugin,tdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi +List=kdedcop,tdeioslave,kxt,kdevlang,kmake,kapp,tdeconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi diff --git a/languages/cpp/app_templates/tdedcop/CMakeLists.txt b/languages/cpp/app_templates/kdedcop/CMakeLists.txt index f5556887..0b7e9a3f 100644 --- a/languages/cpp/app_templates/tdedcop/CMakeLists.txt +++ b/languages/cpp/app_templates/kdedcop/CMakeLists.txt @@ -9,19 +9,19 @@ # ################################################# -add_custom_target( tdedcop.tar.gz ALL - COMMAND tar zcf tdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( kdedcop.tar.gz ALL + COMMAND tar zcf kdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.cpp app.h app_iface.h app.tdevelop main.cpp - mainclass.cpp mainclass.h tdedcop.png src-Makefile.am + mainclass.cpp mainclass.h kdedcop.png src-Makefile.am subdirs ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdedcop.tar.gz tdedcop.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + ${CMAKE_CURRENT_BINARY_DIR}/kdedcop.tar.gz kdedcop.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdedcop.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kdedcop.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdedcop/Makefile.am b/languages/cpp/app_templates/kdedcop/Makefile.am index 8a21a2bd..21c39778 100644 --- a/languages/cpp/app_templates/tdedcop/Makefile.am +++ b/languages/cpp/app_templates/kdedcop/Makefile.am @@ -1,13 +1,13 @@ dataFiles = app.cpp app.h app_iface.h app.tdevelop main.cpp mainclass.cpp \ - mainclass.h tdedcop.png src-Makefile.am subdirs + mainclass.h kdedcop.png src-Makefile.am subdirs -templateName = tdedcop +templateName = kdedcop ### 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/cpp/app_templates/tdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp index 5c2fa627..5c2fa627 100644 --- a/languages/cpp/app_templates/tdedcop/app.cpp +++ b/languages/cpp/app_templates/kdedcop/app.cpp diff --git a/languages/cpp/app_templates/tdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h index 814fccad..814fccad 100644 --- a/languages/cpp/app_templates/tdedcop/app.h +++ b/languages/cpp/app_templates/kdedcop/app.h diff --git a/languages/cpp/app_templates/tdedcop/app.tdevelop b/languages/cpp/app_templates/kdedcop/app.tdevelop index c37bd28d..991381c5 100644 --- a/languages/cpp/app_templates/tdedcop/app.tdevelop +++ b/languages/cpp/app_templates/kdedcop/app.tdevelop @@ -14,16 +14,16 @@ <keyword>DCOP</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -48,8 +48,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -57,8 +57,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -93,24 +93,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdedcop/app_iface.h b/languages/cpp/app_templates/kdedcop/app_iface.h index 7049c712..7049c712 100644 --- a/languages/cpp/app_templates/tdedcop/app_iface.h +++ b/languages/cpp/app_templates/kdedcop/app_iface.h diff --git a/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate index 628fadd3..ff6a91c1 100644 --- a/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate +++ b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate @@ -67,11 +67,11 @@ Archive=kdedcop.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdedcop/tdedcop.png b/languages/cpp/app_templates/kdedcop/kdedcop.png Binary files differindex 1d25362b..1d25362b 100644 --- a/languages/cpp/app_templates/tdedcop/tdedcop.png +++ b/languages/cpp/app_templates/kdedcop/kdedcop.png diff --git a/languages/cpp/app_templates/tdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp index 283ab5cf..283ab5cf 100644 --- a/languages/cpp/app_templates/tdedcop/main.cpp +++ b/languages/cpp/app_templates/kdedcop/main.cpp diff --git a/languages/cpp/app_templates/tdedcop/mainclass.cpp b/languages/cpp/app_templates/kdedcop/mainclass.cpp index a5e0d6a5..a5e0d6a5 100644 --- a/languages/cpp/app_templates/tdedcop/mainclass.cpp +++ b/languages/cpp/app_templates/kdedcop/mainclass.cpp diff --git a/languages/cpp/app_templates/tdedcop/mainclass.h b/languages/cpp/app_templates/kdedcop/mainclass.h index 13504f82..13504f82 100644 --- a/languages/cpp/app_templates/tdedcop/mainclass.h +++ b/languages/cpp/app_templates/kdedcop/mainclass.h diff --git a/languages/cpp/app_templates/tdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am index 19ddf2fb..19ddf2fb 100644 --- a/languages/cpp/app_templates/tdedcop/src-Makefile.am +++ b/languages/cpp/app_templates/kdedcop/src-Makefile.am diff --git a/languages/cpp/app_templates/tdedcop/subdirs b/languages/cpp/app_templates/kdedcop/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/tdedcop/subdirs +++ b/languages/cpp/app_templates/kdedcop/subdirs diff --git a/languages/cpp/app_templates/kdevlang/CMakeLists.txt b/languages/cpp/app_templates/kdevlang/CMakeLists.txt new file mode 100644 index 00000000..483f85d9 --- /dev/null +++ b/languages/cpp/app_templates/kdevlang/CMakeLists.txt @@ -0,0 +1,27 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevlang.tar.gz ALL + COMMAND tar zcf kdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevlang_part.cpp kdevlang_part.h + kdevlang.rc kdevlang.desktop app.tdevelop + kdevlang-configure.in.in README.dox +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevlang.tar.gz kdevlang.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevlang.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevlang/Makefile.am b/languages/cpp/app_templates/kdevlang/Makefile.am index d33ab103..7afa5be8 100644 --- a/languages/cpp/app_templates/tdevlang/Makefile.am +++ b/languages/cpp/app_templates/kdevlang/Makefile.am @@ -1,12 +1,12 @@ -dataFiles = src-Makefile.am tdevlang_part.cpp tdevlang_part.h tdevlang.rc \ - tdevlang.desktop app.tdevelop tdevlang-configure.in.in README.dox -templateName = tdevlang +dataFiles = src-Makefile.am kdevlang_part.cpp kdevlang_part.h kdevlang.rc \ + kdevlang.desktop app.tdevelop kdevlang-configure.in.in README.dox +templateName = kdevlang ### 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/cpp/app_templates/tdevlang/README.dox b/languages/cpp/app_templates/kdevlang/README.dox index 7069f3a5..7069f3a5 100644 --- a/languages/cpp/app_templates/tdevlang/README.dox +++ b/languages/cpp/app_templates/kdevlang/README.dox diff --git a/languages/cpp/app_templates/tdevlang/app.tdevelop b/languages/cpp/app_templates/kdevlang/app.tdevelop index d6648708..3f477a08 100644 --- a/languages/cpp/app_templates/tdevlang/app.tdevelop +++ b/languages/cpp/app_templates/kdevlang/app.tdevelop @@ -14,16 +14,16 @@ <keyword>KDevelop</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> </general> @@ -47,8 +47,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -56,8 +56,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in index a7e792f2..2e3823b0 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in +++ b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in @@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION}) AC_C_BIGENDIAN AC_CHECK_TDEMAXPATHLEN -KDE_CHECK_HEADERS([tdevelop/tdevcore.h]) +KDE_CHECK_HEADERS([tdevelop/kdevcore.h]) KDE_CHECK_LIB([tdevelop],main, [LIBTDEVELOP="-ltdevelop"]) AC_SUBST(LIBTDEVELOP) diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.desktop b/languages/cpp/app_templates/kdevlang/kdevlang.desktop index 78fac402..93bb3c3b 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.desktop +++ b/languages/cpp/app_templates/kdevlang/kdevlang.desktop @@ -10,5 +10,5 @@ Name[ta]=கெடெவ்%{APPNAME} Icon=tdevelop ServiceTypes=TDevelop/LanguageSupport X-TDevelop-Language=ChangeMe -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate index 8692af7e..6d852324 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate +++ b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate @@ -60,15 +60,15 @@ Comment[zh_CN]=这将生成 TDevelop 的语言支持插件，可以在 TDevelop Comment[zh_TW]=產生一個 TDevelop 語言支援外掛程式，建立在 TDevelop 程式源碼樹之外。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}_part.cpp -Archive=tdevlang.tar.gz +Archive=kdevlang.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install @@ -88,7 +88,7 @@ Dest=%{dest}/Makefile.cvs [FILE5] Type=install -Source=%{src}/tdevlang-configure.in.in +Source=%{src}/kdevlang-configure.in.in Dest=%{dest}/configure.in.in [MkDir1] @@ -102,23 +102,23 @@ Dest=%{dest}/src/Makefile.am [FILE7] Type=install -Source=%{src}/tdevlang_part.cpp +Source=%{src}/kdevlang_part.cpp Dest=%{dest}/src/%{APPNAMELC}_part.cpp [FILE8] Type=install -Source=%{src}/tdevlang_part.h +Source=%{src}/kdevlang_part.h Dest=%{dest}/src/%{APPNAMELC}_part.h [FILE9] Type=install EscapeXML=true -Source=%{src}/tdevlang.rc +Source=%{src}/kdevlang.rc Dest=%{dest}/src/kdev%{APPNAMELC}.rc [FILE10] Type=install -Source=%{src}/tdevlang.desktop +Source=%{src}/kdevlang.desktop Dest=%{dest}/src/kdev%{APPNAMELC}.desktop [FILE11] diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.png b/languages/cpp/app_templates/kdevlang/kdevlang.png Binary files differindex 840a953c..840a953c 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.png +++ b/languages/cpp/app_templates/kdevlang/kdevlang.png diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.rc b/languages/cpp/app_templates/kdevlang/kdevlang.rc index b4e153fa..b4e153fa 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.rc +++ b/languages/cpp/app_templates/kdevlang/kdevlang.rc diff --git a/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 488f494a..559a931b 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -6,10 +6,10 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kgenericfactory.h> -#include <tdevcore.h> -#include <tdevpartcontroller.h> -#include <tdevplugininfo.h> -#include <tdevproject.h> +#include <kdevcore.h> +#include <kdevpartcontroller.h> +#include <kdevplugininfo.h> +#include <kdevproject.h> #include <tdeaction.h> #include <kdebug.h> #include <tdeapplication.h> @@ -18,14 +18,14 @@ #include "%{APPNAMELC}_part.h" typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( "tdev%{APPNAMELC}" ) ); -static const TDevPluginInfo data("tdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); +static const KDevPluginInfo data("kdev%{APPNAMELC}"); %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) +: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdevlang_%{APPNAMELC}.rc"); + setXMLFile("kdevlang_%{APPNAMELC}.rc"); m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -47,7 +47,7 @@ static const TDevPluginInfo data("tdev%{APPNAMELC}"); delete m_build; } -TDevLanguageSupport::Features %{APPNAME}Part::features() +KDevLanguageSupport::Features %{APPNAME}Part::features() { return Features(Variables | Functions); } diff --git a/languages/cpp/app_templates/tdevlang/tdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h index 9b0f2513..1cce0fa6 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -4,9 +4,9 @@ #define __TDEVPART_%{APPNAMEUC}_H__ -#include <tdevplugin.h> +#include <kdevplugin.h> #include <codemodel.h> -#include <tdevlanguagesupport.h> +#include <kdevlanguagesupport.h> #include <tqstringlist.h> #include <kdialogbase.h> @@ -15,7 +15,7 @@ class TDEAction; /* Please read the README.dox file for more info about this part */ -class %{APPNAME}Part : public TDevLanguageSupport +class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am index 6de535df..18b7a21a 100644 --- a/languages/cpp/app_templates/tdevlang/src-Makefile.am +++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp METASOURCES = AUTO diff --git a/languages/cpp/app_templates/kdevpart/CMakeLists.txt b/languages/cpp/app_templates/kdevpart/CMakeLists.txt new file mode 100644 index 00000000..53293ea9 --- /dev/null +++ b/languages/cpp/app_templates/kdevpart/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevpart.tar.gz ALL + COMMAND tar zcf kdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevpart_part.cpp kdevpart_part.h + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc + kdevpart.desktop app.tdevelop README.dox + globalconfigbase.ui globalconfig.h globalconfig.cpp + projectconfigbase.ui projectconfig.h projectconfig.cpp +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevpart.tar.gz kdevpart.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevpart.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart/Makefile.am b/languages/cpp/app_templates/kdevpart/Makefile.am index 6aa1f606..11c12dfe 100644 --- a/languages/cpp/app_templates/tdevpart/Makefile.am +++ b/languages/cpp/app_templates/kdevpart/Makefile.am @@ -1,14 +1,14 @@ -dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h \ - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc \ - tdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \ +dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h \ + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc \ + kdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \ globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp -templateName = tdevpart +templateName = kdevpart ### 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/cpp/app_templates/tdevpart/README.dox b/languages/cpp/app_templates/kdevpart/README.dox index 7069f3a5..7069f3a5 100644 --- a/languages/cpp/app_templates/tdevpart/README.dox +++ b/languages/cpp/app_templates/kdevpart/README.dox diff --git a/languages/cpp/app_templates/tdevpart/app.tdevelop b/languages/cpp/app_templates/kdevpart/app.tdevelop index 473da16e..d16492cd 100644 --- a/languages/cpp/app_templates/tdevpart/app.tdevelop +++ b/languages/cpp/app_templates/kdevpart/app.tdevelop @@ -14,16 +14,16 @@ <keyword>KDevelop</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -48,8 +48,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> -</tdevautoproject> - <tdevfileview> +</kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -57,8 +57,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -93,24 +93,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp index cddf3e7e..cddf3e7e 100644 --- a/languages/cpp/app_templates/tdevpart/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/globalconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h index 723dbae2..723dbae2 100644 --- a/languages/cpp/app_templates/tdevpart/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart/globalconfig.h diff --git a/languages/cpp/app_templates/tdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui index 588f9dc9..588f9dc9 100644 --- a/languages/cpp/app_templates/tdevpart/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart.desktop b/languages/cpp/app_templates/kdevpart/kdevpart.desktop index c3eb6a81..a3029ac6 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart.desktop +++ b/languages/cpp/app_templates/kdevpart/kdevpart.desktop @@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR} X-TDevelop-Args= X-TDevelop-Scope=%{SCOPE} -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 X-TDevelop-Properties=%{PROPS} diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate index 8bdb87e3..c1860597 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate +++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate @@ -58,7 +58,7 @@ Comment[zh_CN]=这将生成 TDevelop 的插件，该插件需要与 TDevelop 源 Comment[zh_TW]=產生一個 TDevelop 外掛程式，建立於 TDevelop 程式源碼樹內。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}part.cpp -Archive=tdevpart.tar.gz +Archive=kdevpart.tar.gz [SCOPE] Type = value @@ -142,28 +142,28 @@ Dest=%{dest}/Makefile.am [FILE3] Type=install -Source=%{src}/tdevpart_part.cpp +Source=%{src}/kdevpart_part.cpp Dest=%{dest}/%{APPNAMELC}part.cpp [FILE4] Type=install -Source=%{src}/tdevpart_part.h +Source=%{src}/kdevpart_part.h Dest=%{dest}/%{APPNAMELC}part.h [FILE5] Type=install -Source=%{src}/tdevpart_widget.cpp +Source=%{src}/kdevpart_widget.cpp Dest=%{dest}/%{APPNAMELC}widget.cpp [FILE6] Type=install -Source=%{src}/tdevpart_widget.h +Source=%{src}/kdevpart_widget.h Dest=%{dest}/%{APPNAMELC}widget.h [FILE7] Type=install EscapeXML=true -Source=%{src}/tdevpart_part.rc +Source=%{src}/kdevpart_part.rc Dest=%{dest}/kdev%{APPNAMELC}.rc [FILE71] @@ -200,7 +200,7 @@ Dest=%{dest}/%{APPNAMELC}projectconfig.cpp [FILE8] Type=install -Source=%{src}/tdevpart.desktop +Source=%{src}/kdevpart.desktop Dest=%{dest}/kdev%{APPNAMELC}.desktop [FILE9] diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.png b/languages/cpp/app_templates/kdevpart/kdevpart.png Binary files differindex 840a953c..840a953c 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart.png +++ b/languages/cpp/app_templates/kdevpart/kdevpart.png diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 0d846d38..aa950c8a 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -10,29 +10,29 @@ #include <kdialogbase.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <tdevplugininfo.h> -#include <tdevgenericfactory.h> +#include <kdevplugininfo.h> +#include <kdevgenericfactory.h> -#include <tdevcore.h> -#include <tdevmainwindow.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> #include <configwidgetproxy.h> #include "%{APPNAMELC}widget.h" #include "%{APPNAMELC}globalconfig.h" #include "%{APPNAMELC}projectconfig.h" -typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -TDevPluginInfo data("tdev%{APPNAMELC}"); -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); +typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +KDevPluginInfo data("kdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdev%{APPNAMELC}.rc"); + setXMLFile("kdev%{APPNAMELC}.rc"); m_widget = new %{APPNAME}Widget(this); m_widget->setCaption("widget caption"); @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h index 1d61dd0c..9414d448 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -2,7 +2,7 @@ #ifndef TDEV%{APPNAMEUC}_H #define TDEV%{APPNAMEUC}_H -#include <tdevplugin.h> +#include <kdevplugin.h> #include <tqguardedptr.h> @@ -16,7 +16,7 @@ class %{APPNAME}Widget; /** Please read the README.dox file for more info about this part */ -class %{APPNAME}Part: public TDevPlugin +class %{APPNAME}Part: public KDevPlugin { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.rc b/languages/cpp/app_templates/kdevpart/kdevpart_part.rc index a38ee14e..a38ee14e 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_part.rc +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.rc diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp index 1f356afd..65bb996e 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp @@ -5,7 +5,7 @@ #include <klibloader.h> #include <tdeparts/part.h> -#include <tdevcore.h> +#include <kdevcore.h> #include "%{APPNAMELC}part.h" diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e9762de3..e54abd4d 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -5,7 +5,7 @@ #include <tqwidget.h> #include <tqstring.h> -class TDevProject; +class KDevProject; class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget diff --git a/languages/cpp/app_templates/tdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp index 42a9f3e7..42a9f3e7 100644 --- a/languages/cpp/app_templates/tdevpart/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart/projectconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h index 49d4f089..49d4f089 100644 --- a/languages/cpp/app_templates/tdevpart/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart/projectconfig.h diff --git a/languages/cpp/app_templates/tdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui index 30849e54..30849e54 100644 --- a/languages/cpp/app_templates/tdevpart/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am index e082adff..5fe18f43 100644 --- a/languages/cpp/app_templates/tdevpart/src-Makefile.am +++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -libtdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \ +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \ %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp \ %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp diff --git a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt new file mode 100644 index 00000000..080603a8 --- /dev/null +++ b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt @@ -0,0 +1,30 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevpart2.tar.gz ALL + COMMAND tar zcf kdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevpart_part.cpp kdevpart_part.h + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc + kdevpart.desktop app.tdevelop kdevpart-configure.in.in + README.dox subdirs globalconfigbase.ui globalconfig.h + globalconfig.cpp projectconfigbase.ui projectconfig.h + projectconfig.cpp +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevpart2.tar.gz kdevpart2.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevpart2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart2/Makefile.am b/languages/cpp/app_templates/kdevpart2/Makefile.am index ae1df924..436f919c 100644 --- a/languages/cpp/app_templates/tdevpart2/Makefile.am +++ b/languages/cpp/app_templates/kdevpart2/Makefile.am @@ -1,16 +1,16 @@ -dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h\ - tdevpart_widget.h tdevpart_widget.cpp \ - tdevpart_part.rc tdevpart.desktop app.tdevelop \ - tdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \ +dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h\ + kdevpart_widget.h kdevpart_widget.cpp \ + kdevpart_part.rc kdevpart.desktop app.tdevelop \ + kdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \ globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp -templateName = tdevpart2 +templateName = kdevpart2 ### 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/cpp/app_templates/tdevpart2/README.dox b/languages/cpp/app_templates/kdevpart2/README.dox index 7069f3a5..7069f3a5 100644 --- a/languages/cpp/app_templates/tdevpart2/README.dox +++ b/languages/cpp/app_templates/kdevpart2/README.dox diff --git a/languages/cpp/app_templates/tdevpart2/app.tdevelop b/languages/cpp/app_templates/kdevpart2/app.tdevelop index ac470cdc..1b7aab6e 100644 --- a/languages/cpp/app_templates/tdevpart2/app.tdevelop +++ b/languages/cpp/app_templates/kdevpart2/app.tdevelop @@ -14,7 +14,7 @@ <keyword>KDevelop</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -46,8 +46,8 @@ <envvar value="1" name="WANT_AUTOMAKE_1_6" /> </envvars> </make> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -60,8 +60,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <showvcsfields>true</showvcsfields> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -96,21 +96,21 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <addoptions></addoptions> @@ -120,13 +120,13 @@ <revertoptions>-C -d -P</revertoptions> <diffoptions>-u3 -p</diffoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevcppsupport> + </kdevcvs> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -138,11 +138,11 @@ <codeCompletionDelay>250</codeCompletionDelay> <argumentsHintDelay>400</argumentsHintDelay> </codecompletion> - </tdevcppsupport> - <tdevdocumentation> + </kdevcppsupport> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp index cddf3e7e..cddf3e7e 100644 --- a/languages/cpp/app_templates/tdevpart2/globalconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h index 723dbae2..723dbae2 100644 --- a/languages/cpp/app_templates/tdevpart2/globalconfig.h +++ b/languages/cpp/app_templates/kdevpart2/globalconfig.h diff --git a/languages/cpp/app_templates/tdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui index 588f9dc9..588f9dc9 100644 --- a/languages/cpp/app_templates/tdevpart2/globalconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in index f08ae2b7..55f2f614 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in +++ b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in @@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION}) AC_C_BIGENDIAN AC_CHECK_TDEMAXPATHLEN -KDE_CHECK_HEADERS([tdevelop/interfaces/tdevcore.h]) +KDE_CHECK_HEADERS([tdevelop/interfaces/kdevcore.h]) KDE_CHECK_LIB([tdevelop],main, [LIBTDEVELOP="-ltdevelop"]) AC_SUBST(LIBTDEVELOP) diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.desktop b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop index c3eb6a81..a3029ac6 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart.desktop +++ b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop @@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR} X-TDevelop-Args= X-TDevelop-Scope=%{SCOPE} -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 X-TDevelop-Properties=%{PROPS} diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate index b0431099..5aeda5d1 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate +++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate @@ -60,7 +60,7 @@ Comment[zh_CN]=这将生成一个 TDevelop 的 KPart，可以在 TDevelop 源代 Comment[zh_TW]=產生一個 TDevelop 的 KPart 元件，建立在 TDevelop 程式源碼樹之外。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}_part.cpp -Archive=tdevpart2.tar.gz +Archive=kdevpart2.tar.gz [SCOPE] Type = value @@ -133,11 +133,11 @@ Default= [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install @@ -162,7 +162,7 @@ Dest=%{dest}/subdirs [FILE5] Type=install -Source=%{src}/tdevpart-configure.in.in +Source=%{src}/kdevpart-configure.in.in Dest=%{dest}/configure.in.in [MkDir1] @@ -176,7 +176,7 @@ Dest=%{dest}/src/Makefile.am [FILE7] Type=install -Source=%{src}/tdevpart_part.cpp +Source=%{src}/kdevpart_part.cpp Dest=%{dest}/src/%{APPNAMELC}part.cpp [FILE71] @@ -213,28 +213,28 @@ Dest=%{dest}/src/%{APPNAMELC}projectconfig.cpp [FILE8] Type=install -Source=%{src}/tdevpart_part.h +Source=%{src}/kdevpart_part.h Dest=%{dest}/src/%{APPNAMELC}part.h [FILE9] Type=install -Source=%{src}/tdevpart_widget.cpp +Source=%{src}/kdevpart_widget.cpp Dest=%{dest}/src/%{APPNAMELC}widget.cpp [FILE10] Type=install -Source=%{src}/tdevpart_widget.h +Source=%{src}/kdevpart_widget.h Dest=%{dest}/src/%{APPNAMELC}widget.h [FILE11] Type=install EscapeXML=true -Source=%{src}/tdevpart_part.rc +Source=%{src}/kdevpart_part.rc Dest=%{dest}/src/kdev%{APPNAMELC}.rc [FILE12] Type=install -Source=%{src}/tdevpart.desktop +Source=%{src}/kdevpart.desktop Dest=%{dest}/src/kdev%{APPNAMELC}.desktop [FILE13] diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart2.png b/languages/cpp/app_templates/kdevpart2/kdevpart2.png Binary files differindex 840a953c..840a953c 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart2.png +++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.png diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 0d846d38..aa950c8a 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -10,29 +10,29 @@ #include <kdialogbase.h> #include <kiconloader.h> #include <tdemessagebox.h> -#include <tdevplugininfo.h> -#include <tdevgenericfactory.h> +#include <kdevplugininfo.h> +#include <kdevgenericfactory.h> -#include <tdevcore.h> -#include <tdevmainwindow.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> #include <configwidgetproxy.h> #include "%{APPNAMELC}widget.h" #include "%{APPNAMELC}globalconfig.h" #include "%{APPNAMELC}projectconfig.h" -typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -TDevPluginInfo data("tdev%{APPNAMELC}"); -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); +typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +KDevPluginInfo data("kdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdev%{APPNAMELC}.rc"); + setXMLFile("kdev%{APPNAMELC}.rc"); m_widget = new %{APPNAME}Widget(this); m_widget->setCaption("widget caption"); @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 1d61dd0c..9414d448 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -2,7 +2,7 @@ #ifndef TDEV%{APPNAMEUC}_H #define TDEV%{APPNAMEUC}_H -#include <tdevplugin.h> +#include <kdevplugin.h> #include <tqguardedptr.h> @@ -16,7 +16,7 @@ class %{APPNAME}Widget; /** Please read the README.dox file for more info about this part */ -class %{APPNAME}Part: public TDevPlugin +class %{APPNAME}Part: public KDevPlugin { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.rc b/languages/cpp/app_templates/kdevpart2/kdevpart_part.rc index a38ee14e..a38ee14e 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_part.rc +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.rc diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp index 1f356afd..65bb996e 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp @@ -5,7 +5,7 @@ #include <klibloader.h> #include <tdeparts/part.h> -#include <tdevcore.h> +#include <kdevcore.h> #include "%{APPNAMELC}part.h" diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e9762de3..e54abd4d 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -5,7 +5,7 @@ #include <tqwidget.h> #include <tqstring.h> -class TDevProject; +class KDevProject; class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget diff --git a/languages/cpp/app_templates/tdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp index 42a9f3e7..42a9f3e7 100644 --- a/languages/cpp/app_templates/tdevpart2/projectconfig.cpp +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h index 49d4f089..49d4f089 100644 --- a/languages/cpp/app_templates/tdevpart2/projectconfig.h +++ b/languages/cpp/app_templates/kdevpart2/projectconfig.h diff --git a/languages/cpp/app_templates/tdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui index 30849e54..30849e54 100644 --- a/languages/cpp/app_templates/tdevpart2/projectconfigbase.ui +++ b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/src-Makefile.am b/languages/cpp/app_templates/kdevpart2/src-Makefile.am index 407d9565..c5995af4 100644 --- a/languages/cpp/app_templates/tdevpart2/src-Makefile.am +++ b/languages/cpp/app_templates/kdevpart2/src-Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) -libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) +libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp METASOURCES = AUTO diff --git a/languages/cpp/app_templates/tdevpart2/subdirs b/languages/cpp/app_templates/kdevpart2/subdirs index 0e678106..0e678106 100644 --- a/languages/cpp/app_templates/tdevpart2/subdirs +++ b/languages/cpp/app_templates/kdevpart2/subdirs diff --git a/languages/cpp/app_templates/khello/CMakeLists.txt b/languages/cpp/app_templates/khello/CMakeLists.txt index 3ed5e064..360e792e 100644 --- a/languages/cpp/app_templates/khello/CMakeLists.txt +++ b/languages/cpp/app_templates/khello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( khello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/khello.tar.gz khello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - khello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + khello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/khello/Makefile.am b/languages/cpp/app_templates/khello/Makefile.am index 49feb06a..56df4792 100644 --- a/languages/cpp/app_templates/khello/Makefile.am +++ b/languages/cpp/app_templates/khello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName = khello ### 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/cpp/app_templates/khello/app.tdevelop b/languages/cpp/app_templates/khello/app.tdevelop index 029288aa..9c25500e 100644 --- a/languages/cpp/app_templates/khello/app.tdevelop +++ b/languages/cpp/app_templates/khello/app.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -47,8 +47,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -56,8 +56,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/khello/khello.tdevtemplate b/languages/cpp/app_templates/khello/khello.kdevtemplate index 2bce3511..81d20c5a 100644 --- a/languages/cpp/app_templates/khello/khello.tdevtemplate +++ b/languages/cpp/app_templates/khello/khello.kdevtemplate @@ -68,11 +68,11 @@ Archive=khello.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/khello2/CMakeLists.txt b/languages/cpp/app_templates/khello2/CMakeLists.txt index 151fb079..8e9fdb9d 100644 --- a/languages/cpp/app_templates/khello2/CMakeLists.txt +++ b/languages/cpp/app_templates/khello2/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( khello2.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/khello2.tar.gz khello2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - khello2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + khello2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/khello2/Makefile.am b/languages/cpp/app_templates/khello2/Makefile.am index 96774e3b..14445170 100644 --- a/languages/cpp/app_templates/khello2/Makefile.am +++ b/languages/cpp/app_templates/khello2/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName = khello2 ### 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/cpp/app_templates/khello2/app.tdevelop b/languages/cpp/app_templates/khello2/app.tdevelop index b51226ee..a079670d 100644 --- a/languages/cpp/app_templates/khello2/app.tdevelop +++ b/languages/cpp/app_templates/khello2/app.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -47,8 +47,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -56,8 +56,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/khello2/khello2.tdevtemplate b/languages/cpp/app_templates/khello2/khello2.kdevtemplate index 66666212..b85e11fb 100644 --- a/languages/cpp/app_templates/khello2/khello2.tdevtemplate +++ b/languages/cpp/app_templates/khello2/khello2.kdevtemplate @@ -64,11 +64,11 @@ Archive=khello2.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kicker/CMakeLists.txt b/languages/cpp/app_templates/kicker/CMakeLists.txt index fba98f58..c1a1d7d5 100644 --- a/languages/cpp/app_templates/kicker/CMakeLists.txt +++ b/languages/cpp/app_templates/kicker/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( kicker.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kicker.tar.gz kicker.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kicker.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kicker.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kicker/Makefile.am b/languages/cpp/app_templates/kicker/Makefile.am index 254e5917..82095d72 100644 --- a/languages/cpp/app_templates/kicker/Makefile.am +++ b/languages/cpp/app_templates/kicker/Makefile.am @@ -3,10 +3,10 @@ dataFiles = applet.cpp applet.h applet.desktop applet.tdevelop \ templateName = kicker ### 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/cpp/app_templates/kicker/applet.tdevelop b/languages/cpp/app_templates/kicker/applet.tdevelop index 88bf952d..929b3c49 100644 --- a/languages/cpp/app_templates/kicker/applet.tdevelop +++ b/languages/cpp/app_templates/kicker/applet.tdevelop @@ -14,16 +14,16 @@ <keyword>Kicker</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -45,8 +45,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -54,8 +54,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kicker/kicker.tdevtemplate b/languages/cpp/app_templates/kicker/kicker.kdevtemplate index ba1252de..5185eb20 100644 --- a/languages/cpp/app_templates/kicker/kicker.tdevtemplate +++ b/languages/cpp/app_templates/kicker/kicker.kdevtemplate @@ -65,11 +65,11 @@ Archive=kicker.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kmake/Makefile.am b/languages/cpp/app_templates/kmake/Makefile.am index 35238c7e..b7bd96f9 100644 --- a/languages/cpp/app_templates/kmake/Makefile.am +++ b/languages/cpp/app_templates/kmake/Makefile.am @@ -2,10 +2,10 @@ dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview. templateName = kmake ### 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/cpp/app_templates/kmake/app.tdevelop b/languages/cpp/app_templates/kmake/app.tdevelop index ffcb6370..ba82ff4b 100644 --- a/languages/cpp/app_templates/kmake/app.tdevelop +++ b/languages/cpp/app_templates/kmake/app.tdevelop @@ -10,16 +10,16 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -30,8 +30,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -68,8 +68,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell/> <breakpoints/> @@ -84,28 +84,28 @@ <demanglenames>true</demanglenames> </display> <breakpoints/> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> + </kdevtrollproject> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> <type ext="ts" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kmake/kmake.tdevtemplate b/languages/cpp/app_templates/kmake/kmake.kdevtemplate index 7c2688d9..7c2688d9 100644 --- a/languages/cpp/app_templates/kmake/kmake.tdevtemplate +++ b/languages/cpp/app_templates/kmake/kmake.kdevtemplate diff --git a/languages/cpp/app_templates/kmod/CMakeLists.txt b/languages/cpp/app_templates/kmod/CMakeLists.txt index ff891946..af575a10 100644 --- a/languages/cpp/app_templates/kmod/CMakeLists.txt +++ b/languages/cpp/app_templates/kmod/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( kmod.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kmod.tar.gz kmod.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kmod.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kmod.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kmod/Makefile.am b/languages/cpp/app_templates/kmod/Makefile.am index bae9772c..f4b1ec98 100644 --- a/languages/cpp/app_templates/kmod/Makefile.am +++ b/languages/cpp/app_templates/kmod/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile kmod.tdevelop kmod-driver.c templateName = kmod ### 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/cpp/app_templates/kmod/kmod.tdevtemplate b/languages/cpp/app_templates/kmod/kmod.kdevtemplate index c47912f8..069d5103 100644 --- a/languages/cpp/app_templates/kmod/kmod.tdevtemplate +++ b/languages/cpp/app_templates/kmod/kmod.kdevtemplate @@ -66,7 +66,7 @@ Archive=kmod.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/kmod/kmod.tdevelop b/languages/cpp/app_templates/kmod/kmod.tdevelop index 55d6f2b6..6ce5f390 100644 --- a/languages/cpp/app_templates/kmod/kmod.tdevelop +++ b/languages/cpp/app_templates/kmod/kmod.tdevelop @@ -4,10 +4,10 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C</primarylanguage> <ignoreparts> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> <keywords> <keyword>C</keyword> @@ -15,13 +15,13 @@ <keyword>Kernel</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="Makefile" name="Build" /> <group pattern="*.c" name="Source" /> </groups> - </tdevfileview> - <tdevcustomproject> + </kdevfileview> + <kdevcustomproject> <envvars/> <build> <buildtool>make</buildtool> @@ -35,8 +35,8 @@ <envvars/> </make> <makeenvvars/> - </tdevcustomproject> - <tdevdoctreeview> + </kdevcustomproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -83,11 +83,11 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdocumentation> + </kdevdoctreeview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt index 460b3293..955225bc 100644 --- a/languages/cpp/app_templates/kofficepart/CMakeLists.txt +++ b/languages/cpp/app_templates/kofficepart/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( kopart.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kopart.tar.gz kopart.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kopart.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kopart.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kofficepart/Makefile.am b/languages/cpp/app_templates/kofficepart/Makefile.am index d602a552..a38746b1 100644 --- a/languages/cpp/app_templates/kofficepart/Makefile.am +++ b/languages/cpp/app_templates/kofficepart/Makefile.am @@ -7,10 +7,10 @@ dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \ templateName = kopart ### 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/cpp/app_templates/kofficepart/kopart.tdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate index 076b650a..0273e0ca 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.tdevtemplate +++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate @@ -63,11 +63,11 @@ Archive=kopart.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop index 7c4b0e4c..194157d7 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop +++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop @@ -14,16 +14,16 @@ <keyword>tdeioslave</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}part.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -45,15 +45,15 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -90,24 +90,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt index c683f536..e38fc279 100644 --- a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt +++ b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( konqnavpanel.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/konqnavpanel.tar.gz konqnavpanel.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - konqnavpanel.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + konqnavpanel.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/konqnavpanel/Makefile.am b/languages/cpp/app_templates/konqnavpanel/Makefile.am index a901456b..6fccbf38 100644 --- a/languages/cpp/app_templates/konqnavpanel/Makefile.am +++ b/languages/cpp/app_templates/konqnavpanel/Makefile.am @@ -4,10 +4,10 @@ dataFiles = konqnavpanel.cpp konqnavpanel.h konqnavpanel.desktop \ templateName = konqnavpanel ### 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/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate index 01a924df..e6f1a23e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate @@ -65,11 +65,11 @@ Archive=konqnavpanel.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop index 88bf952d..929b3c49 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop @@ -14,16 +14,16 @@ <keyword>Kicker</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -45,8 +45,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -54,8 +54,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt index ab0ed3b0..9f3d8119 100644 --- a/languages/cpp/app_templates/kpartapp/CMakeLists.txt +++ b/languages/cpp/app_templates/kpartapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kpartapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kpartapp.tar.gz kpartapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kpartapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kpartapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am index 45c41564..bfb8ceed 100644 --- a/languages/cpp/app_templates/kpartapp/Makefile.am +++ b/languages/cpp/app_templates/kpartapp/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app.cpp app.h app_part.cpp\ kpartapp.png app.tdevelop subdirs templateName = kpartapp ### 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/cpp/app_templates/kpartapp/app.tdevelop b/languages/cpp/app_templates/kpartapp/app.tdevelop index 56e6f467..a8628fe3 100644 --- a/languages/cpp/app_templates/kpartapp/app.tdevelop +++ b/languages/cpp/app_templates/kpartapp/app.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -47,8 +47,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> -</tdevautoproject> - <tdevfileview> +</kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -56,8 +56,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -92,24 +92,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate index 11aaaabb..773cc0d8 100644 --- a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate +++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate @@ -65,11 +65,11 @@ Archive=kpartapp.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt index a1d063b0..00f4c664 100644 --- a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kpartplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kpartplugin.tar.gz kpartplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kpartplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kpartplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kpartplugin/Makefile.am b/languages/cpp/app_templates/kpartplugin/Makefile.am index dd0a5612..057be667 100644 --- a/languages/cpp/app_templates/kpartplugin/Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \ templateName = kpartplugin ### 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/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate index dc3b3e04..59ca51d8 100644 --- a/languages/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate +++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate @@ -64,11 +64,11 @@ Archive=kpartplugin.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop index 2a61c8d5..c94ba886 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> -<tdevautoproject> +<kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -44,8 +44,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -53,8 +53,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -91,24 +91,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt index 2aa03b98..bf1be9f6 100644 --- a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt +++ b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( kscons_kxt.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kscons_kxt.tar.gz kscons_kxt.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kscons_kxt.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kscons_kxt.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_kxt/Makefile.am b/languages/cpp/app_templates/kscons_kxt/Makefile.am index 5f00c212..59a58ee1 100644 --- a/languages/cpp/app_templates/kscons_kxt/Makefile.am +++ b/languages/cpp/app_templates/kscons_kxt/Makefile.am @@ -7,10 +7,10 @@ QUICKSTART INSTALL README templateName= kscons_kxt ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kscons_kxt/app.tdevelop b/languages/cpp/app_templates/kscons_kxt/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.tdevelop +++ b/languages/cpp/app_templates/kscons_kxt/app.tdevelop @@ -17,16 +17,16 @@ <description/> <ignoreparts/> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -62,8 +62,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -75,8 +75,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -111,8 +111,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -126,16 +126,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -144,7 +144,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -156,14 +156,14 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate index fd709e79..20d35070 100644 --- a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate +++ b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate @@ -65,7 +65,7 @@ Archive=kscons_kxt.tar.gz [SCONS] Type=include -File=%{tdevelop}/template-common/scons.tdevtemplate +File=%{tdevelop}/template-common/scons.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt index d8af0f23..c05f1bb1 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt +++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt @@ -22,9 +22,9 @@ add_custom_target( kscons_tdemdi.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kscons_tdemdi.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kscons_tdemdi.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am index b51e2bdb..191ea8ee 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am +++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am @@ -7,10 +7,10 @@ app_part.cpp app_part.h app_part.rc app_shell.rc templateName= kscons_tdemdi ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop +++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop @@ -17,16 +17,16 @@ <description/> <ignoreparts/> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -62,8 +62,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -75,8 +75,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -111,8 +111,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -126,16 +126,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -144,7 +144,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -156,14 +156,14 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate index 4b71d06c..2a297d60 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate +++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate @@ -64,7 +64,7 @@ Archive=kscons_tdemdi.tar.gz [SCONS] Type=include -File=%{tdevelop}/template-common/scons.tdevtemplate +File=%{tdevelop}/template-common/scons.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kxt/CMakeLists.txt b/languages/cpp/app_templates/kxt/CMakeLists.txt index c7de3e19..4b203750 100644 --- a/languages/cpp/app_templates/kxt/CMakeLists.txt +++ b/languages/cpp/app_templates/kxt/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( kxt.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kxt.tar.gz kxt.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kxt.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kxt.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kxt/Makefile.am b/languages/cpp/app_templates/kxt/Makefile.am index 96333456..8321742a 100644 --- a/languages/cpp/app_templates/kxt/Makefile.am +++ b/languages/cpp/app_templates/kxt/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName= kxt ### 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/cpp/app_templates/kxt/app.tdevelop b/languages/cpp/app_templates/kxt/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kxt/app.tdevelop +++ b/languages/cpp/app_templates/kxt/app.tdevelop @@ -17,16 +17,16 @@ <description/> <ignoreparts/> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -62,8 +62,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -75,8 +75,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -111,8 +111,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -126,16 +126,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -144,7 +144,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -156,14 +156,14 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/kxt/kxt.tdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate index 7b6583f1..79789759 100644 --- a/languages/cpp/app_templates/kxt/kxt.tdevtemplate +++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate @@ -67,11 +67,11 @@ Archive=kxt.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/makefileempty/CMakeLists.txt b/languages/cpp/app_templates/makefileempty/CMakeLists.txt index 25f86b01..48a6e3dd 100644 --- a/languages/cpp/app_templates/makefileempty/CMakeLists.txt +++ b/languages/cpp/app_templates/makefileempty/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( makefileempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/makefileempty.tar.gz makefileempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - makefileempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + makefileempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/makefileempty/Makefile.am b/languages/cpp/app_templates/makefileempty/Makefile.am index 60035c3d..ec381a04 100644 --- a/languages/cpp/app_templates/makefileempty/Makefile.am +++ b/languages/cpp/app_templates/makefileempty/Makefile.am @@ -3,10 +3,10 @@ dataFiles = makefileempty-Makefile \ templateName = makefileempty ### 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/cpp/app_templates/makefileempty/app.tdevelop b/languages/cpp/app_templates/makefileempty/app.tdevelop index e3b8de97..da576369 100644 --- a/languages/cpp/app_templates/makefileempty/app.tdevelop +++ b/languages/cpp/app_templates/makefileempty/app.tdevelop @@ -4,14 +4,14 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <keywords> <keyword>C++</keyword> <keyword>Code</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> </general> <run> @@ -33,8 +33,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -79,23 +79,23 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="cpp"/> <type ext="h"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> </groups> - </tdevfileview> - <tdevdocumentation> + </kdevfileview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate index 97c3f238..b69317d7 100644 --- a/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate +++ b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate @@ -53,7 +53,7 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE2] Type=install diff --git a/languages/cpp/app_templates/noatunui/CMakeLists.txt b/languages/cpp/app_templates/noatunui/CMakeLists.txt index 698684c1..332a960a 100644 --- a/languages/cpp/app_templates/noatunui/CMakeLists.txt +++ b/languages/cpp/app_templates/noatunui/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( noatunui.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/noatunui.tar.gz noatunui.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - noatunui.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + noatunui.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/noatunui/Makefile.am b/languages/cpp/app_templates/noatunui/Makefile.am index d72a928d..a222f235 100644 --- a/languages/cpp/app_templates/noatunui/Makefile.am +++ b/languages/cpp/app_templates/noatunui/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_impl.cpp plugin_impl.h \ templateName = noatunui ### 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/cpp/app_templates/noatunui/noatunui.tdevtemplate b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate index 3324640f..a91349c3 100644 --- a/languages/cpp/app_templates/noatunui/noatunui.tdevtemplate +++ b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate @@ -63,11 +63,11 @@ Archive=noatunui.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/noatunui/plugin.tdevelop b/languages/cpp/app_templates/noatunui/plugin.tdevelop index bc17550d..66986f2a 100644 --- a/languages/cpp/app_templates/noatunui/plugin.tdevelop +++ b/languages/cpp/app_templates/noatunui/plugin.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> -<tdevautoproject> +<kdevautoproject> <general> <activetarget>src/noatun_%{APPNAMELC}plugin.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -44,8 +44,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -53,8 +53,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -88,24 +88,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt index adac7be4..8b5668ec 100644 --- a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt +++ b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( noatunvisual.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/noatunvisual.tar.gz noatunvisual.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - noatunvisual.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + noatunvisual.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/noatunvisual/Makefile.am b/languages/cpp/app_templates/noatunvisual/Makefile.am index e32b274e..d7466e24 100644 --- a/languages/cpp/app_templates/noatunvisual/Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h plugin_impl.cpp \ templateName = noatunvisual ### 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/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate index 0a91ba64..c747925c 100644 --- a/languages/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate +++ b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate @@ -67,11 +67,11 @@ Archive=noatunvisual.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop index 6833abad..78193361 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop +++ b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> -<tdevautoproject> +<kdevautoproject> <general> <activetarget>src/noatun_%{APPNAMELC}plugin.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -49,8 +49,8 @@ <ldflags>-lSDL</ldflags> </default> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -58,8 +58,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -95,24 +95,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt index 45dc1b61..4f2b2824 100644 --- a/languages/cpp/app_templates/opieapp/CMakeLists.txt +++ b/languages/cpp/app_templates/opieapp/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieapp.tar.gz opieapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieapp/Makefile.am b/languages/cpp/app_templates/opieapp/Makefile.am index 854f4c54..10a1f2a1 100644 --- a/languages/cpp/app_templates/opieapp/Makefile.am +++ b/languages/cpp/app_templates/opieapp/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Example.png app.tdevelop example.desktop Makefile.am \ templateName = opieapp ### 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/cpp/app_templates/opieapp/app.tdevelop b/languages/cpp/app_templates/opieapp/app.tdevelop index 94c86a45..9bdb127e 100644 --- a/languages/cpp/app_templates/opieapp/app.tdevelop +++ b/languages/cpp/app_templates/opieapp/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>true</quick_app> </opie> @@ -93,15 +93,15 @@ <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -120,11 +120,11 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -133,11 +133,11 @@ <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opieapp/opieapp.tdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate index fc492b55..fc492b55 100644 --- a/languages/cpp/app_templates/opieapp/opieapp.tdevtemplate +++ b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate diff --git a/languages/cpp/app_templates/opieapplet/CMakeLists.txt b/languages/cpp/app_templates/opieapplet/CMakeLists.txt index 6c8edbbe..e4dc42f0 100644 --- a/languages/cpp/app_templates/opieapplet/CMakeLists.txt +++ b/languages/cpp/app_templates/opieapplet/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieapplet.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieapplet.tar.gz opieapplet.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieapplet.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieapplet.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieapplet/Makefile.am b/languages/cpp/app_templates/opieapplet/Makefile.am index 845411c7..6bbb09ac 100644 --- a/languages/cpp/app_templates/opieapplet/Makefile.am +++ b/languages/cpp/app_templates/opieapplet/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opieapplet ### 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/cpp/app_templates/opieapplet/app.tdevelop b/languages/cpp/app_templates/opieapplet/app.tdevelop index da3b91d4..c5544656 100644 --- a/languages/cpp/app_templates/opieapplet/app.tdevelop +++ b/languages/cpp/app_templates/opieapplet/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>true</quick_app> </opie> @@ -108,15 +108,15 @@ fi <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -135,11 +135,11 @@ fi <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -148,11 +148,11 @@ fi <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate index e6cec5eb..e6cec5eb 100644 --- a/languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate +++ b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate diff --git a/languages/cpp/app_templates/opieinput/CMakeLists.txt b/languages/cpp/app_templates/opieinput/CMakeLists.txt index 5246ccdb..f7bba492 100644 --- a/languages/cpp/app_templates/opieinput/CMakeLists.txt +++ b/languages/cpp/app_templates/opieinput/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieinput.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieinput.tar.gz opieinput.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieinput.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieinput.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieinput/Makefile.am b/languages/cpp/app_templates/opieinput/Makefile.am index fee564a7..9a3e5ffd 100644 --- a/languages/cpp/app_templates/opieinput/Makefile.am +++ b/languages/cpp/app_templates/opieinput/Makefile.am @@ -3,10 +3,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opieinput ### 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/cpp/app_templates/opieinput/app.tdevelop b/languages/cpp/app_templates/opieinput/app.tdevelop index 9a81ebba..cc61122f 100644 --- a/languages/cpp/app_templates/opieinput/app.tdevelop +++ b/languages/cpp/app_templates/opieinput/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>false</quick_app> </opie> @@ -109,15 +109,15 @@ fi <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -136,11 +136,11 @@ fi <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -149,11 +149,11 @@ fi <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opieinput/opieinput.tdevtemplate b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate index 19b721bf..19b721bf 100644 --- a/languages/cpp/app_templates/opieinput/opieinput.tdevtemplate +++ b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate diff --git a/languages/cpp/app_templates/opiemenu/CMakeLists.txt b/languages/cpp/app_templates/opiemenu/CMakeLists.txt index 12eedcdc..c321604c 100644 --- a/languages/cpp/app_templates/opiemenu/CMakeLists.txt +++ b/languages/cpp/app_templates/opiemenu/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opiemenu.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opiemenu.tar.gz opiemenu.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opiemenu.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opiemenu.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opiemenu/Makefile.am b/languages/cpp/app_templates/opiemenu/Makefile.am index 91d1c2ba..343a2bfa 100644 --- a/languages/cpp/app_templates/opiemenu/Makefile.am +++ b/languages/cpp/app_templates/opiemenu/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opiemenu ### 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/cpp/app_templates/opiemenu/app.tdevelop b/languages/cpp/app_templates/opiemenu/app.tdevelop index da3b91d4..c5544656 100644 --- a/languages/cpp/app_templates/opiemenu/app.tdevelop +++ b/languages/cpp/app_templates/opiemenu/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>true</quick_app> </opie> @@ -108,15 +108,15 @@ fi <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -135,11 +135,11 @@ fi <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -148,11 +148,11 @@ fi <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate index 204cf5d8..204cf5d8 100644 --- a/languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate +++ b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate diff --git a/languages/cpp/app_templates/opienet/CMakeLists.txt b/languages/cpp/app_templates/opienet/CMakeLists.txt index 19c969d3..a08e71be 100644 --- a/languages/cpp/app_templates/opienet/CMakeLists.txt +++ b/languages/cpp/app_templates/opienet/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( opienet.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opienet.tar.gz opienet.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opienet.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opienet.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opienet/Makefile.am b/languages/cpp/app_templates/opienet/Makefile.am index d23c835b..5245c17e 100644 --- a/languages/cpp/app_templates/opienet/Makefile.am +++ b/languages/cpp/app_templates/opienet/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opienet ### 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/cpp/app_templates/opienet/app.tdevelop b/languages/cpp/app_templates/opienet/app.tdevelop index 1292af0e..7717a098 100644 --- a/languages/cpp/app_templates/opienet/app.tdevelop +++ b/languages/cpp/app_templates/opienet/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>false</quick_app> </opie> @@ -93,15 +93,15 @@ <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -120,11 +120,11 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -133,11 +133,11 @@ <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opienet/opienet.tdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate index 23223d28..23223d28 100644 --- a/languages/cpp/app_templates/opienet/opienet.tdevtemplate +++ b/languages/cpp/app_templates/opienet/opienet.kdevtemplate diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt index 2f9e0dd1..6c7c4d66 100644 --- a/languages/cpp/app_templates/opietoday/CMakeLists.txt +++ b/languages/cpp/app_templates/opietoday/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( opietoday.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opietoday.tar.gz opietoday.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opietoday.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opietoday.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opietoday/Makefile.am b/languages/cpp/app_templates/opietoday/Makefile.am index 8c9ec514..6c999369 100644 --- a/languages/cpp/app_templates/opietoday/Makefile.am +++ b/languages/cpp/app_templates/opietoday/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro exampleplugin.cpp \ templateName = opietoday ### 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/cpp/app_templates/opietoday/app.tdevelop b/languages/cpp/app_templates/opietoday/app.tdevelop index 043326d3..c387911b 100644 --- a/languages/cpp/app_templates/opietoday/app.tdevelop +++ b/languages/cpp/app_templates/opietoday/app.tdevelop @@ -13,7 +13,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -24,8 +24,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>gtk</toc> <toc>gnustep</toc> @@ -52,8 +52,8 @@ <toc>libbonobo</toc> <toc>libbonoboui</toc> </ignoredevhelp> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs>-qws</programargs> @@ -66,8 +66,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <opie> <quick_app>false</quick_app> </opie> @@ -93,15 +93,15 @@ <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -120,11 +120,11 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -133,11 +133,11 @@ <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate index 91bb39be..91bb39be 100644 --- a/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate +++ b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate diff --git a/languages/cpp/app_templates/prc-tool/Makefile.am b/languages/cpp/app_templates/prc-tool/Makefile.am index ee4e2182..06f097a4 100644 --- a/languages/cpp/app_templates/prc-tool/Makefile.am +++ b/languages/cpp/app_templates/prc-tool/Makefile.am @@ -3,10 +3,10 @@ dataFiles = prc-tool.png src-Makefile prc-tool.tdevelop callback.h \ templateName = prc-tool ### 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/cpp/app_templates/prc-tool/prc-tool.tdevtemplate b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate index 23b0013e..8cfea15f 100644 --- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevtemplate +++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate @@ -65,7 +65,7 @@ Archive=prc-tool.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop index cb31f8a1..9015718f 100644 --- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop +++ b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop @@ -4,23 +4,23 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C</primarylanguage> <ignoreparts> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> <keywords> <keyword>C</keyword> <keyword>PalmOS</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="Makefile" name="Build" /> <group pattern="*.c" name="Source" /> </groups> - </tdevfileview> -<tdevcustomproject> + </kdevfileview> +<kdevcustomproject> <run> <mainprogram>make test</mainprogram> <programargs/> @@ -40,12 +40,12 @@ <envvars/> </make> <makeenvvars/> - </tdevcustomproject> + </kdevcustomproject> - <tdevdocumentation> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt index f23ed602..4af3dc73 100644 --- a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qmakeapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakeapp.tar.gz qmakeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakeapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakeapp/Makefile.am b/languages/cpp/app_templates/qmakeapp/Makefile.am index 11a39e79..233717d7 100644 --- a/languages/cpp/app_templates/qmakeapp/Makefile.am +++ b/languages/cpp/app_templates/qmakeapp/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.tdevelop \ templateName = qmakeapp ### 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/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate index b89e8a52..b89e8a52 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop index 04ec68cb..48a9bd99 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop @@ -10,7 +10,7 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -21,18 +21,18 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevcppsupport> + </kdevfileview> + <kdevcppsupport> <qt> <used>true</used> <version>3</version> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> <root>%{QTDIR}</root> <qmake>%{QMAKE}</qmake> </qt> - </tdevcppsupport> - <tdevdoctreeview> + </kdevcppsupport> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -69,8 +69,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell/> <breakpoints/> @@ -85,28 +85,28 @@ <demanglenames>true</demanglenames> </display> <breakpoints/> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> + </kdevtrollproject> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> <type ext="ts" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt index f8bba7c6..bc109590 100644 --- a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( qmakeempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakeempty.tar.gz qmakeempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakeempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakeempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakeempty/Makefile.am b/languages/cpp/app_templates/qmakeempty/Makefile.am index 2eb31a4f..9d62ad0a 100644 --- a/languages/cpp/app_templates/qmakeempty/Makefile.am +++ b/languages/cpp/app_templates/qmakeempty/Makefile.am @@ -4,10 +4,10 @@ dataFiles = qmakeempty.tdevelop \ templateName = qmakeempty ### 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/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate index 19c03688..19c03688 100644 --- a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate +++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop +++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop @@ -10,7 +10,7 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -21,8 +21,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevcppsupport> + </kdevfileview> + <kdevcppsupport> <qt> <used>true</used> <version>4</version> @@ -31,8 +31,8 @@ <qmake>%{QMAKE}</qmake> <designer>%{DESIGNER}</designer> </qt> - </tdevcppsupport> - <tdevdoctreeview> + </kdevcppsupport> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -69,8 +69,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell/> <breakpoints/> @@ -85,17 +85,17 @@ <demanglenames>true</demanglenames> </display> <breakpoints/> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> + </kdevtrollproject> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> @@ -103,11 +103,11 @@ <type ext="ts" /> <type ext="qrc" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt index 71d9301b..64b3b0bd 100644 --- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( qmakesimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakesimple.tar.gz qmakesimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakesimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakesimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am index 728d63ba..ac17219f 100644 --- a/languages/cpp/app_templates/qmakesimple/Makefile.am +++ b/languages/cpp/app_templates/qmakesimple/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro templateName = qmakesimple ### 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/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.tdevelop index a8e39ca6..2af4f7ad 100644 --- a/languages/cpp/app_templates/qmakesimple/app.tdevelop +++ b/languages/cpp/app_templates/qmakesimple/app.tdevelop @@ -10,25 +10,25 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> <group pattern="*.png" name="Icons" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevcppsupport> + </kdevfileview> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> <root>%{QTDIR}</root> <qmake>%{QMAKE}</qmake> </qt> - </tdevcppsupport> - <tdevdoctreeview> + </kdevcppsupport> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -66,8 +66,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <programargs></programargs> <gdbpath>/usr/bin/gdb</gdbpath> @@ -76,25 +76,25 @@ <floatingtoolbar>false</floatingtoolbar> <dbgshell/> </general> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> <type ext="ts" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate index 8f2dbee7..8f2dbee7 100644 --- a/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate +++ b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt index d1aee7bd..7ec55256 100644 --- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt +++ b/languages/cpp/app_templates/qt4hello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( qt4hello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qt4hello.tar.gz qt4hello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qt4hello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qt4hello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am index 20edc902..3f735466 100644 --- a/languages/cpp/app_templates/qt4hello/Makefile.am +++ b/languages/cpp/app_templates/qt4hello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp qt4hello.png qt4hello.tdevelop \ templateName = qt4hello ### 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/cpp/app_templates/qt4hello/qt4hello.tdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate index 2ea95b83..2ea95b83 100644 --- a/languages/cpp/app_templates/qt4hello/qt4hello.tdevtemplate +++ b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop +++ b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop @@ -10,7 +10,7 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -21,8 +21,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevcppsupport> + </kdevfileview> + <kdevcppsupport> <qt> <used>true</used> <version>4</version> @@ -31,8 +31,8 @@ <qmake>%{QMAKE}</qmake> <designer>%{DESIGNER}</designer> </qt> - </tdevcppsupport> - <tdevdoctreeview> + </kdevcppsupport> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -69,8 +69,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell/> <breakpoints/> @@ -85,17 +85,17 @@ <demanglenames>true</demanglenames> </display> <breakpoints/> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> + </kdevtrollproject> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> @@ -103,11 +103,11 @@ <type ext="ts" /> <type ext="qrc" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt index 5fe14da0..422740dc 100644 --- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( qt4makeapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qt4makeapp.tar.gz qt4makeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qt4makeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qt4makeapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am index 265a5cd9..68f78acb 100644 --- a/languages/cpp/app_templates/qt4makeapp/Makefile.am +++ b/languages/cpp/app_templates/qt4makeapp/Makefile.am @@ -5,10 +5,10 @@ dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.tdeve templateName = qt4makeapp ### 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/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate index 1aea3b21..1aea3b21 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop @@ -10,7 +10,7 @@ <keyword>Qt</keyword> </keywords> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -21,8 +21,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevcppsupport> + </kdevfileview> + <kdevcppsupport> <qt> <used>true</used> <version>4</version> @@ -31,8 +31,8 @@ <qmake>%{QMAKE}</qmake> <designer>%{DESIGNER}</designer> </qt> - </tdevcppsupport> - <tdevdoctreeview> + </kdevcppsupport> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -69,8 +69,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell/> <breakpoints/> @@ -85,17 +85,17 @@ <demanglenames>true</demanglenames> </display> <breakpoints/> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <run> <mainprogram>./bin/%{APPNAMELC}</mainprogram> <programargs/> </run> - </tdevtrollproject> + </kdevtrollproject> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> @@ -103,11 +103,11 @@ <type ext="ts" /> <type ext="qrc" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt index ef38e012..57849362 100644 --- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt +++ b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qtopia4app.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtopia4app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtopia4app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am index 8dcaa585..324291bb 100644 --- a/languages/cpp/app_templates/qtopia4app/Makefile.am +++ b/languages/cpp/app_templates/qtopia4app/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.desktop \ templateName = qtopia4app ### 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 -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/qtopia4app/app.tdevelop b/languages/cpp/app_templates/qtopia4app/app.tdevelop index 320ae4d7..b890135e 100644 --- a/languages/cpp/app_templates/qtopia4app/app.tdevelop +++ b/languages/cpp/app_templates/qtopia4app/app.tdevelop @@ -11,7 +11,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -22,8 +22,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -61,8 +61,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs></programargs> @@ -75,8 +75,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <general> <activedir></activedir> </general> @@ -105,11 +105,11 @@ <envvar value="$PATH:/opt/Qtopia/SDK/scripts:/opt/Qtopia/SDK/4.2.4/x86/bin:/opt/Qtopia/SDK/4.2.4/x86/scripts" name="PATH" /> </envvars> </make> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes/> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -128,11 +128,11 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -141,14 +141,14 @@ <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> - <tdevcppsupport> + </kdevdocumentation> + <kdevcppsupport> <qt> <used>true</used> <version>4</version> @@ -159,5 +159,5 @@ <designer>/opt/Qtopia/SDK/4.2.4/x86/bin/designer</designer> <designerpluginpaths/> </qt> - </tdevcppsupport> + </kdevcppsupport> </tdevelop> diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate index e6a7ec9e..e6a7ec9e 100644 --- a/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate +++ b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate diff --git a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt index 74826ef3..424d19bc 100644 --- a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qtopiaapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtopiaapp.tar.gz qtopiaapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtopiaapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtopiaapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qtopiaapp/Makefile.am b/languages/cpp/app_templates/qtopiaapp/Makefile.am index 342e2a96..afaaf294 100644 --- a/languages/cpp/app_templates/qtopiaapp/Makefile.am +++ b/languages/cpp/app_templates/qtopiaapp/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.control example.desktop \ templateName = qtopiaapp ### 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/cpp/app_templates/qtopiaapp/app.tdevelop b/languages/cpp/app_templates/qtopiaapp/app.tdevelop index 67916b05..962f4622 100644 --- a/languages/cpp/app_templates/qtopiaapp/app.tdevelop +++ b/languages/cpp/app_templates/qtopiaapp/app.tdevelop @@ -11,7 +11,7 @@ </keywords> <ignoreparts/> </general> - <tdevfileview> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -22,8 +22,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -61,8 +61,8 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs></programargs> @@ -75,8 +75,8 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevtrollproject> + </kdevdebugger> + <kdevtrollproject> <general> <activedir></activedir> </general> @@ -85,11 +85,11 @@ <programargs>-qws</programargs> </run> <envvars/> - </tdevtrollproject> - <tdevfilecreate> + </kdevtrollproject> + <kdevfilecreate> <filetypes/> <useglobaltypes/> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <codecompletion> <codehinting outputview="1" enablech="0" selectview="0" /> @@ -108,11 +108,11 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevcvs> + </kdevclassview> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions></commitoptions> <updateoptions>-dP</updateoptions> @@ -121,11 +121,11 @@ <diffoptions>-u3 -p</diffoptions> <logoptions></logoptions> <rshoptions></rshoptions> - </tdevcvs> - <tdevdocumentation> + </kdevcvs> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate index 5c7dcc36..5c7dcc36 100644 --- a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate +++ b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate diff --git a/languages/cpp/app_templates/tde4app/CMakeLists.txt b/languages/cpp/app_templates/tde4app/CMakeLists.txt deleted file mode 100644 index 29997b2c..00000000 --- a/languages/cpp/app_templates/tde4app/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tde4app.tar.gz ALL - COMMAND tar zcf tde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp - tdeapp4view.h tdeapp4view_base.ui main.cpp tde4appui.rc - tde4app-CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg - settings.kcfgc tde4app.png README tde4app.tdevelop - tde4app.tdevelop.filelist -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tde4app.tar.gz tde4app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tde4app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tde4app/Makefile.am b/languages/cpp/app_templates/tde4app/Makefile.am deleted file mode 100644 index 3fc82b7a..00000000 --- a/languages/cpp/app_templates/tde4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp tdeapp4view.h tdeapp4view_base.ui \ - main.cpp tde4appui.rc CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg settings.kcfgc \ - tde4app.png README tde4app.tdevelop tde4app.tdevelop.filelist - -templateName = tde4app - -### no need to change below: -template_DATA = $(templateName).tdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/tdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt index 40e12016..072f5f5e 100644 --- a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt +++ b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( tdecmodule.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdecmodule.tar.gz tdecmodule.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdecmodule.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdecmodule.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdecmodule/Makefile.am b/languages/cpp/app_templates/tdecmodule/Makefile.am index 0938012d..b3b19611 100644 --- a/languages/cpp/app_templates/tdecmodule/Makefile.am +++ b/languages/cpp/app_templates/tdecmodule/Makefile.am @@ -3,10 +3,10 @@ dataFiles = module.cpp module.h module.desktop module.tdevelop \ templateName = tdecmodule ### 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/cpp/app_templates/tdecmodule/module.tdevelop b/languages/cpp/app_templates/tdecmodule/module.tdevelop index 4f2d0606..7b5a57c0 100644 --- a/languages/cpp/app_templates/tdecmodule/module.tdevelop +++ b/languages/cpp/app_templates/tdecmodule/module.tdevelop @@ -13,15 +13,15 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> - <tdevautoproject> + </kdevcppsupport> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -43,8 +43,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -52,8 +52,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -90,24 +90,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate index 06d6657a..f646c242 100644 --- a/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate +++ b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate @@ -69,11 +69,11 @@ Archive=tdecmodule.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt index 1025eb0b..32dd830c 100644 --- a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( tdeconfig35.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdeconfig35.tar.gz tdeconfig35.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeconfig35.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdeconfig35.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am index dc6c56d1..a172f05f 100644 --- a/languages/cpp/app_templates/tdeconfig35/Makefile.am +++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName= tdeconfig35 ### 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/cpp/app_templates/tdeconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.tdevelop index e1523988..6a53f237 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.tdevelop +++ b/languages/cpp/app_templates/tdeconfig35/app.tdevelop @@ -17,15 +17,15 @@ <description/> <ignoreparts/> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> - <tdevautoproject> + </kdevcppsupport> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -61,8 +61,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -74,8 +74,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -110,8 +110,8 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> <programargs/> @@ -125,16 +125,16 @@ <staticmembers>false</staticmembers> <demanglenames>true</demanglenames> </display> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcvs> + </kdevfilecreate> + <kdevcvs> <cvsoptions>-f</cvsoptions> <commitoptions/> <updateoptions>-dP</updateoptions> @@ -143,7 +143,7 @@ <diffoptions>-u3 -p</diffoptions> <logoptions/> <rshoptions/> - </tdevcvs> + </kdevcvs> <cppsupportpart> <codecompletion/> <filetemplates> @@ -155,14 +155,14 @@ <lowercasefilenames>true</lowercasefilenames> </filetemplates> </cppsupportpart> - <tdevclassview> + <kdevclassview> <folderhierarchy>true</folderhierarchy> <depthoffolders>2</depthoffolders> - </tdevclassview> - <tdevdocumentation> + </kdevclassview> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate index 485b9eb9..b9edfb7a 100644 --- a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate +++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate @@ -52,11 +52,11 @@ Archive=tdeconfig35.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt index d6998c33..5462742c 100644 --- a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( tdefileplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdefileplugin.tar.gz tdefileplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdefileplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdefileplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdefileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am index 2896e774..019d2d7c 100644 --- a/languages/cpp/app_templates/tdefileplugin/Makefile.am +++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am @@ -4,10 +4,10 @@ dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \ templateName = tdefileplugin ### 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/cpp/app_templates/tdefileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop index cb6caa43..f09030c1 100644 --- a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop @@ -13,16 +13,16 @@ <keyword>TDE</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> -<tdevautoproject> +<kdevautoproject> <general> <activetarget>src/tdefile_%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -44,8 +44,8 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -53,8 +53,8 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -91,24 +91,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate index 4ef025de..2e53acc7 100644 --- a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate +++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate @@ -65,11 +65,11 @@ Archive=tdefileplugin.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt index 730f65e2..584bdc19 100644 --- a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( tdeioslave.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeioslave.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdeioslave.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am index 003040b4..bee7ddb6 100644 --- a/languages/cpp/app_templates/tdeioslave/Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/Makefile.am @@ -3,10 +3,10 @@ dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \ templateName = tdeioslave ### 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/cpp/app_templates/tdeioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop index 5cbbe5e0..cb257385 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.tdevelop +++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop @@ -14,16 +14,16 @@ <keyword>tdeioslave</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -45,15 +45,15 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -91,23 +91,23 @@ <toc>Qt Designer Manual</toc> <toc>Qt Reference Documentation</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate index 6ced25c6..2ff27786 100644 --- a/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate +++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate @@ -56,11 +56,11 @@ Archive=tdeioslave.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt index eae96197..b1149d88 100644 --- a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt +++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( tdescreensaver.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdescreensaver.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdescreensaver.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am index 1f9e6179..bee93bbc 100644 --- a/languages/cpp/app_templates/tdescreensaver/Makefile.am +++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am @@ -5,10 +5,10 @@ dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \ templateName= tdescreensaver ### 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/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate index 0500fdd5..91510f04 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate @@ -68,11 +68,11 @@ Archive=tdescreensaver.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop index c3ae15db..28e0a678 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop @@ -14,16 +14,16 @@ <keyword>tdeioslave</keyword> </keywords> </general> - <tdevcppsupport> + <kdevcppsupport> <qt> <version>3</version> <used>true</used> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> </qt> - </tdevcppsupport> + </kdevcppsupport> -<tdevautoproject> +<kdevautoproject> <general> <activetarget>src/lib%{APPNAMELC}.la</activetarget> <useconfiguration>debug</useconfiguration> @@ -45,15 +45,15 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -90,24 +90,24 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/tdevlang/CMakeLists.txt b/languages/cpp/app_templates/tdevlang/CMakeLists.txt deleted file mode 100644 index a5768a94..00000000 --- a/languages/cpp/app_templates/tdevlang/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevlang.tar.gz ALL - COMMAND tar zcf tdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevlang_part.cpp tdevlang_part.h - tdevlang.rc tdevlang.desktop app.tdevelop - tdevlang-configure.in.in README.dox -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevlang.tar.gz tdevlang.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevlang.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart/CMakeLists.txt b/languages/cpp/app_templates/tdevpart/CMakeLists.txt deleted file mode 100644 index e952ce8a..00000000 --- a/languages/cpp/app_templates/tdevpart/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevpart.tar.gz ALL - COMMAND tar zcf tdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevpart_part.cpp tdevpart_part.h - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc - tdevpart.desktop app.tdevelop README.dox - globalconfigbase.ui globalconfig.h globalconfig.cpp - projectconfigbase.ui projectconfig.h projectconfig.cpp -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevpart.tar.gz tdevpart.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevpart.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart2/CMakeLists.txt b/languages/cpp/app_templates/tdevpart2/CMakeLists.txt deleted file mode 100644 index d48daf45..00000000 --- a/languages/cpp/app_templates/tdevpart2/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevpart2.tar.gz ALL - COMMAND tar zcf tdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevpart_part.cpp tdevpart_part.h - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc - tdevpart.desktop app.tdevelop tdevpart-configure.in.in - README.dox subdirs globalconfigbase.ui globalconfig.h - globalconfig.cpp projectconfigbase.ui projectconfig.h - projectconfig.cpp -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevpart2.tar.gz tdevpart2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevpart2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt index 3e7bf9d0..09d0bc52 100644 --- a/languages/cpp/app_templates/win32gui/CMakeLists.txt +++ b/languages/cpp/app_templates/win32gui/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( win32gui.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/win32gui.tar.gz win32gui.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - win32gui.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + win32gui.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am index d315f718..a29fa6a8 100644 --- a/languages/cpp/app_templates/win32gui/Makefile.am +++ b/languages/cpp/app_templates/win32gui/Makefile.am @@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32gui-Makefile.am win32gui-Makefile.cvs \ templateName = win32gui ### 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/cpp/app_templates/win32gui/app.tdevelop b/languages/cpp/app_templates/win32gui/app.tdevelop index 53ec087b..eb9bbdbd 100644 --- a/languages/cpp/app_templates/win32gui/app.tdevelop +++ b/languages/cpp/app_templates/win32gui/app.tdevelop @@ -16,7 +16,7 @@ <ignoreparts/> <secondaryLanguages/> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -103,8 +103,8 @@ <makebin/> <prio>0</prio> </make> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>clanlib</toc> <toc>opengl</toc> @@ -120,15 +120,15 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> @@ -139,14 +139,14 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> - <tdevcppsupport> + <kdevcppsupport> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> <includeTypes>true</includeTypes> @@ -164,8 +164,8 @@ <pcs>TDElibs</pcs> <pcs>ksjembed</pcs> </references> - </tdevcppsupport> - <tdevdebugger> + </kdevcppsupport> + <kdevdebugger> <general> <programargs></programargs> <gdbpath></gdbpath> @@ -182,11 +182,11 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdocumentation> + </kdevdebugger> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate index cd15f549..dec00262 100644 --- a/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate +++ b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate @@ -64,11 +64,11 @@ Archive=win32gui.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt index 9cc35db0..bc1c8d80 100644 --- a/languages/cpp/app_templates/win32hello/CMakeLists.txt +++ b/languages/cpp/app_templates/win32hello/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( win32hello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/win32hello.tar.gz win32hello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - win32hello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + win32hello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am index 813c591f..a55bcebc 100644 --- a/languages/cpp/app_templates/win32hello/Makefile.am +++ b/languages/cpp/app_templates/win32hello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32-Makefile.am win32-Makefile.cvs \ templateName = win32hello ### 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/cpp/app_templates/win32hello/app.tdevelop b/languages/cpp/app_templates/win32hello/app.tdevelop index 3ee2b1af..672646c4 100644 --- a/languages/cpp/app_templates/win32hello/app.tdevelop +++ b/languages/cpp/app_templates/win32hello/app.tdevelop @@ -16,7 +16,7 @@ <ignoreparts/> <secondaryLanguages/> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>default</useconfiguration> @@ -75,8 +75,8 @@ <makebin/> <prio>0</prio> </make> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>clanlib</toc> <toc>opengl</toc> @@ -92,15 +92,15 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.h" name="Header files" /> <group pattern="*.cpp" name="Source files" /> @@ -111,14 +111,14 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> - <tdevcppsupport> + <kdevcppsupport> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> <includeTypes>true</includeTypes> @@ -136,8 +136,8 @@ <pcs>TDElibs</pcs> <pcs>ksjembed</pcs> </references> - </tdevcppsupport> - <tdevdebugger> + </kdevcppsupport> + <kdevdebugger> <general> <programargs></programargs> <gdbpath></gdbpath> @@ -154,11 +154,11 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdocumentation> + </kdevdebugger> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate index ce8804a7..3b5f4f3e 100644 --- a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate +++ b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate @@ -63,11 +63,11 @@ Archive=win32hello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/wxhello/CMakeLists.txt b/languages/cpp/app_templates/wxhello/CMakeLists.txt index 48d382bd..f1a8ffec 100644 --- a/languages/cpp/app_templates/wxhello/CMakeLists.txt +++ b/languages/cpp/app_templates/wxhello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( wxhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/wxhello.tar.gz wxhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - wxhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + wxhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/wxhello/Makefile.am b/languages/cpp/app_templates/wxhello/Makefile.am index f0e0839e..c45b1d10 100644 --- a/languages/cpp/app_templates/wxhello/Makefile.am +++ b/languages/cpp/app_templates/wxhello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h app.tdevelop subdirs \ templateName = wxhello ### 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/cpp/app_templates/wxhello/app.tdevelop b/languages/cpp/app_templates/wxhello/app.tdevelop index 9a3f0821..9de4fa75 100644 --- a/languages/cpp/app_templates/wxhello/app.tdevelop +++ b/languages/cpp/app_templates/wxhello/app.tdevelop @@ -12,7 +12,7 @@ <keyword>wxWidgets</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> <useconfiguration>debug</useconfiguration> @@ -37,16 +37,16 @@ <cxxflags>-O0 -g3</cxxflags> </debug> </configurations> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.cpp;*.cxx;*.h" name="Sources" /> <group pattern="*.rc" name="Resource file" /> <group pattern="*.png" name="Icons" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -91,24 +91,24 @@ <ignoredoxygen> <toc>TDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="rc" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevdocumentation> + </kdevfilecreate> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate index dab3c253..ed1cbc6a 100644 --- a/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate +++ b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate @@ -64,7 +64,7 @@ Archive=wxhello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [WXARCH] Type=install archive @@ -97,7 +97,7 @@ Dest=%{dest}/doc/en/index.docbook [WX] Type=include -File=%{tdevelop}/template-common/wx.tdevtemplate +File=%{tdevelop}/template-common/wx.kdevtemplate [FILE4] Type=install diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 51311dac..730a090f 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -15,8 +15,8 @@ #include "codeinformationrepository.h" #include "cppcodecompletion.h" #include "ast_utils.h" -#include "tdevdeepcopy.h" -#include "tdevdriver.h" +#include "kdevdeepcopy.h" +#include "kdevdriver.h" #include <tqmutex.h> @@ -25,8 +25,8 @@ #include <tdetexteditor/document.h> #include <tdetexteditor/view.h> -#include <tdevpartcontroller.h> -#include <tdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevproject.h> #include <kurl.h> #include <kdebug.h> @@ -39,9 +39,9 @@ #include <tqdatastream.h> -class BackgroundTDevDriver : public TDevDriver { +class BackgroundKDevDriver : public KDevDriver { public: - BackgroundTDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : TDevDriver( cppSupport, false ), m_backgroundParser(bp) { + BackgroundKDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : KDevDriver( cppSupport, false ), m_backgroundParser(bp) { } virtual void fileParsed( ParsedFile& fileName ); virtual void addDependence( const TQString& fileName, const Dependence& dep ); @@ -255,7 +255,7 @@ BackgroundParser::BackgroundParser( CppSupportPart* part, TQWaitCondition* consu : m_consumed( consumed ), m_cppSupport( part ), m_close( false ), m_saveMemory( false ) { m_fileList = new SynchronizedFileList(); - m_driver = new BackgroundTDevDriver( m_cppSupport, this ); + m_driver = new BackgroundKDevDriver( m_cppSupport, this ); m_driver->setSourceProvider( new KDevSourceProvider( m_cppSupport, m_mutex ) ); TQString conf_file_name = m_cppSupport->specialHeaderName(); @@ -347,14 +347,14 @@ void BackgroundParser::removeFile( const TQString& fileName ) m_isEmpty.wakeAll(); } -void BackgroundTDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { +void BackgroundKDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { //give waiting threads a chance to perform their actions m_backgroundParser->m_mutex.unlock(); m_backgroundParser->m_mutex.lock(); - TDevDriver::addDependence( fileName, dep ); + KDevDriver::addDependence( fileName, dep ); } -void BackgroundTDevDriver::fileParsed( ParsedFile& fileName ) { +void BackgroundKDevDriver::fileParsed( ParsedFile& fileName ) { m_backgroundParser->fileParsed( fileName ); } diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index bd21fd6f..f3cd86fd 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -24,7 +24,7 @@ class CppSupportPart; class TranslationUnitAST; class SynchronizedFileList; -class BackgroundTDevDriver; +class BackgroundKDevDriver; class Unit { public: @@ -94,14 +94,14 @@ public: virtual void run(); protected: - friend class BackgroundTDevDriver; + friend class BackgroundKDevDriver; void fileParsed( ParsedFile& fileName ); Unit* findUnit( const TQString& fileName ); void parseFile( const TQString& fileName, bool readFromDisk, bool lock = false ) ; private: - class TDevDriver* m_driver; + class KDevDriver* m_driver; TQString m_currentFile; TQWaitCondition m_canParse; TQWaitCondition m_isEmpty; diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 6e285019..99a6db12 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> // kde includes -#include <tdevproject.h> +#include <kdevproject.h> #include <tdefiledialog.h> #include <tdelocale.h> #include <tdemessagebox.h> @@ -41,9 +41,9 @@ #include <tdeversion.h> // tdevelop includes #include <domutil.h> -#include <tdevcoderepository.h> -#include <tdevmainwindow.h> -#include <tdevcoderepository.h> +#include <kdevcoderepository.h> +#include <kdevmainwindow.h> +#include <kdevcoderepository.h> #include <catalog.h> // std includes #include <stdlib.h> @@ -440,11 +440,11 @@ void CCConfigWidget::initTQtTab() isExecutable( m_qmakePath->url() ); m_designerPath->setURL( c->designerPath() ); isExecutable( m_designerPath->url() ); - if ( c->designerIntegration() == "EmbeddedTDevDesigner" ) + if ( c->designerIntegration() == "EmbeddedKDevDesigner" ) { m_kdevembedded->setChecked( true ); } - else if ( c->designerIntegration() == "ExternalTDevDesigner" ) + else if ( c->designerIntegration() == "ExternalKDevDesigner" ) { m_kdevexternal->setChecked( true ); }else @@ -507,11 +507,11 @@ void CCConfigWidget::saveTQtTab() c->setDesignerPath( m_designerPath->url() ); if( m_kdevembedded->isChecked() ) { - c->setDesignerIntegration( "EmbeddedTDevDesigner" ); + c->setDesignerIntegration( "EmbeddedKDevDesigner" ); } else if ( m_kdevexternal->isChecked() ) { - c->setDesignerIntegration( "ExternalTDevDesigner" ); + c->setDesignerIntegration( "ExternalKDevDesigner" ); }else { c->setDesignerIntegration( "ExternalDesigner" ); diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index de256b00..a1ad79b0 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -12,7 +12,7 @@ #include "codeinformationrepository.h" #include "cpp_tags.h" -#include <tdevcoderepository.h> +#include <kdevcoderepository.h> #include <kdebug.h> /// @todo move in utils.cpp @@ -39,7 +39,7 @@ my_unique( const TQValueList<KTextEditor::CompletionEntry>& entryList ) return l; } -CodeInformationRepository::CodeInformationRepository( TDevCodeRepository* rep ) +CodeInformationRepository::CodeInformationRepository( KDevCodeRepository* rep ) : m_rep( rep ) {} diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index 4b46ce0e..54610e50 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -23,12 +23,12 @@ struct TypeProcessor { virtual TQString parentType() = 0; }; -class TDevCodeRepository; +class KDevCodeRepository; class CodeInformationRepository { public: - CodeInformationRepository( TDevCodeRepository* rep ); + CodeInformationRepository( KDevCodeRepository* rep ); virtual ~CodeInformationRepository(); static TQValueList<KTextEditor::CompletionEntry> toEntryList( const TQValueList<Tag>& tags, @@ -46,7 +46,7 @@ public: private: TQValueList<KTextEditor::CompletionEntry> m_globalEntries; - TDevCodeRepository* m_rep; + KDevCodeRepository* m_rep; private: CodeInformationRepository( const CodeInformationRepository& source ); diff --git a/languages/cpp/compiler/Makefile.am b/languages/cpp/compiler/Makefile.am index ab237cd4..128e715f 100644 --- a/languages/cpp/compiler/Makefile.am +++ b/languages/cpp/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = gccoptions diff --git a/languages/cpp/compiler/gccoptions/CMakeLists.txt b/languages/cpp/compiler/gccoptions/CMakeLists.txt index ed9b49d4..35c6159d 100644 --- a/languages/cpp/compiler/gccoptions/CMakeLists.txt +++ b/languages/cpp/compiler/gccoptions/CMakeLists.txt @@ -26,15 +26,15 @@ link_directories( ##### other data ################################ install( FILES - tdevgccoptions.desktop tdevgppoptions.desktop - tdevg77options.desktop + kdevgccoptions.desktop kdevgppoptions.desktop + kdevg77options.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevgccoptions (module) ################ +##### libkdevgccoptions (module) ################ -tde_add_kpart( libtdevgccoptions AUTOMOC +tde_add_kpart( libkdevgccoptions AUTOMOC SOURCES gccoptionsplugin.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/compiler/gccoptions/Makefile.am b/languages/cpp/compiler/gccoptions/Makefile.am index 23c8a752..e90edb63 100644 --- a/languages/cpp/compiler/gccoptions/Makefile.am +++ b/languages/cpp/compiler/gccoptions/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevgccoptions.la -libtdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevgccoptions.la +libkdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevgccoptions_la_SOURCES = gccoptionsplugin.cpp +libkdevgccoptions_la_SOURCES = gccoptionsplugin.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevgccoptions.desktop tdevgppoptions.desktop tdevg77options.desktop +service_DATA = kdevgccoptions.desktop kdevgppoptions.desktop kdevg77options.desktop diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index d43bf094..37470a49 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -24,7 +24,7 @@ #include "flagboxes.h" #include "gccoptionsplugin.h" -K_EXPORT_COMPONENT_FACTORY( libtdevgccoptions, KGenericFactory<GccOptionsPlugin>( "tdevgccoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory<GccOptionsPlugin>( "kdevgccoptions" ) ) class GeneralTab : public TQWidget { @@ -650,7 +650,7 @@ TQString GccOptionsDialog::flags() const GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : TDevCompilerOptions( parent, name ) + : KDevCompilerOptions( parent, name ) { gcctype = Unknown; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 3332809a..656bd289 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -14,7 +14,7 @@ #include <kdialogbase.h> -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" class GeneralTab; @@ -24,7 +24,7 @@ class Warnings1Tab; class Warnings2Tab; -class GccOptionsPlugin : public TDevCompilerOptions +class GccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/cpp/compiler/gccoptions/tdevg77options.desktop b/languages/cpp/compiler/gccoptions/kdevg77options.desktop index bbe1f47c..e2a806f5 100644 --- a/languages/cpp/compiler/gccoptions/tdevg77options.desktop +++ b/languages/cpp/compiler/gccoptions/kdevg77options.desktop @@ -49,7 +49,7 @@ Name[tg]=G77Интихобҳо Name[tr]=G77Seçenekleri Name[zh_TW]=G77 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=g77 diff --git a/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop index ce01a066..14bc62df 100644 --- a/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop +++ b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop @@ -46,7 +46,7 @@ Name[ta]=Gccவிருப்பங்கள் Name[tr]=GccSeçenekleri Name[zh_TW]=Gcc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=C X-TDevelop-Args=gcc diff --git a/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop index b5fe552e..d8487596 100644 --- a/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop +++ b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop @@ -48,7 +48,7 @@ Name[ta]=Gppவிருப்பங்கள் Name[tr]=GppSeçenekleri Name[zh_TW]=Gpp 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=C++ X-TDevelop-Args=g++ diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 2b1ad2a3..97cc66e1 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -8,7 +8,7 @@ #include "cppsupportpart.h" -#include <tdevproject.h> +#include <kdevproject.h> #include <tdeconfig.h> #include <tdeapplication.h> diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index adfc1c7d..bf4bef5a 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -59,10 +59,10 @@ email : david.nolden.kdevelop@art-master.de #include <tqpair.h> #include <tqvaluestack.h> -#include <tdevpartcontroller.h> -#include <tdevmainwindow.h> -#include <tdevproject.h> -#include <tdevcoderepository.h> +#include <kdevpartcontroller.h> +#include <kdevmainwindow.h> +#include <kdevproject.h> +#include <kdevcoderepository.h> #include <codemodel_utils.h> #include <codemodel.h> #include <codebrowserfrontend.h> @@ -1470,7 +1470,7 @@ void CppCodeCompletion::popupDefinitionAction( int number ) { } void CppCodeCompletion::selectItem( ItemDom item ) { - Extensions::TDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); + Extensions::KDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); if ( f != 0 ) { ItemDom itemDom( &( *item ) ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 5fc00da3..35069349 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -31,12 +31,12 @@ #include <tdelistview.h> #include <klineedit.h> -#include <tdevlanguagesupport.h> -#include <tdevproject.h> +#include <kdevlanguagesupport.h> +#include <kdevproject.h> #include <domutil.h> #include <filetemplate.h> -CppImplementationWidget::CppImplementationWidget( TDevLanguageSupport *part, +CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, TQWidget *parent, const char *name, bool modal ) : ImplementationWidget( part, parent, name, modal ) {} @@ -45,7 +45,7 @@ TQStringList CppImplementationWidget::createClassFiles() { TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; - if ( m_part->project() ->options() == TDevProject::UsesAutotoolsBuildSystem ) + if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; TQFileInfo formInfo( m_formName ); diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 6040cf69..c8569c03 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -32,7 +32,7 @@ class CppImplementationWidget : public ImplementationWidget Q_OBJECT public: - CppImplementationWidget( TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: virtual TQStringList createClassFiles(); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 84c8fe4e..6289da44 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -40,10 +40,10 @@ #include <tdeversion.h> #include "cppsupportpart.h" -#include "tdevproject.h" -#include "tdevsourceformatter.h" -#include "tdevcoderepository.h" -#include "tdevpartcontroller.h" +#include "kdevproject.h" +#include "kdevsourceformatter.h" +#include "kdevcoderepository.h" +#include "kdevpartcontroller.h" #include "backgroundparser.h" #include "domutil.h" #include "filetemplate.h" @@ -65,7 +65,7 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co implementationModified = false; m_part = part; // read file template configuration - // TDevProject *project = part->project(); + // KDevProject *project = part->project(); TQDomDocument &dom = *part->projectDom(); interface_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfaceURL" ); implementation_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationURL" ); @@ -1342,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput() } /// \FIXME - if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) ) + if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { KMessageBox::error( &dlg, i18n( "Generated files will always be added to the " "active directory, so you must not give an " @@ -1376,7 +1376,7 @@ bool CppNewClassDialog::ClassGenerator::generate() return false; } - if( ( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) ) + if( ( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() ); kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl; @@ -1818,7 +1818,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation ); - if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & TDevProject::UsesAutotoolsBuildSystem ) ) + if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { TQString moc = header; moc.replace( TQRegExp( "\\..*" ), ".moc" ); diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 30aed9e4..e7f969db 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -24,7 +24,7 @@ #include "cppnewclassdlgbase.h" class CppSupportPart; -class TDevProject; +class KDevProject; class TQPopupMenu; class TDECompletion; class CodeModel; @@ -257,7 +257,7 @@ private: TQString advConstructorsHeader; TQString advConstructorsSource; - TDevProject *project; + KDevProject *project; TQString subDir, headerPath, implementationPath; TQString doc; TQString namespaceStr; diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index b8d9909f..b40fc0ec 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -12,7 +12,7 @@ #ifndef __cppsupport_events_h #define __cppsupport_events_h -#include "tdevdeepcopy.h" +#include "kdevdeepcopy.h" #include <tqevent.h> #include <tqvaluelist.h> diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index ca98f2f3..41335cdb 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -11,21 +11,21 @@ #include <kinstance.h> #include <kstandarddirs.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include "cppsupportfactory.h" -K_EXPORT_COMPONENT_FACTORY( libtdevcppsupport, CppSupportFactory ) +K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory ) -static const TDevPluginInfo data("tdevcppsupport"); +static const KDevPluginInfo data("kdevcppsupport"); CppSupportFactory::CppSupportFactory() -: TDevGenericFactory<CppSupportPart>( data ) +: KDevGenericFactory<CppSupportPart>( data ) { } TDEInstance *CppSupportFactory::createInstance() { - TDEInstance *instance = TDevGenericFactory<CppSupportPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<CppSupportPart>::createInstance(); TDEStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); @@ -33,7 +33,7 @@ TDEInstance *CppSupportFactory::createInstance() return instance; } -const TDevPluginInfo * CppSupportFactory::info() +const KDevPluginInfo * CppSupportFactory::info() { return &data; } diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h index 0ece65e9..f543c4fc 100644 --- a/languages/cpp/cppsupportfactory.h +++ b/languages/cpp/cppsupportfactory.h @@ -12,17 +12,17 @@ #ifndef _CPPSUPPORTFACTORY_H_ #define _CPPSUPPORTFACTORY_H_ -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include "cppsupportpart.h" -class TDevPluginInfo; +class KDevPluginInfo; -class CppSupportFactory : public TDevGenericFactory<CppSupportPart> +class CppSupportFactory : public KDevGenericFactory<CppSupportPart> { public: CppSupportFactory(); - static const TDevPluginInfo *info(); + static const KDevPluginInfo *info(); protected: virtual TDEInstance *createInstance(); 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() ); diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index ec00cd9c..7de698c0 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -18,8 +18,8 @@ #ifndef _CPPSUPPORTPART_H_ #define _CPPSUPPORTPART_H_ -#include <tdevcore.h> -#include <tdevlanguagesupport.h> +#include <kdevcore.h> +#include <kdevlanguagesupport.h> #include <tqthread.h> #include <tqmutex.h> @@ -153,7 +153,7 @@ private: SetType m_fileSet; }; -class CppSupportPart : public TDevLanguageSupport +class CppSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -243,7 +243,7 @@ public: //uses the old simple algorithm to find the header TQString findHeaderSimple( const TQString &header ); - virtual TDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); + virtual KDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); void setTyping( bool typing ); @@ -284,7 +284,7 @@ signals: void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); virtual TQString formatClassName( const TQString &name ); virtual TQString unformatClassName( const TQString &name ); @@ -435,7 +435,7 @@ private: KTextEditor::ViewCursorInterface* m_activeViewCursor; TQString m_activeFileName; - TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers; + TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; TQWaitCondition m_eventConsumed; bool m_projectClosed; @@ -623,7 +623,7 @@ private: static TQStringList m_sourceExtensions; static TQStringList m_headerExtensions; - friend class TDevCppSupportIface; + friend class KDevCppSupportIface; friend class CppDriver; // we need something to plug actions that are not in any menu diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 0f390477..9cca7ef8 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -17,8 +17,8 @@ #include "setuphelper.h" #include <catalog.h> -#include <tdevpcsimporter.h> -#include <tdevcoderepository.h> +#include <kdevpcsimporter.h> +#include <kdevcoderepository.h> #include <tdeparts/componentfactory.h> @@ -132,12 +132,12 @@ private: class PCSListViewItem: public TDEListViewItem { public: - PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListViewItem* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListView* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); @@ -155,13 +155,13 @@ public: setPixmap( 0, SmallIcon( ptr->icon() ) ); } - TDevPCSImporter* importer() + KDevPCSImporter* importer() { return m_importer; } private: - TDevPCSImporter* m_importer; + KDevPCSImporter* m_importer; }; class CreatePCSDialog::PCSJobData @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - TDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<TDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService<KDevPCSImporter>( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -272,7 +272,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) if ( m_settings ) delete( m_settings ); - TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() ) ->importer(); + KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() ) ->importer(); m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); @@ -286,7 +286,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) } else if ( currentPage() == descriptionPage ) { - TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer(); + KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer(); filename_edit->setText( importer->dbName() ); } else if ( currentPage() == finalPage ) @@ -294,7 +294,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) setBackEnabled( currentPage(), false ); setNextEnabled( currentPage(), false ); - TDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer(); + KDevPCSImporter* importer = static_cast<PCSListViewItem*>( importerListView->selectedItem() )->importer(); TQStringList fileList = importer->fileList(); progressBar->setTotalSteps( fileList.size() ); progressBar->setPercentageVisible( true ); diff --git a/languages/cpp/debugger/CMakeLists.txt b/languages/cpp/debugger/CMakeLists.txt index d5b91df2..4b660c1d 100644 --- a/languages/cpp/debugger/CMakeLists.txt +++ b/languages/cpp/debugger/CMakeLists.txt @@ -33,13 +33,13 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger ) +install( FILES kdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger ) -##### libtdevdebugger (module) ################## +##### libkdevdebugger (module) ################## -tde_add_kpart( libtdevdebugger AUTOMOC +tde_add_kpart( libkdevdebugger AUTOMOC SOURCES debuggerdcopinterface.skel debuggerpart.cpp dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp @@ -50,6 +50,6 @@ tde_add_kpart( libtdevdebugger AUTOMOC debuggerconfigwidgetbase.ui debuggertracingdialogbase.ui gdboutputwidget.cpp gdbtable.cpp debuggertracingdialog.cpp label_with_double_click.cpp - LINK gdbmi_parser-shared lang_debugger-shared tdevwidgets-shared tdevelop-shared + LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am index 40aba33a..09c147ad 100644 --- a/languages/cpp/debugger/Makefile.am +++ b/languages/cpp/debugger/Makefile.am @@ -7,13 +7,13 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \ -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevdebugger.la -libtdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \ +kde_module_LTLIBRARIES = libkdevdebugger.la +libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \ $(top_builddir)/languages/lib/debugger/liblang_debugger.la \ $(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la -libtdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \ +libkdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \ dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp \ gdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp \ gdbbreakpointwidget.cpp framestackwidget.cpp disassemblewidget.cpp \ @@ -26,8 +26,8 @@ METASOURCES = AUTO KDE_ICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdebugger.desktop +service_DATA = kdevdebugger.desktop -rcdir = $(kde_datadir)/tdevdebugger -rc_DATA = tdevdebugger.rc +rcdir = $(kde_datadir)/kdevdebugger +rc_DATA = kdevdebugger.rc noinst_HEADERS = gdbtable.h diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index dab4486b..2b8523ae 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -14,7 +14,7 @@ #include "debuggerconfigwidget.h" #include "debuggerpart.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "domutil.h" #include <kurlrequester.h> diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index f2379ccb..3cae3762 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -23,7 +23,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdemainwindow.h> @@ -37,12 +37,12 @@ #include <kstringhandler.h> #include <kdockwidget.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" -#include "tdevdebugger.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" +#include "kdevdebugger.h" #include "domutil.h" #include "variablewidget.h" #include "gdbbreakpointwidget.h" @@ -61,7 +61,7 @@ #include <iostream> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include <debugger.h> @@ -71,13 +71,13 @@ namespace GDBDebugger { -static const TDevPluginInfo data("tdevdebugger"); +static const KDevPluginInfo data("kdevdebugger"); -typedef TDevGenericFactory<DebuggerPart> DebuggerFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevdebugger, DebuggerFactory( data ) ) +typedef KDevGenericFactory<DebuggerPart> DebuggerFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : - TDevPlugin( &data, parent, name ? name : "DebuggerPart" ), + KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) @@ -85,7 +85,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi setObjId("DebuggerInterface"); setInstance(DebuggerFactory::instance()); - setXMLFile("tdevdebugger.rc"); + setXMLFile("kdevdebugger.rc"); m_debugger = new Debugger( partController() ); @@ -333,8 +333,8 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStop(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStop(KDevPlugin*)) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -858,7 +858,7 @@ void DebuggerPart::slotRun() if (rebuild) { disconnect(TQT_SIGNAL(buildProject())); - // The TDevProject has no method to build the project, + // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save @@ -984,7 +984,7 @@ bool DebuggerPart::attachProcess(int pid) } -void DebuggerPart::slotStop(TDevPlugin* which) +void DebuggerPart::slotStop(KDevPlugin* which) { if( which != 0 && which != this ) return; @@ -1259,12 +1259,12 @@ bool DebuggerPart::haveModifiedFiles() } -TDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( ) +KDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( ) { - return extension<TDevAppFrontend>("TDevelop/AppFrontend"); + return extension<KDevAppFrontend>("TDevelop/AppFrontend"); } -TDevDebugger * GDBDebugger::DebuggerPart::debugger() +KDevDebugger * GDBDebugger::DebuggerPart::debugger() { return m_debugger; } diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index f1f27d23..50479249 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -15,8 +15,8 @@ #define _DEBUGGERPART_H_ #include <tqguardedptr.h> -#include "tdevplugin.h" -#include "tdevcore.h" +#include "kdevplugin.h" +#include "kdevcore.h" #include "gdbcontroller.h" #include "debuggerdcopinterface.h" @@ -28,8 +28,8 @@ class TQPopupMenu; class KDialogBase; class ProcessWidget; class ProcessLineMaker; -class TDevAppFrontend; -class TDevDebugger; +class KDevAppFrontend; +class KDevDebugger; namespace GDBDebugger { @@ -44,7 +44,7 @@ class VariableWidget; class GDBOutputWidget; class ViewerWidget; -class DebuggerPart : public TDevPlugin, virtual public DebuggerDCOPInterface +class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface { Q_OBJECT @@ -82,7 +82,7 @@ private slots: void slotExamineCore(); void slotAttachProcess(); void slotStopDebugger(); - void slotStop(TDevPlugin* which = 0); + void slotStop(KDevPlugin* which = 0); void slotPause(); void slotRunToCursor(); void slotJumpToCursor(); @@ -116,8 +116,8 @@ private slots: void slotEvent(GDBController::event_t); private: - TDevAppFrontend *appFrontend(); - TDevDebugger *debugger(); + KDevAppFrontend *appFrontend(); + KDevDebugger *debugger(); bool attachProcess(int pid); bool startDebugger(); @@ -139,7 +139,7 @@ private: TQString m_contextIdent; TQCString m_drkonqi; - TDevDebugger *m_debugger; + KDevDebugger *m_debugger; int previousDebuggerState_; // Set to true after each debugger restart // Currently used to auto-show variables view diff --git a/languages/cpp/debugger/tdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop index 9db31510..beaf17f3 100644 --- a/languages/cpp/debugger/tdevdebugger.desktop +++ b/languages/cpp/debugger/kdevdebugger.desktop @@ -34,7 +34,7 @@ Comment[tg]=Ин модул дар GDB интерфейсро ба ихтиёр Comment[tr]=Bu eklenti, C, C++ ve daha fazlası için bir kaynak-düzeyinde hata ayıklayıcı olan GDB için bir önucu sağlar. http://sources.redhat.com/gdb/ Comment[zh_CN]=这个插件是一个 GDB 前端，一个 C、C++ 和其它语言的源代码调试器。http://sources.redhat.com/gdb/ Comment[zh_TW]=這個外掛程式提供 GDB 的前端介面。GDB 是一個 C/C++ 還有其它語言的除錯器。http://sources.redhat.com/gdb/ -Name=TDevDebugger +Name=KDevDebugger Name[da]=TDevelop Debugger Name[de]=Debugger (TDevelop) Name[hi]=के-डेव-डिबगर @@ -80,7 +80,7 @@ GenericName[zh_CN]=调试器前端 GenericName[zh_TW]=除錯器前端 Icon=debugger ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevdebugger +X-TDE-Library=libkdevdebugger X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CompiledDevelopment diff --git a/languages/cpp/debugger/tdevdebugger.rc b/languages/cpp/debugger/kdevdebugger.rc index 99a10f3c..801cadb8 100644 --- a/languages/cpp/debugger/tdevdebugger.rc +++ b/languages/cpp/debugger/kdevdebugger.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="TDevDebugger" version="11"> +<kpartgui name="KDevDebugger" version="11"> <MenuBar> <Menu name="debug"> <text>&Debug</text> diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop index fc68be33..54214a1b 100644 --- a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop +++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop @@ -4,14 +4,14 @@ <author>Vladimir Prus</author> <email>ghost@ghostwalk</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description/> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>breakpoints</mainprogram> <directoryradio>executable</directoryradio> @@ -38,8 +38,8 @@ <default/> </environments> </make> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> <programargs/> @@ -56,8 +56,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -102,16 +102,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -143,8 +143,8 @@ <synchronize>true</synchronize> <orientation>Vertical</orientation> </splitheadersource> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -153,7 +153,7 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> diff --git a/languages/cpp/debugger/tests/dll/dll.tdevelop b/languages/cpp/debugger/tests/dll/dll.tdevelop index b875ae48..f92f1d08 100644 --- a/languages/cpp/debugger/tests/dll/dll.tdevelop +++ b/languages/cpp/debugger/tests/dll/dll.tdevelop @@ -4,14 +4,14 @@ <author>Vladimir Prus</author> <email>ghost@ghostwalk</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description/> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>main</mainprogram> <directoryradio>executable</directoryradio> @@ -38,8 +38,8 @@ <default/> </environments> </make> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> <programargs/> @@ -56,8 +56,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -102,22 +102,22 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> - <tdevcppsupport> + <kdevcppsupport> <qt> <used>false</used> <version>3</version> @@ -144,8 +144,8 @@ <inlineSet>true</inlineSet> </creategettersetter> <references/> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -154,5 +154,5 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop index 3096faea..267a73d8 100644 --- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop +++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop @@ -4,22 +4,22 @@ <author>Vladimir Prus</author> <email>ghost@zigzag</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>infinite_loop</mainprogram> <directoryradio>executable</directoryradio> </run> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> </general> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -64,16 +64,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -95,8 +95,8 @@ <processPrimaryTypes>true</processPrimaryTypes> <processFunctionArguments>false</processFunctionArguments> </codecompletion> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -105,5 +105,5 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop index fc7f4d19..a838d09d 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop @@ -4,7 +4,7 @@ <author>Vladimir Prus</author> <email>ghost@cs.msu.su</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts> <part>kdevsecurity</part> @@ -18,7 +18,7 @@ <description/> <projectname>print_pointers</projectname> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>print_pointers</mainprogram> <directoryradio>executable</directoryradio> @@ -62,8 +62,8 @@ <filetype>CMakeLists.txt</filetype> </filetypes> <blacklist/> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> <programargs/> @@ -80,8 +80,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -126,22 +126,22 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> <implementationsuffix>.cpp</implementationsuffix> </filetemplates> </cppsupportpart> - <tdevcppsupport> + <kdevcppsupport> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> <includeTypes>true</includeTypes> @@ -185,7 +185,7 @@ <version>3</version> <root>/usr/share/qt3</root> <includestyle>3</includestyle> - <designerintegration>EmbeddedTDevDesigner</designerintegration> + <designerintegration>EmbeddedKDevDesigner</designerintegration> <qmake>/usr/bin/qmake-qt3</qmake> <designer>/usr/bin/designer</designer> <designerpluginpaths/> @@ -195,8 +195,8 @@ <synchronize>true</synchronize> <orientation>Vertical</orientation> </splitheadersource> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -205,8 +205,8 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> - <tdevvisualadvance> + </kdevfileview> + <kdevvisualadvance> <emulator>VisualBoyAdvance</emulator> <binary/> <addOptions/> @@ -214,5 +214,5 @@ <fullscreen>false</fullscreen> <graphicFilter>-f0</graphicFilter> <scaling>-1</scaling> - </tdevvisualadvance> + </kdevvisualadvance> </tdevelop> diff --git a/languages/cpp/debugger/tests/segfault/segfault.tdevelop b/languages/cpp/debugger/tests/segfault/segfault.tdevelop index e48ed4e4..4eccf2e1 100644 --- a/languages/cpp/debugger/tests/segfault/segfault.tdevelop +++ b/languages/cpp/debugger/tests/segfault/segfault.tdevelop @@ -4,14 +4,14 @@ <author>Vladimir Prus</author> <email>ghost@zigzag</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description></description> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>segfault</mainprogram> <directoryradio>executable</directoryradio> @@ -38,8 +38,8 @@ <default/> </environments> </make> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs></programargs> @@ -56,8 +56,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -102,16 +102,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -143,8 +143,8 @@ <synchronize>true</synchronize> <orientation>Vertical</orientation> </splitheadersource> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -153,7 +153,7 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> diff --git a/languages/cpp/debugger/tests/threads/threads.tdevelop b/languages/cpp/debugger/tests/threads/threads.tdevelop index c730bfc4..048b3aed 100644 --- a/languages/cpp/debugger/tests/threads/threads.tdevelop +++ b/languages/cpp/debugger/tests/threads/threads.tdevelop @@ -4,22 +4,22 @@ <author>Vladimir Prus</author> <email>ghost@zigzag</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>threads</mainprogram> <directoryradio>executable</directoryradio> </run> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> </general> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -64,16 +64,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -87,8 +87,8 @@ <argumentsHintDelay>400</argumentsHintDelay> <headerCompletionDelay>250</headerCompletionDelay> </codecompletion> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -97,5 +97,5 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/cpp/debugger/tests/tracing/tracing.tdevelop b/languages/cpp/debugger/tests/tracing/tracing.tdevelop index ab1846ef..56743de1 100644 --- a/languages/cpp/debugger/tests/tracing/tracing.tdevelop +++ b/languages/cpp/debugger/tests/tracing/tracing.tdevelop @@ -4,14 +4,14 @@ <author>Vladimir Prus</author> <email>ghost@ghostwalk</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description/> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>tracing</mainprogram> <directoryradio>executable</directoryradio> @@ -38,8 +38,8 @@ <default/> </environments> </make> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell/> <programargs/> @@ -56,8 +56,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -102,16 +102,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -143,8 +143,8 @@ <synchronize>true</synchronize> <orientation>Vertical</orientation> </splitheadersource> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -153,7 +153,7 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> diff --git a/languages/cpp/debugger/tests/two_module/two_module.tdevelop b/languages/cpp/debugger/tests/two_module/two_module.tdevelop index e4a9ae33..a6d22c2a 100644 --- a/languages/cpp/debugger/tests/two_module/two_module.tdevelop +++ b/languages/cpp/debugger/tests/two_module/two_module.tdevelop @@ -4,14 +4,14 @@ <author>Vladimir Prus</author> <email>ghost@ghostwalk</email> <version>$VERSION$</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>C++</primarylanguage> <ignoreparts/> <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> <description></description> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>two_module</mainprogram> <directoryradio>executable</directoryradio> @@ -38,8 +38,8 @@ <default/> </environments> </make> - </tdevcustomproject> - <tdevdebugger> + </kdevcustomproject> + <kdevdebugger> <general> <dbgshell></dbgshell> <programargs></programargs> @@ -56,8 +56,8 @@ <demanglenames>true</demanglenames> <outputradix>10</outputradix> </display> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -102,16 +102,16 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="ui" /> <type ext="cpp" /> <type ext="h" /> </useglobaltypes> - </tdevfilecreate> - <tdevcppsupport> + </kdevfilecreate> + <kdevcppsupport> <references/> <codecompletion> <includeGlobalFunctions>true</includeGlobalFunctions> @@ -143,8 +143,8 @@ <synchronize>true</synchronize> <orientation>Vertical</orientation> </splitheadersource> - </tdevcppsupport> - <tdevfileview> + </kdevcppsupport> + <kdevfileview> <groups> <hidenonprojectfiles>false</hidenonprojectfiles> <hidenonlocation>false</hidenonlocation> @@ -153,7 +153,7 @@ <hidepatterns>*.o,*.lo,CVS</hidepatterns> <hidenonprojectfiles>false</hidenonprojectfiles> </tree> - </tdevfileview> + </kdevfileview> <cppsupportpart> <filetemplates> <interfacesuffix>.h</interfacesuffix> diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt index a6371ae2..9a2b4e11 100644 --- a/languages/cpp/doc/CMakeLists.txt +++ b/languages/cpp/doc/CMakeLists.txt @@ -10,8 +10,8 @@ ################################################# install( FILES - libc.toc libstdc++.toc tdetemplates.toc stl.toc - qt-tdev3.toc tde2book.toc gnustep.toc gnome1.toc + libc.toc libstdc++.toc kdetemplates.toc stl.toc + qt-kdev3.toc kde2book.toc gnustep.toc gnome1.toc clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc wxwidgets_bugs.toc cppannotations.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am index cf1ecd60..55571124 100644 --- a/languages/cpp/doc/Makefile.am +++ b/languages/cpp/doc/Makefile.am @@ -1,5 +1,5 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs -toc_DATA = libc.toc libstdc++.toc tdetemplates.toc stl.toc qt-tdev3.toc tde2book.toc \ +tocdir = ${kde_datadir}/kdevdocumentation/tocs +toc_DATA = libc.toc libstdc++.toc kdetemplates.toc stl.toc qt-kdev3.toc kde2book.toc \ gnustep.toc gnome1.toc clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc wxwidgets_bugs.toc \ cppannotations.toc diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc index 82cfe409..2cad8dcd 100644 --- a/languages/cpp/doc/clanlib.toc +++ b/languages/cpp/doc/clanlib.toc @@ -7,7 +7,7 @@ <tocsect2 name="Display overview" url="overview/display-1.html" /> <tocsect2 name="Resources" url="overview/resources-1.html" /> <tocsect2 name="Sound overview" url="overview/sound_overview.html" /> - <tocsect2 name="Signals & Slots overview" url="overview/signals.html" /> + <tocsect2 name="Signals & Slots overview" url="overview/Q_SIGNALS.html" /> <tocsect2 name="Sprites overview" url="overview/sprites_overview.html" /> <tocsect2 name="Font overview" url="overview/font_overview-1.html" /> <tocsect2 name="Loading graphics overview" url="overview/loading_graphics.html" /> diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc index 3cb995d3..577d61af 100644 --- a/languages/cpp/doc/gnome1.toc +++ b/languages/cpp/doc/gnome1.toc @@ -124,7 +124,7 @@ <tocsect3 name="Keyboard Accelerators" url="gtk/gtk-keyboard-accelerators.html"/> <tocsect3 name="Selections" url="gtk/gtk-selections.html"/> <tocsect3 name="Drag and Drop" url="gtk/gtk-drag-and-drop.html"/> - <tocsect3 name="Signals" url="gtk/gtk-signals.html"/> + <tocsect3 name="Signals" url="gtk/gtk-Q_SIGNALS.html"/> <tocsect3 name="Signal Marshallers" url="gtk/gtk-signal-marshallers.html"/> <tocsect3 name="Implementation of Object Properties" url="gtk/gtk-object-properties.html"/> <tocsect3 name="Types" url="gtk/gtk-types.html"/> diff --git a/languages/cpp/doc/tde2book.toc b/languages/cpp/doc/kde2book.toc index 79ceb137..d806e440 100644 --- a/languages/cpp/doc/tde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -472,15 +472,15 @@ <entry name="classes, QWidget, example (listing)" url="ch03lev1sec2.html"/> <entry name="classes, QWidget, functions" url="ch03lev1sec2.html"/> <entry name="classes, QWidget, sample class declaration" url="ch04.html"/> -<entry name="classes, QWidget, signals" url="ch04.html"/> -<entry name="classes, QWidget, slots" url="ch04.html"/> +<entry name="classes, QWidget, Q_SIGNALS" url="ch04.html"/> +<entry name="classes, QWidget, Q_SLOTS" url="ch04.html"/> <entry name="classes, QWidget" url="ch03lev1sec2.html"/> <entry name="classes, QWidget" url="ch04.html"/> <entry name="classes, ReadOnlyPart" url="ch12lev1sec4.html"/> <entry name="classes, ReadWritePart" url="ch12lev1sec4.html"/> <entry name="classes, SelectDialog" url="ch08.html"/> -<entry name="classes, slots in temporary classes" url="ch03lev1sec3.html"/> -<entry name="classes, slots" url="ch03lev1sec3.html"/> +<entry name="classes, Q_SLOTS in temporary classes" url="ch03lev1sec3.html"/> +<entry name="classes, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="classes, template, QList" url="ch03lev1sec5.html"/> <entry name="classes, template" url="ch03lev1sec5.html"/> <entry name="classes, utility (Qt)" url="ch03lev1sec5.html"/> @@ -667,7 +667,7 @@ <entry name="DCOP, programming interface, transactions" url="ch13lev1sec5.html"/> <entry name="DCOP, programming interface" url="ch13lev1sec5.html"/> <entry name="DCOPRef objects" url="ch13lev1sec6.html"/> -<entry name="DCOP, signals and slots" url="ch13lev1sec6.html"/> +<entry name="DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/> <entry name="DCOP, underlying technologies, data streaming" url="ch13lev1sec3.html"/> <entry name="DCOP, underlying technologies, ICE (Inter-Client Exchange) mechanism" url="ch13lev1sec3.html"/> <entry name="DCOP, underlying technologies" url="ch13lev1sec3.html"/> @@ -897,7 +897,7 @@ <entry name="embedding, parts, multiple parts" url="ch12lev1sec8.html"/> <entry name="embedding, parts" url="ch12lev1sec7.html"/> <entry name="emitDCOPSignal() method" url="ch13lev1sec6.html"/> -<entry name="emitting signals" url="ch03lev1sec3.html"/> +<entry name="emitting Q_SIGNALS" url="ch03lev1sec3.html"/> <entry name="Emphasis tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="enabling, application functions" url="ch09lev1sec3.html"/> <entry name="enabling, debugging, gdb debugger" url="ch18lev1sec6.html"/> @@ -912,7 +912,7 @@ <entry name="event handling, drag events" url="ch07.html"/> <entry name="event handling, drop events" url="ch07.html"/> <entry name="event handling, Qt" url="ch03lev1sec2.html"/> -<entry name="event handling, signals and slots" url="ch03lev1sec3.html"/> +<entry name="event handling, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="event handling, widgets, closeEvent()" url="ch04.html"/> <entry name="event handling, widgets, dragEnterEvent()" url="ch04.html"/> <entry name="event handling, widgets, dragLeaveEvent()" url="ch04.html"/> @@ -1061,7 +1061,7 @@ <entry name="functions, slotOpen()" url="ch07lev1sec5.html"/> <entry name="functions, slotSave()" url="ch07lev1sec5.html"/> <entry name="functions, slotSpecialHelp()" url="ch05lev1sec2.html"/> -<entry name="functions, slots" url="ch03lev1sec3.html"/> +<entry name="functions, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="functions, sorry()" url="ch05lev1sec3.html"/> <entry name="functions, streamEnd()" url="ch14lev1sec3.html"/> <entry name="functions, streamInit()" url="ch14lev1sec3.html"/> @@ -1170,8 +1170,8 @@ <entry name="GUIs, widgets, event handlers" url="ch04.html"/> <entry name="GUIs, widgets, painting" url="ch04lev1sec2.html"/> <entry name="GUIs, widgets, sample class declaration" url="ch04.html"/> -<entry name="GUIs, widgets, signals" url="ch04.html"/> -<entry name="GUIs, widgets, slots" url="ch04.html"/> +<entry name="GUIs, widgets, Q_SIGNALS" url="ch04.html"/> +<entry name="GUIs, widgets, Q_SLOTS" url="ch04.html"/> <entry name="GUIs, widgets" url="ch04.html"/> <entry name="GUIs, widgets, user input" url="ch04lev1sec4.html"/> <entry name="Hausmann, Simon" url="ch13lev1sec7.html"/> @@ -1637,7 +1637,7 @@ <entry name="lines, drawing" url="ch04lev1sec2.html"/> <entry name="listing, CVS (Concurrent Version System) modules" url="ch17lev1sec5.html"/> <entry name="listings, application configuration file example" url="ch07lev1sec2.html"/> -<entry name="listings, connecting slots to signals" url="ch03lev1sec3.html"/> +<entry name="listings, connecting Q_SLOTS to Q_SIGNALS" url="ch03lev1sec3.html"/> <entry name="listings, DCOP, client using stub interface" url="ch13lev1sec5.html"/> <entry name="listings, DCOP, DCOPClient call() method" url="ch13lev1sec5.html"/> <entry name="listings, DCOP, DCOPClient send() method" url="ch13lev1sec5.html"/> @@ -2149,7 +2149,7 @@ <entry name="panel applet (KWeather), kweather.h class definition" url="ch11lev1sec3.html"/> <entry name="panel applet (KWeather), main() method" url="ch11lev1sec3.html"/> <entry name="panel applet (KWeather)" url="ch11lev1sec3.html"/> -<entry name="parameters, signals and slots" url="ch03lev1sec3.html"/> +<entry name="parameters, Q_SIGNALS and Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="param (" url="ch15.html"/> <entry name="Para tag (DocBook)" url="ch15lev1sec2.html"/> <entry name="Parent Classes command (Classbrowser pop-up menu)" url="ch18lev1sec4.html"/> @@ -2259,7 +2259,7 @@ <entry name="protocols, DCOP, message redirection technology (referencing)" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, performance and overhead" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, programming interface" url="ch13lev1sec5.html"/> -<entry name="protocols, DCOP, signals and slots" url="ch13lev1sec6.html"/> +<entry name="protocols, DCOP, Q_SIGNALS and Q_SLOTS" url="ch13lev1sec6.html"/> <entry name="protocols, DCOP, underlying technologies" url="ch13lev1sec3.html"/> <entry name="protocols, DCOP" url="ch13.html"/> <entry name="protocols, FTP, snapshots" url="ch17lev1sec3.html"/> @@ -2313,14 +2313,14 @@ <entry name="Qt, QWidget class, example (listing)" url="ch03lev1sec2.html"/> <entry name="Qt, QWidget class, member functions" url="ch03lev1sec2.html"/> <entry name="Qt, QWidget class" url="ch03lev1sec2.html"/> -<entry name="Qt, signals, connecting to slots" url="ch03lev1sec3.html"/> -<entry name="Qt, signals, emitting" url="ch03lev1sec3.html"/> -<entry name="Qt, signals" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, connecting to signals" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, creating" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, parameters" url="ch03lev1sec3.html"/> -<entry name="Qt, slots, temporary classes" url="ch03lev1sec3.html"/> -<entry name="Qt, slots" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS, emitting" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, creating" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, parameters" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/> +<entry name="Qt, Q_SLOTS" url="ch03lev1sec3.html"/> <entry name="Qt, STL" url="ch03lev1sec5.html"/> <entry name="Qt tookit" url="ch03.html"/> <entry name="Qt toolkit, overview" url="ch03lev1sec2.html"/> @@ -2353,8 +2353,8 @@ <entry name="QWidget class, event handlers" url="ch04.html"/> <entry name="QWidget class, event handlers, wheelEvent()" url="ch04.html"/> <entry name="QWidget class, sample class declaration" url="ch04.html"/> -<entry name="QWidget class, signals" url="ch04.html"/> -<entry name="QWidget class, slots" url="ch04.html"/> +<entry name="QWidget class, Q_SIGNALS" url="ch04.html"/> +<entry name="QWidget class, Q_SLOTS" url="ch04.html"/> <entry name="QWidget class" url="ch03lev1sec2.html"/> <entry name="QWidget class" url="ch04.html"/> <entry name="raises (" url="ch15.html"/> @@ -2463,13 +2463,13 @@ <entry name="show() method" url="ch02lev1sec3.html"/> <entry name="showStatusbar action" url="ch06.html"/> <entry name="showToolbar action" url="ch06.html"/> -<entry name="signals, connecting to slots" url="ch03lev1sec3.html"/> -<entry name="signals (DCOP)" url="ch13lev1sec6.html"/> -<entry name="signals, emitting" url="ch03lev1sec3.html"/> -<entry name="signals, parameters" url="ch03lev1sec3.html"/> -<entry name="signals, (Qt)" url="ch03lev1sec3.html"/> -<entry name="signals" url="ch03lev1sec2.html"/> -<entry name="signals (widgets)" url="ch04.html"/> +<entry name="Q_SIGNALS, connecting to Q_SLOTS" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS (DCOP)" url="ch13lev1sec6.html"/> +<entry name="Q_SIGNALS, emitting" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS, parameters" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS, (Qt)" url="ch03lev1sec3.html"/> +<entry name="Q_SIGNALS" url="ch03lev1sec2.html"/> +<entry name="Q_SIGNALS (widgets)" url="ch04.html"/> <entry name="SimpleSoundServer interface" url="ch14lev1sec4.html"/> <entry name="since (" url="ch15.html"/> <entry name="single-instance application, kunique.cpp call definition" url="ch11lev1sec2.html"/> @@ -2479,17 +2479,17 @@ <entry name="slotButton()" url="ch03lev1sec4.html"/> <entry name="slotOpen() function" url="ch07lev1sec5.html"/> <entry name="slotSave() function" url="ch07lev1sec5.html"/> -<entry name="slots, connecting to signals" url="ch03lev1sec3.html"/> -<entry name="slots, creating" url="ch03lev1sec3.html"/> -<entry name="slots (DCOP)" url="ch13lev1sec6.html"/> -<entry name="slots, parameters" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, connecting to Q_SIGNALS" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, creating" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS (DCOP)" url="ch13lev1sec6.html"/> +<entry name="Q_SLOTS, parameters" url="ch03lev1sec3.html"/> <entry name="slotSpecialHelp() function" url="ch05lev1sec2.html"/> <entry name="slotSpellCheck() method" url="ch10lev1sec3.html"/> -<entry name="slots, (Qt)" url="ch03lev1sec3.html"/> -<entry name="slots, slotButton()" url="ch03lev1sec4.html"/> -<entry name="slots, temporary classes" url="ch03lev1sec3.html"/> -<entry name="slots" url="ch03lev1sec2.html"/> -<entry name="slots (widgets)" url="ch04.html"/> +<entry name="Q_SLOTS, (Qt)" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS, slotButton()" url="ch03lev1sec4.html"/> +<entry name="Q_SLOTS, temporary classes" url="ch03lev1sec3.html"/> +<entry name="Q_SLOTS" url="ch03lev1sec2.html"/> +<entry name="Q_SLOTS (widgets)" url="ch04.html"/> <entry name="snapshots" url="ch17lev1sec3.html"/> <entry name="socket() method" url="ch13lev1sec6.html"/> <entry name="software development, documentation" url="ch18.html"/> @@ -2836,8 +2836,8 @@ <entry name="widgets, painting" url="ch04lev1sec2.html"/> <entry name="widgets, QGL" url="ch03lev1sec6.html"/> <entry name="widgets, sample class declaration" url="ch04.html"/> -<entry name="widgets, signals" url="ch04.html"/> -<entry name="widgets, slots" url="ch04.html"/> +<entry name="widgets, Q_SIGNALS" url="ch04.html"/> +<entry name="widgets, Q_SLOTS" url="ch04.html"/> <entry name="widgets" url="ch01lev1sec2.html"/> <entry name="widgets" url="ch04.html"/> <entry name="widgets" url="ch04lev1sec3.html"/> diff --git a/languages/cpp/doc/tdetemplates.toc b/languages/cpp/doc/kdetemplates.toc index c764c0c4..c764c0c4 100644 --- a/languages/cpp/doc/tdetemplates.toc +++ b/languages/cpp/doc/kdetemplates.toc diff --git a/languages/cpp/doc/qt-tdev3.toc b/languages/cpp/doc/qt-kdev3.toc index 3f6ffff0..af086cf5 100644 --- a/languages/cpp/doc/qt-tdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -1,6 +1,6 @@ <!DOCTYPE tdeveloptoc> <tdeveloptoc> -<title>Qt Designer-3 and TDevelop-3</title> +<title>Qt Designer-3 and KDevelop-3</title> <base href="http://women.kde.org/articles/tutorials/tdevelop3"/> <tocsect1 name="Index" url="index.html"> </tocsect1> @@ -8,7 +8,7 @@ </tocsect1> <tocsect1 name="Requirements" url="requirements.html"> <tocsect2 name="How to get Qt Designer" url="requirements.html"/> - <tocsect2 name="How to get TDevelop 3" url="get-kevelop.html"/> + <tocsect2 name="How to get KDevelop 3" url="get-kevelop.html"/> <tocsect2 name="Lexicon" url="lexicon.html"/> </tocsect1> <tocsect1 name="Creating the application" url="creating.html"> @@ -16,9 +16,9 @@ <tocsect2 name="Designing the program" url="design-program.html"/> <tocsect2 name="Adding widgets" url="adding-widgets.html"/> <tocsect2 name="Getting spaced out" url="spaced-out.html"/> - <tocsect2 name="Signals and slots" url="signals-and-slots.html"/> + <tocsect2 name="Signals and Q_SLOTS" url="Q_SIGNALS-and-Q_SLOTS.html"/> <tocsect2 name="Generating the source" url="source.html"/> - <tocsect2 name="Implementing the slot" url="slots.html"/> + <tocsect2 name="Implementing the slot" url="Q_SLOTS.html"/> </tocsect1> <tocsect1 name="In short" url="in-short.html"> </tocsect1> @@ -26,13 +26,13 @@ </tocsect1> <tocsect1 name="A few general tips" url="a_few_tips.html"> <tocsect2 name="General hints" url="a_few_tips.html#id2771559"/> - <tocsect2 name="Importing your project in TDE GIT" url="importing.html"/> + <tocsect2 name="Importing your project in KDE CVS" url="importing.html"/> <tocsect2 name="How do I release my application as a tarball?" url="release-tarball.html"/> <tocsect2 name="Useful links" url="links.html"/> </tocsect1> <tocsect1 name="Generating the source (alternate)" url="without_subclass.html"> - <tocsect2 name="Without using the TDevelop subclassing capability" url="without_subclass.html"/> - <tocsect2 name="Implementing the slot" url="slots2.html"/> + <tocsect2 name="Without using the KDevelop subclassing capability" url="without_subclass.html"/> + <tocsect2 name="Implementing the slot" url="Q_SLOTS2.html"/> </tocsect1> <tocsect1 name="Credits and License" url="credits.html"> </tocsect1> diff --git a/languages/cpp/file_templates/CMakeLists.txt b/languages/cpp/file_templates/CMakeLists.txt index f7dbfda7..17909c7d 100644 --- a/languages/cpp/file_templates/CMakeLists.txt +++ b/languages/cpp/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES c cpp h l ll y yy - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/cpp/file_templates/Makefile.am b/languages/cpp/file_templates/Makefile.am index 722d3091..d688d547 100644 --- a/languages/cpp/file_templates/Makefile.am +++ b/languages/cpp/file_templates/Makefile.am @@ -1,3 +1,3 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = c cpp h l ll y yy diff --git a/languages/cpp/tdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop index 93a99f59..cd638819 100644 --- a/languages/cpp/tdevcppsupport.desktop +++ b/languages/cpp/kdevcppsupport.desktop @@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони C++ Comment[tr]=C++ Desteği Comment[zh_CN]=C++ 支持 Comment[zh_TW]=C++ 支援 -Name=TDevCppSupport +Name=KDevCppSupport Name[da]=TDevelop C++ understøttelse Name[hi]=के-डेव-सीपीपी-समर्थन Name[nds]=CPP-Ünnerstütten för TDevelop @@ -80,7 +80,7 @@ GenericName[zh_CN]=C++ 支持 GenericName[zh_TW]=C++ 支援 ServiceTypes=TDevelop/LanguageSupport Icon=source_cpp -X-TDE-Library=libtdevcppsupport +X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C++ X-TDevelop-Args=Cpp diff --git a/languages/cpp/tdevcppsupport.rc b/languages/cpp/kdevcppsupport.rc index 1bfcf5a8..37e3fa3a 100644 --- a/languages/cpp/tdevcppsupport.rc +++ b/languages/cpp/kdevcppsupport.rc @@ -1,5 +1,5 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="TDevCppSupport" version="9"> +<kpartgui name="KDevCppSupport" version="9"> <MenuBar> <Menu name="edit"> <Action name="edit_complete_text"/> diff --git a/languages/cpp/tdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop index 7c196ef0..cc54dd73 100644 --- a/languages/cpp/tdevcsupport.desktop +++ b/languages/cpp/kdevcsupport.desktop @@ -79,7 +79,7 @@ GenericName[zh_CN]=C 支持 GenericName[zh_TW]=C 支援 ServiceTypes=TDevelop/LanguageSupport Icon=source_cpp -X-TDE-Library=libtdevcppsupport +X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C X-TDevelop-Args=C diff --git a/languages/cpp/tdevdeepcopy.h b/languages/cpp/kdevdeepcopy.h index 3b5d6995..c29ee1e1 100644 --- a/languages/cpp/tdevdeepcopy.h +++ b/languages/cpp/kdevdeepcopy.h @@ -1,5 +1,5 @@ -#ifndef TDEVDEEPCOPY_H -#define TDEVDEEPCOPY_H +#ifndef KDEVDEEPCOPY_H +#define KDEVDEEPCOPY_H #include <tqstring.h> diff --git a/languages/cpp/tdevdriver.cpp b/languages/cpp/kdevdriver.cpp index f2ac1ddb..4a6c45ec 100644 --- a/languages/cpp/tdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -1,14 +1,14 @@ #include "tdelocale.h" /* defines [function] i18n */ #include <lexer.h> -#include "tdevdriver.h" +#include "kdevdriver.h" #include "cppcodecompletionconfig.h" #include "setuphelper.h" #include <unistd.h> #include "includepathresolver.h" -TDevDriver::TDevDriver( CppSupportPart* cppSupport, bool foreground ) +KDevDriver::KDevDriver( CppSupportPart* cppSupport, bool foreground ) : m_cppSupport( cppSupport ), m_includePathResolver(0), m_foreground(foreground), m_shouldParseIncludedFiles(true) { //setupProject(); @@ -16,13 +16,13 @@ TDevDriver::TDevDriver( CppSupportPart* cppSupport, bool foreground ) } -TDevDriver::~TDevDriver() { +KDevDriver::~KDevDriver() { delete m_includePathResolver; } -CppSupportPart* TDevDriver::cppSupport() { return m_cppSupport; } +CppSupportPart* KDevDriver::cppSupport() { return m_cppSupport; } -void TDevDriver::setupProject() +void KDevDriver::setupProject() { TQMap<TQString, bool> map; @@ -43,7 +43,7 @@ void TDevDriver::setupProject() } } -void TDevDriver::setupLexer( Lexer* lexer ) +void KDevDriver::setupLexer( Lexer* lexer ) { Driver::setupLexer( lexer ); lexer->setReportMessages( true ); @@ -52,7 +52,7 @@ void TDevDriver::setupLexer( Lexer* lexer ) //! setup the preprocessor //! code provided by Reginald Stadlbauer <reggie@trolltech.com> -void TDevDriver::setup() +void KDevDriver::setup() { if( lexerCache() ) lexerCache()->clear(); ///Clear the lexer-cache so missing headers get a chance to be parsed clearMacros(); @@ -167,9 +167,9 @@ void TDevDriver::setup() m_shouldParseIncludedFiles = cfg->parseMissingHeaders(); } -TQStringList TDevDriver::getCustomIncludePath( const TQString& file ) { +TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { if( !file.startsWith("/") ) - kdDebug( 9007 ) << "TDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; + kdDebug( 9007 ) << "KDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; if( !m_includePathResolver ) return includePaths(); CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file ); @@ -183,7 +183,7 @@ TQStringList TDevDriver::getCustomIncludePath( const TQString& file ) { return res.path + includePaths(); } -bool TDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { +bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) diff --git a/languages/cpp/tdevdriver.h b/languages/cpp/kdevdriver.h index 46c7d515..8af87e0c 100644 --- a/languages/cpp/tdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -1,11 +1,11 @@ -#ifndef __tdevdriver_h -#define __tdevdriver_h +#ifndef __kdevdriver_h +#define __kdevdriver_h #include "cppsupportpart.h" #include "driver.h" -#include <tdevproject.h> +#include <kdevproject.h> #include <tdeversion.h> #include <cstdlib> @@ -17,12 +17,12 @@ namespace CppTools { class IncludePathResolver; }; -class TDevDriver: public Driver +class KDevDriver: public Driver { public: ///When the driver is used in a background-thread, foreground MUST be false(else crash) - TDevDriver( CppSupportPart* cppSupport, bool foreground = false ); - ~TDevDriver(); + KDevDriver( CppSupportPart* cppSupport, bool foreground = false ); + ~KDevDriver(); CppSupportPart* cppSupport(); void setupProject(); //! setup the preprocessor diff --git a/languages/cpp/newclass_templates/CMakeLists.txt b/languages/cpp/newclass_templates/CMakeLists.txt index 7847d9a7..73b9bff5 100644 --- a/languages/cpp/newclass_templates/CMakeLists.txt +++ b/languages/cpp/newclass_templates/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES cpp_header cpp_source gtk_header gtk_source objc_header objc_source - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/newclass ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/newclass ) diff --git a/languages/cpp/newclass_templates/Makefile.am b/languages/cpp/newclass_templates/Makefile.am index 2b47443f..5b013d27 100644 --- a/languages/cpp/newclass_templates/Makefile.am +++ b/languages/cpp/newclass_templates/Makefile.am @@ -1,4 +1,4 @@ -cppsupportdatadir = ${kde_datadir}/tdevcppsupport +cppsupportdatadir = ${kde_datadir}/kdevcppsupport newclassdir = ${cppsupportdatadir}/newclass newclass_DATA = cpp_header cpp_source gtk_header gtk_source objc_header objc_source diff --git a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt index 90652509..c2e07bdb 100644 --- a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevcustompcsimporter (module) ######### +##### libkdevcustompcsimporter (module) ######### -tde_add_kpart( libtdevcustompcsimporter AUTOMOC +tde_add_kpart( libkdevcustompcsimporter AUTOMOC SOURCES - tdevcustomimporter.cpp settingsdialog.cpp + kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/customimporter/Makefile.am b/languages/cpp/pcsimporter/customimporter/Makefile.am index 1a6c1f1d..7e6a7093 100644 --- a/languages/cpp/pcsimporter/customimporter/Makefile.am +++ b/languages/cpp/pcsimporter/customimporter/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevcustompcsimporter.la +kde_module_LTLIBRARIES = libkdevcustompcsimporter.la -noinst_HEADERS = tdevcustomimporter.h -libtdevcustompcsimporter_la_SOURCES = tdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui -libtdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevcustomimporter.h +libkdevcustompcsimporter_la_SOURCES = kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui +libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -kde_services_DATA = tdevpcscustomimporter.desktop +libkdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +kde_services_DATA = kdevpcscustomimporter.desktop diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 33a2bf40..38a41eb8 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include "tdevcustomimporter.h" +#include "kdevcustomimporter.h" #include "settingsdialog.h" @@ -17,24 +17,24 @@ #include <kdebug.h> #include <kgenericfactory.h> -K_EXPORT_COMPONENT_FACTORY( libtdevcustompcsimporter, KGenericFactory<TDevCustomImporter>( "tdevcustompcsimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory<KDevCustomImporter>( "kdevcustompcsimporter" ) ) -TDevCustomImporter::TDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) - : TDevPCSImporter( parent, name ) + : KDevPCSImporter( parent, name ) {} -TDevCustomImporter::~TDevCustomImporter() +KDevCustomImporter::~KDevCustomImporter() {} -TQString TDevCustomImporter::dbName() const +TQString KDevCustomImporter::dbName() const { return m_settings->dbName(); } -TQStringList TDevCustomImporter::fileList( const TQString& path ) +TQStringList KDevCustomImporter::fileList( const TQString& path ) { TQDir dir( path ); if ( !dir.exists() ) @@ -49,7 +49,7 @@ TQStringList TDevCustomImporter::fileList( const TQString& path ) return fileList; } -TQStringList TDevCustomImporter::fileList() +TQStringList KDevCustomImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -67,7 +67,7 @@ TQStringList TDevCustomImporter::fileList() return files; } -TQStringList TDevCustomImporter::includePaths() +TQStringList KDevCustomImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -75,13 +75,13 @@ TQStringList TDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* TDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; } -void TDevCustomImporter::processDir( const TQString path, TQStringList & files ) +void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) { TQValueStack<TQString> s; s.push( path ); @@ -114,5 +114,5 @@ void TDevCustomImporter::processDir( const TQString path, TQStringList & files ) while ( !s.isEmpty() ); } -#include "tdevcustomimporter.moc" +#include "kdevcustomimporter.moc" //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 925e42f9..884a033d 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -7,23 +7,23 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#ifndef TDEVCUSTOMIMPORTER_H -#define TDEVCUSTOMIMPORTER_H +#ifndef KDEVCUSTOMIMPORTER_H +#define KDEVCUSTOMIMPORTER_H -#include "tdevpcsimporter.h" +#include "kdevpcsimporter.h" #include <tqguardedptr.h> class SettingsDialog; -class TDevCustomImporter : public TDevPCSImporter +class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT public: - TDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); - ~TDevCustomImporter(); + ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop index 50530ef8..b351a8e3 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop +++ b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Name=TDevPCSCustomImporter +Name=KDevPCSCustomImporter Name[da]=TDevelop brugerdefineret PCS-importør Name[nds]=EgenPCS-Import för TDevelop Name[pl]=KDevWłasnyImportPCS @@ -40,5 +40,5 @@ Comment[zh_CN]=TDevelop 自定义目录的 PCS 导入器 Comment[zh_TW]=TDevelop 自訂目錄 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevcustompcsimporter +X-TDE-Library=libkdevcustompcsimporter X-TDevelop-PCSImporter= diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt index 908c66fc..8e29fdec 100644 --- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt +++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevqt4importer (module) ############### +##### libkdevqt4importer (module) ############### -tde_add_kpart( libtdevqt4importer AUTOMOC +tde_add_kpart( libkdevqt4importer AUTOMOC SOURCES - tdevqt4importer.cpp settingsdialogbase.ui + kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am index 935c7d49..12f12104 100644 --- a/languages/cpp/pcsimporter/qt4importer/Makefile.am +++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevqt4importer.la +kde_module_LTLIBRARIES = libkdevqt4importer.la -noinst_HEADERS = tdevqt4importer.h settingsdialog.h -libtdevqt4importer_la_SOURCES = tdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevqt4importer.desktop -libtdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevqt4importer.h settingsdialog.h +libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevqt4importer.desktop +libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index fefa57ee..0289c7a4 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevqt4importer.h" -#include "tdevqt4importer.moc" +#include "kdevqt4importer.h" +#include "kdevqt4importer.moc" #include "settingsdialog.h" #include <kgenericfactory.h> @@ -22,15 +22,15 @@ #include <tqlabel.h> #include <tqdir.h> -K_EXPORT_COMPONENT_FACTORY( libtdevqt4importer, KGenericFactory<TDevQt4Importer>( "tdevqt4importer" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory<KDevQt4Importer>( "kdevqt4importer" ) ) -TDevQt4Importer::TDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) { m_qtfile = 0; } -TDevQt4Importer::~TDevQt4Importer() +KDevQt4Importer::~KDevQt4Importer() { if (m_qtfile) delete m_qtfile; @@ -38,7 +38,7 @@ TDevQt4Importer::~TDevQt4Importer() m_qtfile = 0; } -TQStringList TDevQt4Importer::fileList() +TQStringList KDevQt4Importer::fileList() { if( !m_settings ) return TQStringList(); @@ -86,7 +86,7 @@ TQStringList TDevQt4Importer::fileList() return m_qtfile->name(); } -TQStringList TDevQt4Importer::includePaths() +TQStringList KDevQt4Importer::includePaths() { if( !m_settings || !m_qtfile) return TQStringList(); @@ -99,7 +99,7 @@ TQStringList TDevQt4Importer::includePaths() return includePaths; } -TQWidget * TDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop index cf42c497..5d91d917 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Service -Name=TDevQt4Importer +Name=KDevQt4Importer Name[de]=Qt4-PCS-Import (TDevelop) -Name[fr]=TDevQtImporter +Name[fr]=KDevQtImporter Name[nds]=Qt4-PCS-Import (TDevelop) -Name[ru]=TDevQt 4Importer +Name[ru]=KDevQt 4Importer Name[sv]=TDevelop QT4-import Comment=TDevelop Qt4 PCS Importer Comment[ca]=Importador PCS de Qt4 per a TDevelop @@ -29,6 +29,6 @@ Comment[sv]=TDevelop QT4 PCS-import Comment[zh_TW]=TDevelop Qt4 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevqt4importer +X-TDE-Library=libkdevqt4importer X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 53f6a18e..3b9563f3 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -9,22 +9,22 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include <tdevpcsimporter.h> +#include <kdevpcsimporter.h> #include <tqguardedptr.h> class SettingsDialog; class KTempFile; -class TDevQt4Importer : public TDevPCSImporter +class KDevQt4Importer : public KDevPCSImporter { Q_OBJECT public: - TDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevQt4Importer(); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevQt4Importer(); virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt index 9af966d9..64e95d39 100644 --- a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevqtimporter (module) ################ +##### libkdevqtimporter (module) ################ -tde_add_kpart( libtdevqtimporter AUTOMOC +tde_add_kpart( libkdevqtimporter AUTOMOC SOURCES - tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp + kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/pcsimporter/qtimporter/Makefile.am b/languages/cpp/pcsimporter/qtimporter/Makefile.am index 23a60885..80ccc8be 100644 --- a/languages/cpp/pcsimporter/qtimporter/Makefile.am +++ b/languages/cpp/pcsimporter/qtimporter/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevqtimporter.la +kde_module_LTLIBRARIES = libkdevqtimporter.la -noinst_HEADERS = tdevqtimporter.h settingsdialog.h -libtdevqtimporter_la_SOURCES = tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevqtimporter.desktop -libtdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevqtimporter.h settingsdialog.h +libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevqtimporter.desktop +libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index b3b94019..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevqtimporter.h" -#include "tdevqtimporter.moc" +#include "kdevqtimporter.h" +#include "kdevqtimporter.moc" #include "settingsdialog.h" #include <kgenericfactory.h> @@ -18,16 +18,16 @@ #include <tqlabel.h> #include <tqdir.h> -K_EXPORT_COMPONENT_FACTORY( libtdevqtimporter, KGenericFactory<TDevQtImporter>( "tdevqtimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory<KDevQtImporter>( "kdevqtimporter" ) ) -TDevQtImporter::TDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} -TDevQtImporter::~TDevQtImporter() +KDevQtImporter::~KDevQtImporter() {} -TQStringList TDevQtImporter::fileList() +TQStringList KDevQtImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -50,7 +50,7 @@ TQStringList TDevQtImporter::fileList() return fileList; } -TQStringList TDevQtImporter::includePaths() +TQStringList KDevQtImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -64,7 +64,7 @@ TQStringList TDevQtImporter::includePaths() return includePaths; } -TQWidget * TDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop index f9b02306..72161838 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Name=TDevQtImporter +Name=KDevQtImporter Name[da]=TDevelop Qt-importør Name[de]=Qt-PCS-Import (TDevelop) Name[hi]=के-डेव-क्यूटी-आयातक @@ -32,6 +32,6 @@ Comment[sv]=TDevelop QT3 PCS-import Comment[zh_TW]=TDevelop Qt3 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevqtimporter +X-TDE-Library=libkdevqtimporter X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index 3f7d1ac8..bad9973e 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include <tdevpcsimporter.h> +#include <kdevpcsimporter.h> #include <tqguardedptr.h> class SettingsDialog; -class TDevQtImporter : public TDevPCSImporter +class KDevQtImporter : public KDevPCSImporter { Q_OBJECT public: - TDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevQtImporter(); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevQtImporter(); virtual TQString dbName() const { return TQString::fromLatin1("TQt"); } virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt index 4dbf0d0c..d48bad5a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevtdelibsimporter (module) ########### +##### libkdevtdelibsimporter (module) ########### -tde_add_kpart( libtdevtdelibsimporter AUTOMOC +tde_add_kpart( libkdevtdelibsimporter AUTOMOC SOURCES - tdevtdelibsimporter.cpp settingsdialogbase.ui + kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am index e7c846d4..14efcabc 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am +++ b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevtdelibsimporter.la +kde_module_LTLIBRARIES = libkdevtdelibsimporter.la -noinst_HEADERS = tdevtdelibsimporter.h settingsdialog.h -libtdevtdelibsimporter_la_SOURCES = tdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevtdelibsimporter.desktop -libtdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevtdelibsimporter.h settingsdialog.h +libkdevtdelibsimporter_la_SOURCES = kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevtdelibsimporter.desktop +libkdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp index 6f83e483..d3f5795b 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevtdelibsimporter.h" -#include "tdevtdelibsimporter.moc" +#include "kdevtdelibsimporter.h" +#include "kdevtdelibsimporter.moc" #include "settingsdialog.h" #include <kdebug.h> @@ -21,16 +21,16 @@ #include <tqdir.h> #include <tqcombobox.h> -K_EXPORT_COMPONENT_FACTORY( libtdevtdelibsimporter, KGenericFactory<TDevTDELibsImporter>( "tdevtdelibsimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevtdelibsimporter, KGenericFactory<KDevKDELibsImporter>( "kdevtdelibsimporter" ) ) -TDevTDELibsImporter::TDevTDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} -TDevTDELibsImporter::~TDevTDELibsImporter() +KDevKDELibsImporter::~KDevKDELibsImporter() {} -TQStringList TDevTDELibsImporter::fileList( const TQString& path ) +TQStringList KDevKDELibsImporter::fileList( const TQString& path ) { TQDir dir( path ); TQStringList lst = dir.entryList( "*.h" ); @@ -43,7 +43,7 @@ TQStringList TDevTDELibsImporter::fileList( const TQString& path ) } -TQStringList TDevTDELibsImporter::fileList() +TQStringList KDevKDELibsImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -99,7 +99,7 @@ TQStringList TDevTDELibsImporter::fileList() return files; } -TQStringList TDevTDELibsImporter::includePaths() +TQStringList KDevKDELibsImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -109,7 +109,7 @@ TQStringList TDevTDELibsImporter::includePaths() return includePaths; } -TQWidget * TDevTDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop index 54cd2996..7433518e 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Service -Name=TDevTDELibsImporter +Name=KDevKDELibsImporter Name[da]=TDevelop KDELibs-importør Name[de]=KDELibs-PCS-Import (TDevelop) Name[hi]=के-डेव-केडीई-लिब्स-इम्पोर्टर Name[ja]=KDev KDE Name[nds]=KDELibs-PCS-Import (TDevelop) -Name[pl]=TDevTDEImportBib +Name[pl]=KDevKDEImportBib Name[sk]=KDev KDE import knižníc Name[sv]=TDevelop KDE-biblioteksimport Name[ta]=கெடெவ் கெடெலிப்ஸ் இறக்குமதியாளர் @@ -44,6 +44,6 @@ Comment[zh_CN]=TDevelop KDELibs PCS 导入器 Comment[zh_TW]=TDevelop KDE 函式庫匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevtdelibsimporter +X-TDE-Library=libkdevtdelibsimporter X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h index 0d772bba..14fb7cff 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include <tdevpcsimporter.h> +#include <kdevpcsimporter.h> #include <tqguardedptr.h> class SettingsDialog; -class TDevTDELibsImporter : public TDevPCSImporter +class KDevKDELibsImporter : public KDevPCSImporter { Q_OBJECT public: - TDevTDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevTDELibsImporter(); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevKDELibsImporter(); virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } virtual TQStringList fileList(); diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index bed0c9ae..eed7a5b6 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -21,9 +21,9 @@ #include "configproblemreporter.h" #include "backgroundparser.h" -#include <tdevpartcontroller.h> -#include <tdevmainwindow.h> -#include <tdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevmainwindow.h> +#include <kdevproject.h> #include <tdeversion.h> #include <tdeparts/part.h> diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index 5c42ffb1..c5c87b1c 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -77,7 +77,7 @@ void QtBuildConfig::init( ) if( m_designerIntegration.isEmpty() ) { if ( m_version == 3 ) - m_designerIntegration = "EmbeddedTDevDesigner"; + m_designerIntegration = "EmbeddedKDevDesigner"; else m_designerIntegration = "ExternalDesigner"; } diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 10da233d..118503b6 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -81,7 +81,7 @@ private: TQString m_designerPath; ///< The path including the binary name of TQt Designer TQString m_qmakePath; ///< The path including the binary name of TQMake TQStringList m_designerPluginPaths; ///< The Prefix for Designer - TQString m_designerIntegration; ///< The type of designer used, tdevdesigner or qt designer + TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer static const TQString m_configRoot; ///< The root path of the configuration }; diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 715da1a9..db6df895 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -32,15 +32,15 @@ #include <tdetexteditor/viewcursorinterface.h> #include <domutil.h> -#include <tdevpartcontroller.h> -#include <tdevcreatefile.h> +#include <kdevpartcontroller.h> +#include <kdevcreatefile.h> #include "backgroundparser.h" #include "cppsupportpart.h" #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerCppIntegration::QtDesignerCppIntegration( TDevLanguageSupport *part, +QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ) : QtDesignerIntegration( part, impl, true, 0 ) {} @@ -126,7 +126,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) { - if ( TDevCreateFile * createFileSupp = m_part->extension<TDevCreateFile>( "TDevelop/CreateFile" ) ) + if ( KDevCreateFile * createFileSupp = m_part->extension<KDevCreateFile>( "TDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() ); } diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index 143cf180..d156d276 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -27,7 +27,7 @@ class QtDesignerCppIntegration : public QtDesignerIntegration Q_OBJECT public: - QtDesignerCppIntegration( TDevLanguageSupport *part, ImplementationWidget *impl ); + QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); protected: virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ); diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index ac905c33..db3f9c79 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -910,9 +910,9 @@ TQString SimpleTypeImpl::fullTypeResolved( int depth ) { TypeDesc t = desc(); if ( !scope().isEmpty() ) { if ( depth > 10 ) - return "TDeveParseError::ToDeep"; + return "KDevParseError::ToDeep"; if ( !safetyCounter ) - return "TDeveParseError::MaximumCountReached"; + return "KDevParseError::MaximumCountReached"; ifVerbose( dbg() << "fully resolving type " << t.fullName() << endl ); if ( scope().size() != 0 ) { diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 670e69ff..6ad55925 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -14,7 +14,7 @@ #include <kdebug.h> -#include <tdevcoderepository.h> +#include <kdevcoderepository.h> #include "cppcodecompletion.h" #include "codeinformationrepository.h" diff --git a/languages/cpp/subclassing_template/CMakeLists.txt b/languages/cpp/subclassing_template/CMakeLists.txt index 4ee02817..3223a7d7 100644 --- a/languages/cpp/subclassing_template/CMakeLists.txt +++ b/languages/cpp/subclassing_template/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES subclass_template.h subclass_template.cpp subclass_qt4_template.h subclass_qt4_template.cpp - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/subclassing ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/subclassing ) diff --git a/languages/cpp/subclassing_template/Makefile.am b/languages/cpp/subclassing_template/Makefile.am index 850ec6b9..4e722ca0 100644 --- a/languages/cpp/subclassing_template/Makefile.am +++ b/languages/cpp/subclassing_template/Makefile.am @@ -1,4 +1,4 @@ -cppsupportdatadir = ${kde_datadir}/tdevcppsupport +cppsupportdatadir = ${kde_datadir}/kdevcppsupport subclassingdir = ${cppsupportdatadir}/subclassing subclassing_DATA = subclass_template.h subclass_template.cpp \ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 26758d09..0982226c 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -16,9 +16,9 @@ #include "backgroundparser.h" #include "store_walker.h" #include "cppsupportfactory.h" -#include "tdevsourceformatter.h" -#include "tdevapi.h" -#include "tdevproject.h" +#include "kdevsourceformatter.h" +#include "kdevapi.h" +#include "kdevproject.h" #include "filetemplate.h" #include "codemodel.h" @@ -475,7 +475,7 @@ void SubclassingDlg::accept() TQString basefilename = fi.baseName(true); buffer.replace(TQRegExp("\\$MODULE\\$"),module); buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); - if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & TDevProject::UsesAutotoolsBuildSystem)) + if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; } else diff --git a/languages/cpp/templates/CMakeLists.txt b/languages/cpp/templates/CMakeLists.txt index c52a25aa..c278a137 100644 --- a/languages/cpp/templates/CMakeLists.txt +++ b/languages/cpp/templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES default.cpp default.h - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/templates ) diff --git a/languages/cpp/templates/Makefile.am b/languages/cpp/templates/Makefile.am index d5d24bcb..21f95fa8 100644 --- a/languages/cpp/templates/Makefile.am +++ b/languages/cpp/templates/Makefile.am @@ -1,2 +1,2 @@ templatesdata_DATA = default.cpp default.h -templatesdatadir = $(kde_datadir)/tdevcppsupport/templates +templatesdatadir = $(kde_datadir)/kdevcppsupport/templates diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt index 361ce1a1..5e148431 100644 --- a/languages/csharp/CMakeLists.txt +++ b/languages/csharp/CMakeLists.txt @@ -31,17 +31,17 @@ link_directories( ##### other data ################################ install( FILES - tdevcsharpsupport.desktop csharpdoc.protocol + kdevcsharpsupport.desktop csharpdoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevcsharpsupport.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevcsharpsupport ) + kdevcsharpsupport.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevcsharpsupport ) -##### libtdevcsharpsupport (module) ############# +##### libkdevcsharpsupport (module) ############# -tde_add_kpart( libtdevcsharpsupport AUTOMOC +tde_add_kpart( libkdevcsharpsupport AUTOMOC SOURCES csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am index 313e8bca..75ba9513 100644 --- a/languages/csharp/Makefile.am +++ b/languages/csharp/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevcsharpsupport.la tdeio_csharpdoc.la -libtdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la +libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui +libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp tdeio_csharpdoc_la_LIBADD = $(LIB_TDEIO) @@ -19,7 +19,7 @@ tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcsharpsupport.desktop csharpdoc.protocol +service_DATA = kdevcsharpsupport.desktop csharpdoc.protocol -rcdir = $(kde_datadir)/tdevcsharpsupport -rc_DATA = tdevcsharpsupport.rc +rcdir = $(kde_datadir)/kdevcsharpsupport +rc_DATA = kdevcsharpsupport.rc diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index d410441b..154ff911 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -19,24 +19,24 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tqregexp.h> #include <codemodel.h> #include <tqprogressbar.h> #include <kstatusbar.h> -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include <kprocess.h> #include <stdlib.h> #include <unistd.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" +#include "kdevappfrontend.h" //#include "classstore.h" //#include "parsedclass.h" //#include "parsedmethod.h" @@ -44,16 +44,16 @@ #include "domutil.h" //#include "programmingbycontract.h" -typedef TDevGenericFactory<CSharpSupportPart> CSharpSupportFactory; -static const TDevPluginInfo data("tdevcsharpsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevcsharpsupport, CSharpSupportFactory( data ) ) +typedef KDevGenericFactory<CSharpSupportPart> CSharpSupportFactory; +static const KDevPluginInfo data("kdevcsharpsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") { setInstance(CSharpSupportFactory::instance()); - setXMLFile("tdevcsharpsupport.rc"); + setXMLFile("kdevcsharpsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -174,9 +174,9 @@ void CSharpSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features CSharpSupportPart::features() +KDevLanguageSupport::Features CSharpSupportPart::features() { - return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); + return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); // return Functions; } @@ -193,7 +193,7 @@ TQString CSharpSupportPart::interpreter() void CSharpSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index 2256480b..18e5a663 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -12,11 +12,11 @@ #ifndef _CSHARPSUPPORTPART_H_ #define _CSHARPSUPPORTPART_H_ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include <codemodel.h> // #include "csharpparser.h" -class CSharpSupportPart : public TDevLanguageSupport +class CSharpSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/csharp/doc/Makefile.am b/languages/csharp/doc/Makefile.am index 1e8dbe53..e0dfb9eb 100644 --- a/languages/csharp/doc/Makefile.am +++ b/languages/csharp/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/csharp/file_templates/Makefile.am b/languages/csharp/file_templates/Makefile.am index 40ad2f23..b4f0a30c 100644 --- a/languages/csharp/file_templates/Makefile.am +++ b/languages/csharp/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = diff --git a/languages/csharp/tdevcsharpsupport.desktop b/languages/csharp/kdevcsharpsupport.desktop index c072003e..a5627cc3 100644 --- a/languages/csharp/tdevcsharpsupport.desktop +++ b/languages/csharp/kdevcsharpsupport.desktop @@ -51,7 +51,7 @@ GenericName[sr@Latn]=Podrška za CSharp GenericName[sv]=C#-stöd GenericName[zh_TW]=C# 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevcsharpsupport +X-TDE-Library=libkdevcsharpsupport X-TDevelop-Version=5 X-TDevelop-Language=CSharp diff --git a/languages/csharp/tdevcsharpsupport.rc b/languages/csharp/kdevcsharpsupport.rc index b5f735e2..b5f735e2 100644 --- a/languages/csharp/tdevcsharpsupport.rc +++ b/languages/csharp/kdevcsharpsupport.rc diff --git a/languages/fortran/CMakeLists.txt b/languages/fortran/CMakeLists.txt index 8829a5b3..507795aa 100644 --- a/languages/fortran/CMakeLists.txt +++ b/languages/fortran/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfortransupport ) +install( FILES kdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfortransupport ) -##### libtdevfortransupport (module) ############ +##### libkdevfortransupport (module) ############ -tde_add_kpart( libtdevfortransupport AUTOMOC +tde_add_kpart( libkdevfortransupport AUTOMOC SOURCES fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui diff --git a/languages/fortran/Makefile.am b/languages/fortran/Makefile.am index e6568364..73f4582c 100644 --- a/languages/fortran/Makefile.am +++ b/languages/fortran/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = file_templates app_templates compiler doc -kde_module_LTLIBRARIES = libtdevfortransupport.la -libtdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfortransupport.la +libkdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui +libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfortransupport.desktop +service_DATA = kdevfortransupport.desktop -rcdir = $(kde_datadir)/tdevfortransupport -rc_DATA = tdevfortransupport.rc +rcdir = $(kde_datadir)/kdevfortransupport +rc_DATA = kdevfortransupport.rc diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt index 86254144..74709631 100644 --- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt +++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( fortranhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fortranhello.tar.gz fortranhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fortranhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fortranhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am index 15da4c3f..3bf32575 100644 --- a/languages/fortran/app_templates/fortranhello/Makefile.am +++ b/languages/fortran/app_templates/fortranhello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \ templateName = fortranhello ### 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/fortran/app_templates/fortranhello/app.tdevelop b/languages/fortran/app_templates/fortranhello/app.tdevelop index 238351ec..f97fd76a 100644 --- a/languages/fortran/app_templates/fortranhello/app.tdevelop +++ b/languages/fortran/app_templates/fortranhello/app.tdevelop @@ -14,7 +14,7 @@ <part>KDevCTags</part> </ignoreparts> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/%{APPNAMELC}</activetarget> </general> @@ -26,16 +26,16 @@ <envvar value="1" name="WANT_AUTOCONF_2_5" /> <envvar value="1" name="WANT_AUTOMAKE_1_6" /> </makeenvvars> - </tdevautoproject> - <tdevfilecreate> + </kdevautoproject> + <kdevfilecreate> <useglobaltypes> <type ext="F"/> <type ext="fpp"/> <type ext="f"/> <type ext="for"/> </useglobaltypes> - </tdevfilecreate> - <tdevfortransupport> + </kdevfilecreate> + <kdevfortransupport> <ftnchek> <division>false</division> <extern>false</extern> @@ -54,8 +54,8 @@ <f77only></f77only> <portabilityonly></portabilityonly> </ftnchek> - </tdevfortransupport> - <tdevdoctreeview> + </kdevfortransupport> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -103,11 +103,11 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfileview> + </kdevdoctreeview> + <kdevfileview> <groups> <group pattern="*.f;*.for;*.FOR" name="Preprocessed Fortran" /> <group pattern="*.F;*.fpp;*.FPP" name="Fortran77 source files" /> </groups> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate index d25570f7..e4c5cb33 100644 --- a/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate +++ b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate @@ -67,11 +67,11 @@ Archive=fortranhello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/fortran/compiler/Makefile.am b/languages/fortran/compiler/Makefile.am index 183131cb..3489a85c 100644 --- a/languages/fortran/compiler/Makefile.am +++ b/languages/fortran/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = pgioptions diff --git a/languages/fortran/compiler/pgioptions/CMakeLists.txt b/languages/fortran/compiler/pgioptions/CMakeLists.txt index 82d0d0a2..2111f2ad 100644 --- a/languages/fortran/compiler/pgioptions/CMakeLists.txt +++ b/languages/fortran/compiler/pgioptions/CMakeLists.txt @@ -25,15 +25,15 @@ link_directories( ##### other data ################################ install( FILES - tdevpghpfoptions.desktop tdevpgf77options.desktop + kdevpghpfoptions.desktop kdevpgf77options.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevpgioptions (module) ################ +##### libkdevpgioptions (module) ################ -tde_add_kpart( libtdevpgioptions AUTOMOC +tde_add_kpart( libkdevpgioptions AUTOMOC SOURCES pgioptionsfactory.cpp pgioptionsplugin.cpp - LINK tdevextras-shared tdeui-shared + LINK kdevextras-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/fortran/compiler/pgioptions/Makefile.am b/languages/fortran/compiler/pgioptions/Makefile.am index c26068e2..893b7950 100644 --- a/languages/fortran/compiler/pgioptions/Makefile.am +++ b/languages/fortran/compiler/pgioptions/Makefile.am @@ -4,15 +4,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ $(all_includes) -kde_module_LTLIBRARIES = libtdevpgioptions.la -libtdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la +kde_module_LTLIBRARIES = libkdevpgioptions.la +libkdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la -libtdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp +libkdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpghpfoptions.desktop tdevpgf77options.desktop +service_DATA = kdevpghpfoptions.desktop kdevpgf77options.desktop diff --git a/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop index 12dadcff..6d2007ea 100644 --- a/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop +++ b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop @@ -47,7 +47,7 @@ Name[ta]=Pgf77 விருப்பங்கள் Name[tg]=Pgf77Интихобҳо Name[zh_TW]=Pgf77 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevpgioptions +X-TDE-Library=libkdevpgioptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=pgf77 diff --git a/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop index 7fe27fe8..f3793949 100644 --- a/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop +++ b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop @@ -44,7 +44,7 @@ Name[ta]=Pghpf விருப்பங்கள் Name[tg]=PghpfИнтихобҳо Name[zh_TW]=Pghpf 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevpgioptions +X-TDE-Library=libkdevpgioptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=pghpf diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 474263f0..6e019589 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -17,7 +17,7 @@ extern "C" { - void *init_libtdevpgioptions() + void *init_libkdevpgioptions() { return new PgiOptionsFactory; } @@ -61,7 +61,7 @@ TDEInstance *PgiOptionsFactory::s_instance = 0; TDEInstance *PgiOptionsFactory::instance() { if (!s_instance) - s_instance = new TDEInstance("tdevpgioptions"); + s_instance = new TDEInstance("kdevpgioptions"); return s_instance; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 50d907b5..29301c36 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -300,7 +300,7 @@ TQString PgiOptionsDialog::flags() const PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { pgitype = type; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index daa8c99b..d5d80892 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -14,14 +14,14 @@ #include <kdialogbase.h> -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" class GeneralTab; class OptimizationTab; class HpfTab; -class PgiOptionsPlugin : public TDevCompilerOptions +class PgiOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/fortran/doc/CMakeLists.txt b/languages/fortran/doc/CMakeLists.txt index 423f4cbd..50e2ab71 100644 --- a/languages/fortran/doc/CMakeLists.txt +++ b/languages/fortran/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES fortran_bugs_gcc.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/fortran/doc/Makefile.am b/languages/fortran/doc/Makefile.am index b7f9a188..5e7eab51 100644 --- a/languages/fortran/doc/Makefile.am +++ b/languages/fortran/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = fortran_bugs_gcc.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/fortran/file_templates/CMakeLists.txt b/languages/fortran/file_templates/CMakeLists.txt index b031bbdc..3b5ef22e 100644 --- a/languages/fortran/file_templates/CMakeLists.txt +++ b/languages/fortran/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES f f77 f90 f95 for fpp ftn - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/fortran/file_templates/Makefile.am b/languages/fortran/file_templates/Makefile.am index d935b552..2a8e4365 100644 --- a/languages/fortran/file_templates/Makefile.am +++ b/languages/fortran/file_templates/Makefile.am @@ -1,2 +1,2 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = f f77 f90 f95 for fpp ftn diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index c23a35f3..4f749ed3 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -31,29 +31,29 @@ #include <tdemessagebox.h> #include <kprocess.h> #include <kregexp.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <tdeaction.h> #include <kiconloader.h> -#include <tdevcore.h> -#include <tdevproject.h> -#include <tdevmakefrontend.h> -#include <tdevpartcontroller.h> +#include <kdevcore.h> +#include <kdevproject.h> +#include <kdevmakefrontend.h> +#include <kdevpartcontroller.h> #include <domutil.h> #include <codemodel.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> -typedef TDevGenericFactory<FortranSupportPart> FortranSupportFactory; -static const TDevPluginInfo data("tdevfortransupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevfortransupport, FortranSupportFactory( data ) ) +typedef KDevGenericFactory<FortranSupportPart> FortranSupportFactory; +static const KDevPluginInfo data("kdevfortransupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") { setInstance(FortranSupportFactory::instance()); - setXMLFile("tdevfortransupport.rc"); + setXMLFile("kdevfortransupport.rc"); connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); @@ -274,14 +274,14 @@ void FortranSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features FortranSupportPart::features() +KDevLanguageSupport::Features FortranSupportPart::features() { return Features(Functions); } -TDevMakeFrontend * FortranSupportPart::makeFrontend( ) +KDevMakeFrontend * FortranSupportPart::makeFrontend( ) { - return extension<TDevMakeFrontend>("TDevelop/MakeFrontend"); + return extension<KDevMakeFrontend>("TDevelop/MakeFrontend"); } #include "fortransupportpart.moc" diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index fe48e364..7ed0f122 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -15,12 +15,12 @@ class FixedFormParser; class KDialogBase; class TQStringList; -class TDevMakeFrontend; +class KDevMakeFrontend; -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" -class FortranSupportPart : public TDevLanguageSupport +class FortranSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -30,7 +30,7 @@ public: ~FortranSupportPart(); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); private slots: void slotFtnchek(); @@ -46,7 +46,7 @@ private slots: private: void maybeParse(const TQString fileName); - TDevMakeFrontend *makeFrontend(); + KDevMakeFrontend *makeFrontend(); FixedFormParser *parser; }; diff --git a/languages/fortran/tdevfortransupport.desktop b/languages/fortran/kdevfortransupport.desktop index d4da4cba..b6465210 100644 --- a/languages/fortran/tdevfortransupport.desktop +++ b/languages/fortran/kdevfortransupport.desktop @@ -75,6 +75,6 @@ GenericName[tr]=Fortran 77 Desteği GenericName[zh_CN]=Fortran 77 支持 GenericName[zh_TW]=Fortran 77 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevfortransupport +X-TDE-Library=libkdevfortransupport X-TDevelop-Version=5 X-TDevelop-Language=Fortran77 diff --git a/languages/fortran/tdevfortransupport.rc b/languages/fortran/kdevfortransupport.rc index 40e3f80a..40e3f80a 100644 --- a/languages/fortran/tdevfortransupport.rc +++ b/languages/fortran/kdevfortransupport.rc diff --git a/languages/java/CMakeLists.txt b/languages/java/CMakeLists.txt index 546c6ac9..d3f7f5a7 100644 --- a/languages/java/CMakeLists.txt +++ b/languages/java/CMakeLists.txt @@ -35,20 +35,20 @@ link_directories( ##### other data ################################ -install( FILES tdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevjavasupport ) +install( FILES kdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevjavasupport ) -##### libtdevjavasupport (module) ############### +##### libkdevjavasupport (module) ############### -tde_add_kpart( libtdevjavasupport AUTOMOC +tde_add_kpart( libkdevjavasupport AUTOMOC SOURCES - JavaLexer.cpp TDevJavaSupportIface.cpp + JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp - tdevdriver.cpp TDevJavaSupportIface.skel - LINK antlr-static tdevcatalog-shared tdevelop-shared + kdevdriver.cpp KDevJavaSupportIface.skel + LINK antlr-static kdevcatalog-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/java/KDevJavaSupportIface.cpp b/languages/java/KDevJavaSupportIface.cpp new file mode 100644 index 00000000..b1225700 --- /dev/null +++ b/languages/java/KDevJavaSupportIface.cpp @@ -0,0 +1,24 @@ + +#include "KDevJavaSupportIface.h" +#include "javasupportpart.h" + +KDevJavaSupportIface::KDevJavaSupportIface( JavaSupportPart* javaSupport ) + : TQObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport ) +{ +} + +KDevJavaSupportIface::~KDevJavaSupportIface() +{ +} + +void KDevJavaSupportIface::addClass() +{ + m_javaSupport->slotNewClass(); +} + +void KDevJavaSupportIface::parseProject() +{ + m_javaSupport->parseProject(); +} + +#include "KDevJavaSupportIface.moc" diff --git a/languages/java/TDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h index 9732ca51..d0c4d441 100644 --- a/languages/java/TDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -1,20 +1,20 @@ -#ifndef TDEVJAVASUPPORTIFACE_H -#define TDEVJAVASUPPORTIFACE_H +#ifndef KDEVJAVASUPPORTIFACE_H +#define KDEVJAVASUPPORTIFACE_H #include <tqobject.h> #include <dcopobject.h> class JavaSupportPart; -class TDevJavaSupportIface : public TQObject, public DCOPObject +class KDevJavaSupportIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevJavaSupportIface( JavaSupportPart* javaSupport ); - ~TDevJavaSupportIface(); + KDevJavaSupportIface( JavaSupportPart* javaSupport ); + ~KDevJavaSupportIface(); k_dcop: void addClass(); diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am index 8e19da19..a1a1e812 100644 --- a/languages/java/Makefile.am +++ b/languages/java/Makefile.am @@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ $(all_includes) -kde_module_LTLIBRARIES = libtdevjavasupport.la -libtdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la +kde_module_LTLIBRARIES = libkdevjavasupport.la +libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -libtdevjavasupport_la_SOURCES = JavaLexer.cpp TDevJavaSupportIface.cpp javasupportfactory.cpp \ +libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \ JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp \ -JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp tdevdriver.cpp TDevJavaSupportIface.skel +JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel EXTRA_DIST = java.g java.tree.g java.store.g @@ -31,7 +31,7 @@ EXTRA_DIST = java.g java.tree.g java.store.g METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevjavasupport.desktop +service_DATA = kdevjavasupport.desktop -rcdir = $(kde_datadir)/tdevjavasupport -rc_DATA = tdevjavasupport.rc +rcdir = $(kde_datadir)/kdevjavasupport +rc_DATA = kdevjavasupport.rc diff --git a/languages/java/TDevJavaSupportIface.cpp b/languages/java/TDevJavaSupportIface.cpp deleted file mode 100644 index b9847558..00000000 --- a/languages/java/TDevJavaSupportIface.cpp +++ /dev/null @@ -1,24 +0,0 @@ - -#include "TDevJavaSupportIface.h" -#include "javasupportpart.h" - -TDevJavaSupportIface::TDevJavaSupportIface( JavaSupportPart* javaSupport ) - : TQObject( javaSupport ), DCOPObject( "TDevJavaSupport" ), m_javaSupport( javaSupport ) -{ -} - -TDevJavaSupportIface::~TDevJavaSupportIface() -{ -} - -void TDevJavaSupportIface::addClass() -{ - m_javaSupport->slotNewClass(); -} - -void TDevJavaSupportIface::parseProject() -{ - m_javaSupport->parseProject(); -} - -#include "TDevJavaSupportIface.moc" diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt index 34cc305c..f7e7d242 100644 --- a/languages/java/app_templates/CMakeLists.txt +++ b/languages/java/app_templates/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( javahello ) -add_subdirectory( tdeappjava ) +add_subdirectory( kappjava ) add_subdirectory( superwaba ) install( FILES diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am index f30aefdb..fe3931a3 100644 --- a/languages/java/app_templates/Makefile.am +++ b/languages/java/app_templates/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = javahello tdeappjava superwaba +SUBDIRS = javahello kappjava superwaba profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE profiles_DATA = java.appwizard diff --git a/languages/java/app_templates/java.appwizard b/languages/java/app_templates/java.appwizard index f4f8d6ba..087d6c0c 100644 --- a/languages/java/app_templates/java.appwizard +++ b/languages/java/app_templates/java.appwizard @@ -1,2 +1,2 @@ [General] -List=javahello,tdeappjava,superwaba +List=javahello,kappjava,superwaba diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt index 04fd4963..8129bbc1 100644 --- a/languages/java/app_templates/javahello/CMakeLists.txt +++ b/languages/java/app_templates/javahello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( javahello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/javahello.tar.gz javahello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - javahello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + javahello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am index e3e3be27..f47e7056 100644 --- a/languages/java/app_templates/javahello/Makefile.am +++ b/languages/java/app_templates/javahello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop templateName= javahello ### 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/java/app_templates/javahello/javahello.filelist b/languages/java/app_templates/javahello/javahello.filelist index b9ce43ab..97da44be 100644 --- a/languages/java/app_templates/javahello/javahello.filelist +++ b/languages/java/app_templates/javahello/javahello.filelist @@ -1,2 +1,2 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List Main.java diff --git a/languages/java/app_templates/javahello/javahello.tdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate index 62fcffc5..62fcffc5 100644 --- a/languages/java/app_templates/javahello/javahello.tdevtemplate +++ b/languages/java/app_templates/javahello/javahello.kdevtemplate diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop index ade81a9a..a41fae72 100644 --- a/languages/java/app_templates/javahello/javahello.tdevelop +++ b/languages/java/app_templates/javahello/javahello.tdevelop @@ -7,15 +7,15 @@ <projectmanagement>KDevAntProject</projectmanagement> <primarylanguage>Java</primarylanguage> <ignoreparts> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevcustomproject> + <kdevcustomproject> <build> <buildtool>ant</buildtool> </build> - </tdevcustomproject> - <tdevdoctreeview> + </kdevcustomproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -59,11 +59,11 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfileview> + </kdevdoctreeview> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> </tree> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt new file mode 100644 index 00000000..042872fd --- /dev/null +++ b/languages/java/app_templates/kappjava/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kappjava.tar.gz ALL + COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + app.java pref.java appview.java app_client.java appui.rc + src-Makefile.am kappjava.png app.tdevelop subdirs +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kappjava.tar.gz kappjava.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kappjava.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/tdeappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am index 889abb5a..edbd4468 100644 --- a/languages/java/app_templates/tdeappjava/Makefile.am +++ b/languages/java/app_templates/kappjava/Makefile.am @@ -1,12 +1,12 @@ dataFiles = app.java pref.java appview.java app_client.java appui.rc \ - src-Makefile.am tdeappjava.png app.tdevelop subdirs -templateName = tdeappjava + src-Makefile.am kappjava.png app.tdevelop subdirs +templateName = kappjava ### 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/java/app_templates/tdeappjava/app.desktop b/languages/java/app_templates/kappjava/app.desktop index 3cc75ad8..3cc75ad8 100644 --- a/languages/java/app_templates/tdeappjava/app.desktop +++ b/languages/java/app_templates/kappjava/app.desktop diff --git a/languages/java/app_templates/tdeappjava/app.java b/languages/java/app_templates/kappjava/app.java index 40bc6b93..40bc6b93 100644 --- a/languages/java/app_templates/tdeappjava/app.java +++ b/languages/java/app_templates/kappjava/app.java diff --git a/languages/java/app_templates/tdeappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.tdevelop index 1e07dec0..7ee74558 100644 --- a/languages/java/app_templates/tdeappjava/app.tdevelop +++ b/languages/java/app_templates/kappjava/app.tdevelop @@ -13,15 +13,15 @@ <keyword>KDE</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activetarget>src/java</activetarget> </general> <run> <mainprogram>src/%{APPNAMELC}</mainprogram> </run> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.java" name="Sources" /> <group pattern="*.ui" name="User Interface" /> @@ -29,12 +29,12 @@ <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdebugger> + </kdevfileview> + <kdevdebugger> <general> </general> - </tdevdebugger> - <tdevdoctreeview> + </kdevdebugger> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -79,10 +79,10 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="java"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/java/app_templates/tdeappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java index 9648cfad..9648cfad 100644 --- a/languages/java/app_templates/tdeappjava/app_client.java +++ b/languages/java/app_templates/kappjava/app_client.java diff --git a/languages/java/app_templates/tdeappjava/appui.rc b/languages/java/app_templates/kappjava/appui.rc index ceb4f14e..ceb4f14e 100644 --- a/languages/java/app_templates/tdeappjava/appui.rc +++ b/languages/java/app_templates/kappjava/appui.rc diff --git a/languages/java/app_templates/tdeappjava/appview.java b/languages/java/app_templates/kappjava/appview.java index 347ff58f..347ff58f 100644 --- a/languages/java/app_templates/tdeappjava/appview.java +++ b/languages/java/app_templates/kappjava/appview.java diff --git a/languages/java/app_templates/tdeappjava/tdeappjava b/languages/java/app_templates/kappjava/kappjava index a62edafa..e199ac25 100644 --- a/languages/java/app_templates/tdeappjava/tdeappjava +++ b/languages/java/app_templates/kappjava/kappjava @@ -2,7 +2,7 @@ [General] Name=Application framework Name[fr]=Squelette d'application -Icon=tdeappjava.png +Icon=kappjava.png Category=Java/KDE Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars. Comment[fr]=Gnre une simple application KDE dans le language JAVA avec une fentre principale, des menus, et des barres d'outils. diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate index b5b35e33..92cf4710 100644 --- a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate +++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate @@ -30,7 +30,7 @@ Name[sv]=Programramverk Name[tr]=Uygulama Çatısı Name[zh_CN]=应用程序框架 Name[zh_TW]=應用程式框架 -Icon=tdeappjava.png +Icon=kappjava.png Category=Java/KDE Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars. Comment[ca]=Genera una simple aplicació per al KDE en Java amb una finestra principal, menús i barres d'eines. @@ -61,19 +61,19 @@ Comment[zh_CN]=生成一个简单的带有顶级窗口、菜单和工具栏的 J Comment[zh_TW]=產生一個簡單的 Java KDE 應用程式，內含頂層視窗、選單與工具列。 FileTemplates=java,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAME}View.java -Archive=tdeappjava.tar.gz +Archive=kappjava.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [DOCBOOK] Type=include -File=%{tdevelop}/template-common/dockbook.tdevtemplate +File=%{tdevelop}/template-common/dockbook.kdevtemplate [FILE4] Type=install diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.png b/languages/java/app_templates/kappjava/kappjava.png Binary files differindex 913ebb87..913ebb87 100644 --- a/languages/java/app_templates/tdeappjava/tdeappjava.png +++ b/languages/java/app_templates/kappjava/kappjava.png diff --git a/languages/java/app_templates/tdeappjava/pref.java b/languages/java/app_templates/kappjava/pref.java index a50fdb31..a50fdb31 100644 --- a/languages/java/app_templates/tdeappjava/pref.java +++ b/languages/java/app_templates/kappjava/pref.java diff --git a/languages/java/app_templates/tdeappjava/src-Makefile.am b/languages/java/app_templates/kappjava/src-Makefile.am index 6468994c..6468994c 100644 --- a/languages/java/app_templates/tdeappjava/src-Makefile.am +++ b/languages/java/app_templates/kappjava/src-Makefile.am diff --git a/languages/java/app_templates/tdeappjava/subdirs b/languages/java/app_templates/kappjava/subdirs index 0e678106..0e678106 100644 --- a/languages/java/app_templates/tdeappjava/subdirs +++ b/languages/java/app_templates/kappjava/subdirs diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt index ea9517be..58932352 100644 --- a/languages/java/app_templates/superwaba/CMakeLists.txt +++ b/languages/java/app_templates/superwaba/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( superwaba.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/superwaba.tar.gz superwaba.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - superwaba.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + superwaba.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am index c9c6aa99..bc706fe6 100644 --- a/languages/java/app_templates/superwaba/Makefile.am +++ b/languages/java/app_templates/superwaba/Makefile.am @@ -2,10 +2,10 @@ dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist templateName = superwaba ### 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/java/app_templates/superwaba/superwaba.tdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate index e792af35..27257770 100644 --- a/languages/java/app_templates/superwaba/superwaba.tdevtemplate +++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate @@ -162,5 +162,5 @@ Archive=superwaba.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.tdevelop index 029d3af3..11db7411 100644 --- a/languages/java/app_templates/superwaba/sw.tdevelop +++ b/languages/java/app_templates/superwaba/sw.tdevelop @@ -4,17 +4,17 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>Java</primarylanguage> <ignoreparts> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> <keywords> <keyword>Java</keyword> <keyword>Code</keyword> </keywords> </general> - <tdevcustomproject> + <kdevcustomproject> <run> <mainprogram>make test</mainprogram> <programargs/> @@ -34,14 +34,14 @@ <envvars/> </make> <makeenvvars/> - </tdevcustomproject> - <tdevfileview> + </kdevcustomproject> + <kdevfileview> <groups> <group pattern="Makefile" name="Build" /> <group pattern="*.java" name="Source" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -85,10 +85,10 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="java"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/java/app_templates/tdeappjava/CMakeLists.txt b/languages/java/app_templates/tdeappjava/CMakeLists.txt deleted file mode 100644 index 578b6e9d..00000000 --- a/languages/java/app_templates/tdeappjava/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdeappjava.tar.gz ALL - COMMAND tar zcf tdeappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - app.java pref.java appview.java app_client.java appui.rc - src-Makefile.am tdeappjava.png app.tdevelop subdirs -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdeappjava.tar.gz tdeappjava.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdeappjava.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 006b0127..d6a034e4 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -13,8 +13,8 @@ #include "javasupportpart.h" #include "javasupport_events.h" #include "driver.h" -#include "tdevdeepcopy.h" -#include "tdevdriver.h" +#include "kdevdeepcopy.h" +#include "kdevdriver.h" #include <tqmutex.h> @@ -23,8 +23,8 @@ #include <tdetexteditor/document.h> #include <tdetexteditor/view.h> -#include <tdevpartcontroller.h> -#include <tdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevproject.h> #include <kurl.h> #include <kdebug.h> @@ -178,7 +178,7 @@ BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* cons : m_consumed( consumed ), m_javaSupport( part ), m_close( false ) { m_fileList = new SynchronizedFileList(); - m_driver = new TDevDriver( m_javaSupport ); + m_driver = new KDevDriver( m_javaSupport ); m_driver->setSourceProvider( new KDevSourceProvider(m_javaSupport) ); //disabled for now m_driver->setResolveDependencesEnabled( true ); } diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index db197e31..fee2bc78 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -71,7 +71,7 @@ protected: Unit* parseFile( const TQString& fileName, bool readFromDisk ); private: - class TDevDriver* m_driver; + class KDevDriver* m_driver; TQString m_currentFile; TQWaitCondition m_canParse; TQWaitCondition m_isEmpty; diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt index 23acf492..685a980d 100644 --- a/languages/java/doc/CMakeLists.txt +++ b/languages/java/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES sw.toc java_bugs_gcc.toc java_bugs_sun.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am index f163d148..adb0f24f 100644 --- a/languages/java/doc/Makefile.am +++ b/languages/java/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/java/file_templates/CMakeLists.txt b/languages/java/file_templates/CMakeLists.txt index cee049fb..848555dd 100644 --- a/languages/java/file_templates/CMakeLists.txt +++ b/languages/java/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES java - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/java/file_templates/Makefile.am b/languages/java/file_templates/Makefile.am index 4d9013d4..dc3b82a9 100644 --- a/languages/java/file_templates/Makefile.am +++ b/languages/java/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = java diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h index b2022af2..36cda51b 100644 --- a/languages/java/javasupport_events.h +++ b/languages/java/javasupport_events.h @@ -13,7 +13,7 @@ #define __javasupport_events_h #include "driver.h" -#include "tdevdeepcopy.h" +#include "kdevdeepcopy.h" #include <tqevent.h> #include <tqvaluelist.h> diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index ac1eaadb..94e435f2 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -11,28 +11,28 @@ #include <kinstance.h> #include <kstandarddirs.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include "javasupportfactory.h" -static const TDevPluginInfo data("tdevjavasupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevjavasupport, JavaSupportFactory ) +static const KDevPluginInfo data("kdevjavasupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) JavaSupportFactory::JavaSupportFactory() - : TDevGenericFactory<JavaSupportPart>( data ) + : KDevGenericFactory<JavaSupportPart>( data ) { } TDEInstance *JavaSupportFactory::createInstance() { - TDEInstance *instance = TDevGenericFactory<JavaSupportPart>::createInstance(); + TDEInstance *instance = KDevGenericFactory<JavaSupportPart>::createInstance(); TDEStandardDirs *dirs = instance->dirs(); - dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "tdevjavasupport/newclass/" ); - dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "tdevjavasupport/pcs/" ); + dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); + dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); return instance; } -const TDevPluginInfo *JavaSupportFactory::info() +const KDevPluginInfo *JavaSupportFactory::info() { return &data; } diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h index cb231d34..e5ae52b4 100644 --- a/languages/java/javasupportfactory.h +++ b/languages/java/javasupportfactory.h @@ -12,17 +12,17 @@ #ifndef _JAVASUPPORTFACTORY_H_ #define _JAVASUPPORTFACTORY_H_ -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include "javasupportpart.h" -class TDevPluginInfo; +class KDevPluginInfo; -class JavaSupportFactory : public TDevGenericFactory<JavaSupportPart> +class JavaSupportFactory : public KDevGenericFactory<JavaSupportPart> { public: JavaSupportFactory(); - static const TDevPluginInfo *info(); + static const KDevPluginInfo *info(); protected: virtual TDEInstance *createInstance(); diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 3c2090e8..63b174fc 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -17,10 +17,10 @@ #include "javasupport_events.h" #include "problemreporter.h" #include "backgroundparser.h" -#include "TDevJavaSupportIface.h" +#include "KDevJavaSupportIface.h" #include "javasupportfactory.h" #include "catalog.h" -#include "tdevdriver.h" +#include "kdevdriver.h" #include "javasupport_utils.h" #include "JavaStoreWalker.hpp" @@ -63,12 +63,12 @@ #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 <domutil.h> #include <urlutil.h> @@ -77,11 +77,11 @@ enum { KDEV_DB_VERSION = 7 }; enum { KDEV_PCS_VERSION = 8 }; -class JavaDriver: public TDevDriver +class JavaDriver: public KDevDriver { public: JavaDriver( JavaSupportPart* javaSupport ) - : TDevDriver( javaSupport ) + : KDevDriver( javaSupport ) { } @@ -119,7 +119,7 @@ public: }; JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "TDevJavaSupport"), + : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false ) { @@ -127,7 +127,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_driver = new JavaDriver( this ); - setXMLFile( "tdevjavasupport.rc" ); + setXMLFile( "kdevjavasupport.rc" ); m_catalogList.setAutoDelete( true ); setupCatalog(); @@ -167,7 +167,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - new TDevJavaSupportIface( this ); + new KDevJavaSupportIface( this ); //(void) dcopClient(); } @@ -434,7 +434,7 @@ TQString JavaSupportPart::findSourceFile() return m_activeFileName; } -TDevLanguageSupport::Features JavaSupportPart::features() +KDevLanguageSupport::Features JavaSupportPart::features() { return Features( Classes | Functions | Variables ); } @@ -830,7 +830,7 @@ TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool short return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } void JavaSupportPart::addClass( ) diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index 6154cb8f..a69e3524 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -16,8 +16,8 @@ #ifndef _JAVASUPPORTPART_H_ #define _JAVASUPPORTPART_H_ -#include <tdevcore.h> -#include <tdevlanguagesupport.h> +#include <kdevcore.h> +#include <kdevlanguagesupport.h> #include <kdialogbase.h> #include <tqguardedptr.h> @@ -46,7 +46,7 @@ namespace KTextEditor class ViewCursorInterface; } -class JavaSupportPart : public TDevLanguageSupport +class JavaSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -82,7 +82,7 @@ signals: void fileParsed( const TQString& fileName ); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); virtual TQString formatClassName(const TQString &name); virtual TQString unformatClassName(const TQString &name); @@ -159,7 +159,7 @@ private: FunctionDom m_activeFunction; VariableDom m_activeVariable; - friend class TDevJavaSupportIface; + friend class KDevJavaSupportIface; friend class JavaDriver; }; diff --git a/languages/java/tdevdeepcopy.h b/languages/java/kdevdeepcopy.h index c4f889c1..dd4d8f4d 100644 --- a/languages/java/tdevdeepcopy.h +++ b/languages/java/kdevdeepcopy.h @@ -1,5 +1,5 @@ -#ifndef TDEVDEEPCOPY_H -#define TDEVDEEPCOPY_H +#ifndef KDEVDEEPCOPY_H +#define KDEVDEEPCOPY_H #include <tqstring.h> diff --git a/languages/java/tdevdriver.cpp b/languages/java/kdevdriver.cpp index d36a23f3..d19a20c3 100644 --- a/languages/java/tdevdriver.cpp +++ b/languages/java/kdevdriver.cpp @@ -1,20 +1,20 @@ -#include "tdevdriver.h" +#include "kdevdriver.h" #include "JavaLexer.hpp" #include <unistd.h> #include <tqfileinfo.h> -TDevDriver::TDevDriver( JavaSupportPart* javaSupport ) +KDevDriver::KDevDriver( JavaSupportPart* javaSupport ) : m_javaSupport( javaSupport ) { } -JavaSupportPart* TDevDriver::javaSupport() +JavaSupportPart* KDevDriver::javaSupport() { return m_javaSupport; } -void TDevDriver::setupProject() +void KDevDriver::setupProject() { TQMap<TQString, bool> map; @@ -38,7 +38,7 @@ void TDevDriver::setupProject() } } -void TDevDriver::setupLexer( JavaLexer* lexer ) +void KDevDriver::setupLexer( JavaLexer* lexer ) { Driver::setupLexer( lexer ); } diff --git a/languages/java/tdevdriver.h b/languages/java/kdevdriver.h index 27fd7854..cc0a1393 100644 --- a/languages/java/tdevdriver.h +++ b/languages/java/kdevdriver.h @@ -1,10 +1,10 @@ -#ifndef __tdevdriver_h -#define __tdevdriver_h +#ifndef __kdevdriver_h +#define __kdevdriver_h #include "javasupportpart.h" -#include <tdevproject.h> +#include <kdevproject.h> #include <tdeversion.h> #include "driver.h" @@ -12,10 +12,10 @@ #include <cstdlib> #include <unistd.h> -class TDevDriver: public Driver +class KDevDriver: public Driver { public: - TDevDriver( JavaSupportPart* javaSupport ); + KDevDriver( JavaSupportPart* javaSupport ); JavaSupportPart* javaSupport(); void setupProject(); diff --git a/languages/java/tdevjavasupport.desktop b/languages/java/kdevjavasupport.desktop index 6d3553d7..620fb10f 100644 --- a/languages/java/tdevjavasupport.desktop +++ b/languages/java/kdevjavasupport.desktop @@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони Java Comment[tr]=Java Desteği Comment[zh_CN]=Java 支持 Comment[zh_TW]=Java 支援 -Name=TDevJavaSupport +Name=KDevJavaSupport Name[da]=TDevelop Java-understøttelse Name[de]=Unterstützung für Java (TDevelop) Name[hi]=के-डेव-जावा-समर्थन @@ -79,7 +79,7 @@ GenericName[tr]=Java Desteği GenericName[zh_CN]=Java 支持 GenericName[zh_TW]=Java 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevjavasupport +X-TDE-Library=libkdevjavasupport X-TDevelop-Version=5 X-TDevelop-Language=Java X-TDevelop-Args=Java diff --git a/languages/java/tdevjavasupport.rc b/languages/java/kdevjavasupport.rc index 66c7975c..e9b80d0d 100644 --- a/languages/java/tdevjavasupport.rc +++ b/languages/java/kdevjavasupport.rc @@ -1,4 +1,4 @@ <!DOCTYPE kpartgui SYSTEM "kpartgui.dtd"> -<kpartgui name="TDevJavaSupport" version="4"> +<kpartgui name="KDevJavaSupport" version="4"> </kpartgui> diff --git a/languages/java/newclass_templates/Makefile.am b/languages/java/newclass_templates/Makefile.am index f8b9e3bd..d24c99ef 100644 --- a/languages/java/newclass_templates/Makefile.am +++ b/languages/java/newclass_templates/Makefile.am @@ -1,4 +1,4 @@ -javasupportdatadir = ${kde_datadir}/tdevjavasupport +javasupportdatadir = ${kde_datadir}/kdevjavasupport newclassdir = ${javasupportdatadir}/newclass newclass_DATA = java_source diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index 6b6a46e6..4d4f47af 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -21,8 +21,8 @@ #include "configproblemreporter.h" #include "backgroundparser.h" -#include <tdevpartcontroller.h> -#include <tdevmainwindow.h> +#include <kdevpartcontroller.h> +#include <kdevmainwindow.h> #include <tdeversion.h> #include <tdeparts/part.h> diff --git a/languages/kjssupport/Makefile.am b/languages/kjssupport/Makefile.am index 1fd1839b..72cc722b 100644 --- a/languages/kjssupport/Makefile.am +++ b/languages/kjssupport/Makefile.am @@ -1,22 +1,22 @@ INCLUDES = -I$(kde_includes)/tdevelop $(all_includes) -kde_module_LTLIBRARIES = libtdevkjssupport.la -libtdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop -libtdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui +kde_module_LTLIBRARIES = libkdevkjssupport.la +libkdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop +libkdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevkjssupport.desktop +service_DATA = kdevkjssupport.desktop mimesrcdir = $(kde_mimedir)/text mimesrc_DATA = x-javascript-source.desktop EXTRA_DIST = $(mimesrc_DATA) -rcdir = $(kde_datadir)/tdevkjssupport -rc_DATA = tdevkjssupport.rc +rcdir = $(kde_datadir)/kdevkjssupport +rc_DATA = kdevkjssupport.rc SUBDIRS = template subclassing_template noinst_HEADERS = kjsproblems.h diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index b8f361a4..436e0a95 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -28,12 +28,12 @@ #include <kdialogbase.h> -#include <tdevelop/tdevcore.h> +#include <tdevelop/kdevcore.h> #include <tdevelop/kdevmainwindow.h> -#include <tdevelop/tdevlanguagesupport.h> -#include <tdevelop/tdevpartcontroller.h> -#include <tdevelop/tdevproject.h> -#include <tdevelop/tdevappfrontend.h> +#include <tdevelop/kdevlanguagesupport.h> +#include <tdevelop/kdevpartcontroller.h> +#include <tdevelop/kdevproject.h> +#include <tdevelop/kdevappfrontend.h> #include <tdevelop/domutil.h> #include <tdevelop/codemodel.h> diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index 9e4434bb..f1d18a70 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -15,7 +15,7 @@ #include <tqobject.h> #include <tdevelop/codemodel.h> #include <tdevelop/kdevplugin.h> -#include <tdevelop/tdevlanguagesupport.h> +#include <tdevelop/kdevlanguagesupport.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/viewcursorinterface.h> diff --git a/languages/kjssupport/tdevkjssupport.desktop b/languages/kjssupport/kdevkjssupport.desktop index 02640f78..e972cd18 100644 --- a/languages/kjssupport/tdevkjssupport.desktop +++ b/languages/kjssupport/kdevkjssupport.desktop @@ -50,5 +50,5 @@ GenericName[zh_TW]=TDE JavaScript 支援 Icon=tdevelop ServiceTypes=TDevelop/LanguageSupport X-TDevelop-Language=Javascript -X-TDE-Library=libtdevkjssupport +X-TDE-Library=libkdevkjssupport X-TDevelop-Version=3 diff --git a/languages/kjssupport/tdevkjssupport.rc b/languages/kjssupport/kdevkjssupport.rc index e48fc863..e48fc863 100644 --- a/languages/kjssupport/tdevkjssupport.rc +++ b/languages/kjssupport/kdevkjssupport.rc diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 69311ac3..4a3dbc25 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -26,15 +26,15 @@ #include <kiconloader.h> #include <tdelocale.h> #include <kgenericfactory.h> -#include <tdevcore.h> -#include <tdevpartcontroller.h> -#include <tdevmainwindow.h> +#include <kdevcore.h> +#include <kdevpartcontroller.h> +#include <kdevmainwindow.h> #include <domutil.h> #include <codemodel.h> #include <tdeparts/part.h> -#include <tdevproject.h> +#include <kdevproject.h> #include <tdeaction.h> #include <kdebug.h> #include <tdeapplication.h> @@ -42,16 +42,16 @@ #include <kjsembed/kjsembedpart.h> #include <kjsembed/jsconsolewidget.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include "kjssupport_part.h" #include "kjsproblems.h" #include "jscodecompletion.h" #include "subclassingdlg.h" -typedef TDevGenericFactory<kjsSupportPart> kjsSupportFactory; -static const TDevPluginInfo data("tdevkjssupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevkjssupport, kjsSupportFactory( data ) ); +typedef KDevGenericFactory<kjsSupportPart> kjsSupportFactory; +static const KDevPluginInfo data("kdevkjssupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) ); class typeProperty @@ -63,10 +63,10 @@ class typeProperty }; kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) +: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) { setInstance(kjsSupportFactory::instance()); - setXMLFile("tdevkjssupport.rc"); + setXMLFile("kdevkjssupport.rc"); m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -104,7 +104,7 @@ kjsSupportPart::~kjsSupportPart() delete m_js; } -TDevLanguageSupport::Features kjsSupportPart::features() +KDevLanguageSupport::Features kjsSupportPart::features() { return Features(Classes | Variables | Functions); } diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index 59b5dae4..4572b9a2 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -17,13 +17,13 @@ */ -#ifndef __TDEVPART_KJSSUPPORT_H__ -#define __TDEVPART_KJSSUPPORT_H__ +#ifndef __KDEVPART_KJSSUPPORT_H__ +#define __KDEVPART_KJSSUPPORT_H__ #include <tdevelop/kdevplugin.h> #include <tdevelop/codemodel.h> -#include <tdevelop/tdevlanguagesupport.h> +#include <tdevelop/kdevlanguagesupport.h> #include <kdialogbase.h> #include <tqstringlist.h> #include <tqdict.h> @@ -43,7 +43,7 @@ class Context; class typeProperty; -class kjsSupportPart : public TDevLanguageSupport +class kjsSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/kjssupport/subclassing_template/Makefile.am b/languages/kjssupport/subclassing_template/Makefile.am index bafadb4e..8c99d172 100644 --- a/languages/kjssupport/subclassing_template/Makefile.am +++ b/languages/kjssupport/subclassing_template/Makefile.am @@ -1,3 +1,3 @@ -kjssupportdatadir = ${kde_datadir}/tdevkjssupport +kjssupportdatadir = ${kde_datadir}/kdevkjssupport subclassingdir = ${kjssupportdatadir}/subclassing subclassing_DATA = subclass_template.js diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 260e2d49..513e0180 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -17,7 +17,7 @@ #include "store_walker.h" #include "cppsupportfactory.h"*/ #include <tdevelop/kdevsourceformatter.h> -#include <tdevelop/tdevproject.h> +#include <tdevelop/kdevproject.h> #include <tdevelop/filetemplate.h> #include <tdevelop/codemodel.h> diff --git a/languages/kjssupport/template/Makefile.am b/languages/kjssupport/template/Makefile.am index fd902e1a..284227b7 100644 --- a/languages/kjssupport/template/Makefile.am +++ b/languages/kjssupport/template/Makefile.am @@ -1,4 +1,4 @@ -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard commondatadir = ${appwizarddatadir}/template-common jshellodir = ${appwizarddatadir}/template-jshello templatedir = ${appwizarddatadir}/templates diff --git a/languages/kjssupport/template/app.tdevelop b/languages/kjssupport/template/app.tdevelop index d1e55b10..cbef8262 100644 --- a/languages/kjssupport/template/app.tdevelop +++ b/languages/kjssupport/template/app.tdevelop @@ -10,24 +10,24 @@ <keyword>Javascript</keyword> </keywords> <ignoreparts> - <part>TDevFileView</part> + <part>KDevFileView</part> <part>KDevdistpart</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir>src</activedir> <includepatterns>*.js</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.js" name="Scripts" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>kde</toc> <toc>gtk</toc> @@ -36,10 +36,10 @@ <toc>perl</toc> <toc>php</toc> </ignoretocs> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="js"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/kjssupport/template/script b/languages/kjssupport/template/script index 3ed2602c..1473d762 100644 --- a/languages/kjssupport/template/script +++ b/languages/kjssupport/template/script @@ -1,4 +1,4 @@ -#!perl -I/usr/kde/3.1/share/apps/tdevappwizard/template-common +#!perl -I/usr/kde/3.1/share/apps/kdevappwizard/template-common use gideon; diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt index fbd121e4..c159528b 100644 --- a/languages/lib/debugger/CMakeLists.txt +++ b/languages/lib/debugger/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### headers ################################### install( FILES - debugger.h tdevdebugger.h + debugger.h kdevdebugger.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/debugger ) ##### lang_debugger (shared) #################### tde_add_library( lang_debugger SHARED AUTOMOC - SOURCES tdevdebugger.cpp debugger.cpp + SOURCES kdevdebugger.cpp debugger.cpp VERSION 0.0.0 LINK tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 3ca4e3a8..fc8923aa 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor -liblang_debugger_la_SOURCES = tdevdebugger.cpp debugger.cpp +liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger -langincludedir_HEADERS = debugger.h tdevdebugger.h +langincludedir_HEADERS = debugger.h kdevdebugger.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Debugger Support Library -DOXYGEN_DOCDIRPREFIX = tdevlang +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library +DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 341abecd..bc8356b7 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -6,14 +6,14 @@ #include <tdetexteditor/document.h> // #include "editorproxy.h" -#include <tdevpartcontroller.h> +#include <kdevpartcontroller.h> using namespace KTextEditor; Debugger *Debugger::s_instance = 0; -Debugger::Debugger(TDevPartController *partController) +Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index 1f5cbae8..d4112490 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -3,7 +3,7 @@ #include <tqvaluelist.h> -#include "tdevdebugger.h" +#include "kdevdebugger.h" #include <tdeparts/part.h> #include <tdetexteditor/markinterface.h> @@ -11,7 +11,7 @@ #include <tdeversion.h> #include <tdetexteditor/markinterfaceextension.h> -class TDevPartController; +class KDevPartController; /** * Describes a single breakpoint in the system @@ -54,7 +54,7 @@ private: * point of the debugger. * We may change, add or remove breakpoints in this class. */ -class Debugger : public TDevDebugger +class Debugger : public KDevDebugger { Q_OBJECT @@ -94,7 +94,7 @@ public: // protected: - Debugger(TDevPartController *partController); + Debugger(KDevPartController *partController); ~Debugger(); private slots: @@ -126,7 +126,7 @@ private: }; static Debugger *s_instance; - TDevPartController *m_partController; + KDevPartController *m_partController; TQValueList<BPItem> BPList; }; diff --git a/languages/lib/debugger/tdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp index e005491f..b9ee4a05 100644 --- a/languages/lib/debugger/tdevdebugger.cpp +++ b/languages/lib/debugger/kdevdebugger.cpp @@ -17,19 +17,19 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdebugger.h" +#include "kdevdebugger.h" -TDevDebugger::TDevDebugger(TQObject *parent, const char *name) +KDevDebugger::KDevDebugger(TQObject *parent, const char *name) : TQObject(parent, name) { } -TDevDebugger::~TDevDebugger() +KDevDebugger::~KDevDebugger() { } -const TQPixmap* TDevDebugger::inactiveBreakpointPixmap() +const TQPixmap* KDevDebugger::inactiveBreakpointPixmap() { const char*breakpoint_gr_xpm[]={ "11 16 6 1", @@ -59,7 +59,7 @@ const TQPixmap* TDevDebugger::inactiveBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::activeBreakpointPixmap() +const TQPixmap* KDevDebugger::activeBreakpointPixmap() { const char* breakpoint_xpm[]={ "11 16 6 1", @@ -89,7 +89,7 @@ const TQPixmap* TDevDebugger::activeBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::reachedBreakpointPixmap() +const TQPixmap* KDevDebugger::reachedBreakpointPixmap() { const char*breakpoint_bl_xpm[]={ "11 16 7 1", @@ -120,7 +120,7 @@ const TQPixmap* TDevDebugger::reachedBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::disabledBreakpointPixmap() +const TQPixmap* KDevDebugger::disabledBreakpointPixmap() { const char*breakpoint_wh_xpm[]={ "11 16 7 1", @@ -151,7 +151,7 @@ const TQPixmap* TDevDebugger::disabledBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::executionPointPixmap() +const TQPixmap* KDevDebugger::executionPointPixmap() { const char*exec_xpm[]={ "11 16 4 1", @@ -179,4 +179,4 @@ const TQPixmap* TDevDebugger::executionPointPixmap() return &pixmap; } -#include "tdevdebugger.moc" +#include "kdevdebugger.moc" diff --git a/languages/lib/debugger/tdevdebugger.h b/languages/lib/debugger/kdevdebugger.h index 3cfcd5de..4cb7df3f 100644 --- a/languages/lib/debugger/tdevdebugger.h +++ b/languages/lib/debugger/kdevdebugger.h @@ -17,8 +17,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVDEBUGGER_H_ -#define _TDEVDEBUGGER_H_ +#ifndef _KDEVDEBUGGER_H_ +#define _KDEVDEBUGGER_H_ #include <tqobject.h> @@ -31,15 +31,15 @@ * Base class to handle signals from the editor that relate to breakpoints * and the execution point of the debugger. */ -class TDevDebugger : public TQObject +class KDevDebugger : public TQObject { Q_OBJECT public: - TDevDebugger(TQObject *parent=0, const char *name=0); - ~TDevDebugger(); + KDevDebugger(TQObject *parent=0, const char *name=0); + ~KDevDebugger(); /** * Sets a breakpoint in the editor document belong to fileName. diff --git a/languages/lib/designer_integration/Mainpage.dox b/languages/lib/designer_integration/Mainpage.dox index 43070931..1f2db949 100644 --- a/languages/lib/designer_integration/Mainpage.dox +++ b/languages/lib/designer_integration/Mainpage.dox @@ -10,18 +10,18 @@ This library contains base classes to implement GUI designer integration in lang \section usingintegration Using designer integration support library Each language support which wants to use integrated designer, must reimplement @code -virtual TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) +virtual KDevDesignerIntegration *KDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) @endcode -method and return designer integration object (@ref TDevLanguageSupport base class returns 0). +method and return designer integration object (@ref KDevLanguageSupport base class returns 0). Qt designer integration can be easily implemented by reusing @ref QtDesignerIntegration base class. For example, designer method of a language support could look like: @code -TDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type) +KDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type) { - TDevDesignerIntegration *des = 0; + KDevDesignerIntegration *des = 0; switch (type) { case KInterfaceDesigner::QtDesigner: @@ -40,7 +40,7 @@ return des; @endcode In the code above m_designers is a designer cache declared as: @code -QMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers; +QMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; @endcode MyLanguageImplementationWidget and MyLanguageQtDesignerIntegration classes are subclasses of @ref QtDesignerIntegration and @ref ImplementationWidget base classes. diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index 41c0395d..6e9680a9 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO libdesignerintegration_la_LDFLAGS = $(all_libraries) lib_LTLIBRARIES = libdesignerintegration.la -libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ implementationwidget.cpp qtdesignerintegration.cpp langincludedirdir = $(includedir)/tdevelop/languages/designer_integration langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Designer Integration Support Library +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library include ../../../Doxyfile.am diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index 314e9eeb..bdca4558 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -32,10 +32,10 @@ #include <tdemessagebox.h> #include <tdelistview.h> -#include <tdevproject.h> +#include <kdevproject.h> #include <domutil.h> #include <filetemplate.h> -#include <tdevlanguagesupport.h> +#include <kdevlanguagesupport.h> namespace ImplUtils{ class ClassItem: public TDEListViewItem{ @@ -61,7 +61,7 @@ private: }; } -ImplementationWidget::ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) +ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) :CreateImplemenationWidgetBase(parent, name, modal), m_part(part) { } diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index c74947be..3dd53763 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -26,7 +26,7 @@ #include <codemodel.h> class TDEListViewItem; -class TDevLanguageSupport; +class KDevLanguageSupport; /** Base class for implementation creation widgets. @@ -42,7 +42,7 @@ class ImplementationWidget : public CreateImplemenationWidgetBase Q_OBJECT public: - ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); + ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); virtual ~ImplementationWidget(); /*$PUBLIC_FUNCTIONS$*/ @@ -77,7 +77,7 @@ protected slots: virtual void accept(); protected: - TDevLanguageSupport *m_part; + KDevLanguageSupport *m_part; ClassDom m_selectedClass; TQString m_formName; TQString m_baseClassName; diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp index c2b9ab34..26912ba1 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.cpp +++ b/languages/lib/designer_integration/qtdesignerintegration.cpp @@ -30,16 +30,16 @@ #include <rurl.h> #include <domutil.h> -#include <tdevpartcontroller.h> -#include <tdevcreatefile.h> -#include <tdevlanguagesupport.h> -#include <tdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevcreatefile.h> +#include <kdevlanguagesupport.h> +#include <kdevproject.h> #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerIntegration::QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name) - :TDevDesignerIntegration(part, name), m_part(part), m_impl(impl), +QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name) + :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl), m_classHasDefinitions(classHasDefinitions) { } diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h index faafec58..f76eecba 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.h +++ b/languages/lib/designer_integration/qtdesignerintegration.h @@ -23,24 +23,24 @@ #include <tqmap.h> #include <codemodel.h> -#include "tdevdesignerintegration.h" +#include "kdevdesignerintegration.h" -class TDevLanguageSupport; +class KDevLanguageSupport; class ImplementationWidget; /** TQt Designer integration base class. -Contains language-independent implementation part of a @ref TDevDesignerIntegration interface. +Contains language-independent implementation part of a @ref KDevDesignerIntegration interface. Ready to use in KDevelop language support plugins. Subclasses of this class should reimplement only pure virtual functions in the common case. */ -class QtDesignerIntegration : public TDevDesignerIntegration +class QtDesignerIntegration : public KDevDesignerIntegration { Q_OBJECT public: - QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl, + QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name = 0); virtual ~QtDesignerIntegration(); @@ -73,7 +73,7 @@ protected: //Form file - derived class name TQMap<TQString, ClassDom> m_implementations; - TDevLanguageSupport *m_part; + KDevLanguageSupport *m_part; ImplementationWidget *m_impl; bool m_classHasDefinitions; }; diff --git a/languages/lib/interfaces/CMakeLists.txt b/languages/lib/interfaces/CMakeLists.txt index e8af2f36..370eece3 100644 --- a/languages/lib/interfaces/CMakeLists.txt +++ b/languages/lib/interfaces/CMakeLists.txt @@ -22,7 +22,7 @@ link_directories( ##### headers ################################### -install( FILES tdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces ) +install( FILES kdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces ) ##### other data ################################ @@ -33,7 +33,7 @@ install( FILES tdeveloppcsimporter.desktop DESTINATION ${SERVICETYPES_INSTALL_DI ##### lang_interfaces (shared) ################## tde_add_library( lang_interfaces SHARED AUTOMOC - SOURCES tdevpcsimporter.cpp + SOURCES kdevpcsimporter.cpp VERSION 0.0.0 LINK ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am index 127999e6..c3ed3d00 100644 --- a/languages/lib/interfaces/Makefile.am +++ b/languages/lib/interfaces/Makefile.am @@ -3,14 +3,14 @@ METASOURCES = AUTO langincludedirdir = $(includedir)/tdevelop/languages/interfaces lib_LTLIBRARIES = liblang_interfaces.la liblang_interfaces_la_LDFLAGS = $(all_libraries) -liblang_interfaces_la_SOURCES = tdevpcsimporter.cpp +liblang_interfaces_la_SOURCES = kdevpcsimporter.cpp liblang_interfaces_la_LIBADD = $(LIB_QT) -langincludedir_HEADERS = tdevpcsimporter.h +langincludedir_HEADERS = kdevpcsimporter.h INCLUDES = $(all_includes) servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdeveloppcsimporter.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Language Support Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdevlang +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library +DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/interfaces/tdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp index 66e29c13..166cc862 100644 --- a/languages/lib/interfaces/tdevpcsimporter.cpp +++ b/languages/lib/interfaces/kdevpcsimporter.cpp @@ -17,19 +17,19 @@ Boston, MA 02110-1301, USA. */ -#include "tdevpcsimporter.h" -#include "tdevpcsimporter.moc" +#include "kdevpcsimporter.h" +#include "kdevpcsimporter.moc" -TDevPCSImporter::TDevPCSImporter( TQObject * parent, const char * name ) +KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name ) : TQObject( parent, name ) { } -TDevPCSImporter::~ TDevPCSImporter( ) +KDevPCSImporter::~ KDevPCSImporter( ) { } -TQWidget * TDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) +TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) { return 0; } diff --git a/languages/lib/interfaces/tdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h index 62878973..870865cb 100644 --- a/languages/lib/interfaces/tdevpcsimporter.h +++ b/languages/lib/interfaces/kdevpcsimporter.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef TDEVPCSIMPORTER_H -#define TDEVPCSIMPORTER_H +#ifndef KDEVPCSIMPORTER_H +#define KDEVPCSIMPORTER_H #include <tqobject.h> #include <tqstringlist.h> @@ -32,13 +32,13 @@ These plugins are used by language support plugins to fill symbol stores with symbol information from certain files. The purpose of the importer is to provide file selection wizard. */ -class TDevPCSImporter: public TQObject +class KDevPCSImporter: public TQObject { Q_OBJECT public: - TDevPCSImporter( TQObject* parent=0, const char* name=0 ); - virtual ~TDevPCSImporter(); + KDevPCSImporter( TQObject* parent=0, const char* name=0 ); + virtual ~KDevPCSImporter(); virtual TQString dbName() const = 0; virtual TQStringList includePaths() = 0; @@ -47,4 +47,4 @@ public: virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); }; -#endif // TDEVPCSIMPORTER_H +#endif // KDEVPCSIMPORTER_H diff --git a/languages/pascal/CMakeLists.txt b/languages/pascal/CMakeLists.txt index cd398415..7449570e 100644 --- a/languages/pascal/CMakeLists.txt +++ b/languages/pascal/CMakeLists.txt @@ -34,18 +34,18 @@ link_directories( ##### other data ################################ -install( FILES tdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalsupport ) -install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) +install( FILES kdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalsupport ) +install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) -##### libtdevpascalsupport (module) ############# +##### libkdevpascalsupport (module) ############# -tde_add_kpart( libtdevpascalsupport AUTOMOC +tde_add_kpart( libkdevpascalsupport AUTOMOC SOURCES pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp - LINK antlr-static tdevcatalog-shared tdevelop-shared + LINK antlr-static kdevcatalog-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am index 403f37f9..9d168734 100644 --- a/languages/pascal/Makefile.am +++ b/languages/pascal/Makefile.am @@ -5,19 +5,19 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ $(all_includes) SUBDIRS = file_templates app_templates compiler doc -kde_module_LTLIBRARIES = libtdevpascalsupport.la -libtdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) -libtdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la +kde_module_LTLIBRARIES = libkdevpascalsupport.la +libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -libtdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp +libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpascalsupport.desktop +service_DATA = kdevpascalsupport.desktop -rcdir = $(kde_datadir)/tdevpascalsupport -rc_DATA = tdevpascalsupport.rc +rcdir = $(kde_datadir)/kdevpascalsupport +rc_DATA = kdevpascalsupport.rc genparser: antlr pascal.g && antlr pascal.tree.g @@ -29,5 +29,5 @@ genparser: #PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g # antlr pascal.tree.g -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = pascaltemplates diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt index b4a2e071..eb16e978 100644 --- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt +++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpcgtk.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpcgtk.tar.gz fpcgtk.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpcgtk.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpcgtk.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am index e9744c9b..5c4c116f 100644 --- a/languages/pascal/app_templates/fpcgtk/Makefile.am +++ b/languages/pascal/app_templates/fpcgtk/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpcgtk ### 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/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.tdevelop index bbd6d777..e7b3a147 100644 --- a/languages/pascal/app_templates/fpcgtk/app.tdevelop +++ b/languages/pascal/app_templates/fpcgtk/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevpascalproject> + <kdevpascalproject> <general> <useconfiguration>default</useconfiguration> </general> @@ -26,8 +26,8 @@ <run> <terminal>false</terminal> </run> - </tdevpascalproject> - <tdevdoctreeview> + </kdevpascalproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -75,12 +75,12 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="pp"/> <type ext="pas"/> <type ext="dpr"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate index d0103844..45bb7eea 100644 --- a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate +++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate @@ -64,7 +64,7 @@ Archive=fpcgtk.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt index 37ac3aa9..12941440 100644 --- a/languages/pascal/app_templates/fpchello/CMakeLists.txt +++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpchello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpchello.tar.gz fpchello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpchello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpchello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am index f5567a09..744bc214 100644 --- a/languages/pascal/app_templates/fpchello/Makefile.am +++ b/languages/pascal/app_templates/fpchello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpchello ### 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/pascal/app_templates/fpchello/app.tdevelop b/languages/pascal/app_templates/fpchello/app.tdevelop index 603e6e6b..a2f83092 100644 --- a/languages/pascal/app_templates/fpchello/app.tdevelop +++ b/languages/pascal/app_templates/fpchello/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevpascalproject> + <kdevpascalproject> <general> <useconfiguration>default</useconfiguration> </general> @@ -26,8 +26,8 @@ <run> <terminal>true</terminal> </run> - </tdevpascalproject> - <tdevdoctreeview> + </kdevpascalproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -75,12 +75,12 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="pp"/> <type ext="pas"/> <type ext="dpr"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate index 21c213f4..65c46115 100644 --- a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate +++ b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate @@ -65,7 +65,7 @@ Archive=fpchello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt index 779eda2d..52a5e4f7 100644 --- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt +++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpcsharedlib.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpcsharedlib.tar.gz fpcsharedlib.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpcsharedlib.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpcsharedlib.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am index 13194e81..d1d0eef4 100644 --- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am +++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpcsharedlib ### 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/pascal/app_templates/fpcsharedlib/app.tdevelop b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop index e0289480..8249e017 100644 --- a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop +++ b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword>
</keywords>
</general>
- <tdevpascalproject>
+ <kdevpascalproject>
<general>
<useconfiguration>default</useconfiguration>
</general>
@@ -26,8 +26,8 @@ <run>
<terminal>true</terminal>
</run>
- </tdevpascalproject>
- <tdevdoctreeview>
+ </kdevpascalproject>
+ <kdevdoctreeview>
<ignoretocs>
<toc>ada</toc>
<toc>ada_bugs_gcc</toc>
@@ -75,12 +75,12 @@ <ignoredoxygen>
<toc>KDE Libraries (Doxygen)</toc>
</ignoredoxygen>
- </tdevdoctreeview>
- <tdevfilecreate>
+ </kdevdoctreeview>
+ <kdevfilecreate>
<useglobaltypes>
<type ext="pp"/>
<type ext="pas"/>
<type ext="dpr"/>
</useglobaltypes>
- </tdevfilecreate>
+ </kdevfilecreate>
</tdevelop>
diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate index 3c4e93bf..35835599 100644 --- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate +++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate @@ -65,7 +65,7 @@ Archive=fpcsharedlib.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt index a9d1b313..3422a8ff 100644 --- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt +++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( pascalhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/pascalhello.tar.gz pascalhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - pascalhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + pascalhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am index 96ce40c7..3e72435c 100644 --- a/languages/pascal/app_templates/pascalhello/Makefile.am +++ b/languages/pascal/app_templates/pascalhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = pascalhello ### 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/pascal/app_templates/pascalhello/app.tdevelop b/languages/pascal/app_templates/pascalhello/app.tdevelop index 8e571db2..51e8c65e 100644 --- a/languages/pascal/app_templates/pascalhello/app.tdevelop +++ b/languages/pascal/app_templates/pascalhello/app.tdevelop @@ -11,7 +11,7 @@ <keyword>Code</keyword> </keywords> </general> - <tdevpascalproject> + <kdevpascalproject> <general> <useconfiguration>default</useconfiguration> </general> @@ -23,8 +23,8 @@ <run> <terminal>true</terminal> </run> - </tdevpascalproject> - <tdevdoctreeview> + </kdevpascalproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -72,12 +72,12 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="pp"/> <type ext="pas"/> <type ext="dpr"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate index e70ca533..ed7104cb 100644 --- a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate +++ b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate @@ -67,7 +67,7 @@ Archive=pascalhello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/compiler/Makefile.am b/languages/pascal/compiler/Makefile.am index 400962be..c9f7528b 100644 --- a/languages/pascal/compiler/Makefile.am +++ b/languages/pascal/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = dccoptions fpcoptions diff --git a/languages/pascal/compiler/dccoptions/CMakeLists.txt b/languages/pascal/compiler/dccoptions/CMakeLists.txt index 3e7fbcdd..ae6c6388 100644 --- a/languages/pascal/compiler/dccoptions/CMakeLists.txt +++ b/languages/pascal/compiler/dccoptions/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevdccoptions (module) ################ +##### libkdevdccoptions (module) ################ -tde_add_kpart( libtdevdccoptions AUTOMOC +tde_add_kpart( libkdevdccoptions AUTOMOC SOURCES dccoptionsplugin.cpp optiontabs.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am index f913ae45..734e63c5 100644 --- a/languages/pascal/compiler/dccoptions/Makefile.am +++ b/languages/pascal/compiler/dccoptions/Makefile.am @@ -3,14 +3,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevdccoptions.la -libtdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevdccoptions.la +libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp +libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdccoptions.desktop +service_DATA = kdevdccoptions.desktop diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp index cffbbdd5..8a8ffc54 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp @@ -19,10 +19,10 @@ #include "optiontabs.h" -K_EXPORT_COMPONENT_FACTORY( libtdevdccoptions, KGenericFactory<DccOptionsPlugin>( "tdevdccoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory<DccOptionsPlugin>( "kdevdccoptions" ) ) DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const TQStringList/* &args*/) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { } diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index b0db639d..d8465520 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -13,9 +13,9 @@ #include <kdialogbase.h> -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" -class DccOptionsPlugin : public TDevCompilerOptions +class DccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop index 3631eeb9..e99e9385 100644 --- a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop +++ b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop @@ -48,7 +48,7 @@ Name[ta]=Dccவிருப்பங்கள் Name[tg]=DccИнтихобҳо Name[zh_TW]=Dcc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevdccoptions +X-TDE-Library=libkdevdccoptions X-TDevelop-Version=5 X-TDevelop-Language=Pascal X-TDevelop-Args=dcc diff --git a/languages/pascal/compiler/fpcoptions/CMakeLists.txt b/languages/pascal/compiler/fpcoptions/CMakeLists.txt index 7d9a010f..12c9ef89 100644 --- a/languages/pascal/compiler/fpcoptions/CMakeLists.txt +++ b/languages/pascal/compiler/fpcoptions/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevfpcoptions (module) ################ +##### libkdevfpcoptions (module) ################ -tde_add_kpart( libtdevfpcoptions AUTOMOC +tde_add_kpart( libkdevfpcoptions AUTOMOC SOURCES fpcoptionsplugin.cpp optiontabs.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am index 3d105f6f..70579448 100644 --- a/languages/pascal/compiler/fpcoptions/Makefile.am +++ b/languages/pascal/compiler/fpcoptions/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevfpcoptions.la -libtdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevfpcoptions.la +libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp +libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfpcoptions.desktop +service_DATA = kdevfpcoptions.desktop diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp index 31babced..0b01fb01 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp @@ -16,10 +16,10 @@ #include "optiontabs.h" #include "fpcoptionsplugin.h" -K_EXPORT_COMPONENT_FACTORY( libtdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "tdevfpcoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory<FpcOptionsPlugin>( "kdevfpcoptions" ) ) FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { } diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index cee18e79..e30b33c0 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -13,9 +13,9 @@ #include <kdialogbase.h> -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" -class FpcOptionsPlugin : public TDevCompilerOptions +class FpcOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop index da25b683..660e973d 100644 --- a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop +++ b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop @@ -47,7 +47,7 @@ Name[ta]=Fpcவிருப்பங்கள் Name[tg]=FpcИнтихобҳо Name[zh_TW]=Fpc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevfpcoptions +X-TDE-Library=libkdevfpcoptions X-TDevelop-Version=5 X-TDevelop-Language=Pascal X-TDevelop-Args=fpc diff --git a/languages/pascal/doc/CMakeLists.txt b/languages/pascal/doc/CMakeLists.txt index 37627f81..ade55abb 100644 --- a/languages/pascal/doc/CMakeLists.txt +++ b/languages/pascal/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES pascal_bugs_fp.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/pascal/doc/Makefile.am b/languages/pascal/doc/Makefile.am index bf36ead8..a7829d08 100644 --- a/languages/pascal/doc/Makefile.am +++ b/languages/pascal/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = pascal_bugs_fp.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/pascal/file_templates/CMakeLists.txt b/languages/pascal/file_templates/CMakeLists.txt index 5a55baad..812d0398 100644 --- a/languages/pascal/file_templates/CMakeLists.txt +++ b/languages/pascal/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES dpr pas-program pas-unit pp-program pp-unit - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/pascal/file_templates/Makefile.am b/languages/pascal/file_templates/Makefile.am index fe16bfb0..94891c97 100644 --- a/languages/pascal/file_templates/Makefile.am +++ b/languages/pascal/file_templates/Makefile.am @@ -1,2 +1,2 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = dpr pas-program pas-unit pp-program pp-unit diff --git a/languages/pascal/tdevpascalsupport.desktop b/languages/pascal/kdevpascalsupport.desktop index 85c50c20..65e9f851 100644 --- a/languages/pascal/tdevpascalsupport.desktop +++ b/languages/pascal/kdevpascalsupport.desktop @@ -79,6 +79,6 @@ GenericName[tr]=Pascal Dil Desteği GenericName[zh_CN]=Pascal 语言支持 GenericName[zh_TW]=Pascal 語言支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevpascalsupport +X-TDE-Library=libkdevpascalsupport X-TDevelop-Version=5 X-TDevelop-Language=Pascal diff --git a/languages/pascal/tdevpascalsupport.rc b/languages/pascal/kdevpascalsupport.rc index 4335b2a6..4335b2a6 100644 --- a/languages/pascal/tdevpascalsupport.rc +++ b/languages/pascal/kdevpascalsupport.rc diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 3b9d8263..69cbebf8 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -15,7 +15,7 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdebug.h> #include <tdeapplication.h> #include <kstatusbar.h> @@ -23,11 +23,11 @@ #include <antlr/ASTFactory.hpp> #include "catalog.h" -#include <tdevcore.h> -#include <tdevmainwindow.h> -#include <tdevpartcontroller.h> -#include <tdevproject.h> -#include <tdevplugininfo.h> +#include <kdevcore.h> +#include <kdevmainwindow.h> +#include <kdevpartcontroller.h> +#include <kdevproject.h> +#include <kdevplugininfo.h> #include "pascalsupport_part.h" #include "problemreporter.h" @@ -43,16 +43,16 @@ struct PascalSupportPartData{ {} }; -typedef TDevGenericFactory<PascalSupportPart> PascalSupportFactory; -static const TDevPluginInfo data("tdevpascalsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevpascalsupport, PascalSupportFactory( data ) ) +typedef KDevGenericFactory<PascalSupportPart> PascalSupportFactory; +static const KDevPluginInfo data("kdevpascalsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), + : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), d( new PascalSupportPartData() ) { setInstance(PascalSupportFactory::instance()); - setXMLFile("tdevpascalsupport.rc"); + setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), @@ -317,7 +317,7 @@ TQString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sh return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } #include "pascalsupport_part.moc" diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index bac5c25b..5c99c2ae 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -7,11 +7,11 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#ifndef __TDEVPART_PASCALSUPPORT_H__ -#define __TDEVPART_PASCALSUPPORT_H__ +#ifndef __KDEVPART_PASCALSUPPORT_H__ +#define __KDEVPART_PASCALSUPPORT_H__ #include <tqguardedptr.h> -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" class PascalSupportWidget; class KDialogBase; @@ -19,7 +19,7 @@ class TQPopupMenu; class Context; class PascalSupportPartData; -class PascalSupportPart : public TDevLanguageSupport +class PascalSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 0d33aec1..2b477063 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -18,8 +18,8 @@ #include "problemreporter.h" #include "pascalsupport_part.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "configproblemreporter.h" #include "backgroundparser.h" diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt index 01327acb..e458c240 100644 --- a/languages/perl/CMakeLists.txt +++ b/languages/perl/CMakeLists.txt @@ -30,13 +30,13 @@ link_directories( ##### other data ################################ -install( FILES tdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevperlsupport ) +install( FILES kdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevperlsupport ) -##### libtdevperlsupport (module) ############### +##### libkdevperlsupport (module) ############### -tde_add_kpart( libtdevperlsupport AUTOMOC +tde_add_kpart( libkdevperlsupport AUTOMOC SOURCES perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui diff --git a/languages/perl/Makefile.am b/languages/perl/Makefile.am index f498dfd3..fcedfa23 100644 --- a/languages/perl/Makefile.am +++ b/languages/perl/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevperlsupport.la tdeio_perldoc.la -libtdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevperlsupport.la tdeio_perldoc.la +libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui +libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui tdeio_perldoc_la_SOURCES = perldoc.cpp tdeio_perldoc_la_LIBADD = $(LIB_TDEIO) @@ -19,7 +19,7 @@ tdeio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevperlsupport.desktop perldoc.protocol +service_DATA = kdevperlsupport.desktop perldoc.protocol -rcdir = $(kde_datadir)/tdevperlsupport -rc_DATA = tdevperlsupport.rc +rcdir = $(kde_datadir)/kdevperlsupport +rc_DATA = kdevperlsupport.rc diff --git a/languages/perl/app_templates/perlhello/CMakeLists.txt b/languages/perl/app_templates/perlhello/CMakeLists.txt index 6537b51c..bf51d851 100644 --- a/languages/perl/app_templates/perlhello/CMakeLists.txt +++ b/languages/perl/app_templates/perlhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( perlhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/perlhello.tar.gz perlhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - perlhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + perlhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/perl/app_templates/perlhello/Makefile.am b/languages/perl/app_templates/perlhello/Makefile.am index a7987969..b483b35b 100644 --- a/languages/perl/app_templates/perlhello/Makefile.am +++ b/languages/perl/app_templates/perlhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.pl app.tdevelop templateName = perlhello ### 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/perl/app_templates/perlhello/app.tdevelop b/languages/perl/app_templates/perlhello/app.tdevelop index 2ae93215..a83391b7 100644 --- a/languages/perl/app_templates/perlhello/app.tdevelop +++ b/languages/perl/app_templates/perlhello/app.tdevelop @@ -9,7 +9,7 @@ <projectdirectory>.</projectdirectory> <absoluteprojectpath>false</absoluteprojectpath> </general> - <tdevscriptproject> + <kdevscriptproject> <run> <mainprogram>./%{APPNAMELC}.pl</mainprogram> </run> @@ -17,8 +17,8 @@ <includepatterns>*.pl,*.pm</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevdoctreeview> + </kdevscriptproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -65,13 +65,13 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <filetypes/> <useglobaltypes> <type ext="" /> <type ext="pl" /> <type ext="pm" /> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/perl/app_templates/perlhello/perlhello.tdevtemplate b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate index 8ec5a560..8ec5a560 100644 --- a/languages/perl/app_templates/perlhello/perlhello.tdevtemplate +++ b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate diff --git a/languages/perl/doc/CMakeLists.txt b/languages/perl/doc/CMakeLists.txt index 2e8ed498..653dc0d7 100644 --- a/languages/perl/doc/CMakeLists.txt +++ b/languages/perl/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES perl.toc perl_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/perl/doc/Makefile.am b/languages/perl/doc/Makefile.am index b62295ed..dae5d699 100644 --- a/languages/perl/doc/Makefile.am +++ b/languages/perl/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = perl.toc perl_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/perl/file_templates/CMakeLists.txt b/languages/perl/file_templates/CMakeLists.txt index 96c5fa74..7faec8fc 100644 --- a/languages/perl/file_templates/CMakeLists.txt +++ b/languages/perl/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES pl pm - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/perl/file_templates/Makefile.am b/languages/perl/file_templates/Makefile.am index 5dd94646..f1f8457d 100644 --- a/languages/perl/file_templates/Makefile.am +++ b/languages/perl/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = pl pm diff --git a/languages/perl/tdevperlsupport.desktop b/languages/perl/kdevperlsupport.desktop index 472be4f3..9c637679 100644 --- a/languages/perl/tdevperlsupport.desktop +++ b/languages/perl/kdevperlsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=Perl Desteği GenericName[zh_CN]=Perl 支持 GenericName[zh_TW]=Perl 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevperlsupport +X-TDE-Library=libkdevperlsupport X-TDevelop-Version=5 X-TDevelop-Language=Perl diff --git a/languages/perl/tdevperlsupport.rc b/languages/perl/kdevperlsupport.rc index 9f5f4ee9..9f5f4ee9 100644 --- a/languages/perl/tdevperlsupport.rc +++ b/languages/perl/kdevperlsupport.rc diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index ca7b8dff..60cca8f5 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -22,7 +22,7 @@ #include <tqregexp.h> #include <tqfileinfo.h> -perlparser::perlparser(TDevCore* core,CodeModel* model, TQString interpreter) { +perlparser::perlparser(KDevCore* core,CodeModel* model, TQString interpreter) { m_core = core; m_model = model; m_interpreter=interpreter; diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h index 6249ce15..b536596b 100644 --- a/languages/perl/perlparser.h +++ b/languages/perl/perlparser.h @@ -18,7 +18,7 @@ #ifndef PERLPARSER_H #define PERLPARSER_H -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include <codemodel.h> @@ -28,7 +28,7 @@ class perlparser { public: - perlparser(TDevCore* core,CodeModel* model, TQString interpreter); + perlparser(KDevCore* core,CodeModel* model, TQString interpreter); perlparser(); ~perlparser(); @@ -70,7 +70,7 @@ class perlparser { //CodeModel CodeModel* m_model; - TDevCore* m_core; + KDevCore* m_core; FileDom m_file; //this willhav a list of INC paths diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 08627ea5..c8379c77 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -19,24 +19,24 @@ #include <tdeaction.h> #include <tdeapplication.h> #include <kdebug.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tqregexp.h> #include <codemodel.h> #include <tqprogressbar.h> #include <kstatusbar.h> -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include <kprocess.h> #include <stdlib.h> #include <unistd.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" +#include "kdevappfrontend.h" //#include "classstore.h" //#include "parsedclass.h" //#include "parsedmethod.h" @@ -44,16 +44,16 @@ #include "domutil.h" //#include "programmingbycontract.h" -typedef TDevGenericFactory<PerlSupportPart> PerlSupportFactory; -static const TDevPluginInfo data("tdevperlsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevperlsupport, PerlSupportFactory( data ) ) +typedef KDevGenericFactory<PerlSupportPart> PerlSupportFactory; +static const KDevPluginInfo data("kdevperlsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") { setInstance(PerlSupportFactory::instance()); - setXMLFile("tdevperlsupport.rc"); + setXMLFile("kdevperlsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -174,9 +174,9 @@ void PerlSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features PerlSupportPart::features() +KDevLanguageSupport::Features PerlSupportPart::features() { - return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); + return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); // return Functions; } @@ -193,7 +193,7 @@ TQString PerlSupportPart::interpreter() void PerlSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h index b6517bbc..00c6bc69 100644 --- a/languages/perl/perlsupportpart.h +++ b/languages/perl/perlsupportpart.h @@ -12,11 +12,11 @@ #ifndef _PERLSUPPORTPART_H_ #define _PERLSUPPORTPART_H_ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include <codemodel.h> #include "perlparser.h" -class PerlSupportPart : public TDevLanguageSupport +class PerlSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/php/CMakeLists.txt b/languages/php/CMakeLists.txt index 02faa3cc..3a9e4123 100644 --- a/languages/php/CMakeLists.txt +++ b/languages/php/CMakeLists.txt @@ -32,20 +32,20 @@ link_directories( ##### other data ################################ -install( FILES tdevphpsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevphpsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevphpsupport ) -install( FILES phptemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) +install( FILES kdevphpsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevphpsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevphpsupport ) +install( FILES phptemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) -##### libtdevphpsupport (module) ################ +##### libkdevphpsupport (module) ################ -tde_add_kpart( libtdevphpsupport AUTOMOC +tde_add_kpart( libkdevphpsupport AUTOMOC SOURCES phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp - LINK tdevwidgets-shared tdevelop-shared + LINK kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/php/Makefile.am b/languages/php/Makefile.am index bc4bb9d9..a10604e5 100644 --- a/languages/php/Makefile.am +++ b/languages/php/Makefile.am @@ -6,19 +6,19 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = data app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevphpsupport.la -libtdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevphpsupport.la +libkdevphpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevphpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -libtdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp +libkdevphpsupport_la_SOURCES = phpsupportpart.cpp phpconfigwidgetbase.ui phpconfigwidget.cpp phpinfodlg.ui phphtmlview.cpp phperrorview.cpp phpconfigdata.cpp phpcodecompletion.cpp phpparser.cpp phpnewclassdlgbase.ui phpnewclassdlg.cpp phpfile.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevphpsupport.desktop +service_DATA = kdevphpsupport.desktop -rcdir = $(kde_datadir)/tdevphpsupport -rc_DATA = tdevphpsupport.rc +rcdir = $(kde_datadir)/kdevphpsupport +rc_DATA = kdevphpsupport.rc -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = phptemplates diff --git a/languages/php/app_templates/phphello/CMakeLists.txt b/languages/php/app_templates/phphello/CMakeLists.txt index c858f07a..4e534e08 100644 --- a/languages/php/app_templates/phphello/CMakeLists.txt +++ b/languages/php/app_templates/phphello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( phphello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/phphello.tar.gz phphello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - phphello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + phphello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/php/app_templates/phphello/Makefile.am b/languages/php/app_templates/phphello/Makefile.am index c1457307..bc983960 100644 --- a/languages/php/app_templates/phphello/Makefile.am +++ b/languages/php/app_templates/phphello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.php app.tdevelop templateName = phphello ### 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/php/app_templates/phphello/app.tdevelop b/languages/php/app_templates/phphello/app.tdevelop index 961e0f4d..2cdb1c70 100644 --- a/languages/php/app_templates/phphello/app.tdevelop +++ b/languages/php/app_templates/phphello/app.tdevelop @@ -15,13 +15,13 @@ <part>KDevVisualBoyAdvance</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir></activedir> <includepatterns>*.php,*.phps,*.php3,*.inc</includepatterns> </general> - </tdevscriptproject> - <tdevdoctreeview> + </kdevscriptproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -65,23 +65,23 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> -<tdevphpsupport> + </kdevdoctreeview> +<kdevphpsupport> <codeHelp> <codeCompletion>true</codeCompletion> <codeHinting>true</codeHinting> <realtimeParsing>true</realtimeParsing> </codeHelp> -</tdevphpsupport> - <tdevfilecreate> +</kdevphpsupport> + <kdevfilecreate> <useglobaltypes> <type ext="php"/> </useglobaltypes> - </tdevfilecreate> - <tdevfileview> + </kdevfilecreate> + <kdevfileview> <groups> <group pattern="*.php;*.phps;*.php3" name="PHP files" /> <group pattern="*.inc" name="Include files" /> </groups> - </tdevfileview> + </kdevfileview> </tdevelop> diff --git a/languages/php/app_templates/phphello/phphello.tdevtemplate b/languages/php/app_templates/phphello/phphello.kdevtemplate index 481f2748..481f2748 100644 --- a/languages/php/app_templates/phphello/phphello.tdevtemplate +++ b/languages/php/app_templates/phphello/phphello.kdevtemplate diff --git a/languages/php/data/CMakeLists.txt b/languages/php/data/CMakeLists.txt index 1662f9c9..f89943bc 100644 --- a/languages/php/data/CMakeLists.txt +++ b/languages/php/data/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES phpfunctions - DESTINATION ${DATA_INSTALL_DIR}/tdevphpsupport ) + DESTINATION ${DATA_INSTALL_DIR}/kdevphpsupport ) diff --git a/languages/php/data/Makefile.am b/languages/php/data/Makefile.am index c48e5460..e54b0415 100644 --- a/languages/php/data/Makefile.am +++ b/languages/php/data/Makefile.am @@ -1,4 +1,4 @@ -phpsupportdatadir = ${kde_datadir}/tdevphpsupport +phpsupportdatadir = ${kde_datadir}/kdevphpsupport install-data-local: mkdir -p $(DESTDIR)$(phpsupportdatadir) diff --git a/languages/php/doc/CMakeLists.txt b/languages/php/doc/CMakeLists.txt index 8b7e6b10..59ea2199 100644 --- a/languages/php/doc/CMakeLists.txt +++ b/languages/php/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES php.toc php_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/php/doc/Makefile.am b/languages/php/doc/Makefile.am index 2b2ce6aa..163d435b 100644 --- a/languages/php/doc/Makefile.am +++ b/languages/php/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = php.toc php_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/php/file_templates/CMakeLists.txt b/languages/php/file_templates/CMakeLists.txt index 3b034ae7..5de3a576 100644 --- a/languages/php/file_templates/CMakeLists.txt +++ b/languages/php/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES php - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/php/file_templates/Makefile.am b/languages/php/file_templates/Makefile.am index 765157b2..7f031b4a 100644 --- a/languages/php/file_templates/Makefile.am +++ b/languages/php/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = php diff --git a/languages/php/tdevphpsupport.desktop b/languages/php/kdevphpsupport.desktop index 64fe4329..eea6c168 100644 --- a/languages/php/tdevphpsupport.desktop +++ b/languages/php/kdevphpsupport.desktop @@ -80,7 +80,7 @@ GenericName[tr]=PHP Desteği GenericName[zh_CN]=PHP 支持 GenericName[zh_TW]=PHP 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevphpsupport +X-TDE-Library=libkdevphpsupport X-TDevelop-Version=5 X-TDevelop-Language=PHP diff --git a/languages/php/tdevphpsupport.rc b/languages/php/kdevphpsupport.rc index 14ebd3ba..14ebd3ba 100644 --- a/languages/php/tdevphpsupport.rc +++ b/languages/php/kdevphpsupport.rc diff --git a/languages/php/phpcodecompletion.cpp b/languages/php/phpcodecompletion.cpp index 42615f69..af301000 100644 --- a/languages/php/phpcodecompletion.cpp +++ b/languages/php/phpcodecompletion.cpp @@ -21,7 +21,7 @@ #include "phpsupportpart.h" #include "phpconfigdata.h" -#include <tdevcore.h> +#include <kdevcore.h> #include <kinstance.h> #include <kstandarddirs.h> #include <kdebug.h> diff --git a/languages/php/phpcodecompletion.h b/languages/php/phpcodecompletion.h index bac6c44f..65905878 100644 --- a/languages/php/phpcodecompletion.h +++ b/languages/php/phpcodecompletion.h @@ -27,7 +27,7 @@ #include <kregexp.h> #include <tdeparts/part.h> -#include <tdevmainwindow.h> +#include <kdevmainwindow.h> #include <kstatusbar.h> #include <tdetexteditor/editinterface.h> @@ -36,7 +36,7 @@ #include <tdetexteditor/selectioninterface.h> -class TDevCore; +class KDevCore; class PHPSupportPart; class PHPConfigData; diff --git a/languages/php/phperrorview.cpp b/languages/php/phperrorview.cpp index d408afb9..9af14b0d 100644 --- a/languages/php/phperrorview.cpp +++ b/languages/php/phperrorview.cpp @@ -20,9 +20,9 @@ #include "phperrorview.h" #include "phpsupportpart.h" -#include <tdevpartcontroller.h> -#include <tdevmainwindow.h> -#include <tdevproject.h> +#include <kdevpartcontroller.h> +#include <kdevmainwindow.h> +#include <kdevproject.h> #include <tdeversion.h> #include <tdeparts/part.h> diff --git a/languages/php/phpfile.cpp b/languages/php/phpfile.cpp index 1c4e6d04..92d2fc4c 100644 --- a/languages/php/phpfile.cpp +++ b/languages/php/phpfile.cpp @@ -25,7 +25,7 @@ #include <kprocess.h> #include <kdebug.h> -#include <tdevpartcontroller.h> +#include <kdevpartcontroller.h> #include "phphtmlview.h" #include "phperrorview.h" diff --git a/languages/php/phpfile.h b/languages/php/phpfile.h index 647be68a..ac5a4525 100644 --- a/languages/php/phpfile.h +++ b/languages/php/phpfile.h @@ -30,9 +30,9 @@ #include <kprocess.h> #include <kdebug.h> -#include <tdevproject.h> -#include <tdevlanguagesupport.h> -#include <tdevpartcontroller.h> +#include <kdevproject.h> +#include <kdevlanguagesupport.h> +#include <kdevpartcontroller.h> #include <tdetexteditor/editinterface.h> #include <tdetexteditor/document.h> diff --git a/languages/php/phphtmlview.cpp b/languages/php/phphtmlview.cpp index 01123bb8..d21a6fa0 100644 --- a/languages/php/phphtmlview.cpp +++ b/languages/php/phphtmlview.cpp @@ -18,7 +18,7 @@ #include "phphtmlview.h" #include "phpsupportpart.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" PHPHTMLView::PHPHTMLView(PHPSupportPart *part):m_part(part) { setOptions(CanOpenInNewWindow); diff --git a/languages/php/phphtmlview.h b/languages/php/phphtmlview.h index 2da25349..e55be392 100644 --- a/languages/php/phphtmlview.h +++ b/languages/php/phphtmlview.h @@ -18,14 +18,14 @@ #ifndef PHPHTMLVIEW_H #define PHPHTMLVIEW_H -#include <tdevhtmlpart.h> +#include <kdevhtmlpart.h> /** *@author */ class PHPSupportPart; -class PHPHTMLView : public TDevHTMLPart { +class PHPHTMLView : public KDevHTMLPart { Q_OBJECT public: diff --git a/languages/php/phpparser.cpp b/languages/php/phpparser.cpp index 2af89eee..6b725dc8 100644 --- a/languages/php/phpparser.cpp +++ b/languages/php/phpparser.cpp @@ -21,8 +21,8 @@ #include <urlutil.h> #include <tdeapplication.h> -#include <tdevcore.h> -#include <tdevproject.h> +#include <kdevcore.h> +#include <kdevproject.h> #include <codemodel.h> #include <tqregexp.h> diff --git a/languages/php/phpparser.h b/languages/php/phpparser.h index 629e68b6..87093b06 100644 --- a/languages/php/phpparser.h +++ b/languages/php/phpparser.h @@ -31,7 +31,7 @@ #include "phpfile.h" -class TDevCore; +class KDevCore; class PHPSupportPart; /** @@ -56,7 +56,7 @@ public: private: CodeModel* m_model; - TDevCore* m_core; + KDevCore* m_core; PHPSupportPart* m_part; TQMutex m_mutex; diff --git a/languages/php/phpsupportpart.cpp b/languages/php/phpsupportpart.cpp index f5c484a9..4f764f1f 100644 --- a/languages/php/phpsupportpart.cpp +++ b/languages/php/phpsupportpart.cpp @@ -43,13 +43,13 @@ #include <kstatusbar.h> #include <tdeparts/browserextension.h> -#include <tdevcore.h> -#include <tdevproject.h> -#include <tdevmainwindow.h> -#include <tdevpartcontroller.h> +#include <kdevcore.h> +#include <kdevproject.h> +#include <kdevmainwindow.h> +#include <kdevpartcontroller.h> #include <codemodel.h> #include <domutil.h> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include <kiconloader.h> #include "phpconfigdata.h" @@ -66,18 +66,18 @@ using namespace std; -static const TDevPluginInfo data("tdevphpsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevphpsupport, PHPSupportFactory( data ) ) +static const KDevPluginInfo data("kdevphpsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevphpsupport, PHPSupportFactory( data ) ) PHPSupportPart::PHPSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "PHPSupportPart") { m_htmlView = 0; m_parser = 0; phpExeProc = 0; setInstance(PHPSupportFactory::instance()); - setXMLFile("tdevphpsupport.rc"); + setXMLFile("kdevphpsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -545,7 +545,7 @@ TQString PHPSupportPart::getExePath() return configData->getPHPExecPath(); } -TDevLanguageSupport::Features PHPSupportPart::features() +KDevLanguageSupport::Features PHPSupportPart::features() { return Features(Classes | Functions); } diff --git a/languages/php/phpsupportpart.h b/languages/php/phpsupportpart.h index 35203bc7..4dca877b 100644 --- a/languages/php/phpsupportpart.h +++ b/languages/php/phpsupportpart.h @@ -25,9 +25,9 @@ #include <tqprogressbar.h> #include <kdialogbase.h> -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include <tdeio/job.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <tdetexteditor/editinterface.h> @@ -41,7 +41,7 @@ class PHPCodeCompletion; class PHPParser; class PHPFile; -class PHPSupportPart : public TDevLanguageSupport +class PHPSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -129,6 +129,6 @@ private: VariableDom LastVariable; }; -typedef TDevGenericFactory<PHPSupportPart> PHPSupportFactory; +typedef KDevGenericFactory<PHPSupportPart> PHPSupportFactory; #endif diff --git a/languages/python/CMakeLists.txt b/languages/python/CMakeLists.txt index ec9d708b..989ea1b1 100644 --- a/languages/python/CMakeLists.txt +++ b/languages/python/CMakeLists.txt @@ -32,14 +32,14 @@ link_directories( ##### other data ################################ -install( FILES tdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc ) -install( FILES tdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpythonsupport ) +install( FILES kdevpythonsupport.desktop pydoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kde_pydoc.py DESTINATION ${DATA_INSTALL_DIR}/tdeio_pydoc ) +install( FILES kdevpythonsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpythonsupport ) -##### libtdevpythonsupport (module) ############# +##### libkdevpythonsupport (module) ############# -tde_add_kpart( libtdevpythonsupport AUTOMOC +tde_add_kpart( libkdevpythonsupport AUTOMOC SOURCES pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui pythonimplementationwidget.cpp diff --git a/languages/python/Makefile.am b/languages/python/Makefile.am index 12ca5a06..feef469d 100644 --- a/languages/python/Makefile.am +++ b/languages/python/Makefile.am @@ -1,5 +1,5 @@ # Here resides the Python support part. -# Do not confuse this with the python part responsible for TDevelop scripting +# Do not confuse this with the python part responsible for KDevelop scripting INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer_integration \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_builddir)/languages/lib/designer_integration \ @@ -7,12 +7,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/languages/lib/designer SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevpythonsupport.la tdeio_pydoc.la +kde_module_LTLIBRARIES = libkdevpythonsupport.la tdeio_pydoc.la -libtdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +libkdevpythonsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevpythonsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la -libtdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \ +libkdevpythonsupport_la_SOURCES = pythonsupportpart.cpp pythonconfigwidget.cpp pythonconfigwidgetbase.ui \ pythonimplementationwidget.cpp qtdesignerpythonintegration.cpp tdeio_pydoc_la_SOURCES = pydoc.cpp @@ -22,10 +22,10 @@ tdeio_pydoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO slavedir = $(kde_datadir)/tdeio_pydoc -slave_DATA = tde_pydoc.py +slave_DATA = kde_pydoc.py servicedir = $(kde_servicesdir) -service_DATA = tdevpythonsupport.desktop pydoc.protocol +service_DATA = kdevpythonsupport.desktop pydoc.protocol -rcdir = $(kde_datadir)/tdevpythonsupport -rc_DATA = tdevpythonsupport.rc +rcdir = $(kde_datadir)/kdevpythonsupport +rc_DATA = kdevpythonsupport.rc diff --git a/languages/python/app_templates/pyqt/CMakeLists.txt b/languages/python/app_templates/pyqt/CMakeLists.txt index 0beb7976..672d6652 100644 --- a/languages/python/app_templates/pyqt/CMakeLists.txt +++ b/languages/python/app_templates/pyqt/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( pyqt.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/pyqt.tar.gz pyqt.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - pyqt.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + pyqt.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/python/app_templates/pyqt/Makefile.am b/languages/python/app_templates/pyqt/Makefile.am index 7ace4e15..dc12ca69 100644 --- a/languages/python/app_templates/pyqt/Makefile.am +++ b/languages/python/app_templates/pyqt/Makefile.am @@ -6,10 +6,10 @@ dataFiles = app.py app.tdevelop fileopen.pyxpm fileprint.pyxpm \ templateName = pyqt ### 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/python/app_templates/pyqt/app.tdevelop b/languages/python/app_templates/pyqt/app.tdevelop index 7f2743cb..2abb394e 100644 --- a/languages/python/app_templates/pyqt/app.tdevelop +++ b/languages/python/app_templates/pyqt/app.tdevelop @@ -12,15 +12,15 @@ </keywords> <ignoreparts/> </general> - <tdevautoproject> + <kdevautoproject> <general> <activedir/> </general> <run> <mainprogram>./%{APPNAMELC}.py</mainprogram> </run> - </tdevautoproject> - <tdevdoctreeview> + </kdevautoproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -61,8 +61,8 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfileview> + </kdevdoctreeview> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> @@ -71,11 +71,11 @@ <group pattern="*.py" name="Python files" /> <group pattern="*.ui" name="QT Designer files" /> </groups> - </tdevfileview> - <tdevfilecreate> + </kdevfileview> + <kdevfilecreate> <useglobaltypes> <type ext="py"/> <type ext="ui"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/python/app_templates/pyqt/pyqt.tdevtemplate b/languages/python/app_templates/pyqt/pyqt.kdevtemplate index cb0deace..f19e263c 100644 --- a/languages/python/app_templates/pyqt/pyqt.tdevtemplate +++ b/languages/python/app_templates/pyqt/pyqt.kdevtemplate @@ -66,7 +66,7 @@ Archive=pyqt.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/python/app_templates/pythonhello/CMakeLists.txt b/languages/python/app_templates/pythonhello/CMakeLists.txt index d6c3f09c..dfdbbc3b 100644 --- a/languages/python/app_templates/pythonhello/CMakeLists.txt +++ b/languages/python/app_templates/pythonhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( pythonhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/pythonhello.tar.gz pythonhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - pythonhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + pythonhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/python/app_templates/pythonhello/Makefile.am b/languages/python/app_templates/pythonhello/Makefile.am index 7265f7de..2dc4f559 100644 --- a/languages/python/app_templates/pythonhello/Makefile.am +++ b/languages/python/app_templates/pythonhello/Makefile.am @@ -1,10 +1,10 @@ dataFiles = app.py app.tdevelop pythonhello.png templateName = pythonhello ### 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/python/app_templates/pythonhello/app.tdevelop b/languages/python/app_templates/pythonhello/app.tdevelop index a93a999c..9826d145 100644 --- a/languages/python/app_templates/pythonhello/app.tdevelop +++ b/languages/python/app_templates/pythonhello/app.tdevelop @@ -11,15 +11,15 @@ </keywords> <ignoreparts/> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir></activedir> </general> <run> <mainprogram>%{APPNAMELC}.py</mainprogram> </run> - </tdevscriptproject> - <tdevdoctreeview> + </kdevscriptproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -66,8 +66,8 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfileview> + </kdevdoctreeview> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> @@ -75,10 +75,10 @@ <groups> <group pattern="*.py" name="Python files" /> </groups> - </tdevfileview> - <tdevfilecreate> + </kdevfileview> + <kdevfilecreate> <useglobaltypes> <type ext="py"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate index 0e130571..0e130571 100644 --- a/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate +++ b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate diff --git a/languages/python/app_templates/pytk/CMakeLists.txt b/languages/python/app_templates/pytk/CMakeLists.txt index d71c9be1..1a28ddad 100644 --- a/languages/python/app_templates/pytk/CMakeLists.txt +++ b/languages/python/app_templates/pytk/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( pytk.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/pytk.tar.gz pytk.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - pytk.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + pytk.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/python/app_templates/pytk/Makefile.am b/languages/python/app_templates/pytk/Makefile.am index 94fb2122..d1ebe715 100644 --- a/languages/python/app_templates/pytk/Makefile.am +++ b/languages/python/app_templates/pytk/Makefile.am @@ -1,10 +1,10 @@ dataFiles = app.py app.tdevelop pytk.png templateName = pytk ### 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/python/app_templates/pytk/app.tdevelop b/languages/python/app_templates/pytk/app.tdevelop index 95144f90..1482b842 100644 --- a/languages/python/app_templates/pytk/app.tdevelop +++ b/languages/python/app_templates/pytk/app.tdevelop @@ -11,15 +11,15 @@ </keywords> <ignoreparts/> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <activedir></activedir> </general> <run> <mainprogram>%{APPNAMELC}.py</mainprogram> </run> - </tdevscriptproject> - <tdevdoctreeview> + </kdevscriptproject> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -64,8 +64,8 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfileview> + </kdevdoctreeview> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>*.o,*.lo,CVS</hidepatterns> @@ -73,10 +73,10 @@ <groups> <group pattern="*.py" name="Python files" /> </groups> - </tdevfileview> - <tdevfilecreate> + </kdevfileview> + <kdevfilecreate> <useglobaltypes> <type ext="py"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/python/app_templates/pytk/pytk.tdevtemplate b/languages/python/app_templates/pytk/pytk.kdevtemplate index 3b8ac6bc..3b8ac6bc 100644 --- a/languages/python/app_templates/pytk/pytk.tdevtemplate +++ b/languages/python/app_templates/pytk/pytk.kdevtemplate diff --git a/languages/python/doc/CMakeLists.txt b/languages/python/doc/CMakeLists.txt index 49cdea0d..a3caa5fd 100644 --- a/languages/python/doc/CMakeLists.txt +++ b/languages/python/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES python.toc python_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/python/doc/Makefile.am b/languages/python/doc/Makefile.am index 1714c774..5159f5f0 100644 --- a/languages/python/doc/Makefile.am +++ b/languages/python/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = python.toc python_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/python/file_templates/CMakeLists.txt b/languages/python/file_templates/CMakeLists.txt index efd7a0bf..ddc20b95 100644 --- a/languages/python/file_templates/CMakeLists.txt +++ b/languages/python/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES py - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/python/file_templates/Makefile.am b/languages/python/file_templates/Makefile.am index 9073dd5f..0846fdf2 100644 --- a/languages/python/file_templates/Makefile.am +++ b/languages/python/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = py diff --git a/languages/python/tde_pydoc.py b/languages/python/kde_pydoc.py index 0516f172..0516f172 100644..100755 --- a/languages/python/tde_pydoc.py +++ b/languages/python/kde_pydoc.py diff --git a/languages/python/tdevpythonsupport.desktop b/languages/python/kdevpythonsupport.desktop index 973604ff..61f2ff76 100644 --- a/languages/python/tdevpythonsupport.desktop +++ b/languages/python/kdevpythonsupport.desktop @@ -80,6 +80,6 @@ GenericName[tr]=Python Desteği GenericName[zh_CN]=Python 支持 GenericName[zh_TW]=Python 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevpythonsupport +X-TDE-Library=libkdevpythonsupport X-TDevelop-Version=5 X-TDevelop-Language=Python diff --git a/languages/python/tdevpythonsupport.rc b/languages/python/kdevpythonsupport.rc index d19011b8..d19011b8 100644 --- a/languages/python/tdevpythonsupport.rc +++ b/languages/python/kdevpythonsupport.rc diff --git a/languages/python/pydoc.cpp b/languages/python/pydoc.cpp index 43ceb071..bcb38b1e 100644 --- a/languages/python/pydoc.cpp +++ b/languages/python/pydoc.cpp @@ -20,7 +20,7 @@ PydocProtocol::PydocProtocol(const TQCString &pool, const TQCString &app) : SlaveBase("pydoc", pool, app), key() { python = TDEGlobal::dirs()->findExe("python"); - script = locate("data", "tdeio_pydoc/tde_pydoc.py"); + script = locate("data", "tdeio_pydoc/kde_pydoc.py"); } diff --git a/languages/python/pythonconfigwidget.cpp b/languages/python/pythonconfigwidget.cpp index e6915eac..29103705 100644 --- a/languages/python/pythonconfigwidget.cpp +++ b/languages/python/pythonconfigwidget.cpp @@ -20,8 +20,8 @@ PythonConfigWidget::PythonConfigWidget(TQDomDocument &projectDom, TQWidget *parent, const char *name) : PythonConfigWidgetBase(parent, name), dom(projectDom) { - interpreter_edit->setText(DomUtil::readEntry(dom, "/tdepythonsupport/run/interpreter")); - terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/tdepythonsupport/run/terminal")); + interpreter_edit->setText(DomUtil::readEntry(dom, "/kdevpythonsupport/run/interpreter")); + terminal_box->setChecked(DomUtil::readBoolEntry(dom, "/kdevpythonsupport/run/terminal")); } @@ -31,8 +31,8 @@ PythonConfigWidget::~PythonConfigWidget() void PythonConfigWidget::accept() { - DomUtil::writeEntry(dom, "/tdepythonsupport/run/interpreter", interpreter_edit->text()); - DomUtil::writeBoolEntry(dom, "/tdepythonsupport/run/terminal", terminal_box->isChecked()); + DomUtil::writeEntry(dom, "/kdevpythonsupport/run/interpreter", interpreter_edit->text()); + DomUtil::writeBoolEntry(dom, "/kdevpythonsupport/run/terminal", terminal_box->isChecked()); } #include "pythonconfigwidget.moc" diff --git a/languages/python/pythonimplementationwidget.cpp b/languages/python/pythonimplementationwidget.cpp index b89488ef..de351b8e 100644 --- a/languages/python/pythonimplementationwidget.cpp +++ b/languages/python/pythonimplementationwidget.cpp @@ -30,10 +30,10 @@ #include <tdemessagebox.h> #include <filetemplate.h> -#include <tdevlanguagesupport.h> -#include <tdevproject.h> +#include <kdevlanguagesupport.h> +#include <kdevproject.h> -PythonImplementationWidget::PythonImplementationWidget(TDevLanguageSupport* part, +PythonImplementationWidget::PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent, const char* name, bool modal) : ImplementationWidget(part, parent, name, modal) { diff --git a/languages/python/pythonimplementationwidget.h b/languages/python/pythonimplementationwidget.h index bc4a945b..c8e1cbde 100644 --- a/languages/python/pythonimplementationwidget.h +++ b/languages/python/pythonimplementationwidget.h @@ -27,7 +27,7 @@ class PythonImplementationWidget : public ImplementationWidget Q_OBJECT public: - PythonImplementationWidget(TDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); + PythonImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); ~PythonImplementationWidget(); diff --git a/languages/python/pythonsupportpart.cpp b/languages/python/pythonsupportpart.cpp index 279688a6..1f2c7b87 100644 --- a/languages/python/pythonsupportpart.cpp +++ b/languages/python/pythonsupportpart.cpp @@ -12,10 +12,10 @@ #include "pythonsupportpart.h" #include "pythonconfigwidget.h" -#include <tdevcore.h> -#include <tdevproject.h> -#include <tdevappfrontend.h> -#include <tdevpartcontroller.h> +#include <kdevcore.h> +#include <kdevproject.h> +#include <kdevappfrontend.h> +#include <kdevpartcontroller.h> #include <codemodel.h> #include <domutil.h> @@ -29,8 +29,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <tdevgenericfactory.h> -#include <tdevplugininfo.h> +#include <kdevgenericfactory.h> +#include <kdevplugininfo.h> #include <kinputdialog.h> #include <tdelocale.h> #include <tqregexp.h> @@ -38,16 +38,16 @@ #include "qtdesignerpythonintegration.h" #include "pythonimplementationwidget.h" -typedef TDevGenericFactory<PythonSupportPart> PythonSupportFactory; -static const TDevPluginInfo data("tdepythonsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevpythonsupport, PythonSupportFactory( data ) ) +typedef KDevGenericFactory<PythonSupportPart> PythonSupportFactory; +static const KDevPluginInfo data("kdevpythonsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevpythonsupport, PythonSupportFactory( data ) ) PythonSupportPart::PythonSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "PythonSupportPart") { setInstance(PythonSupportFactory::instance()); - setXMLFile("tdepythonsupport.rc"); + setXMLFile("kdevpythonsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -100,7 +100,7 @@ void PythonSupportPart::contextMenu(TQPopupMenu *popup, const Context *context) { m_contextFileName = url.fileName(); 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.")); } } } @@ -217,7 +217,7 @@ void PythonSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features PythonSupportPart::features() +KDevLanguageSupport::Features PythonSupportPart::features() { return Features(Classes | Functions); } @@ -316,7 +316,7 @@ void PythonSupportPart::parse(const TQString &fileName) TQString PythonSupportPart::interpreter() { - TQString prog = DomUtil::readEntry(*projectDom(), "/tdepythonsupport/run/interpreter"); + TQString prog = DomUtil::readEntry(*projectDom(), "/kdevpythonsupport/run/interpreter"); if (prog.isEmpty()) prog = "python"; @@ -326,8 +326,8 @@ TQString PythonSupportPart::interpreter() void PythonSupportPart::startApplication(const TQString &program) { - bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/tdepythonsupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal"); + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } @@ -369,9 +369,9 @@ void PythonSupportPart::slotPydoc() } } -TDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::DesignerType type) +KDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::DesignerType type) { - TDevDesignerIntegration *des = 0; + KDevDesignerIntegration *des = 0; switch (type) { case KInterfaceDesigner::TQtDesigner: @@ -381,7 +381,7 @@ TDevDesignerIntegration *PythonSupportPart::designer(KInterfaceDesigner::Designe PythonImplementationWidget *impl = new PythonImplementationWidget(this); des = new QtDesignerPythonIntegration(this, impl); des->loadSettings(*project()->projectDom(), - "tdepythonsupport/designerintegration"); + "kdevpythonsupport/designerintegration"); m_designers[type] = des; } break; diff --git a/languages/python/pythonsupportpart.h b/languages/python/pythonsupportpart.h index 873e0934..c60a2eb3 100644 --- a/languages/python/pythonsupportpart.h +++ b/languages/python/pythonsupportpart.h @@ -13,14 +13,14 @@ #define _PYTHONSUPPORTPART_H_ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" class KDialogBase; class TQStringList; class TQPopupMenu; class Context; -class PythonSupportPart : public TDevLanguageSupport +class PythonSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -29,7 +29,7 @@ public: PythonSupportPart( TQObject *parent, const char *name, const TQStringList & ); ~PythonSupportPart(); - virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); + virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); public slots: void contextMenu(TQPopupMenu *popup, const Context *context); @@ -60,7 +60,7 @@ private: void maybeParse(const TQString fileName); void parse(const TQString &fileName); - TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers; + TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; TQString m_contextFileName; }; diff --git a/languages/python/qtdesignerpythonintegration.cpp b/languages/python/qtdesignerpythonintegration.cpp index ca8bed51..c1627f18 100644 --- a/languages/python/qtdesignerpythonintegration.cpp +++ b/languages/python/qtdesignerpythonintegration.cpp @@ -31,14 +31,14 @@ #include <tdetexteditor/viewcursorinterface.h> #include <domutil.h> -#include <tdevpartcontroller.h> -#include <tdevcreatefile.h> -#include <tdevlanguagesupport.h> +#include <kdevpartcontroller.h> +#include <kdevcreatefile.h> +#include <kdevlanguagesupport.h> #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerPythonIntegration::QtDesignerPythonIntegration(TDevLanguageSupport* part, ImplementationWidget* impl) +QtDesignerPythonIntegration::QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl) :QtDesignerIntegration(part, impl, false, 0) { } diff --git a/languages/python/qtdesignerpythonintegration.h b/languages/python/qtdesignerpythonintegration.h index 120e6b47..8b171f17 100644 --- a/languages/python/qtdesignerpythonintegration.h +++ b/languages/python/qtdesignerpythonintegration.h @@ -27,7 +27,7 @@ class QtDesignerPythonIntegration : public QtDesignerIntegration Q_OBJECT public: - QtDesignerPythonIntegration(TDevLanguageSupport* part, ImplementationWidget* impl); + QtDesignerPythonIntegration(KDevLanguageSupport* part, ImplementationWidget* impl); ~QtDesignerPythonIntegration(); diff --git a/languages/ruby/CMakeLists.txt b/languages/ruby/CMakeLists.txt index 8418c5c9..2f1a231e 100644 --- a/languages/ruby/CMakeLists.txt +++ b/languages/ruby/CMakeLists.txt @@ -33,15 +33,15 @@ link_directories( ##### other data ################################ -install( FILES tdevrubysupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES rubytemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) -install( FILES tdevrubysupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevrubysupport ) -install( FILES ruby_config.png ruby_run.png DESTINATION ${DATA_INSTALL_DIR}/tdevrubysupport/pics ) +install( FILES kdevrubysupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES rubytemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) +install( FILES kdevrubysupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevrubysupport ) +install( FILES ruby_config.png ruby_run.png DESTINATION ${DATA_INSTALL_DIR}/kdevrubysupport/pics ) -##### libtdevrubysupport (module) ############### +##### libkdevrubysupport (module) ############### -tde_add_kpart( libtdevrubysupport AUTOMOC +tde_add_kpart( libkdevrubysupport AUTOMOC SOURCES rubysupport_part.cpp rubyconfigwidgetbase.ui rubyconfigwidget.cpp qtdesignerrubyintegration.cpp diff --git a/languages/ruby/Makefile.am b/languages/ruby/Makefile.am index 95a632cc..e0a3612b 100644 --- a/languages/ruby/Makefile.am +++ b/languages/ruby/Makefile.am @@ -7,25 +7,25 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \ SUBDIRS = app_templates file_templates doc debugger -kde_module_LTLIBRARIES = libtdevrubysupport.la -libtdevrubysupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevrubysupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/util/libtdevutil.la +kde_module_LTLIBRARIES = libkdevrubysupport.la +libkdevrubysupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevrubysupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/util/libkdevutil.la -libtdevrubysupport_la_SOURCES = rubysupport_part.cpp rubyconfigwidgetbase.ui \ +libkdevrubysupport_la_SOURCES = rubysupport_part.cpp rubyconfigwidgetbase.ui \ rubyconfigwidget.cpp qtdesignerrubyintegration.cpp rubyimplementationwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevrubysupport.desktop +service_DATA = kdevrubysupport.desktop -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = rubytemplates -rcdir = $(kde_datadir)/tdevrubysupport -rc_DATA = tdevrubysupport.rc +rcdir = $(kde_datadir)/kdevrubysupport +rc_DATA = kdevrubysupport.rc -picsdirdir = $(kde_datadir)/tdevrubysupport/pics +picsdirdir = $(kde_datadir)/kdevrubysupport/pics picsdir_DATA = ruby_config.png ruby_run.png noinst_HEADERS = qtdesignerrubyintegration.h rubyimplementationwidget.h diff --git a/languages/ruby/app_templates/CMakeLists.txt b/languages/ruby/app_templates/CMakeLists.txt index 9e642f8e..1f8c054a 100644 --- a/languages/ruby/app_templates/CMakeLists.txt +++ b/languages/ruby/app_templates/CMakeLists.txt @@ -13,7 +13,7 @@ add_subdirectory( rubyhello ) add_subdirectory( qtruby ) add_subdirectory( qtrubyapp ) add_subdirectory( dcopservice ) -add_subdirectory( tdeapp ) +add_subdirectory( kapp ) add_subdirectory( kxt ) add_subdirectory( rails ) add_subdirectory( qtruby4app ) diff --git a/languages/ruby/app_templates/Makefile.am b/languages/ruby/app_templates/Makefile.am index 9e02a942..3150485b 100644 --- a/languages/ruby/app_templates/Makefile.am +++ b/languages/ruby/app_templates/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = rubyhello qtruby qtrubyapp dcopservice tdeapp kxt rails qtruby4app +SUBDIRS = rubyhello qtruby qtrubyapp dcopservice kapp kxt rails qtruby4app profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/ScriptingLanguageIDE/RubyIDE profiles_DATA = ruby.appwizard diff --git a/languages/ruby/app_templates/dcopservice/CMakeLists.txt b/languages/ruby/app_templates/dcopservice/CMakeLists.txt index c971b3cd..f673e72c 100644 --- a/languages/ruby/app_templates/dcopservice/CMakeLists.txt +++ b/languages/ruby/app_templates/dcopservice/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( dcopserviceruby.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dcopserviceruby.tar.gz dcopserviceruby.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - dcopserviceruby.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + dcopserviceruby.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/dcopservice/Makefile.am b/languages/ruby/app_templates/dcopservice/Makefile.am index 3d7668ef..a7193d6a 100644 --- a/languages/ruby/app_templates/dcopservice/Makefile.am +++ b/languages/ruby/app_templates/dcopservice/Makefile.am @@ -4,10 +4,10 @@ dataFiles = dcopservice.desktop app.cpp app-configure.in.in \ templateName = dcopserviceruby ### 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/ruby/app_templates/dcopservice/dcopservice.tdevelop b/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop index a1b10215..437aa315 100644 --- a/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop +++ b/languages/ruby/app_templates/dcopservice/dcopservice.tdevelop @@ -13,22 +13,22 @@ <keyword>KDE</keyword> </keywords> </general> - <tdevautoproject> + <kdevautoproject> <general> <activedir/> </general> <run> <mainprogram>src/%{APPNAMELC}</mainprogram> </run> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <groups> <group pattern="*.rb" name="Sources" /> <group pattern="*.po;*.ts" name="Translations" /> <group pattern="*" name="Others" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -63,29 +63,29 @@ <ignoreqt_xml> <toc>qmake User Guide</toc> </ignoreqt_xml> - </tdevdoctreeview> - <tdevdebugger> + </kdevdoctreeview> + <kdevdebugger> <general> <dbgshell>libtool</dbgshell> </general> - </tdevdebugger> - <tdevfilecreate> + </kdevdebugger> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <terminal>false</terminal> <charactercoding>3</charactercoding> <mainprogram>src/main.rb</mainprogram> </run> - </tdevrubysupport> - <tdevdocumentation> + </kdevrubysupport> + <kdevdocumentation> <projectdoc> <docsystem>Doxygen Documentation Collection</docsystem> <docurl>%{APPNAMELC}.tag</docurl> </projectdoc> - </tdevdocumentation> + </kdevdocumentation> </tdevelop> diff --git a/languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate index 0bcb93cb..fbadd4e3 100644 --- a/languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate +++ b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate @@ -66,11 +66,11 @@ Archive=dcopserviceruby.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/ruby/app_templates/tdeapp/CMakeLists.txt b/languages/ruby/app_templates/kapp/CMakeLists.txt index 598ce743..6817278b 100644 --- a/languages/ruby/app_templates/tdeapp/CMakeLists.txt +++ b/languages/ruby/app_templates/kapp/CMakeLists.txt @@ -9,8 +9,8 @@ # ################################################# -add_custom_target( tdeappruby.tar.gz ALL - COMMAND tar zcf tdeappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( kappruby.tar.gz ALL + COMMAND tar zcf kappruby.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb app.cpp appui.rc app.desktop app.tdevelop app-Makefile.am app-configure.in.in src-Makefile.am subdirs README @@ -18,10 +18,10 @@ add_custom_target( tdeappruby.tar.gz ALL install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdeappruby.tar.gz tdeappruby.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + ${CMAKE_CURRENT_BINARY_DIR}/kappruby.tar.gz kappruby.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeappruby.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kappruby.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/tdeapp/Makefile.am b/languages/ruby/app_templates/kapp/Makefile.am index ff783b87..9dbc37b5 100644 --- a/languages/ruby/app_templates/tdeapp/Makefile.am +++ b/languages/ruby/app_templates/kapp/Makefile.am @@ -2,13 +2,13 @@ dataFiles = app_client.rb appiface.rb app.rb appview.rb main.rb pref.rb app.cpp appui.rc app.desktop app.tdevelop app-Makefile.am app-configure.in.in \ src-Makefile.am subdirs README -templateName = tdeappruby +templateName = kappruby ### 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/ruby/app_templates/tdeapp/README b/languages/ruby/app_templates/kapp/README index 39de8b2f..39de8b2f 100644 --- a/languages/ruby/app_templates/tdeapp/README +++ b/languages/ruby/app_templates/kapp/README diff --git a/languages/ruby/app_templates/tdeapp/app-Makefile.am b/languages/ruby/app_templates/kapp/app-Makefile.am index bfe1c599..bfe1c599 100644 --- a/languages/ruby/app_templates/tdeapp/app-Makefile.am +++ b/languages/ruby/app_templates/kapp/app-Makefile.am diff --git a/languages/ruby/app_templates/tdeapp/app-configure.in.in b/languages/ruby/app_templates/kapp/app-configure.in.in index 7d849466..7d849466 100644 --- a/languages/ruby/app_templates/tdeapp/app-configure.in.in +++ b/languages/ruby/app_templates/kapp/app-configure.in.in diff --git a/languages/ruby/app_templates/tdeapp/app.cpp b/languages/ruby/app_templates/kapp/app.cpp index 04770335..04770335 100644 --- a/languages/ruby/app_templates/tdeapp/app.cpp +++ b/languages/ruby/app_templates/kapp/app.cpp diff --git a/languages/ruby/app_templates/tdeapp/app.desktop b/languages/ruby/app_templates/kapp/app.desktop index 4587fd3c..4587fd3c 100644 --- a/languages/ruby/app_templates/tdeapp/app.desktop +++ b/languages/ruby/app_templates/kapp/app.desktop diff --git a/languages/ruby/app_templates/tdeapp/app.rb b/languages/ruby/app_templates/kapp/app.rb index 61531be2..61531be2 100644 --- a/languages/ruby/app_templates/tdeapp/app.rb +++ b/languages/ruby/app_templates/kapp/app.rb diff --git a/languages/ruby/app_templates/tdeapp/app.tdevelop b/languages/ruby/app_templates/kapp/app.tdevelop index d416fcdb..5c57b8fb 100644 --- a/languages/ruby/app_templates/tdeapp/app.tdevelop +++ b/languages/ruby/app_templates/kapp/app.tdevelop @@ -15,18 +15,18 @@ <part>KDevDoxygen</part> <part>KDevdistpart</part> <part>KDevVisualBoyAdvance</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevautoproject> + <kdevautoproject> <general> <activedir/> </general> <run> <mainprogram>src/%{APPNAMELC}</mainprogram> </run> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>CVS,.svn</hidepatterns> @@ -35,8 +35,8 @@ <group pattern="*.rb" name="Ruby files" /> <group pattern="*.ui" name="QT Designer files" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -72,19 +72,19 @@ <toc>w3c-uaag10</toc> <toc>wxwindows_bugs</toc> </ignoretocs> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> <type ext="ui"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <terminal>false</terminal> <charactercoding>3</charactercoding> <mainprogram>src/main.rb</mainprogram> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/tdeapp/app_client.rb b/languages/ruby/app_templates/kapp/app_client.rb index b08e9b21..b08e9b21 100644 --- a/languages/ruby/app_templates/tdeapp/app_client.rb +++ b/languages/ruby/app_templates/kapp/app_client.rb diff --git a/languages/ruby/app_templates/tdeapp/appiface.rb b/languages/ruby/app_templates/kapp/appiface.rb index a8be16b5..a8be16b5 100644 --- a/languages/ruby/app_templates/tdeapp/appiface.rb +++ b/languages/ruby/app_templates/kapp/appiface.rb diff --git a/languages/ruby/app_templates/tdeapp/appui.rc b/languages/ruby/app_templates/kapp/appui.rc index ceb4f14e..ceb4f14e 100644 --- a/languages/ruby/app_templates/tdeapp/appui.rc +++ b/languages/ruby/app_templates/kapp/appui.rc diff --git a/languages/ruby/app_templates/tdeapp/appview.rb b/languages/ruby/app_templates/kapp/appview.rb index e7aabe3c..e7aabe3c 100644 --- a/languages/ruby/app_templates/tdeapp/appview.rb +++ b/languages/ruby/app_templates/kapp/appview.rb diff --git a/languages/ruby/app_templates/tdeapp/tdeappruby.tdevtemplate b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate index 8a4c0320..368e0705 100644 --- a/languages/ruby/app_templates/tdeapp/tdeappruby.tdevtemplate +++ b/languages/ruby/app_templates/kapp/kappruby.kdevtemplate @@ -30,7 +30,7 @@ Name[sv]=Programramverk Name[tr]=Uygulama Çatısı Name[zh_CN]=应用程序框架 Name[zh_TW]=應用程式框架 -Icon=tdeapp.png +Icon=kapp.png Category=Ruby/KDE Comment=Generates a simple Korundum application with one toplevel window, menus and toolbars. A DCOP interface is also provided, so that your application can provide a scripting interface Comment[ca]=Genera una simple aplicació Korundum amb una finestra principal, menús i barres d'eines. També es proveeix la interfície DCOP, de manera que la vostra aplicació podrà proveir d'una interfície per a scripts @@ -60,15 +60,15 @@ Comment[tr]=Bir üst seviye penceresi, menüleri ve araç çubukları olan basit Comment[zh_TW]=產生一個簡單的 Korundum 應用程式，內含頂層視窗、選單與工具列。另外提供一個 DCOP 介面，讓您的應用程式可以使用文稿介面。 FileTemplates=rb,ShellStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}.rb -Archive=tdeappruby.tar.gz +Archive=kappruby.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/ruby/app_templates/tdeapp/tdeappruby.png b/languages/ruby/app_templates/kapp/kappruby.png Binary files differindex 913ebb87..913ebb87 100644 --- a/languages/ruby/app_templates/tdeapp/tdeappruby.png +++ b/languages/ruby/app_templates/kapp/kappruby.png diff --git a/languages/ruby/app_templates/tdeapp/main.rb b/languages/ruby/app_templates/kapp/main.rb index 47235013..47235013 100644 --- a/languages/ruby/app_templates/tdeapp/main.rb +++ b/languages/ruby/app_templates/kapp/main.rb diff --git a/languages/ruby/app_templates/tdeapp/pref.rb b/languages/ruby/app_templates/kapp/pref.rb index 98669ad2..98669ad2 100644 --- a/languages/ruby/app_templates/tdeapp/pref.rb +++ b/languages/ruby/app_templates/kapp/pref.rb diff --git a/languages/ruby/app_templates/tdeapp/src-Makefile.am b/languages/ruby/app_templates/kapp/src-Makefile.am index acb41899..acb41899 100644 --- a/languages/ruby/app_templates/tdeapp/src-Makefile.am +++ b/languages/ruby/app_templates/kapp/src-Makefile.am diff --git a/languages/ruby/app_templates/tdeapp/subdirs b/languages/ruby/app_templates/kapp/subdirs index 0e678106..0e678106 100644 --- a/languages/ruby/app_templates/tdeapp/subdirs +++ b/languages/ruby/app_templates/kapp/subdirs diff --git a/languages/ruby/app_templates/kxt/CMakeLists.txt b/languages/ruby/app_templates/kxt/CMakeLists.txt index 482d5e24..539cfdb6 100644 --- a/languages/ruby/app_templates/kxt/CMakeLists.txt +++ b/languages/ruby/app_templates/kxt/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( kxtruby.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kxtruby.tar.gz kxtruby.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kxtruby.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kxtruby.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/kxt/Makefile.am b/languages/ruby/app_templates/kxt/Makefile.am index 66b2b259..2ea8cf5b 100644 --- a/languages/ruby/app_templates/kxt/Makefile.am +++ b/languages/ruby/app_templates/kxt/Makefile.am @@ -6,10 +6,10 @@ dataFiles = app.rb main.rb prefs.rb app.cpp appview.rb appview_base.ui prefs-bas templateName = kxtruby ### 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/ruby/app_templates/kxt/app.tdevelop b/languages/ruby/app_templates/kxt/app.tdevelop index d416fcdb..5c57b8fb 100644 --- a/languages/ruby/app_templates/kxt/app.tdevelop +++ b/languages/ruby/app_templates/kxt/app.tdevelop @@ -15,18 +15,18 @@ <part>KDevDoxygen</part> <part>KDevdistpart</part> <part>KDevVisualBoyAdvance</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevautoproject> + <kdevautoproject> <general> <activedir/> </general> <run> <mainprogram>src/%{APPNAMELC}</mainprogram> </run> - </tdevautoproject> - <tdevfileview> + </kdevautoproject> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>CVS,.svn</hidepatterns> @@ -35,8 +35,8 @@ <group pattern="*.rb" name="Ruby files" /> <group pattern="*.ui" name="QT Designer files" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -72,19 +72,19 @@ <toc>w3c-uaag10</toc> <toc>wxwindows_bugs</toc> </ignoretocs> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> <type ext="ui"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <terminal>false</terminal> <charactercoding>3</charactercoding> <mainprogram>src/main.rb</mainprogram> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/kxt/kxtruby.tdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate index f17db17b..e4756e1d 100644 --- a/languages/ruby/app_templates/kxt/kxtruby.tdevtemplate +++ b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate @@ -67,11 +67,11 @@ Archive=kxtruby.tar.gz [ADMIN] Type=include -File=%{tdevelop}/template-common/admin.tdevtemplate +File=%{tdevelop}/template-common/admin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/ruby/app_templates/qtruby/CMakeLists.txt b/languages/ruby/app_templates/qtruby/CMakeLists.txt index edbe6376..beac7f1f 100644 --- a/languages/ruby/app_templates/qtruby/CMakeLists.txt +++ b/languages/ruby/app_templates/qtruby/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( qtruby.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtruby.tar.gz qtruby.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtruby.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtruby.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/qtruby/Makefile.am b/languages/ruby/app_templates/qtruby/Makefile.am index a822765c..919a69f5 100644 --- a/languages/ruby/app_templates/qtruby/Makefile.am +++ b/languages/ruby/app_templates/qtruby/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.rb app.tdevelop app-Makefile app.filelist README templateName = qtruby ### 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/ruby/app_templates/qtruby/app.filelist b/languages/ruby/app_templates/qtruby/app.filelist index 2458459f..202beb22 100644 --- a/languages/ruby/app_templates/qtruby/app.filelist +++ b/languages/ruby/app_templates/qtruby/app.filelist @@ -1,2 +1,2 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List %{APPNAMELC}.rb diff --git a/languages/ruby/app_templates/qtruby/app.tdevelop b/languages/ruby/app_templates/qtruby/app.tdevelop index ad09b42c..3b59130c 100644 --- a/languages/ruby/app_templates/qtruby/app.tdevelop +++ b/languages/ruby/app_templates/qtruby/app.tdevelop @@ -4,7 +4,7 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>Ruby</primarylanguage> <keywords> <keyword>Ruby</keyword> @@ -14,15 +14,15 @@ <part>KDevDoxygen</part> <part>KDevdistpart</part> <part>KDevVisualBoyAdvance</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevcustomproject> + <kdevcustomproject> <general> <activedir/> </general> - </tdevcustomproject> - <tdevfileview> + </kdevcustomproject> + <kdevfileview> <tree> <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>CVS,.svn</hidepatterns> @@ -31,8 +31,8 @@ <group pattern="*.rb" name="Ruby files" /> <group pattern="*.ui" name="QT Designer files" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -68,18 +68,18 @@ <toc>w3c-uaag10</toc> <toc>wxwindows_bugs</toc> </ignoretocs> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> <type ext="ui"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <mainprogram>./%{APPNAMELC}.rb</mainprogram> <interpreter>ruby</interpreter> <terminal>false</terminal> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/qtruby/qtruby.tdevtemplate b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate index da8500dc..da8500dc 100644 --- a/languages/ruby/app_templates/qtruby/qtruby.tdevtemplate +++ b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate diff --git a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt index 9bf5e3b6..e5045380 100644 --- a/languages/ruby/app_templates/qtruby4app/CMakeLists.txt +++ b/languages/ruby/app_templates/qtruby4app/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( qtruby4app.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtruby4app.tar.gz qtruby4app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtruby4app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtruby4app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/qtruby4app/Makefile.am b/languages/ruby/app_templates/qtruby4app/Makefile.am index 09709aed..8f4adecd 100644 --- a/languages/ruby/app_templates/qtruby4app/Makefile.am +++ b/languages/ruby/app_templates/qtruby4app/Makefile.am @@ -5,10 +5,10 @@ dataFiles = main.rb qtruby4app.rb qtruby4app.png qtruby4app.tdevelop \ templateName = qtruby4app ### 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/ruby/app_templates/qtruby4app/app.filelist b/languages/ruby/app_templates/qtruby4app/app.filelist index 23f4bc76..339e6998 100644 --- a/languages/ruby/app_templates/qtruby4app/app.filelist +++ b/languages/ruby/app_templates/qtruby4app/app.filelist @@ -1,3 +1,3 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List main.rb %{APPNAMELC}.rb diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevtemplate b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate index 70df2248..70df2248 100644 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevtemplate +++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.kdevtemplate diff --git a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop index 84a1a8e3..3df7f3ab 100644 --- a/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop +++ b/languages/ruby/app_templates/qtruby4app/qtruby4app.tdevelop @@ -4,19 +4,19 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>Ruby</primarylanguage> <keywords> <keyword>Ruby</keyword> <keyword>Qt</keyword> </keywords> </general> - <tdevcustomproject> + <kdevcustomproject> <general> <activedir/> </general> - </tdevcustomproject> - <tdevfileview> + </kdevcustomproject> + <kdevfileview> <groups> <group pattern="*.rb" name="Ruby files" /> <group pattern="*.ui" name="QT Designer files" /> @@ -27,8 +27,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>CVS,.svn</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -63,21 +63,21 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> + </kdevdoctreeview> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="rb" /> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <terminal>false</terminal> <mainprogram>./main.rb</mainprogram> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt index c0a0429e..37f6e5b1 100644 --- a/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt +++ b/languages/ruby/app_templates/qtrubyapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qtrubyapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtrubyapp.tar.gz qtrubyapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtrubyapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtrubyapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/qtrubyapp/Makefile.am b/languages/ruby/app_templates/qtrubyapp/Makefile.am index 2ea3aa4b..7777b886 100644 --- a/languages/ruby/app_templates/qtrubyapp/Makefile.am +++ b/languages/ruby/app_templates/qtrubyapp/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.rb qtrubyapp.rb qtrubyapp.png qtrubyapp.tdevelop \ templateName = qtrubyapp ### 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/ruby/app_templates/qtrubyapp/app.filelist b/languages/ruby/app_templates/qtrubyapp/app.filelist index 23f4bc76..339e6998 100644 --- a/languages/ruby/app_templates/qtrubyapp/app.filelist +++ b/languages/ruby/app_templates/qtrubyapp/app.filelist @@ -1,3 +1,3 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List main.rb %{APPNAMELC}.rb diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevtemplate b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate index 3e2c896a..3e2c896a 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevtemplate +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.kdevtemplate diff --git a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop index 84a1a8e3..3df7f3ab 100644 --- a/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop +++ b/languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevelop @@ -4,19 +4,19 @@ <author>%{AUTHOR}</author> <email>%{EMAIL}</email> <version>%{VERSION}</version> - <projectmanagement>TDevCustomProject</projectmanagement> + <projectmanagement>KDevCustomProject</projectmanagement> <primarylanguage>Ruby</primarylanguage> <keywords> <keyword>Ruby</keyword> <keyword>Qt</keyword> </keywords> </general> - <tdevcustomproject> + <kdevcustomproject> <general> <activedir/> </general> - </tdevcustomproject> - <tdevfileview> + </kdevcustomproject> + <kdevfileview> <groups> <group pattern="*.rb" name="Ruby files" /> <group pattern="*.ui" name="QT Designer files" /> @@ -27,8 +27,8 @@ <hidenonprojectfiles>false</hidenonprojectfiles> <hidepatterns>CVS,.svn</hidepatterns> </tree> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>bash</toc> <toc>bash_bugs</toc> @@ -63,21 +63,21 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> + </kdevdoctreeview> <workspace> <openfiles/> </workspace> - <tdevfilecreate> + <kdevfilecreate> <useglobaltypes> <type ext="ui" /> <type ext="rb" /> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <terminal>false</terminal> <mainprogram>./main.rb</mainprogram> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/rails/CMakeLists.txt b/languages/ruby/app_templates/rails/CMakeLists.txt index 8d8fb1e2..6f53dd0d 100644 --- a/languages/ruby/app_templates/rails/CMakeLists.txt +++ b/languages/ruby/app_templates/rails/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( rails.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/rails.tar.gz rails.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - rails.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + rails.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/rails/Makefile.am b/languages/ruby/app_templates/rails/Makefile.am index 915e789c..9d89a708 100644 --- a/languages/ruby/app_templates/rails/Makefile.am +++ b/languages/ruby/app_templates/rails/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.tdevelop templateName= rails ### 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/ruby/app_templates/rails/app.tdevelop b/languages/ruby/app_templates/rails/app.tdevelop index 272185c7..17a0e6a1 100644 --- a/languages/ruby/app_templates/rails/app.tdevelop +++ b/languages/ruby/app_templates/rails/app.tdevelop @@ -13,16 +13,16 @@ <part>KDevDoxygen</part> <part>KDevdistpart</part> <part>KDevVisualBoyAdvance</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <includepatterns>*.rb,*.rhtml,*.rxml,*.rjs,*.css,*.js,*.html.erb,*.js.rjs,*.xml.builder</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.rb" name="Scripts" /> <group pattern="*.css" name="StyleSheets" /> @@ -34,8 +34,8 @@ <group pattern="*.gif,*.jpg,*.png,*.ico" name="Images" /> <group pattern="*.html,*.cgi,*.fcgi,*.txt" name="Public" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -82,8 +82,8 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> <type ext="rhtml"/> @@ -95,13 +95,13 @@ <type ext="css"/> <type ext="js"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <interpreter>ruby</interpreter> <shell>%{dest}/script/console</shell> <terminal>false</terminal> <mainprogram>script/server</mainprogram> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/rails/rails.tdevtemplate b/languages/ruby/app_templates/rails/rails.kdevtemplate index 5ed2d78d..5ed2d78d 100644 --- a/languages/ruby/app_templates/rails/rails.tdevtemplate +++ b/languages/ruby/app_templates/rails/rails.kdevtemplate diff --git a/languages/ruby/app_templates/ruby.appwizard b/languages/ruby/app_templates/ruby.appwizard index b5937b62..726daeed 100644 --- a/languages/ruby/app_templates/ruby.appwizard +++ b/languages/ruby/app_templates/ruby.appwizard @@ -1,2 +1,2 @@ [General] -List=rubyhello,qtruby,qtrubyapp,dcopserviceruby,tdeappruby,kxtruby,rails +List=rubyhello,qtruby,qtrubyapp,dcopserviceruby,kappruby,kxtruby,rails diff --git a/languages/ruby/app_templates/rubyhello/CMakeLists.txt b/languages/ruby/app_templates/rubyhello/CMakeLists.txt index 103d97e9..74da59e4 100644 --- a/languages/ruby/app_templates/rubyhello/CMakeLists.txt +++ b/languages/ruby/app_templates/rubyhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( rubyhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/rubyhello.tar.gz rubyhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - rubyhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + rubyhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ruby/app_templates/rubyhello/Makefile.am b/languages/ruby/app_templates/rubyhello/Makefile.am index 9afc2af8..5d20526e 100644 --- a/languages/ruby/app_templates/rubyhello/Makefile.am +++ b/languages/ruby/app_templates/rubyhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.rb app.tdevelop templateName= rubyhello ### 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/ruby/app_templates/rubyhello/app.tdevelop b/languages/ruby/app_templates/rubyhello/app.tdevelop index 2023467f..c938d122 100644 --- a/languages/ruby/app_templates/rubyhello/app.tdevelop +++ b/languages/ruby/app_templates/rubyhello/app.tdevelop @@ -13,21 +13,21 @@ <part>KDevDoxygen</part> <part>KDevdistpart</part> <part>KDevVisualBoyAdvance</part> - <part>TDevDebugger</part> + <part>KDevDebugger</part> </ignoreparts> </general> - <tdevscriptproject> + <kdevscriptproject> <general> <includepatterns>*.rb</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.rb" name="Scripts" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -74,18 +74,18 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="rb"/> </useglobaltypes> - </tdevfilecreate> - <tdevrubysupport> + </kdevfilecreate> + <kdevrubysupport> <run> <mainprogram>./%{APPNAMELC}.rb</mainprogram> <interpreter>ruby</interpreter> <terminal>false</terminal> </run> - </tdevrubysupport> + </kdevrubysupport> </tdevelop> diff --git a/languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate index bce79ff9..bce79ff9 100644 --- a/languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate +++ b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate diff --git a/languages/ruby/debugger/CMakeLists.txt b/languages/ruby/debugger/CMakeLists.txt index 7fb74000..8290afd7 100644 --- a/languages/ruby/debugger/CMakeLists.txt +++ b/languages/ruby/debugger/CMakeLists.txt @@ -29,20 +29,20 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevrbdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES debuggee.rb DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger ) -install( FILES tdevrbdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger ) +install( FILES kdevrbdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES debuggee.rb DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger ) +install( FILES kdevrbdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger ) -##### libtdevrbdebugger (module) ################ +##### libkdevrbdebugger (module) ################ -tde_add_kpart( libtdevrbdebugger AUTOMOC +tde_add_kpart( libkdevrbdebugger AUTOMOC SOURCES debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp - LINK lang_debugger-shared tdevwidgets-shared tdevelop-shared + LINK lang_debugger-shared kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/ruby/debugger/Makefile.am b/languages/ruby/debugger/Makefile.am index 0bbe445b..88e03f03 100644 --- a/languages/ruby/debugger/Makefile.am +++ b/languages/ruby/debugger/Makefile.am @@ -4,22 +4,22 @@ INCLUDES = -I$(top_srcdir)/languages/lib/debugger \ -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevrbdebugger.la -libtdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \ +kde_module_LTLIBRARIES = libkdevrbdebugger.la +libkdevrbdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevrbdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \ $(top_builddir)/languages/lib/debugger/liblang_debugger.la -libtdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp +libkdevrbdebugger_la_SOURCES = debuggerpart.cpp dbgcontroller.cpp rdbcontroller.cpp dbgcommand.cpp rdbcommand.cpp rdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp rdbbreakpointwidget.cpp framestackwidget.cpp dbgpsdlg.cpp dbgtoolbar.cpp rdboutputwidget.cpp rdbtable.cpp METASOURCES = AUTO KDE_ICON = AUTO rubysrc_DATA = debuggee.rb -rubysrcdir = $(kde_datadir)/tdevrbdebugger +rubysrcdir = $(kde_datadir)/kdevrbdebugger servicedir = $(kde_servicesdir) -service_DATA = tdevrbdebugger.desktop +service_DATA = kdevrbdebugger.desktop -rcdir = $(kde_datadir)/tdevrbdebugger -rc_DATA = tdevrbdebugger.rc +rcdir = $(kde_datadir)/kdevrbdebugger +rc_DATA = kdevrbdebugger.rc noinst_HEADERS = rdbtable.h diff --git a/languages/ruby/debugger/debuggerpart.cpp b/languages/ruby/debugger/debuggerpart.cpp index 9d0c9767..35e6a2d2 100644 --- a/languages/ruby/debugger/debuggerpart.cpp +++ b/languages/ruby/debugger/debuggerpart.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kiconloader.h> #include <tdelocale.h> #include <tdemainwindow.h> @@ -40,12 +40,12 @@ #include <kstringhandler.h> #include <kstandarddirs.h> -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" -#include "tdevdebugger.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" +#include "kdevdebugger.h" #include "domutil.h" #include "variablewidget.h" #include "rdbbreakpointwidget.h" @@ -61,25 +61,25 @@ #include <iostream> -#include <tdevplugininfo.h> +#include <kdevplugininfo.h> #include <debugger.h> namespace RDBDebugger { -static const TDevPluginInfo data("tdevrbdebugger"); +static const KDevPluginInfo data("kdevrbdebugger"); -typedef TDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevrbdebugger, RubyDebuggerFactory( data ) ) +typedef KDevGenericFactory<RubyDebuggerPart> RubyDebuggerFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevrbdebugger, RubyDebuggerFactory( data ) ) RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : - TDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ), + KDevPlugin( &data, parent, name ? name : "RubyDebuggerPart" ), controller(0) { // setObjId("RubyDebuggerInterface"); setInstance(RubyDebuggerFactory::instance()); - setXMLFile("tdevrbdebugger.rc"); + setXMLFile("kdevrbdebugger.rc"); m_debugger = new Debugger( partController() ); @@ -245,8 +245,8 @@ RubyDebuggerPart::RubyDebuggerPart( TQObject *parent, const char *name, const TQ connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStop(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStop(KDevPlugin*)) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -616,7 +616,7 @@ void RubyDebuggerPart::slotRun() -void RubyDebuggerPart::slotStop(TDevPlugin* which) +void RubyDebuggerPart::slotStop(KDevPlugin* which) { if( which != 0 && which != this ) return; @@ -772,12 +772,12 @@ void RubyDebuggerPart::savePartialProjectSession(TQDomElement* el) } -TDevAppFrontend * RDBDebugger::RubyDebuggerPart::appFrontend( ) +KDevAppFrontend * RDBDebugger::RubyDebuggerPart::appFrontend( ) { - return extension<TDevAppFrontend>("TDevelop/AppFrontend"); + return extension<KDevAppFrontend>("TDevelop/AppFrontend"); } -TDevDebugger * RDBDebugger::RubyDebuggerPart::debugger() +KDevDebugger * RDBDebugger::RubyDebuggerPart::debugger() { return m_debugger; } diff --git a/languages/ruby/debugger/debuggerpart.h b/languages/ruby/debugger/debuggerpart.h index 9b554a8f..498a159e 100644 --- a/languages/ruby/debugger/debuggerpart.h +++ b/languages/ruby/debugger/debuggerpart.h @@ -21,8 +21,8 @@ #define _DEBUGGERPART_H_ #include <tqguardedptr.h> -#include "tdevplugin.h" -#include "tdevcore.h" +#include "kdevplugin.h" +#include "kdevcore.h" namespace KParts { class Part; } @@ -31,8 +31,8 @@ class TQPopupMenu; class KDialogBase; class ProcessWidget; class ProcessLineMaker; -class TDevAppFrontend; -class TDevDebugger; +class KDevAppFrontend; +class KDevDebugger; namespace RDBDebugger { @@ -45,7 +45,7 @@ class DbgToolBar; class VariableWidget; class RDBOutputWidget; -class RubyDebuggerPart : public TDevPlugin +class RubyDebuggerPart : public KDevPlugin { Q_OBJECT @@ -68,7 +68,7 @@ private slots: void slotRun(); void slotStopDebugger(); - void slotStop(TDevPlugin* which = 0); + void slotStop(KDevPlugin* which = 0); void slotPause(); void slotRunToCursor(); void slotStepOver(); @@ -84,8 +84,8 @@ signals: void rubyInspect(const TQString&); private: - TDevAppFrontend *appFrontend(); - TDevDebugger *debugger(); + KDevAppFrontend *appFrontend(); + KDevDebugger *debugger(); bool startDebugger(); void setupController(); @@ -103,7 +103,7 @@ private: TQString m_contextIdent; TQCString m_drkonqi; - TDevDebugger *m_debugger; + KDevDebugger *m_debugger; }; } diff --git a/languages/ruby/debugger/tdevrbdebugger.desktop b/languages/ruby/debugger/kdevrbdebugger.desktop index 8b333642..714b51a3 100644 --- a/languages/ruby/debugger/tdevrbdebugger.desktop +++ b/languages/ruby/debugger/kdevrbdebugger.desktop @@ -66,7 +66,7 @@ GenericName[zh_CN]=Ruby 调试器前端 GenericName[zh_TW]=Ruby 除錯器前端介面 Icon= ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevrbdebugger +X-TDE-Library=libkdevrbdebugger X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-ProgrammingLanguages=Ruby diff --git a/languages/ruby/debugger/tdevrbdebugger.rc b/languages/ruby/debugger/kdevrbdebugger.rc index c7e3b336..c7e3b336 100644 --- a/languages/ruby/debugger/tdevrbdebugger.rc +++ b/languages/ruby/debugger/kdevrbdebugger.rc diff --git a/languages/ruby/doc/CMakeLists.txt b/languages/ruby/doc/CMakeLists.txt index 127248cd..781fa2ba 100644 --- a/languages/ruby/doc/CMakeLists.txt +++ b/languages/ruby/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES ruby.toc ruby_bugs.toc qtruby.toc rails.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/ruby/doc/Makefile.am b/languages/ruby/doc/Makefile.am index 38fd2b45..245b8fe5 100644 --- a/languages/ruby/doc/Makefile.am +++ b/languages/ruby/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = ruby.toc ruby_bugs.toc qtruby.toc rails.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/ruby/file_templates/CMakeLists.txt b/languages/ruby/file_templates/CMakeLists.txt index ef75c4e1..617e829c 100644 --- a/languages/ruby/file_templates/CMakeLists.txt +++ b/languages/ruby/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES rb rhtml rxml rjs js css html.erb xml.builder js.rjs - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/ruby/file_templates/Makefile.am b/languages/ruby/file_templates/Makefile.am index 591930a0..7b449085 100644 --- a/languages/ruby/file_templates/Makefile.am +++ b/languages/ruby/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = rb rhtml rxml rjs js css html.erb xml.builder js.rjs diff --git a/languages/ruby/tdevrubysupport.desktop b/languages/ruby/kdevrubysupport.desktop index 1a507ffd..9b5c6771 100644 --- a/languages/ruby/tdevrubysupport.desktop +++ b/languages/ruby/kdevrubysupport.desktop @@ -79,6 +79,6 @@ GenericName[tr]=Ruby Desteği GenericName[zh_CN]=Ruby 支持 GenericName[zh_TW]=Ruby 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevrubysupport +X-TDE-Library=libkdevrubysupport X-TDevelop-Version=5 X-TDevelop-Language=Ruby diff --git a/languages/ruby/tdevrubysupport.rc b/languages/ruby/kdevrubysupport.rc index b9269aa2..b9269aa2 100644 --- a/languages/ruby/tdevrubysupport.rc +++ b/languages/ruby/kdevrubysupport.rc diff --git a/languages/ruby/qtdesignerrubyintegration.cpp b/languages/ruby/qtdesignerrubyintegration.cpp index 7172b9e0..bb9c0113 100644 --- a/languages/ruby/qtdesignerrubyintegration.cpp +++ b/languages/ruby/qtdesignerrubyintegration.cpp @@ -32,14 +32,14 @@ #include <tdetexteditor/viewcursorinterface.h> #include <domutil.h> -#include <tdevpartcontroller.h> -#include <tdevcreatefile.h> -#include <tdevlanguagesupport.h> +#include <kdevpartcontroller.h> +#include <kdevcreatefile.h> +#include <kdevlanguagesupport.h> #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerRubyIntegration::QtDesignerRubyIntegration(TDevLanguageSupport *part, +QtDesignerRubyIntegration::QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl) :QtDesignerIntegration(part, impl, false, 0) { diff --git a/languages/ruby/qtdesignerrubyintegration.h b/languages/ruby/qtdesignerrubyintegration.h index 91776afa..38722167 100644 --- a/languages/ruby/qtdesignerrubyintegration.h +++ b/languages/ruby/qtdesignerrubyintegration.h @@ -27,7 +27,7 @@ class QtDesignerRubyIntegration : public QtDesignerIntegration Q_OBJECT public: - QtDesignerRubyIntegration(TDevLanguageSupport *part, ImplementationWidget *impl); + QtDesignerRubyIntegration(KDevLanguageSupport *part, ImplementationWidget *impl); protected: void addFunctionToClass(KInterfaceDesigner::Function function, ClassDom klass); diff --git a/languages/ruby/rubyimplementationwidget.cpp b/languages/ruby/rubyimplementationwidget.cpp index 9a7cde7a..ba371526 100644 --- a/languages/ruby/rubyimplementationwidget.cpp +++ b/languages/ruby/rubyimplementationwidget.cpp @@ -30,10 +30,10 @@ #include <tdemessagebox.h> #include <filetemplate.h> -#include <tdevlanguagesupport.h> -#include <tdevproject.h> +#include <kdevlanguagesupport.h> +#include <kdevproject.h> -RubyImplementationWidget::RubyImplementationWidget(TDevLanguageSupport* part, +RubyImplementationWidget::RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent, const char* name, bool modal) :ImplementationWidget(part, parent, name, modal) { diff --git a/languages/ruby/rubyimplementationwidget.h b/languages/ruby/rubyimplementationwidget.h index dac75fb1..a5d8e491 100644 --- a/languages/ruby/rubyimplementationwidget.h +++ b/languages/ruby/rubyimplementationwidget.h @@ -26,7 +26,7 @@ class RubyImplementationWidget : public ImplementationWidget { Q_OBJECT public: - RubyImplementationWidget(TDevLanguageSupport* part, TQWidget* parent = 0, + RubyImplementationWidget(KDevLanguageSupport* part, TQWidget* parent = 0, const char* name = 0, bool modal = true); virtual TQStringList createClassFiles(); diff --git a/languages/ruby/rubysupport_part.cpp b/languages/ruby/rubysupport_part.cpp index 915d12a1..e1745a02 100644 --- a/languages/ruby/rubysupport_part.cpp +++ b/languages/ruby/rubysupport_part.cpp @@ -5,15 +5,15 @@ #include "qtdesignerrubyintegration.h" #include "rubyimplementationwidget.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevlanguagesupport.h" -#include "tdevpartcontroller.h" -#include "tdevproject.h" -#include "tdevappfrontend.h" -#include "tdevplugininfo.h" -#include "tdevshellwidget.h" -#include "tdevquickopen.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevlanguagesupport.h" +#include "kdevpartcontroller.h" +#include "kdevproject.h" +#include "kdevappfrontend.h" +#include "kdevplugininfo.h" +#include "kdevshellwidget.h" +#include "kdevquickopen.h" #include <tqdir.h> #include <tqwhatsthis.h> @@ -24,7 +24,7 @@ #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kprocess.h> #include <kdebug.h> #include <tdeaction.h> @@ -37,15 +37,15 @@ #include <codemodel_utils.h> -typedef TDevGenericFactory<RubySupportPart> RubySupportFactory; -static const TDevPluginInfo data("tdevrubysupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevrubysupport, RubySupportFactory( data ) ) +typedef KDevGenericFactory<RubySupportPart> RubySupportFactory; +static const KDevPluginInfo data("kdevrubysupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevrubysupport, RubySupportFactory( data ) ) RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) + : KDevLanguageSupport (&data, parent, name ? name : "RubySupportPart" ) { setInstance(RubySupportFactory::instance()); - setXMLFile("tdevrubysupport.rc"); + setXMLFile("kdevrubysupport.rc"); TDEAction *action; action = new TDEAction( i18n("&Run"), "exec", SHIFT + Key_F9, @@ -72,7 +72,7 @@ RubySupportPart::RubySupportPart(TQObject *parent, const char *name, const TQStr kdDebug() << "Creating RubySupportPart" << endl; - m_shellWidget = new TDevShellWidget( 0, "irb console"); + m_shellWidget = new KDevShellWidget( 0, "irb console"); m_shellWidget->setIcon( SmallIcon("ruby_config.png", TDEIcon::SizeMedium, TDEIcon::DefaultState, RubySupportPart::instance())); m_shellWidget->setCaption(i18n("Ruby Shell")); mainWindow()->embedOutputView( m_shellWidget, i18n("Ruby Shell"), i18n("Ruby Shell")); @@ -127,7 +127,7 @@ void RubySupportPart::projectOpened() TQFileInfo server(project()->projectDirectory() + "/script/server"); if (! server.exists()) { cmd += "rails " + project()->projectDirectory(); - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); } } @@ -211,7 +211,7 @@ void RubySupportPart::savedFile(const KURL &fileName) } } -TDevLanguageSupport::Features RubySupportPart::features() +KDevLanguageSupport::Features RubySupportPart::features() { return Features(Classes | Functions | Variables | Declarations | Signals | Slots); } @@ -528,7 +528,7 @@ void RubySupportPart::slotRun () // Starting WEBrick for a Rails app. Translate a SIGTERM signal sent by KDevelop // to a SIGINT expected by WEBrick (ie control&c) to terminate it. cmd += "script/server& \n trap \"kill -s SIGINT $!\" TERM \n wait \n exit 0"; - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(project()->projectDirectory(), cmd, false); } else { TQString cmd = TQString("%1 -K%2 -C\"%3\" -I\"%4\" \"%5\" %6") @@ -613,7 +613,7 @@ TQString RubySupportPart::characterCoding() { void RubySupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevrubysupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension<TDevAppFrontend>("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension<KDevAppFrontend>("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } @@ -627,9 +627,9 @@ KMimeType::List RubySupportPart::mimeTypes( ) return list; } -TDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerType type) +KDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerType type) { - TDevDesignerIntegration *des = 0; + KDevDesignerIntegration *des = 0; switch (type) { case KInterfaceDesigner::TQtDesigner: @@ -651,7 +651,7 @@ TDevDesignerIntegration *RubySupportPart::designer(KInterfaceDesigner::DesignerT void RubySupportPart::projectClosed( ) { - 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() << "calling save settings fro designer integration" << endl; @@ -669,7 +669,7 @@ void RubySupportPart::contextMenu( TQPopupMenu * popup, const Context * context { m_contextFileName = url.fileName(); 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.")); } } } diff --git a/languages/ruby/rubysupport_part.h b/languages/ruby/rubysupport_part.h index c0bfc36e..024eae60 100644 --- a/languages/ruby/rubysupport_part.h +++ b/languages/ruby/rubysupport_part.h @@ -3,19 +3,19 @@ */ -#ifndef __TDEVPART_RUBYSUPPORT_H__ -#define __TDEVPART_RUBYSUPPORT_H__ +#ifndef __KDEVPART_RUBYSUPPORT_H__ +#define __KDEVPART_RUBYSUPPORT_H__ #include <tqguardedptr.h> -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" class KDialogBase; class TQPopupMenu; class Context; -class TDevShellWidget; +class KDevShellWidget; -class RubySupportPart : public TDevLanguageSupport +class RubySupportPart : public KDevLanguageSupport { Q_OBJECT @@ -25,7 +25,7 @@ public: RubySupportPart(TQObject *parent, const char *name, const TQStringList &); virtual ~RubySupportPart(); - virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); + virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); protected: virtual Features features(); @@ -63,12 +63,12 @@ private: void maybeParse(const TQString fileName); void parse(const TQString &fileName); - TQMap<KInterfaceDesigner::DesignerType, TDevDesignerIntegration*> m_designers; + TQMap<KInterfaceDesigner::DesignerType, KDevDesignerIntegration*> m_designers; TQString m_contextFileName; TQCString m_shell; - TQGuardedPtr<TDevShellWidget> m_shellWidget; + TQGuardedPtr<KDevShellWidget> m_shellWidget; }; diff --git a/languages/sql/CMakeLists.txt b/languages/sql/CMakeLists.txt index 67d5aef5..8e7d41cc 100644 --- a/languages/sql/CMakeLists.txt +++ b/languages/sql/CMakeLists.txt @@ -30,13 +30,13 @@ link_directories( ##### other data ################################ -install( FILES tdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsqlsupport ) +install( FILES kdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsqlsupport ) -##### libtdevsqlsupport (module) ################ +##### libkdevsqlsupport (module) ################ -tde_add_kpart( libtdevsqlsupport AUTOMOC +tde_add_kpart( libkdevsqlsupport AUTOMOC SOURCES sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp diff --git a/languages/sql/Makefile.am b/languages/sql/Makefile.am index eb48a72f..ba410a98 100644 --- a/languages/sql/Makefile.am +++ b/languages/sql/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = app_templates doc -kde_module_LTLIBRARIES = libtdevsqlsupport.la -libtdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevsqlsupport.la +libkdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp +libkdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevsqlsupport.desktop +service_DATA = kdevsqlsupport.desktop -rcdir = $(kde_datadir)/tdevsqlsupport -rc_DATA = tdevsqlsupport.rc +rcdir = $(kde_datadir)/kdevsqlsupport +rc_DATA = kdevsqlsupport.rc diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt index 290dd962..05ddb17f 100644 --- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt +++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( sqlsimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/sqlsimple.tar.gz sqlsimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - sqlsimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + sqlsimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am index 1b49cc21..6bfae1c4 100644 --- a/languages/sql/app_templates/sqlsimple/Makefile.am +++ b/languages/sql/app_templates/sqlsimple/Makefile.am @@ -2,10 +2,10 @@ templateName = sqlsimple dataFiles = app.sql app.tdevelop ### 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/sql/app_templates/sqlsimple/app.tdevelop b/languages/sql/app_templates/sqlsimple/app.tdevelop index 6977b304..7fc4efc9 100644 --- a/languages/sql/app_templates/sqlsimple/app.tdevelop +++ b/languages/sql/app_templates/sqlsimple/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>*.sql</includepatterns> <excludepatterns>*~</excludepatterns> </general> - </tdevscriptproject> - <tdevfileview> + </kdevscriptproject> + <kdevfileview> <groups> <group pattern="*.sql" name="SQL" /> </groups> - </tdevfileview> - <tdevdoctreeview> + </kdevfileview> + <kdevdoctreeview> <ignoretocs> <toc>ada</toc> <toc>ada_bugs_gcc</toc> @@ -75,10 +75,10 @@ <ignoredoxygen> <toc>KDE Libraries (Doxygen)</toc> </ignoredoxygen> - </tdevdoctreeview> - <tdevfilecreate> + </kdevdoctreeview> + <kdevfilecreate> <useglobaltypes> <type ext="sql"/> </useglobaltypes> - </tdevfilecreate> + </kdevfilecreate> </tdevelop> diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate index 5081e992..5081e992 100644 --- a/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate +++ b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate diff --git a/languages/sql/doc/Makefile.am b/languages/sql/doc/Makefile.am index f6fd6d52..d42aec82 100644 --- a/languages/sql/doc/Makefile.am +++ b/languages/sql/doc/Makefile.am @@ -1,4 +1,4 @@ -#tocdir = ${kde_datadir}/tdevdoctreeview/tocs +#tocdir = ${kde_datadir}/kdevdoctreeview/tocs #toc_DATA = #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/sql/tdevsqlsupport.desktop b/languages/sql/kdevsqlsupport.desktop index 5357d127..f5ee67ab 100644 --- a/languages/sql/tdevsqlsupport.desktop +++ b/languages/sql/kdevsqlsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=SQL Desteği GenericName[zh_CN]=SQL 支持 GenericName[zh_TW]=SQL 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevsqlsupport +X-TDE-Library=libkdevsqlsupport X-TDevelop-Version=5 X-TDevelop-Language=SQL X-TDevelop-Args=SQL diff --git a/languages/sql/tdevsqlsupport.rc b/languages/sql/kdevsqlsupport.rc index 36b91d7a..36b91d7a 100644 --- a/languages/sql/tdevsqlsupport.rc +++ b/languages/sql/kdevsqlsupport.rc diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index f737b694..1d1a5b14 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -21,8 +21,8 @@ #include <kiconloader.h> #include <kcombobox.h> -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" #include "sqlsupport_part.h" SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index e58930f9..c06413e7 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -195,7 +195,7 @@ void SqlConfigWidget::accept() { Q_ASSERT( doc ); - TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/tdevsqlsupport/servers" ); + TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" ); DomUtil::makeEmpty( dbElem ); for ( int i = 0; i < dbTable->numRows() - 1; i++ ) { @@ -206,7 +206,7 @@ void SqlConfigWidget::accept() << SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); DomUtil::writeListEntry( *doc, - "/tdevsqlsupport/servers/server" + TQString::number( i ), + "/kdevsqlsupport/servers/server" + TQString::number( i ), "el", db ); } if ( changed ) @@ -227,7 +227,7 @@ void SqlConfigWidget::loadConfig() TQStringList db; int i = 0; while ( true ) { - TQStringList db = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( db.isEmpty() ) return; diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index c4d0a235..2ecb2ec4 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -8,7 +8,7 @@ #include <tdeapplication.h> #include <kiconloader.h> #include <tdelocale.h> -#include <tdevgenericfactory.h> +#include <kdevgenericfactory.h> #include <kdebug.h> #include <tdeaction.h> #include <tdeparts/part.h> @@ -16,28 +16,28 @@ #include <tdetexteditor/editinterface.h> #include <tdemessagebox.h> -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevlanguagesupport.h" -#include "tdevpartcontroller.h" -#include "tdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevlanguagesupport.h" +#include "kdevpartcontroller.h" +#include "kdevproject.h" #include "codemodel.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "sqlconfigwidget.h" #include "sqlactions.h" #include "sqloutputwidget.h" #include "domutil.h" -typedef TDevGenericFactory<SQLSupportPart> SQLSupportFactory; -static const TDevPluginInfo data("tdevsqlsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevsqlsupport, SQLSupportFactory( data ) ) +typedef KDevGenericFactory<SQLSupportPart> SQLSupportFactory; +static const KDevPluginInfo data("kdevsqlsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) - : TDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) + : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) { setInstance( SQLSupportFactory::instance() ); - setXMLFile( "tdevsqlsupport.rc" ); + setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); @@ -106,7 +106,7 @@ void SQLSupportPart::loadConfig() int i = 0; TQString conName; while ( true ) { - TQStringList sdb = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( (int)sdb.size() < 6 ) break; @@ -267,7 +267,7 @@ void SQLSupportPart::savedFile( const KURL &fileName ) } } -TDevLanguageSupport::Features SQLSupportPart::features() +KDevLanguageSupport::Features SQLSupportPart::features() { return Features( Classes | Functions ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 4798d7fa..d5efca5b 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -1,5 +1,5 @@ -#ifndef __TDEVPART_SQLSUPPORT_H__ -#define __TDEVPART_SQLSUPPORT_H__ +#ifndef __KDEVPART_SQLSUPPORT_H__ +#define __KDEVPART_SQLSUPPORT_H__ #include <tqguardedptr.h> #include <tqstringlist.h> @@ -7,14 +7,14 @@ #include <kprocess.h> #include <kdialogbase.h> -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" class SqlListAction; class SqlOutputWidget; class CodeModel; -class SQLSupportPart : public TDevLanguageSupport +class SQLSupportPart : public KDevLanguageSupport { Q_OBJECT |
