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/perl | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/perl')
-rw-r--r-- | languages/perl/CMakeLists.txt | 8 | ||||
-rw-r--r-- | languages/perl/Makefile.am | 14 | ||||
-rw-r--r-- | languages/perl/app_templates/perlhello/CMakeLists.txt | 6 | ||||
-rw-r--r-- | languages/perl/app_templates/perlhello/Makefile.am | 4 | ||||
-rw-r--r-- | languages/perl/app_templates/perlhello/app.tdevelop | 12 | ||||
-rw-r--r-- | languages/perl/app_templates/perlhello/perlhello.kdevtemplate (renamed from languages/perl/app_templates/perlhello/perlhello.tdevtemplate) | 0 | ||||
-rw-r--r-- | languages/perl/doc/CMakeLists.txt | 2 | ||||
-rw-r--r-- | languages/perl/doc/Makefile.am | 2 | ||||
-rw-r--r-- | languages/perl/file_templates/CMakeLists.txt | 2 | ||||
-rw-r--r-- | languages/perl/file_templates/Makefile.am | 2 | ||||
-rw-r--r-- | languages/perl/kdevperlsupport.desktop (renamed from languages/perl/tdevperlsupport.desktop) | 2 | ||||
-rw-r--r-- | languages/perl/kdevperlsupport.rc (renamed from languages/perl/tdevperlsupport.rc) | 0 | ||||
-rw-r--r-- | languages/perl/perlparser.cpp | 2 | ||||
-rw-r--r-- | languages/perl/perlparser.h | 6 | ||||
-rw-r--r-- | languages/perl/perlsupportpart.cpp | 30 | ||||
-rw-r--r-- | languages/perl/perlsupportpart.h | 4 |
16 files changed, 48 insertions, 48 deletions
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 |