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/ruby | |
parent | aba2788b428dc53243407902e9ccbb20b97a69fd (diff) | |
download | tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.tar.gz tdevelop-6392f5a9dfce2bf83617d49bb7f332181ec6004e.zip |
Revert "Finish renaming tdevelop components"
This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73.
Diffstat (limited to 'languages/ruby')
73 files changed, 255 insertions, 255 deletions
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; }; |