diff options
Diffstat (limited to 'languages/python')
29 files changed, 96 insertions, 96 deletions
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(); |