diff options
author | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
---|---|---|
committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2014-05-25 15:37:31 +0900 |
commit | 6392f5a9dfce2bf83617d49bb7f332181ec6004e (patch) | |
tree | ab69e390f7962b7e7dda1a3a64f035c61c751cf4 /languages/kjssupport | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/kjssupport')
-rw-r--r-- | languages/kjssupport/Makefile.am | 14 | ||||
-rw-r--r-- | languages/kjssupport/jscodecompletion.cpp | 10 | ||||
-rw-r--r-- | languages/kjssupport/jscodecompletion.h | 2 | ||||
-rw-r--r-- | languages/kjssupport/kdevkjssupport.desktop (renamed from languages/kjssupport/tdevkjssupport.desktop) | 2 | ||||
-rw-r--r-- | languages/kjssupport/kdevkjssupport.rc (renamed from languages/kjssupport/tdevkjssupport.rc) | 0 | ||||
-rw-r--r-- | languages/kjssupport/kjssupport_part.cpp | 22 | ||||
-rw-r--r-- | languages/kjssupport/kjssupport_part.h | 8 | ||||
-rw-r--r-- | languages/kjssupport/subclassing_template/Makefile.am | 2 | ||||
-rw-r--r-- | languages/kjssupport/subclassingdlg.cpp | 2 | ||||
-rw-r--r-- | languages/kjssupport/template/Makefile.am | 2 | ||||
-rw-r--r-- | languages/kjssupport/template/app.tdevelop | 20 | ||||
-rw-r--r-- | languages/kjssupport/template/script | 2 |
12 files changed, 43 insertions, 43 deletions
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; |