diff options
Diffstat (limited to 'languages/php')
25 files changed, 67 insertions, 67 deletions
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 |