From 6392f5a9dfce2bf83617d49bb7f332181ec6004e Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Sun, 25 May 2014 15:37:31 +0900 Subject: [PATCH] Revert "Finish renaming tdevelop components" This reverts commit 722ce1efbac31c61b1d4b13f7e075c9f311e3e73. --- AUTHORS | 2 +- CMakeLists.txt | 12 +- Doxyfile | 2 +- Makefile.am | 13 +- buildtools/ada/CMakeLists.txt | 10 +- buildtools/ada/Makefile.am | 16 +- buildtools/ada/adaglobaloptionsdlg.cpp | 4 +- buildtools/ada/adaproject_part.cpp | 68 +++--- buildtools/ada/adaproject_part.h | 12 +- buildtools/ada/adaproject_widget.cpp | 2 +- buildtools/ada/adaproject_widget.h | 2 +- buildtools/ada/adaprojectoptionsdlg.cpp | 16 +- buildtools/ada/adaprojectoptionsdlg.h | 2 +- ...project.desktop => kdevadaproject.desktop} | 2 +- .../{tdevadaproject.rc => kdevadaproject.rc} | 0 buildtools/ant/CMakeLists.txt | 10 +- buildtools/ant/Makefile.am | 16 +- buildtools/ant/antprojectpart.cpp | 20 +- buildtools/ant/antprojectpart.h | 4 +- ...project.desktop => kdevantproject.desktop} | 2 +- .../{tdevantproject.rc => kdevantproject.rc} | 0 buildtools/autotools/CMakeLists.txt | 10 +- buildtools/autotools/Makefile.am | 20 +- buildtools/autotools/addfiledlg.cpp | 2 +- buildtools/autotools/addsubprojectdlg.cpp | 2 +- buildtools/autotools/autodetailsview.cpp | 20 +- buildtools/autotools/autoprojectpart.cpp | 30 +-- buildtools/autotools/autoprojectpart.h | 14 +- buildtools/autotools/autoprojectwidget.cpp | 2 +- buildtools/autotools/autosubprojectview.cpp | 8 +- buildtools/autotools/choosetargetdialog.cpp | 2 +- .../autotools/configureoptionswidget.cpp | 20 +- buildtools/autotools/configureoptionswidget.h | 4 +- buildtools/autotools/fileselectorwidget.cpp | 4 +- ...roject.desktop => kdevautoproject.desktop} | 2 +- ...{tdevautoproject.rc => kdevautoproject.rc} | 0 ...ect.desktop => kdevtdeautoproject.desktop} | 2 +- buildtools/autotools/misc.cpp | 16 +- buildtools/autotools/removefiledlg.cpp | 2 +- buildtools/custommakefiles/CMakeLists.txt | 10 +- buildtools/custommakefiles/Makefile.am | 16 +- .../custommakefiles/customprojectpart.cpp | 28 +-- .../custommakefiles/customprojectpart.h | 4 +- ...ject.desktop => kdevcustomproject.desktop} | 4 +- ...vcustomproject.rc => kdevcustomproject.rc} | 2 +- buildtools/lib/base/CMakeLists.txt | 8 +- buildtools/lib/base/Mainpage.dox | 4 +- buildtools/lib/base/Makefile.am | 16 +- .../{tdevbuildtool.cpp => kdevbuildtool.cpp} | 18 +- .../base/{tdevbuildtool.h => kdevbuildtool.h} | 18 +- .../lib/parsers/autotools/CMakeLists.txt | 4 +- buildtools/lib/parsers/autotools/Makefile.am | 10 +- .../lib/parsers/autotools/tests/Makefile.am | 4 +- buildtools/lib/parsers/qmake/CMakeLists.txt | 4 +- buildtools/lib/parsers/qmake/Makefile.am | 10 +- .../lib/parsers/qmake/tests/Makefile.am | 4 +- buildtools/lib/widgets/CMakeLists.txt | 4 +- buildtools/lib/widgets/Makefile.am | 14 +- buildtools/pascal/CMakeLists.txt | 10 +- buildtools/pascal/Makefile.am | 16 +- ...ject.desktop => kdevpascalproject.desktop} | 2 +- ...vpascalproject.rc => kdevpascalproject.rc} | 0 buildtools/pascal/pascalglobaloptionsdlg.cpp | 4 +- buildtools/pascal/pascalproject_part.cpp | 48 ++--- buildtools/pascal/pascalproject_part.h | 12 +- buildtools/pascal/pascalproject_widget.cpp | 2 +- buildtools/pascal/pascalproject_widget.h | 2 +- buildtools/pascal/pascalprojectoptionsdlg.cpp | 8 +- buildtools/pascal/pascalprojectoptionsdlg.h | 2 +- buildtools/qmake/CMakeLists.txt | 10 +- buildtools/qmake/Makefile.am | 22 +- ...oject.desktop => kdevtmakeproject.desktop} | 2 +- ...oject.desktop => kdevtrollproject.desktop} | 2 +- ...devtrollproject.rc => kdevtrollproject.rc} | 0 buildtools/qmake/trollprojectpart.cpp | 30 +-- buildtools/qmake/trollprojectpart.h | 4 +- buildtools/qmake/trollprojectwidget.cpp | 22 +- buildtools/script/CMakeLists.txt | 10 +- buildtools/script/Makefile.am | 16 +- ...ject.desktop => kdevscriptproject.desktop} | 2 +- ...vscriptproject.rc => kdevscriptproject.rc} | 2 +- buildtools/script/scriptnewfiledlg.cpp | 2 +- buildtools/script/scriptoptionswidget.cpp | 4 +- buildtools/script/scriptoptionswidget.h | 6 +- buildtools/script/scriptprojectpart.cpp | 30 +-- buildtools/script/scriptprojectpart.h | 4 +- configure.in.bot | 4 +- configure.in.in | 2 +- doc/Makefile.am | 2 +- doc/api/Architecture.dox | 16 +- doc/api/FutureTasks.dox | 2 +- doc/api/HighPriTasks.dox | 2 +- doc/api/HowToAddApplicationTemplates.dox | 12 +- doc/api/HowToAddGenericBuildTools.dox | 2 +- doc/api/HowToAddPlugins.dox | 10 +- doc/api/HowToAddProgrammingLanguages.dox | 10 +- doc/api/HowToDocument.dox | 4 +- doc/extras/CMakeLists.txt | 2 +- doc/extras/Makefile.am | 2 +- doc/extras/w3c/CMakeLists.txt | 2 +- doc/extras/w3c/Makefile.am | 2 +- .../CMakeLists.txt | 2 +- .../Makefile.am | 0 .../appwizard.png | Bin .../index.docbook | 12 +- .../kscribblefiles.png | Bin doc/{tde_app_devel => kdearch}/Makefile.am | 0 doc/{tdearch => kdearch}/affine-general.png | Bin doc/{tdearch => kdearch}/affine-rotate.png | Bin doc/{tdearch => kdearch}/affine-scale.png | Bin doc/{tdearch => kdearch}/affine-shear.png | Bin doc/{tdearch => kdearch}/affine-translate.png | Bin doc/{tdearch => kdearch}/brushstyles.png | Bin doc/{tdearch => kdearch}/canvas.png | Bin doc/{tdearch => kdearch}/capflat.png | Bin doc/{tdearch => kdearch}/capround.png | Bin doc/{tdearch => kdearch}/capsquare.png | Bin doc/{tdearch => kdearch}/index.docbook | 6 +- doc/{tdearch => kdearch}/joinbevel.png | Bin doc/{tdearch => kdearch}/joinmiter.png | Bin doc/{tdearch => kdearch}/joinround.png | Bin doc/{tdearch => kdearch}/konqi-mirrored.png | Bin doc/{tdearch => kdearch}/konqi-normal.png | Bin doc/{tdearch => kdearch}/konqi-rotated.png | Bin doc/{tdearch => kdearch}/konqi-sheared.png | Bin doc/{tdearch => kdearch}/kview-menu.png | Bin doc/{tdearch => kdearch}/opengl.png | Bin doc/{tdearch => kdearch}/penstyles.png | Bin doc/{tdearch => kdearch}/whatsthis.png | Bin .../CMakeLists.txt | 2 +- .../Makefile.am | 0 .../index.docbook | 12 +- doc/platform/Mainpage.dox | 12 +- doc/std/CMakeLists.txt | 4 +- doc/std/Makefile.am | 4 +- doc/std/{tdev3api.toc => kdev3api.toc} | 0 doc/tdearch/Makefile.am | 2 - doc/tdevassistant/CMakeLists.txt | 9 - doc/tdevassistant/index.docbook | 65 ------ doc/tdevelop/app-files.docbook | 202 +++++++++--------- doc/tdevelop/commands.docbook | 16 +- doc/tdevelop/getting-started.docbook | 22 +- doc/tdevelop/index.docbook | 2 +- .../{tdevdesigner.png => kdevdesigner.png} | Bin doc/tdevelop/nutshell.docbook | 2 +- doc/tdevelop/plugin-tools.docbook | 36 ++-- doc/tdevelop/project-advanced.docbook | 4 +- doc/tdevelop/setup.docbook | 34 +-- doc/tdevelop/survey-manual.docbook | 2 +- doc/tdevelop/tdevelop-install.docbook | 2 +- doc/tdevelop/tdevelop-scripting.docbook | 4 +- doc/tdevelop/tdevelop-survey.docbook | 2 +- editors/editor-chooser/CMakeLists.txt | 6 +- editors/editor-chooser/Makefile.am | 10 +- editors/editor-chooser/editorchooser_part.cpp | 14 +- editors/editor-chooser/editorchooser_part.h | 8 +- ...oser.desktop => kdeveditorchooser.desktop} | 6 +- embedded/visualboyadvance/CMakeLists.txt | 10 +- embedded/visualboyadvance/Makefile.am | 14 +- ...dvance.rc => kdevpart_visualboyadvance.rc} | 0 ...e.desktop => kdevvisualboyadvance.desktop} | 2 +- .../visualboyadvance_part.cpp | 24 +-- .../visualboyadvance/visualboyadvance_part.h | 8 +- ...assistant.desktop => kdevassistant.desktop | 2 +- {tdevdesigner => kdevdesigner}/AUTHORS | 2 +- {tdevdesigner => kdevdesigner}/CMakeLists.txt | 0 {tdevdesigner => kdevdesigner}/LICENSE.GPL | 0 {tdevdesigner => kdevdesigner}/Makefile.am | 0 {tdevdesigner => kdevdesigner}/NEWS | 0 {tdevdesigner => kdevdesigner}/README | 12 +- {tdevdesigner => kdevdesigner}/TODO | 0 .../designer/CMakeLists.txt | 16 +- .../designer/Makefile.am | 22 +- .../designer/about.ui | 0 .../designer/actiondnd.cpp | 0 .../designer/actiondnd.h | 0 .../designer/actioneditor.ui | 0 .../designer/actioneditorimpl.cpp | 0 .../designer/actioneditorimpl.h | 0 .../designer/actionlistview.cpp | 0 .../designer/actionlistview.h | 0 .../designer/asciivalidator.cpp | 0 .../designer/asciivalidator.h | 0 .../designer/command.cpp | 2 +- .../designer/command.h | 0 .../designer/configtoolboxdialog.ui | 0 .../designer/configtoolboxdialog.ui.h | 0 .../designer/connectiondialog.ui | 0 .../designer/connectiondialog.ui.h | 0 .../designer/connectionitems.cpp | 0 .../designer/connectionitems.h | 0 .../designer/connectiontable.cpp | 0 .../designer/connectiontable.h | 0 .../designer/createtemplate.ui | 0 .../designer/customwidgeteditor.ui | 0 .../designer/customwidgeteditorimpl.cpp | 0 .../designer/customwidgeteditorimpl.h | 0 .../designer/database.cpp | 0 .../designer/database.h | 0 .../designer/dbconnection.ui | 0 .../designer/dbconnectioneditor.ui | 0 .../designer/dbconnectionimpl.cpp | 0 .../designer/dbconnectionimpl.h | 0 .../designer/dbconnections.ui | 0 .../designer/dbconnectionsimpl.cpp | 0 .../designer/dbconnectionsimpl.h | 0 .../designer/defs.cpp | 0 .../designer/defs.h | 0 .../designer/designer_pch.h | 0 .../designer/designeraction.cpp | 0 .../designer/designeraction.h | 0 .../designer/designerapp.cpp | 0 .../designer/designerapp.h | 0 .../designer/designerappiface.cpp | 0 .../designer/designerappiface.h | 0 .../designer/editfunctions.ui | 0 .../designer/editfunctionsimpl.cpp | 8 +- .../designer/editfunctionsimpl.h | 0 .../designer/filechooser.cpp | 0 .../designer/filechooser.h | 0 .../designer/finddialog.ui | 0 .../designer/finddialog.ui.h | 0 .../designer/formfile.cpp | 2 +- .../designer/formfile.h | 0 .../designer/formsettings.ui | 0 .../designer/formsettingsimpl.cpp | 0 .../designer/formsettingsimpl.h | 0 .../designer/formwindow.cpp | 6 +- .../designer/formwindow.h | 0 .../designer/gotolinedialog.ui | 0 .../designer/gotolinedialog.ui.h | 0 .../designer/hierarchyview.cpp | 20 +- .../designer/hierarchyview.h | 0 .../designer/iconvieweditor.ui | 0 .../designer/iconvieweditorimpl.cpp | 0 .../designer/iconvieweditorimpl.h | 0 .../designer/kdevdesigner_part.cpp | 156 +++++++------- .../designer/kdevdesigner_part.desktop | 6 +- .../designer/kdevdesigner_part.h | 18 +- .../designer/kdevdesigner_part.rc | 2 +- .../designer/kdevdesigner_part_sh.rc | 2 +- .../designer/layout.cpp | 0 .../designer/layout.h | 0 .../designer/listboxdnd.cpp | 0 .../designer/listboxdnd.h | 0 .../designer/listboxeditor.ui | 0 .../designer/listboxeditorimpl.cpp | 0 .../designer/listboxeditorimpl.h | 0 .../designer/listboxrename.cpp | 0 .../designer/listboxrename.h | 0 .../designer/listdnd.cpp | 0 .../designer/listdnd.h | 0 .../designer/listeditor.ui | 0 .../designer/listeditor.ui.h | 0 .../designer/listviewdnd.cpp | 0 .../designer/listviewdnd.h | 0 .../designer/listvieweditor.ui | 0 .../designer/listvieweditorimpl.cpp | 0 .../designer/listvieweditorimpl.h | 0 .../designer/mainwindow.cpp | 12 +- .../designer/mainwindow.h | 10 +- .../designer/mainwindowactions.cpp | 6 +- .../designer/menubareditor.cpp | 0 .../designer/menubareditor.h | 0 .../designer/metadatabase.cpp | 4 +- .../designer/metadatabase.h | 0 .../designer/multilineeditor.ui | 0 .../designer/multilineeditorimpl.cpp | 36 ++-- .../designer/multilineeditorimpl.h | 0 .../designer/myiconloader.cpp | 6 +- .../designer/myiconloader.h | 0 .../designer/newform.ui | 0 .../designer/newformimpl.cpp | 18 +- .../designer/newformimpl.h | 0 .../designer/orderindicator.cpp | 0 .../designer/orderindicator.h | 0 .../designer/outputwindow.cpp | 0 .../designer/outputwindow.h | 0 .../designer/paletteeditor.ui | 0 .../designer/paletteeditoradvanced.ui | 0 .../designer/paletteeditoradvancedimpl.cpp | 0 .../designer/paletteeditoradvancedimpl.h | 0 .../designer/paletteeditorimpl.cpp | 0 .../designer/paletteeditorimpl.h | 0 .../designer/pics/CMakeLists.txt | 2 +- .../designer/pics/Makefile.am | 2 +- .../designer/pics/designer_adjustsize.png | Bin .../designer/pics/designer_appicon.png | Bin .../designer/pics/designer_arrow.png | Bin .../designer/pics/designer_background.png | Bin .../designer/pics/designer_book.png | Bin .../designer/pics/designer_buttongroup.png | Bin .../designer/pics/designer_checkbox.png | Bin .../designer/pics/designer_combobox.png | Bin .../designer/pics/designer_connecttool.png | Bin .../designer/pics/designer_cross.png | Bin .../designer/pics/designer_customwidget.png | Bin .../designer/pics/designer_d_adjustsize.png | Bin .../designer/pics/designer_d_book.png | Bin .../designer/pics/designer_d_buttongroup.png | Bin .../designer/pics/designer_d_checkbox.png | Bin .../designer/pics/designer_d_combobox.png | Bin .../designer/pics/designer_d_connecttool.png | Bin .../designer/pics/designer_d_customwidget.png | Bin .../designer/pics/designer_d_databrowser.png | Bin .../designer/pics/designer_d_datatable.png | Bin .../designer/pics/designer_d_dataview.png | Bin .../designer/pics/designer_d_dateedit.png | Bin .../designer/pics/designer_d_datetimeedit.png | Bin .../designer/pics/designer_d_dial.png | Bin .../designer/pics/designer_d_down.png | Bin .../pics/designer_d_editbreaklayout.png | Bin .../designer/pics/designer_d_editcopy.png | Bin .../designer/pics/designer_d_editcut.png | Bin .../designer/pics/designer_d_editdelete.png | Bin .../designer/pics/designer_d_editgrid.png | Bin .../designer/pics/designer_d_edithlayout.png | Bin .../pics/designer_d_edithlayoutsplit.png | Bin .../designer/pics/designer_d_editlower.png | Bin .../designer/pics/designer_d_editpaste.png | Bin .../designer/pics/designer_d_editraise.png | Bin .../designer/pics/designer_d_editslots.png | Bin .../designer/pics/designer_d_editvlayout.png | Bin .../pics/designer_d_editvlayoutsplit.png | Bin .../designer/pics/designer_d_filenew.png | Bin .../designer/pics/designer_d_fileopen.png | Bin .../designer/pics/designer_d_filesave.png | Bin .../designer/pics/designer_d_folder.png | Bin .../designer/pics/designer_d_form.png | Bin .../designer/pics/designer_d_frame.png | Bin .../designer/pics/designer_d_groupbox.png | Bin .../designer/pics/designer_d_help.png | Bin .../designer/pics/designer_d_home.png | Bin .../designer/pics/designer_d_iconview.png | Bin .../designer/pics/designer_d_image.png | Bin .../designer/pics/designer_d_label.png | Bin .../designer/pics/designer_d_layout.png | Bin .../designer/pics/designer_d_lcdnumber.png | Bin .../designer/pics/designer_d_left.png | Bin .../designer/pics/designer_d_line.png | Bin .../designer/pics/designer_d_lineedit.png | Bin .../designer/pics/designer_d_listbox.png | Bin .../designer/pics/designer_d_listview.png | Bin .../pics/designer_d_multilineedit.png | Bin .../designer/pics/designer_d_newform.png | Bin .../designer/pics/designer_d_ordertool.png | Bin .../designer/pics/designer_d_pixlabel.png | Bin .../designer/pics/designer_d_pointer.png | Bin .../designer/pics/designer_d_print.png | Bin .../designer/pics/designer_d_progress.png | Bin .../designer/pics/designer_d_project.png | Bin .../designer/pics/designer_d_pushbutton.png | Bin .../designer/pics/designer_d_radiobutton.png | Bin .../designer/pics/designer_d_redo.png | Bin .../designer/pics/designer_d_richtextedit.png | Bin .../designer/pics/designer_d_right.png | Bin .../designer/pics/designer_d_scrollbar.png | Bin .../designer/pics/designer_d_searchfind.png | Bin .../designer/pics/designer_d_setbuddy.png | Bin .../designer/pics/designer_d_slider.png | Bin .../designer/pics/designer_d_spacer.png | Bin .../designer/pics/designer_d_spinbox.png | Bin .../designer/pics/designer_d_table.png | Bin .../designer/pics/designer_d_tabwidget.png | Bin .../designer/pics/designer_d_textbold.png | Bin .../designer/pics/designer_d_textbrowser.png | Bin .../designer/pics/designer_d_textcenter.png | Bin .../designer/pics/designer_d_textedit.png | Bin .../designer/pics/designer_d_textfont.png | Bin .../designer/pics/designer_d_texth1.png | Bin .../designer/pics/designer_d_texth2.png | Bin .../designer/pics/designer_d_texth3.png | Bin .../designer/pics/designer_d_textitalic.png | Bin .../designer/pics/designer_d_textjustify.png | Bin .../designer/pics/designer_d_textlarger.png | Bin .../designer/pics/designer_d_textleft.png | Bin .../pics/designer_d_textlinebreak.png | Bin .../pics/designer_d_textparagraph.png | Bin .../designer/pics/designer_d_textright.png | Bin .../designer/pics/designer_d_textsmaller.png | Bin .../designer/pics/designer_d_textteletext.png | Bin .../pics/designer_d_textunderline.png | Bin .../designer/pics/designer_d_textview.png | Bin .../designer/pics/designer_d_timeedit.png | Bin .../designer/pics/designer_d_toolbox.png | Bin .../designer/pics/designer_d_toolbutton.png | Bin .../designer/pics/designer_d_undo.png | Bin .../designer/pics/designer_d_up.png | Bin .../designer/pics/designer_d_widgetstack.png | Bin .../designer/pics/designer_d_wizarddata.png | Bin .../designer/pics/designer_d_wizarddialog.png | Bin .../designer/pics/designer_d_wordwrap.png | Bin .../designer/pics/designer_databrowser.png | Bin .../designer/pics/designer_datatable.png | Bin .../designer/pics/designer_dataview.png | Bin .../designer/pics/designer_dateedit.png | Bin .../designer/pics/designer_datetimeedit.png | Bin .../designer/pics/designer_dial.png | Bin .../designer/pics/designer_down.png | Bin .../pics/designer_editbreaklayout.png | Bin .../designer/pics/designer_editcopy.png | Bin .../designer/pics/designer_editcut.png | Bin .../designer/pics/designer_editdelete.png | Bin .../designer/pics/designer_editgrid.png | Bin .../designer/pics/designer_edithlayout.png | Bin .../pics/designer_edithlayoutsplit.png | Bin .../designer/pics/designer_editlower.png | Bin .../designer/pics/designer_editpaste.png | Bin .../designer/pics/designer_editraise.png | Bin .../designer/pics/designer_editslots.png | Bin .../designer/pics/designer_editvlayout.png | Bin .../pics/designer_editvlayoutsplit.png | Bin .../designer/pics/designer_filenew.png | Bin .../designer/pics/designer_fileopen.png | Bin .../designer/pics/designer_filesave.png | Bin .../designer/pics/designer_folder.png | Bin .../designer/pics/designer_form.png | Bin .../designer/pics/designer_frame.png | Bin .../designer/pics/designer_groupbox.png | Bin .../designer/pics/designer_hand.png | Bin .../designer/pics/designer_help.png | Bin .../designer/pics/designer_home.png | Bin .../designer/pics/designer_hsplit.png | Bin .../designer/pics/designer_ibeam.png | Bin .../designer/pics/designer_iconview.png | Bin .../designer/pics/designer_image.png | Bin .../designer/pics/designer_label.png | Bin .../designer/pics/designer_layout.png | Bin .../designer/pics/designer_lcdnumber.png | Bin .../designer/pics/designer_left.png | Bin .../designer/pics/designer_line.png | Bin .../designer/pics/designer_lineedit.png | Bin .../designer/pics/designer_listbox.png | Bin .../designer/pics/designer_listview.png | Bin .../designer/pics/designer_multilineedit.png | Bin .../designer/pics/designer_newform.png | Bin .../designer/pics/designer_no.png | Bin .../designer/pics/designer_object.png | Bin .../designer/pics/designer_ordertool.png | Bin .../designer/pics/designer_pixlabel.png | Bin .../designer/pics/designer_pointer.png | Bin .../designer/pics/designer_print.png | Bin .../designer/pics/designer_progress.png | Bin .../designer/pics/designer_project.png | Bin .../designer/pics/designer_pushbutton.png | Bin .../designer/pics/designer_qtlogo.png | Bin .../designer/pics/designer_radiobutton.png | Bin .../designer/pics/designer_redo.png | Bin .../designer/pics/designer_resetproperty.png | Bin .../designer/pics/designer_richtextedit.png | Bin .../designer/pics/designer_right.png | Bin .../designer/pics/designer_s_down.png | Bin .../designer/pics/designer_s_editcut.png | Bin .../designer/pics/designer_s_left.png | Bin .../designer/pics/designer_s_right.png | Bin .../designer/pics/designer_s_up.png | Bin .../designer/pics/designer_scrollbar.png | Bin .../designer/pics/designer_searchfind.png | Bin .../designer/pics/designer_setbuddy.png | Bin .../designer/pics/designer_sizeall.png | Bin .../designer/pics/designer_sizeb.png | Bin .../designer/pics/designer_sizef.png | Bin .../designer/pics/designer_sizeh.png | Bin .../designer/pics/designer_sizev.png | Bin .../designer/pics/designer_slider.png | Bin .../designer/pics/designer_spacer.png | Bin .../designer/pics/designer_spinbox.png | Bin .../designer/pics/designer_splash.png | Bin .../designer/pics/designer_table.png | Bin .../designer/pics/designer_tabwidget.png | Bin .../designer/pics/designer_textbold.png | Bin .../designer/pics/designer_textbrowser.png | Bin .../designer/pics/designer_textcenter.png | Bin .../designer/pics/designer_textedit.png | Bin .../designer/pics/designer_textfont.png | Bin .../designer/pics/designer_texth1.png | Bin .../designer/pics/designer_texth2.png | Bin .../designer/pics/designer_texth3.png | Bin .../designer/pics/designer_textitalic.png | Bin .../designer/pics/designer_textjustify.png | Bin .../designer/pics/designer_textlarger.png | Bin .../designer/pics/designer_textleft.png | Bin .../designer/pics/designer_textlinebreak.png | Bin .../designer/pics/designer_textparagraph.png | Bin .../designer/pics/designer_textright.png | Bin .../designer/pics/designer_textsmaller.png | Bin .../designer/pics/designer_textteletext.png | Bin .../designer/pics/designer_textunderline.png | Bin .../designer/pics/designer_textview.png | Bin .../designer/pics/designer_timeedit.png | Bin .../designer/pics/designer_toolbox.png | Bin .../designer/pics/designer_toolbutton.png | Bin .../designer/pics/designer_undo.png | Bin .../designer/pics/designer_up.png | Bin .../designer/pics/designer_uparrow.png | Bin .../designer/pics/designer_vsplit.png | Bin .../designer/pics/designer_wait.png | Bin .../designer/pics/designer_widgetstack.png | Bin .../designer/pics/designer_wizarddata.png | Bin .../designer/pics/designer_wizarddialog.png | Bin .../designer/pics/designer_wordwrap.png | Bin .../designer/pixmapchooser.cpp | 6 +- .../designer/pixmapchooser.h | 0 .../designer/pixmapcollection.cpp | 0 .../designer/pixmapcollection.h | 0 .../designer/pixmapcollectioneditor.ui | 0 .../designer/pixmapcollectioneditor.ui.h | 0 .../designer/pixmapfunction.ui | 0 .../designer/popupmenueditor.cpp | 0 .../designer/popupmenueditor.h | 0 .../designer/preferences.ui | 0 .../designer/previewframe.cpp | 0 .../designer/previewframe.h | 0 .../designer/previewwidget.ui | 0 .../designer/previewwidgetimpl.cpp | 0 .../designer/previewwidgetimpl.h | 0 .../designer/project.cpp | 0 .../designer/project.h | 0 .../designer/projectsettings.ui | 0 .../designer/projectsettingsimpl.cpp | 0 .../designer/projectsettingsimpl.h | 0 .../designer/propertyeditor.cpp | 44 ++-- .../designer/propertyeditor.h | 0 .../designer/propertyobject.cpp | 0 .../designer/propertyobject.h | 0 .../designer/qcompletionedit.cpp | 0 .../designer/qcompletionedit.h | 0 .../designer/replacedialog.ui | 0 .../designer/replacedialog.ui.h | 0 .../designer/resource.cpp | 6 +- .../designer/resource.h | 0 .../designer/richtextfontdialog.ui | 0 .../designer/richtextfontdialog.ui.h | 0 .../designer/sizehandle.cpp | 0 .../designer/sizehandle.h | 0 .../designer/sourceeditor.cpp | 4 +- .../designer/sourceeditor.h | 0 .../designer/sourcefile.cpp | 0 .../designer/sourcefile.h | 0 .../designer/startdialog.ui | 0 .../designer/startdialogimpl.cpp | 4 +- .../designer/startdialogimpl.h | 0 .../designer/styledbutton.cpp | 0 .../designer/styledbutton.h | 0 .../designer/syntaxhighlighter_html.cpp | 0 .../designer/syntaxhighlighter_html.h | 0 .../designer/tableeditor.ui | 0 .../designer/tableeditorimpl.cpp | 0 .../designer/tableeditorimpl.h | 0 .../designer/timestamp.cpp | 0 .../designer/timestamp.h | 0 .../designer/variabledialog.ui | 0 .../designer/variabledialogimpl.cpp | 0 .../designer/variabledialogimpl.h | 0 .../designer/widgetaction.cpp | 0 .../designer/widgetaction.h | 0 .../designer/widgetfactory.cpp | 4 +- .../designer/widgetfactory.h | 0 .../designer/wizardeditor.ui | 0 .../designer/wizardeditorimpl.cpp | 0 .../designer/wizardeditorimpl.h | 0 .../designer/workspace.cpp | 20 +- .../designer/workspace.h | 0 .../interfaces/actioninterface.h | 0 .../interfaces/classbrowserinterface.h | 0 .../interfaces/designerinterface.h | 0 .../interfaces/editorinterface.h | 0 .../interfaces/filterinterface.h | 0 .../interfaces/interpreterinterface.h | 0 .../interfaces/languageinterface.h | 0 .../interfaces/preferenceinterface.h | 0 .../interfaces/projectsettingsiface.h | 0 .../interfaces/sourcetemplateiface.h | 0 .../interfaces/templatewizardiface.h | 0 .../interfaces/widgetinterface.h | 0 kdevdesigner/plugins/Makefile.am | 8 + .../plugins/languageinterfaceimpl.cpp | 0 .../plugins/languageinterfaceimpl.h | 0 .../shared/CMakeLists.txt | 0 .../shared/Makefile.am | 0 .../shared/domtool.cpp | 0 .../shared/domtool.h | 0 .../shared/globaldefs.h | 0 .../shared/parser.cpp | 0 .../shared/parser.h | 0 .../shared/ui2uib.cpp | 0 .../shared/ui2uib.h | 0 {tdevdesigner => kdevdesigner}/shared/uib.cpp | 0 {tdevdesigner => kdevdesigner}/shared/uib.h | 0 .../shared/widgetdatabase.cpp | 4 +- .../shared/widgetdatabase.h | 0 .../src/CMakeLists.txt | 10 +- .../src/Makefile.am | 22 +- .../src/kdevdesigner.cpp | 46 ++-- .../src/kdevdesigner.desktop | 6 +- .../src/kdevdesigner.h | 12 +- .../src/kdevdesigner_shell.rc | 2 +- {tdevdesigner => kdevdesigner}/src/main.cpp | 14 +- .../uilib/CMakeLists.txt | 6 +- kdevdesigner/uilib/Makefile.am | 9 + .../uilib/database.cpp | 0 .../uilib/database2.h | 0 .../uilib/qwidgetfactory.cpp | 0 .../uilib/qwidgetfactory.h | 0 tdevprj2tdevelop => kdevprj2tdevelop | 14 +- languages/ada/CMakeLists.txt | 8 +- languages/ada/Makefile.am | 14 +- languages/ada/adasupportpart.cpp | 24 +-- languages/ada/adasupportpart.h | 4 +- .../ada/app_templates/adahello/CMakeLists.txt | 6 +- .../ada/app_templates/adahello/Makefile.am | 4 +- ...llo.tdevtemplate => adahello.kdevtemplate} | 2 +- .../ada/app_templates/adahello/app.tdevelop | 14 +- languages/ada/doc/CMakeLists.txt | 2 +- languages/ada/doc/Makefile.am | 2 +- languages/ada/file_templates/CMakeLists.txt | 2 +- languages/ada/file_templates/Makefile.am | 2 +- ...support.desktop => kdevadasupport.desktop} | 2 +- .../{tdevadasupport.rc => kdevadasupport.rc} | 0 languages/ada/problemreporter.cpp | 4 +- languages/bash/CMakeLists.txt | 8 +- languages/bash/Makefile.am | 14 +- .../app_templates/bashhello/CMakeLists.txt | 6 +- .../bash/app_templates/bashhello/Makefile.am | 4 +- .../bash/app_templates/bashhello/app.tdevelop | 18 +- ...lo.tdevtemplate => bashhello.kdevtemplate} | 0 languages/bash/bashsupport_part.cpp | 30 +-- languages/bash/bashsupport_part.h | 10 +- languages/bash/doc/CMakeLists.txt | 2 +- languages/bash/doc/Makefile.am | 2 +- ...upport.desktop => kdevbashsupport.desktop} | 2 +- ...{tdevbashsupport.rc => kdevbashsupport.rc} | 0 languages/cpp/CMakeLists.txt | 20 +- languages/cpp/KDevCppSupportIface.cpp | 24 +++ ...ppSupportIface.h => KDevCppSupportIface.h} | 10 +- languages/cpp/Makefile.am | 28 +-- languages/cpp/README.dox | 2 +- languages/cpp/TDevCppSupportIface.cpp | 24 --- languages/cpp/addattributedialog.cpp | 2 +- languages/cpp/addmethoddialog.cpp | 6 +- languages/cpp/app_templates/CMakeLists.txt | 14 +- languages/cpp/app_templates/Makefile.am | 6 +- .../automakeempty/CMakeLists.txt | 6 +- .../app_templates/automakeempty/Makefile.am | 4 +- .../app_templates/automakeempty/app.tdevelop | 20 +- ...devtemplate => automakeempty.kdevtemplate} | 4 +- .../cpp/app_templates/chello/CMakeLists.txt | 6 +- .../cpp/app_templates/chello/Makefile.am | 4 +- .../cpp/app_templates/chello/app.tdevelop | 20 +- ...hello.tdevtemplate => chello.kdevtemplate} | 4 +- .../app_templates/chello_gba/CMakeLists.txt | 6 +- .../cpp/app_templates/chello_gba/Makefile.am | 4 +- .../cpp/app_templates/chello_gba/app.tdevelop | 22 +- ...ba.tdevtemplate => chellogba.kdevtemplate} | 4 +- .../cpp/app_templates/clanlib/CMakeLists.txt | 6 +- .../cpp/app_templates/clanlib/Makefile.am | 4 +- .../cpp/app_templates/clanlib/app.tdevelop | 16 +- ...nlib.tdevtemplate => clanlib.kdevtemplate} | 2 +- .../app_templates/cmakelibc/CMakeLists.txt | 6 +- .../cpp/app_templates/cmakelibc/Makefile.am | 4 +- ...bc.tdevtemplate => cmakelibc.kdevtemplate} | 0 .../app_templates/cmakelibcpp/CMakeLists.txt | 6 +- .../cpp/app_templates/cmakelibcpp/Makefile.am | 4 +- ....tdevtemplate => cmakelibcpp.kdevtemplate} | 0 .../app_templates/cmakeqt3app/CMakeLists.txt | 6 +- .../cpp/app_templates/cmakeqt3app/Makefile.am | 4 +- ....tdevtemplate => cmakeqt3app.kdevtemplate} | 0 .../app_templates/cmakesimple/CMakeLists.txt | 6 +- .../cpp/app_templates/cmakesimple/Makefile.am | 4 +- ....tdevtemplate => cmakesimple.kdevtemplate} | 0 .../app_templates/cmakesimplec/CMakeLists.txt | 6 +- .../app_templates/cmakesimplec/Makefile.am | 4 +- ...tdevtemplate => cmakesimplec.kdevtemplate} | 0 .../cppcurseshello/CMakeLists.txt | 6 +- .../app_templates/cppcurseshello/Makefile.am | 4 +- .../app_templates/cppcurseshello/app.tdevelop | 20 +- ...evtemplate => cppcurseshello.kdevtemplate} | 4 +- .../cpp/app_templates/cpphello/CMakeLists.txt | 6 +- .../cpp/app_templates/cpphello/Makefile.am | 4 +- .../cpp/app_templates/cpphello/app.tdevelop | 20 +- ...llo.tdevtemplate => cpphello.kdevtemplate} | 4 +- .../app_templates/cppsdlhello/CMakeLists.txt | 6 +- .../cpp/app_templates/cppsdlhello/Makefile.am | 4 +- .../app_templates/cppsdlhello/app.tdevelop | 16 +- ....tdevtemplate => cppsdlhello.kdevtemplate} | 4 +- .../app_templates/dcopservice/CMakeLists.txt | 6 +- .../cpp/app_templates/dcopservice/Makefile.am | 4 +- ....tdevtemplate => dcopservice.kdevtemplate} | 4 +- .../dcopservice/dcopservice.tdevelop | 30 +-- .../app_templates/generichello/Makefile.am | 4 +- .../cpp/app_templates/generichello/app.prj | 4 +- .../app_templates/generichello/app.tdevelop | 18 +- ...tdevtemplate => generichello.kdevtemplate} | 2 +- .../cpp/app_templates/gnome2mmapp/Makefile.am | 4 +- .../app_templates/gnome2mmapp/app.tdevelop | 20 +- ....tdevtemplate => gnome2mmapp.kdevtemplate} | 6 +- .../app_templates/gtk2mmapp/CMakeLists.txt | 6 +- .../cpp/app_templates/gtk2mmapp/Makefile.am | 4 +- .../cpp/app_templates/gtk2mmapp/app.tdevelop | 24 +-- ...pp.tdevtemplate => gtk2mmapp.kdevtemplate} | 4 +- .../{tdeapp => kapp}/CMakeLists.txt | 14 +- .../{tdeapp => kapp}/Makefile.am | 8 +- .../cpp/app_templates/{tdeapp => kapp}/README | 0 .../app_templates/{tdeapp => kapp}/app.cpp | 0 .../{tdeapp => kapp}/app.desktop | 0 .../cpp/app_templates/{tdeapp => kapp}/app.h | 0 .../{tdeapp/app.tdevses => kapp/app.kdevses} | 0 .../{tdeapp => kapp}/app.tdevelop | 38 ++-- .../{tdeapp => kapp}/app_client.cpp | 0 .../app_templates/{tdeapp => kapp}/appiface.h | 0 .../app_templates/{tdeapp => kapp}/appui.rc | 0 .../{tdeapp => kapp}/appview.cpp | 0 .../app_templates/{tdeapp => kapp}/appview.h | 0 .../kapp.kdevtemplate} | 6 +- .../{tde4app/tde4app.png => kapp/kapp.png} | Bin .../app_templates/{tdeapp => kapp}/main.cpp | 0 .../app_templates/{tdeapp => kapp}/pref.cpp | 0 .../cpp/app_templates/{tdeapp => kapp}/pref.h | 0 .../{tdeapp => kapp}/src-Makefile.am | 0 .../app_templates/{tdeapp => kapp}/subdirs | 0 .../app_templates/kateplugin/CMakeLists.txt | 6 +- .../cpp/app_templates/kateplugin/Makefile.am | 4 +- ...n.tdevtemplate => kateplugin.kdevtemplate} | 4 +- .../app_templates/kateplugin/plugin.tdevelop | 30 +-- .../app_templates/kateplugin2/CMakeLists.txt | 6 +- .../cpp/app_templates/kateplugin2/Makefile.am | 4 +- ....tdevtemplate => kateplugin2.kdevtemplate} | 4 +- .../app_templates/kateplugin2/plugin.tdevelop | 30 +-- .../cpp/app_templates/kde4app/CMakeLists.txt | 29 +++ .../cpp/app_templates/kde4app/Makefile.am | 19 ++ .../app_templates/{tde4app => kde4app}/README | 0 .../tdeapp4.cpp => kde4app/kapp4.cpp} | 0 .../tdeapp4.desktop => kde4app/kapp4.desktop} | 2 +- .../{tde4app/tdeapp4.h => kde4app/kapp4.h} | 0 .../tdeapp4.kcfg => kde4app/kapp4.kcfg} | 0 .../tdeapp4view.cpp => kde4app/kapp4view.cpp} | 0 .../tdeapp4view.h => kde4app/kapp4view.h} | 0 .../kapp4view_base.ui} | 0 .../kde4app-CMakeLists.txt} | 0 .../kde4app.kdevtemplate} | 0 .../tdeapp.png => kde4app/kde4app.png} | Bin .../kde4app.tdevelop} | 38 ++-- .../kde4app.tdevelop.filelist} | 2 +- .../tde4appui.rc => kde4app/kde4appui.rc} | 0 .../{tde4app => kde4app}/main.cpp | 0 .../{tde4app => kde4app}/prefs_base.ui | 0 .../{tde4app => kde4app}/settings.kcfgc | 0 .../{tdecpp.appwizard => kdecpp.appwizard} | 2 +- .../{tdedcop => kdedcop}/CMakeLists.txt | 14 +- .../{tdedcop => kdedcop}/Makefile.am | 8 +- .../{tdedcop => kdedcop}/app.cpp | 0 .../app_templates/{tdedcop => kdedcop}/app.h | 0 .../{tdedcop => kdedcop}/app.tdevelop | 30 +-- .../{tdedcop => kdedcop}/app_iface.h | 0 .../kdedcop.kdevtemplate} | 4 +- .../tdedcop.png => kdedcop/kdedcop.png} | Bin .../{tdedcop => kdedcop}/main.cpp | 0 .../{tdedcop => kdedcop}/mainclass.cpp | 0 .../{tdedcop => kdedcop}/mainclass.h | 0 .../{tdedcop => kdedcop}/src-Makefile.am | 0 .../{tdedcop => kdedcop}/subdirs | 0 .../cpp/app_templates/kdevlang/CMakeLists.txt | 27 +++ .../{tdevlang => kdevlang}/Makefile.am | 10 +- .../{tdevlang => kdevlang}/README.dox | 0 .../{tdevlang => kdevlang}/app.tdevelop | 30 +-- .../kdevlang-configure.in.in} | 2 +- .../kdevlang.desktop} | 2 +- .../kdevlang.kdevtemplate} | 16 +- .../tdevlang.png => kdevlang/kdevlang.png} | Bin .../tdevlang.rc => kdevlang/kdevlang.rc} | 0 .../kdevlang_part.cpp} | 18 +- .../kdevlang_part.h} | 6 +- .../{tdevlang => kdevlang}/src-Makefile.am | 8 +- .../cpp/app_templates/kdevpart/CMakeLists.txt | 29 +++ .../{tdevpart => kdevpart}/Makefile.am | 12 +- .../{tdevpart => kdevpart}/README.dox | 0 .../{tdevpart => kdevpart}/app.tdevelop | 30 +-- .../{tdevpart => kdevpart}/globalconfig.cpp | 0 .../{tdevpart => kdevpart}/globalconfig.h | 0 .../globalconfigbase.ui | 0 .../kdevpart.desktop} | 2 +- .../kdevpart.kdevtemplate} | 14 +- .../tdevpart.png => kdevpart/kdevpart.png} | Bin .../kdevpart_part.cpp} | 20 +- .../kdevpart_part.h} | 4 +- .../kdevpart_part.rc} | 0 .../kdevpart_widget.cpp} | 2 +- .../kdevpart_widget.h} | 2 +- .../{tdevpart => kdevpart}/projectconfig.cpp | 0 .../{tdevpart => kdevpart}/projectconfig.h | 0 .../projectconfigbase.ui | 0 .../{tdevpart => kdevpart}/src-Makefile.am | 8 +- .../app_templates/kdevpart2/CMakeLists.txt | 30 +++ .../{tdevpart2 => kdevpart2}/Makefile.am | 14 +- .../{tdevpart2 => kdevpart2}/README.dox | 0 .../{tdevpart2 => kdevpart2}/app.tdevelop | 34 +-- .../{tdevpart2 => kdevpart2}/globalconfig.cpp | 0 .../{tdevpart2 => kdevpart2}/globalconfig.h | 0 .../globalconfigbase.ui | 0 .../kdevpart-configure.in.in} | 2 +- .../kdevpart.desktop} | 2 +- .../kdevpart2.kdevtemplate} | 20 +- .../tdevpart2.png => kdevpart2/kdevpart2.png} | Bin .../kdevpart_part.cpp} | 20 +- .../kdevpart_part.h} | 4 +- .../kdevpart_part.rc} | 0 .../kdevpart_widget.cpp} | 2 +- .../kdevpart_widget.h} | 2 +- .../projectconfig.cpp | 0 .../{tdevpart2 => kdevpart2}/projectconfig.h | 0 .../projectconfigbase.ui | 0 .../{tdevpart2 => kdevpart2}/src-Makefile.am | 8 +- .../{tdevpart2 => kdevpart2}/subdirs | 0 .../cpp/app_templates/khello/CMakeLists.txt | 6 +- .../cpp/app_templates/khello/Makefile.am | 4 +- .../cpp/app_templates/khello/app.tdevelop | 30 +-- ...hello.tdevtemplate => khello.kdevtemplate} | 4 +- .../cpp/app_templates/khello2/CMakeLists.txt | 6 +- .../cpp/app_templates/khello2/Makefile.am | 4 +- .../cpp/app_templates/khello2/app.tdevelop | 30 +-- ...llo2.tdevtemplate => khello2.kdevtemplate} | 4 +- .../cpp/app_templates/kicker/CMakeLists.txt | 6 +- .../cpp/app_templates/kicker/Makefile.am | 4 +- .../cpp/app_templates/kicker/applet.tdevelop | 30 +-- ...icker.tdevtemplate => kicker.kdevtemplate} | 4 +- languages/cpp/app_templates/kmake/Makefile.am | 4 +- .../cpp/app_templates/kmake/app.tdevelop | 30 +-- ...{kmake.tdevtemplate => kmake.kdevtemplate} | 0 .../cpp/app_templates/kmod/CMakeLists.txt | 6 +- languages/cpp/app_templates/kmod/Makefile.am | 4 +- .../{kmod.tdevtemplate => kmod.kdevtemplate} | 2 +- .../cpp/app_templates/kmod/kmod.tdevelop | 20 +- .../app_templates/kofficepart/CMakeLists.txt | 6 +- .../cpp/app_templates/kofficepart/Makefile.am | 4 +- ...opart.tdevtemplate => kopart.kdevtemplate} | 4 +- .../app_templates/kofficepart/kopart.tdevelop | 30 +-- .../app_templates/konqnavpanel/CMakeLists.txt | 6 +- .../app_templates/konqnavpanel/Makefile.am | 4 +- ...tdevtemplate => konqnavpanel.kdevtemplate} | 4 +- .../konqnavpanel/konqnavpanel.tdevelop | 30 +-- .../cpp/app_templates/kpartapp/CMakeLists.txt | 6 +- .../cpp/app_templates/kpartapp/Makefile.am | 4 +- .../cpp/app_templates/kpartapp/app.tdevelop | 30 +-- ...app.tdevtemplate => kpartapp.kdevtemplate} | 4 +- .../app_templates/kpartplugin/CMakeLists.txt | 6 +- .../cpp/app_templates/kpartplugin/Makefile.am | 4 +- ....tdevtemplate => kpartplugin.kdevtemplate} | 4 +- .../app_templates/kpartplugin/plugin.tdevelop | 30 +-- .../app_templates/kscons_kxt/CMakeLists.txt | 6 +- .../cpp/app_templates/kscons_kxt/Makefile.am | 4 +- .../cpp/app_templates/kscons_kxt/app.tdevelop | 38 ++-- ...t.tdevtemplate => kscons_kxt.kdevtemplate} | 2 +- .../kscons_tdemdi/CMakeLists.txt | 6 +- .../app_templates/kscons_tdemdi/Makefile.am | 4 +- .../app_templates/kscons_tdemdi/app.tdevelop | 38 ++-- ...devtemplate => kscons_tdemdi.kdevtemplate} | 2 +- .../cpp/app_templates/kxt/CMakeLists.txt | 6 +- languages/cpp/app_templates/kxt/Makefile.am | 4 +- languages/cpp/app_templates/kxt/app.tdevelop | 38 ++-- .../{kxt.tdevtemplate => kxt.kdevtemplate} | 4 +- .../makefileempty/CMakeLists.txt | 6 +- .../app_templates/makefileempty/Makefile.am | 4 +- .../app_templates/makefileempty/app.tdevelop | 22 +- ...devtemplate => makefileempty.kdevtemplate} | 2 +- .../cpp/app_templates/noatunui/CMakeLists.txt | 6 +- .../cpp/app_templates/noatunui/Makefile.am | 4 +- ...nui.tdevtemplate => noatunui.kdevtemplate} | 4 +- .../app_templates/noatunui/plugin.tdevelop | 30 +-- .../app_templates/noatunvisual/CMakeLists.txt | 6 +- .../app_templates/noatunvisual/Makefile.am | 4 +- ...tdevtemplate => noatunvisual.kdevtemplate} | 4 +- .../noatunvisual/plugin.tdevelop | 30 +-- .../cpp/app_templates/opieapp/CMakeLists.txt | 6 +- .../cpp/app_templates/opieapp/Makefile.am | 4 +- .../cpp/app_templates/opieapp/app.tdevelop | 32 +-- ...eapp.tdevtemplate => opieapp.kdevtemplate} | 0 .../app_templates/opieapplet/CMakeLists.txt | 6 +- .../cpp/app_templates/opieapplet/Makefile.am | 4 +- .../cpp/app_templates/opieapplet/app.tdevelop | 32 +-- ...t.tdevtemplate => opieapplet.kdevtemplate} | 0 .../app_templates/opieinput/CMakeLists.txt | 6 +- .../cpp/app_templates/opieinput/Makefile.am | 4 +- .../cpp/app_templates/opieinput/app.tdevelop | 32 +-- ...ut.tdevtemplate => opieinput.kdevtemplate} | 0 .../cpp/app_templates/opiemenu/CMakeLists.txt | 6 +- .../cpp/app_templates/opiemenu/Makefile.am | 4 +- .../cpp/app_templates/opiemenu/app.tdevelop | 32 +-- ...enu.tdevtemplate => opiemenu.kdevtemplate} | 0 .../cpp/app_templates/opienet/CMakeLists.txt | 6 +- .../cpp/app_templates/opienet/Makefile.am | 4 +- .../cpp/app_templates/opienet/app.tdevelop | 32 +-- ...enet.tdevtemplate => opienet.kdevtemplate} | 0 .../app_templates/opietoday/CMakeLists.txt | 6 +- .../cpp/app_templates/opietoday/Makefile.am | 4 +- .../cpp/app_templates/opietoday/app.tdevelop | 32 +-- ...ay.tdevtemplate => opietoday.kdevtemplate} | 0 .../cpp/app_templates/prc-tool/Makefile.am | 4 +- ...ool.tdevtemplate => prc-tool.kdevtemplate} | 2 +- .../app_templates/prc-tool/prc-tool.tdevelop | 16 +- .../cpp/app_templates/qmakeapp/CMakeLists.txt | 6 +- .../cpp/app_templates/qmakeapp/Makefile.am | 4 +- ...app.tdevtemplate => qmakeapp.kdevtemplate} | 0 .../app_templates/qmakeapp/qmakeapp.tdevelop | 30 +-- .../app_templates/qmakeempty/CMakeLists.txt | 6 +- .../cpp/app_templates/qmakeempty/Makefile.am | 4 +- ...y.tdevtemplate => qmakeempty.kdevtemplate} | 0 .../qmakeempty/qmakeempty.tdevelop | 28 +-- .../app_templates/qmakesimple/CMakeLists.txt | 6 +- .../cpp/app_templates/qmakesimple/Makefile.am | 4 +- .../app_templates/qmakesimple/app.tdevelop | 30 +-- ....tdevtemplate => qmakesimple.kdevtemplate} | 0 .../cpp/app_templates/qt4hello/CMakeLists.txt | 6 +- .../cpp/app_templates/qt4hello/Makefile.am | 4 +- ...llo.tdevtemplate => qt4hello.kdevtemplate} | 0 .../app_templates/qt4hello/qt4hello.tdevelop | 28 +-- .../app_templates/qt4makeapp/CMakeLists.txt | 6 +- .../cpp/app_templates/qt4makeapp/Makefile.am | 4 +- ...p.tdevtemplate => qt4makeapp.kdevtemplate} | 0 .../qt4makeapp/qt4makeapp.tdevelop | 28 +-- .../app_templates/qtopia4app/CMakeLists.txt | 6 +- .../cpp/app_templates/qtopia4app/Makefile.am | 4 +- .../cpp/app_templates/qtopia4app/app.tdevelop | 36 ++-- ...p.tdevtemplate => qtopia4app.kdevtemplate} | 0 .../app_templates/qtopiaapp/CMakeLists.txt | 6 +- .../cpp/app_templates/qtopiaapp/Makefile.am | 4 +- .../cpp/app_templates/qtopiaapp/app.tdevelop | 32 +-- ...pp.tdevtemplate => qtopiaapp.kdevtemplate} | 0 .../cpp/app_templates/tde4app/CMakeLists.txt | 29 --- .../cpp/app_templates/tde4app/Makefile.am | 19 -- .../app_templates/tdecmodule/CMakeLists.txt | 6 +- .../cpp/app_templates/tdecmodule/Makefile.am | 4 +- .../app_templates/tdecmodule/module.tdevelop | 30 +-- ...e.tdevtemplate => tdecmodule.kdevtemplate} | 4 +- .../app_templates/tdeconfig35/CMakeLists.txt | 6 +- .../cpp/app_templates/tdeconfig35/Makefile.am | 4 +- .../app_templates/tdeconfig35/app.tdevelop | 38 ++-- ....tdevtemplate => tdeconfig35.kdevtemplate} | 4 +- .../tdefileplugin/CMakeLists.txt | 6 +- .../app_templates/tdefileplugin/Makefile.am | 4 +- .../tdefileplugin/plugin.tdevelop | 30 +-- ...devtemplate => tdefileplugin.kdevtemplate} | 4 +- .../app_templates/tdeioslave/CMakeLists.txt | 6 +- .../cpp/app_templates/tdeioslave/Makefile.am | 4 +- .../app_templates/tdeioslave/slave.tdevelop | 30 +-- ...e.tdevtemplate => tdeioslave.kdevtemplate} | 4 +- .../tdescreensaver/CMakeLists.txt | 6 +- .../app_templates/tdescreensaver/Makefile.am | 4 +- ...evtemplate => tdescreensaver.kdevtemplate} | 4 +- .../tdescreensaver/tdescreensaver.tdevelop | 30 +-- .../cpp/app_templates/tdevlang/CMakeLists.txt | 27 --- .../cpp/app_templates/tdevpart/CMakeLists.txt | 29 --- .../app_templates/tdevpart2/CMakeLists.txt | 30 --- .../cpp/app_templates/win32gui/CMakeLists.txt | 6 +- .../cpp/app_templates/win32gui/Makefile.am | 4 +- .../cpp/app_templates/win32gui/app.tdevelop | 28 +-- ...gui.tdevtemplate => win32gui.kdevtemplate} | 4 +- .../app_templates/win32hello/CMakeLists.txt | 6 +- .../cpp/app_templates/win32hello/Makefile.am | 4 +- .../cpp/app_templates/win32hello/app.tdevelop | 28 +-- ...o.tdevtemplate => win32hello.kdevtemplate} | 4 +- .../cpp/app_templates/wxhello/CMakeLists.txt | 6 +- .../cpp/app_templates/wxhello/Makefile.am | 4 +- .../cpp/app_templates/wxhello/app.tdevelop | 24 +-- ...ello.tdevtemplate => wxhello.kdevtemplate} | 4 +- languages/cpp/backgroundparser.cpp | 20 +- languages/cpp/backgroundparser.h | 6 +- languages/cpp/ccconfigwidget.cpp | 16 +- languages/cpp/codeinformationrepository.cpp | 4 +- languages/cpp/codeinformationrepository.h | 6 +- languages/cpp/compiler/Makefile.am | 2 +- .../cpp/compiler/gccoptions/CMakeLists.txt | 10 +- languages/cpp/compiler/gccoptions/Makefile.am | 12 +- .../compiler/gccoptions/gccoptionsplugin.cpp | 4 +- .../compiler/gccoptions/gccoptionsplugin.h | 4 +- ...options.desktop => kdevg77options.desktop} | 2 +- ...options.desktop => kdevgccoptions.desktop} | 2 +- ...options.desktop => kdevgppoptions.desktop} | 2 +- languages/cpp/configproblemreporter.ui.h | 2 +- languages/cpp/cppcodecompletion.cpp | 10 +- languages/cpp/cppimplementationwidget.cpp | 8 +- languages/cpp/cppimplementationwidget.h | 2 +- languages/cpp/cppnewclassdlg.cpp | 16 +- languages/cpp/cppnewclassdlg.h | 4 +- languages/cpp/cppsupport_events.h | 2 +- languages/cpp/cppsupportfactory.cpp | 12 +- languages/cpp/cppsupportfactory.h | 8 +- languages/cpp/cppsupportpart.cpp | 54 ++--- languages/cpp/cppsupportpart.h | 14 +- languages/cpp/createpcsdialog.cpp | 20 +- languages/cpp/debugger/CMakeLists.txt | 10 +- languages/cpp/debugger/Makefile.am | 14 +- .../cpp/debugger/debuggerconfigwidget.cpp | 2 +- languages/cpp/debugger/debuggerpart.cpp | 40 ++-- languages/cpp/debugger/debuggerpart.h | 18 +- ...vdebugger.desktop => kdevdebugger.desktop} | 4 +- .../{tdevdebugger.rc => kdevdebugger.rc} | 2 +- .../tests/breakpoints/breakpoints.tdevelop | 26 +-- languages/cpp/debugger/tests/dll/dll.tdevelop | 26 +-- .../infinite_loop/infinite_loop.tdevelop | 26 +-- .../print_pointers/print_pointers.tdevelop | 32 +-- .../debugger/tests/segfault/segfault.tdevelop | 26 +-- .../debugger/tests/threads/threads.tdevelop | 26 +-- .../debugger/tests/tracing/tracing.tdevelop | 26 +-- .../tests/two_module/two_module.tdevelop | 26 +-- languages/cpp/doc/CMakeLists.txt | 6 +- languages/cpp/doc/Makefile.am | 4 +- languages/cpp/doc/clanlib.toc | 2 +- languages/cpp/doc/gnome1.toc | 2 +- .../cpp/doc/{tde2book.toc => kde2book.toc} | 82 +++---- .../{tdetemplates.toc => kdetemplates.toc} | 0 .../cpp/doc/{qt-tdev3.toc => qt-kdev3.toc} | 14 +- languages/cpp/file_templates/CMakeLists.txt | 2 +- languages/cpp/file_templates/Makefile.am | 2 +- ...support.desktop => kdevcppsupport.desktop} | 4 +- .../{tdevcppsupport.rc => kdevcppsupport.rc} | 2 +- ...vcsupport.desktop => kdevcsupport.desktop} | 2 +- .../cpp/{tdevdeepcopy.h => kdevdeepcopy.h} | 4 +- .../cpp/{tdevdriver.cpp => kdevdriver.cpp} | 20 +- languages/cpp/{tdevdriver.h => kdevdriver.h} | 12 +- .../cpp/newclass_templates/CMakeLists.txt | 2 +- languages/cpp/newclass_templates/Makefile.am | 2 +- .../pcsimporter/customimporter/CMakeLists.txt | 8 +- .../pcsimporter/customimporter/Makefile.am | 12 +- ...tomimporter.cpp => kdevcustomimporter.cpp} | 24 +-- ...vcustomimporter.h => kdevcustomimporter.h} | 12 +- ....desktop => kdevpcscustomimporter.desktop} | 4 +- .../pcsimporter/qt4importer/CMakeLists.txt | 8 +- .../cpp/pcsimporter/qt4importer/Makefile.am | 12 +- ...devqt4importer.cpp => kdevqt4importer.cpp} | 18 +- ...porter.desktop => kdevqt4importer.desktop} | 8 +- .../{tdevqt4importer.h => kdevqt4importer.h} | 12 +- .../cpp/pcsimporter/qtimporter/CMakeLists.txt | 8 +- .../cpp/pcsimporter/qtimporter/Makefile.am | 12 +- ...{tdevqtimporter.cpp => kdevqtimporter.cpp} | 18 +- ...mporter.desktop => kdevqtimporter.desktop} | 4 +- .../{tdevqtimporter.h => kdevqtimporter.h} | 12 +- .../tdelibsimporter/CMakeLists.txt | 8 +- .../pcsimporter/tdelibsimporter/Makefile.am | 12 +- ...bsimporter.cpp => kdevtdelibsimporter.cpp} | 20 +- ...er.desktop => kdevtdelibsimporter.desktop} | 6 +- ...delibsimporter.h => kdevtdelibsimporter.h} | 12 +- languages/cpp/problemreporter.cpp | 6 +- languages/cpp/qtbuildconfig.cpp | 2 +- languages/cpp/qtbuildconfig.h | 2 +- languages/cpp/qtdesignercppintegration.cpp | 8 +- languages/cpp/qtdesignercppintegration.h | 2 +- languages/cpp/simpletype.cpp | 4 +- languages/cpp/storeconverter.cpp | 2 +- .../cpp/subclassing_template/CMakeLists.txt | 2 +- .../cpp/subclassing_template/Makefile.am | 2 +- languages/cpp/subclassingdlg.cpp | 8 +- languages/cpp/templates/CMakeLists.txt | 2 +- languages/cpp/templates/Makefile.am | 2 +- languages/csharp/CMakeLists.txt | 10 +- languages/csharp/Makefile.am | 14 +- languages/csharp/csharpsupportpart.cpp | 30 +-- languages/csharp/csharpsupportpart.h | 4 +- languages/csharp/doc/Makefile.am | 2 +- languages/csharp/file_templates/Makefile.am | 2 +- ...port.desktop => kdevcsharpsupport.desktop} | 2 +- ...vcsharpsupport.rc => kdevcsharpsupport.rc} | 0 languages/fortran/CMakeLists.txt | 8 +- languages/fortran/Makefile.am | 14 +- .../app_templates/fortranhello/CMakeLists.txt | 6 +- .../app_templates/fortranhello/Makefile.am | 4 +- .../app_templates/fortranhello/app.tdevelop | 20 +- ...tdevtemplate => fortranhello.kdevtemplate} | 4 +- languages/fortran/compiler/Makefile.am | 2 +- .../compiler/pgioptions/CMakeLists.txt | 8 +- .../fortran/compiler/pgioptions/Makefile.am | 12 +- ...tions.desktop => kdevpgf77options.desktop} | 2 +- ...tions.desktop => kdevpghpfoptions.desktop} | 2 +- .../compiler/pgioptions/pgioptionsfactory.cpp | 4 +- .../compiler/pgioptions/pgioptionsplugin.cpp | 2 +- .../compiler/pgioptions/pgioptionsplugin.h | 4 +- languages/fortran/doc/CMakeLists.txt | 2 +- languages/fortran/doc/Makefile.am | 2 +- .../fortran/file_templates/CMakeLists.txt | 2 +- languages/fortran/file_templates/Makefile.am | 2 +- languages/fortran/fortransupportpart.cpp | 28 +-- languages/fortran/fortransupportpart.h | 10 +- ...ort.desktop => kdevfortransupport.desktop} | 2 +- ...ortransupport.rc => kdevfortransupport.rc} | 0 languages/java/CMakeLists.txt | 14 +- languages/java/KDevJavaSupportIface.cpp | 24 +++ ...aSupportIface.h => KDevJavaSupportIface.h} | 10 +- languages/java/Makefile.am | 16 +- languages/java/TDevJavaSupportIface.cpp | 24 --- languages/java/app_templates/CMakeLists.txt | 2 +- languages/java/app_templates/Makefile.am | 2 +- languages/java/app_templates/java.appwizard | 2 +- .../app_templates/javahello/CMakeLists.txt | 6 +- .../java/app_templates/javahello/Makefile.am | 4 +- .../javahello/javahello.filelist | 2 +- ...lo.tdevtemplate => javahello.kdevtemplate} | 0 .../javahello/javahello.tdevelop | 14 +- .../app_templates/kappjava/CMakeLists.txt | 26 +++ .../{tdeappjava => kappjava}/Makefile.am | 8 +- .../{tdeappjava => kappjava}/app.desktop | 0 .../{tdeappjava => kappjava}/app.java | 0 .../{tdeappjava => kappjava}/app.tdevelop | 20 +- .../{tdeappjava => kappjava}/app_client.java | 0 .../{tdeappjava => kappjava}/appui.rc | 0 .../{tdeappjava => kappjava}/appview.java | 0 .../tdeappjava => kappjava/kappjava} | 2 +- .../kappjava.kdevtemplate} | 10 +- .../tdeappjava.png => kappjava/kappjava.png} | Bin .../{tdeappjava => kappjava}/pref.java | 0 .../{tdeappjava => kappjava}/src-Makefile.am | 0 .../{tdeappjava => kappjava}/subdirs | 0 .../app_templates/superwaba/CMakeLists.txt | 6 +- .../java/app_templates/superwaba/Makefile.am | 4 +- ...ba.tdevtemplate => superwaba.kdevtemplate} | 2 +- .../java/app_templates/superwaba/sw.tdevelop | 20 +- .../app_templates/tdeappjava/CMakeLists.txt | 26 --- languages/java/backgroundparser.cpp | 10 +- languages/java/backgroundparser.h | 2 +- languages/java/doc/CMakeLists.txt | 2 +- languages/java/doc/Makefile.am | 2 +- languages/java/file_templates/CMakeLists.txt | 2 +- languages/java/file_templates/Makefile.am | 2 +- languages/java/javasupport_events.h | 2 +- languages/java/javasupportfactory.cpp | 16 +- languages/java/javasupportfactory.h | 8 +- languages/java/javasupportpart.cpp | 30 +-- languages/java/javasupportpart.h | 10 +- .../java/{tdevdeepcopy.h => kdevdeepcopy.h} | 4 +- .../java/{tdevdriver.cpp => kdevdriver.cpp} | 10 +- languages/java/{tdevdriver.h => kdevdriver.h} | 10 +- ...upport.desktop => kdevjavasupport.desktop} | 4 +- ...{tdevjavasupport.rc => kdevjavasupport.rc} | 2 +- languages/java/newclass_templates/Makefile.am | 2 +- languages/java/problemreporter.cpp | 4 +- languages/kjssupport/Makefile.am | 14 +- languages/kjssupport/jscodecompletion.cpp | 10 +- languages/kjssupport/jscodecompletion.h | 2 +- ...support.desktop => kdevkjssupport.desktop} | 2 +- .../{tdevkjssupport.rc => kdevkjssupport.rc} | 0 languages/kjssupport/kjssupport_part.cpp | 22 +- languages/kjssupport/kjssupport_part.h | 8 +- .../subclassing_template/Makefile.am | 2 +- languages/kjssupport/subclassingdlg.cpp | 2 +- languages/kjssupport/template/Makefile.am | 2 +- languages/kjssupport/template/app.tdevelop | 20 +- languages/kjssupport/template/script | 2 +- languages/lib/debugger/CMakeLists.txt | 4 +- languages/lib/debugger/Makefile.am | 10 +- languages/lib/debugger/debugger.cpp | 4 +- languages/lib/debugger/debugger.h | 10 +- .../{tdevdebugger.cpp => kdevdebugger.cpp} | 18 +- .../{tdevdebugger.h => kdevdebugger.h} | 10 +- .../lib/designer_integration/Mainpage.dox | 10 +- .../lib/designer_integration/Makefile.am | 6 +- .../implementationwidget.cpp | 6 +- .../implementationwidget.h | 6 +- .../qtdesignerintegration.cpp | 12 +- .../qtdesignerintegration.h | 12 +- languages/lib/interfaces/CMakeLists.txt | 4 +- languages/lib/interfaces/Makefile.am | 10 +- ...devpcsimporter.cpp => kdevpcsimporter.cpp} | 10 +- .../{tdevpcsimporter.h => kdevpcsimporter.h} | 12 +- languages/pascal/CMakeLists.txt | 12 +- languages/pascal/Makefile.am | 16 +- .../app_templates/fpcgtk/CMakeLists.txt | 6 +- .../pascal/app_templates/fpcgtk/Makefile.am | 4 +- .../pascal/app_templates/fpcgtk/app.tdevelop | 12 +- ...pcgtk.tdevtemplate => fpcgtk.kdevtemplate} | 2 +- .../app_templates/fpchello/CMakeLists.txt | 6 +- .../pascal/app_templates/fpchello/Makefile.am | 4 +- .../app_templates/fpchello/app.tdevelop | 12 +- ...llo.tdevtemplate => fpchello.kdevtemplate} | 2 +- .../app_templates/fpcsharedlib/CMakeLists.txt | 6 +- .../app_templates/fpcsharedlib/Makefile.am | 4 +- .../app_templates/fpcsharedlib/app.tdevelop | 12 +- ...tdevtemplate => fpcsharedlib.kdevtemplate} | 2 +- .../app_templates/pascalhello/CMakeLists.txt | 6 +- .../app_templates/pascalhello/Makefile.am | 4 +- .../app_templates/pascalhello/app.tdevelop | 12 +- ....tdevtemplate => pascalhello.kdevtemplate} | 2 +- languages/pascal/compiler/Makefile.am | 2 +- .../pascal/compiler/dccoptions/CMakeLists.txt | 8 +- .../pascal/compiler/dccoptions/Makefile.am | 12 +- .../compiler/dccoptions/dccoptionsplugin.cpp | 4 +- .../compiler/dccoptions/dccoptionsplugin.h | 4 +- ...options.desktop => kdevdccoptions.desktop} | 2 +- .../pascal/compiler/fpcoptions/CMakeLists.txt | 8 +- .../pascal/compiler/fpcoptions/Makefile.am | 12 +- .../compiler/fpcoptions/fpcoptionsplugin.cpp | 4 +- .../compiler/fpcoptions/fpcoptionsplugin.h | 4 +- ...options.desktop => kdevfpcoptions.desktop} | 2 +- languages/pascal/doc/CMakeLists.txt | 2 +- languages/pascal/doc/Makefile.am | 2 +- .../pascal/file_templates/CMakeLists.txt | 2 +- languages/pascal/file_templates/Makefile.am | 2 +- ...port.desktop => kdevpascalsupport.desktop} | 2 +- ...vpascalsupport.rc => kdevpascalsupport.rc} | 0 languages/pascal/pascalsupport_part.cpp | 24 +-- languages/pascal/pascalsupport_part.h | 8 +- languages/pascal/problemreporter.cpp | 4 +- languages/perl/CMakeLists.txt | 8 +- languages/perl/Makefile.am | 14 +- .../app_templates/perlhello/CMakeLists.txt | 6 +- .../perl/app_templates/perlhello/Makefile.am | 4 +- .../perl/app_templates/perlhello/app.tdevelop | 12 +- ...lo.tdevtemplate => perlhello.kdevtemplate} | 0 languages/perl/doc/CMakeLists.txt | 2 +- languages/perl/doc/Makefile.am | 2 +- languages/perl/file_templates/CMakeLists.txt | 2 +- languages/perl/file_templates/Makefile.am | 2 +- ...upport.desktop => kdevperlsupport.desktop} | 2 +- ...{tdevperlsupport.rc => kdevperlsupport.rc} | 0 languages/perl/perlparser.cpp | 2 +- languages/perl/perlparser.h | 6 +- languages/perl/perlsupportpart.cpp | 30 +-- languages/perl/perlsupportpart.h | 4 +- languages/php/CMakeLists.txt | 12 +- languages/php/Makefile.am | 16 +- .../php/app_templates/phphello/CMakeLists.txt | 6 +- .../php/app_templates/phphello/Makefile.am | 4 +- .../php/app_templates/phphello/app.tdevelop | 20 +- ...llo.tdevtemplate => phphello.kdevtemplate} | 0 languages/php/data/CMakeLists.txt | 2 +- languages/php/data/Makefile.am | 2 +- languages/php/doc/CMakeLists.txt | 2 +- languages/php/doc/Makefile.am | 2 +- languages/php/file_templates/CMakeLists.txt | 2 +- languages/php/file_templates/Makefile.am | 2 +- ...support.desktop => kdevphpsupport.desktop} | 2 +- .../{tdevphpsupport.rc => kdevphpsupport.rc} | 0 languages/php/phpcodecompletion.cpp | 2 +- languages/php/phpcodecompletion.h | 4 +- languages/php/phperrorview.cpp | 6 +- languages/php/phpfile.cpp | 2 +- languages/php/phpfile.h | 6 +- languages/php/phphtmlview.cpp | 2 +- languages/php/phphtmlview.h | 4 +- languages/php/phpparser.cpp | 4 +- languages/php/phpparser.h | 4 +- languages/php/phpsupportpart.cpp | 20 +- languages/php/phpsupportpart.h | 8 +- languages/python/CMakeLists.txt | 10 +- languages/python/Makefile.am | 18 +- .../python/app_templates/pyqt/CMakeLists.txt | 6 +- .../python/app_templates/pyqt/Makefile.am | 4 +- .../python/app_templates/pyqt/app.tdevelop | 16 +- .../{pyqt.tdevtemplate => pyqt.kdevtemplate} | 2 +- .../app_templates/pythonhello/CMakeLists.txt | 6 +- .../app_templates/pythonhello/Makefile.am | 4 +- .../app_templates/pythonhello/app.tdevelop | 16 +- ....tdevtemplate => pythonhello.kdevtemplate} | 0 .../python/app_templates/pytk/CMakeLists.txt | 6 +- .../python/app_templates/pytk/Makefile.am | 4 +- .../python/app_templates/pytk/app.tdevelop | 16 +- .../{pytk.tdevtemplate => pytk.kdevtemplate} | 0 languages/python/doc/CMakeLists.txt | 2 +- languages/python/doc/Makefile.am | 2 +- .../python/file_templates/CMakeLists.txt | 2 +- languages/python/file_templates/Makefile.am | 2 +- .../python/{tde_pydoc.py => kde_pydoc.py} | 0 ...port.desktop => kdevpythonsupport.desktop} | 2 +- ...vpythonsupport.rc => kdevpythonsupport.rc} | 0 languages/python/pydoc.cpp | 2 +- languages/python/pythonconfigwidget.cpp | 8 +- .../python/pythonimplementationwidget.cpp | 6 +- languages/python/pythonimplementationwidget.h | 2 +- languages/python/pythonsupportpart.cpp | 38 ++-- languages/python/pythonsupportpart.h | 8 +- .../python/qtdesignerpythonintegration.cpp | 8 +- .../python/qtdesignerpythonintegration.h | 2 +- languages/ruby/CMakeLists.txt | 12 +- languages/ruby/Makefile.am | 20 +- languages/ruby/app_templates/CMakeLists.txt | 2 +- languages/ruby/app_templates/Makefile.am | 2 +- .../app_templates/dcopservice/CMakeLists.txt | 6 +- .../app_templates/dcopservice/Makefile.am | 4 +- .../dcopservice/dcopservice.tdevelop | 28 +-- ...vtemplate => dcopserviceruby.kdevtemplate} | 4 +- .../{tdeapp => kapp}/CMakeLists.txt | 12 +- .../{tdeapp => kapp}/Makefile.am | 6 +- .../app_templates/{tdeapp => kapp}/README | 0 .../{tdeapp => kapp}/app-Makefile.am | 0 .../{tdeapp => kapp}/app-configure.in.in | 0 .../app_templates/{tdeapp => kapp}/app.cpp | 0 .../{tdeapp => kapp}/app.desktop | 0 .../app_templates/{tdeapp => kapp}/app.rb | 0 .../{tdeapp => kapp}/app.tdevelop | 22 +- .../{tdeapp => kapp}/app_client.rb | 0 .../{tdeapp => kapp}/appiface.rb | 0 .../app_templates/{tdeapp => kapp}/appui.rc | 0 .../app_templates/{tdeapp => kapp}/appview.rb | 0 .../kappruby.kdevtemplate} | 8 +- .../tdeappruby.png => kapp/kappruby.png} | Bin .../app_templates/{tdeapp => kapp}/main.rb | 0 .../app_templates/{tdeapp => kapp}/pref.rb | 0 .../{tdeapp => kapp}/src-Makefile.am | 0 .../app_templates/{tdeapp => kapp}/subdirs | 0 .../ruby/app_templates/kxt/CMakeLists.txt | 6 +- languages/ruby/app_templates/kxt/Makefile.am | 4 +- languages/ruby/app_templates/kxt/app.tdevelop | 22 +- ...ruby.tdevtemplate => kxtruby.kdevtemplate} | 4 +- .../ruby/app_templates/qtruby/CMakeLists.txt | 6 +- .../ruby/app_templates/qtruby/Makefile.am | 4 +- .../ruby/app_templates/qtruby/app.filelist | 2 +- .../ruby/app_templates/qtruby/app.tdevelop | 24 +-- ...truby.tdevtemplate => qtruby.kdevtemplate} | 0 .../app_templates/qtruby4app/CMakeLists.txt | 6 +- .../ruby/app_templates/qtruby4app/Makefile.am | 4 +- .../app_templates/qtruby4app/app.filelist | 2 +- ...p.tdevtemplate => qtruby4app.kdevtemplate} | 0 .../qtruby4app/qtruby4app.tdevelop | 22 +- .../app_templates/qtrubyapp/CMakeLists.txt | 6 +- .../ruby/app_templates/qtrubyapp/Makefile.am | 4 +- .../ruby/app_templates/qtrubyapp/app.filelist | 2 +- ...pp.tdevtemplate => qtrubyapp.kdevtemplate} | 0 .../qtrubyapp/qtrubyapp.tdevelop | 22 +- .../ruby/app_templates/rails/CMakeLists.txt | 6 +- .../ruby/app_templates/rails/Makefile.am | 4 +- .../ruby/app_templates/rails/app.tdevelop | 22 +- ...{rails.tdevtemplate => rails.kdevtemplate} | 0 languages/ruby/app_templates/ruby.appwizard | 2 +- .../app_templates/rubyhello/CMakeLists.txt | 6 +- .../ruby/app_templates/rubyhello/Makefile.am | 4 +- .../ruby/app_templates/rubyhello/app.tdevelop | 22 +- ...lo.tdevtemplate => rubyhello.kdevtemplate} | 0 languages/ruby/debugger/CMakeLists.txt | 12 +- languages/ruby/debugger/Makefile.am | 16 +- languages/ruby/debugger/debuggerpart.cpp | 38 ++-- languages/ruby/debugger/debuggerpart.h | 18 +- ...ebugger.desktop => kdevrbdebugger.desktop} | 2 +- .../{tdevrbdebugger.rc => kdevrbdebugger.rc} | 0 languages/ruby/doc/CMakeLists.txt | 2 +- languages/ruby/doc/Makefile.am | 2 +- languages/ruby/file_templates/CMakeLists.txt | 2 +- languages/ruby/file_templates/Makefile.am | 2 +- ...upport.desktop => kdevrubysupport.desktop} | 2 +- ...{tdevrubysupport.rc => kdevrubysupport.rc} | 0 languages/ruby/qtdesignerrubyintegration.cpp | 8 +- languages/ruby/qtdesignerrubyintegration.h | 2 +- languages/ruby/rubyimplementationwidget.cpp | 6 +- languages/ruby/rubyimplementationwidget.h | 2 +- languages/ruby/rubysupport_part.cpp | 48 ++--- languages/ruby/rubysupport_part.h | 16 +- languages/sql/CMakeLists.txt | 8 +- languages/sql/Makefile.am | 14 +- .../app_templates/sqlsimple/CMakeLists.txt | 6 +- .../sql/app_templates/sqlsimple/Makefile.am | 4 +- .../sql/app_templates/sqlsimple/app.tdevelop | 18 +- ...le.tdevtemplate => sqlsimple.kdevtemplate} | 0 languages/sql/doc/Makefile.am | 2 +- ...support.desktop => kdevsqlsupport.desktop} | 2 +- .../{tdevsqlsupport.rc => kdevsqlsupport.rc} | 0 languages/sql/sqlactions.cpp | 4 +- languages/sql/sqlconfigwidget.ui.h | 6 +- languages/sql/sqlsupport_part.cpp | 28 +-- languages/sql/sqlsupport_part.h | 10 +- lib/CMakeLists.txt | 4 +- lib/Makefile.am | 10 +- lib/catalog/CMakeLists.txt | 4 +- lib/catalog/Makefile.am | 14 +- lib/cppparser/CMakeLists.txt | 6 +- lib/cppparser/Makefile.am | 12 +- lib/cppparser/lexer.cpp | 4 +- lib/interfaces/CMakeLists.txt | 34 +-- .../{TDevCoreIface.cpp => KDevCoreIface.cpp} | 18 +- .../{TDevCoreIface.h => KDevCoreIface.h} | 14 +- ...rIface.cpp => KDevPartControllerIface.cpp} | 30 +-- ...ollerIface.h => KDevPartControllerIface.h} | 14 +- lib/interfaces/Makefile.am | 38 ++-- lib/interfaces/extensions/CMakeLists.txt | 20 +- lib/interfaces/extensions/Mainpage.dox | 10 +- lib/interfaces/extensions/Makefile.am | 18 +- .../extensions/codebrowserfrontend.h | 8 +- lib/interfaces/extensions/dcop/CMakeLists.txt | 10 +- ...tendIface.cpp => KDevAppFrontendIface.cpp} | 26 +-- ...FrontendIface.h => KDevAppFrontendIface.h} | 14 +- ...endIface.cpp => KDevMakeFrontendIface.cpp} | 14 +- ...rontendIface.h => KDevMakeFrontendIface.h} | 14 +- lib/interfaces/extensions/dcop/Makefile.am | 10 +- lib/interfaces/extensions/kdevappfrontend.cpp | 2 + .../{tdevappfrontend.h => kdevappfrontend.h} | 20 +- .../{tdevcreatefile.h => kdevcreatefile.h} | 22 +- ...vdifffrontend.cpp => kdevdifffrontend.cpp} | 10 +- ...{tdevdifffrontend.h => kdevdifffrontend.h} | 20 +- .../extensions/kdevmakefrontend.cpp | 2 + ...{tdevmakefrontend.h => kdevmakefrontend.h} | 20 +- .../{tdevquickopen.h => kdevquickopen.h} | 36 ++-- ...ourceformatter.h => kdevsourceformatter.h} | 18 +- ...vversioncontrol.h => kdevversioncontrol.h} | 36 ++-- lib/interfaces/extensions/tdevappfrontend.cpp | 2 - .../extensions/tdevmakefrontend.cpp | 2 - lib/interfaces/external/Mainpage.dox | 14 +- lib/interfaces/extras/CMakeLists.txt | 8 +- lib/interfaces/extras/Makefile.am | 14 +- lib/interfaces/extras/kdevcompileroptions.cpp | 8 + ...ompileroptions.h => kdevcompileroptions.h} | 20 +- ...csintegrator.cpp => kdevvcsintegrator.cpp} | 6 +- ...devvcsintegrator.h => kdevvcsintegrator.h} | 10 +- lib/interfaces/extras/tdevcompileroptions.cpp | 8 - .../katedocumentmanagerinterface.cpp | 4 +- lib/interfaces/katedocumentmanagerinterface.h | 6 +- lib/interfaces/{tdevapi.cpp => kdevapi.cpp} | 40 ++-- lib/interfaces/{tdevapi.h => kdevapi.h} | 48 ++--- ...erepository.cpp => kdevcoderepository.cpp} | 26 +-- ...vcoderepository.h => kdevcoderepository.h} | 16 +- lib/interfaces/{tdevcore.cpp => kdevcore.cpp} | 14 +- lib/interfaces/{tdevcore.h => kdevcore.h} | 26 +-- ...ration.cpp => kdevdesignerintegration.cpp} | 18 +- ...ntegration.h => kdevdesignerintegration.h} | 16 +- ...e.cpp => kdevdesignerintegrationiface.cpp} | 18 +- ...iface.h => kdevdesignerintegrationiface.h} | 14 +- ...vgenericfactory.h => kdevgenericfactory.h} | 30 +-- ...agesupport.cpp => kdevlanguagesupport.cpp} | 74 +++---- ...anguagesupport.h => kdevlanguagesupport.h} | 38 ++-- ...{tdevmainwindow.cpp => kdevmainwindow.cpp} | 4 +- .../{tdevmainwindow.h => kdevmainwindow.h} | 10 +- ...tcontroller.cpp => kdevpartcontroller.cpp} | 10 +- ...vpartcontroller.h => kdevpartcontroller.h} | 10 +- .../{tdevplugin.cpp => kdevplugin.cpp} | 56 ++--- lib/interfaces/{tdevplugin.h => kdevplugin.h} | 64 +++--- ...ontroller.cpp => kdevplugincontroller.cpp} | 16 +- ...gincontroller.h => kdevplugincontroller.h} | 20 +- ...{tdevplugininfo.cpp => kdevplugininfo.cpp} | 46 ++-- .../{tdevplugininfo.h => kdevplugininfo.h} | 18 +- .../{tdevproject.cpp => kdevproject.cpp} | 44 ++-- .../{tdevproject.h => kdevproject.h} | 20 +- ...vprojectiface.cpp => kdevprojectiface.cpp} | 72 +++---- ...{tdevprojectiface.h => kdevprojectiface.h} | 16 +- lib/util/CMakeLists.txt | 8 +- lib/util/Makefile.am | 18 +- lib/util/configwidgetproxy.cpp | 4 +- lib/util/configwidgetproxy.h | 8 +- lib/util/filetemplate.cpp | 18 +- lib/util/filetemplate.h | 12 +- ...{tdeveditorutil.cpp => kdeveditorutil.cpp} | 10 +- .../{tdeveditorutil.h => kdeveditorutil.h} | 8 +- .../{tdevjobtimer.cpp => kdevjobtimer.cpp} | 14 +- lib/util/{tdevjobtimer.h => kdevjobtimer.h} | 10 +- ...devshellwidget.cpp => kdevshellwidget.cpp} | 24 +-- .../{tdevshellwidget.h => kdevshellwidget.h} | 10 +- lib/widgets/CMakeLists.txt | 10 +- lib/widgets/Makefile.am | 24 +-- ...{tdevhtml_partui.rc => kdevhtml_partui.rc} | 2 +- .../{tdevhtmlpart.cpp => kdevhtmlpart.cpp} | 58 ++--- .../{tdevhtmlpart.h => kdevhtmlpart.h} | 10 +- .../{tdevtabwidget.cpp => kdevtabwidget.cpp} | 8 +- lib/widgets/propeditor/CMakeLists.txt | 4 +- lib/widgets/propeditor/Makefile.am | 14 +- parts/abbrev/CMakeLists.txt | 10 +- parts/abbrev/Makefile.am | 16 +- parts/abbrev/abbrevpart.cpp | 26 +-- parts/abbrev/abbrevpart.h | 4 +- ...{tdevabbrev.desktop => kdevabbrev.desktop} | 2 +- parts/abbrev/{tdevabbrev.rc => kdevabbrev.rc} | 0 parts/appwizard/CMakeLists.txt | 10 +- parts/appwizard/Makefile.am | 20 +- parts/appwizard/appwizarddlg.cpp | 42 ++-- parts/appwizard/appwizarddlg.h | 14 +- parts/appwizard/appwizardfactory.cpp | 18 +- parts/appwizard/appwizardfactory.h | 8 +- parts/appwizard/appwizardpart.cpp | 14 +- parts/appwizard/appwizardpart.h | 4 +- parts/appwizard/common/CMakeLists.txt | 16 +- parts/appwizard/common/Makefile.am | 12 +- ...{admin.tdevtemplate => admin.kdevtemplate} | 0 ...ook.tdevtemplate => dockbook.kdevtemplate} | 0 ...nome2.tdevtemplate => gnome2.kdevtemplate} | 0 .../{gnu.tdevtemplate => gnu.kdevtemplate} | 0 ...min.tdevtemplate => incadmin.kdevtemplate} | 0 .../{tde-Makefile.am => kde-Makefile.am} | 0 .../{tde-Makefile.cvs => kde-Makefile.cvs} | 0 .../common/{tde-app.lsm => kde-app.lsm} | 0 ...de-doc-Makefile.am => kde-doc-Makefile.am} | 0 ...-en-Makefile.am => kde-doc-en-Makefile.am} | 0 ...{tde-po-Makefile.am => kde-po-Makefile.am} | 0 ...{scons.tdevtemplate => scons.kdevtemplate} | 0 .../common/scons/admin/{tde.py => kde.py} | 2 +- parts/appwizard/importdlg.cpp | 12 +- parts/appwizard/importdlg.h | 2 +- parts/appwizard/imports/CMakeLists.txt | 8 +- parts/appwizard/imports/Makefile.am | 6 +- parts/appwizard/imports/ada.tdevelop | 12 +- parts/appwizard/imports/c-auto.tdevelop | 16 +- parts/appwizard/imports/c.tdevelop | 18 +- parts/appwizard/imports/cpp-auto.tdevelop | 16 +- parts/appwizard/imports/cpp.tdevelop | 18 +- parts/appwizard/imports/fortran-auto.tdevelop | 12 +- parts/appwizard/imports/fortran.tdevelop | 18 +- parts/appwizard/imports/gnome.tdevelop | 22 +- parts/appwizard/imports/java-ant.tdevelop | 14 +- parts/appwizard/imports/java-auto.tdevelop | 10 +- parts/appwizard/imports/java.tdevelop | 10 +- parts/appwizard/imports/{tde => kde} | 0 .../imports/{tde.tdevelop => kde.tdevelop} | 16 +- parts/appwizard/imports/pascal.tdevelop | 12 +- parts/appwizard/imports/perl.tdevelop | 12 +- parts/appwizard/imports/php.tdevelop | 20 +- parts/appwizard/imports/python.tdevelop | 16 +- parts/appwizard/imports/qt-auto.tdevelop | 16 +- parts/appwizard/imports/qt.tdevelop | 18 +- parts/appwizard/imports/qt4qmake.tdevelop | 20 +- parts/appwizard/imports/qtqmake.tdevelop | 20 +- parts/appwizard/imports/qttmake.tdevelop | 16 +- parts/appwizard/imports/ruby.tdevelop | 18 +- ...ppwizard.desktop => kdevappwizard.desktop} | 4 +- .../{tdevappwizard.rc => kdevappwizard.rc} | 2 +- .../appwizard/{tdevfile.cpp => kdevfile.cpp} | 40 ++-- parts/appwizard/{tdevfile.h => kdevfile.h} | 8 +- .../{tdevlicense.cpp => kdevlicense.cpp} | 20 +- .../{tdevlicense.h => kdevlicense.h} | 16 +- parts/appwizard/profilesupport.cpp | 4 +- parts/appwizard/profilesupport.h | 4 +- parts/astyle/CMakeLists.txt | 8 +- parts/astyle/Makefile.am | 14 +- parts/astyle/astyle_adaptor.cpp | 6 +- parts/astyle/astyle_adaptor.h | 6 +- parts/astyle/astyle_part.cpp | 24 +-- parts/astyle/astyle_part.h | 8 +- parts/astyle/astyle_widget.cpp | 2 +- parts/astyle/astyle_widget.h | 2 +- ...{tdevastyle.desktop => kdevastyle.desktop} | 2 +- ...{tdevpart_astyle.rc => kdevpart_astyle.rc} | 0 parts/bookmarks/CMakeLists.txt | 6 +- parts/bookmarks/Makefile.am | 10 +- parts/bookmarks/bookmarks_part.cpp | 18 +- parts/bookmarks/bookmarks_part.h | 10 +- parts/bookmarks/bookmarks_widget.cpp | 4 +- ...ookmarks.desktop => kdevbookmarks.desktop} | 2 +- parts/classview/CMakeLists.txt | 10 +- parts/classview/Makefile.am | 14 +- parts/classview/classtooldlg.cpp | 8 +- parts/classview/classtooldlg.h | 4 +- parts/classview/classtreebase.cpp | 26 +-- parts/classview/classviewpart.cpp | 30 +-- parts/classview/classviewpart.h | 12 +- parts/classview/classviewwidget.cpp | 26 +-- parts/classview/classviewwidget.h | 4 +- parts/classview/hierarchydlg.cpp | 18 +- parts/classview/hierarchydlg.h | 4 +- ...lassview.desktop => kdevclassview.desktop} | 2 +- .../{tdevclassview.rc => kdevclassview.rc} | 0 parts/classview/navigator.cpp | 6 +- parts/ctags2/CMakeLists.txt | 8 +- parts/ctags2/Makefile.am | 14 +- parts/ctags2/ctags2_part.cpp | 34 +-- parts/ctags2/ctags2_part.h | 8 +- parts/ctags2/ctags2_settingswidget.cpp | 4 +- parts/ctags2/ctags2_widget.cpp | 4 +- ...{tdevctags2.desktop => kdevctags2.desktop} | 2 +- ...{tdevpart_ctags2.rc => kdevpart_ctags2.rc} | 2 +- parts/diff/CMakeLists.txt | 8 +- parts/diff/Makefile.am | 14 +- parts/diff/diffpart.cpp | 22 +- parts/diff/diffpart.h | 6 +- parts/diff/diffwidget.cpp | 2 +- .../{tdevdiff.desktop => kdevdiff.desktop} | 4 +- parts/diff/{tdevdiff.rc => kdevdiff.rc} | 2 +- parts/distpart/CMakeLists.txt | 8 +- parts/distpart/Makefile.am | 14 +- parts/distpart/distpart_part.cpp | 16 +- parts/distpart/distpart_part.h | 8 +- parts/distpart/distpart_widget.cpp | 6 +- parts/distpart/distpart_widget.h | 2 +- ...vdistpart.desktop => kdevdistpart.desktop} | 2 +- ...vpart_distpart.rc => kdevpart_distpart.rc} | 0 parts/distpart/specsupport.cpp | 12 +- parts/documentation/CMakeLists.txt | 12 +- ...onIface.cpp => KDevDocumentationIface.cpp} | 30 +-- ...tationIface.h => KDevDocumentationIface.h} | 10 +- parts/documentation/Makefile.am | 18 +- parts/documentation/addcatalogdlg.cpp | 2 +- parts/documentation/bookmarkview.cpp | 6 +- parts/documentation/contentsview.cpp | 4 +- parts/documentation/data/CMakeLists.txt | 4 +- parts/documentation/data/Makefile.am | 4 +- parts/documentation/data/nomatch.html | 4 +- parts/documentation/data/syntax.html | 4 +- parts/documentation/data/wrapper.html | 6 +- parts/documentation/docconfiglistview.cpp | 2 +- parts/documentation/docglobalconfigwidget.cpp | 12 +- .../documentation/docprojectconfigwidget.cpp | 10 +- parts/documentation/documentation_part.cpp | 111 +++++----- parts/documentation/documentation_part.h | 9 +- parts/documentation/documentation_widget.cpp | 4 +- parts/documentation/documentation_widget.h | 2 +- parts/documentation/docutils.cpp | 4 +- parts/documentation/editcatalogdlg.cpp | 2 +- parts/documentation/find_documentation.cpp | 4 +- parts/documentation/indexview.cpp | 4 +- parts/documentation/interfaces/CMakeLists.txt | 4 +- parts/documentation/interfaces/Makefile.am | 10 +- ...plugin.cpp => kdevdocumentationplugin.cpp} | 8 +- ...tionplugin.h => kdevdocumentationplugin.h} | 4 +- ...tion.desktop => kdevdocumentation.desktop} | 6 +- ...mentation.rc => kdevpart_documentation.rc} | 1 - parts/documentation/plugins/CMakeLists.txt | 2 +- parts/documentation/plugins/Makefile.am | 2 +- .../plugins/chm/docchmplugin.cpp | 8 +- .../documentation/plugins/chm/docchmplugin.h | 2 +- .../plugins/custom/doccustomplugin.cpp | 8 +- .../plugins/custom/doccustomplugin.h | 2 +- .../plugins/devhelp/docdevhelpplugin.cpp | 8 +- .../plugins/devhelp/docdevhelpplugin.h | 2 +- .../plugins/djvu/docdjvuplugin.cpp | 4 +- .../plugins/djvu/docdjvuplugin.h | 2 +- .../plugins/doxygen/docdoxygenplugin.cpp | 8 +- .../plugins/doxygen/docdoxygenplugin.h | 2 +- .../{tdevtoc => kdevtoc}/CMakeLists.txt | 8 +- .../documentation/plugins/kdevtoc/Makefile.am | 10 + .../dockdevtocplugin.cpp} | 46 ++-- .../dockdevtocplugin.desktop} | 10 +- .../dockdevtocplugin.h} | 12 +- .../plugins/pdb/docpdbplugin.cpp | 4 +- .../documentation/plugins/pdb/docpdbplugin.h | 2 +- .../plugins/pdf/docpdfplugin.cpp | 4 +- .../documentation/plugins/pdf/docpdfplugin.h | 2 +- .../documentation/plugins/qt/docqtplugin.cpp | 8 +- parts/documentation/plugins/qt/docqtplugin.h | 2 +- .../documentation/plugins/tdevtoc/Makefile.am | 10 - .../protocols/chm/CMakeLists.txt | 2 +- parts/documentation/protocols/chm/Makefile.am | 2 +- .../documentation/protocols/chm/kchmpart.cpp | 4 +- parts/documentation/protocols/chm/kchmpart.h | 4 +- parts/documentation/searchview.cpp | 10 +- parts/documentation/selecttopic.h | 2 +- .../documentation/tools/htdig/htdigindex.cpp | 20 +- parts/doxygen/CMakeLists.txt | 8 +- parts/doxygen/Makefile.am | 14 +- parts/doxygen/doxygenpart.cpp | 32 +-- parts/doxygen/doxygenpart.h | 4 +- ...devdoxygen.desktop => kdevdoxygen.desktop} | 2 +- .../{tdevdoxygen.rc => kdevdoxygen.rc} | 0 parts/filecreate/CMakeLists.txt | 8 +- parts/filecreate/Makefile.am | 14 +- parts/filecreate/README.dox | 8 +- parts/filecreate/fcconfigwidget.cpp | 32 +-- .../filecreate/file-templates/CMakeLists.txt | 2 +- parts/filecreate/file-templates/Makefile.am | 2 +- parts/filecreate/filecreate_filedialog.h | 4 +- parts/filecreate/filecreate_part.cpp | 62 +++--- parts/filecreate/filecreate_part.h | 14 +- parts/filecreate/filecreate_widget2.cpp | 4 +- parts/filecreate/filecreate_widget2.h | 2 +- parts/filecreate/filecreate_widget3.cpp | 6 +- parts/filecreate/filecreate_widget3.h | 2 +- ...ecreate.desktop => kdevfilecreate.desktop} | 4 +- ...t_filecreate.rc => kdevpart_filecreate.rc} | 2 +- parts/filecreate/template-info.xml | 4 +- parts/filelist/CMakeLists.txt | 8 +- parts/filelist/Makefile.am | 14 +- parts/filelist/filelist_item.h | 2 +- parts/filelist/filelist_widget.cpp | 4 +- parts/filelist/filelist_widget.h | 4 +- ...vfilelist.desktop => kdevfilelist.desktop} | 2 +- .../{tdevfilelist.rc => kdevfilelist.rc} | 0 parts/filelist/projectviewpart.cpp | 22 +- parts/filelist/projectviewpart.h | 10 +- parts/fileselector/CMakeLists.txt | 6 +- parts/fileselector/Makefile.am | 14 +- parts/fileselector/fileselector_part.cpp | 36 ++-- parts/fileselector/fileselector_part.h | 12 +- parts/fileselector/fileselector_widget.cpp | 102 ++++----- parts/fileselector/fileselector_widget.h | 44 ++-- parts/fileselector/kbookmarkhandler.cpp | 6 +- parts/fileselector/kbookmarkhandler.h | 4 +- ...ector.desktop => kdevfileselector.desktop} | 4 +- ...leselector.rc => kdevpart_fileselector.rc} | 0 parts/fileview/CMakeLists.txt | 10 +- parts/fileview/Makefile.am | 20 +- parts/fileview/filegroupsconfigwidget.cpp | 4 +- parts/fileview/filegroupspart.cpp | 18 +- parts/fileview/filegroupspart.h | 4 +- parts/fileview/filegroupswidget.cpp | 18 +- parts/fileview/filegroupswidget.h | 2 +- parts/fileview/filetreeviewwidgetimpl.cpp | 6 +- parts/fileview/filetreewidget.cpp | 18 +- parts/fileview/filetreewidget.h | 14 +- parts/fileview/fileviewpart.cpp | 26 +-- parts/fileview/fileviewpart.h | 8 +- ...egroups.desktop => kdevfilegroups.desktop} | 4 +- ...vfileview.desktop => kdevfileview.desktop} | 4 +- parts/fileview/partwidget.cpp | 10 +- parts/fileview/vcsfiletreewidgetimpl.cpp | 16 +- parts/fileview/vcsfiletreewidgetimpl.h | 8 +- parts/filter/CMakeLists.txt | 10 +- parts/filter/Makefile.am | 14 +- parts/filter/filterpart.cpp | 18 +- parts/filter/filterpart.h | 8 +- ...{tdevfilter.desktop => kdevfilter.desktop} | 4 +- parts/filter/{tdevfilter.rc => kdevfilter.rc} | 2 +- ...devfilterIface.cpp => kdevfilterIface.cpp} | 14 +- .../{tdevfilterIface.h => kdevfilterIface.h} | 10 +- parts/filter/shellfilterdlg.cpp | 2 +- parts/filter/shellfilterdlg.h | 2 +- parts/filter/shellinsertdlg.cpp | 2 +- parts/filter/shellinsertdlg.h | 2 +- parts/fullscreen/CMakeLists.txt | 8 +- parts/fullscreen/Makefile.am | 14 +- parts/fullscreen/fullscreen_part.cpp | 20 +- parts/fullscreen/fullscreen_part.h | 8 +- ...lscreen.desktop => kdevfullscreen.desktop} | 2 +- ...t_fullscreen.rc => kdevpart_fullscreen.rc} | 0 parts/grepview/CMakeLists.txt | 10 +- parts/grepview/Makefile.am | 16 +- parts/grepview/grepdlg.cpp | 2 +- parts/grepview/grepviewpart.cpp | 28 +-- parts/grepview/grepviewpart.h | 10 +- parts/grepview/grepviewwidget.cpp | 16 +- parts/grepview/grepviewwidget.h | 4 +- ...vgrepview.desktop => kdevgrepview.desktop} | 2 +- .../{tdevgrepview.rc => kdevgrepview.rc} | 0 parts/konsole/CMakeLists.txt | 6 +- parts/konsole/Makefile.am | 12 +- ...leview.desktop => kdevkonsoleview.desktop} | 2 +- parts/konsole/konsoleviewpart.cpp | 22 +- parts/konsole/konsoleviewpart.h | 8 +- parts/konsole/konsoleviewwidget.cpp | 6 +- parts/konsole/konsoleviewwidget.h | 2 +- parts/openwith/CMakeLists.txt | 6 +- parts/openwith/Makefile.am | 10 +- ...vopenwith.desktop => kdevopenwith.desktop} | 2 +- parts/openwith/openwithpart.cpp | 16 +- parts/openwith/openwithpart.h | 4 +- parts/outputviews/CMakeLists.txt | 26 +-- parts/outputviews/Makefile.am | 32 +-- parts/outputviews/appoutputviewpart.cpp | 28 +-- parts/outputviews/appoutputviewpart.h | 10 +- parts/outputviews/appoutputwidget.cpp | 6 +- ...view.desktop => kdevappoutputview.desktop} | 8 +- ...vmakeview.desktop => kdevmakeview.desktop} | 4 +- .../{tdevmakeview.rc => kdevmakeview.rc} | 2 +- parts/outputviews/makeactionfilter.cpp | 24 +-- parts/outputviews/makeviewpart.cpp | 28 +-- parts/outputviews/makeviewpart.h | 10 +- parts/outputviews/makewidget.cpp | 8 +- parts/outputviews/outputviewsfactory.cpp | 6 +- parts/outputviews/outputviewsfactory.h | 8 +- parts/partexplorer/CMakeLists.txt | 8 +- parts/partexplorer/Makefile.am | 14 +- ...lorer.desktop => kdevpartexplorer.desktop} | 4 +- ...devpartexplorer.rc => kdevpartexplorer.rc} | 2 +- parts/partexplorer/partexplorer_plugin.cpp | 16 +- parts/partexplorer/partexplorer_plugin.h | 4 +- parts/quickopen/CMakeLists.txt | 8 +- parts/quickopen/Makefile.am | 14 +- ...art_quickopen.rc => kdevpart_quickopen.rc} | 0 ...uickopen.desktop => kdevquickopen.desktop} | 2 +- parts/quickopen/quickopen_part.cpp | 28 +-- parts/quickopen/quickopen_part.h | 6 +- parts/quickopen/quickopenclassdialog.cpp | 6 +- parts/quickopen/quickopenfiledialog.cpp | 4 +- parts/quickopen/quickopenfunctiondialog.cpp | 8 +- parts/regexptest/CMakeLists.txt | 8 +- parts/regexptest/Makefile.am | 14 +- ...exptest.desktop => kdevregexptest.desktop} | 2 +- .../{tdevregexptest.rc => kdevregexptest.rc} | 0 parts/regexptest/regexptestdlg.cpp | 6 +- parts/regexptest/regexptestdlg.h | 6 +- parts/regexptest/regexptestpart.cpp | 16 +- parts/regexptest/regexptestpart.h | 4 +- parts/replace/CMakeLists.txt | 8 +- parts/replace/Makefile.am | 14 +- ...devpart_replace.rc => kdevpart_replace.rc} | 0 ...devreplace.desktop => kdevreplace.desktop} | 2 +- parts/replace/replace_part.cpp | 18 +- parts/replace/replace_part.h | 8 +- parts/replace/replace_widget.cpp | 14 +- parts/replace/replace_widget.h | 2 +- parts/scripting/CMakeLists.txt | 8 +- parts/scripting/Makefile.am | 16 +- ...cripting.desktop => kdevscripting.desktop} | 2 +- .../{tdevscripting.rc => kdevscripting.rc} | 0 parts/scripting/scriptingpart.cpp | 18 +- parts/scripting/scriptingpart.h | 8 +- parts/snippet/CMakeLists.txt | 8 +- parts/snippet/Makefile.am | 14 +- ...devpart_snippet.rc => kdevpart_snippet.rc} | 2 +- ...devsnippet.desktop => kdevsnippet.desktop} | 2 +- parts/snippet/snippet_part.cpp | 20 +- parts/snippet/snippet_part.h | 10 +- parts/snippet/snippet_widget.cpp | 8 +- parts/snippet/snippet_widget.h | 2 +- parts/texttools/CMakeLists.txt | 6 +- parts/texttools/Makefile.am | 14 +- ...exttools.desktop => kdevtexttools.desktop} | 2 +- parts/texttools/texttoolspart.cpp | 18 +- parts/texttools/texttoolspart.h | 4 +- parts/texttools/texttoolswidget.cpp | 4 +- parts/tipofday/CMakeLists.txt | 10 +- parts/tipofday/Makefile.am | 18 +- ...vpart_tipofday.rc => kdevpart_tipofday.rc} | 0 ...vtipofday.desktop => kdevtipofday.desktop} | 2 +- parts/tipofday/tipofday_part.cpp | 18 +- parts/tipofday/tipofday_part.h | 8 +- parts/tools/CMakeLists.txt | 8 +- parts/tools/Makefile.am | 14 +- parts/tools/addtooldlg.ui | 4 +- parts/tools/addtooldlg.ui.h | 2 +- parts/tools/kapplicationtree.cpp | 40 ++-- parts/tools/kapplicationtree.h | 20 +- .../{tdevpart_tools.rc => kdevpart_tools.rc} | 0 .../{tdevtools.desktop => kdevtools.desktop} | 2 +- parts/tools/tools_part.cpp | 26 +-- parts/tools/tools_part.h | 12 +- parts/tools/toolsconfig.cpp | 4 +- parts/tools/toolsconfig.h | 4 +- parts/uimode/CMakeLists.txt | 6 +- parts/uimode/Makefile.am | 10 +- ...ichooser.desktop => kdevuichooser.desktop} | 2 +- parts/uimode/uichooser_part.cpp | 14 +- parts/uimode/uichooser_part.h | 8 +- parts/uimode/uichooser_widget.cpp | 2 +- parts/valgrind/CMakeLists.txt | 8 +- parts/valgrind/Makefile.am | 14 +- ...vpart_valgrind.rc => kdevpart_valgrind.rc} | 0 ...vvalgrind.desktop => kdevvalgrind.desktop} | 2 +- parts/valgrind/valgrind_part.cpp | 26 +-- parts/valgrind/valgrind_part.h | 10 +- parts/valgrind/valgrind_widget.cpp | 8 +- parts/vcsmanager/CMakeLists.txt | 6 +- parts/vcsmanager/Makefile.am | 14 +- ...manager.desktop => kdevvcsmanager.desktop} | 6 +- parts/vcsmanager/vcsmanagerpart.cpp | 20 +- parts/vcsmanager/vcsmanagerpart.h | 8 +- ...sistant.png => hi16-app-kdevassistant.png} | Bin ...designer.png => hi16-app-kdevdesigner.png} | Bin ...sistant.png => hi32-app-kdevassistant.png} | Bin ...designer.png => hi32-app-kdevdesigner.png} | Bin ...sistant.png => hi48-app-kdevassistant.png} | Bin ...designer.png => hi48-app-kdevdesigner.png} | Bin pics/mini/CMakeLists.txt | 2 +- pics/mini/Makefile.am | 2 +- pics/misc/CMakeLists.txt | 4 +- pics/misc/Makefile.am | 4 +- ...nt-splash.png => kdevassistant-splash.png} | Bin ...ner-splash.png => kdevdesigner-splash.png} | Bin pics/toolbar/CMakeLists.txt | 8 +- pics/toolbar/Makefile.am | 12 +- src/CMakeLists.txt | 24 +-- src/Mainpage.dox | 4 +- src/Makefile.am | 36 ++-- src/api.cpp | 10 +- src/api.h | 12 +- src/core.cpp | 4 +- src/core.h | 10 +- src/documentationpart.cpp | 2 +- src/documentationpart.h | 6 +- src/editorproxy.cpp | 10 +- src/eventsrc | 2 +- ...tension.cpp => kdevassistantextension.cpp} | 16 +- ...ntextension.h => kdevassistantextension.h} | 8 +- src/{tdevassistantrc => kdevassistantrc} | 0 ...{tdevassistantui.rc => kdevassistantui.rc} | 2 +- ...videextension.cpp => kdevideextension.cpp} | 34 +-- ...{tdevideextension.h => kdevideextension.h} | 8 +- ...devpluginprofilerc => kdevpluginprofilerc} | 6 +- src/languageselectwidget.cpp | 2 +- src/main.cpp | 8 +- src/main_assistant.cpp | 14 +- src/mainwindowshare.cpp | 18 +- src/mainwindowshare.h | 4 +- src/multibuffer.cpp | 4 +- src/partcontroller.cpp | 26 +-- src/partcontroller.h | 6 +- src/plugincontroller.cpp | 62 +++--- src/plugincontroller.h | 22 +- src/pluginselectdialog.cpp | 6 +- src/profileengine/editor/CMakeLists.txt | 4 +- src/profileengine/editor/Makefile.am | 8 +- src/profileengine/editor/main.cpp | 2 +- src/profileengine/lib/Makefile.am | 6 +- src/profileengine/lib/profileengine.cpp | 2 +- src/profileengine/lib/profileengine.h | 16 +- src/profiles/CMakeLists.txt | 2 +- .../CandCppIDE/CppIDE/CMakeLists.txt | 2 +- .../{TDECppIDE => KDECppIDE}/CMakeLists.txt | 2 +- .../{TDECppIDE => KDECppIDE}/Makefile.am | 2 +- .../{TDECppIDE => KDECppIDE}/profile.config | 0 .../CandCppIDE/CppIDE/Makefile.am | 2 +- .../RubyIDE/profile.config | 2 +- .../CMakeLists.txt | 2 +- src/profiles/KDevAssistant/Makefile.am | 3 + .../profile.config | 0 src/profiles/Makefile.am | 2 +- src/profiles/TDevAssistant/Makefile.am | 3 - src/projectmanager.cpp | 32 +-- src/projectmanager.h | 6 +- src/projectprofiles | 4 +- src/projectsession.cpp | 14 +- src/projectsession.h | 6 +- src/simplemainwindow.cpp | 8 +- src/simplemainwindow.h | 8 +- src/splashscreen.cpp | 10 +- src/splashscreen.h | 6 +- src/statusbar.cpp | 14 +- src/statusbar.h | 6 +- src/tdeconf_update/CMakeLists.txt | 8 +- src/tdeconf_update/Makefile.am | 10 +- ...p => kdev-gen-settings-tdeconf_update.cpp} | 2 +- ...gen-settings.upd => kdev-gen-settings.upd} | 0 src/toplevel.cpp | 6 +- src/toplevel.h | 10 +- tde_app_devel.desktop | 6 - tdevdesigner/plugins/Makefile.am | 8 - tdevdesigner/uilib/Makefile.am | 9 - ...de_cpp.desktop => tdevelop_kde_cpp.desktop | 2 +- vcs/clearcase/CMakeLists.txt | 8 +- vcs/clearcase/Makefile.am | 10 +- vcs/clearcase/clearcasefileinfoprovider.cpp | 4 +- vcs/clearcase/clearcasefileinfoprovider.h | 2 +- vcs/clearcase/clearcasemanipulator.h | 2 +- vcs/clearcase/clearcasepart.cpp | 40 ++-- vcs/clearcase/clearcasepart.h | 8 +- vcs/clearcase/integrator/CMakeLists.txt | 4 +- vcs/clearcase/integrator/Makefile.am | 4 +- vcs/clearcase/integrator/ccintegratordlg.h | 2 +- .../integrator/clearcaseintegrator.cpp | 10 +- .../integrator/clearcaseintegrator.h | 4 +- ...esktop => kdevclearcaseintegrator.desktop} | 0 ...learcase.desktop => kdevclearcase.desktop} | 2 +- vcs/cvsservice/CMakeLists.txt | 12 +- vcs/cvsservice/Makefile.am | 18 +- vcs/cvsservice/README.dox | 2 +- vcs/cvsservice/bufferedstringreader.h | 2 +- vcs/cvsservice/cvsentry.h | 2 +- vcs/cvsservice/cvsfileinfoprovider.cpp | 4 +- vcs/cvsservice/cvsfileinfoprovider.h | 4 +- vcs/cvsservice/cvsoptions.cpp | 10 +- vcs/cvsservice/cvsoptions.h | 6 +- vcs/cvsservice/cvspart.cpp | 38 ++-- vcs/cvsservice/cvspart.h | 8 +- vcs/cvsservice/cvspartimpl.cpp | 24 +-- vcs/cvsservice/cvspartimpl.h | 18 +- vcs/cvsservice/cvsprocesswidget.cpp | 6 +- vcs/cvsservice/integrator/CMakeLists.txt | 4 +- vcs/cvsservice/integrator/Makefile.am | 4 +- .../integrator/cvsserviceintegrator.cpp | 10 +- .../integrator/cvsserviceintegrator.h | 4 +- ...sktop => kdevcvsserviceintegrator.desktop} | 0 vcs/cvsservice/{tdev_cvs.png => kdev_cvs.png} | Bin vcs/cvsservice/{tdev_cvs.xcf => kdev_cvs.xcf} | Bin ...service.desktop => kdevcvsservice.desktop} | 2 +- ...vsservicepart.rc => kdevcvsservicepart.rc} | 0 vcs/perforce/CMakeLists.txt | 8 +- vcs/perforce/Makefile.am | 12 +- vcs/perforce/integrator/CMakeLists.txt | 4 +- vcs/perforce/integrator/Makefile.am | 4 +- ...desktop => kdevperforceintegrator.desktop} | 0 .../integrator/perforceintegrator.cpp | 10 +- vcs/perforce/integrator/perforceintegrator.h | 4 +- vcs/perforce/integrator/pfintegratordlg.h | 2 +- ...vperforce.desktop => kdevperforce.desktop} | 2 +- ...devperforcepart.rc => kdevperforcepart.rc} | 0 vcs/perforce/perforcepart.cpp | 28 +-- vcs/perforce/perforcepart.h | 6 +- vcs/subversion/CMakeLists.txt | 26 +-- vcs/subversion/Makefile.am | 30 +-- vcs/subversion/integrator/CMakeLists.txt | 4 +- vcs/subversion/integrator/Makefile.am | 4 +- ...sktop => kdevsubversionintegrator.desktop} | 0 .../integrator/subversionintegrator.cpp | 10 +- .../integrator/subversionintegrator.h | 4 +- .../integrator/svnintegratordlg.cpp | 2 +- vcs/subversion/integrator/svnintegratordlg.h | 2 +- ...t_subversion.rc => kdevpart_subversion.rc} | 0 ...version.desktop => kdevsubversion.desktop} | 2 +- ...vn+file.protocol => kdevsvn+file.protocol} | 0 ...vn+http.protocol => kdevsvn+http.protocol} | 0 ...+https.protocol => kdevsvn+https.protocol} | 0 ...vsvn+ssh.protocol => kdevsvn+ssh.protocol} | 0 ...vsvn+svn.protocol => kdevsvn+svn.protocol} | 0 vcs/subversion/{tdevsvnd.cpp => kdevsvnd.cpp} | 22 +- .../{tdevsvnd.desktop => kdevsvnd.desktop} | 0 vcs/subversion/{tdevsvnd.h => kdevsvnd.h} | 6 +- ...vsvnd_widgets.cpp => kdevsvnd_widgets.cpp} | 4 +- ...{tdevsvnd_widgets.h => kdevsvnd_widgets.h} | 4 +- vcs/subversion/subversion_core.cpp | 26 +-- vcs/subversion/subversion_core.h | 4 +- vcs/subversion/subversion_fileinfo.cpp | 6 +- vcs/subversion/subversion_fileinfo.h | 4 +- vcs/subversion/subversion_part.cpp | 26 +-- vcs/subversion/subversion_part.h | 12 +- vcs/subversion/subversion_widget.cpp | 2 +- vcs/subversion/svn_fileselectdlg_commit.cpp | 4 +- vcs/subversion/svn_logviewwidget.cpp | 2 +- vcs/subversion/svn_tdeio.cpp | 4 +- 1985 files changed, 7365 insertions(+), 7465 deletions(-) rename buildtools/ada/{tdevadaproject.desktop => kdevadaproject.desktop} (98%) rename buildtools/ada/{tdevadaproject.rc => kdevadaproject.rc} (100%) rename buildtools/ant/{tdevantproject.desktop => kdevantproject.desktop} (98%) rename buildtools/ant/{tdevantproject.rc => kdevantproject.rc} (100%) rename buildtools/autotools/{tdevautoproject.desktop => kdevautoproject.desktop} (99%) rename buildtools/autotools/{tdevautoproject.rc => kdevautoproject.rc} (100%) rename buildtools/autotools/{tdevtdeautoproject.desktop => kdevtdeautoproject.desktop} (99%) rename buildtools/custommakefiles/{tdevcustomproject.desktop => kdevcustomproject.desktop} (98%) rename buildtools/custommakefiles/{tdevcustomproject.rc => kdevcustomproject.rc} (95%) rename buildtools/lib/base/{tdevbuildtool.cpp => kdevbuildtool.cpp} (69%) rename buildtools/lib/base/{tdevbuildtool.h => kdevbuildtool.h} (78%) rename buildtools/pascal/{tdevpascalproject.desktop => kdevpascalproject.desktop} (98%) rename buildtools/pascal/{tdevpascalproject.rc => kdevpascalproject.rc} (100%) rename buildtools/qmake/{tdevtmakeproject.desktop => kdevtmakeproject.desktop} (98%) rename buildtools/qmake/{tdevtrollproject.desktop => kdevtrollproject.desktop} (98%) rename buildtools/qmake/{tdevtrollproject.rc => kdevtrollproject.rc} (100%) rename buildtools/script/{tdevscriptproject.desktop => kdevscriptproject.desktop} (99%) rename buildtools/script/{tdevscriptproject.rc => kdevscriptproject.rc} (81%) rename doc/{tde_app_devel => kde_app_devel}/CMakeLists.txt (84%) rename doc/{tdevassistant => kde_app_devel}/Makefile.am (100%) rename doc/{tde_app_devel => kde_app_devel}/appwizard.png (100%) rename doc/{tde_app_devel => kde_app_devel}/index.docbook (99%) rename doc/{tde_app_devel => kde_app_devel}/kscribblefiles.png (100%) rename doc/{tde_app_devel => kdearch}/Makefile.am (100%) rename doc/{tdearch => kdearch}/affine-general.png (100%) rename doc/{tdearch => kdearch}/affine-rotate.png (100%) rename doc/{tdearch => kdearch}/affine-scale.png (100%) rename doc/{tdearch => kdearch}/affine-shear.png (100%) rename doc/{tdearch => kdearch}/affine-translate.png (100%) rename doc/{tdearch => kdearch}/brushstyles.png (100%) rename doc/{tdearch => kdearch}/canvas.png (100%) rename doc/{tdearch => kdearch}/capflat.png (100%) rename doc/{tdearch => kdearch}/capround.png (100%) rename doc/{tdearch => kdearch}/capsquare.png (100%) rename doc/{tdearch => kdearch}/index.docbook (99%) rename doc/{tdearch => kdearch}/joinbevel.png (100%) rename doc/{tdearch => kdearch}/joinmiter.png (100%) rename doc/{tdearch => kdearch}/joinround.png (100%) rename doc/{tdearch => kdearch}/konqi-mirrored.png (100%) rename doc/{tdearch => kdearch}/konqi-normal.png (100%) rename doc/{tdearch => kdearch}/konqi-rotated.png (100%) rename doc/{tdearch => kdearch}/konqi-sheared.png (100%) rename doc/{tdearch => kdearch}/kview-menu.png (100%) rename doc/{tdearch => kdearch}/opengl.png (100%) rename doc/{tdearch => kdearch}/penstyles.png (100%) rename doc/{tdearch => kdearch}/whatsthis.png (100%) rename doc/{tdevdesigner => kdevdesigner}/CMakeLists.txt (79%) rename doc/{tdevdesigner => kdevdesigner}/Makefile.am (100%) rename doc/{tdevdesigner => kdevdesigner}/index.docbook (83%) rename doc/std/{tdev3api.toc => kdev3api.toc} (100%) delete mode 100644 doc/tdearch/Makefile.am delete mode 100644 doc/tdevassistant/CMakeLists.txt delete mode 100644 doc/tdevassistant/index.docbook rename doc/tdevelop/{tdevdesigner.png => kdevdesigner.png} (100%) rename editors/editor-chooser/{tdeveditorchooser.desktop => kdeveditorchooser.desktop} (98%) rename embedded/visualboyadvance/{tdevpart_visualboyadvance.rc => kdevpart_visualboyadvance.rc} (100%) rename embedded/visualboyadvance/{tdevvisualboyadvance.desktop => kdevvisualboyadvance.desktop} (99%) rename tdevassistant.desktop => kdevassistant.desktop (99%) rename {tdevdesigner => kdevdesigner}/AUTHORS (60%) rename {tdevdesigner => kdevdesigner}/CMakeLists.txt (100%) rename {tdevdesigner => kdevdesigner}/LICENSE.GPL (100%) rename {tdevdesigner => kdevdesigner}/Makefile.am (100%) rename {tdevdesigner => kdevdesigner}/NEWS (100%) rename {tdevdesigner => kdevdesigner}/README (72%) rename {tdevdesigner => kdevdesigner}/TODO (100%) rename {tdevdesigner => kdevdesigner}/designer/CMakeLists.txt (90%) rename {tdevdesigner => kdevdesigner}/designer/Makefile.am (77%) rename {tdevdesigner => kdevdesigner}/designer/about.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/actiondnd.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/actiondnd.h (100%) rename {tdevdesigner => kdevdesigner}/designer/actioneditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/actioneditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/actioneditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/actionlistview.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/actionlistview.h (100%) rename {tdevdesigner => kdevdesigner}/designer/asciivalidator.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/asciivalidator.h (100%) rename {tdevdesigner => kdevdesigner}/designer/command.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/command.h (100%) rename {tdevdesigner => kdevdesigner}/designer/configtoolboxdialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/configtoolboxdialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/connectiondialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/connectiondialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/connectionitems.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/connectionitems.h (100%) rename {tdevdesigner => kdevdesigner}/designer/connectiontable.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/connectiontable.h (100%) rename {tdevdesigner => kdevdesigner}/designer/createtemplate.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/customwidgeteditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/customwidgeteditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/customwidgeteditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/database.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/database.h (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnection.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnectioneditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnectionimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnectionimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnections.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnectionsimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/dbconnectionsimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/defs.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/defs.h (100%) rename {tdevdesigner => kdevdesigner}/designer/designer_pch.h (100%) rename {tdevdesigner => kdevdesigner}/designer/designeraction.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/designeraction.h (100%) rename {tdevdesigner => kdevdesigner}/designer/designerapp.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/designerapp.h (100%) rename {tdevdesigner => kdevdesigner}/designer/designerappiface.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/designerappiface.h (100%) rename {tdevdesigner => kdevdesigner}/designer/editfunctions.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/editfunctionsimpl.cpp (98%) rename {tdevdesigner => kdevdesigner}/designer/editfunctionsimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/filechooser.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/filechooser.h (100%) rename {tdevdesigner => kdevdesigner}/designer/finddialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/finddialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/formfile.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/formfile.h (100%) rename {tdevdesigner => kdevdesigner}/designer/formsettings.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/formsettingsimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/formsettingsimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/formwindow.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/formwindow.h (100%) rename {tdevdesigner => kdevdesigner}/designer/gotolinedialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/gotolinedialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/hierarchyview.cpp (98%) rename {tdevdesigner => kdevdesigner}/designer/hierarchyview.h (100%) rename {tdevdesigner => kdevdesigner}/designer/iconvieweditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/iconvieweditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/iconvieweditorimpl.h (100%) rename tdevdesigner/designer/tdevdesigner_part.cpp => kdevdesigner/designer/kdevdesigner_part.cpp (81%) rename tdevdesigner/designer/tdevdesigner_part.desktop => kdevdesigner/designer/kdevdesigner_part.desktop (84%) rename tdevdesigner/designer/tdevdesigner_part.h => kdevdesigner/designer/kdevdesigner_part.h (92%) rename tdevdesigner/designer/tdevdesigner_part.rc => kdevdesigner/designer/kdevdesigner_part.rc (98%) rename tdevdesigner/designer/tdevdesigner_part_sh.rc => kdevdesigner/designer/kdevdesigner_part_sh.rc (98%) rename {tdevdesigner => kdevdesigner}/designer/layout.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/layout.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxdnd.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxdnd.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxeditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxeditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxrename.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listboxrename.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listdnd.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listdnd.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/listeditor.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listviewdnd.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listviewdnd.h (100%) rename {tdevdesigner => kdevdesigner}/designer/listvieweditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/listvieweditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/listvieweditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/mainwindow.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/mainwindow.h (98%) rename {tdevdesigner => kdevdesigner}/designer/mainwindowactions.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/menubareditor.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/menubareditor.h (100%) rename {tdevdesigner => kdevdesigner}/designer/metadatabase.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/metadatabase.h (100%) rename {tdevdesigner => kdevdesigner}/designer/multilineeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/multilineeditorimpl.cpp (92%) rename {tdevdesigner => kdevdesigner}/designer/multilineeditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/myiconloader.cpp (91%) rename {tdevdesigner => kdevdesigner}/designer/myiconloader.h (100%) rename {tdevdesigner => kdevdesigner}/designer/newform.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/newformimpl.cpp (95%) rename {tdevdesigner => kdevdesigner}/designer/newformimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/orderindicator.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/orderindicator.h (100%) rename {tdevdesigner => kdevdesigner}/designer/outputwindow.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/outputwindow.h (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditoradvanced.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditoradvancedimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditoradvancedimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/paletteeditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/CMakeLists.txt (98%) rename {tdevdesigner => kdevdesigner}/designer/pics/Makefile.am (99%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_adjustsize.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_appicon.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_arrow.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_background.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_book.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_buttongroup.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_checkbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_combobox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_connecttool.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_cross.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_customwidget.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_adjustsize.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_book.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_buttongroup.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_checkbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_combobox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_connecttool.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_customwidget.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_databrowser.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_datatable.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_dataview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_dateedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_datetimeedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_dial.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_down.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editbreaklayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editcopy.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editcut.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editdelete.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editgrid.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_edithlayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_edithlayoutsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editlower.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editpaste.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editraise.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editslots.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editvlayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_editvlayoutsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_filenew.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_fileopen.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_filesave.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_folder.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_form.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_frame.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_groupbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_help.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_home.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_iconview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_image.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_label.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_layout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_lcdnumber.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_left.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_line.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_lineedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_listbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_listview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_multilineedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_newform.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_ordertool.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_pixlabel.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_pointer.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_print.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_progress.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_project.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_pushbutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_radiobutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_redo.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_richtextedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_right.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_scrollbar.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_searchfind.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_setbuddy.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_slider.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_spacer.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_spinbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_table.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_tabwidget.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textbold.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textbrowser.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textcenter.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textfont.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_texth1.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_texth2.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_texth3.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textitalic.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textjustify.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textlarger.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textleft.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textlinebreak.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textparagraph.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textright.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textsmaller.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textteletext.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textunderline.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_textview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_timeedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_toolbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_toolbutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_undo.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_up.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_widgetstack.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_wizarddata.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_wizarddialog.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_d_wordwrap.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_databrowser.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_datatable.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_dataview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_dateedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_datetimeedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_dial.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_down.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editbreaklayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editcopy.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editcut.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editdelete.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editgrid.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_edithlayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_edithlayoutsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editlower.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editpaste.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editraise.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editslots.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editvlayout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_editvlayoutsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_filenew.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_fileopen.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_filesave.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_folder.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_form.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_frame.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_groupbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_hand.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_help.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_home.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_hsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_ibeam.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_iconview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_image.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_label.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_layout.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_lcdnumber.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_left.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_line.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_lineedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_listbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_listview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_multilineedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_newform.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_no.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_object.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_ordertool.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_pixlabel.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_pointer.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_print.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_progress.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_project.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_pushbutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_qtlogo.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_radiobutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_redo.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_resetproperty.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_richtextedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_right.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_s_down.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_s_editcut.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_s_left.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_s_right.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_s_up.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_scrollbar.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_searchfind.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_setbuddy.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_sizeall.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_sizeb.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_sizef.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_sizeh.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_sizev.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_slider.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_spacer.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_spinbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_splash.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_table.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_tabwidget.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textbold.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textbrowser.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textcenter.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textfont.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_texth1.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_texth2.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_texth3.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textitalic.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textjustify.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textlarger.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textleft.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textlinebreak.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textparagraph.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textright.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textsmaller.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textteletext.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textunderline.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_textview.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_timeedit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_toolbox.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_toolbutton.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_undo.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_up.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_uparrow.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_vsplit.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_wait.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_widgetstack.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_wizarddata.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_wizarddialog.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pics/designer_wordwrap.png (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapchooser.cpp (98%) rename {tdevdesigner => kdevdesigner}/designer/pixmapchooser.h (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapcollection.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapcollection.h (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapcollectioneditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapcollectioneditor.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/pixmapfunction.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/popupmenueditor.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/popupmenueditor.h (100%) rename {tdevdesigner => kdevdesigner}/designer/preferences.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/previewframe.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/previewframe.h (100%) rename {tdevdesigner => kdevdesigner}/designer/previewwidget.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/previewwidgetimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/previewwidgetimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/project.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/project.h (100%) rename {tdevdesigner => kdevdesigner}/designer/projectsettings.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/projectsettingsimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/projectsettingsimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/propertyeditor.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/propertyeditor.h (100%) rename {tdevdesigner => kdevdesigner}/designer/propertyobject.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/propertyobject.h (100%) rename {tdevdesigner => kdevdesigner}/designer/qcompletionedit.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/qcompletionedit.h (100%) rename {tdevdesigner => kdevdesigner}/designer/replacedialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/replacedialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/resource.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/resource.h (100%) rename {tdevdesigner => kdevdesigner}/designer/richtextfontdialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/richtextfontdialog.ui.h (100%) rename {tdevdesigner => kdevdesigner}/designer/sizehandle.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/sizehandle.h (100%) rename {tdevdesigner => kdevdesigner}/designer/sourceeditor.cpp (98%) rename {tdevdesigner => kdevdesigner}/designer/sourceeditor.h (100%) rename {tdevdesigner => kdevdesigner}/designer/sourcefile.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/sourcefile.h (100%) rename {tdevdesigner => kdevdesigner}/designer/startdialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/startdialogimpl.cpp (98%) rename {tdevdesigner => kdevdesigner}/designer/startdialogimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/styledbutton.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/styledbutton.h (100%) rename {tdevdesigner => kdevdesigner}/designer/syntaxhighlighter_html.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/syntaxhighlighter_html.h (100%) rename {tdevdesigner => kdevdesigner}/designer/tableeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/tableeditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/tableeditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/timestamp.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/timestamp.h (100%) rename {tdevdesigner => kdevdesigner}/designer/variabledialog.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/variabledialogimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/variabledialogimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/widgetaction.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/widgetaction.h (100%) rename {tdevdesigner => kdevdesigner}/designer/widgetfactory.cpp (99%) rename {tdevdesigner => kdevdesigner}/designer/widgetfactory.h (100%) rename {tdevdesigner => kdevdesigner}/designer/wizardeditor.ui (100%) rename {tdevdesigner => kdevdesigner}/designer/wizardeditorimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/designer/wizardeditorimpl.h (100%) rename {tdevdesigner => kdevdesigner}/designer/workspace.cpp (97%) rename {tdevdesigner => kdevdesigner}/designer/workspace.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/actioninterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/classbrowserinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/designerinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/editorinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/filterinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/interpreterinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/languageinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/preferenceinterface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/projectsettingsiface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/sourcetemplateiface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/templatewizardiface.h (100%) rename {tdevdesigner => kdevdesigner}/interfaces/widgetinterface.h (100%) create mode 100644 kdevdesigner/plugins/Makefile.am rename {tdevdesigner => kdevdesigner}/plugins/languageinterfaceimpl.cpp (100%) rename {tdevdesigner => kdevdesigner}/plugins/languageinterfaceimpl.h (100%) rename {tdevdesigner => kdevdesigner}/shared/CMakeLists.txt (100%) rename {tdevdesigner => kdevdesigner}/shared/Makefile.am (100%) rename {tdevdesigner => kdevdesigner}/shared/domtool.cpp (100%) rename {tdevdesigner => kdevdesigner}/shared/domtool.h (100%) rename {tdevdesigner => kdevdesigner}/shared/globaldefs.h (100%) rename {tdevdesigner => kdevdesigner}/shared/parser.cpp (100%) rename {tdevdesigner => kdevdesigner}/shared/parser.h (100%) rename {tdevdesigner => kdevdesigner}/shared/ui2uib.cpp (100%) rename {tdevdesigner => kdevdesigner}/shared/ui2uib.h (100%) rename {tdevdesigner => kdevdesigner}/shared/uib.cpp (100%) rename {tdevdesigner => kdevdesigner}/shared/uib.h (100%) rename {tdevdesigner => kdevdesigner}/shared/widgetdatabase.cpp (99%) rename {tdevdesigner => kdevdesigner}/shared/widgetdatabase.h (100%) rename {tdevdesigner => kdevdesigner}/src/CMakeLists.txt (66%) rename {tdevdesigner => kdevdesigner}/src/Makefile.am (72%) rename tdevdesigner/src/tdevdesigner.cpp => kdevdesigner/src/kdevdesigner.cpp (86%) rename tdevdesigner/src/tdevdesigner.desktop => kdevdesigner/src/kdevdesigner.desktop (97%) rename tdevdesigner/src/tdevdesigner.h => kdevdesigner/src/kdevdesigner.h (94%) rename tdevdesigner/src/tdevdesigner_shell.rc => kdevdesigner/src/kdevdesigner_shell.rc (95%) rename {tdevdesigner => kdevdesigner}/src/main.cpp (90%) rename {tdevdesigner => kdevdesigner}/uilib/CMakeLists.txt (76%) create mode 100644 kdevdesigner/uilib/Makefile.am rename {tdevdesigner => kdevdesigner}/uilib/database.cpp (100%) rename {tdevdesigner => kdevdesigner}/uilib/database2.h (100%) rename {tdevdesigner => kdevdesigner}/uilib/qwidgetfactory.cpp (100%) rename {tdevdesigner => kdevdesigner}/uilib/qwidgetfactory.h (100%) rename tdevprj2tdevelop => kdevprj2tdevelop (97%) mode change 100644 => 100755 rename languages/ada/app_templates/adahello/{adahello.tdevtemplate => adahello.kdevtemplate} (99%) rename languages/ada/{tdevadasupport.desktop => kdevadasupport.desktop} (99%) rename languages/ada/{tdevadasupport.rc => kdevadasupport.rc} (100%) rename languages/bash/app_templates/bashhello/{bashhello.tdevtemplate => bashhello.kdevtemplate} (100%) rename languages/bash/{tdevbashsupport.desktop => kdevbashsupport.desktop} (98%) rename languages/bash/{tdevbashsupport.rc => kdevbashsupport.rc} (100%) create mode 100644 languages/cpp/KDevCppSupportIface.cpp rename languages/cpp/{TDevCppSupportIface.h => KDevCppSupportIface.h} (55%) delete mode 100644 languages/cpp/TDevCppSupportIface.cpp rename languages/cpp/app_templates/automakeempty/{automakeempty.tdevtemplate => automakeempty.kdevtemplate} (97%) rename languages/cpp/app_templates/chello/{chello.tdevtemplate => chello.kdevtemplate} (99%) rename languages/cpp/app_templates/chello_gba/{chellogba.tdevtemplate => chellogba.kdevtemplate} (98%) rename languages/cpp/app_templates/clanlib/{clanlib.tdevtemplate => clanlib.kdevtemplate} (99%) rename languages/cpp/app_templates/cmakelibc/{cmakelibc.tdevtemplate => cmakelibc.kdevtemplate} (100%) rename languages/cpp/app_templates/cmakelibcpp/{cmakelibcpp.tdevtemplate => cmakelibcpp.kdevtemplate} (100%) rename languages/cpp/app_templates/cmakeqt3app/{cmakeqt3app.tdevtemplate => cmakeqt3app.kdevtemplate} (100%) rename languages/cpp/app_templates/cmakesimple/{cmakesimple.tdevtemplate => cmakesimple.kdevtemplate} (100%) rename languages/cpp/app_templates/cmakesimplec/{cmakesimplec.tdevtemplate => cmakesimplec.kdevtemplate} (100%) rename languages/cpp/app_templates/cppcurseshello/{cppcurseshello.tdevtemplate => cppcurseshello.kdevtemplate} (98%) rename languages/cpp/app_templates/cpphello/{cpphello.tdevtemplate => cpphello.kdevtemplate} (98%) rename languages/cpp/app_templates/cppsdlhello/{cppsdlhello.tdevtemplate => cppsdlhello.kdevtemplate} (98%) rename languages/cpp/app_templates/dcopservice/{dcopservice.tdevtemplate => dcopservice.kdevtemplate} (98%) rename languages/cpp/app_templates/generichello/{generichello.tdevtemplate => generichello.kdevtemplate} (98%) rename languages/cpp/app_templates/gnome2mmapp/{gnome2mmapp.tdevtemplate => gnome2mmapp.kdevtemplate} (98%) rename languages/cpp/app_templates/gtk2mmapp/{gtk2mmapp.tdevtemplate => gtk2mmapp.kdevtemplate} (98%) rename languages/cpp/app_templates/{tdeapp => kapp}/CMakeLists.txt (55%) rename languages/cpp/app_templates/{tdeapp => kapp}/Makefile.am (71%) rename languages/cpp/app_templates/{tdeapp => kapp}/README (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/app.cpp (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/app.desktop (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/app.h (100%) rename languages/cpp/app_templates/{tdeapp/app.tdevses => kapp/app.kdevses} (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/app.tdevelop (91%) rename languages/cpp/app_templates/{tdeapp => kapp}/app_client.cpp (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/appiface.h (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/appui.rc (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/appview.cpp (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/appview.h (100%) rename languages/cpp/app_templates/{tdeapp/tdeapp.tdevtemplate => kapp/kapp.kdevtemplate} (99%) rename languages/cpp/app_templates/{tde4app/tde4app.png => kapp/kapp.png} (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/main.cpp (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/pref.cpp (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/pref.h (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/src-Makefile.am (100%) rename languages/cpp/app_templates/{tdeapp => kapp}/subdirs (100%) rename languages/cpp/app_templates/kateplugin/{kateplugin.tdevtemplate => kateplugin.kdevtemplate} (98%) rename languages/cpp/app_templates/kateplugin2/{kateplugin2.tdevtemplate => kateplugin2.kdevtemplate} (98%) create mode 100644 languages/cpp/app_templates/kde4app/CMakeLists.txt create mode 100644 languages/cpp/app_templates/kde4app/Makefile.am rename languages/cpp/app_templates/{tde4app => kde4app}/README (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4.cpp => kde4app/kapp4.cpp} (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4.desktop => kde4app/kapp4.desktop} (96%) rename languages/cpp/app_templates/{tde4app/tdeapp4.h => kde4app/kapp4.h} (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4.kcfg => kde4app/kapp4.kcfg} (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4view.cpp => kde4app/kapp4view.cpp} (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4view.h => kde4app/kapp4view.h} (100%) rename languages/cpp/app_templates/{tde4app/tdeapp4view_base.ui => kde4app/kapp4view_base.ui} (100%) rename languages/cpp/app_templates/{tde4app/tde4app-CMakeLists.txt => kde4app/kde4app-CMakeLists.txt} (100%) rename languages/cpp/app_templates/{tde4app/tde4app.tdevtemplate => kde4app/kde4app.kdevtemplate} (100%) rename languages/cpp/app_templates/{tdeapp/tdeapp.png => kde4app/kde4app.png} (100%) rename languages/cpp/app_templates/{tde4app/tde4app.tdevelop => kde4app/kde4app.tdevelop} (93%) rename languages/cpp/app_templates/{tde4app/tde4app.tdevelop.filelist => kde4app/kde4app.tdevelop.filelist} (85%) rename languages/cpp/app_templates/{tde4app/tde4appui.rc => kde4app/kde4appui.rc} (100%) rename languages/cpp/app_templates/{tde4app => kde4app}/main.cpp (100%) rename languages/cpp/app_templates/{tde4app => kde4app}/prefs_base.ui (100%) rename languages/cpp/app_templates/{tde4app => kde4app}/settings.kcfgc (100%) rename languages/cpp/app_templates/{tdecpp.appwizard => kdecpp.appwizard} (54%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/CMakeLists.txt (50%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/Makefile.am (67%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/app.cpp (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/app.h (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/app.tdevelop (89%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/app_iface.h (100%) rename languages/cpp/app_templates/{tdedcop/tdedcop.tdevtemplate => kdedcop/kdedcop.kdevtemplate} (98%) rename languages/cpp/app_templates/{tdedcop/tdedcop.png => kdedcop/kdedcop.png} (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/main.cpp (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/mainclass.cpp (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/mainclass.h (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/src-Makefile.am (100%) rename languages/cpp/app_templates/{tdedcop => kdedcop}/subdirs (100%) create mode 100644 languages/cpp/app_templates/kdevlang/CMakeLists.txt rename languages/cpp/app_templates/{tdevlang => kdevlang}/Makefile.am (54%) rename languages/cpp/app_templates/{tdevlang => kdevlang}/README.dox (100%) rename languages/cpp/app_templates/{tdevlang => kdevlang}/app.tdevelop (89%) rename languages/cpp/app_templates/{tdevlang/tdevlang-configure.in.in => kdevlang/kdevlang-configure.in.in} (81%) rename languages/cpp/app_templates/{tdevlang/tdevlang.desktop => kdevlang/kdevlang.desktop} (89%) rename languages/cpp/app_templates/{tdevlang/tdevlang.tdevtemplate => kdevlang/kdevlang.kdevtemplate} (97%) rename languages/cpp/app_templates/{tdevlang/tdevlang.png => kdevlang/kdevlang.png} (100%) rename languages/cpp/app_templates/{tdevlang/tdevlang.rc => kdevlang/kdevlang.rc} (100%) rename languages/cpp/app_templates/{tdevlang/tdevlang_part.cpp => kdevlang/kdevlang_part.cpp} (90%) rename languages/cpp/app_templates/{tdevlang/tdevlang_part.h => kdevlang/kdevlang_part.h} (88%) rename languages/cpp/app_templates/{tdevlang => kdevlang}/src-Makefile.am (62%) create mode 100644 languages/cpp/app_templates/kdevpart/CMakeLists.txt rename languages/cpp/app_templates/{tdevpart => kdevpart}/Makefile.am (54%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/README.dox (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/app.tdevelop (89%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/globalconfig.cpp (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/globalconfig.h (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/globalconfigbase.ui (100%) rename languages/cpp/app_templates/{tdevpart2/tdevpart.desktop => kdevpart/kdevpart.desktop} (98%) rename languages/cpp/app_templates/{tdevpart/tdevpart.tdevtemplate => kdevpart/kdevpart.kdevtemplate} (98%) rename languages/cpp/app_templates/{tdevpart/tdevpart.png => kdevpart/kdevpart.png} (100%) rename languages/cpp/app_templates/{tdevpart/tdevpart_part.cpp => kdevpart/kdevpart_part.cpp} (93%) rename languages/cpp/app_templates/{tdevpart/tdevpart_part.h => kdevpart/kdevpart_part.h} (93%) rename languages/cpp/app_templates/{tdevpart/tdevpart_part.rc => kdevpart/kdevpart_part.rc} (100%) rename languages/cpp/app_templates/{tdevpart2/tdevpart_widget.cpp => kdevpart/kdevpart_widget.cpp} (94%) rename languages/cpp/app_templates/{tdevpart2/tdevpart_widget.h => kdevpart/kdevpart_widget.h} (94%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/projectconfig.cpp (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/projectconfig.h (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/projectconfigbase.ui (100%) rename languages/cpp/app_templates/{tdevpart => kdevpart}/src-Makefile.am (69%) create mode 100644 languages/cpp/app_templates/kdevpart2/CMakeLists.txt rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/Makefile.am (52%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/README.dox (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/app.tdevelop (91%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/globalconfig.cpp (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/globalconfig.h (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/globalconfigbase.ui (100%) rename languages/cpp/app_templates/{tdevpart2/tdevpart-configure.in.in => kdevpart2/kdevpart-configure.in.in} (77%) rename languages/cpp/app_templates/{tdevpart/tdevpart.desktop => kdevpart2/kdevpart.desktop} (98%) rename languages/cpp/app_templates/{tdevpart2/tdevpart2.tdevtemplate => kdevpart2/kdevpart2.kdevtemplate} (97%) rename languages/cpp/app_templates/{tdevpart2/tdevpart2.png => kdevpart2/kdevpart2.png} (100%) rename languages/cpp/app_templates/{tdevpart2/tdevpart_part.cpp => kdevpart2/kdevpart_part.cpp} (93%) rename languages/cpp/app_templates/{tdevpart2/tdevpart_part.h => kdevpart2/kdevpart_part.h} (93%) rename languages/cpp/app_templates/{tdevpart2/tdevpart_part.rc => kdevpart2/kdevpart_part.rc} (100%) rename languages/cpp/app_templates/{tdevpart/tdevpart_widget.cpp => kdevpart2/kdevpart_widget.cpp} (94%) rename languages/cpp/app_templates/{tdevpart/tdevpart_widget.h => kdevpart2/kdevpart_widget.h} (94%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/projectconfig.cpp (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/projectconfig.h (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/projectconfigbase.ui (100%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/src-Makefile.am (69%) rename languages/cpp/app_templates/{tdevpart2 => kdevpart2}/subdirs (100%) rename languages/cpp/app_templates/khello/{khello.tdevtemplate => khello.kdevtemplate} (98%) rename languages/cpp/app_templates/khello2/{khello2.tdevtemplate => khello2.kdevtemplate} (98%) rename languages/cpp/app_templates/kicker/{kicker.tdevtemplate => kicker.kdevtemplate} (98%) rename languages/cpp/app_templates/kmake/{kmake.tdevtemplate => kmake.kdevtemplate} (100%) rename languages/cpp/app_templates/kmod/{kmod.tdevtemplate => kmod.kdevtemplate} (98%) rename languages/cpp/app_templates/kofficepart/{kopart.tdevtemplate => kopart.kdevtemplate} (98%) rename languages/cpp/app_templates/konqnavpanel/{konqnavpanel.tdevtemplate => konqnavpanel.kdevtemplate} (98%) rename languages/cpp/app_templates/kpartapp/{kpartapp.tdevtemplate => kpartapp.kdevtemplate} (98%) rename languages/cpp/app_templates/kpartplugin/{kpartplugin.tdevtemplate => kpartplugin.kdevtemplate} (98%) rename languages/cpp/app_templates/kscons_kxt/{kscons_kxt.tdevtemplate => kscons_kxt.kdevtemplate} (99%) rename languages/cpp/app_templates/kscons_tdemdi/{kscons_tdemdi.tdevtemplate => kscons_tdemdi.kdevtemplate} (99%) rename languages/cpp/app_templates/kxt/{kxt.tdevtemplate => kxt.kdevtemplate} (98%) rename languages/cpp/app_templates/makefileempty/{makefileempty.tdevtemplate => makefileempty.kdevtemplate} (98%) rename languages/cpp/app_templates/noatunui/{noatunui.tdevtemplate => noatunui.kdevtemplate} (98%) rename languages/cpp/app_templates/noatunvisual/{noatunvisual.tdevtemplate => noatunvisual.kdevtemplate} (98%) rename languages/cpp/app_templates/opieapp/{opieapp.tdevtemplate => opieapp.kdevtemplate} (100%) rename languages/cpp/app_templates/opieapplet/{opieapplet.tdevtemplate => opieapplet.kdevtemplate} (100%) rename languages/cpp/app_templates/opieinput/{opieinput.tdevtemplate => opieinput.kdevtemplate} (100%) rename languages/cpp/app_templates/opiemenu/{opiemenu.tdevtemplate => opiemenu.kdevtemplate} (100%) rename languages/cpp/app_templates/opienet/{opienet.tdevtemplate => opienet.kdevtemplate} (100%) rename languages/cpp/app_templates/opietoday/{opietoday.tdevtemplate => opietoday.kdevtemplate} (100%) rename languages/cpp/app_templates/prc-tool/{prc-tool.tdevtemplate => prc-tool.kdevtemplate} (99%) rename languages/cpp/app_templates/qmakeapp/{qmakeapp.tdevtemplate => qmakeapp.kdevtemplate} (100%) rename languages/cpp/app_templates/qmakeempty/{qmakeempty.tdevtemplate => qmakeempty.kdevtemplate} (100%) rename languages/cpp/app_templates/qmakesimple/{qmakesimple.tdevtemplate => qmakesimple.kdevtemplate} (100%) rename languages/cpp/app_templates/qt4hello/{qt4hello.tdevtemplate => qt4hello.kdevtemplate} (100%) rename languages/cpp/app_templates/qt4makeapp/{qt4makeapp.tdevtemplate => qt4makeapp.kdevtemplate} (100%) rename languages/cpp/app_templates/qtopia4app/{qtopia4app.tdevtemplate => qtopia4app.kdevtemplate} (100%) rename languages/cpp/app_templates/qtopiaapp/{qtopiaapp.tdevtemplate => qtopiaapp.kdevtemplate} (100%) delete mode 100644 languages/cpp/app_templates/tde4app/CMakeLists.txt delete mode 100644 languages/cpp/app_templates/tde4app/Makefile.am rename languages/cpp/app_templates/tdecmodule/{tdecmodule.tdevtemplate => tdecmodule.kdevtemplate} (98%) rename languages/cpp/app_templates/tdeconfig35/{tdeconfig35.tdevtemplate => tdeconfig35.kdevtemplate} (98%) rename languages/cpp/app_templates/tdefileplugin/{tdefileplugin.tdevtemplate => tdefileplugin.kdevtemplate} (98%) rename languages/cpp/app_templates/tdeioslave/{tdeioslave.tdevtemplate => tdeioslave.kdevtemplate} (98%) rename languages/cpp/app_templates/tdescreensaver/{tdescreensaver.tdevtemplate => tdescreensaver.kdevtemplate} (98%) delete mode 100644 languages/cpp/app_templates/tdevlang/CMakeLists.txt delete mode 100644 languages/cpp/app_templates/tdevpart/CMakeLists.txt delete mode 100644 languages/cpp/app_templates/tdevpart2/CMakeLists.txt rename languages/cpp/app_templates/win32gui/{win32gui.tdevtemplate => win32gui.kdevtemplate} (98%) rename languages/cpp/app_templates/win32hello/{win32hello.tdevtemplate => win32hello.kdevtemplate} (98%) rename languages/cpp/app_templates/wxhello/{wxhello.tdevtemplate => wxhello.kdevtemplate} (98%) rename languages/cpp/compiler/gccoptions/{tdevg77options.desktop => kdevg77options.desktop} (98%) rename languages/cpp/compiler/gccoptions/{tdevgccoptions.desktop => kdevgccoptions.desktop} (98%) rename languages/cpp/compiler/gccoptions/{tdevgppoptions.desktop => kdevgppoptions.desktop} (98%) rename languages/cpp/debugger/{tdevdebugger.desktop => kdevdebugger.desktop} (99%) rename languages/cpp/debugger/{tdevdebugger.rc => kdevdebugger.rc} (98%) rename languages/cpp/doc/{tde2book.toc => kde2book.toc} (98%) rename languages/cpp/doc/{tdetemplates.toc => kdetemplates.toc} (100%) rename languages/cpp/doc/{qt-tdev3.toc => qt-kdev3.toc} (76%) rename languages/cpp/{tdevcppsupport.desktop => kdevcppsupport.desktop} (98%) rename languages/cpp/{tdevcppsupport.rc => kdevcppsupport.rc} (93%) rename languages/cpp/{tdevcsupport.desktop => kdevcsupport.desktop} (98%) rename languages/cpp/{tdevdeepcopy.h => kdevdeepcopy.h} (81%) rename languages/cpp/{tdevdriver.cpp => kdevdriver.cpp} (92%) rename languages/cpp/{tdevdriver.h => kdevdriver.h} (86%) rename languages/cpp/pcsimporter/customimporter/{tdevcustomimporter.cpp => kdevcustomimporter.cpp} (80%) rename languages/cpp/pcsimporter/customimporter/{tdevcustomimporter.h => kdevcustomimporter.h} (83%) rename languages/cpp/pcsimporter/customimporter/{tdevpcscustomimporter.desktop => kdevpcscustomimporter.desktop} (97%) rename languages/cpp/pcsimporter/qt4importer/{tdevqt4importer.cpp => kdevqt4importer.cpp} (85%) rename languages/cpp/pcsimporter/qt4importer/{tdevqt4importer.desktop => kdevqt4importer.desktop} (91%) rename languages/cpp/pcsimporter/qt4importer/{tdevqt4importer.h => kdevqt4importer.h} (84%) rename languages/cpp/pcsimporter/qtimporter/{tdevqtimporter.cpp => kdevqtimporter.cpp} (80%) rename languages/cpp/pcsimporter/qtimporter/{tdevqtimporter.desktop => kdevqtimporter.desktop} (96%) rename languages/cpp/pcsimporter/qtimporter/{tdevqtimporter.h => kdevqtimporter.h} (84%) rename languages/cpp/pcsimporter/tdelibsimporter/{tdevtdelibsimporter.cpp => kdevtdelibsimporter.cpp} (85%) rename languages/cpp/pcsimporter/tdelibsimporter/{tdevtdelibsimporter.desktop => kdevtdelibsimporter.desktop} (96%) rename languages/cpp/pcsimporter/tdelibsimporter/{tdevtdelibsimporter.h => kdevtdelibsimporter.h} (84%) rename languages/csharp/{tdevcsharpsupport.desktop => kdevcsharpsupport.desktop} (98%) rename languages/csharp/{tdevcsharpsupport.rc => kdevcsharpsupport.rc} (100%) rename languages/fortran/app_templates/fortranhello/{fortranhello.tdevtemplate => fortranhello.kdevtemplate} (98%) rename languages/fortran/compiler/pgioptions/{tdevpgf77options.desktop => kdevpgf77options.desktop} (98%) rename languages/fortran/compiler/pgioptions/{tdevpghpfoptions.desktop => kdevpghpfoptions.desktop} (98%) rename languages/fortran/{tdevfortransupport.desktop => kdevfortransupport.desktop} (98%) rename languages/fortran/{tdevfortransupport.rc => kdevfortransupport.rc} (100%) create mode 100644 languages/java/KDevJavaSupportIface.cpp rename languages/java/{TDevJavaSupportIface.h => KDevJavaSupportIface.h} (52%) delete mode 100644 languages/java/TDevJavaSupportIface.cpp rename languages/java/app_templates/javahello/{javahello.tdevtemplate => javahello.kdevtemplate} (100%) create mode 100644 languages/java/app_templates/kappjava/CMakeLists.txt rename languages/java/app_templates/{tdeappjava => kappjava}/Makefile.am (66%) rename languages/java/app_templates/{tdeappjava => kappjava}/app.desktop (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/app.java (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/app.tdevelop (91%) rename languages/java/app_templates/{tdeappjava => kappjava}/app_client.java (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/appui.rc (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/appview.java (100%) rename languages/java/app_templates/{tdeappjava/tdeappjava => kappjava/kappjava} (95%) rename languages/java/app_templates/{tdeappjava/tdeappjava.tdevtemplate => kappjava/kappjava.kdevtemplate} (96%) rename languages/java/app_templates/{tdeappjava/tdeappjava.png => kappjava/kappjava.png} (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/pref.java (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/src-Makefile.am (100%) rename languages/java/app_templates/{tdeappjava => kappjava}/subdirs (100%) rename languages/java/app_templates/superwaba/{superwaba.tdevtemplate => superwaba.kdevtemplate} (99%) delete mode 100644 languages/java/app_templates/tdeappjava/CMakeLists.txt rename languages/java/{tdevdeepcopy.h => kdevdeepcopy.h} (77%) rename languages/java/{tdevdriver.cpp => kdevdriver.cpp} (73%) rename languages/java/{tdevdriver.h => kdevdriver.h} (66%) rename languages/java/{tdevjavasupport.desktop => kdevjavasupport.desktop} (98%) rename languages/java/{tdevjavasupport.rc => kdevjavasupport.rc} (54%) rename languages/kjssupport/{tdevkjssupport.desktop => kdevkjssupport.desktop} (98%) rename languages/kjssupport/{tdevkjssupport.rc => kdevkjssupport.rc} (100%) rename languages/lib/debugger/{tdevdebugger.cpp => kdevdebugger.cpp} (88%) rename languages/lib/debugger/{tdevdebugger.h => kdevdebugger.h} (93%) rename languages/lib/interfaces/{tdevpcsimporter.cpp => kdevpcsimporter.cpp} (81%) rename languages/lib/interfaces/{tdevpcsimporter.h => kdevpcsimporter.h} (86%) rename languages/pascal/app_templates/fpcgtk/{fpcgtk.tdevtemplate => fpcgtk.kdevtemplate} (99%) rename languages/pascal/app_templates/fpchello/{fpchello.tdevtemplate => fpchello.kdevtemplate} (99%) rename languages/pascal/app_templates/fpcsharedlib/{fpcsharedlib.tdevtemplate => fpcsharedlib.kdevtemplate} (99%) rename languages/pascal/app_templates/pascalhello/{pascalhello.tdevtemplate => pascalhello.kdevtemplate} (99%) rename languages/pascal/compiler/dccoptions/{tdevdccoptions.desktop => kdevdccoptions.desktop} (98%) rename languages/pascal/compiler/fpcoptions/{tdevfpcoptions.desktop => kdevfpcoptions.desktop} (98%) rename languages/pascal/{tdevpascalsupport.desktop => kdevpascalsupport.desktop} (99%) rename languages/pascal/{tdevpascalsupport.rc => kdevpascalsupport.rc} (100%) rename languages/perl/app_templates/perlhello/{perlhello.tdevtemplate => perlhello.kdevtemplate} (100%) rename languages/perl/{tdevperlsupport.desktop => kdevperlsupport.desktop} (98%) rename languages/perl/{tdevperlsupport.rc => kdevperlsupport.rc} (100%) rename languages/php/app_templates/phphello/{phphello.tdevtemplate => phphello.kdevtemplate} (100%) rename languages/php/{tdevphpsupport.desktop => kdevphpsupport.desktop} (98%) rename languages/php/{tdevphpsupport.rc => kdevphpsupport.rc} (100%) rename languages/python/app_templates/pyqt/{pyqt.tdevtemplate => pyqt.kdevtemplate} (99%) rename languages/python/app_templates/pythonhello/{pythonhello.tdevtemplate => pythonhello.kdevtemplate} (100%) rename languages/python/app_templates/pytk/{pytk.tdevtemplate => pytk.kdevtemplate} (100%) rename languages/python/{tde_pydoc.py => kde_pydoc.py} (100%) mode change 100644 => 100755 rename languages/python/{tdevpythonsupport.desktop => kdevpythonsupport.desktop} (98%) rename languages/python/{tdevpythonsupport.rc => kdevpythonsupport.rc} (100%) rename languages/ruby/app_templates/dcopservice/{dcopserviceruby.tdevtemplate => dcopserviceruby.kdevtemplate} (98%) rename languages/ruby/app_templates/{tdeapp => kapp}/CMakeLists.txt (60%) rename languages/ruby/app_templates/{tdeapp => kapp}/Makefile.am (81%) rename languages/ruby/app_templates/{tdeapp => kapp}/README (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app-Makefile.am (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app-configure.in.in (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app.cpp (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app.desktop (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app.rb (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/app.tdevelop (89%) rename languages/ruby/app_templates/{tdeapp => kapp}/app_client.rb (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/appiface.rb (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/appui.rc (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/appview.rb (100%) rename languages/ruby/app_templates/{tdeapp/tdeappruby.tdevtemplate => kapp/kappruby.kdevtemplate} (98%) rename languages/ruby/app_templates/{tdeapp/tdeappruby.png => kapp/kappruby.png} (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/main.rb (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/pref.rb (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/src-Makefile.am (100%) rename languages/ruby/app_templates/{tdeapp => kapp}/subdirs (100%) rename languages/ruby/app_templates/kxt/{kxtruby.tdevtemplate => kxtruby.kdevtemplate} (98%) rename languages/ruby/app_templates/qtruby/{qtruby.tdevtemplate => qtruby.kdevtemplate} (100%) rename languages/ruby/app_templates/qtruby4app/{qtruby4app.tdevtemplate => qtruby4app.kdevtemplate} (100%) rename languages/ruby/app_templates/qtrubyapp/{qtrubyapp.tdevtemplate => qtrubyapp.kdevtemplate} (100%) rename languages/ruby/app_templates/rails/{rails.tdevtemplate => rails.kdevtemplate} (100%) rename languages/ruby/app_templates/rubyhello/{rubyhello.tdevtemplate => rubyhello.kdevtemplate} (100%) rename languages/ruby/debugger/{tdevrbdebugger.desktop => kdevrbdebugger.desktop} (99%) rename languages/ruby/debugger/{tdevrbdebugger.rc => kdevrbdebugger.rc} (100%) rename languages/ruby/{tdevrubysupport.desktop => kdevrubysupport.desktop} (98%) rename languages/ruby/{tdevrubysupport.rc => kdevrubysupport.rc} (100%) rename languages/sql/app_templates/sqlsimple/{sqlsimple.tdevtemplate => sqlsimple.kdevtemplate} (100%) rename languages/sql/{tdevsqlsupport.desktop => kdevsqlsupport.desktop} (98%) rename languages/sql/{tdevsqlsupport.rc => kdevsqlsupport.rc} (100%) rename lib/interfaces/{TDevCoreIface.cpp => KDevCoreIface.cpp} (80%) rename lib/interfaces/{TDevCoreIface.h => KDevCoreIface.h} (86%) rename lib/interfaces/{TDevPartControllerIface.cpp => KDevPartControllerIface.cpp} (70%) rename lib/interfaces/{TDevPartControllerIface.h => KDevPartControllerIface.h} (83%) rename lib/interfaces/extensions/dcop/{TDevAppFrontendIface.cpp => KDevAppFrontendIface.cpp} (69%) rename lib/interfaces/extensions/dcop/{TDevAppFrontendIface.h => KDevAppFrontendIface.h} (85%) rename lib/interfaces/extensions/dcop/{TDevMakeFrontendIface.cpp => KDevMakeFrontendIface.cpp} (78%) rename lib/interfaces/extensions/dcop/{TDevMakeFrontendIface.h => KDevMakeFrontendIface.h} (81%) create mode 100644 lib/interfaces/extensions/kdevappfrontend.cpp rename lib/interfaces/extensions/{tdevappfrontend.h => kdevappfrontend.h} (90%) rename lib/interfaces/extensions/{tdevcreatefile.h => kdevcreatefile.h} (91%) rename lib/interfaces/extensions/{tdevdifffrontend.cpp => kdevdifffrontend.cpp} (82%) rename lib/interfaces/extensions/{tdevdifffrontend.h => kdevdifffrontend.h} (85%) create mode 100644 lib/interfaces/extensions/kdevmakefrontend.cpp rename lib/interfaces/extensions/{tdevmakefrontend.h => kdevmakefrontend.h} (89%) rename lib/interfaces/extensions/{tdevquickopen.h => kdevquickopen.h} (86%) rename lib/interfaces/extensions/{tdevsourceformatter.h => kdevsourceformatter.h} (86%) rename lib/interfaces/extensions/{tdevversioncontrol.h => kdevversioncontrol.h} (91%) delete mode 100644 lib/interfaces/extensions/tdevappfrontend.cpp delete mode 100644 lib/interfaces/extensions/tdevmakefrontend.cpp create mode 100644 lib/interfaces/extras/kdevcompileroptions.cpp rename lib/interfaces/extras/{tdevcompileroptions.h => kdevcompileroptions.h} (82%) rename lib/interfaces/extras/{tdevvcsintegrator.cpp => kdevvcsintegrator.cpp} (87%) rename lib/interfaces/extras/{tdevvcsintegrator.h => kdevvcsintegrator.h} (92%) delete mode 100644 lib/interfaces/extras/tdevcompileroptions.cpp rename lib/interfaces/{tdevapi.cpp => kdevapi.cpp} (70%) rename lib/interfaces/{tdevapi.h => kdevapi.h} (76%) rename lib/interfaces/{tdevcoderepository.cpp => kdevcoderepository.cpp} (67%) rename lib/interfaces/{tdevcoderepository.h => kdevcoderepository.h} (92%) rename lib/interfaces/{tdevcore.cpp => kdevcore.cpp} (97%) rename lib/interfaces/{tdevcore.h => kdevcore.h} (96%) rename lib/interfaces/{tdevdesignerintegration.cpp => kdevdesignerintegration.cpp} (68%) rename lib/interfaces/{tdevdesignerintegration.h => kdevdesignerintegration.h} (91%) rename lib/interfaces/{tdevdesignerintegrationiface.cpp => kdevdesignerintegrationiface.cpp} (80%) rename lib/interfaces/{tdevdesignerintegrationiface.h => kdevdesignerintegrationiface.h} (84%) rename lib/interfaces/{tdevgenericfactory.h => kdevgenericfactory.h} (77%) rename lib/interfaces/{tdevlanguagesupport.cpp => kdevlanguagesupport.cpp} (56%) rename lib/interfaces/{tdevlanguagesupport.h => kdevlanguagesupport.h} (92%) rename lib/interfaces/{tdevmainwindow.cpp => kdevmainwindow.cpp} (93%) rename lib/interfaces/{tdevmainwindow.h => kdevmainwindow.h} (96%) rename lib/interfaces/{tdevpartcontroller.cpp => kdevpartcontroller.cpp} (83%) rename lib/interfaces/{tdevpartcontroller.h => kdevpartcontroller.h} (97%) rename lib/interfaces/{tdevplugin.cpp => kdevplugin.cpp} (69%) rename lib/interfaces/{tdevplugin.h => kdevplugin.h} (87%) rename lib/interfaces/{tdevplugincontroller.cpp => kdevplugincontroller.cpp} (76%) rename lib/interfaces/{tdevplugincontroller.h => kdevplugincontroller.h} (91%) rename lib/interfaces/{tdevplugininfo.cpp => kdevplugininfo.cpp} (78%) rename lib/interfaces/{tdevplugininfo.h => kdevplugininfo.h} (91%) rename lib/interfaces/{tdevproject.cpp => kdevproject.cpp} (78%) rename lib/interfaces/{tdevproject.h => kdevproject.h} (96%) rename lib/interfaces/{tdevprojectiface.cpp => kdevprojectiface.cpp} (57%) rename lib/interfaces/{tdevprojectiface.h => kdevprojectiface.h} (90%) rename lib/util/{tdeveditorutil.cpp => kdeveditorutil.cpp} (91%) rename lib/util/{tdeveditorutil.h => kdeveditorutil.h} (95%) rename lib/util/{tdevjobtimer.cpp => kdevjobtimer.cpp} (79%) rename lib/util/{tdevjobtimer.h => kdevjobtimer.h} (86%) rename lib/util/{tdevshellwidget.cpp => kdevshellwidget.cpp} (85%) rename lib/util/{tdevshellwidget.h => kdevshellwidget.h} (93%) rename lib/widgets/{tdevhtml_partui.rc => kdevhtml_partui.rc} (91%) rename lib/widgets/{tdevhtmlpart.cpp => kdevhtmlpart.cpp} (91%) rename lib/widgets/{tdevhtmlpart.h => kdevhtmlpart.h} (94%) rename lib/widgets/{tdevtabwidget.cpp => kdevtabwidget.cpp} (92%) rename parts/abbrev/{tdevabbrev.desktop => kdevabbrev.desktop} (99%) rename parts/abbrev/{tdevabbrev.rc => kdevabbrev.rc} (100%) rename parts/appwizard/common/{admin.tdevtemplate => admin.kdevtemplate} (100%) rename parts/appwizard/common/{dockbook.tdevtemplate => dockbook.kdevtemplate} (100%) rename parts/appwizard/common/{gnome2.tdevtemplate => gnome2.kdevtemplate} (100%) rename parts/appwizard/common/{gnu.tdevtemplate => gnu.kdevtemplate} (100%) rename parts/appwizard/common/{incadmin.tdevtemplate => incadmin.kdevtemplate} (100%) rename parts/appwizard/common/{tde-Makefile.am => kde-Makefile.am} (100%) rename parts/appwizard/common/{tde-Makefile.cvs => kde-Makefile.cvs} (100%) rename parts/appwizard/common/{tde-app.lsm => kde-app.lsm} (100%) rename parts/appwizard/common/{tde-doc-Makefile.am => kde-doc-Makefile.am} (100%) rename parts/appwizard/common/{tde-doc-en-Makefile.am => kde-doc-en-Makefile.am} (100%) rename parts/appwizard/common/{tde-po-Makefile.am => kde-po-Makefile.am} (100%) rename parts/appwizard/common/{scons.tdevtemplate => scons.kdevtemplate} (100%) rename parts/appwizard/common/scons/admin/{tde.py => kde.py} (99%) rename parts/appwizard/imports/{tde => kde} (100%) rename parts/appwizard/imports/{tde.tdevelop => kde.tdevelop} (92%) rename parts/appwizard/{tdevappwizard.desktop => kdevappwizard.desktop} (98%) rename parts/appwizard/{tdevappwizard.rc => kdevappwizard.rc} (83%) rename parts/appwizard/{tdevfile.cpp => kdevfile.cpp} (51%) rename parts/appwizard/{tdevfile.h => kdevfile.h} (96%) rename parts/appwizard/{tdevlicense.cpp => kdevlicense.cpp} (89%) rename parts/appwizard/{tdevlicense.h => kdevlicense.h} (87%) rename parts/astyle/{tdevastyle.desktop => kdevastyle.desktop} (99%) rename parts/astyle/{tdevpart_astyle.rc => kdevpart_astyle.rc} (100%) rename parts/bookmarks/{tdevbookmarks.desktop => kdevbookmarks.desktop} (99%) rename parts/classview/{tdevclassview.desktop => kdevclassview.desktop} (99%) rename parts/classview/{tdevclassview.rc => kdevclassview.rc} (100%) rename parts/ctags2/{tdevctags2.desktop => kdevctags2.desktop} (99%) rename parts/ctags2/{tdevpart_ctags2.rc => kdevpart_ctags2.rc} (79%) rename parts/diff/{tdevdiff.desktop => kdevdiff.desktop} (98%) rename parts/diff/{tdevdiff.rc => kdevdiff.rc} (81%) rename parts/distpart/{tdevdistpart.desktop => kdevdistpart.desktop} (99%) rename parts/distpart/{tdevpart_distpart.rc => kdevpart_distpart.rc} (100%) rename parts/documentation/{TDevDocumentationIface.cpp => KDevDocumentationIface.cpp} (71%) rename parts/documentation/{TDevDocumentationIface.h => KDevDocumentationIface.h} (90%) rename parts/documentation/interfaces/{tdevdocumentationplugin.cpp => kdevdocumentationplugin.cpp} (99%) rename parts/documentation/interfaces/{tdevdocumentationplugin.h => kdevdocumentationplugin.h} (99%) rename parts/documentation/{tdevdocumentation.desktop => kdevdocumentation.desktop} (98%) rename parts/documentation/{tdevpart_documentation.rc => kdevpart_documentation.rc} (92%) rename parts/documentation/plugins/{tdevtoc => kdevtoc}/CMakeLists.txt (79%) create mode 100644 parts/documentation/plugins/kdevtoc/Makefile.am rename parts/documentation/plugins/{tdevtoc/doctdevtocplugin.cpp => kdevtoc/dockdevtocplugin.cpp} (85%) rename parts/documentation/plugins/{tdevtoc/doctdevtocplugin.desktop => kdevtoc/dockdevtocplugin.desktop} (94%) rename parts/documentation/plugins/{tdevtoc/doctdevtocplugin.h => kdevtoc/dockdevtocplugin.h} (91%) delete mode 100644 parts/documentation/plugins/tdevtoc/Makefile.am rename parts/doxygen/{tdevdoxygen.desktop => kdevdoxygen.desktop} (99%) rename parts/doxygen/{tdevdoxygen.rc => kdevdoxygen.rc} (100%) rename parts/filecreate/{tdevfilecreate.desktop => kdevfilecreate.desktop} (98%) rename parts/filecreate/{tdevpart_filecreate.rc => kdevpart_filecreate.rc} (79%) rename parts/filelist/{tdevfilelist.desktop => kdevfilelist.desktop} (99%) rename parts/filelist/{tdevfilelist.rc => kdevfilelist.rc} (100%) rename parts/fileselector/{tdevfileselector.desktop => kdevfileselector.desktop} (98%) rename parts/fileselector/{tdevpart_fileselector.rc => kdevpart_fileselector.rc} (100%) rename parts/fileview/{tdevfilegroups.desktop => kdevfilegroups.desktop} (98%) rename parts/fileview/{tdevfileview.desktop => kdevfileview.desktop} (99%) rename parts/filter/{tdevfilter.desktop => kdevfilter.desktop} (99%) rename parts/filter/{tdevfilter.rc => kdevfilter.rc} (85%) rename parts/filter/{tdevfilterIface.cpp => kdevfilterIface.cpp} (52%) rename parts/filter/{tdevfilterIface.h => kdevfilterIface.h} (55%) rename parts/fullscreen/{tdevfullscreen.desktop => kdevfullscreen.desktop} (98%) rename parts/fullscreen/{tdevpart_fullscreen.rc => kdevpart_fullscreen.rc} (100%) rename parts/grepview/{tdevgrepview.desktop => kdevgrepview.desktop} (99%) rename parts/grepview/{tdevgrepview.rc => kdevgrepview.rc} (100%) rename parts/konsole/{tdevkonsoleview.desktop => kdevkonsoleview.desktop} (99%) rename parts/openwith/{tdevopenwith.desktop => kdevopenwith.desktop} (99%) rename parts/outputviews/{tdevappoutputview.desktop => kdevappoutputview.desktop} (96%) rename parts/outputviews/{tdevmakeview.desktop => kdevmakeview.desktop} (98%) rename parts/outputviews/{tdevmakeview.rc => kdevmakeview.rc} (84%) rename parts/partexplorer/{tdevpartexplorer.desktop => kdevpartexplorer.desktop} (99%) rename parts/partexplorer/{tdevpartexplorer.rc => kdevpartexplorer.rc} (76%) rename parts/quickopen/{tdevpart_quickopen.rc => kdevpart_quickopen.rc} (100%) rename parts/quickopen/{tdevquickopen.desktop => kdevquickopen.desktop} (99%) rename parts/regexptest/{tdevregexptest.desktop => kdevregexptest.desktop} (99%) rename parts/regexptest/{tdevregexptest.rc => kdevregexptest.rc} (100%) rename parts/replace/{tdevpart_replace.rc => kdevpart_replace.rc} (100%) rename parts/replace/{tdevreplace.desktop => kdevreplace.desktop} (99%) rename parts/scripting/{tdevscripting.desktop => kdevscripting.desktop} (99%) rename parts/scripting/{tdevscripting.rc => kdevscripting.rc} (100%) rename parts/snippet/{tdevpart_snippet.rc => kdevpart_snippet.rc} (66%) rename parts/snippet/{tdevsnippet.desktop => kdevsnippet.desktop} (99%) rename parts/texttools/{tdevtexttools.desktop => kdevtexttools.desktop} (99%) rename parts/tipofday/{tdevpart_tipofday.rc => kdevpart_tipofday.rc} (100%) rename parts/tipofday/{tdevtipofday.desktop => kdevtipofday.desktop} (99%) rename parts/tools/{tdevpart_tools.rc => kdevpart_tools.rc} (100%) rename parts/tools/{tdevtools.desktop => kdevtools.desktop} (99%) rename parts/uimode/{tdevuichooser.desktop => kdevuichooser.desktop} (99%) rename parts/valgrind/{tdevpart_valgrind.rc => kdevpart_valgrind.rc} (100%) rename parts/valgrind/{tdevvalgrind.desktop => kdevvalgrind.desktop} (99%) rename parts/vcsmanager/{tdevvcsmanager.desktop => kdevvcsmanager.desktop} (96%) rename pics/{hi16-app-tdevassistant.png => hi16-app-kdevassistant.png} (100%) rename pics/{hi16-app-tdevdesigner.png => hi16-app-kdevdesigner.png} (100%) rename pics/{hi32-app-tdevassistant.png => hi32-app-kdevassistant.png} (100%) rename pics/{hi32-app-tdevdesigner.png => hi32-app-kdevdesigner.png} (100%) rename pics/{hi48-app-tdevassistant.png => hi48-app-kdevassistant.png} (100%) rename pics/{hi48-app-tdevdesigner.png => hi48-app-kdevdesigner.png} (100%) rename pics/misc/{tdevassistant-splash.png => kdevassistant-splash.png} (100%) rename pics/misc/{tdevdesigner-splash.png => kdevdesigner-splash.png} (100%) rename src/{tdevassistantextension.cpp => kdevassistantextension.cpp} (82%) rename src/{tdevassistantextension.h => kdevassistantextension.h} (92%) rename src/{tdevassistantrc => kdevassistantrc} (100%) rename src/{tdevassistantui.rc => kdevassistantui.rc} (99%) rename src/{tdevideextension.cpp => kdevideextension.cpp} (88%) rename src/{tdevideextension.h => kdevideextension.h} (93%) rename src/{tdevpluginprofilerc => kdevpluginprofilerc} (85%) rename src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/{TDECppIDE => KDECppIDE}/CMakeLists.txt (89%) rename src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/{TDECppIDE => KDECppIDE}/Makefile.am (73%) rename src/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/{TDECppIDE => KDECppIDE}/profile.config (100%) rename src/profiles/{TDevAssistant => KDevAssistant}/CMakeLists.txt (82%) create mode 100644 src/profiles/KDevAssistant/Makefile.am rename src/profiles/{TDevAssistant => KDevAssistant}/profile.config (100%) delete mode 100644 src/profiles/TDevAssistant/Makefile.am rename src/tdeconf_update/{tdev-gen-settings-tdeconf_update.cpp => kdev-gen-settings-tdeconf_update.cpp} (98%) rename src/tdeconf_update/{tdev-gen-settings.upd => kdev-gen-settings.upd} (100%) delete mode 100644 tde_app_devel.desktop delete mode 100644 tdevdesigner/plugins/Makefile.am delete mode 100644 tdevdesigner/uilib/Makefile.am rename tdevelop_tde_cpp.desktop => tdevelop_kde_cpp.desktop (98%) rename vcs/clearcase/integrator/{tdevclearcaseintegrator.desktop => kdevclearcaseintegrator.desktop} (100%) rename vcs/clearcase/{tdevclearcase.desktop => kdevclearcase.desktop} (99%) rename vcs/cvsservice/integrator/{tdevcvsserviceintegrator.desktop => kdevcvsserviceintegrator.desktop} (100%) rename vcs/cvsservice/{tdev_cvs.png => kdev_cvs.png} (100%) rename vcs/cvsservice/{tdev_cvs.xcf => kdev_cvs.xcf} (100%) rename vcs/cvsservice/{tdevcvsservice.desktop => kdevcvsservice.desktop} (99%) rename vcs/cvsservice/{tdevcvsservicepart.rc => kdevcvsservicepart.rc} (100%) rename vcs/perforce/integrator/{tdevperforceintegrator.desktop => kdevperforceintegrator.desktop} (100%) rename vcs/perforce/{tdevperforce.desktop => kdevperforce.desktop} (99%) rename vcs/perforce/{tdevperforcepart.rc => kdevperforcepart.rc} (100%) rename vcs/subversion/integrator/{tdevsubversionintegrator.desktop => kdevsubversionintegrator.desktop} (100%) rename vcs/subversion/{tdevpart_subversion.rc => kdevpart_subversion.rc} (100%) rename vcs/subversion/{tdevsubversion.desktop => kdevsubversion.desktop} (97%) rename vcs/subversion/{tdevsvn+file.protocol => kdevsvn+file.protocol} (100%) rename vcs/subversion/{tdevsvn+http.protocol => kdevsvn+http.protocol} (100%) rename vcs/subversion/{tdevsvn+https.protocol => kdevsvn+https.protocol} (100%) rename vcs/subversion/{tdevsvn+ssh.protocol => kdevsvn+ssh.protocol} (100%) rename vcs/subversion/{tdevsvn+svn.protocol => kdevsvn+svn.protocol} (100%) rename vcs/subversion/{tdevsvnd.cpp => kdevsvnd.cpp} (96%) rename vcs/subversion/{tdevsvnd.desktop => kdevsvnd.desktop} (100%) rename vcs/subversion/{tdevsvnd.h => kdevsvnd.h} (95%) rename vcs/subversion/{tdevsvnd_widgets.cpp => kdevsvnd_widgets.cpp} (97%) rename vcs/subversion/{tdevsvnd_widgets.h => kdevsvnd_widgets.h} (95%) diff --git a/AUTHORS b/AUTHORS index 7706729d..b2a4a628 100644 --- a/AUTHORS +++ b/AUTHORS @@ -45,7 +45,7 @@ SplashScreens: Marion Klein Ram� Lamana Villar -TDevTabBar, bug fixes, Gideon Release: +KDevTabBar, bug fixes, Gideon Release: Caleb Tennis PartExplorer, (bugs for) CvsPart: diff --git a/CMakeLists.txt b/CMakeLists.txt index 442ab2ab..254c6ba4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -82,7 +82,7 @@ option( WITH_VCS_SUBVERSION "Enable subversion support" ${WITH_VCS_ALL} ) ##### components ################################ option( BUILD_ALL "Build all components" OFF ) -option( BUILD_TDEVDESIGNER "Build tdevdesigner" ${BUILD_ALL} ) +option( BUILD_KDEVDESIGNER "Build kdevdesigner" ${BUILD_ALL} ) option( BUILD_VISUALBOYADVANCE "Build embedded/visualboyadvance" ${BUILD_ALL} ) option( BUILD_DOC "Build doc" ${BUILD_ALL} ) @@ -150,13 +150,11 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" ) ##### install data ############################## install( FILES - tdevelop.desktop tdevassistant.desktop tdevelop_ruby.desktop - tdevelop_c_cpp.desktop tdevelop_tde_cpp.desktop + tdevelop.desktop kdevassistant.desktop tdevelop_ruby.desktop + tdevelop_c_cpp.desktop tdevelop_kde_cpp.desktop tdevelop_scripting.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES tde_app_devel.desktop DESTINATION ${APPS_INSTALL_DIR}/.hidden ) - install( FILES tde-development-tdevelop.directory DESTINATION ${XDG_DIRECTORY_INSTALL_DIR} ) @@ -166,7 +164,7 @@ install( FILES DESTINATION ${MIME_INSTALL_DIR}/application ) install( PROGRAMS - tdevprj2tdevelop + kdevprj2tdevelop DESTINATION ${BIN_INSTALL_DIR} ) @@ -182,7 +180,7 @@ add_subdirectory( mimetypes ) add_subdirectory( pics ) add_subdirectory( vcs ) add_subdirectory( embedded ) -tde_conditional_add_subdirectory( BUILD_TDEVDESIGNER tdevdesigner ) +tde_conditional_add_subdirectory( BUILD_KDEVDESIGNER kdevdesigner ) tde_conditional_add_subdirectory( BUILD_DOC doc ) diff --git a/Doxyfile b/Doxyfile index 5abfb6b9..8e293249 100644 --- a/Doxyfile +++ b/Doxyfile @@ -124,7 +124,7 @@ EXCLUDE_PATTERNS = *.moc.* \ *face_skel.cpp \ *.ui.h EXAMPLE_PATH = languages/cpp/app_templates/khello \ - languages/cpp/app_templates/tdevpart + languages/cpp/app_templates/kdevpart EXAMPLE_PATTERNS = EXAMPLE_RECURSIVE = NO IMAGE_PATH = ./doc/api diff --git a/Makefile.am b/Makefile.am index b3bf5d78..25b1050d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -2,19 +2,16 @@ COMPILE_FIRST = lib src parts EXTRA_DIST = AUTHORS COPYING COPYING.LIB NEWS ChangeLog INSTALL README TODO HACKING HACKING.language admin configure.in.bot -xdg_apps_DATA = tdevelop.desktop tdevassistant.desktop tdevelop_ruby.desktop \ - tdevelop_c_cpp.desktop tdevelop_tde_cpp.desktop tdevelop_scripting.desktop +xdg_apps_DATA = tdevelop.desktop kdevassistant.desktop tdevelop_ruby.desktop \ + tdevelop_c_cpp.desktop tdevelop_kde_cpp.desktop tdevelop_scripting.desktop #appsdir = $(kde_appsdir)/Development -app_DATA = tde_app_devel.desktop -appdir = $(kde_appsdir)/.hidden - xdg_directory_DATA = tde-development-tdevelop.directory mime_DATA = x-tdevelop.desktop mimedir = $(kde_mimedir)/application -kde_bin_SCRIPTS = tdevprj2tdevelop +kde_bin_SCRIPTS = kdevprj2tdevelop $(top_srcdir)/acinclude.m4: $(top_srcdir)/tdevelop.m4.in @@ -51,7 +48,7 @@ include admin/deps.am DOXYGEN_SEARCHENGINE = YES DOXYGEN_EMPTY = YES -DOXYGEN_PROJECTNAME = TDevelop Platform API +DOXYGEN_PROJECTNAME = KDevelop Platform API include Doxyfile.am SUBDIRS=$(TOPSUBDIRS) -#tdevelop: lib src parts buildtools doc editors embedded tdevdesigner languages mimetypes pics vcs +#tdevelop: lib src parts buildtools doc editors embedded kdevdesigner languages mimetypes pics vcs diff --git a/buildtools/ada/CMakeLists.txt b/buildtools/ada/CMakeLists.txt index 0cf08117..8d0fd4ae 100644 --- a/buildtools/ada/CMakeLists.txt +++ b/buildtools/ada/CMakeLists.txt @@ -28,17 +28,17 @@ link_directories( ##### other data ################################ -install( FILES tdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadaproject ) +install( FILES kdevadaproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevadaproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadaproject ) -##### libtdevadaproject (module) ################ +##### libkdevadaproject (module) ################ -tde_add_kpart( libtdevadaproject AUTOMOC +tde_add_kpart( libkdevadaproject AUTOMOC SOURCES adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp - LINK tdevbuildbase-shared + LINK kdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/ada/Makefile.am b/buildtools/ada/Makefile.am index 7997b18c..2b2614ec 100644 --- a/buildtools/ada/Makefile.am +++ b/buildtools/ada/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external \ -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevadaproject.la -libtdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la +kde_module_LTLIBRARIES = libkdevadaproject.la +libkdevadaproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevadaproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la -libtdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp +libkdevadaproject_la_SOURCES = adaproject_part.cpp adaproject_widget.cpp adaproject_optionsdlgbase.ui adaprojectoptionsdlg.cpp adaglobaloptionsdlg.cpp service.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevadaproject.desktop +service_DATA = kdevadaproject.desktop -rcdir = $(kde_datadir)/tdevadaproject -rc_DATA = tdevadaproject.rc +rcdir = $(kde_datadir)/kdevadaproject +rc_DATA = kdevadaproject.rc diff --git a/buildtools/ada/adaglobaloptionsdlg.cpp b/buildtools/ada/adaglobaloptionsdlg.cpp index 791c23ae..cea68bdc 100644 --- a/buildtools/ada/adaglobaloptionsdlg.cpp +++ b/buildtools/ada/adaglobaloptionsdlg.cpp @@ -15,7 +15,7 @@ #include #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" #include "service.h" #include "adaproject_part.h" @@ -61,7 +61,7 @@ AdaGlobalOptionsDlg::~AdaGlobalOptionsDlg() void AdaGlobalOptionsDlg::optionsButtonClicked() { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/ada/adaproject_part.cpp b/buildtools/ada/adaproject_part.cpp index 195e2889..32833dfd 100644 --- a/buildtools/ada/adaproject_part.cpp +++ b/buildtools/ada/adaproject_part.cpp @@ -28,29 +28,29 @@ #include #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevmakefrontend.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" -#include "tdevlanguagesupport.h" -#include "tdevcompileroptions.h" -#include "tdevgenericfactory.h" -#include +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevmakefrontend.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" +#include "kdevlanguagesupport.h" +#include "kdevcompileroptions.h" +#include "kdevgenericfactory.h" +#include #include "adaproject_widget.h" #include "adaprojectoptionsdlg.h" #include "adaglobaloptionsdlg.h" -typedef TDevGenericFactory AdaProjectFactory; -static const TDevPluginInfo data("tdevadaproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevadaproject, AdaProjectFactory( data ) ) +typedef KDevGenericFactory AdaProjectFactory; +static const KDevPluginInfo data("kdevadaproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevadaproject, AdaProjectFactory( data ) ) AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :TDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) + :KDevBuildTool(&data, parent, name ? name : "AdaProjectPart" ) { setInstance(AdaProjectFactory::instance()); - setXMLFile("tdevadaproject.rc"); + setXMLFile("kdevadaproject.rc"); TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, @@ -70,7 +70,7 @@ AdaProjectPart::AdaProjectPart(TQObject *parent, const char *name, const TQStrin // TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment @@ -109,8 +109,8 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec TQDomDocument &dom = *projectDom(); // Set the default directory radio to "executable" - if (DomUtil::readEntry(dom, "/tdevadaproject/run/directoryradio") == "" ) { - DomUtil::writeEntry(dom, "/tdevadaproject/run/directoryradio", "executable"); + if (DomUtil::readEntry(dom, "/kdevadaproject/run/directoryradio") == "" ) { + DomUtil::writeEntry(dom, "/kdevadaproject/run/directoryradio", "executable"); } loadProjectConfig(); @@ -165,7 +165,7 @@ void AdaProjectPart::openProject(const TQString &dirName, const TQString &projec } } while (!s.isEmpty()); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } void AdaProjectPart::closeProject() @@ -175,7 +175,7 @@ void AdaProjectPart::closeProject() /** Retuns a PairList with the run environment variables */ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const { - return DomUtil::readPairListEntry(*projectDom(), "/tdevadaproject/run/envvars", "envvar", "name", "value"); + return DomUtil::readPairListEntry(*projectDom(), "/kdevadaproject/run/envvars", "envvar", "name", "value"); } @@ -190,7 +190,7 @@ DomUtil::PairList AdaProjectPart::runEnvironmentVars() const */ TQString AdaProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("tdevadaproject"); + TQString cwd = defaultRunDirectory("kdevadaproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -212,7 +212,7 @@ TQString AdaProjectPart::mainProgram() const if ( !dom ) return TQString(); - TQString DomMainProgram = DomUtil::readEntry( *dom, "/tdevadaproject/run/mainprogram"); + TQString DomMainProgram = DomUtil::readEntry( *dom, "/kdevadaproject/run/mainprogram"); if ( DomMainProgram.isEmpty() ) return TQString(); @@ -231,14 +231,14 @@ TQString AdaProjectPart::mainProgram() const /** Retuns a TQString with the run command line arguments */ TQString AdaProjectPart::debugArguments() const { - return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/globaldebugarguments"); + return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/globaldebugarguments"); } /** Retuns a TQString with the run command line arguments */ TQString AdaProjectPart::runArguments() const { - return DomUtil::readEntry(*projectDom(), "/tdevadaproject/run/programargs"); + return DomUtil::readEntry(*projectDom(), "/kdevadaproject/run/programargs"); } TQString AdaProjectPart::mainSource() const @@ -361,12 +361,12 @@ void AdaProjectPart::slotExecute() void AdaProjectPart::changedFiles( const TQStringList & fileList ) { - TDevProject::changedFiles(fileList); + KDevProject::changedFiles(fileList); } void AdaProjectPart::changedFile( const TQString & fileName ) { - TDevProject::changedFile(fileName); + KDevProject::changedFile(fileName); } void AdaProjectPart::projectConfigWidget( KDialogBase * dlg ) @@ -382,10 +382,10 @@ void AdaProjectPart::loadProjectConfig( ) { TQDomDocument &dom = *(projectDom()); - TQString config = DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default"); - m_mainSource = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/mainsource") ); - m_compilerOpts = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compileroptions")); - m_compilerExec = DomUtil::readEntry(dom, TQString("/tdevadaproject/configurations/") + config + TQString("/compilerexec")); + TQString config = DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default"); + m_mainSource = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/mainsource") ); + m_compilerOpts = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compileroptions")); + m_compilerExec = DomUtil::readEntry(dom, TQString("/kdevadaproject/configurations/") + config + TQString("/compilerexec")); if (m_compilerExec.isEmpty()) { @@ -408,7 +408,7 @@ void AdaProjectPart::configWidget( KDialogBase * dlg ) connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) +KDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -430,13 +430,13 @@ TDevCompilerOptions *AdaProjectPart::createCompilerOptions(const TQString &name) args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(this, service->name().latin1(), - "TDevCompilerOptions", args); + "KDevCompilerOptions", args); - if (!obj->inherits("TDevCompilerOptions")) { - kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit TDevCompilerOptions" << endl; + if (!obj->inherits("KDevCompilerOptions")) { + kdDebug() << "AdaProjectPart::createCompilerOptions: component does not inherit KDevCompilerOptions" << endl; return 0; } - TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; + KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/ada/adaproject_part.h b/buildtools/ada/adaproject_part.h index 46b328c4..5511da78 100644 --- a/buildtools/ada/adaproject_part.h +++ b/buildtools/ada/adaproject_part.h @@ -6,18 +6,18 @@ * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. */ -#ifndef __TDEVPART_ADAPROJECT_H__ -#define __TDEVPART_ADAPROJECT_H__ +#ifndef __KDEVPART_ADAPROJECT_H__ +#define __KDEVPART_ADAPROJECT_H__ #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class AdaProjectWidget; class KDialogBase; -class TDevCompilerOptions; +class KDevCompilerOptions; -class AdaProjectPart : public TDevBuildTool +class AdaProjectPart : public KDevBuildTool { Q_OBJECT @@ -59,7 +59,7 @@ public: virtual void changedFiles( const TQStringList & fileList ); virtual void changedFile( const TQString & fileName ); - TDevCompilerOptions *createCompilerOptions(const TQString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); virtual TQString defaultOptions(const TQString compiler); TQStringList distFiles() const; diff --git a/buildtools/ada/adaproject_widget.cpp b/buildtools/ada/adaproject_widget.cpp index 3eaba244..f5016e8c 100644 --- a/buildtools/ada/adaproject_widget.cpp +++ b/buildtools/ada/adaproject_widget.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include "adaproject_part.h" #include "adaproject_widget.h" diff --git a/buildtools/ada/adaproject_widget.h b/buildtools/ada/adaproject_widget.h index c89fc511..6bbab369 100644 --- a/buildtools/ada/adaproject_widget.h +++ b/buildtools/ada/adaproject_widget.h @@ -4,7 +4,7 @@ #include #include -class TDevProject; +class KDevProject; class AdaProjectPart; class AdaProjectWidget : public TQWidget diff --git a/buildtools/ada/adaprojectoptionsdlg.cpp b/buildtools/ada/adaprojectoptionsdlg.cpp index 6cced020..28549efc 100644 --- a/buildtools/ada/adaprojectoptionsdlg.cpp +++ b/buildtools/ada/adaprojectoptionsdlg.cpp @@ -18,7 +18,7 @@ #include #include "domutil.h" -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" #include "service.h" #include "adaproject_part.h" @@ -43,7 +43,7 @@ AdaProjectOptionsDlg::AdaProjectOptionsDlg(AdaProjectPart *part, TQWidget* paren TQDomDocument &dom = *(m_part->projectDom()); currentConfig = TQString(); - configChanged(DomUtil::readEntry(dom, "/tdevadaproject/general/useconfiguration", "default")); + configChanged(DomUtil::readEntry(dom, "/kdevadaproject/general/useconfiguration", "default")); } AdaProjectOptionsDlg::~AdaProjectOptionsDlg() @@ -57,7 +57,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs() TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { TQString config = childEl.tagName(); @@ -72,7 +72,7 @@ TQStringList AdaProjectOptionsDlg::allBuildConfigs() void AdaProjectOptionsDlg::accept() { - DomUtil::writeEntry(*m_part->projectDom(), "/tdevadaproject/general/useconfiguration", currentConfig); + DomUtil::writeEntry(*m_part->projectDom(), "/kdevadaproject/general/useconfiguration", currentConfig); if (dirty) { saveConfig(currentConfig); @@ -88,7 +88,7 @@ void AdaProjectOptionsDlg::compiler_box_activated( const TQString& /*s*/ ) void AdaProjectOptionsDlg::saveConfig( TQString config ) { TQDomDocument dom = *m_part->projectDom(); - TQString prefix = "/tdevadaproject/configurations/" + config + "/"; + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; DomUtil::writeEntry(dom, prefix + "compiler", ServiceComboBox::currentText(compiler_box, service_names)); @@ -100,7 +100,7 @@ void AdaProjectOptionsDlg::saveConfig( TQString config ) void AdaProjectOptionsDlg::readConfig( TQString config ) { TQDomDocument dom = *m_part->projectDom(); - TQString prefix = "/tdevadaproject/configurations/" + config + "/"; + TQString prefix = "/kdevadaproject/configurations/" + config + "/"; TQString compiler = DomUtil::readEntry(dom, prefix + "compiler", ""); @@ -171,7 +171,7 @@ void AdaProjectOptionsDlg::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("tdevadaproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevadaproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -185,7 +185,7 @@ void AdaProjectOptionsDlg::configRemoved() void AdaProjectOptionsDlg::optionsButtonClicked( ) { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/ada/adaprojectoptionsdlg.h b/buildtools/ada/adaprojectoptionsdlg.h index 0f6c0262..569f06c9 100644 --- a/buildtools/ada/adaprojectoptionsdlg.h +++ b/buildtools/ada/adaprojectoptionsdlg.h @@ -14,7 +14,7 @@ #include "adaproject_optionsdlgbase.h" class AdaProjectPart; -class TDevCompilerOptions; +class KDevCompilerOptions; class AdaProjectOptionsDlg : public AdaProjectOptionsDlgBase { diff --git a/buildtools/ada/tdevadaproject.desktop b/buildtools/ada/kdevadaproject.desktop similarity index 98% rename from buildtools/ada/tdevadaproject.desktop rename to buildtools/ada/kdevadaproject.desktop index 91206fd4..882b0f64 100644 --- a/buildtools/ada/tdevadaproject.desktop +++ b/buildtools/ada/kdevadaproject.desktop @@ -95,6 +95,6 @@ GenericName[uz@cyrillic]=Ada лойиҳаси GenericName[zh_CN]=Ada 工程 GenericName[zh_TW]=Ada 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevadaproject +X-TDE-Library=libkdevadaproject X-TDevelop-Version=5 X-TDevelop-Language=Ada diff --git a/buildtools/ada/tdevadaproject.rc b/buildtools/ada/kdevadaproject.rc similarity index 100% rename from buildtools/ada/tdevadaproject.rc rename to buildtools/ada/kdevadaproject.rc diff --git a/buildtools/ant/CMakeLists.txt b/buildtools/ant/CMakeLists.txt index 48858d7f..1b7cfd98 100644 --- a/buildtools/ant/CMakeLists.txt +++ b/buildtools/ant/CMakeLists.txt @@ -26,15 +26,15 @@ link_directories( ##### other data ################################ -install( FILES tdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevantproject ) +install( FILES kdevantproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevantproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevantproject ) -##### libtdevantproject (module) ################ +##### libkdevantproject (module) ################ -tde_add_kpart( libtdevantproject AUTOMOC +tde_add_kpart( libkdevantproject AUTOMOC SOURCES antprojectpart.cpp antoptionswidget.ui classpathwidget.ui - LINK tdevbuildbase-shared + LINK kdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/ant/Makefile.am b/buildtools/ant/Makefile.am index 6f3e23e6..30f314b8 100644 --- a/buildtools/ant/Makefile.am +++ b/buildtools/ant/Makefile.am @@ -5,17 +5,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \ $(all_includes) -kde_module_LTLIBRARIES = libtdevantproject.la -libtdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la +kde_module_LTLIBRARIES = libkdevantproject.la +libkdevantproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevantproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la -libtdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui +libkdevantproject_la_SOURCES = antprojectpart.cpp antoptionswidget.ui classpathwidget.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevantproject.desktop +service_DATA = kdevantproject.desktop -rcdir = $(kde_datadir)/tdevantproject -rc_DATA = tdevantproject.rc +rcdir = $(kde_datadir)/kdevantproject +rc_DATA = kdevantproject.rc diff --git a/buildtools/ant/antprojectpart.cpp b/buildtools/ant/antprojectpart.cpp index fcbdd630..902055ec 100644 --- a/buildtools/ant/antprojectpart.cpp +++ b/buildtools/ant/antprojectpart.cpp @@ -11,7 +11,7 @@ #include -#include +#include #include #include #include @@ -21,10 +21,10 @@ #include #include -#include +#include -#include -#include +#include +#include #include @@ -34,9 +34,9 @@ -typedef TDevGenericFactory AntProjectFactory; -static const TDevPluginInfo data("tdevantproject"); -K_EXPORT_COMPONENT_FACTORY(libtdevantproject, AntProjectFactory( data )) +typedef KDevGenericFactory AntProjectFactory; +static const KDevPluginInfo data("kdevantproject"); +K_EXPORT_COMPONENT_FACTORY(libkdevantproject, AntProjectFactory( data )) AntOptions::AntOptions() @@ -46,11 +46,11 @@ AntOptions::AntOptions() AntProjectPart::AntProjectPart(TQObject *parent, const char *name, const TQStringList &) - : TDevBuildTool(&data, parent, name ? name : "AntProjectPart") + : KDevBuildTool(&data, parent, name ? name : "AntProjectPart") { setInstance(AntProjectFactory::instance()); - setXMLFile("tdevantproject.rc"); + setXMLFile("kdevantproject.rc"); m_buildProjectAction = new TDEAction(i18n("&Build Project"), "make_tdevelop", Key_F8, this, TQT_SLOT(slotBuild()), @@ -111,7 +111,7 @@ void AntProjectPart::openProject(const TQString &dirName, const TQString &projec else populateProject(); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } diff --git a/buildtools/ant/antprojectpart.h b/buildtools/ant/antprojectpart.h index f6203c55..e3b325d2 100644 --- a/buildtools/ant/antprojectpart.h +++ b/buildtools/ant/antprojectpart.h @@ -16,7 +16,7 @@ class Context; class ClassPathWidget; -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class AntOptionsWidget; @@ -40,7 +40,7 @@ public: }; -class AntProjectPart : public TDevBuildTool +class AntProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/ant/tdevantproject.desktop b/buildtools/ant/kdevantproject.desktop similarity index 98% rename from buildtools/ant/tdevantproject.desktop rename to buildtools/ant/kdevantproject.desktop index bbca6555..e2880101 100644 --- a/buildtools/ant/tdevantproject.desktop +++ b/buildtools/ant/kdevantproject.desktop @@ -91,6 +91,6 @@ GenericName[uz@cyrillic]=Ant лойиҳаси GenericName[zh_CN]=Ant 工程 GenericName[zh_TW]=Ant 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevantproject +X-TDE-Library=libkdevantproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/ant/tdevantproject.rc b/buildtools/ant/kdevantproject.rc similarity index 100% rename from buildtools/ant/tdevantproject.rc rename to buildtools/ant/kdevantproject.rc diff --git a/buildtools/autotools/CMakeLists.txt b/buildtools/autotools/CMakeLists.txt index e33d897c..f7af5bc6 100644 --- a/buildtools/autotools/CMakeLists.txt +++ b/buildtools/autotools/CMakeLists.txt @@ -32,13 +32,13 @@ link_directories( ##### other data ################################ -install( FILES tdevautoproject.desktop tdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevautoproject ) +install( FILES kdevautoproject.desktop kdevtdeautoproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevautoproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevautoproject ) -##### libtdevautoproject (module) ############### +##### libkdevautoproject (module) ############### -tde_add_kpart( libtdevautoproject AUTOMOC +tde_add_kpart( libkdevautoproject AUTOMOC SOURCES autoprojectpart.cpp autoprojectwidget.cpp configureoptionswidget.cpp configureoptionswidgetbase.ui @@ -60,6 +60,6 @@ tde_add_kpart( libtdevautoproject AUTOMOC autolistviewitems.cpp managecustomcommandsbase.ui managecustomcommand.cpp autoprojectviewbase.ui autotoolsaction.cpp makefilehandler.cpp - LINK tdevautotoolsparser-static tdevbuildbase-shared tdevbuildtoolswidgets-shared + LINK kdevautotoolsparser-static kdevbuildbase-shared kdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/autotools/Makefile.am b/buildtools/autotools/Makefile.am index a704eb29..98f3ad51 100644 --- a/buildtools/autotools/Makefile.am +++ b/buildtools/autotools/Makefile.am @@ -7,14 +7,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib -I$(top_srcdir)/buildtools/lib/base \ -I$(top_builddir)/buildtools/lib/widgets -kde_module_LTLIBRARIES = libtdevautoproject.la -libtdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) -libtdevautoproject_la_LIBADD = \ - $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \ - $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevautoproject.la +libkdevautoproject_la_LDFLAGS = $(all_libraries) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) $(KDE_PLUGIN) +libkdevautoproject_la_LIBADD = \ + $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ + $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ +libkdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ configureoptionswidget.cpp configureoptionswidgetbase.ui subprojectoptionsdlg.cpp \ subprojectoptionsdlgbase.ui targetoptionsdlg.cpp targetoptionsdlgbase.ui addservicedlg.cpp \ addservicedlgbase.ui addapplicationdlg.cpp addapplicationdlgbase.ui addtargetdlg.cpp \ @@ -30,9 +30,9 @@ libtdevautoproject_la_SOURCES = autoprojectpart.cpp autoprojectwidget.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevautoproject.desktop tdevtdeautoproject.desktop +service_DATA = kdevautoproject.desktop kdevtdeautoproject.desktop -rcdir = $(kde_datadir)/tdevautoproject -rc_DATA = tdevautoproject.rc +rcdir = $(kde_datadir)/kdevautoproject +rc_DATA = kdevautoproject.rc noinst_HEADERS = managecustomcommand.h autotoolsaction.h makefilehandler.h diff --git a/buildtools/autotools/addfiledlg.cpp b/buildtools/autotools/addfiledlg.cpp index 18bf87a8..d3f71637 100644 --- a/buildtools/autotools/addfiledlg.cpp +++ b/buildtools/autotools/addfiledlg.cpp @@ -36,7 +36,7 @@ #include "autoprojectpart.h" #include "autoprojectwidget.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" AddFileDialog::AddFileDialog(AutoProjectPart *part, AutoProjectWidget *widget, SubprojectItem *spitem, TargetItem *item, diff --git a/buildtools/autotools/addsubprojectdlg.cpp b/buildtools/autotools/addsubprojectdlg.cpp index fa64c506..59cebc53 100644 --- a/buildtools/autotools/addsubprojectdlg.cpp +++ b/buildtools/autotools/addsubprojectdlg.cpp @@ -25,7 +25,7 @@ #include "autolistviewitems.h" -#include "tdevmakefrontend.h" +#include "kdevmakefrontend.h" #include "misc.h" #include "autoprojectpart.h" #include "autosubprojectview.h" diff --git a/buildtools/autotools/autodetailsview.cpp b/buildtools/autotools/autodetailsview.cpp index 34060b61..91b6d75c 100644 --- a/buildtools/autotools/autodetailsview.cpp +++ b/buildtools/autotools/autodetailsview.cpp @@ -32,13 +32,13 @@ #include /** KDevelop */ -#include "tdevappfrontend.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" -#include "tdevcreatefile.h" -#include "tdevlanguagesupport.h" -#include "tdevmakefrontend.h" +#include "kdevappfrontend.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevcreatefile.h" +#include "kdevlanguagesupport.h" +#include "kdevmakefrontend.h" #include "urlutil.h" #include "domutil.h" @@ -294,13 +294,13 @@ void AutoDetailsView::slotAddNewFile() if ( !titem ) return; - TDevCreateFile * createFileSupport = m_part->extension("TDevelop/CreateFile"); + KDevCreateFile * createFileSupport = m_part->extension("TDevelop/CreateFile"); if (createFileSupport) { - TDevCreateFile::CreatedFile crFile = + KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile(TQString(), m_widget->selectedSubproject()->path); -/* if (crFile.status == TDevCreateFile::CreatedFile::STATUS_OK) +/* if (crFile.status == KDevCreateFile::CreatedFile::STATUS_OK) { FileItem *fitem = m_widget->createFileItem(crFile.filename, m_widget->selectedSubproject()); titem->sources.append(fitem); diff --git a/buildtools/autotools/autoprojectpart.cpp b/buildtools/autotools/autoprojectpart.cpp index ae5453bc..6b408bd0 100644 --- a/buildtools/autotools/autoprojectpart.cpp +++ b/buildtools/autotools/autoprojectpart.cpp @@ -45,34 +45,34 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include #include -#include +#include #include #define CONFIGURE_OPTIONS 1 #define RUN_OPTIONS 2 #define MAKE_OPTIONS 3 -static const TDevPluginInfo data("tdevautoproject"); +static const KDevPluginInfo data("kdevautoproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevautoproject, AutoProjectFactory( data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevautoproject, AutoProjectFactory( data ) ) AutoProjectPart::AutoProjectPart(TQObject *parent, const char *name, const TQStringList &args) - : TDevBuildTool(&data, parent, name ? name : "AutoProjectPart") + : KDevBuildTool(&data, parent, name ? name : "AutoProjectPart") , m_lastCompilationFailed(false) { setInstance(AutoProjectFactory::instance()); - setXMLFile("tdevautoproject.rc"); + setXMLFile("kdevautoproject.rc"); m_executeAfterBuild = false; m_isKDE = (args[0] == "kde"); @@ -310,7 +310,7 @@ void AutoProjectPart::openProject(const TQString &dirName, const TQString &proje "Project -> Project Options -> Run Options"), i18n("No active target specified"), "tdevelop_open_project_no_active_target"); } - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -358,7 +358,7 @@ TQString AutoProjectPart::runDirectory() const TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevautoproject/run/useglobalprogram", false) || !m_widget->activeTarget() ) { - cwd = defaultRunDirectory("tdevautoproject"); + cwd = defaultRunDirectory("kdevautoproject"); }else { cwd = DomUtil::readEntry( dom, "/kdevautoproject/run/cwd/"+m_widget->activeTarget()->name ); @@ -585,7 +585,7 @@ TQStringList AutoProjectPart::allBuildConfigs() const TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { @@ -1075,7 +1075,7 @@ TQString AutoProjectPart::updateAdminDirectoryCommand() const // Find the admin tarball TDEStandardDirs dirs; - dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/template-common/"); + dirs.addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/template-common/"); source = dirs.findResource("apptemplates", "admin.tar.gz"); if (source != "") { TQString cmdline = "rm -rf admin && tar -xzvf "; @@ -1453,7 +1453,7 @@ bool AutoProjectPart::isKDE() const return m_isKDE; } -TDevProject::Options AutoProjectPart::options() const +KDevProject::Options AutoProjectPart::options() const { return UsesAutotoolsBuildSystem; } diff --git a/buildtools/autotools/autoprojectpart.h b/buildtools/autotools/autoprojectpart.h index 08d83719..83066c3c 100644 --- a/buildtools/autotools/autoprojectpart.h +++ b/buildtools/autotools/autoprojectpart.h @@ -20,8 +20,8 @@ #include #include #include -#include -#include "tdevbuildtool.h" +#include +#include "kdevbuildtool.h" class TQDomElement; class TQStringList; @@ -31,7 +31,7 @@ class TDESelectAction; class TargetItem; class ConfigWidgetProxy; -class AutoProjectPart : public TDevBuildTool +class AutoProjectPart : public KDevBuildTool { Q_OBJECT @@ -41,7 +41,7 @@ public: virtual ~AutoProjectPart(); /** - * Implementation of the TDevProject interface. + * Implementation of the KDevProject interface. */ virtual TQString projectDirectory() const; virtual TQString projectName() const; @@ -61,7 +61,7 @@ public: virtual Options options() const; /** - * Implementation of the TDevPlugin interface. + * Implementation of the KDevPlugin interface. */ virtual void restorePartialProjectSession ( const TQDomElement* el ); virtual void savePartialProjectSession ( TQDomElement* el ); @@ -85,7 +85,7 @@ public: protected: /** - * Reimplemented from TDevProject. These methods are only + * Reimplemented from KDevProject. These methods are only * for use by the application core. */ virtual void openProject( const TQString &dirName, const TQString &projectName ); @@ -151,7 +151,7 @@ private: bool queueInternalLibDependenciesBuild( TargetItem* titem, TQStringList& list ); }; -typedef TDevGenericFactory AutoProjectFactory; +typedef KDevGenericFactory AutoProjectFactory; #endif // kate: indent-mode csands; tab-width 4; diff --git a/buildtools/autotools/autoprojectwidget.cpp b/buildtools/autotools/autoprojectwidget.cpp index c41a60dc..a558a593 100644 --- a/buildtools/autotools/autoprojectwidget.cpp +++ b/buildtools/autotools/autoprojectwidget.cpp @@ -42,7 +42,7 @@ #include #include -#include "tdevcore.h" +#include "kdevcore.h" #include "domutil.h" #include "misc.h" #include "choosetargetdialog.h" diff --git a/buildtools/autotools/autosubprojectview.cpp b/buildtools/autotools/autosubprojectview.cpp index 0eecfe4b..8353e2ea 100644 --- a/buildtools/autotools/autosubprojectview.cpp +++ b/buildtools/autotools/autosubprojectview.cpp @@ -34,10 +34,10 @@ #include /** KDevelop */ -#include -#include -#include -#include +#include +#include +#include +#include #include /** AutoProject */ diff --git a/buildtools/autotools/choosetargetdialog.cpp b/buildtools/autotools/choosetargetdialog.cpp index fad399f3..8b59545f 100644 --- a/buildtools/autotools/choosetargetdialog.cpp +++ b/buildtools/autotools/choosetargetdialog.cpp @@ -43,7 +43,7 @@ #include "autoprojectwidget.h" #include "autoprojectpart.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" class ChooseTargetDialog::Private { diff --git a/buildtools/autotools/configureoptionswidget.cpp b/buildtools/autotools/configureoptionswidget.cpp index c991d15d..cc39aa07 100644 --- a/buildtools/autotools/configureoptionswidget.cpp +++ b/buildtools/autotools/configureoptionswidget.cpp @@ -29,7 +29,7 @@ #include #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" #include "autoprojectpart.h" #include "environmentvariableswidget.h" @@ -310,7 +310,7 @@ void ConfigureOptionsWidget::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("tdevautoproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevautoproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -348,7 +348,7 @@ void ConfigureOptionsWidget::f77serviceChanged() void ConfigureOptionsWidget::cflagsClicked() { TQString name = ServiceComboBox::currentText(cservice_combo, cservice_names); - TDevCompilerOptions *plugin = createCompilerOptions(name); + KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, cflags_edit->text()); @@ -361,7 +361,7 @@ void ConfigureOptionsWidget::cflagsClicked() void ConfigureOptionsWidget::cxxflagsClicked() { TQString name = ServiceComboBox::currentText(cxxservice_combo, cxxservice_names); - TDevCompilerOptions *plugin = createCompilerOptions(name); + KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, cxxflags_edit->text()); @@ -374,7 +374,7 @@ void ConfigureOptionsWidget::cxxflagsClicked() void ConfigureOptionsWidget::f77flagsClicked() { TQString name = ServiceComboBox::currentText(f77service_combo, f77service_names); - TDevCompilerOptions *plugin = createCompilerOptions(name); + KDevCompilerOptions *plugin = createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, f77flags_edit->text()); @@ -384,7 +384,7 @@ void ConfigureOptionsWidget::f77flagsClicked() } -TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) +KDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -406,13 +406,13 @@ TDevCompilerOptions *ConfigureOptionsWidget::createCompilerOptions(const TQStrin args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(TQT_TQOBJECT(this), service->name().latin1(), - "TDevCompilerOptions", args); + "KDevCompilerOptions", args); - if (!obj->inherits("TDevCompilerOptions")) { - kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl; + if (!obj->inherits("KDevCompilerOptions")) { + kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl; return 0; } - TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; + KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/autotools/configureoptionswidget.h b/buildtools/autotools/configureoptionswidget.h index dfab95cc..e40874de 100644 --- a/buildtools/autotools/configureoptionswidget.h +++ b/buildtools/autotools/configureoptionswidget.h @@ -18,7 +18,7 @@ #include "domutil.h" -class TDevCompilerOptions; +class KDevCompilerOptions; class AutoProjectPart; class EnvironmentVariablesWidget; @@ -53,7 +53,7 @@ private: void readSettings( const TQString &config ); void saveSettings( const TQString &config ); - TDevCompilerOptions *createCompilerOptions( const TQString &lang ); + KDevCompilerOptions *createCompilerOptions( const TQString &lang ); TDETrader::OfferList coffers, cxxoffers, f77offers; TQStringList cservice_names, cservice_execs; TQStringList cxxservice_names, cxxservice_execs; diff --git a/buildtools/autotools/fileselectorwidget.cpp b/buildtools/autotools/fileselectorwidget.cpp index afd09d4b..c10db050 100644 --- a/buildtools/autotools/fileselectorwidget.cpp +++ b/buildtools/autotools/fileselectorwidget.cpp @@ -43,7 +43,7 @@ #include "autoprojectwidget.h" #include "autoprojectpart.h" -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "tdefilednddetailview.h" #include "tdefiledndiconview.h" @@ -140,7 +140,7 @@ FileSelectorWidget::FileSelectorWidget(AutoProjectPart* part, KFile::Mode mode, /* read the file patterns from the project DOM */ TQDomElement docEl = m_part->projectDom()->documentElement(); - TQDomElement fileviewEl = docEl.namedItem("tdevfileview").toElement(); + TQDomElement fileviewEl = docEl.namedItem("kdevfileview").toElement(); TQDomElement groupsEl = fileviewEl.namedItem("groups").toElement(); TQDomElement groupEl = groupsEl.firstChild().toElement(); diff --git a/buildtools/autotools/tdevautoproject.desktop b/buildtools/autotools/kdevautoproject.desktop similarity index 99% rename from buildtools/autotools/tdevautoproject.desktop rename to buildtools/autotools/kdevautoproject.desktop index ad164259..a149c870 100644 --- a/buildtools/autotools/tdevautoproject.desktop +++ b/buildtools/autotools/kdevautoproject.desktop @@ -92,6 +92,6 @@ GenericName[zh_CN]=Automake 工程 GenericName[zh_TW]=Automake 專案 ServiceTypes=TDevelop/Project Icon=make -X-TDE-Library=libtdevautoproject +X-TDE-Library=libkdevautoproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/autotools/tdevautoproject.rc b/buildtools/autotools/kdevautoproject.rc similarity index 100% rename from buildtools/autotools/tdevautoproject.rc rename to buildtools/autotools/kdevautoproject.rc diff --git a/buildtools/autotools/tdevtdeautoproject.desktop b/buildtools/autotools/kdevtdeautoproject.desktop similarity index 99% rename from buildtools/autotools/tdevtdeautoproject.desktop rename to buildtools/autotools/kdevtdeautoproject.desktop index 5ed348d1..b9b6abd8 100644 --- a/buildtools/autotools/tdevtdeautoproject.desktop +++ b/buildtools/autotools/kdevtdeautoproject.desktop @@ -87,6 +87,6 @@ GenericName[zh_CN]=TDE Automake 工程 GenericName[zh_TW]=TDE Automake 專案 ServiceTypes=TDevelop/Project Icon=make -X-TDE-Library=libtdevautoproject +X-TDE-Library=libkdevautoproject X-TDevelop-Version=5 X-TDevelop-Args=kde diff --git a/buildtools/autotools/misc.cpp b/buildtools/autotools/misc.cpp index f1174b21..ec58b54c 100644 --- a/buildtools/autotools/misc.cpp +++ b/buildtools/autotools/misc.cpp @@ -21,10 +21,10 @@ #include "misc.h" -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" -static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -48,13 +48,13 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(parent, service->name().latin1(), - "TDevCompilerOptions", args); + "KDevCompilerOptions", args); - if (!obj->inherits("TDevCompilerOptions")) { - kdDebug(9020) << "Component does not inherit TDevCompilerOptions" << endl; + if (!obj->inherits("KDevCompilerOptions")) { + kdDebug(9020) << "Component does not inherit KDevCompilerOptions" << endl; return 0; } - TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; + KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; return dlg; @@ -65,14 +65,14 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split( " ", prop.toString() ); return KParts::ComponentFactory - ::createInstanceFromService( service, parent, + ::createInstanceFromService( service, parent, service->name().latin1(), args );*/ } TQString AutoProjectTool::execFlagsDialog( const TQString &compiler, const TQString &flags, TQWidget *parent ) { - TDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); + KDevCompilerOptions * plugin = createCompilerOptions( compiler, TQT_TQOBJECT(parent) ); if ( plugin ) { diff --git a/buildtools/autotools/removefiledlg.cpp b/buildtools/autotools/removefiledlg.cpp index 6508d126..e265a969 100644 --- a/buildtools/autotools/removefiledlg.cpp +++ b/buildtools/autotools/removefiledlg.cpp @@ -155,7 +155,7 @@ void RemoveFileDialog::accept() TQDomDocument &dom = *(m_part->projectDom()); TQDomElement el = dom.documentElement(); - TQDomNode el2 = el.namedItem("tdevautoproject"); + TQDomNode el2 = el.namedItem("kdevautoproject"); TQDomNode el3 = el2.namedItem("subclassing"); TQDomNode n = el3.firstChild(); diff --git a/buildtools/custommakefiles/CMakeLists.txt b/buildtools/custommakefiles/CMakeLists.txt index 8327a38d..55036324 100644 --- a/buildtools/custommakefiles/CMakeLists.txt +++ b/buildtools/custommakefiles/CMakeLists.txt @@ -30,15 +30,15 @@ link_directories( ##### other data ################################ -install( FILES tdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcustomproject ) +install( FILES kdevcustomproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevcustomproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcustomproject ) -##### libtdevcustomproject (module) ############# +##### libkdevcustomproject (module) ############# -tde_add_kpart( libtdevcustomproject AUTOMOC +tde_add_kpart( libkdevcustomproject AUTOMOC SOURCES selectnewfilesdialog.cpp selectnewfilesdialogbase.ui custombuildoptionswidget.cpp @@ -46,6 +46,6 @@ tde_add_kpart( libtdevcustomproject AUTOMOC custommakeconfigwidgetbase.ui custommanagerwidget.cpp custommanagerwidgetbase.ui customotherconfigwidget.cpp customotherconfigwidgetbase.ui customprojectpart.cpp - LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared + LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/custommakefiles/Makefile.am b/buildtools/custommakefiles/Makefile.am index 618f8794..087ab001 100644 --- a/buildtools/custommakefiles/Makefile.am +++ b/buildtools/custommakefiles/Makefile.am @@ -5,12 +5,12 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) \ -I$(top_builddir)/buildtools/lib/widgets -kde_module_LTLIBRARIES = libtdevcustomproject.la -libtdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la +kde_module_LTLIBRARIES = libkdevcustomproject.la +libkdevcustomproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcustomproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la -libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \ +libkdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogbase.ui \ custombuildoptionswidget.cpp custombuildoptionswidgetbase.ui custommakeconfigwidget.cpp \ custommakeconfigwidgetbase.ui custommanagerwidget.cpp custommanagerwidgetbase.ui \ customotherconfigwidget.cpp customotherconfigwidgetbase.ui customprojectpart.cpp @@ -18,9 +18,9 @@ libtdevcustomproject_la_SOURCES = selectnewfilesdialog.cpp selectnewfilesdialogb METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcustomproject.desktop +service_DATA = kdevcustomproject.desktop -rcdir = $(kde_datadir)/tdevcustomproject -rc_DATA = tdevcustomproject.rc +rcdir = $(kde_datadir)/kdevcustomproject +rc_DATA = kdevcustomproject.rc noinst_HEADERS = selectnewfilesdialog.h custommanagerwidget.h \ customotherconfigwidget.h diff --git a/buildtools/custommakefiles/customprojectpart.cpp b/buildtools/custommakefiles/customprojectpart.cpp index c9cc482d..5b41080e 100644 --- a/buildtools/custommakefiles/customprojectpart.cpp +++ b/buildtools/custommakefiles/customprojectpart.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include @@ -42,11 +42,11 @@ #include #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevmakefrontend.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevmakefrontend.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" #include "runoptionswidget.h" #include "makeoptionswidget.h" #include "custombuildoptionswidget.h" @@ -59,18 +59,18 @@ #include "selectnewfilesdialog.h" -#include +#include -typedef TDevGenericFactory CustomProjectFactory; -static const TDevPluginInfo data( "tdevcustomproject" ); -K_EXPORT_COMPONENT_FACTORY( libtdevcustomproject, CustomProjectFactory( data ) ) +typedef KDevGenericFactory CustomProjectFactory; +static const KDevPluginInfo data( "kdevcustomproject" ); +K_EXPORT_COMPONENT_FACTORY( libkdevcustomproject, CustomProjectFactory( data ) ) CustomProjectPart::CustomProjectPart( TQObject *parent, const char *name, const TQStringList & ) - : TDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) + : KDevBuildTool( &data, parent, name ? name : "CustomProjectPart" ) , m_lastCompilationFailed( false ), m_recursive( false ), m_first_recursive( false ) { setInstance( CustomProjectFactory::instance() ); - setXMLFile( "tdevcustomproject.rc" ); + setXMLFile( "kdevcustomproject.rc" ); m_executeAfterBuild = false; @@ -477,7 +477,7 @@ void CustomProjectPart::openProject( const TQString &dirName, const TQString &pr el.setTagName( "default" ); envs.appendChild( el ); } - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -632,7 +632,7 @@ DomUtil::PairList CustomProjectPart::runEnvironmentVars() const */ TQString CustomProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory( "tdevcustomproject" ); + TQString cwd = defaultRunDirectory( "kdevcustomproject" ); if ( cwd.isEmpty() ) cwd = buildDirectory(); return cwd; diff --git a/buildtools/custommakefiles/customprojectpart.h b/buildtools/custommakefiles/customprojectpart.h index db46d576..67223e92 100644 --- a/buildtools/custommakefiles/customprojectpart.h +++ b/buildtools/custommakefiles/customprojectpart.h @@ -20,7 +20,7 @@ #include #include -#include +#include class TQListViewItem; class TQPopupMenu; @@ -30,7 +30,7 @@ class CustomProjectWidget; class Context; class TDESelectAction; -class CustomProjectPart : public TDevBuildTool +class CustomProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/custommakefiles/tdevcustomproject.desktop b/buildtools/custommakefiles/kdevcustomproject.desktop similarity index 98% rename from buildtools/custommakefiles/tdevcustomproject.desktop rename to buildtools/custommakefiles/kdevcustomproject.desktop index 0ea2c3bc..9f81a3d6 100644 --- a/buildtools/custommakefiles/tdevcustomproject.desktop +++ b/buildtools/custommakefiles/kdevcustomproject.desktop @@ -38,7 +38,7 @@ Comment[tg]=Лоиҳаи оддӣ Comment[tr]=Özel Proje Comment[zh_CN]=自定义工程 Comment[zh_TW]=自訂專案 -Name=TDevCustomProject +Name=KDevCustomProject Name[da]=TDevelop brugerdefineret projekt Name[de]=Benutzerdefiniertes Projekt (TDevelop) Name[hi]=के-डेव-कस्टम-परियोजना @@ -86,6 +86,6 @@ GenericName[tr]=Özel Proje GenericName[zh_CN]=自定义工程 GenericName[zh_TW]=自訂專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevcustomproject +X-TDE-Library=libkdevcustomproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/custommakefiles/tdevcustomproject.rc b/buildtools/custommakefiles/kdevcustomproject.rc similarity index 95% rename from buildtools/custommakefiles/tdevcustomproject.rc rename to buildtools/custommakefiles/kdevcustomproject.rc index 08079774..c744b4be 100644 --- a/buildtools/custommakefiles/tdevcustomproject.rc +++ b/buildtools/custommakefiles/kdevcustomproject.rc @@ -1,5 +1,5 @@ - + diff --git a/buildtools/lib/base/CMakeLists.txt b/buildtools/lib/base/CMakeLists.txt index a429be6c..f3585669 100644 --- a/buildtools/lib/base/CMakeLists.txt +++ b/buildtools/lib/base/CMakeLists.txt @@ -26,14 +26,14 @@ link_directories( ##### headers ################################### install( FILES - tdevbuildtool.h + kdevbuildtool.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/base ) -##### tdevbuildbase (shared) #################### +##### kdevbuildbase (shared) #################### -tde_add_library( tdevbuildbase SHARED AUTOMOC - SOURCES tdevbuildtool.cpp +tde_add_library( kdevbuildbase SHARED AUTOMOC + SOURCES kdevbuildtool.cpp VERSION 0.0.0 LINK tdevelop-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/buildtools/lib/base/Mainpage.dox b/buildtools/lib/base/Mainpage.dox index 8a85d338..3e16d2d8 100644 --- a/buildtools/lib/base/Mainpage.dox +++ b/buildtools/lib/base/Mainpage.dox @@ -8,8 +8,8 @@ This library contains base classes for KDevelop builtool support plugins. Include path: -I\$(kde_includes)/tdevelop/buildtools/base \section btbaseoverview Overview -This library is created to provide TDevBuildTool compat class which can be used -as drop-in replacement of TDevProject class for buildtool support plugins +This library is created to provide KDevBuildTool compat class which can be used +as drop-in replacement of KDevProject class for buildtool support plugins written for old KDevelop architecture (before version 3.2). Nevertheless, it can be useful for new buildtool plugins as well because it provides diff --git a/buildtools/lib/base/Makefile.am b/buildtools/lib/base/Makefile.am index 6532398d..7e1083ef 100644 --- a/buildtools/lib/base/Makefile.am +++ b/buildtools/lib/base/Makefile.am @@ -2,14 +2,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevbuildbase.la -libtdevbuildbase_la_LDFLAGS = $(all_libraries) -libtdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) -libtdevbuildbase_la_SOURCES = tdevbuildtool.cpp +lib_LTLIBRARIES = libkdevbuildbase.la +libkdevbuildbase_la_LDFLAGS = $(all_libraries) +libkdevbuildbase_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDEUI) +libkdevbuildbase_la_SOURCES = kdevbuildtool.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/base -tdevelopbuildtoolsinclude_HEADERS = tdevbuildtool.h +tdevelopbuildtoolsinclude_HEADERS = kdevbuildtool.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions -DOXYGEN_PROJECTNAME = TDevelop Buildtool Base Library -DOXYGEN_DOCDIRPREFIX = tdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_PROJECTNAME = KDevelop Buildtool Base Library +DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am diff --git a/buildtools/lib/base/tdevbuildtool.cpp b/buildtools/lib/base/kdevbuildtool.cpp similarity index 69% rename from buildtools/lib/base/tdevbuildtool.cpp rename to buildtools/lib/base/kdevbuildtool.cpp index aa901bb7..618f02d9 100644 --- a/buildtools/lib/base/tdevbuildtool.cpp +++ b/buildtools/lib/base/kdevbuildtool.cpp @@ -16,23 +16,23 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" -#include -#include +#include +#include -TDevBuildTool::TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name) - :TDevProject(info, parent, name) +KDevBuildTool::KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name) + :KDevProject(info, parent, name) { } -TDevMakeFrontend * TDevBuildTool::makeFrontend() +KDevMakeFrontend * KDevBuildTool::makeFrontend() { - return extension("TDevelop/MakeFrontend"); + return extension("TDevelop/MakeFrontend"); } -TDevAppFrontend * TDevBuildTool::appFrontend() +KDevAppFrontend * KDevBuildTool::appFrontend() { - return extension("TDevelop/AppFrontend"); + return extension("TDevelop/AppFrontend"); } diff --git a/buildtools/lib/base/tdevbuildtool.h b/buildtools/lib/base/kdevbuildtool.h similarity index 78% rename from buildtools/lib/base/tdevbuildtool.h rename to buildtools/lib/base/kdevbuildtool.h index b6899f9b..ff1abcc0 100644 --- a/buildtools/lib/base/tdevbuildtool.h +++ b/buildtools/lib/base/kdevbuildtool.h @@ -17,24 +17,24 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVBUILDTOOL_H -#define TDEVBUILDTOOL_H +#ifndef KDEVBUILDTOOL_H +#define KDEVBUILDTOOL_H -#include +#include -class TDevMakeFrontend; -class TDevAppFrontend; +class KDevMakeFrontend; +class KDevAppFrontend; /**Base class for KDevelop build tool support plugins.*/ -class TDevBuildTool: public TDevProject +class KDevBuildTool: public KDevProject { public: - TDevBuildTool(const TDevPluginInfo* info, TQObject* parent, const char* name); + KDevBuildTool(const KDevPluginInfo* info, TQObject* parent, const char* name); /**@return The make frontend.*/ - TDevMakeFrontend *makeFrontend(); + KDevMakeFrontend *makeFrontend(); /**@return The application frontend.*/ - TDevAppFrontend *appFrontend(); + KDevAppFrontend *appFrontend(); }; diff --git a/buildtools/lib/parsers/autotools/CMakeLists.txt b/buildtools/lib/parsers/autotools/CMakeLists.txt index 5bc97247..8226e963 100644 --- a/buildtools/lib/parsers/autotools/CMakeLists.txt +++ b/buildtools/lib/parsers/autotools/CMakeLists.txt @@ -16,9 +16,9 @@ include_directories( ) -##### tdevautotoolsparser (static) ############## +##### kdevautotoolsparser (static) ############## -tde_add_library( tdevautotoolsparser STATIC_PIC +tde_add_library( kdevautotoolsparser STATIC_PIC SOURCES autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp ) diff --git a/buildtools/lib/parsers/autotools/Makefile.am b/buildtools/lib/parsers/autotools/Makefile.am index 47234583..340d0e38 100644 --- a/buildtools/lib/parsers/autotools/Makefile.am +++ b/buildtools/lib/parsers/autotools/Makefile.am @@ -6,9 +6,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -noinst_LTLIBRARIES = libtdevautotoolsparser.la -libtdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) -libtdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp +noinst_LTLIBRARIES = libkdevautotoolsparser.la +libkdevautotoolsparser_la_LDFLAGS = $(all_libraries) $(LIB_TDEIO) +libkdevautotoolsparser_la_SOURCES = autotoolsast.cpp autotoolsdriver.cpp autotools_yacc.cpp parser: cd $(srcdir) ; \ @@ -19,6 +19,6 @@ parser: EXTRA_DIST = autotools.yy autotools.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop AutoTools Parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop AutoTools Parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am diff --git a/buildtools/lib/parsers/autotools/tests/Makefile.am b/buildtools/lib/parsers/autotools/tests/Makefile.am index 00c2baba..30c67288 100644 --- a/buildtools/lib/parsers/autotools/tests/Makefile.am +++ b/buildtools/lib/parsers/autotools/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO check_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libtdevautotoolsparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/autotools/libkdevautotoolsparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/parsers/qmake/CMakeLists.txt b/buildtools/lib/parsers/qmake/CMakeLists.txt index 6ffebfa6..b8328a84 100644 --- a/buildtools/lib/parsers/qmake/CMakeLists.txt +++ b/buildtools/lib/parsers/qmake/CMakeLists.txt @@ -27,9 +27,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/parsers/qmake ) -##### tdevqmakeparser (shared) ################## +##### kdevqmakeparser (shared) ################## -tde_add_library( tdevqmakeparser SHARED +tde_add_library( kdevqmakeparser SHARED SOURCES qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp qmakeastvisitor.cpp qmakedriver.cpp diff --git a/buildtools/lib/parsers/qmake/Makefile.am b/buildtools/lib/parsers/qmake/Makefile.am index 9e14382a..ff3f175b 100644 --- a/buildtools/lib/parsers/qmake/Makefile.am +++ b/buildtools/lib/parsers/qmake/Makefile.am @@ -8,9 +8,9 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets/propeditor \ $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevqmakeparser.la -libtdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) -libtdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ +lib_LTLIBRARIES = libkdevqmakeparser.la +libkdevqmakeparser_la_LDFLAGS = -no-undefined $(all_libraries) $(LIB_TDEIO) +libkdevqmakeparser_la_SOURCES = qmake_lex.cpp qmake_yacc.cpp qmakeast.cpp \ qmakeastvisitor.cpp qmakedriver.cpp tdevelopbuildtoolsincludedir = $(includedir)/tdevelop/buildtools/parsers/qmake @@ -24,8 +24,8 @@ parser: EXTRA_DIST = qmake.yy qmake.ll DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop QMake parser -DOXYGEN_DOCDIRPREFIX = tdevparser +DOXYGEN_PROJECTNAME = KDevelop QMake parser +DOXYGEN_DOCDIRPREFIX = kdevparser include ../../../../Doxyfile.am noinst_HEADERS = qmake.ll qmake.yy qmake_lex.h diff --git a/buildtools/lib/parsers/qmake/tests/Makefile.am b/buildtools/lib/parsers/qmake/tests/Makefile.am index 74935269..e1932f7e 100644 --- a/buildtools/lib/parsers/qmake/tests/Makefile.am +++ b/buildtools/lib/parsers/qmake/tests/Makefile.am @@ -13,9 +13,9 @@ METASOURCES = AUTO noinst_PROGRAMS = runner viewer runner_LDFLAGS = $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +runner_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la runner_SOURCES = runner.cpp viewer_LDFLAGS = --no-undefined $(all_libraries) $(LIB_TDECORE) $(KDE_RPATH) -viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la +viewer_LDADD = $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la viewer_SOURCES = viewer.cpp viewer_main.cpp viewerbase.ui diff --git a/buildtools/lib/widgets/CMakeLists.txt b/buildtools/lib/widgets/CMakeLists.txt index 0349f6d3..d86d0c66 100644 --- a/buildtools/lib/widgets/CMakeLists.txt +++ b/buildtools/lib/widgets/CMakeLists.txt @@ -36,9 +36,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/buildtools/widgets ) -##### tdevbuildtoolswidgets (shared) ############ +##### kdevbuildtoolswidgets (shared) ############ -tde_add_library( tdevbuildtoolswidgets SHARED AUTOMOC +tde_add_library( kdevbuildtoolswidgets SHARED AUTOMOC SOURCES addenvvardlg.cpp addfilesdialog.cpp environmentdisplaydialog.cpp diff --git a/buildtools/lib/widgets/Makefile.am b/buildtools/lib/widgets/Makefile.am index 718bbb04..6042ea06 100644 --- a/buildtools/lib/widgets/Makefile.am +++ b/buildtools/lib/widgets/Makefile.am @@ -5,11 +5,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets/propeditor $(all_includes) -lib_LTLIBRARIES = libtdevbuildtoolswidgets.la -libtdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) -libtdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \ +lib_LTLIBRARIES = libkdevbuildtoolswidgets.la +libkdevbuildtoolswidgets_la_LDFLAGS = $(all_libraries) +libkdevbuildtoolswidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -ltdetexteditor -libtdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ +libkdevbuildtoolswidgets_la_SOURCES = addenvvardlg.cpp addfilesdialog.cpp \ environmentdisplaydialog.cpp environmentdisplaydialogbase.ui environmentvariableswidget.cpp \ environmentvariableswidgetbase.ui envvartools.cpp makeoptionswidget.cpp makeoptionswidgetbase.ui \ removesubprojectdialog.cpp removesubprojectdlgbase.ui runoptionswidget.cpp runoptionswidgetbase.ui \ @@ -23,8 +23,8 @@ tdevelopbuildtoolsinclude_HEADERS = addenvvardlg.h addfilesdialog.h \ makeoptionswidgetbase.h removesubprojectdialog.h removesubprojectdlgbase.h runoptionswidget.h \ runoptionswidgetbase.h subclassesdlg.h subclassesdlgbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Buildtool Widgets Library -DOXYGEN_DOCDIRPREFIX = tdevbt +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Buildtool Widgets Library +DOXYGEN_DOCDIRPREFIX = kdevbt include ../../../Doxyfile.am noinst_HEADERS = environmentdisplaydialog.h diff --git a/buildtools/pascal/CMakeLists.txt b/buildtools/pascal/CMakeLists.txt index f43f27b2..b10a6bec 100644 --- a/buildtools/pascal/CMakeLists.txt +++ b/buildtools/pascal/CMakeLists.txt @@ -30,17 +30,17 @@ link_directories( ##### other data ################################ -install( FILES tdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalproject ) +install( FILES kdevpascalproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpascalproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalproject ) -##### libtdevpascalproject (module) ############# +##### libkdevpascalproject (module) ############# -tde_add_kpart( libtdevpascalproject AUTOMOC +tde_add_kpart( libkdevpascalproject AUTOMOC SOURCES pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp - LINK tdevbuildbase-shared tdevbuildtoolswidgets-shared + LINK kdevbuildbase-shared kdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/pascal/Makefile.am b/buildtools/pascal/Makefile.am index f822bd6d..9bf4fc90 100644 --- a/buildtools/pascal/Makefile.am +++ b/buildtools/pascal/Makefile.am @@ -4,20 +4,20 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_builddir)/buildtools/lib/widgets \ $(all_includes) -kde_module_LTLIBRARIES = libtdevpascalproject.la -libtdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la +kde_module_LTLIBRARIES = libkdevpascalproject.la +libkdevpascalproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevpascalproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la -libtdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp +libkdevpascalproject_la_SOURCES = pascalproject_part.cpp pascalproject_widget.cpp pascalproject_optionsdlgbase.ui pascalprojectoptionsdlg.cpp pascalglobaloptionsdlg.cpp service.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpascalproject.desktop +service_DATA = kdevpascalproject.desktop -rcdir = $(kde_datadir)/tdevpascalproject -rc_DATA = tdevpascalproject.rc +rcdir = $(kde_datadir)/kdevpascalproject +rc_DATA = kdevpascalproject.rc diff --git a/buildtools/pascal/tdevpascalproject.desktop b/buildtools/pascal/kdevpascalproject.desktop similarity index 98% rename from buildtools/pascal/tdevpascalproject.desktop rename to buildtools/pascal/kdevpascalproject.desktop index 36143f24..cde3c21d 100644 --- a/buildtools/pascal/tdevpascalproject.desktop +++ b/buildtools/pascal/kdevpascalproject.desktop @@ -89,5 +89,5 @@ GenericName[uz@cyrillic]=Pascal лойиҳаси GenericName[zh_CN]=Pascal 工程 GenericName[zh_TW]=Pascal 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevpascalproject +X-TDE-Library=libkdevpascalproject X-TDevelop-Version=5 diff --git a/buildtools/pascal/tdevpascalproject.rc b/buildtools/pascal/kdevpascalproject.rc similarity index 100% rename from buildtools/pascal/tdevpascalproject.rc rename to buildtools/pascal/kdevpascalproject.rc diff --git a/buildtools/pascal/pascalglobaloptionsdlg.cpp b/buildtools/pascal/pascalglobaloptionsdlg.cpp index b55ae62f..ccbf8dc1 100644 --- a/buildtools/pascal/pascalglobaloptionsdlg.cpp +++ b/buildtools/pascal/pascalglobaloptionsdlg.cpp @@ -17,7 +17,7 @@ #include #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" #include "service.h" #include "pascalproject_part.h" @@ -64,7 +64,7 @@ PascalGlobalOptionsDlg::~PascalGlobalOptionsDlg() void PascalGlobalOptionsDlg::optionsButtonClicked() { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/pascal/pascalproject_part.cpp b/buildtools/pascal/pascalproject_part.cpp index 42864e23..01b0734a 100644 --- a/buildtools/pascal/pascalproject_part.cpp +++ b/buildtools/pascal/pascalproject_part.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -32,13 +32,13 @@ #include #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevmakefrontend.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" -#include "tdevlanguagesupport.h" -#include "tdevcompileroptions.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevmakefrontend.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" +#include "kdevlanguagesupport.h" +#include "kdevcompileroptions.h" #include "runoptionswidget.h" #include "envvartools.h" @@ -46,17 +46,17 @@ #include "pascalprojectoptionsdlg.h" #include "pascalglobaloptionsdlg.h" -#include +#include -typedef TDevGenericFactory PascalProjectFactory; -static const TDevPluginInfo data("tdevpascalproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevpascalproject, PascalProjectFactory( data ) ) +typedef KDevGenericFactory PascalProjectFactory; +static const KDevPluginInfo data("kdevpascalproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevpascalproject, PascalProjectFactory( data ) ) PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const TQStringList& ) - :TDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) + :KDevBuildTool(&data, parent, name ? name : "PascalProjectPart" ) { setInstance(PascalProjectFactory::instance()); - setXMLFile("tdevpascalproject.rc"); + setXMLFile("kdevpascalproject.rc"); TDEAction *action; action = new TDEAction( i18n("&Build Project"), "make_tdevelop", Key_F8, @@ -82,7 +82,7 @@ PascalProjectPart::PascalProjectPart(TQObject *parent, const char *name, const T // TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment @@ -172,7 +172,7 @@ void PascalProjectPart::openProject(const TQString &dirName, const TQString &pro } } while (!s.isEmpty()); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } void PascalProjectPart::closeProject() @@ -197,7 +197,7 @@ DomUtil::PairList PascalProjectPart::runEnvironmentVars() const */ TQString PascalProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("tdevpascalproject"); + TQString cwd = defaultRunDirectory("kdevpascalproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; @@ -384,12 +384,12 @@ void PascalProjectPart::slotExecute() void PascalProjectPart::changedFiles( const TQStringList & fileList ) { - TDevProject::changedFiles(fileList); + KDevProject::changedFiles(fileList); } void PascalProjectPart::changedFile( const TQString & fileName ) { - TDevProject::changedFile(fileName); + KDevProject::changedFile(fileName); } void PascalProjectPart::projectConfigWidget( KDialogBase * dlg ) @@ -436,7 +436,7 @@ void PascalProjectPart::configWidget( KDialogBase * dlg ) connect( dlg, TQT_SIGNAL(okClicked()), w, TQT_SLOT(accept()) ); } -TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) +KDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &name) { KService::Ptr service = KService::serviceByDesktopName(name); if (!service) { @@ -458,13 +458,13 @@ TDevCompilerOptions *PascalProjectPart::createCompilerOptions(const TQString &na args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(this, service->name().latin1(), - "TDevCompilerOptions", args); + "KDevCompilerOptions", args); - if (!obj->inherits("TDevCompilerOptions")) { - kdDebug() << "Component does not inherit TDevCompilerOptions" << endl; + if (!obj->inherits("KDevCompilerOptions")) { + kdDebug() << "Component does not inherit KDevCompilerOptions" << endl; return 0; } - TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; + KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; return dlg; } diff --git a/buildtools/pascal/pascalproject_part.h b/buildtools/pascal/pascalproject_part.h index 8f46817b..54d09b2e 100644 --- a/buildtools/pascal/pascalproject_part.h +++ b/buildtools/pascal/pascalproject_part.h @@ -8,18 +8,18 @@ * (at your option) any later version. * * * ***************************************************************************/ -#ifndef __TDEVPART_PASCALPROJECT_H__ -#define __TDEVPART_PASCALPROJECT_H__ +#ifndef __KDEVPART_PASCALPROJECT_H__ +#define __KDEVPART_PASCALPROJECT_H__ #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class PascalProjectWidget; class KDialogBase; -class TDevCompilerOptions; +class KDevCompilerOptions; -class PascalProjectPart : public TDevBuildTool +class PascalProjectPart : public KDevBuildTool { Q_OBJECT @@ -61,7 +61,7 @@ public: virtual void changedFiles( const TQStringList & fileList ); virtual void changedFile( const TQString & fileName ); - TDevCompilerOptions *createCompilerOptions(const TQString &name); + KDevCompilerOptions *createCompilerOptions(const TQString &name); virtual TQString defaultOptions(const TQString compiler) const; TQStringList distFiles() const; diff --git a/buildtools/pascal/pascalproject_widget.cpp b/buildtools/pascal/pascalproject_widget.cpp index 9ce95c47..a8671023 100644 --- a/buildtools/pascal/pascalproject_widget.cpp +++ b/buildtools/pascal/pascalproject_widget.cpp @@ -4,7 +4,7 @@ #include -#include +#include #include "pascalproject_part.h" diff --git a/buildtools/pascal/pascalproject_widget.h b/buildtools/pascal/pascalproject_widget.h index 5e104856..252c7500 100644 --- a/buildtools/pascal/pascalproject_widget.h +++ b/buildtools/pascal/pascalproject_widget.h @@ -6,7 +6,7 @@ #include -class TDevProject; +class KDevProject; class PascalProjectPart; diff --git a/buildtools/pascal/pascalprojectoptionsdlg.cpp b/buildtools/pascal/pascalprojectoptionsdlg.cpp index 1593656a..9c7c2518 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.cpp +++ b/buildtools/pascal/pascalprojectoptionsdlg.cpp @@ -20,7 +20,7 @@ #include #include "domutil.h" -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" #include "service.h" #include "pascalproject_part.h" @@ -59,7 +59,7 @@ TQStringList PascalProjectOptionsDlg::allBuildConfigs() TQStringList allConfigs; allConfigs.append("default"); - TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); TQDomElement childEl = node.firstChild().toElement(); while (!childEl.isNull()) { TQString config = childEl.tagName(); @@ -173,7 +173,7 @@ void PascalProjectOptionsDlg::configRemoved() TQString config = config_combo->currentText(); TQDomDocument dom = *m_part->projectDom(); - TQDomNode node = dom.documentElement().namedItem("tdevpascalproject").namedItem("configurations"); + TQDomNode node = dom.documentElement().namedItem("kdevpascalproject").namedItem("configurations"); node.removeChild(node.namedItem(config)); allConfigs.remove(config); @@ -187,7 +187,7 @@ void PascalProjectOptionsDlg::configRemoved() void PascalProjectOptionsDlg::optionsButtonClicked( ) { TQString name = ServiceComboBox::currentText(compiler_box, service_names); - TDevCompilerOptions *plugin = m_part->createCompilerOptions(name); + KDevCompilerOptions *plugin = m_part->createCompilerOptions(name); if (plugin) { TQString flags = plugin->exec(this, options_edit->text()); diff --git a/buildtools/pascal/pascalprojectoptionsdlg.h b/buildtools/pascal/pascalprojectoptionsdlg.h index c641faf3..acedb14d 100644 --- a/buildtools/pascal/pascalprojectoptionsdlg.h +++ b/buildtools/pascal/pascalprojectoptionsdlg.h @@ -16,7 +16,7 @@ #include "pascalproject_optionsdlgbase.h" class PascalProjectPart; -class TDevCompilerOptions; +class KDevCompilerOptions; class PascalProjectOptionsDlg : public PascalProjectOptionsDlgBase { diff --git a/buildtools/qmake/CMakeLists.txt b/buildtools/qmake/CMakeLists.txt index e2b877f5..fa281096 100644 --- a/buildtools/qmake/CMakeLists.txt +++ b/buildtools/qmake/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES tdevtrollproject.desktop tdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtrollproject ) +install( FILES kdevtrollproject.desktop kdevtmakeproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevtrollproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtrollproject ) -##### libtdevtrollproject (module) ############## +##### libkdevtrollproject (module) ############## -tde_add_kpart( libtdevtrollproject AUTOMOC +tde_add_kpart( libkdevtrollproject AUTOMOC SOURCES choosesubprojectdlg.cpp choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui @@ -48,6 +48,6 @@ tde_add_kpart( libtdevtrollproject AUTOMOC qmakeoptionswidgetbase.ui qmakescopeitem.cpp scope.cpp trolllistview.cpp trollprojectpart.cpp trollprojectwidget.cpp - LINK tdevqmakeparser-shared tdevbuildbase-shared tdevbuildtoolswidgets-shared + LINK kdevqmakeparser-shared kdevbuildbase-shared kdevbuildtoolswidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/qmake/Makefile.am b/buildtools/qmake/Makefile.am index 68adba76..b50fc775 100644 --- a/buildtools/qmake/Makefile.am +++ b/buildtools/qmake/Makefile.am @@ -8,14 +8,14 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_builddir)/buildtools/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevtrollproject.la -libtdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la \ - $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la \ - $(top_builddir)/buildtools/lib/parsers/qmake/libtdevqmakeparser.la - -libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ +kde_module_LTLIBRARIES = libkdevtrollproject.la +libkdevtrollproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtrollproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la \ + $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la \ + $(top_builddir)/buildtools/lib/parsers/qmake/libkdevqmakeparser.la + +libkdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ choosesubprojectdlgbase.ui createscopedlg.cpp createscopedlgbase.ui disablesubprojectdlg.cpp \ disablesubprojectdlgbase.ui newwidgetdlg.cpp newwidgetdlgbase.ui \ projectconfigurationdlg.cpp projectconfigurationdlgbase.ui qmakedefaultopts.cpp \ @@ -26,9 +26,9 @@ libtdevtrollproject_la_SOURCES = choosesubprojectdlg.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtrollproject.desktop tdevtmakeproject.desktop +service_DATA = kdevtrollproject.desktop kdevtmakeproject.desktop -rcdir = $(kde_datadir)/tdevtrollproject -rc_DATA = tdevtrollproject.rc +rcdir = $(kde_datadir)/kdevtrollproject +rc_DATA = kdevtrollproject.rc noinst_HEADERS = createscopedlg.h disablesubprojectdlg.h qmakedefaultopts.h \ qmakeoptionswidget.h qmakescopeitem.h trolllistview.h diff --git a/buildtools/qmake/tdevtmakeproject.desktop b/buildtools/qmake/kdevtmakeproject.desktop similarity index 98% rename from buildtools/qmake/tdevtmakeproject.desktop rename to buildtools/qmake/kdevtmakeproject.desktop index a5b729d5..97b4b528 100644 --- a/buildtools/qmake/tdevtmakeproject.desktop +++ b/buildtools/qmake/kdevtmakeproject.desktop @@ -85,7 +85,7 @@ GenericName[tr]=TMake Projesi GenericName[zh_CN]=TMake 工程 GenericName[zh_TW]=TMake 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevtrollproject +X-TDE-Library=libkdevtrollproject X-TDevelop-Version=5 X-TDevelop-Args=TMake diff --git a/buildtools/qmake/tdevtrollproject.desktop b/buildtools/qmake/kdevtrollproject.desktop similarity index 98% rename from buildtools/qmake/tdevtrollproject.desktop rename to buildtools/qmake/kdevtrollproject.desktop index 24ef620e..bf118c56 100644 --- a/buildtools/qmake/tdevtrollproject.desktop +++ b/buildtools/qmake/kdevtrollproject.desktop @@ -90,6 +90,6 @@ GenericName[uz@cyrillic]=QMake лойиҳаси GenericName[zh_CN]=QMake 工程 GenericName[zh_TW]=QMake 專案 ServiceTypes=TDevelop/Project -X-TDE-Library=libtdevtrollproject +X-TDE-Library=libkdevtrollproject X-TDevelop-Version=5 X-TDevelop-Args= diff --git a/buildtools/qmake/tdevtrollproject.rc b/buildtools/qmake/kdevtrollproject.rc similarity index 100% rename from buildtools/qmake/tdevtrollproject.rc rename to buildtools/qmake/kdevtrollproject.rc diff --git a/buildtools/qmake/trollprojectpart.cpp b/buildtools/qmake/trollprojectpart.cpp index 738e2534..c71afc30 100644 --- a/buildtools/qmake/trollprojectpart.cpp +++ b/buildtools/qmake/trollprojectpart.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include @@ -41,11 +41,11 @@ #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevmakefrontend.h" -#include "tdevappfrontend.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevmakefrontend.h" +#include "kdevappfrontend.h" +#include "kdevpartcontroller.h" #include "trollprojectwidget.h" #include "runoptionswidget.h" #include "config.h" @@ -53,15 +53,15 @@ #include "qmakeoptionswidget.h" #include "scope.h" -#include +#include #include -typedef TDevGenericFactory TrollProjectFactory; -static const TDevPluginInfo data("tdevtrollproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevtrollproject, TrollProjectFactory( data ) ) +typedef KDevGenericFactory TrollProjectFactory; +static const KDevPluginInfo data("kdevtrollproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevtrollproject, TrollProjectFactory( data ) ) TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQStringList& args ) - : TDevBuildTool(&data, parent, name ? name : "TrollProjectPart") + : KDevBuildTool(&data, parent, name ? name : "TrollProjectPart") { setInstance(TrollProjectFactory::instance()); @@ -70,7 +70,7 @@ TrollProjectPart::TrollProjectPart(TQObject *parent, const char *name, const TQS else m_tmakeProject = false; - setXMLFile("tdevtrollproject.rc"); + setXMLFile("kdevtrollproject.rc"); m_executeProjectAfterBuild = false; m_executeTargetAfterBuild = false; @@ -405,7 +405,7 @@ void TrollProjectPart::openProject(const TQString &dirName, const TQString &proj DomUtil::writeEntry(dom, "/kdevtrollproject/run/directoryradio", "executable"); } - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -475,7 +475,7 @@ TQString TrollProjectPart::runDirectory() const TQString cwd; if( DomUtil::readBoolEntry(dom, "/kdevtrollproject/run/useglobalprogram", true) ) { - cwd = defaultRunDirectory("tdevtrollproject"); + cwd = defaultRunDirectory("kdevtrollproject"); }else { TQString name = m_widget->getCurrentOutputFilename(); @@ -788,7 +788,7 @@ bool TrollProjectPart::isDirty() return false; } -TDevProject::Options TrollProjectPart::options( ) const +KDevProject::Options TrollProjectPart::options( ) const { return UsesTQMakeBuildSystem; } diff --git a/buildtools/qmake/trollprojectpart.h b/buildtools/qmake/trollprojectpart.h index 2b673b59..e36ef202 100644 --- a/buildtools/qmake/trollprojectpart.h +++ b/buildtools/qmake/trollprojectpart.h @@ -21,14 +21,14 @@ #include #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class KDialogBase; class TrollProjectWidget; class KDirWatch; class TQMakeDefaultOpts; -class TrollProjectPart : public TDevBuildTool +class TrollProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/buildtools/qmake/trollprojectwidget.cpp b/buildtools/qmake/trollprojectwidget.cpp index 12d814a5..68dfad8e 100644 --- a/buildtools/qmake/trollprojectwidget.cpp +++ b/buildtools/qmake/trollprojectwidget.cpp @@ -60,14 +60,14 @@ #include #include -#include "tdevcore.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "trollprojectpart.h" -#include "tdevappfrontend.h" -#include "tdevmakefrontend.h" -#include "tdevlanguagesupport.h" -#include "tdevcreatefile.h" +#include "kdevappfrontend.h" +#include "kdevmakefrontend.h" +#include "kdevlanguagesupport.h" +#include "kdevcreatefile.h" #include "subclassesdlg.h" #include "addfilesdialog.h" #include "urlutil.h" @@ -1403,7 +1403,7 @@ void TrollProjectWidget::slotNewFile() return ; } } - TDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); + KDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); TQString fcext; if( gitem ) { @@ -1437,7 +1437,7 @@ void TrollProjectWidget::slotNewFile() fcext = TQString(); } } - TDevCreateFile::CreatedFile crFile = + KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, projectDirectory() + TQString(TQChar(TQDir::separator()))+ m_shownSubproject->relativePath() ); } @@ -1683,7 +1683,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * } else if ( r == idInsNewFile ) { - TDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); + KDevCreateFile * createFileSupport = m_part->extension( "TDevelop/CreateFile" ); TQString fcext; switch ( titem->groupType ) { @@ -1714,7 +1714,7 @@ void TrollProjectWidget::slotDetailsContextMenu( TDEListView *, TQListViewItem * default: fcext = TQString(); } - TDevCreateFile::CreatedFile crFile = + KDevCreateFile::CreatedFile crFile = createFileSupport->createNewFile( fcext, cleanSubprojectPath ); } diff --git a/buildtools/script/CMakeLists.txt b/buildtools/script/CMakeLists.txt index c30a403d..d3f97540 100644 --- a/buildtools/script/CMakeLists.txt +++ b/buildtools/script/CMakeLists.txt @@ -27,16 +27,16 @@ link_directories( ##### other data ################################ -install( FILES tdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscriptproject ) +install( FILES kdevscriptproject.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevscriptproject.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscriptproject ) -##### libtdevscriptproject (module) ############# +##### libkdevscriptproject (module) ############# -tde_add_kpart( libtdevscriptproject AUTOMOC +tde_add_kpart( libkdevscriptproject AUTOMOC SOURCES scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp - LINK tdevbuildbase-shared + LINK kdevbuildbase-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/buildtools/script/Makefile.am b/buildtools/script/Makefile.am index a3d7652a..542b1a69 100644 --- a/buildtools/script/Makefile.am +++ b/buildtools/script/Makefile.am @@ -10,17 +10,17 @@ INCLUDES = -I$(top_srcdir)/buildtools/lib/base \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/external_interfaces $(all_includes) -kde_module_LTLIBRARIES = libtdevscriptproject.la -libtdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/buildtools/lib/widgets/libtdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libtdevbuildbase.la +kde_module_LTLIBRARIES = libkdevscriptproject.la +libkdevscriptproject_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevscriptproject_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/buildtools/lib/widgets/libkdevbuildtoolswidgets.la $(top_builddir)/buildtools/lib/base/libkdevbuildbase.la -libtdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp +libkdevscriptproject_la_SOURCES = scriptprojectpart.cpp scriptoptionswidget.cpp scriptoptionswidgetbase.ui scriptnewfiledlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevscriptproject.desktop +service_DATA = kdevscriptproject.desktop -rcdir = $(kde_datadir)/tdevscriptproject -rc_DATA = tdevscriptproject.rc +rcdir = $(kde_datadir)/kdevscriptproject +rc_DATA = kdevscriptproject.rc diff --git a/buildtools/script/tdevscriptproject.desktop b/buildtools/script/kdevscriptproject.desktop similarity index 99% rename from buildtools/script/tdevscriptproject.desktop rename to buildtools/script/kdevscriptproject.desktop index 9ba87c9f..6e135c16 100644 --- a/buildtools/script/tdevscriptproject.desktop +++ b/buildtools/script/kdevscriptproject.desktop @@ -83,5 +83,5 @@ GenericName[zh_CN]=脚本语言工程 GenericName[zh_TW]=文稿語言專案 ServiceTypes=TDevelop/Project Icon=tdevelop -X-TDE-Library=libtdevscriptproject +X-TDE-Library=libkdevscriptproject X-TDevelop-Version=5 diff --git a/buildtools/script/tdevscriptproject.rc b/buildtools/script/kdevscriptproject.rc similarity index 81% rename from buildtools/script/tdevscriptproject.rc rename to buildtools/script/kdevscriptproject.rc index d15c3dc2..651b10b4 100644 --- a/buildtools/script/tdevscriptproject.rc +++ b/buildtools/script/kdevscriptproject.rc @@ -1,5 +1,5 @@ - + diff --git a/buildtools/script/scriptnewfiledlg.cpp b/buildtools/script/scriptnewfiledlg.cpp index f254680e..9308792a 100644 --- a/buildtools/script/scriptnewfiledlg.cpp +++ b/buildtools/script/scriptnewfiledlg.cpp @@ -81,7 +81,7 @@ void ScriptNewFileDialog::accept() return; } - TDevProject *project = m_part->project(); + KDevProject *project = m_part->project(); if (!project->activeDirectory().isEmpty()) fileName.prepend(project->activeDirectory() + "/"); TQString destpath = project->projectDirectory() + "/" + fileName; diff --git a/buildtools/script/scriptoptionswidget.cpp b/buildtools/script/scriptoptionswidget.cpp index 13049699..d80cd501 100644 --- a/buildtools/script/scriptoptionswidget.cpp +++ b/buildtools/script/scriptoptionswidget.cpp @@ -16,10 +16,10 @@ #include #include #include "domutil.h" -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" -ScriptOptionsWidget::ScriptOptionsWidget(TDevPlugin *part, +ScriptOptionsWidget::ScriptOptionsWidget(KDevPlugin *part, TQWidget *parent, const char *name) : ScriptOptionsWidgetBase(parent, name) { diff --git a/buildtools/script/scriptoptionswidget.h b/buildtools/script/scriptoptionswidget.h index 086186cc..8f136d75 100644 --- a/buildtools/script/scriptoptionswidget.h +++ b/buildtools/script/scriptoptionswidget.h @@ -14,7 +14,7 @@ #include "scriptoptionswidgetbase.h" -class TDevPlugin; +class KDevPlugin; class ScriptOptionsWidget : public ScriptOptionsWidgetBase @@ -23,14 +23,14 @@ class ScriptOptionsWidget : public ScriptOptionsWidgetBase public: - ScriptOptionsWidget( TDevPlugin *part, TQWidget *parent=0, const char *name=0 ); + ScriptOptionsWidget( KDevPlugin *part, TQWidget *parent=0, const char *name=0 ); ~ScriptOptionsWidget(); public slots: void accept(); private: - TDevPlugin *m_part; + KDevPlugin *m_part; }; #endif diff --git a/buildtools/script/scriptprojectpart.cpp b/buildtools/script/scriptprojectpart.cpp index ef4fb16f..8f6b5fb4 100644 --- a/buildtools/script/scriptprojectpart.cpp +++ b/buildtools/script/scriptprojectpart.cpp @@ -23,32 +23,32 @@ #include #include #include -#include -#include +#include +#include #include #include "domutil.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" -#include "tdevlanguagesupport.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevlanguagesupport.h" #include "scriptoptionswidget.h" #include "scriptnewfiledlg.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" -typedef TDevGenericFactory ScriptProjectFactory; -static const TDevPluginInfo data("tdevscriptproject"); -K_EXPORT_COMPONENT_FACTORY( libtdevscriptproject, ScriptProjectFactory( data ) ) +typedef KDevGenericFactory ScriptProjectFactory; +static const KDevPluginInfo data("kdevscriptproject"); +K_EXPORT_COMPONENT_FACTORY( libkdevscriptproject, ScriptProjectFactory( data ) ) ScriptProjectPart::ScriptProjectPart(TQObject *parent, const char *name, const TQStringList &) - : TDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") + : KDevBuildTool(&data, parent, name ? name : "ScriptProjectPart") { setInstance(ScriptProjectFactory::instance()); - setXMLFile("tdevscriptproject.rc"); + setXMLFile("kdevscriptproject.rc"); // only create new file action if file creation part not available - if (!extension("TDevelop/CreateFile")) { + if (!extension("TDevelop/CreateFile")) { TDEAction *action; action = new TDEAction( i18n("New File..."), 0, this, TQT_SLOT(slotNewFile()), @@ -148,7 +148,7 @@ void ScriptProjectPart::openProject(const TQString &dirName, const TQString &pro } } while (!s.isEmpty()); - TDevProject::openProject( dirName, projectName ); + KDevProject::openProject( dirName, projectName ); } @@ -192,7 +192,7 @@ DomUtil::PairList ScriptProjectPart::runEnvironmentVars() const */ TQString ScriptProjectPart::runDirectory() const { - TQString cwd = defaultRunDirectory("tdevscriptproject"); + TQString cwd = defaultRunDirectory("kdevscriptproject"); if (cwd.isEmpty()) cwd = buildDirectory(); return cwd; diff --git a/buildtools/script/scriptprojectpart.h b/buildtools/script/scriptprojectpart.h index 2c3023ad..92087991 100644 --- a/buildtools/script/scriptprojectpart.h +++ b/buildtools/script/scriptprojectpart.h @@ -15,14 +15,14 @@ #include #include -#include "tdevbuildtool.h" +#include "kdevbuildtool.h" class TQListViewItem; class TQStringList; class KDialogBase; class ScriptProjectWidget; -class ScriptProjectPart : public TDevBuildTool +class ScriptProjectPart : public KDevBuildTool { Q_OBJECT diff --git a/configure.in.bot b/configure.in.bot index 6ee60dff..9b006e9e 100644 --- a/configure.in.bot +++ b/configure.in.bot @@ -1,7 +1,7 @@ if test "$DOT_FOUND" = "no"; then echo "" echo "You're missing the dot program." - echo "It is still possible to run and use TDevelop without it, but you will " + echo "It is still possible to run and use KDevelop without it, but you will " echo "not be able to use the new graphical classbrowser. In order to get " echo "a dot copy, go to www.graphviz.org and download the graphviz package." fi @@ -18,7 +18,7 @@ fi if test -n "$VCSCOMPAT" -a -z "$SVN_SUBDIR"; then echo "" echo "You're missing Subversion libraries (1.x)" - echo "TDevelop subversion support will not work without it," + echo "KDevelop subversion support will not work without it," echo "consider installing it." echo "" fi diff --git a/configure.in.in b/configure.in.in index 769baa0c..0e9fa12a 100644 --- a/configure.in.in +++ b/configure.in.in @@ -124,4 +124,4 @@ esac dnl AC_CHECK_FILE([$qt_includes/qassistantclient.h], [],[AC_MSG_ERROR([The qassistantclient.h header from Qt3 is needed to build tdevelop, on some systems this header is in a separate package called qt3-apps-dev])]) -KDE_INIT_DOXYGEN([TDevelop], [Version $VERSION]) +KDE_INIT_DOXYGEN([KDevelop], [Version $VERSION]) diff --git a/doc/Makefile.am b/doc/Makefile.am index 440f3684..8275eb30 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,2 +1,2 @@ -SUBDIRS = tdevelop std extras tde_app_devel tdevdesigner +SUBDIRS = tdevelop std extras kde_app_devel kdevdesigner diff --git a/doc/api/Architecture.dox b/doc/api/Architecture.dox index 52c1447a..ae4ef73d 100644 --- a/doc/api/Architecture.dox +++ b/doc/api/Architecture.dox @@ -40,7 +40,7 @@ parts to distinguish, mainly: - src = The core part of KDevelop - lib/interfaces = Plugin handler interface classes - - parts = The various parts using the KParts framework ( TDevPlugin children ) + - parts = The various parts using the KParts framework ( KDevPlugin children ) - languages = \ref language-parts - buildtools = \ref buildtool-parts - vcs = \ref vcs-parts @@ -67,12 +67,12 @@ There are two types of possible main window objects: pre-arranged access tabs around user areas. . -Both main window classes inherit from the TDevMainWindow class which provides +Both main window classes inherit from the KDevMainWindow class which provides access to common window features. \subsubsection toplevel The TopLevel Object -There is only one toplevel object of class TDevMainWindow in KDevelop. It can +There is only one toplevel object of class KDevMainWindow in KDevelop. It can be accessed through the static function TopLevel::getInstance() (see the TopLevel class). @@ -83,7 +83,7 @@ be viewed according to their functionalities as follows. \subsubsection language-parts Programming Language Support Parts -These parts implement a TDevLanguageSupport Class interface. +These parts implement a KDevLanguageSupport Class interface. To add support for a new programming language check the \ref howToAddProgrammingLanguages page (doc/api/HowToAddProgrammingLanguages.dox file). Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to see the current status/features of the programming languages currently supported by KDevelop. @@ -135,7 +135,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se \subsubsection buildtool-parts Build tools Parts -These parts implement a TDevProject Class interface. +These parts implement a KDevProject Class interface. - buildtools/ada = Ada build tool - (see AdaProjectPart) @@ -166,7 +166,7 @@ These parts implement a TDevProject Class interface. \subsubsection vcs-parts VCS (Version Control System) Parts -These parts implement a TDevVersionControl Class interface. +These parts implement a KDevVersionControl Class interface. - vcs/cervisia = Cervisia Support - (see CervisiaPlugin) @@ -211,7 +211,7 @@ Take a look at \ref EditorsSupportStatus (doc/api/EditorsSupportStatus.dox file) Some of the parts are considered global - that is, they effect the entire operation of KDevelop. -These parts implement a TDevPlugin Class interface. +These parts implement a KDevPlugin Class interface. - parts/appwizard = New Project Wizard - see AppWizardPart @@ -264,7 +264,7 @@ These parts implement a TDevPlugin Class interface. \subsubsection project-specific-parts Project Specific Parts -These parts implement a TDevPlugin Class interface. +These parts implement a KDevPlugin Class interface. - parts/astyle = Source code formatter - (see AStylePart) diff --git a/doc/api/FutureTasks.dox b/doc/api/FutureTasks.dox index 763537f3..1d7f7f26 100644 --- a/doc/api/FutureTasks.dox +++ b/doc/api/FutureTasks.dox @@ -129,7 +129,7 @@ the same border as other items (impossible) - Browser tool bar should truncate long menu entries so it doesn't take so much space (already implemented?) - - Extend TDevPlugin-API in order to have a preferred border for at + - Extend KDevPlugin-API in order to have a preferred border for at least the selection parts (Automake Manager, Class Browser, File Groups, etc...) diff --git a/doc/api/HighPriTasks.dox b/doc/api/HighPriTasks.dox index 7bcbaf1f..062b3b06 100644 --- a/doc/api/HighPriTasks.dox +++ b/doc/api/HighPriTasks.dox @@ -12,7 +12,7 @@ This way the .tdevelop file can be shared in teams of developers. -\section TDevelop2compat KDevelop 2 compatibility +\section KDevelop2compat KDevelop 2 compatibility (These are things that must be accomplished before we can say that KDevelop 3 >= tdevelop 2.x UI-wise and functionality-wise!) diff --git a/doc/api/HowToAddApplicationTemplates.dox b/doc/api/HowToAddApplicationTemplates.dox index 1da5a3e5..f53ce4f8 100644 --- a/doc/api/HowToAddApplicationTemplates.dox +++ b/doc/api/HowToAddApplicationTemplates.dox @@ -27,7 +27,7 @@ applications like kedit as well as plugins for example for tdevelop or noatun.\n \section templates_1 I. Example: How To Create a Simple KDE Application Template "KHello" -You can find this template in $TDEDIR/share/apps/tdevappwizard/template-khello. +You can find this template in $TDEDIR/share/apps/kdevappwizard/template-khello. \subsection templates_1_1 I.1. Step 1: Basic Skeleton @@ -64,7 +64,7 @@ wizard will replace: - \%{YEAR} ........ by the year . -All this can be found in $TDEDIR/share/apps/tdevappwizard/template-common/tdevelop.pm. +All this can be found in $TDEDIR/share/apps/kdevappwizard/template-common/tdevelop.pm. \subsubsection templates_1_2a I.2.1. The Source Files The files template-khello/app.cpp, template-khello/app.h and @@ -135,22 +135,22 @@ if [ `id -u` = 0 ]; then # we are root so install the template into the global kde directory kde_dir=`tde-config --prefix` else - # we are a user so install it into $HOME/.trinity/share/apps/tdevappwizard directory + # we are a user so install it into $HOME/.trinity/share/apps/kdevappwizard directory kde_dir=`tde-config --localprefix` echo "Note: It would be better to install as root. Press CTRL+C to abort" fi # use usual path or another one? -echo "Install dir [${kde_dir}/share/apps/tdevappwizard]:" +echo "Install dir [${kde_dir}/share/apps/kdevappwizard]:" read newdir -if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/tdevappwizard/"; fi +if [ "$newdir"a = a ]; then newdir="${kde_dir}/share/apps/kdevappwizard/"; fi # make sure the directories exist if [ ! -e "${newdir}/template-khello" ]; then mkdir -p "${newdir}/template-khello" ; fi; if [ ! -e "${newdir}/templates" ]; then mkdir -p "${newdir}/templates" ; fi; if [ ! -e "${newdir}" ]; then mkdir -p "$newdir" ; fi; -if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/tdevappwizard/template-common" "${newdir}/template-common" ; fi; +if [ ! -e "${newdir}/template-common" ]; then ln -s "${kde_prefix}/share/apps/kdevappwizard/template-common" "${newdir}/template-common" ; fi; # install now cp -R --target-directory "$newdir" template-khello diff --git a/doc/api/HowToAddGenericBuildTools.dox b/doc/api/HowToAddGenericBuildTools.dox index d713082a..b073cf0f 100644 --- a/doc/api/HowToAddGenericBuildTools.dox +++ b/doc/api/HowToAddGenericBuildTools.dox @@ -6,7 +6,7 @@ This part offers build tool facilities using project files in xml format (dtd is located in buildtools/generic/kdevxmlproject.dtd). Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins. -Build system plugin is an object that implements TDevBuildSystem interface. +Build system plugin is an object that implements KDevBuildSystem interface. Build system plugins are located in buildtools/generic/buildsystem. \section sectionStep1 Step 1: Make your plugin loadable diff --git a/doc/api/HowToAddPlugins.dox b/doc/api/HowToAddPlugins.dox index b0b282db..fa7f74e2 100644 --- a/doc/api/HowToAddPlugins.dox +++ b/doc/api/HowToAddPlugins.dox @@ -8,7 +8,7 @@ For a plugin foo, create a file foo.desktop which contains KDevelop/Part in its list of ServiceTypes. - - See parts/doctreeview/tdevdoctreeview.desktop for an example. + - See parts/doctreeview/kdevdoctreeview.desktop for an example. . If you install this file into \$(kde_servicesdir), your plugin will automatically be loaded. @@ -80,9 +80,9 @@ See parts/doctreeview/doctreeviewfactory.cpp for an example. \section implementPart Step 3: Implement your part. -Your part must be derived from TDevPlugin. +Your part must be derived from KDevPlugin. - - TDevPlugin takes two arguments: + - KDevPlugin takes two arguments: - 1) A parent argument. This also comes from createPartObject(). - 2) A name, which in turn is given to the QObject @@ -93,7 +93,7 @@ Your part must be derived from TDevPlugin. \subsection accessIDE How to access other IDE components A part can access other components of the IDE via some accessors -of TDevPlugin: +of KDevPlugin: - The application core via core(), - the build tools via project(), @@ -155,7 +155,7 @@ to write it back. \subsection sessionAccess Project session file (*.kdevses) -The base class of all TDevelop plugins is TDevPlugin. It provides two virtual methods +The base class of all TDevelop plugins is KDevPlugin. It provides two virtual methods restorePartialProjectSession(..) and savePartialProjectSession(..) that you should reimplement in your special plugin to attach to session loading and saving. diff --git a/doc/api/HowToAddProgrammingLanguages.dox b/doc/api/HowToAddProgrammingLanguages.dox index 5dd44fda..a5840885 100644 --- a/doc/api/HowToAddProgrammingLanguages.dox +++ b/doc/api/HowToAddProgrammingLanguages.dox @@ -6,7 +6,7 @@ \section LSupport List of things to have "complete" support of a given language in KDevelop - - Implement interface TDevLanguageSupport + - Implement interface KDevLanguageSupport - \ref sectionClassWizard - \ref sectionAttributeMethodWizard - \ref sectionQtUiSubclassing - (if the language has Qt bindings) @@ -43,7 +43,7 @@ Take a look at \ref LangSupportStatus (doc/api/LangSupportStatus.dox file) to se \section sectionLanguageSupport Language Support Any language support should be written as a tdevelop part and implement -TDevLanguageSupport interface (lib/interfaces/tdevlanguagesupport.h). +KDevLanguageSupport interface (lib/interfaces/kdevlanguagesupport.h). Implementing methods: - virtual Features features(); @@ -54,7 +54,7 @@ Should be enough for a language support to start working. KDevelop ships with KDevLang project template. It is a simple language support prototype that can be used when developing language support plugins with KDevelop. To use it, start a New Project and select: C++->KDevelop->KDevelop Language Support Plugin in the application wizard. -The template is located in languages/cpp/app_templates/tdevlang, you can change it there if you need. +The template is located in languages/cpp/app_templates/kdevlang, you can change it there if you need. You should look at languages/ruby for a simple language support @@ -177,7 +177,7 @@ write a Debugger . KDevelop already provides GDB support \subsection sectionCompilerPlugins Compiler plugins There is an ability to create compiler plugin for KDevelop. Compiler plugin provides the compiler configuration dialog which implements command line compiler options. -Compiler plugins must implement TDevCompilerOptions interface. +Compiler plugins must implement KDevCompilerOptions interface. \section MiscInf Other Info @@ -226,7 +226,7 @@ currently provides several build tools. They are: - see GenericProjectPart at buildtools/generic - Offers build tool facilities using project files in xml format (dtd is located in buildtools/generic/kdevxmlproject.dtd). Those xml files can be converted into makefiles, ant xml files or simply shell scripts using build system plugins. - Build system plugin is an object that implements TDevBuildSystem interface. Build system plugins are located in buildtools/generic/buildsystem. + Build system plugin is an object that implements KDevBuildSystem interface. Build system plugins are located in buildtools/generic/buildsystem. . - QMake build tool - see TrollProjectPart at buildtools/qmake diff --git a/doc/api/HowToDocument.dox b/doc/api/HowToDocument.dox index 65cd7c31..d606a8bf 100644 --- a/doc/api/HowToDocument.dox +++ b/doc/api/HowToDocument.dox @@ -3,7 +3,7 @@ */ /** \page howToDocument How to document KDevelop parts -You should add a README and a README.dox file to your part (TDevPlugin). +You should add a README and a README.dox file to your part (KDevPlugin). On the README file put this text: \verbatim @@ -31,7 +31,7 @@ implements your part. On the area marked with ... you can add optional informations. Here is an example of that: -\verbinclude languages/cpp/app_templates/tdevpart/README.dox +\verbinclude languages/cpp/app_templates/kdevpart/README.dox All these infos are optional and you should only add the link to the bugzilla database if YOUR_COMPONENT_NAME has been defined in that database. diff --git a/doc/extras/CMakeLists.txt b/doc/extras/CMakeLists.txt index a358cf07..dd7c977f 100644 --- a/doc/extras/CMakeLists.txt +++ b/doc/extras/CMakeLists.txt @@ -14,5 +14,5 @@ add_subdirectory( w3c ) install( FILES sdl.toc opengl.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/doc/extras/Makefile.am b/doc/extras/Makefile.am index deb28a1a..0e7893c4 100644 --- a/doc/extras/Makefile.am +++ b/doc/extras/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS=w3c -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = sdl.toc opengl.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/doc/extras/w3c/CMakeLists.txt b/doc/extras/w3c/CMakeLists.txt index 9681021f..7424e5fd 100644 --- a/doc/extras/w3c/CMakeLists.txt +++ b/doc/extras/w3c/CMakeLists.txt @@ -12,5 +12,5 @@ install( FILES w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/doc/extras/w3c/Makefile.am b/doc/extras/w3c/Makefile.am index 68a489f8..19518e8d 100644 --- a/doc/extras/w3c/Makefile.am +++ b/doc/extras/w3c/Makefile.am @@ -1,3 +1,3 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = w3c-dom-level2-html.toc w3c-svg.toc w3c-uaag10.toc diff --git a/doc/tde_app_devel/CMakeLists.txt b/doc/kde_app_devel/CMakeLists.txt similarity index 84% rename from doc/tde_app_devel/CMakeLists.txt rename to doc/kde_app_devel/CMakeLists.txt index 83e96ce9..243887d5 100644 --- a/doc/tde_app_devel/CMakeLists.txt +++ b/doc/kde_app_devel/CMakeLists.txt @@ -9,4 +9,4 @@ # ################################################# -tde_create_handbook( DESTINATION tde_app_devel ) +tde_create_handbook( DESTINATION kde_app_devel ) diff --git a/doc/tdevassistant/Makefile.am b/doc/kde_app_devel/Makefile.am similarity index 100% rename from doc/tdevassistant/Makefile.am rename to doc/kde_app_devel/Makefile.am diff --git a/doc/tde_app_devel/appwizard.png b/doc/kde_app_devel/appwizard.png similarity index 100% rename from doc/tde_app_devel/appwizard.png rename to doc/kde_app_devel/appwizard.png diff --git a/doc/tde_app_devel/index.docbook b/doc/kde_app_devel/index.docbook similarity index 99% rename from doc/tde_app_devel/index.docbook rename to doc/kde_app_devel/index.docbook index e212e4e6..2d913c0b 100644 --- a/doc/tde_app_devel/index.docbook +++ b/doc/kde_app_devel/index.docbook @@ -1,6 +1,6 @@ TDevelop"> + KDevelop"> @@ -47,7 +47,7 @@ the &tdevelop; IDE KDE -TDevelop +KDevelop IDE development programming @@ -85,7 +85,7 @@ review of the functionality provided by the IDE. About this Handbook This handbook has been written to give developers an introduction into KDE application development by -using the TDevelop Integrated Development Environment. +using the KDevelop Integrated Development Environment. The following chapters therefore give an introduction on how to create projects, explains the sourcecode @@ -135,7 +135,7 @@ You will learn how to: Additional information about Qt/KDE programming is available by various sources: Programming with Qt by Matthias Kalle Dalheimer -The User Manual to TDevelop, provided with the TDevelop IDE +The User Manual to KDevelop, provided with the TDevelop IDE The Online Reference to the Qt library The KDE Developer web site @@ -147,7 +147,7 @@ Unix Systems as well as about the C and C++ programming language. For obtaining help about the TDevelop IDE, you should send requests to our mailinglist at -kdevelop@kdevelop.org. Mind that the TDevelop team is dedicated to provide the means to enable you to +kdevelop@kdevelop.org. Mind that the KDevelop team is dedicated to provide the means to enable you to program applications and therefore is not intended as a technical support team in cases where the applications you're developing don't work due to implementation errors or misconfigurations of your operating system. By this, we ask all users to take advantage of the mailinglist in any case you're running @@ -697,7 +697,7 @@ what in later steps. This chapter makes the assumption that you understand the basic navigation of &tdevelop;. Consult the -TDevelop User Manual for information if you need it. +KDevelop User Manual for information if you need it. The Automake manager shows the project files as follows: diff --git a/doc/tde_app_devel/kscribblefiles.png b/doc/kde_app_devel/kscribblefiles.png similarity index 100% rename from doc/tde_app_devel/kscribblefiles.png rename to doc/kde_app_devel/kscribblefiles.png diff --git a/doc/tde_app_devel/Makefile.am b/doc/kdearch/Makefile.am similarity index 100% rename from doc/tde_app_devel/Makefile.am rename to doc/kdearch/Makefile.am diff --git a/doc/tdearch/affine-general.png b/doc/kdearch/affine-general.png similarity index 100% rename from doc/tdearch/affine-general.png rename to doc/kdearch/affine-general.png diff --git a/doc/tdearch/affine-rotate.png b/doc/kdearch/affine-rotate.png similarity index 100% rename from doc/tdearch/affine-rotate.png rename to doc/kdearch/affine-rotate.png diff --git a/doc/tdearch/affine-scale.png b/doc/kdearch/affine-scale.png similarity index 100% rename from doc/tdearch/affine-scale.png rename to doc/kdearch/affine-scale.png diff --git a/doc/tdearch/affine-shear.png b/doc/kdearch/affine-shear.png similarity index 100% rename from doc/tdearch/affine-shear.png rename to doc/kdearch/affine-shear.png diff --git a/doc/tdearch/affine-translate.png b/doc/kdearch/affine-translate.png similarity index 100% rename from doc/tdearch/affine-translate.png rename to doc/kdearch/affine-translate.png diff --git a/doc/tdearch/brushstyles.png b/doc/kdearch/brushstyles.png similarity index 100% rename from doc/tdearch/brushstyles.png rename to doc/kdearch/brushstyles.png diff --git a/doc/tdearch/canvas.png b/doc/kdearch/canvas.png similarity index 100% rename from doc/tdearch/canvas.png rename to doc/kdearch/canvas.png diff --git a/doc/tdearch/capflat.png b/doc/kdearch/capflat.png similarity index 100% rename from doc/tdearch/capflat.png rename to doc/kdearch/capflat.png diff --git a/doc/tdearch/capround.png b/doc/kdearch/capround.png similarity index 100% rename from doc/tdearch/capround.png rename to doc/kdearch/capround.png diff --git a/doc/tdearch/capsquare.png b/doc/kdearch/capsquare.png similarity index 100% rename from doc/tdearch/capsquare.png rename to doc/kdearch/capsquare.png diff --git a/doc/tdearch/index.docbook b/doc/kdearch/index.docbook similarity index 99% rename from doc/tdearch/index.docbook rename to doc/kdearch/index.docbook index 3bc09158..97dee33d 100644 --- a/doc/tdearch/index.docbook +++ b/doc/kdearch/index.docbook @@ -1965,7 +1965,7 @@ EXTRA_DIST = $(kde_servicesdir_DATA) The content of the following example file -tdevdoxygen.desktop defines the +kdevdoxygen.desktop defines the KDevDoxygen plugin with the service type TDevelop/Part: @@ -1976,7 +1976,7 @@ Type=Service Comment=Doxygen Name=KDevDoxygen ServiceTypes=TDevelop/Part -X-TDE-Library=libtdevdoxygen +X-TDE-Library=libkdevdoxygen X-TDevelop-ProgrammingLanguages=C,C++,Java X-TDevelop-Scope=Project @@ -1992,7 +1992,7 @@ the library must contain the following function: extern "C" { - void *init_libtdevdoxygen() + void *init_libkdevdoxygen() { return new DoxygenFactory; } diff --git a/doc/tdearch/joinbevel.png b/doc/kdearch/joinbevel.png similarity index 100% rename from doc/tdearch/joinbevel.png rename to doc/kdearch/joinbevel.png diff --git a/doc/tdearch/joinmiter.png b/doc/kdearch/joinmiter.png similarity index 100% rename from doc/tdearch/joinmiter.png rename to doc/kdearch/joinmiter.png diff --git a/doc/tdearch/joinround.png b/doc/kdearch/joinround.png similarity index 100% rename from doc/tdearch/joinround.png rename to doc/kdearch/joinround.png diff --git a/doc/tdearch/konqi-mirrored.png b/doc/kdearch/konqi-mirrored.png similarity index 100% rename from doc/tdearch/konqi-mirrored.png rename to doc/kdearch/konqi-mirrored.png diff --git a/doc/tdearch/konqi-normal.png b/doc/kdearch/konqi-normal.png similarity index 100% rename from doc/tdearch/konqi-normal.png rename to doc/kdearch/konqi-normal.png diff --git a/doc/tdearch/konqi-rotated.png b/doc/kdearch/konqi-rotated.png similarity index 100% rename from doc/tdearch/konqi-rotated.png rename to doc/kdearch/konqi-rotated.png diff --git a/doc/tdearch/konqi-sheared.png b/doc/kdearch/konqi-sheared.png similarity index 100% rename from doc/tdearch/konqi-sheared.png rename to doc/kdearch/konqi-sheared.png diff --git a/doc/tdearch/kview-menu.png b/doc/kdearch/kview-menu.png similarity index 100% rename from doc/tdearch/kview-menu.png rename to doc/kdearch/kview-menu.png diff --git a/doc/tdearch/opengl.png b/doc/kdearch/opengl.png similarity index 100% rename from doc/tdearch/opengl.png rename to doc/kdearch/opengl.png diff --git a/doc/tdearch/penstyles.png b/doc/kdearch/penstyles.png similarity index 100% rename from doc/tdearch/penstyles.png rename to doc/kdearch/penstyles.png diff --git a/doc/tdearch/whatsthis.png b/doc/kdearch/whatsthis.png similarity index 100% rename from doc/tdearch/whatsthis.png rename to doc/kdearch/whatsthis.png diff --git a/doc/tdevdesigner/CMakeLists.txt b/doc/kdevdesigner/CMakeLists.txt similarity index 79% rename from doc/tdevdesigner/CMakeLists.txt rename to doc/kdevdesigner/CMakeLists.txt index d8d93cbb..db314d97 100644 --- a/doc/tdevdesigner/CMakeLists.txt +++ b/doc/kdevdesigner/CMakeLists.txt @@ -6,4 +6,4 @@ # ################################################# -tde_create_handbook( DESTINATION tdevdesigner ) +tde_create_handbook( DESTINATION kdevdesigner ) diff --git a/doc/tdevdesigner/Makefile.am b/doc/kdevdesigner/Makefile.am similarity index 100% rename from doc/tdevdesigner/Makefile.am rename to doc/kdevdesigner/Makefile.am diff --git a/doc/tdevdesigner/index.docbook b/doc/kdevdesigner/index.docbook similarity index 83% rename from doc/tdevdesigner/index.docbook rename to doc/kdevdesigner/index.docbook index 3bfdf384..c903aa65 100644 --- a/doc/tdevdesigner/index.docbook +++ b/doc/kdevdesigner/index.docbook @@ -1,7 +1,7 @@ TDevDesigner"> - + KDevDesigner"> + ]> @@ -11,10 +11,10 @@
-The &tdevdesigner; Handbook +The &kdevdesigner; Handbook -The &tdevdesigner; Handbook +The &kdevdesigner; Handbook &tde-authors; @@ -33,7 +33,7 @@ -&tdevdesigner; is a GUI designer environment for &tde;. +&kdevdesigner; is a GUI designer environment for &tde;. @@ -45,7 +45,7 @@ We Apologize -No documentation has yet been written for &tdevdesigner;. +No documentation has yet been written for &kdevdesigner;. If you need help, please check The &tde; web site, submit questions to the diff --git a/doc/platform/Mainpage.dox b/doc/platform/Mainpage.dox index ae377ddf..29f6deb0 100644 --- a/doc/platform/Mainpage.dox +++ b/doc/platform/Mainpage.dox @@ -81,11 +81,11 @@ KDevelop Technotes. \section langapi Programming Language Support API -- Language Support Interfaces Library - (classes)\n +- Language Support Interfaces Library + (classes)\n Interfaces for KDevelop language support facilities. -- Debugger Support Library - (classes)\n +- Debugger Support Library + (classes)\n Classes to implement debugger support for a programming language. . @@ -110,8 +110,8 @@ KDevelop Technotes. \section shellapi Shell API -- Generic Shell - (classes)\n +- Generic Shell + (classes)\n The Shell - a profile-based implementation of TDevelop plugin architecture. - Shell Profiles Library (classes)\n diff --git a/doc/std/CMakeLists.txt b/doc/std/CMakeLists.txt index edb0d2a8..3c034ee5 100644 --- a/doc/std/CMakeLists.txt +++ b/doc/std/CMakeLists.txt @@ -11,6 +11,6 @@ install( FILES - tdev3api.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs + kdev3api.toc + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/doc/std/Makefile.am b/doc/std/Makefile.am index 7b636e47..07f12cde 100644 --- a/doc/std/Makefile.am +++ b/doc/std/Makefile.am @@ -1,5 +1,5 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs -toc_DATA = tdev3api.toc +tocdir = ${kde_datadir}/kdevdocumentation/tocs +toc_DATA = kdev3api.toc #indexdir = ${kde_datadir}/devdoctreeview/indices #index_DATA = diff --git a/doc/std/tdev3api.toc b/doc/std/kdev3api.toc similarity index 100% rename from doc/std/tdev3api.toc rename to doc/std/kdev3api.toc diff --git a/doc/tdearch/Makefile.am b/doc/tdearch/Makefile.am deleted file mode 100644 index 171f575c..00000000 --- a/doc/tdearch/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -KDE_LANG = en -KDE_DOCS = AUTO diff --git a/doc/tdevassistant/CMakeLists.txt b/doc/tdevassistant/CMakeLists.txt deleted file mode 100644 index caa4d7b8..00000000 --- a/doc/tdevassistant/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -################################################# -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -tde_create_handbook( DESTINATION tdevassistant ) diff --git a/doc/tdevassistant/index.docbook b/doc/tdevassistant/index.docbook deleted file mode 100644 index 065276f9..00000000 --- a/doc/tdevassistant/index.docbook +++ /dev/null @@ -1,65 +0,0 @@ - -TDevAssistant"> - - - -]> - - - - - -
-The &tdevassistant; Handbook - - -The &tdevassistant; Handbook - - -&tde-authors; - - - -&tde-release-version; -Reviewed: &tde-release-date; - - -&tde-copyright-date; -&tde-team; - - - - - - -&tdevassistant; is a development documentation viewer for &tde;. - - - - -TDE - - - - - -We Apologize -No documentation has yet been written for &tdevassistant;. - -If you need help, please check The &tde; -web site, submit questions to the -&tde; mail lists, or file a bug report at the -&tde; bug tracker. - -If you are interested in helping, please consider writing the help file. -Submitting a basic text file is acceptable as the &tde-team; will convert the text. - -Thank you for helping and thank you for your patience. - -&underFDL; - - - -&documentation.index; -
diff --git a/doc/tdevelop/app-files.docbook b/doc/tdevelop/app-files.docbook index 736baf16..547010ec 100644 --- a/doc/tdevelop/app-files.docbook +++ b/doc/tdevelop/app-files.docbook @@ -56,7 +56,7 @@ Most &tdevelop; features are provided by KParts. These are basically application -There are quite a lot of default configuration subdirectories in $TDEDIR/share/apps/ whose names all start with a tdev sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as: +There are quite a lot of default configuration subdirectories in $TDEDIR/share/apps/ whose names all start with a kdev sequence. Most of them are for &tdevelop; internal use only. They might be deliberately grouped for readability as: Stand-alone Applications Task Specific Parts @@ -76,25 +76,25 @@ There are quite a lot of default configuration subdirectories in profiles/ — contains default plugin profile settings. (Currently there is only a tiny profile provided which defines a minimum set of active &tdevelop; plugins.) eventsrc — holds a lot of Process successful localization strings. tdevelopui.rc — provides the basic menu and tool bar entries &tdevelop; uses. - tdevhtml_partui.rc — provides a Print... entry in the File menu, a Copy entry in the Edit menu, and Back and Forward arrows in the Browser Toolbar in case a &HTML; file is browsed from the Documentation plugin. + kdevhtml_partui.rc — provides a Print... entry in the File menu, a Copy entry in the Edit menu, and Back and Forward arrows in the Browser Toolbar in case a &HTML; file is browsed from the Documentation plugin. - tdevassistant/ — provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser. - tdevdesigner/ and tdevdesignerpart/ — provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer. + kdevassistant/ — provides the menu and tool bars of the stand-alone &tdevelop; Assistant documentation browser. + kdevdesigner/ and kdevdesignerpart/ — provide menu bar and tool bars of the stand-alone &tdevelop; user interface designer. Task Specific Parts - tdevabbrev/ — contains files used by the Abbreviation Expansion plugin: + kdevabbrev/ — contains files used by the Abbreviation Expansion plugin: sources/ — contains keyword definition files used by the Expand Text command. templates/ — contains template definition files used by the Expand Abbreviation command. - tdevabbrev.rc — provides the Expand Text and Expand Abbreviation entries in the Edit menu. + kdevabbrev.rc — provides the Expand Text and Expand Abbreviation entries in the Edit menu. - tdevappwizard/ — contains files used by the &appwizard; part: + kdevappwizard/ — contains files used by the &appwizard; part: importfiles/ — contains .tdevelop project files which control the initialization of a new project. imports/ — contains templates to set up project specific .desktop files. @@ -104,89 +104,89 @@ There are quite a lot of default configuration subdirectories in *.tar.gz — tarballs containing the source files to be included in a new generated project directory. - tdevastyle/ — provides the Reformat Source entry in the Edit menu. - tdevautoproject/ — provides most of the entries in the Build menu and the Build Toolbar (&tdevelop;) toolbar. + kdevastyle/ — provides the Reformat Source entry in the Edit menu. + kdevautoproject/ — provides most of the entries in the Build menu and the Build Toolbar (&tdevelop;) toolbar. - tdevclassview/ — contains files used by the Class View project plugin: + kdevclassview/ — contains files used by the Class View project plugin: pics/ — contains the icons used in the Classes classview tree. - tdevclassview.tc — provides the Class Inheritance Diagram entry in the Projects menu as well as the classes navigation combo box in the Browser Toolbar. + kdevclassview.tc — provides the Class Inheritance Diagram entry in the Projects menu as well as the classes navigation combo box in the Browser Toolbar. - tdevcloser/ — provides the Windows menu close entries. - tdevctags/ — provides the CTags entry in the Tools menu for the CTags Frontend project plugin. - tdevcvsservice/ — provides the icon used by the CvsService tab and a short shell script used to add a new entry to the &cvs; repository, both used by the CVS Integration project plugin. - tdevdebugger/ — provides the Debug menu entries for the Debugger Frontend project plugin. - tdevdiff/ — provides the Difference Viewer entry in the Tools menu. - tdevdistpart/ — provides the Distribution & Publishing entry in the Project menu for the Final Packaging Support project plugin. + kdevcloser/ — provides the Windows menu close entries. + kdevctags/ — provides the CTags entry in the Tools menu for the CTags Frontend project plugin. + kdevcvsservice/ — provides the icon used by the CvsService tab and a short shell script used to add a new entry to the &cvs; repository, both used by the CVS Integration project plugin. + kdevdebugger/ — provides the Debug menu entries for the Debugger Frontend project plugin. + kdevdiff/ — provides the Difference Viewer entry in the Tools menu. + kdevdistpart/ — provides the Distribution & Publishing entry in the Project menu for the Final Packaging Support project plugin. - tdevdocumentation/ — contains files used by the Documentation plugin: + kdevdocumentation/ — contains files used by the Documentation plugin: en/ and pics/ — contain files used by the htdig search tool. tocs/ — contain the default &tdevelop; documentation content description files (see the description in Basic Structure of &tdevelop; TOC Files). - tdevpart_documentation.rc — provides the search related entries in the Help menu. + kdevpart_documentation.rc — provides the search related entries in the Help menu. - tdevdoxygen/ — provides the menu entries for the Doxygen Support project plugin. + kdevdoxygen/ — provides the menu entries for the Doxygen Support project plugin. - tdevfilecreate/ — contains files used by the New File Wizard: + kdevfilecreate/ — contains files used by the New File Wizard: file-templates/ — provides the initial text contents to be put into the new source file of a given type. - tdevpart_filecreate.rc — provides the New entry in the File menu. + kdevpart_filecreate.rc — provides the New entry in the File menu. template-info.xml — contains descriptions of the available file types to be displayed in the New File tool view. - tdevfilter/ — provides the Execute Command... and Filter Selection Through Command... entries in the Tools menu used by the Shell Filtering and Insertion plugin. - tdevfullscreen/ — provides the Full Screen Mode entry in the View menu and the according tool bar icon. - tdevgrepview/ — provides the Find in Files...entry in the Edit menu used by the Grep Frontend plugin. - tdevhistory/ — provides the Back and Forward entries in the View menu. - tdevjavadebugger/ — provides a Java Debug menu in order to debug a &Java; application. - tdevoutputviews/ — provides the Next Error and Previous Error entries in the View menu. - tdevpartexplorer/ — provides the Part Explorer entry in the Tools menu used by the Part Explorer Tool plugin. - tdevquickopen/ — provides the Quick Open File.. entry in the File menu and the Quick Open Class... and Quick Open Method entries in the Tools menu used by the Quick Open project plugin. - tdevregexptest/ — provides the Debug Regular Expression... entry in the Tools menu used by the Regular Expression Tester plugin. - tdevreplace/ — provides the Find-Select-Replace... entry in the Edit menu used by the Replace Part plugin. - tdevtipofday/ — provides the Tip of the Day entry in the Help menu as well as a HTML-File containing the available tips. - tdevtools/ — controls various menu entries ceated by Tools Menu and External Tools Menu settings provided by the Tools Menu Addition plugin. - tdevvalgrind/ — provides the Valgrind Memory Leak Check and Profile with KCachegrind entries in the Debug menu used by the Valgrind Frontend plugin. + kdevfilter/ — provides the Execute Command... and Filter Selection Through Command... entries in the Tools menu used by the Shell Filtering and Insertion plugin. + kdevfullscreen/ — provides the Full Screen Mode entry in the View menu and the according tool bar icon. + kdevgrepview/ — provides the Find in Files...entry in the Edit menu used by the Grep Frontend plugin. + kdevhistory/ — provides the Back and Forward entries in the View menu. + kdevjavadebugger/ — provides a Java Debug menu in order to debug a &Java; application. + kdevoutputviews/ — provides the Next Error and Previous Error entries in the View menu. + kdevpartexplorer/ — provides the Part Explorer entry in the Tools menu used by the Part Explorer Tool plugin. + kdevquickopen/ — provides the Quick Open File.. entry in the File menu and the Quick Open Class... and Quick Open Method entries in the Tools menu used by the Quick Open project plugin. + kdevregexptest/ — provides the Debug Regular Expression... entry in the Tools menu used by the Regular Expression Tester plugin. + kdevreplace/ — provides the Find-Select-Replace... entry in the Edit menu used by the Replace Part plugin. + kdevtipofday/ — provides the Tip of the Day entry in the Help menu as well as a HTML-File containing the available tips. + kdevtools/ — controls various menu entries ceated by Tools Menu and External Tools Menu settings provided by the Tools Menu Addition plugin. + kdevvalgrind/ — provides the Valgrind Memory Leak Check and Profile with KCachegrind entries in the Debug menu used by the Valgrind Frontend plugin. Project Generation Parts - tdevadaproject/ — provides entries for the Build menu and according tool bar icons to build an Ada application. - tdevantproject/ — provides entries for the Build menu when the Ant project generator is used. - tdevautoproject/ — provides entries for the Build menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the Add Translation and Build Configuration entries to the Project menu. - tdevcustomproject/ — provides entries for the Build menu and according tool bar icons when the project is based on custom Makefils. - tdevgenericproject/ — contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused. - tdevhaskellproject/ — provides entries for the Build menu and according tool bar icons to build a Haskell application. - tdevpascalproject/ — provides entries for the Build menu and according tool bar icons to build a Pascal application. - tdevtrollproject/ — provides entries for the Build menu and according tool bar icons to build an application using the &Qt; QMake project manager. + kdevadaproject/ — provides entries for the Build menu and according tool bar icons to build an Ada application. + kdevantproject/ — provides entries for the Build menu when the Ant project generator is used. + kdevautoproject/ — provides entries for the Build menu and according tool bar icons when working with the &GNU; Tools based &automake; project generator. Additionally provides the Add Translation and Build Configuration entries to the Project menu. + kdevcustomproject/ — provides entries for the Build menu and according tool bar icons when the project is based on custom Makefils. + kdevgenericproject/ — contains menu definitions for an experimental generic project generator. Currently (version 3.1.0) unused. + kdevhaskellproject/ — provides entries for the Build menu and according tool bar icons to build a Haskell application. + kdevpascalproject/ — provides entries for the Build menu and according tool bar icons to build a Pascal application. + kdevtrollproject/ — provides entries for the Build menu and according tool bar icons to build an application using the &Qt; QMake project manager. Language Specific Parts - tdevadasupport/ — provides entries in the Tools menu and according tool bar icons needed to develop Ada applications. - tdevbashsupport/ — provides entries in the Build menu and according tool bar icons needed to develop Bash scripts. + kdevadasupport/ — provides entries in the Tools menu and according tool bar icons needed to develop Ada applications. + kdevbashsupport/ — provides entries in the Build menu and according tool bar icons needed to develop Bash scripts. - tdevcppsupport/ — contains files used by the &appwizard; to build C++ applications: + kdevcppsupport/ — contains files used by the &appwizard; to build C++ applications: newclass/ — contains header and source templates from which the &appwizard; builds the according source files. subclassing/ — contains templates which the &appwizard; uses to set up initial class declarations/definitions in the source files. templates — contains templates from which the &appwizard; sets up the default header and source template files to be used by the &nfwizard;. configuration — dummy template to add macros. - tdevcppsupport.rc — provides the Complete Text and Make Member entries fo the Edit menu, the Switch Header/Implementation entry for the View menu, and the New Class entry for the Project menu as well as a New Class icon for the Browser Toolbar. + kdevcppsupport.rc — provides the Complete Text and Make Member entries fo the Edit menu, the Switch Header/Implementation entry for the View menu, and the New Class entry for the Project menu as well as a New Class icon for the Browser Toolbar. - tdevfortransupport/ — provides entries in the Build menu needed to develop Fortran applications. - tdevhaskellsupport/ — provides entries in the Build menu and according tool bar icons needed to develop Haskell applications. - tdevjavasupport/ — contains the UI definition needed to develop &Java; applications. - tdevpascalsupport/ — contains the UI definition needed to develop Pascal applications. - tdevperlsupport/ — provides Project and Help menu entries needed to develop Perl scripts. - tdevphpsupport/ — contains UI and PHP function definition files needed to develop PHP scripts. - tdevpythonsupport/ — provides Build and Help menu entries and according tool bar icons needed to develop Python scripts. - tdevrubysupport/ — provides Build menu entries and according tool bar icons needed to develop Ruby scripts. - tdevscriptproject/ — provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused. - tdevsqlsupport/ — provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused. + kdevfortransupport/ — provides entries in the Build menu needed to develop Fortran applications. + kdevhaskellsupport/ — provides entries in the Build menu and according tool bar icons needed to develop Haskell applications. + kdevjavasupport/ — contains the UI definition needed to develop &Java; applications. + kdevpascalsupport/ — contains the UI definition needed to develop Pascal applications. + kdevperlsupport/ — provides Project and Help menu entries needed to develop Perl scripts. + kdevphpsupport/ — contains UI and PHP function definition files needed to develop PHP scripts. + kdevpythonsupport/ — provides Build and Help menu entries and according tool bar icons needed to develop Python scripts. + kdevrubysupport/ — provides Build menu entries and according tool bar icons needed to develop Ruby scripts. + kdevscriptproject/ — provides th UI definitions needed to develop custom projects. Currently (version 3.1.0) unused. + kdevsqlsupport/ — provides th UI definitions needed to develop SQL projects. Currently (version 3.1.0) unused. @@ -212,7 +212,7 @@ All information about user defined settings is kept in two subdirectories of Application Specific Configuration -Any user changes to the &tdevelop; Default Configuration settings as well as user specific settings which are not kept in any of the Resource Configuration Files are found in tdev... subdirectories of the $TDEHOME/share/apps/ directory. +Any user changes to the &tdevelop; Default Configuration settings as well as user specific settings which are not kept in any of the Resource Configuration Files are found in kdev... subdirectories of the $TDEHOME/share/apps/ directory. Most of these configuration files are however used by various &tdevelop; plugins in order to provide some specific menu and/or toolbar entries. Thus they are of interest only in case something went really wrong with the user interface. @@ -223,30 +223,30 @@ In case the contents of these directories mirror those of the Default Configurat - tdevabbrev/ — contains files used by the Abbreviation Expansion plugin: + kdevabbrev/ — contains files used by the Abbreviation Expansion plugin: sources/ — currently empty; &tdevelop; uses the default keyword definition files for Expand Text commands. templates/ — contains the user modified template definition files used by the Expand Abbreviation command. - tdevabbrev.rc — provides the Expand Text and Expand Abbreviation entries in the Edit menu. + kdevabbrev.rc — provides the Expand Text and Expand Abbreviation entries in the Edit menu. - tdevappwizard/ — only provides the New Project... and Import Existing Project... entries in the Projects menu. The &appwizard; will use the default configuration settings for its actual works. + kdevappwizard/ — only provides the New Project... and Import Existing Project... entries in the Projects menu. The &appwizard; will use the default configuration settings for its actual works. - tdevastyle/ — provides the actual Reformat Source entry in the Edit menu. + kdevastyle/ — provides the actual Reformat Source entry in the Edit menu. - tdevautoproject/ — provides the actual entries in the Build menu and the Build Toolbar (TDevelop) toolbar. + kdevautoproject/ — provides the actual entries in the Build menu and the Build Toolbar (KDevelop) toolbar. - tdevclassview/ — provides the Class Inheritance Diagram entry in the Project menu and the class browser combo box in the Browser Toolbar by the Class View project plugin. + kdevclassview/ — provides the Class Inheritance Diagram entry in the Project menu and the class browser combo box in the Browser Toolbar by the Class View project plugin. - tdevcloser/ — provides the Close Selected Windows... entry in the Windows menu. + kdevcloser/ — provides the Close Selected Windows... entry in the Windows menu. - tdevcppsupport/ — holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the default configuration directory. See there for more detail. + kdevcppsupport/ — holds the acual configuration used by the &appwizard; to build C++ applications. The &appwizard; however uses its main bulk of configuration information directly from the default configuration directory. See there for more detail. newclass/ — contains the actual header and source templates from which the &appwizard; builds the according source files. @@ -255,22 +255,22 @@ In case the contents of these directories mirror those of the Default Configurat pcs/ — contains database files &tdevelop; uses build the actual Persistent Code Store (.pcs) file of a &kde; C++ project. - tdevcppsupport.rc — provides the Complete Text and Make Member entries fo the Edit menu, the Switch Header/Implementation entry for the View menu, and the New Class entry for the Project menu as well as a New Class icon for the Browser Toolbar. + kdevcppsupport.rc — provides the Complete Text and Make Member entries fo the Edit menu, the Switch Header/Implementation entry for the View menu, and the New Class entry for the Project menu as well as a New Class icon for the Browser Toolbar. - tdevctags/ — provides the CTags entry in the Tools menu for the CTags Frontend project plugin. + kdevctags/ — provides the CTags entry in the Tools menu for the CTags Frontend project plugin. - tdevdebugger/ — provides the Debug menu entries for the Debugger Frontend project plugin. + kdevdebugger/ — provides the Debug menu entries for the Debugger Frontend project plugin. - tdevdiff/ — provides the Difference Viewer entry in the Tools menu. + kdevdiff/ — provides the Difference Viewer entry in the Tools menu. - tdevdocumentation/ — contains the actual files used by the Documentation plugin in addition to the default configuration files. See there for more detail. - The directories in tdevdocumentation/ mainly hold actual bookkeeping information. The actually set up documentation files are kept in doc...pluginrc files in the $TDEHOME/share/config/ directory. + kdevdocumentation/ — contains the actual files used by the Documentation plugin in addition to the default configuration files. See there for more detail. + The directories in kdevdocumentation/ mainly hold actual bookkeeping information. The actually set up documentation files are kept in doc...pluginrc files in the $TDEHOME/share/config/ directory. bookmarks/ — maintains the entries in the Bookmarks tab of the &tdevelop; Documentation plugin. @@ -282,12 +282,12 @@ In case the contents of these directories mirror those of the Default Configurat search/ — contains files used by the htdig search tool which serves search calls from the Search tab of the Documentation plugin. - tdevpart_documentation.rc — provides the search related entries in the Help menu. + kdevpart_documentation.rc — provides the search related entries in the Help menu. - tdevdoxygen/ — provides the menu entries for the Doxygen Support project plugin. + kdevdoxygen/ — provides the menu entries for the Doxygen Support project plugin. tdevelop/ — contains some actual settings &tdevelop; uses for its basic setup: @@ -297,45 +297,45 @@ In case the contents of these directories mirror those of the Default Configurat - tdevfilecreate/ — contains files used by the New File Wizard: + kdevfilecreate/ — contains files used by the New File Wizard: file-templates/ — provides the actually used text contents to be put into the new source file of a given type. More file templates are found in the default configuration files directory. - tdevpart_filecreate.rc — provides the New entry in the File menu. + kdevpart_filecreate.rc — provides the New entry in the File menu. template-info.xml — contains descriptions of the available file types to be displayed in the New File tool view. - tdevfilter/ — provides the Execute Command... and Filter Selection Through Command... entries in the Tools menu used by the Shell Filtering and Insertion plugin. + kdevfilter/ — provides the Execute Command... and Filter Selection Through Command... entries in the Tools menu used by the Shell Filtering and Insertion plugin. - tdevfullscreen/ — provides the Full Screen Mode entry in the View menu and the according tool bar icon. + kdevfullscreen/ — provides the Full Screen Mode entry in the View menu and the according tool bar icon. - tdevgrepview/ — provides the Find in Files...entry in the Edit menu used by the Grep Frontend plugin. + kdevgrepview/ — provides the Find in Files...entry in the Edit menu used by the Grep Frontend plugin. - tdevoutputviews/ — provides the Next Error and Previous Error entries in the View menu. + kdevoutputviews/ — provides the Next Error and Previous Error entries in the View menu. - tdevpartexplorer/ — provides the Part Explorer entry in the Tools menu used by the Part Explorer Tool plugin. + kdevpartexplorer/ — provides the Part Explorer entry in the Tools menu used by the Part Explorer Tool plugin. - tdevquickopen/ — provides the Quick Open File.. entry in the File menu and the Quick Open Class... and Quick Open Method entries in the Tools menu used by the Quick Open project plugin. + kdevquickopen/ — provides the Quick Open File.. entry in the File menu and the Quick Open Class... and Quick Open Method entries in the Tools menu used by the Quick Open project plugin. - tdevregexptest/ — provides the Debug Regular Expression... entry in the Tools menu used by the Regular Expression Tester plugin. + kdevregexptest/ — provides the Debug Regular Expression... entry in the Tools menu used by the Regular Expression Tester plugin. - tdevreplace/ — provides the Find-Select-Replace... entry in the Edit menu used by the Replace Part plugin. + kdevreplace/ — provides the Find-Select-Replace... entry in the Edit menu used by the Replace Part plugin. - tdevtipofday/ —provides the Tip of the Day entry in the Help menu. The HTML-File containing the available tips is provided as a default configuration file only. + kdevtipofday/ —provides the Tip of the Day entry in the Help menu. The HTML-File containing the available tips is provided as a default configuration file only. - tdevtools/ — controls various menu entries ceated by Tools Menu and External Tools Menu settings provided by the Tools Menu Addition plugin. + kdevtools/ — controls various menu entries ceated by Tools Menu and External Tools Menu settings provided by the Tools Menu Addition plugin. - tdevvalgrind/ — provides the Valgrind Memory Leak Check and Profile with KCachegrind entries in the Debug menu used by the Valgrind Frontend plugin. + kdevvalgrind/ — provides the Valgrind Memory Leak Check and Profile with KCachegrind entries in the Debug menu used by the Valgrind Frontend plugin. @@ -348,35 +348,35 @@ In case the contents of these directories mirror those of the Default Configurat There are two groups of &tdevelop; configuration files in the $TDEHOME/share/config/ directory, distiguished by their surrounding character sequences: doc...pluginrc denotes files used by the documentation plugin. - tdev...rc denotes configuration files used by &tdevelop; itself and its available plugins. + kdev...rc denotes configuration files used by &tdevelop; itself and its available plugins. Configuration Files Used by &tdevelop; - tdevabbrevrc — holds the current state of the Abbreviations configuration provided by the Abbreviation Expansion plugin. + kdevabbrevrc — holds the current state of the Abbreviations configuration provided by the Abbreviation Expansion plugin. This only records whether the abbreviations will be used or not. The actual definitions of new abbreviations will go into the $TDEHOME/share/apps/kdevabbrev/templates/templates file. - tdevassistantrc — holds some configuration states specific of the stand-alone &tdevelop; Assistant documentation browser. + kdevassistantrc — holds some configuration states specific of the stand-alone &tdevelop; Assistant documentation browser. Most common configuration settings are shared with the &tdevelop; IDE tdeveloprc file. - tdevassistantuimode4rc — holds the current MDI configuration states (dock positions &etc;) of the stand-alone &tdevelop; Assistant documentation browser. + kdevassistantuimode4rc — holds the current MDI configuration states (dock positions &etc;) of the stand-alone &tdevelop; Assistant documentation browser. - tdevclassviewrc — holds the View Mode setting of the Classes class browser tab provided by the Class View project plugin. + kdevclassviewrc — holds the View Mode setting of the Classes class browser tab provided by the Class View project plugin. This is a global setting, although the Class View plugin may be disabled on a per project basis. Any change in this setting will be globally updated whenever the current project is closed and thus affect all subsequently loaded projects. - tdevcppsupportrc — holds some settings used to set up CPP source files. In particular you will find the settings made on the C++ Class Generator configuration dialog in here. - tdevdocumentationrc — holds actual settings the Documentation plugin uses. + kdevcppsupportrc — holds some settings used to set up CPP source files. In particular you will find the settings made on the C++ Class Generator configuration dialog in here. + kdevdocumentationrc — holds actual settings the Documentation plugin uses. tdeveloprc — holds the global settings the &tdevelop; IDE and the &tdevelop; Assistant stand-alone documentation browser will use. tdevelopuimode4rc — holds the current MDI configuration states (dock positions &etc;) of the &tdevelop; IDE. - tdevfileselectorrc — holds actual settings the File Selector plugin uses. - tdevfileviewrc — holds the actual filename color settings the CVS Integration (Cervisia) project plugin uses for display. - tdevfilterrc — holds actual settings the Shell Filtering and Insertion plugin uses. - tdevgrepviewrc — holds actual settings the Grep Frontend plugin uses. - tdevsnippetrc — holds actual settings the Code Snippets plugin uses. - tdevtoolsrc — holds actual settings the Tools Menu Addition plugin uses. + kdevfileselectorrc — holds actual settings the File Selector plugin uses. + kdevfileviewrc — holds the actual filename color settings the CVS Integration (Cervisia) project plugin uses for display. + kdevfilterrc — holds actual settings the Shell Filtering and Insertion plugin uses. + kdevgrepviewrc — holds actual settings the Grep Frontend plugin uses. + kdevsnippetrc — holds actual settings the Code Snippets plugin uses. + kdevtoolsrc — holds actual settings the Tools Menu Addition plugin uses. @@ -385,7 +385,7 @@ There are two groups of &tdevelop; configuration files in the the Filter plugin. +the Filter plugin. @@ -1840,10 +1840,10 @@ Configure Editor... Settings -Configure TDevelop... +Configure KDevelop... -Configure TDevelop... +Configure KDevelop... @@ -1866,7 +1866,7 @@ Configure TDevelop... Help -TDevelop Handbook +KDevelop Handbook View this document. @@ -1960,10 +1960,10 @@ Info Page... Help -About TDevelop... +About KDevelop... Display some brief information about -TDevelop's version number, authors and license agreement. +KDevelop's version number, authors and license agreement. diff --git a/doc/tdevelop/getting-started.docbook b/doc/tdevelop/getting-started.docbook index 39d7c4de..a805f393 100644 --- a/doc/tdevelop/getting-started.docbook +++ b/doc/tdevelop/getting-started.docbook @@ -77,7 +77,7 @@ already did switch to another user interface mode some items may not be there as described or will behave slightly different. If in doubt which user interface mode your &tdevelop; currently uses, check with the Settings Configure -TDevelop... User Interface +KDevelop... User Interface dialog. @@ -416,7 +416,7 @@ and plugged-in tools to extend the basic &IDE; capabilities. The The upper set of Tools menu entries will be provided by the editor plugin which is in use. You may select your favorite editor via Settings Configure -TDevelop... Editor. Once an +KDevelop... Editor. Once an editable document file is selected, the upper part of the Tools menu will provide advanced editing commands specific to the editor part in use. @@ -452,10 +452,10 @@ Also, you can configure shortcuts, toolbars, notifications, the editor and Help -Here you can open this TDevelop manual, look up terms in various +Here you can open this KDevelop manual, look up terms in various documentation files, open man pages (the traditional UNIX manual format) and info pages (the GNU manual format). Furthermore you can report bugs here or get -some info about your current TDevelop version and its authors. +some info about your current KDevelop version and its authors. @@ -497,7 +497,7 @@ different main purpose. actual work. More tools to work on that project will be available then. The actual number of tool views depends on the Plugin Tools being currently available to &tdevelop;. You will find more on this -topic in the Configuring TDevelop chapter. +topic in the Configuring KDevelop chapter. Currently, with no project open and the default number of plugin tools loaded, you will find the following tool views. Clicking on a tab will open @@ -627,7 +627,7 @@ adjusted. If you want to know more about &tdevelop; configuration, have a look at -the Configuring TDevelop chapter. +the Configuring KDevelop chapter. @@ -635,8 +635,8 @@ the Configuring TDevelop chapter. To configure &tdevelop;, click the Settings menu and select -Configure TDevelop.... The -Configure TDevelop dialog will pop up, showing the +Configure KDevelop.... The +Configure KDevelop dialog will pop up, showing the following General settings page to the right. @@ -770,7 +770,7 @@ mandatory that the KDELibs Apidocs were present when perform the identifier lookup examples later in this chapter, make sure that this documentation exists and is accessible to &tdevelop;. See Installing -TDevelop fore more detail. +KDevelop fore more detail. @@ -1127,7 +1127,7 @@ and hello.kdevses. Of particular importance in each project is the xxx.tdevelop (where xxx denotes the project -name) file. It is the main TDevelop 3 Project File and +name) file. It is the main KDevelop 3 Project File and needed if you later want load this project into the &IDE;. @@ -1789,7 +1789,7 @@ this behavior. Select Settings Configure -TDevelop... +KDevelop... In the left hand icon bar on the dialog popup click the User diff --git a/doc/tdevelop/index.docbook b/doc/tdevelop/index.docbook index 9e83802d..d412dc35 100644 --- a/doc/tdevelop/index.docbook +++ b/doc/tdevelop/index.docbook @@ -76,7 +76,7 @@ Entries which require special treatment are marked with comments starting with ' - &tdevelop; Handbook + &tdevelop; User Manual 2006-06-19 &kdevrelease; diff --git a/doc/tdevelop/tdevdesigner.png b/doc/tdevelop/kdevdesigner.png similarity index 100% rename from doc/tdevelop/tdevdesigner.png rename to doc/tdevelop/kdevdesigner.png diff --git a/doc/tdevelop/nutshell.docbook b/doc/tdevelop/nutshell.docbook index 93db1506..ca0a4276 100644 --- a/doc/tdevelop/nutshell.docbook +++ b/doc/tdevelop/nutshell.docbook @@ -37,7 +37,7 @@ smaller tool view tabs in IDEAl Mode By default &tdevelop; starts with large text-based tool tip tabs around the work area. You may change this look to ⪚ save space in the &tdevelop; configuration dialog (Settings -Configure TDevelop... User +Configure KDevelop... User Interface). If you use an older &tdevelop; 3 version, this configuration dialog may not be available. To change the toolview tabs display manually, place a diff --git a/doc/tdevelop/plugin-tools.docbook b/doc/tdevelop/plugin-tools.docbook index 174767e2..ad10fb16 100644 --- a/doc/tdevelop/plugin-tools.docbook +++ b/doc/tdevelop/plugin-tools.docbook @@ -14,11 +14,11 @@ For example, in the file menu there is a Quick Open feature, but only if it's enabled in the Project - Project Options dialog. -Technically, plugins are based on the TDevPlugin class defined in +Technically, plugins are based on the KDevPlugin class defined in lib/interfaces/kdevplugin.h. The following is taken from a comment from there. -TDevPlugin is the base class for all TDevelop plugins. +KDevPlugin is the base class for all TDevelop plugins. A plugin is a component which is loaded into TDevelop shell at startup or by request. A plugin has a scope that can be either: @@ -32,7 +32,7 @@ A plugin has a scope that can be either: are not selectable by user in plugin configuration pages. Global plugins are plugins which require only shell to be loaded and do not operate on -TDevProject interface and/or do not use project wide information. +KDevProject interface and/or do not use project wide information. For example, the uimode plugin allows a developer to select which user interface they wish to use. @@ -43,13 +43,13 @@ The Automake Manager, for example, only needs to be active when an Automake base As stated above, core plugins cannot be disabled. Global plugins can be enabled/disabled in Settings -Configure TDevelop... +Configure KDevelop... under Plugins. Project plugins can be enabled/disabled in Project Project Options... under Plugins. -Active plugins can have many effects on TDevelop. +Active plugins can have many effects on KDevelop. Depending on their function, they may add extra menus, extra menu items, extra tool buttons, etc. @@ -67,13 +67,13 @@ it is because the plugin authors made them this way. Scope: Core - + Application Wizard Application Wizard - + Difference Viewer Difference Viewer - + FileCreate FileCreate @@ -85,7 +85,7 @@ it is because the plugin authors made them this way. User-Interface Selection Provides a dialog for UI-mode selection. - + VCSManager Version Control System Manager @@ -95,13 +95,13 @@ it is because the plugin authors made them this way. Abbreviation Expansion Provides support for customizable abbreviations - short words which expand into commonly needed code structures. - + Documentation The Documentation plugin offers browsing and searching in local and online documentation with support for multiple documentation systems. FileList Provides a list of all currently open files. (Handy when the tab bar is not quite wide enough.) - + File Selector Powerful network transparent file browser utility. @@ -109,14 +109,14 @@ it is because the plugin authors made them this way. Provides a way of manipulating editor text using commandline tools. Appears in the Tools menu. Grep Frontend -Integrates "find|grep" in TDevelop - allows fast searching of multiple files using patterns or regular expressions. +Integrates "find|grep" in KDevelop - allows fast searching of multiple files using patterns or regular expressions. Embedded Konsole -This plugin gives TDevelop an embedded konsole for quick and easy command line access. +This plugin gives KDevelop an embedded konsole for quick and easy command line access. "Open with" Menu Addon -This plugin provides additional "open" alternatives for various context menus in TDevelop. - +This plugin provides additional "open" alternatives for various context menus in KDevelop. + Part Explorer Tool A Graphical tool for performing TDETrader-like queries about registered services @@ -127,7 +127,7 @@ it is because the plugin authors made them this way. This plugin is an interactive projectwide "Search and Replace" tool. Search using string or regexp matching, and select the replacements to be made from a preview before the action is finalized. When loaded it appears in the Edit menu. Scripting -The Scripting plugin offers KScript based scripting of the TDevelop application +The Scripting plugin offers KScript based scripting of the KDevelop application Code Snippets This plugin allows you to store code snippets and add them to your code @@ -242,13 +242,13 @@ templates than for &Java;. The set of code templates is configurable. If the plugin is enabled, you can see which ones are available in the Settings -Configure TDevelop... +Configure KDevelop... dialog under Abbreviations. - + The <command>filter</command> Plugin filter diff --git a/doc/tdevelop/project-advanced.docbook b/doc/tdevelop/project-advanced.docbook index 81c0e4a6..a87b1658 100644 --- a/doc/tdevelop/project-advanced.docbook +++ b/doc/tdevelop/project-advanced.docbook @@ -42,10 +42,10 @@ -Converting Old TDevelop Project Files +Converting Old KDevelop Project Files -&tdevelop; allows you to open old TDevelop 2.x project files and convert them to &tdevelop; files. To do so go to Open Project... and select TDevelop 2 project files in the Filter:. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a &tdevelop; project file. +&tdevelop; allows you to open old KDevelop 2.x project files and convert them to &tdevelop; files. To do so go to Open Project... and select KDevelop 2 project files in the Filter:. Then select project file you want to open. The project gets converted to &tdevelop; and saved as a &tdevelop; project file. diff --git a/doc/tdevelop/setup.docbook b/doc/tdevelop/setup.docbook index 2c448945..0c078a3b 100644 --- a/doc/tdevelop/setup.docbook +++ b/doc/tdevelop/setup.docbook @@ -271,14 +271,14 @@ This let you choose the way you want .ui files to be displa This uses &tdevelop; own designer embedded within &tdevelop; Run &tdevelop;'s designer as a separate application - The TDevDesigner application will be run separately in its own window. + The KDevDesigner application will be run separately in its own window. - + - TDevDesigner in its own window + KDevDesigner in its own window @@ -294,7 +294,7 @@ Run Qt Designer Terminal Emulation -You choose here which terminal you want to be integrated within TDevelop. +You choose here which terminal you want to be integrated within KDevelop. @@ -349,7 +349,7 @@ A typical example of this user interface mode is Borland Delphi 6.0. -To switch the user interface mode select Settings Configure &tdevelop;... from the menus. The Customize TDevelop dialog will pop up, where you have to select User Interface in the left hand tree. This will display the following settings dialog to the right. +To switch the user interface mode select Settings Configure &tdevelop;... from the menus. The Customize KDevelop dialog will pop up, where you have to select User Interface in the left hand tree. This will display the following settings dialog to the right. @@ -524,7 +524,7 @@ The active toolview window must be shown fixed (non-overlap mode), sharing the w Selecting an Editor -&tdevelop; allows you to select your favorite text editor tool. Mark the Editor entry in the left hand side selections tree of the Configure TDevelop window. The following dialog will be displayed to the right. +&tdevelop; allows you to select your favorite text editor tool. Mark the Editor entry in the left hand side selections tree of the Configure KDevelop window. The following dialog will be displayed to the right. @@ -568,7 +568,7 @@ Changing the editor will not effect already open files. There are two possibilit -TDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed. +KDevelop lets you use editor interfaces which have registered with &kde; and that provide a KatePart interface. If you miss one one of the selections shown above check your &kde; installation if the corresponding KPart was correctly installed. What to do if the file has been changed externally: @@ -663,7 +663,7 @@ The reformat source feature is currently available for C, C++, and &Java; only. -To set up a specific format style, select Settings Configure &tdevelop;.. from the menubar. The Customize TDevelop dialog will pop up, where you have to select Source Formatter in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a General Formatting Setup, a Indentation Style Setup, and a Other Formatting Setup. +To set up a specific format style, select Settings Configure &tdevelop;.. from the menubar. The Customize KDevelop dialog will pop up, where you have to select Source Formatter in the left hand tree. This will display a series of three settings dialog tabs to the right, namely a General Formatting Setup, a Indentation Style Setup, and a Other Formatting Setup. @@ -997,7 +997,7 @@ split a long line apart. For C/C++ code this can be controlled here. Setting Up the Code Snippets Tool -When editing in &tdevelop; you can store often used parts of code as Code Snippets. To configure the capabilities of the code snippets part select Settings Configure &tdevelop;.. from the menubar. The Customize TDevelop dialog will pop up, where you have to select Code Snippets in the left hand tree. This will show the following dialog in the right hand side. +When editing in &tdevelop; you can store often used parts of code as Code Snippets. To configure the capabilities of the code snippets part select Settings Configure &tdevelop;.. from the menubar. The Customize KDevelop dialog will pop up, where you have to select Code Snippets in the left hand tree. This will show the following dialog in the right hand side. @@ -1089,7 +1089,7 @@ system. The behaviour of the File Selector can be highly configured. Select Settings Configure &tdevelop;.. from the -menubar. The Customize TDevelop dialog will pop up, +menubar. The Customize KDevelop dialog will pop up, where you have to select File Selector in the left hand tree. This will show the following dialog in the right hand side. @@ -1330,7 +1330,7 @@ If &tdevelop; was automatically restarted by the &kde; session manager the chang -You may set up contents and behaviour of the various parts of this documentation window if you select Settings Configure &tdevelop;.. from the menubar. The Customize TDevelop dialog will pop up, where you have to select Documentation in the left hand window. +You may set up contents and behaviour of the various parts of this documentation window if you select Settings Configure &tdevelop;.. from the menubar. The Customize KDevelop dialog will pop up, where you have to select Documentation in the left hand window. @@ -1662,10 +1662,10 @@ You must put the &API; of your current project into this Doxygen Docum -Handling Structured Documentation (TDevelopTOC Files) +Handling Structured Documentation (KDevelopTOC Files) -The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the TDevelopTOC Documentation Collection page. +The main bulk of the &tdevelop; documentation facility provides immediate access to structured documentation, local as well as remote ones. You can configure this on the KDevelopTOC Documentation Collection page. @@ -1674,17 +1674,17 @@ The main bulk of the &tdevelop; documentation facility provides immediate access - Providing TDevelopTOC structured documentation access + Providing KDevelopTOC structured documentation access -&tdevelop; comes with a bunch of predefined TDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the TOC check box in the setup table. +&tdevelop; comes with a bunch of predefined KDevelopTOC files which are automatically entered in the table at installation time. To keep the display manageable only the most often used will initially be marked for display. If you want to see another documentation, mark the TOC check box in the setup table. -TDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a .toc file can have an index manually defined, using the <index> tag. Thus the Index check box will be enabled ony when &tdevelop; finds an <index> tag in the .toc file. (For more detail see the description below in the &tdevelop; TOC Files section.) +KDevelopTOC files cannot be indexed to perform a full text search because they usually point to a remote location. On the other hand, such a .toc file can have an index manually defined, using the <index> tag. Thus the Index check box will be enabled ony when &tdevelop; finds an <index> tag in the .toc file. (For more detail see the description below in the &tdevelop; TOC Files section.) The Search check box in the setup table will alway be disabled. @@ -1720,7 +1720,7 @@ Such structured access is made possible through the use of special table Standard Directory of &tdevelop; TOC Files -When &tdevelop; was installed usually a series of predefined .toc files has been put into the $TDEDIR/share/apps/tdevdocumentation/tocs directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility. +When &tdevelop; was installed usually a series of predefined .toc files has been put into the $TDEDIR/share/apps/kdevdocumentation/tocs directory. These are fairly simple, structured text files. You may look at them using a text editor or other text display facility. diff --git a/doc/tdevelop/survey-manual.docbook b/doc/tdevelop/survey-manual.docbook index 93c1fd63..0bd59c8d 100644 --- a/doc/tdevelop/survey-manual.docbook +++ b/doc/tdevelop/survey-manual.docbook @@ -198,7 +198,7 @@ necessary and why you need an &IDE;. --> -TDevelop User Interface Mode Examples +KDevelop User Interface Mode Examples Shows user interface modes. diff --git a/doc/tdevelop/tdevelop-install.docbook b/doc/tdevelop/tdevelop-install.docbook index 663d9d08..14f7236b 100644 --- a/doc/tdevelop/tdevelop-install.docbook +++ b/doc/tdevelop/tdevelop-install.docbook @@ -699,7 +699,7 @@ The tdebuildsycoca command does not run from within the root. API is the short form of Application Program Interface. Actually such an API cotains a series of descriptions (&ie; calling conventions) by which an application program can access the operating system and other services. In our context, however, a broader definition was adopted. The API of a &kde; or &Qt; application is an abstract of the classes and methods interfaces, a synopsis to be used like a dictionary to navigate the sources. -There is a version of the most current API available at the TDevelop-Home website. It will be automatically updated every 24 hours so you can keep up. +There is a version of the most current API available at the KDevelop-Home website. It will be automatically updated every 24 hours so you can keep up. Alas, this version is best used read-only over the internet. If you do not always have internet access you may as well build your own API documentation from the &tdevelop; sources. To do so, you must tell the automake system where to find the KDELIBS API in your system. This is accomplished by the special option in the configure command when you prepare to compile the &tdevelop; sources: diff --git a/doc/tdevelop/tdevelop-scripting.docbook b/doc/tdevelop/tdevelop-scripting.docbook index 1cb8a294..1b722f2d 100644 --- a/doc/tdevelop/tdevelop-scripting.docbook +++ b/doc/tdevelop/tdevelop-scripting.docbook @@ -7,12 +7,12 @@ -Using Scripts in TDevelop +Using Scripts in KDevelop Running Scripts - To access a script that is available to &tdevelop; use the ToolsScripts menu. If there there is no such menu item then there are no installed scripts available to TDevelop. + To access a script that is available to &tdevelop; use the ToolsScripts menu. If there there is no such menu item then there are no installed scripts available to KDevelop. diff --git a/doc/tdevelop/tdevelop-survey.docbook b/doc/tdevelop/tdevelop-survey.docbook index 7aca28a9..0f117958 100644 --- a/doc/tdevelop/tdevelop-survey.docbook +++ b/doc/tdevelop/tdevelop-survey.docbook @@ -145,7 +145,7 @@ switch UI modes -To switch the user interface mode select Settings Configure TDevelop... from the menus. The Customize TDevelop dialog will pop up, where you have to select User Interface in the left hand tree. This will display the settings page shown below. +To switch the user interface mode select Settings Configure KDevelop... from the menus. The Customize KDevelop dialog will pop up, where you have to select User Interface in the left hand tree. This will display the settings page shown below. diff --git a/editors/editor-chooser/CMakeLists.txt b/editors/editor-chooser/CMakeLists.txt index c3d37efb..90d6d070 100644 --- a/editors/editor-chooser/CMakeLists.txt +++ b/editors/editor-chooser/CMakeLists.txt @@ -24,12 +24,12 @@ link_directories( ##### other data ################################ -install( FILES tdeveditorchooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdeveditorchooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdeveditorchooser (module) ############# +##### libkdeveditorchooser (module) ############# -tde_add_kpart( libtdeveditorchooser AUTOMOC +tde_add_kpart( libkdeveditorchooser AUTOMOC SOURCES editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp LINK tdevelop-shared diff --git a/editors/editor-chooser/Makefile.am b/editors/editor-chooser/Makefile.am index 7b12d2db..f95ca61c 100644 --- a/editors/editor-chooser/Makefile.am +++ b/editors/editor-chooser/Makefile.am @@ -1,13 +1,13 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdeveditorchooser.la -libtdeveditorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdeveditorchooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdeveditorchooser.la +libkdeveditorchooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdeveditorchooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdeveditorchooser_la_SOURCES = editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp +libkdeveditorchooser_la_SOURCES = editorchooser_part.cpp editchooser.ui editorchooser_widget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdeveditorchooser.desktop +service_DATA = kdeveditorchooser.desktop diff --git a/editors/editor-chooser/editorchooser_part.cpp b/editors/editor-chooser/editorchooser_part.cpp index 33f9cb0e..a9a4339a 100644 --- a/editors/editor-chooser/editorchooser_part.cpp +++ b/editors/editor-chooser/editorchooser_part.cpp @@ -4,20 +4,20 @@ #include #include #include -#include +#include -#include -#include +#include +#include #include "editorchooser_part.h" #include "editorchooser_widget.h" -typedef TDevGenericFactory EditorChooserFactory; -static const TDevPluginInfo data("tdeveditorchooser"); -K_EXPORT_COMPONENT_FACTORY( libtdeveditorchooser, EditorChooserFactory( data ) ) +typedef KDevGenericFactory EditorChooserFactory; +static const KDevPluginInfo data("kdeveditorchooser"); +K_EXPORT_COMPONENT_FACTORY( libkdeveditorchooser, EditorChooserFactory( data ) ) EditorChooserPart::EditorChooserPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "EditorChooserPart") + : KDevPlugin(&data, parent, name ? name : "EditorChooserPart") { setInstance(EditorChooserFactory::instance()); diff --git a/editors/editor-chooser/editorchooser_part.h b/editors/editor-chooser/editorchooser_part.h index ab892677..d7a9dbd1 100644 --- a/editors/editor-chooser/editorchooser_part.h +++ b/editors/editor-chooser/editorchooser_part.h @@ -3,17 +3,17 @@ */ -#ifndef __TDEVPART_EDITORCHOOSER_H__ -#define __TDEVPART_EDITORCHOOSER_H__ +#ifndef __KDEVPART_EDITORCHOOSER_H__ +#define __KDEVPART_EDITORCHOOSER_H__ class KDialogBase; -#include +#include -class EditorChooserPart : public TDevPlugin +class EditorChooserPart : public KDevPlugin { Q_OBJECT diff --git a/editors/editor-chooser/tdeveditorchooser.desktop b/editors/editor-chooser/kdeveditorchooser.desktop similarity index 98% rename from editors/editor-chooser/tdeveditorchooser.desktop rename to editors/editor-chooser/kdeveditorchooser.desktop index f56f0416..94f06903 100644 --- a/editors/editor-chooser/tdeveditorchooser.desktop +++ b/editors/editor-chooser/kdeveditorchooser.desktop @@ -37,14 +37,14 @@ Comment[tg]=Ба ихтиёр гузоштани гуфтугӯи интихоб Comment[tr]=Düzenleyici seçimi için bir pencere sağlar Comment[zh_CN]=提供编辑器选择对话框 Comment[zh_TW]=提供對話框以編輯選擇。 -Name=TDevEditorChooser +Name=KDevEditorChooser Name[da]=TDevelop Editorvælger Name[de]=Editor-Auswahl (TDevelop) Name[hi]=के-डेव-एडिटर-चूसर Name[nds]=TDevelop-Editorutwahl Name[ne]=केडीई विकास सम्पादक छनोटकर्ता Name[pl]=KDevWybórEdytora -Name[sk]=TDevEditorVolič +Name[sk]=KDevEditorVolič Name[sv]=TDevelop editorväljare Name[ta]=கெடெவ் தொகுப்பாளர் தேர்வாளர் Name[tg]=KDevМуҳаррирИнтихобкунанда @@ -85,7 +85,7 @@ GenericName[zh_CN]=编辑器选择 GenericName[zh_TW]=編輯器選擇 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdeveditorchooser +X-TDE-Library=libkdeveditorchooser X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=EditorChooser diff --git a/embedded/visualboyadvance/CMakeLists.txt b/embedded/visualboyadvance/CMakeLists.txt index cd281f67..be7cf42f 100644 --- a/embedded/visualboyadvance/CMakeLists.txt +++ b/embedded/visualboyadvance/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories( ) -##### tdevvisualboyadvance (module) ############# +##### kdevvisualboyadvance (module) ############# -tde_add_kpart( libtdevvisualboyadvance AUTOMOC +tde_add_kpart( libkdevvisualboyadvance AUTOMOC SOURCES visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp LINK tdevelop-shared @@ -36,11 +36,11 @@ tde_add_kpart( libtdevvisualboyadvance AUTOMOC ##### other data ################################ install( - FILES tdevvisualboyadvance.desktop + FILES kdevvisualboyadvance.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( - FILES tdevpart_visualboyadvance.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevvisualboyadvance + FILES kdevpart_visualboyadvance.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevvisualboyadvance ) diff --git a/embedded/visualboyadvance/Makefile.am b/embedded/visualboyadvance/Makefile.am index 16fac82e..a866fd79 100644 --- a/embedded/visualboyadvance/Makefile.am +++ b/embedded/visualboyadvance/Makefile.am @@ -1,17 +1,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevvisualboyadvance.la -libtdevvisualboyadvance_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevvisualboyadvance_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevvisualboyadvance.la +libkdevvisualboyadvance_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevvisualboyadvance_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevvisualboyadvance_la_SOURCES = visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp +libkdevvisualboyadvance_la_SOURCES = visualboyadvance_part.cpp vbaconfigwidgetbase.ui vbaconfigwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevvisualboyadvance.desktop +service_DATA = kdevvisualboyadvance.desktop -rcdir = $(kde_datadir)/tdevvisualboyadvance -rc_DATA = tdevpart_visualboyadvance.rc +rcdir = $(kde_datadir)/kdevvisualboyadvance +rc_DATA = kdevpart_visualboyadvance.rc diff --git a/embedded/visualboyadvance/tdevpart_visualboyadvance.rc b/embedded/visualboyadvance/kdevpart_visualboyadvance.rc similarity index 100% rename from embedded/visualboyadvance/tdevpart_visualboyadvance.rc rename to embedded/visualboyadvance/kdevpart_visualboyadvance.rc diff --git a/embedded/visualboyadvance/tdevvisualboyadvance.desktop b/embedded/visualboyadvance/kdevvisualboyadvance.desktop similarity index 99% rename from embedded/visualboyadvance/tdevvisualboyadvance.desktop rename to embedded/visualboyadvance/kdevvisualboyadvance.desktop index a50ec24f..292fe6de 100644 --- a/embedded/visualboyadvance/tdevvisualboyadvance.desktop +++ b/embedded/visualboyadvance/kdevvisualboyadvance.desktop @@ -79,7 +79,7 @@ GenericName[zh_CN]=VisualBoyAdvance 支持 GenericName[zh_TW]=VisualBoyAdvance 支援 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevvisualboyadvance +X-TDE-Library=libkdevvisualboyadvance X-TDevelop-Version=5 X-TDevelop-Scope=Project Keywords=GBA diff --git a/embedded/visualboyadvance/visualboyadvance_part.cpp b/embedded/visualboyadvance/visualboyadvance_part.cpp index a3b842f4..873cd01d 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.cpp +++ b/embedded/visualboyadvance/visualboyadvance_part.cpp @@ -4,30 +4,30 @@ #include #include -#include +#include #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevappfrontend.h" #include "domutil.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "vbaconfigwidget.h" using namespace VisualBoyAdvance; -typedef TDevGenericFactory VisualBoyAdvanceFactory; -static const TDevPluginInfo data("tdevvisualboyadvance"); -K_EXPORT_COMPONENT_FACTORY( libtdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) +typedef KDevGenericFactory VisualBoyAdvanceFactory; +static const KDevPluginInfo data("kdevvisualboyadvance"); +K_EXPORT_COMPONENT_FACTORY( libkdevvisualboyadvance, VisualBoyAdvanceFactory( data ) ) VisualBoyAdvancePart::VisualBoyAdvancePart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name){ + : KDevPlugin(&data, parent, name){ setInstance(VisualBoyAdvanceFactory::instance()); - setXMLFile("tdevpart_visualboyadvance.rc"); + setXMLFile("kdevpart_visualboyadvance.rc"); TDEAction *action; action = new TDEAction( i18n("Execute Program"), "exec", Key_F9, @@ -44,7 +44,7 @@ VisualBoyAdvancePart::~VisualBoyAdvancePart() } void VisualBoyAdvancePart::slotExecute(){ - TDevProject* prj = project(); + KDevProject* prj = project(); TQDomDocument &doc = *projectDom(); TQString binary = DomUtil::readEntry(doc, "/kdevvisualadvance/binary"); TQString emulator = DomUtil::readEntry(doc, "/kdevvisualadvance/emulator"); @@ -62,7 +62,7 @@ void VisualBoyAdvancePart::slotExecute(){ program += prj->projectDirectory() + "/" + binary; - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, terminal); } diff --git a/embedded/visualboyadvance/visualboyadvance_part.h b/embedded/visualboyadvance/visualboyadvance_part.h index 17a2ade8..941e0ff2 100644 --- a/embedded/visualboyadvance/visualboyadvance_part.h +++ b/embedded/visualboyadvance/visualboyadvance_part.h @@ -3,15 +3,15 @@ */ -#ifndef __TDEVPART_VISUALBOYADVANCE_H__ -#define __TDEVPART_VISUALBOYADVANCE_H__ +#ifndef __KDEVPART_VISUALBOYADVANCE_H__ +#define __KDEVPART_VISUALBOYADVANCE_H__ #include -#include +#include #include namespace VisualBoyAdvance { - class VisualBoyAdvancePart : public TDevPlugin + class VisualBoyAdvancePart : public KDevPlugin { Q_OBJECT diff --git a/tdevassistant.desktop b/kdevassistant.desktop similarity index 99% rename from tdevassistant.desktop rename to kdevassistant.desktop index d4640788..0e8192cf 100644 --- a/tdevassistant.desktop +++ b/kdevassistant.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=tdevassistant %u +Exec=kdevassistant %u Icon=tdevelop DocPath=tdevelop/index.html Terminal=false diff --git a/tdevdesigner/AUTHORS b/kdevdesigner/AUTHORS similarity index 60% rename from tdevdesigner/AUTHORS rename to kdevdesigner/AUTHORS index 5ecf318c..40d295ec 100644 --- a/tdevdesigner/AUTHORS +++ b/kdevdesigner/AUTHORS @@ -1,4 +1,4 @@ -TDevDesigner: Alexander Dymo +KDevDesigner: Alexander Dymo Qt Designer Copyright: (C) 2000-2003 Trolltech AS All Rights Reserved diff --git a/tdevdesigner/CMakeLists.txt b/kdevdesigner/CMakeLists.txt similarity index 100% rename from tdevdesigner/CMakeLists.txt rename to kdevdesigner/CMakeLists.txt diff --git a/tdevdesigner/LICENSE.GPL b/kdevdesigner/LICENSE.GPL similarity index 100% rename from tdevdesigner/LICENSE.GPL rename to kdevdesigner/LICENSE.GPL diff --git a/tdevdesigner/Makefile.am b/kdevdesigner/Makefile.am similarity index 100% rename from tdevdesigner/Makefile.am rename to kdevdesigner/Makefile.am diff --git a/tdevdesigner/NEWS b/kdevdesigner/NEWS similarity index 100% rename from tdevdesigner/NEWS rename to kdevdesigner/NEWS diff --git a/tdevdesigner/README b/kdevdesigner/README similarity index 72% rename from tdevdesigner/README rename to kdevdesigner/README index 23675fdb..99b55648 100644 --- a/tdevdesigner/README +++ b/kdevdesigner/README @@ -1,25 +1,25 @@ -TDevDesigner is a port of Qt Designer (code taken from Qt 3.3 distribution) to KDE technologies: +KDevDesigner is a port of Qt Designer (code taken from Qt 3.3 distribution) to KDE technologies: 1) XML GUI 2) KParts 3) KFileDialog 4) TDEIconLoader -TDevDesigner consists of a part and a shell. +KDevDesigner consists of a part and a shell. Part can be used in Konqueror and KDevelop to edit and view ui files and projects. Shell loads a part with "in shell" argument so that the part can create projects and ui files. Other important notes: -TDevDesignerPart is Read/Write part which ignores readonly mode. +KDevDesignerPart is Read/Write part which ignores readonly mode. Designer Editor plugins are not loaded. Available in system designer plugins are loaded if possible (tested with Qt 3.3 version). -TDevDesignerPart integration: -TDevDesignerPart implements KInterfaceDesigner interface (defined in tdevelop/lib/external_interfaces). +KDevDesignerPart integration: +KDevDesignerPart implements KInterfaceDesigner interface (defined in tdevelop/lib/external_interfaces). WARNING: If you want to modify this code, try to introduce as few modifications to original Qt Designer code as possible. Write your own classes and wrappers instead. The goal is to ease syncronization between the port and original Qt Designer. -Feel free to modify tdevdesigner_part.h(cpp) though. +Feel free to modify kdevdesigner_part.h(cpp) though. FUTURE: Trolltech promises that Qt 4 will have easilly embeddable designer. If that happens, this port will be dropped for KDevelop 4. diff --git a/tdevdesigner/TODO b/kdevdesigner/TODO similarity index 100% rename from tdevdesigner/TODO rename to kdevdesigner/TODO diff --git a/tdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt similarity index 90% rename from tdevdesigner/designer/CMakeLists.txt rename to kdevdesigner/designer/CMakeLists.txt index c74d2977..4cdcea2b 100644 --- a/tdevdesigner/designer/CMakeLists.txt +++ b/kdevdesigner/designer/CMakeLists.txt @@ -14,7 +14,7 @@ add_definitions( -DDESIGNER -UQT_NO_ASCII_CAST ) include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} - ${CMAKE_SOURCE_DIR}/tdevdesigner/shared + ${CMAKE_SOURCE_DIR}/kdevdesigner/shared ${CMAKE_SOURCE_DIR}/lib/interfaces/external ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -28,17 +28,17 @@ link_directories( ##### other data ################################ install( FILES - tdevdesigner_part.desktop + kdevdesigner_part.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevdesigner_part.rc tdevdesigner_part_sh.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevdesignerpart ) + kdevdesigner_part.rc kdevdesigner_part_sh.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart ) add_subdirectory( pics ) -##### libtdevdesignerpart (module) ############## +##### libkdevdesignerpart (module) ############## set( SRCS about.ui dbconnection.ui gotolinedialog.ui @@ -53,7 +53,7 @@ set( SRCS editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp - tdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp + kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listeditor.ui pixmapcollectioneditor.ui listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp listvieweditor.ui @@ -98,10 +98,10 @@ tde_moc( SRCS ) -tde_add_kpart( libtdevdesignerpart AUTOMOC +tde_add_kpart( libkdevdesignerpart AUTOMOC SOURCES ${SRCS} LINK - tdevqui-static shared-static kinterfacedesigner-shared + kdevqui-static shared-static kinterfacedesigner-shared tdeio-shared tdeparts-shared tqassistantclient DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/tdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am similarity index 77% rename from tdevdesigner/designer/Makefile.am rename to kdevdesigner/designer/Makefile.am index b486e711..1857de19 100644 --- a/tdevdesigner/designer/Makefile.am +++ b/kdevdesigner/designer/Makefile.am @@ -2,20 +2,20 @@ SUBDIRS = pics AM_CXXFLAGS=-DDESIGNER KDE_CXXFLAGS=-UQT_NO_ASCII_CAST -INCLUDES = -I$(top_srcdir)/tdevdesigner/shared \ +INCLUDES = -I$(top_srcdir)/kdevdesigner/shared \ -I$(top_srcdir)/lib/interfaces/external $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevdesignerpart.la -libtdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -libtdevdesignerpart_la_LIBADD = \ - $(top_builddir)/tdevdesigner/uilib/libtdevqui.la $(top_builddir)/tdevdesigner/shared/libshared.la \ +kde_module_LTLIBRARIES = libkdevdesignerpart.la +libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) +libkdevdesignerpart_la_LIBADD = \ + $(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \ $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS) -libtdevdesignerpart_la_SOURCES = tdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp -partrcdir = $(kde_datadir)/tdevdesignerpart +libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp +partrcdir = $(kde_datadir)/kdevdesignerpart partdesktopdir = $(kde_servicesdir) -partdesktop_DATA = tdevdesigner_part.desktop -partrc_DATA = tdevdesigner_part.rc tdevdesigner_part_sh.rc -noinst_HEADERS = tdevdesigner_part.h designeraction.h myiconloader.h -picsdirdir = $(kde_datadir)/tdevdesignerpart/pics +partdesktop_DATA = kdevdesigner_part.desktop +partrc_DATA = kdevdesigner_part.rc kdevdesigner_part_sh.rc +noinst_HEADERS = kdevdesigner_part.h designeraction.h myiconloader.h +picsdirdir = $(kde_datadir)/kdevdesignerpart/pics KDE_OPTIONS=nofinal diff --git a/tdevdesigner/designer/about.ui b/kdevdesigner/designer/about.ui similarity index 100% rename from tdevdesigner/designer/about.ui rename to kdevdesigner/designer/about.ui diff --git a/tdevdesigner/designer/actiondnd.cpp b/kdevdesigner/designer/actiondnd.cpp similarity index 100% rename from tdevdesigner/designer/actiondnd.cpp rename to kdevdesigner/designer/actiondnd.cpp diff --git a/tdevdesigner/designer/actiondnd.h b/kdevdesigner/designer/actiondnd.h similarity index 100% rename from tdevdesigner/designer/actiondnd.h rename to kdevdesigner/designer/actiondnd.h diff --git a/tdevdesigner/designer/actioneditor.ui b/kdevdesigner/designer/actioneditor.ui similarity index 100% rename from tdevdesigner/designer/actioneditor.ui rename to kdevdesigner/designer/actioneditor.ui diff --git a/tdevdesigner/designer/actioneditorimpl.cpp b/kdevdesigner/designer/actioneditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/actioneditorimpl.cpp rename to kdevdesigner/designer/actioneditorimpl.cpp diff --git a/tdevdesigner/designer/actioneditorimpl.h b/kdevdesigner/designer/actioneditorimpl.h similarity index 100% rename from tdevdesigner/designer/actioneditorimpl.h rename to kdevdesigner/designer/actioneditorimpl.h diff --git a/tdevdesigner/designer/actionlistview.cpp b/kdevdesigner/designer/actionlistview.cpp similarity index 100% rename from tdevdesigner/designer/actionlistview.cpp rename to kdevdesigner/designer/actionlistview.cpp diff --git a/tdevdesigner/designer/actionlistview.h b/kdevdesigner/designer/actionlistview.h similarity index 100% rename from tdevdesigner/designer/actionlistview.h rename to kdevdesigner/designer/actionlistview.h diff --git a/tdevdesigner/designer/asciivalidator.cpp b/kdevdesigner/designer/asciivalidator.cpp similarity index 100% rename from tdevdesigner/designer/asciivalidator.cpp rename to kdevdesigner/designer/asciivalidator.cpp diff --git a/tdevdesigner/designer/asciivalidator.h b/kdevdesigner/designer/asciivalidator.h similarity index 100% rename from tdevdesigner/designer/asciivalidator.h rename to kdevdesigner/designer/asciivalidator.h diff --git a/tdevdesigner/designer/command.cpp b/kdevdesigner/designer/command.cpp similarity index 99% rename from tdevdesigner/designer/command.cpp rename to kdevdesigner/designer/command.cpp index cce10a34..b9b97827 100644 --- a/tdevdesigner/designer/command.cpp +++ b/kdevdesigner/designer/command.cpp @@ -56,7 +56,7 @@ #endif #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include diff --git a/tdevdesigner/designer/command.h b/kdevdesigner/designer/command.h similarity index 100% rename from tdevdesigner/designer/command.h rename to kdevdesigner/designer/command.h diff --git a/tdevdesigner/designer/configtoolboxdialog.ui b/kdevdesigner/designer/configtoolboxdialog.ui similarity index 100% rename from tdevdesigner/designer/configtoolboxdialog.ui rename to kdevdesigner/designer/configtoolboxdialog.ui diff --git a/tdevdesigner/designer/configtoolboxdialog.ui.h b/kdevdesigner/designer/configtoolboxdialog.ui.h similarity index 100% rename from tdevdesigner/designer/configtoolboxdialog.ui.h rename to kdevdesigner/designer/configtoolboxdialog.ui.h diff --git a/tdevdesigner/designer/connectiondialog.ui b/kdevdesigner/designer/connectiondialog.ui similarity index 100% rename from tdevdesigner/designer/connectiondialog.ui rename to kdevdesigner/designer/connectiondialog.ui diff --git a/tdevdesigner/designer/connectiondialog.ui.h b/kdevdesigner/designer/connectiondialog.ui.h similarity index 100% rename from tdevdesigner/designer/connectiondialog.ui.h rename to kdevdesigner/designer/connectiondialog.ui.h diff --git a/tdevdesigner/designer/connectionitems.cpp b/kdevdesigner/designer/connectionitems.cpp similarity index 100% rename from tdevdesigner/designer/connectionitems.cpp rename to kdevdesigner/designer/connectionitems.cpp diff --git a/tdevdesigner/designer/connectionitems.h b/kdevdesigner/designer/connectionitems.h similarity index 100% rename from tdevdesigner/designer/connectionitems.h rename to kdevdesigner/designer/connectionitems.h diff --git a/tdevdesigner/designer/connectiontable.cpp b/kdevdesigner/designer/connectiontable.cpp similarity index 100% rename from tdevdesigner/designer/connectiontable.cpp rename to kdevdesigner/designer/connectiontable.cpp diff --git a/tdevdesigner/designer/connectiontable.h b/kdevdesigner/designer/connectiontable.h similarity index 100% rename from tdevdesigner/designer/connectiontable.h rename to kdevdesigner/designer/connectiontable.h diff --git a/tdevdesigner/designer/createtemplate.ui b/kdevdesigner/designer/createtemplate.ui similarity index 100% rename from tdevdesigner/designer/createtemplate.ui rename to kdevdesigner/designer/createtemplate.ui diff --git a/tdevdesigner/designer/customwidgeteditor.ui b/kdevdesigner/designer/customwidgeteditor.ui similarity index 100% rename from tdevdesigner/designer/customwidgeteditor.ui rename to kdevdesigner/designer/customwidgeteditor.ui diff --git a/tdevdesigner/designer/customwidgeteditorimpl.cpp b/kdevdesigner/designer/customwidgeteditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/customwidgeteditorimpl.cpp rename to kdevdesigner/designer/customwidgeteditorimpl.cpp diff --git a/tdevdesigner/designer/customwidgeteditorimpl.h b/kdevdesigner/designer/customwidgeteditorimpl.h similarity index 100% rename from tdevdesigner/designer/customwidgeteditorimpl.h rename to kdevdesigner/designer/customwidgeteditorimpl.h diff --git a/tdevdesigner/designer/database.cpp b/kdevdesigner/designer/database.cpp similarity index 100% rename from tdevdesigner/designer/database.cpp rename to kdevdesigner/designer/database.cpp diff --git a/tdevdesigner/designer/database.h b/kdevdesigner/designer/database.h similarity index 100% rename from tdevdesigner/designer/database.h rename to kdevdesigner/designer/database.h diff --git a/tdevdesigner/designer/dbconnection.ui b/kdevdesigner/designer/dbconnection.ui similarity index 100% rename from tdevdesigner/designer/dbconnection.ui rename to kdevdesigner/designer/dbconnection.ui diff --git a/tdevdesigner/designer/dbconnectioneditor.ui b/kdevdesigner/designer/dbconnectioneditor.ui similarity index 100% rename from tdevdesigner/designer/dbconnectioneditor.ui rename to kdevdesigner/designer/dbconnectioneditor.ui diff --git a/tdevdesigner/designer/dbconnectionimpl.cpp b/kdevdesigner/designer/dbconnectionimpl.cpp similarity index 100% rename from tdevdesigner/designer/dbconnectionimpl.cpp rename to kdevdesigner/designer/dbconnectionimpl.cpp diff --git a/tdevdesigner/designer/dbconnectionimpl.h b/kdevdesigner/designer/dbconnectionimpl.h similarity index 100% rename from tdevdesigner/designer/dbconnectionimpl.h rename to kdevdesigner/designer/dbconnectionimpl.h diff --git a/tdevdesigner/designer/dbconnections.ui b/kdevdesigner/designer/dbconnections.ui similarity index 100% rename from tdevdesigner/designer/dbconnections.ui rename to kdevdesigner/designer/dbconnections.ui diff --git a/tdevdesigner/designer/dbconnectionsimpl.cpp b/kdevdesigner/designer/dbconnectionsimpl.cpp similarity index 100% rename from tdevdesigner/designer/dbconnectionsimpl.cpp rename to kdevdesigner/designer/dbconnectionsimpl.cpp diff --git a/tdevdesigner/designer/dbconnectionsimpl.h b/kdevdesigner/designer/dbconnectionsimpl.h similarity index 100% rename from tdevdesigner/designer/dbconnectionsimpl.h rename to kdevdesigner/designer/dbconnectionsimpl.h diff --git a/tdevdesigner/designer/defs.cpp b/kdevdesigner/designer/defs.cpp similarity index 100% rename from tdevdesigner/designer/defs.cpp rename to kdevdesigner/designer/defs.cpp diff --git a/tdevdesigner/designer/defs.h b/kdevdesigner/designer/defs.h similarity index 100% rename from tdevdesigner/designer/defs.h rename to kdevdesigner/designer/defs.h diff --git a/tdevdesigner/designer/designer_pch.h b/kdevdesigner/designer/designer_pch.h similarity index 100% rename from tdevdesigner/designer/designer_pch.h rename to kdevdesigner/designer/designer_pch.h diff --git a/tdevdesigner/designer/designeraction.cpp b/kdevdesigner/designer/designeraction.cpp similarity index 100% rename from tdevdesigner/designer/designeraction.cpp rename to kdevdesigner/designer/designeraction.cpp diff --git a/tdevdesigner/designer/designeraction.h b/kdevdesigner/designer/designeraction.h similarity index 100% rename from tdevdesigner/designer/designeraction.h rename to kdevdesigner/designer/designeraction.h diff --git a/tdevdesigner/designer/designerapp.cpp b/kdevdesigner/designer/designerapp.cpp similarity index 100% rename from tdevdesigner/designer/designerapp.cpp rename to kdevdesigner/designer/designerapp.cpp diff --git a/tdevdesigner/designer/designerapp.h b/kdevdesigner/designer/designerapp.h similarity index 100% rename from tdevdesigner/designer/designerapp.h rename to kdevdesigner/designer/designerapp.h diff --git a/tdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp similarity index 100% rename from tdevdesigner/designer/designerappiface.cpp rename to kdevdesigner/designer/designerappiface.cpp diff --git a/tdevdesigner/designer/designerappiface.h b/kdevdesigner/designer/designerappiface.h similarity index 100% rename from tdevdesigner/designer/designerappiface.h rename to kdevdesigner/designer/designerappiface.h diff --git a/tdevdesigner/designer/editfunctions.ui b/kdevdesigner/designer/editfunctions.ui similarity index 100% rename from tdevdesigner/designer/editfunctions.ui rename to kdevdesigner/designer/editfunctions.ui diff --git a/tdevdesigner/designer/editfunctionsimpl.cpp b/kdevdesigner/designer/editfunctionsimpl.cpp similarity index 98% rename from tdevdesigner/designer/editfunctionsimpl.cpp rename to kdevdesigner/designer/editfunctionsimpl.cpp index 78730c99..5681f00b 100644 --- a/tdevdesigner/designer/editfunctionsimpl.cpp +++ b/kdevdesigner/designer/editfunctionsimpl.cpp @@ -34,7 +34,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -61,7 +61,7 @@ EditFunctions::EditFunctions( TQWidget *parent, FormWindow *fw, bool justSlots ) for ( TQValueList::Iterator it = functionList.begin(); it != functionList.end(); ++it ) { TQListViewItem *i = new TQListViewItem( functionListView ); - i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) ); + i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setText( 0, (*it).function ); i->setText( 1, (*it).returnType ); i->setText( 2, (*it).specifier ); @@ -269,7 +269,7 @@ void EditFunctions::okClicked() void EditFunctions::functionAdd( const TQString &access, const TQString &type ) { TQListViewItem *i = new TQListViewItem( functionListView ); - i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) ); + i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setRenameEnabled( 0, TRUE ); i->setText( 1, "void" ); i->setText( 2, "virtual" ); @@ -507,7 +507,7 @@ void EditFunctions::displaySlots( bool justSlots ) continue; TQListViewItem *i = new TQListViewItem( functionListView ); functionIds.insert( i, (*it).id ); - i->setPixmap( 0, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()) ); + i->setPixmap( 0, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()) ); i->setText( 0, (*it).newName ); i->setText( 1, (*it).retTyp ); i->setText( 2, (*it).spec ); diff --git a/tdevdesigner/designer/editfunctionsimpl.h b/kdevdesigner/designer/editfunctionsimpl.h similarity index 100% rename from tdevdesigner/designer/editfunctionsimpl.h rename to kdevdesigner/designer/editfunctionsimpl.h diff --git a/tdevdesigner/designer/filechooser.cpp b/kdevdesigner/designer/filechooser.cpp similarity index 100% rename from tdevdesigner/designer/filechooser.cpp rename to kdevdesigner/designer/filechooser.cpp diff --git a/tdevdesigner/designer/filechooser.h b/kdevdesigner/designer/filechooser.h similarity index 100% rename from tdevdesigner/designer/filechooser.h rename to kdevdesigner/designer/filechooser.h diff --git a/tdevdesigner/designer/finddialog.ui b/kdevdesigner/designer/finddialog.ui similarity index 100% rename from tdevdesigner/designer/finddialog.ui rename to kdevdesigner/designer/finddialog.ui diff --git a/tdevdesigner/designer/finddialog.ui.h b/kdevdesigner/designer/finddialog.ui.h similarity index 100% rename from tdevdesigner/designer/finddialog.ui.h rename to kdevdesigner/designer/finddialog.ui.h diff --git a/tdevdesigner/designer/formfile.cpp b/kdevdesigner/designer/formfile.cpp similarity index 99% rename from tdevdesigner/designer/formfile.cpp rename to kdevdesigner/designer/formfile.cpp index ce04010e..4ba5b7c7 100644 --- a/tdevdesigner/designer/formfile.cpp +++ b/kdevdesigner/designer/formfile.cpp @@ -45,7 +45,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" static TQString make_func_pretty( const TQString &s ) { diff --git a/tdevdesigner/designer/formfile.h b/kdevdesigner/designer/formfile.h similarity index 100% rename from tdevdesigner/designer/formfile.h rename to kdevdesigner/designer/formfile.h diff --git a/tdevdesigner/designer/formsettings.ui b/kdevdesigner/designer/formsettings.ui similarity index 100% rename from tdevdesigner/designer/formsettings.ui rename to kdevdesigner/designer/formsettings.ui diff --git a/tdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp similarity index 100% rename from tdevdesigner/designer/formsettingsimpl.cpp rename to kdevdesigner/designer/formsettingsimpl.cpp diff --git a/tdevdesigner/designer/formsettingsimpl.h b/kdevdesigner/designer/formsettingsimpl.h similarity index 100% rename from tdevdesigner/designer/formsettingsimpl.h rename to kdevdesigner/designer/formsettingsimpl.h diff --git a/tdevdesigner/designer/formwindow.cpp b/kdevdesigner/designer/formwindow.cpp similarity index 99% rename from tdevdesigner/designer/formwindow.cpp rename to kdevdesigner/designer/formwindow.cpp index 8852eaa2..4e5bc09d 100644 --- a/tdevdesigner/designer/formwindow.cpp +++ b/kdevdesigner/designer/formwindow.cpp @@ -46,7 +46,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -192,7 +192,7 @@ void FormWindow::init() this, TQT_SIGNAL( undoRedoChanged( bool, bool, const TQString &, const TQString & ) ) ); propShowBlocked = FALSE; - setIcon( SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance()) ); + setIcon( SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); connect( &commands, TQT_SIGNAL( modificationChanged( bool ) ), this, TQT_SLOT( modificationChanged( bool ) ) ); @@ -372,7 +372,7 @@ void FormWindow::insertWidget() if ( !savePixmapInline() && currTool == WidgetDatabase::idFromClassName( "PixmapLabel" ) ) { // ### what to do for pixmaps in project TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that - pix.convertFromImage( SmallIcon( "designer_image.png" , TDevDesignerPartFactory::instance()).convertToImage() ); + pix.convertFromImage( SmallIcon( "designer_image.png" , KDevDesignerPartFactory::instance()).convertToImage() ); ( (TQLabel*)w )->setPixmap( pix ); } int id = WidgetDatabase::idFromClassName( WidgetFactory::classNameOf(TQT_TQOBJECT(w)) ); diff --git a/tdevdesigner/designer/formwindow.h b/kdevdesigner/designer/formwindow.h similarity index 100% rename from tdevdesigner/designer/formwindow.h rename to kdevdesigner/designer/formwindow.h diff --git a/tdevdesigner/designer/gotolinedialog.ui b/kdevdesigner/designer/gotolinedialog.ui similarity index 100% rename from tdevdesigner/designer/gotolinedialog.ui rename to kdevdesigner/designer/gotolinedialog.ui diff --git a/tdevdesigner/designer/gotolinedialog.ui.h b/kdevdesigner/designer/gotolinedialog.ui.h similarity index 100% rename from tdevdesigner/designer/gotolinedialog.ui.h rename to kdevdesigner/designer/gotolinedialog.ui.h diff --git a/tdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp similarity index 98% rename from tdevdesigner/designer/hierarchyview.cpp rename to kdevdesigner/designer/hierarchyview.cpp index 860897ff..c6433cd0 100644 --- a/tdevdesigner/designer/hierarchyview.cpp +++ b/kdevdesigner/designer/hierarchyview.cpp @@ -43,7 +43,7 @@ #include "menubareditor.h" #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -175,10 +175,10 @@ void HierarchyItem::cancelRename( int col ) HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects ) : TQListView( parent ), formWindow( fw ) { - DesignerFormPix = SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance()); - DesignerLayoutPix = SmallIcon( "designer_layout.png" , TDevDesignerPartFactory::instance()); - DesignerFolderPix = SmallIcon( "designer_folder.png" , TDevDesignerPartFactory::instance()); - DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()); + DesignerFormPix = SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()); + DesignerLayoutPix = SmallIcon( "designer_layout.png" , KDevDesignerPartFactory::instance()); + DesignerFolderPix = SmallIcon( "designer_folder.png" , KDevDesignerPartFactory::instance()); + DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); init_colors(); @@ -1047,16 +1047,16 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) if ( i->rtti() == HierarchyItem::FunctParent || i->rtti() == HierarchyItem::SlotParent || i->rtti() == HierarchyItem::VarParent ) { - menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT ); + menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT ); } else - menu.insertItem( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()), i18n( "New..." ), NEW ); + menu.insertItem( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()), i18n( "New..." ), NEW ); if ( i->rtti() == HierarchyItem::DefinitionParent || i->rtti() == HierarchyItem::Variable || i->rtti() == HierarchyItem::Definition ) { - menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT ); + menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Edit..." ), EDIT ); } if ( i->rtti() == HierarchyItem::Function || i->rtti() == HierarchyItem::Slot ) { if ( formWindow->project()->isCpp() ) - menu.insertItem( SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), i18n( "Properties" ), PROPS ); + menu.insertItem( SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), i18n( "Properties" ), PROPS ); if ( MetaDataBase::hasEditor( formWindow->project()->language() ) ) menu.insertItem( i18n( "Goto Implementation" ), GOIMPL ); insertDelete = TRUE; @@ -1065,7 +1065,7 @@ void FormDefinitionView::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) i->rtti() == HierarchyItem::Function || i->rtti() == HierarchyItem::Slot || i->rtti() == HierarchyItem::Definition ) { menu.insertSeparator(); - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), i18n( "Delete" ), DEL ); + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete" ), DEL ); } popupOpen = TRUE; int res = menu.exec( pos ); diff --git a/tdevdesigner/designer/hierarchyview.h b/kdevdesigner/designer/hierarchyview.h similarity index 100% rename from tdevdesigner/designer/hierarchyview.h rename to kdevdesigner/designer/hierarchyview.h diff --git a/tdevdesigner/designer/iconvieweditor.ui b/kdevdesigner/designer/iconvieweditor.ui similarity index 100% rename from tdevdesigner/designer/iconvieweditor.ui rename to kdevdesigner/designer/iconvieweditor.ui diff --git a/tdevdesigner/designer/iconvieweditorimpl.cpp b/kdevdesigner/designer/iconvieweditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/iconvieweditorimpl.cpp rename to kdevdesigner/designer/iconvieweditorimpl.cpp diff --git a/tdevdesigner/designer/iconvieweditorimpl.h b/kdevdesigner/designer/iconvieweditorimpl.h similarity index 100% rename from tdevdesigner/designer/iconvieweditorimpl.h rename to kdevdesigner/designer/iconvieweditorimpl.h diff --git a/tdevdesigner/designer/tdevdesigner_part.cpp b/kdevdesigner/designer/kdevdesigner_part.cpp similarity index 81% rename from tdevdesigner/designer/tdevdesigner_part.cpp rename to kdevdesigner/designer/kdevdesigner_part.cpp index def9aa7f..ac966d00 100644 --- a/tdevdesigner/designer/tdevdesigner_part.cpp +++ b/kdevdesigner/designer/kdevdesigner_part.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -40,12 +40,12 @@ #include "designeraction.h" #include "formwindow.h" -TDevDesignerPart::TDevDesignerPart( TQWidget *parentWidget, const char *// widgetName +KDevDesignerPart::KDevDesignerPart( TQWidget *parentWidget, const char *// widgetName , TQObject *parent, const char *name, const TQStringList &args ) : KInterfaceDesigner::Designer(parent, name) { - setInstance( TDevDesignerPartFactory::instance() ); + setInstance( KDevDesignerPartFactory::instance() ); m_widget = new MainWindow( this, true ); m_widget->reparent(parentWidget, TQPoint(0,0)); @@ -55,9 +55,9 @@ TDevDesignerPart::TDevDesignerPart( TQWidget *parentWidget, const char *// widge setupActions(); if (args.contains("in shell")) - setXMLFile("tdevdesigner_part_sh.rc"); + setXMLFile("kdevdesigner_part_sh.rc"); else - setXMLFile("tdevdesigner_part.rc"); + setXMLFile("kdevdesigner_part.rc"); setReadWrite(true); setModified(false); @@ -65,7 +65,7 @@ TDevDesignerPart::TDevDesignerPart( TQWidget *parentWidget, const char *// widge connect(m_widget, TQT_SIGNAL(formModified(bool )), this, TQT_SLOT(formModified(bool))); } -void TDevDesignerPart::setupDesignerWindow() +void KDevDesignerPart::setupDesignerWindow() { m_widget->menuBar()->hide(); m_widget->layoutToolBar->hide(); @@ -76,15 +76,15 @@ void TDevDesignerPart::setupDesignerWindow() static TQIconSet createPartIconSet( const TQString &name ) { - TQIconSet ic( BarIcon( "" + name, TDevDesignerPartFactory::instance() ) ); + TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); TQString prefix = "designer_"; int right = name.length() - prefix.length(); - ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), TDevDesignerPartFactory::instance() ), + ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ), TQIconSet::Small, TQIconSet::Disabled ); return ic; } -void TDevDesignerPart::setupActions( ) +void KDevDesignerPart::setupActions( ) { TDEAction *action; action = KStdAction::openNew(this, TQT_SLOT(fileNew()), actionCollection()); @@ -169,20 +169,20 @@ void TDevDesignerPart::setupActions( ) stateSync(action, m_widget->actionWindowPrevious); action = KStdAction::preferences(this, TQT_SLOT(editPreferences()), actionCollection()); - action->setText(i18n("Configure &TDevDesigner...")); + action->setText(i18n("Configure &KDevDesigner...")); stateSync(action, m_widget->actionEditPreferences); } -TDevDesignerPart::~TDevDesignerPart() +KDevDesignerPart::~KDevDesignerPart() { } -void TDevDesignerPart::setReadWrite(bool rw) +void KDevDesignerPart::setReadWrite(bool rw) { ReadWritePart::setReadWrite(rw); } -void TDevDesignerPart::setModified(bool modified) +void KDevDesignerPart::setModified(bool modified) { /* TDEAction *save = actionCollection()->action(KStdAction::stdName(KStdAction::Save)); if (!save) @@ -195,13 +195,13 @@ void TDevDesignerPart::setModified(bool modified) ReadWritePart::setModified(modified); } -bool TDevDesignerPart::openFile() +bool KDevDesignerPart::openFile() { m_widget->fileOpen("", "", m_file); return true; } -bool TDevDesignerPart::saveFile() +bool KDevDesignerPart::saveFile() { if (isReadWrite() == false) return false; @@ -209,7 +209,7 @@ bool TDevDesignerPart::saveFile() return true; } -void TDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) +void KDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) { if (!qaction) return; @@ -220,7 +220,7 @@ void TDevDesignerPart::stateSync( TDEAction * tdeaction, TQAction * qaction ) connect(ac, TQT_SIGNAL(actionEnabled(bool )), tdeaction, TQT_SLOT(setEnabled(bool ))); } -void TDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) +void KDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * action ) { if (!action) return; @@ -240,15 +240,15 @@ void TDevDesignerPart::setupToolsAction( TDERadioAction * toggle, TQAction * act #include #include -TDEInstance* TDevDesignerPartFactory::s_instance = 0L; -TDEAboutData* TDevDesignerPartFactory::s_about = 0L; +TDEInstance* KDevDesignerPartFactory::s_instance = 0L; +TDEAboutData* KDevDesignerPartFactory::s_about = 0L; -TDevDesignerPartFactory::TDevDesignerPartFactory() +KDevDesignerPartFactory::KDevDesignerPartFactory() : KParts::Factory() { } -TDevDesignerPartFactory::~TDevDesignerPartFactory() +KDevDesignerPartFactory::~KDevDesignerPartFactory() { delete s_instance; delete s_about; @@ -256,12 +256,12 @@ TDevDesignerPartFactory::~TDevDesignerPartFactory() s_instance = 0L; } -KParts::Part* TDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, +KParts::Part* KDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ) { // Create an instance of our Part - TDevDesignerPart* obj = new TDevDesignerPart( parentWidget, widgetName, parent, name, args ); + KDevDesignerPart* obj = new KDevDesignerPart( parentWidget, widgetName, parent, name, args ); // See if we are to be read-write or not if (TQCString(classname) == "KParts::ReadOnlyPart") @@ -270,11 +270,11 @@ KParts::Part* TDevDesignerPartFactory::createPartObject( TQWidget *parentWidget, return obj; } -TDEInstance* TDevDesignerPartFactory::instance() +TDEInstance* KDevDesignerPartFactory::instance() { if( !s_instance ) { - s_about = new TDEAboutData("tdevdesignerpart", I18N_NOOP("TDevDesignerPart"), "0.1"); + s_about = new TDEAboutData("kdevdesignerpart", I18N_NOOP("KDevDesignerPart"), "0.1"); s_about->addAuthor("Alexander Dymo", 0, "cloudtemple@mksat.net"); s_about->addAuthor("Trolltech AS", 0, "info@trolltech.com"); s_instance = new TDEInstance(s_about); @@ -284,15 +284,15 @@ TDEInstance* TDevDesignerPartFactory::instance() extern "C" { - void* init_libtdevdesignerpart() + void* init_libkdevdesignerpart() { - return new TDevDesignerPartFactory; + return new KDevDesignerPartFactory; } } //actions -void TDevDesignerPart::fileNew( ) +void KDevDesignerPart::fileNew( ) { if (!m_widget->actionNewFile) { @@ -302,167 +302,167 @@ void TDevDesignerPart::fileNew( ) m_widget->actionNewFile->activate(); } -void TDevDesignerPart::fileOpen() +void KDevDesignerPart::fileOpen() { m_widget->fileOpen(); } -void TDevDesignerPart::fileSaveAs() +void KDevDesignerPart::fileSaveAs() { m_widget->actionFileSaveAs->activate(); } -void TDevDesignerPart::fileClose( ) +void KDevDesignerPart::fileClose( ) { m_widget->actionFileClose->activate(); } -void TDevDesignerPart::fileCreateTemplate( ) +void KDevDesignerPart::fileCreateTemplate( ) { m_widget->fileCreateTemplate(); } -void TDevDesignerPart::editUndo( ) +void KDevDesignerPart::editUndo( ) { m_widget->actionEditUndo->activate(); } -void TDevDesignerPart::editRedo( ) +void KDevDesignerPart::editRedo( ) { m_widget->actionEditRedo->activate(); } -void TDevDesignerPart::editCut( ) +void KDevDesignerPart::editCut( ) { m_widget->actionEditCut->activate(); } -void TDevDesignerPart::editPaste( ) +void KDevDesignerPart::editPaste( ) { m_widget->actionEditPaste->activate(); } -void TDevDesignerPart::editCopy( ) +void KDevDesignerPart::editCopy( ) { m_widget->actionEditCopy->activate(); } -void TDevDesignerPart::editDelete( ) +void KDevDesignerPart::editDelete( ) { m_widget->actionEditDelete->activate(); } -void TDevDesignerPart::editSelectAll( ) +void KDevDesignerPart::editSelectAll( ) { m_widget->actionEditSelectAll->activate(); } -void TDevDesignerPart::editAccels( ) +void KDevDesignerPart::editAccels( ) { m_widget->actionEditAccels->activate(); } -void TDevDesignerPart::editFunctions( ) +void KDevDesignerPart::editFunctions( ) { m_widget->actionEditFunctions->activate(); } -void TDevDesignerPart::editConnections( ) +void KDevDesignerPart::editConnections( ) { m_widget->actionEditConnections->activate(); } -void TDevDesignerPart::editFormSettings( ) +void KDevDesignerPart::editFormSettings( ) { m_widget->actionEditFormSettings->activate(); } -void TDevDesignerPart::editPreferences( ) +void KDevDesignerPart::editPreferences( ) { m_widget->actionEditPreferences->activate(); } -void TDevDesignerPart::projectAddFile( ) +void KDevDesignerPart::projectAddFile( ) { m_widget->actionProjectAddFile->activate(); } -void TDevDesignerPart::projectImageCollection( ) +void KDevDesignerPart::projectImageCollection( ) { m_widget->actionEditPixmapCollection->activate(); } -void TDevDesignerPart::projectDatabaseCollections( ) +void KDevDesignerPart::projectDatabaseCollections( ) { m_widget->actionEditDatabaseConnections->activate(); } -void TDevDesignerPart::projectSettings( ) +void KDevDesignerPart::projectSettings( ) { m_widget->actionEditProjectSettings->activate(); } -void TDevDesignerPart::toolsConfigureToolbox( ) +void KDevDesignerPart::toolsConfigureToolbox( ) { m_widget->toolsConfigure(); } -void TDevDesignerPart::layoutAdjustSize( ) +void KDevDesignerPart::layoutAdjustSize( ) { m_widget->actionEditAdjustSize->activate(); } -void TDevDesignerPart::layoutHLayout( ) +void KDevDesignerPart::layoutHLayout( ) { m_widget->actionEditHLayout->activate(); } -void TDevDesignerPart::layoutVLayout( ) +void KDevDesignerPart::layoutVLayout( ) { m_widget->actionEditVLayout->activate(); } -void TDevDesignerPart::layoutGridLayout( ) +void KDevDesignerPart::layoutGridLayout( ) { m_widget->actionEditGridLayout->activate(); } -void TDevDesignerPart::layoutSplitHLayout( ) +void KDevDesignerPart::layoutSplitHLayout( ) { m_widget->actionEditSplitHorizontal->activate(); } -void TDevDesignerPart::layoutSplitVLayout( ) +void KDevDesignerPart::layoutSplitVLayout( ) { m_widget->actionEditSplitVertical->activate(); } -void TDevDesignerPart::layoutBreak( ) +void KDevDesignerPart::layoutBreak( ) { m_widget->actionEditBreakLayout->activate(); } -void TDevDesignerPart::windowPreview( ) +void KDevDesignerPart::windowPreview( ) { m_widget->actionPreview->activate(); } -void TDevDesignerPart::windowNext( ) +void KDevDesignerPart::windowNext( ) { m_widget->actionWindowNext->activate(); } -void TDevDesignerPart::windowPrev( ) +void KDevDesignerPart::windowPrev( ) { m_widget->actionWindowPrevious->activate(); } -void TDevDesignerPart::statusMessage( const TQString & msg ) +void KDevDesignerPart::statusMessage( const TQString & msg ) { emit setStatusBarText(msg); } -void TDevDesignerPart::setToggleActionChecked( bool b) +void KDevDesignerPart::setToggleActionChecked( bool b) { if (!sender()) return; @@ -484,7 +484,7 @@ void TDevDesignerPart::setToggleActionChecked( bool b) tdeaction->blockSignals(false); } -void TDevDesignerPart::setToggleActionOn( bool b ) +void KDevDesignerPart::setToggleActionOn( bool b ) { if (!sender()) return; @@ -500,33 +500,33 @@ void TDevDesignerPart::setToggleActionOn( bool b ) connect(qaction, TQT_SIGNAL(toggled(bool )), this, TQT_SLOT(setToggleActionChecked(bool ))); } -void TDevDesignerPart::openProject( const TQString & // projectFile +void KDevDesignerPart::openProject( const TQString & // projectFile ) { //TODO: implement return; } -KInterfaceDesigner::DesignerType TDevDesignerPart::designerType( ) +KInterfaceDesigner::DesignerType KDevDesignerPart::designerType( ) { return KInterfaceDesigner::TQtDesigner; } -void TDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitAddedFunction( const TQString & form, KInterfaceDesigner::Function func ) { - kdDebug() << "TDevDesignerPart::emitAddedFunction: form " << form << ", function: " << func.function << endl; + kdDebug() << "KDevDesignerPart::emitAddedFunction: form " << form << ", function: " << func.function << endl; emit addedFunction(designerType(), form, func); } -void TDevDesignerPart::emitRemovedFunction( const TQString & form, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitRemovedFunction( const TQString & form, KInterfaceDesigner::Function func ) { - kdDebug() << "TDevDesignerPart::emitRemovedFunction: form " << form << ", function: " << func.function << endl; + kdDebug() << "KDevDesignerPart::emitRemovedFunction: form " << form << ", function: " << func.function << endl; emit removedFunction(designerType(), form, func); } -void TDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func ) +void KDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesigner::Function oldFunc, KInterfaceDesigner::Function func ) { - kdDebug() << "TDevDesignerPart::emitEditedFunction: form " << form + kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << form << ", old function: " << oldFunc.function << ", function: " << func.function << endl; @@ -534,32 +534,32 @@ void TDevDesignerPart::emitEditedFunction( const TQString & form, KInterfaceDesi emit editedFunction(designerType(), form, oldFunc, func); } -void TDevDesignerPart::emitEditFunction(const TQString &formName, const TQString &functionName) +void KDevDesignerPart::emitEditFunction(const TQString &formName, const TQString &functionName) { - kdDebug() << "TDevDesignerPart::emitEditedFunction: form " << formName + kdDebug() << "KDevDesignerPart::emitEditedFunction: form " << formName << ", function: " << functionName << endl; emit editFunction(designerType(), formName, functionName); } -void TDevDesignerPart::formModified(bool b) +void KDevDesignerPart::formModified(bool b) { - kdDebug() << "TDevDesignerPart::formModified " << b << endl; + kdDebug() << "KDevDesignerPart::formModified " << b << endl; setModified(b); } -void TDevDesignerPart::emitEditSource(const TQString &formName) +void KDevDesignerPart::emitEditSource(const TQString &formName) { emit editSource(designerType(), formName); } -void TDevDesignerPart::emitNewStatus(const TQString &formName, int status) +void KDevDesignerPart::emitNewStatus(const TQString &formName, int status) { emit newStatus(formName, status); } -void TDevDesignerPart::toolsEditCustomWidgets( ) +void KDevDesignerPart::toolsEditCustomWidgets( ) { m_widget->toolsCustomWidget(); } -#include "tdevdesigner_part.moc" +#include "kdevdesigner_part.moc" diff --git a/tdevdesigner/designer/tdevdesigner_part.desktop b/kdevdesigner/designer/kdevdesigner_part.desktop similarity index 84% rename from tdevdesigner/designer/tdevdesigner_part.desktop rename to kdevdesigner/designer/kdevdesigner_part.desktop index 998d4f74..2928a8ad 100644 --- a/tdevdesigner/designer/tdevdesigner_part.desktop +++ b/kdevdesigner/designer/kdevdesigner_part.desktop @@ -1,7 +1,7 @@ [Desktop Entry] -Name=TDevDesignerPart +Name=KDevDesignerPart Name[da]=TDevelop Designer-part -Name[el]=ΤμήμαTDevDesigner +Name[el]=ΤμήμαKDevDesigner Name[nds]=Kdevelop-Makerkomponent Name[ne]=केडीई विकास डिजाइनर भाग Name[sv]=TDevelop designerdel @@ -10,7 +10,7 @@ Name[tg]=KDevҚисми дизайнгар Name[zh_TW]=TDevelop 設計元件 MimeType=application/x-designer ServiceTypes=KParts/ReadOnlyPart,KParts/ReadWritePart -X-TDE-Library=libtdevdesignerpart +X-TDE-Library=libkdevdesignerpart Type=Service InitialPreference=10 diff --git a/tdevdesigner/designer/tdevdesigner_part.h b/kdevdesigner/designer/kdevdesigner_part.h similarity index 92% rename from tdevdesigner/designer/tdevdesigner_part.h rename to kdevdesigner/designer/kdevdesigner_part.h index 3381da5a..3006c600 100644 --- a/tdevdesigner/designer/tdevdesigner_part.h +++ b/kdevdesigner/designer/kdevdesigner_part.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _TDEVDESIGNERPART_H_ -#define _TDEVDESIGNERPART_H_ +#ifndef _KDEVDESIGNERPART_H_ +#define _KDEVDESIGNERPART_H_ #include @@ -36,14 +36,14 @@ class TDEAction; class TQAction; class TDERadioAction; -class TDevDesignerPart : public KInterfaceDesigner::Designer +class KDevDesignerPart : public KInterfaceDesigner::Designer { Q_OBJECT public: - TDevDesignerPart(TQWidget *parentWidget, const char *widgetName, + KDevDesignerPart(TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const TQStringList &args); - virtual ~TDevDesignerPart(); + virtual ~KDevDesignerPart(); virtual void setReadWrite(bool rw); virtual void setModified(bool modified); @@ -128,13 +128,13 @@ private: class TDEInstance; class TDEAboutData; -class TDevDesignerPartFactory : public KParts::Factory +class KDevDesignerPartFactory : public KParts::Factory { Q_OBJECT public: - TDevDesignerPartFactory(); - virtual ~TDevDesignerPartFactory(); + KDevDesignerPartFactory(); + virtual ~KDevDesignerPartFactory(); virtual KParts::Part* createPartObject( TQWidget *parentWidget, const char *widgetName, TQObject *parent, const char *name, const char *classname, const TQStringList &args ); @@ -145,4 +145,4 @@ private: static TDEAboutData* s_about; }; -#endif // _TDEVDESIGNERPART_H_ +#endif // _KDEVDESIGNERPART_H_ diff --git a/tdevdesigner/designer/tdevdesigner_part.rc b/kdevdesigner/designer/kdevdesigner_part.rc similarity index 98% rename from tdevdesigner/designer/tdevdesigner_part.rc rename to kdevdesigner/designer/kdevdesigner_part.rc index 318a0761..71adcdc9 100644 --- a/tdevdesigner/designer/tdevdesigner_part.rc +++ b/kdevdesigner/designer/kdevdesigner_part.rc @@ -1,5 +1,5 @@ - + &File diff --git a/tdevdesigner/designer/tdevdesigner_part_sh.rc b/kdevdesigner/designer/kdevdesigner_part_sh.rc similarity index 98% rename from tdevdesigner/designer/tdevdesigner_part_sh.rc rename to kdevdesigner/designer/kdevdesigner_part_sh.rc index c0ec9d8a..eb6b503b 100644 --- a/tdevdesigner/designer/tdevdesigner_part_sh.rc +++ b/kdevdesigner/designer/kdevdesigner_part_sh.rc @@ -1,5 +1,5 @@ - + &File diff --git a/tdevdesigner/designer/layout.cpp b/kdevdesigner/designer/layout.cpp similarity index 100% rename from tdevdesigner/designer/layout.cpp rename to kdevdesigner/designer/layout.cpp diff --git a/tdevdesigner/designer/layout.h b/kdevdesigner/designer/layout.h similarity index 100% rename from tdevdesigner/designer/layout.h rename to kdevdesigner/designer/layout.h diff --git a/tdevdesigner/designer/listboxdnd.cpp b/kdevdesigner/designer/listboxdnd.cpp similarity index 100% rename from tdevdesigner/designer/listboxdnd.cpp rename to kdevdesigner/designer/listboxdnd.cpp diff --git a/tdevdesigner/designer/listboxdnd.h b/kdevdesigner/designer/listboxdnd.h similarity index 100% rename from tdevdesigner/designer/listboxdnd.h rename to kdevdesigner/designer/listboxdnd.h diff --git a/tdevdesigner/designer/listboxeditor.ui b/kdevdesigner/designer/listboxeditor.ui similarity index 100% rename from tdevdesigner/designer/listboxeditor.ui rename to kdevdesigner/designer/listboxeditor.ui diff --git a/tdevdesigner/designer/listboxeditorimpl.cpp b/kdevdesigner/designer/listboxeditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/listboxeditorimpl.cpp rename to kdevdesigner/designer/listboxeditorimpl.cpp diff --git a/tdevdesigner/designer/listboxeditorimpl.h b/kdevdesigner/designer/listboxeditorimpl.h similarity index 100% rename from tdevdesigner/designer/listboxeditorimpl.h rename to kdevdesigner/designer/listboxeditorimpl.h diff --git a/tdevdesigner/designer/listboxrename.cpp b/kdevdesigner/designer/listboxrename.cpp similarity index 100% rename from tdevdesigner/designer/listboxrename.cpp rename to kdevdesigner/designer/listboxrename.cpp diff --git a/tdevdesigner/designer/listboxrename.h b/kdevdesigner/designer/listboxrename.h similarity index 100% rename from tdevdesigner/designer/listboxrename.h rename to kdevdesigner/designer/listboxrename.h diff --git a/tdevdesigner/designer/listdnd.cpp b/kdevdesigner/designer/listdnd.cpp similarity index 100% rename from tdevdesigner/designer/listdnd.cpp rename to kdevdesigner/designer/listdnd.cpp diff --git a/tdevdesigner/designer/listdnd.h b/kdevdesigner/designer/listdnd.h similarity index 100% rename from tdevdesigner/designer/listdnd.h rename to kdevdesigner/designer/listdnd.h diff --git a/tdevdesigner/designer/listeditor.ui b/kdevdesigner/designer/listeditor.ui similarity index 100% rename from tdevdesigner/designer/listeditor.ui rename to kdevdesigner/designer/listeditor.ui diff --git a/tdevdesigner/designer/listeditor.ui.h b/kdevdesigner/designer/listeditor.ui.h similarity index 100% rename from tdevdesigner/designer/listeditor.ui.h rename to kdevdesigner/designer/listeditor.ui.h diff --git a/tdevdesigner/designer/listviewdnd.cpp b/kdevdesigner/designer/listviewdnd.cpp similarity index 100% rename from tdevdesigner/designer/listviewdnd.cpp rename to kdevdesigner/designer/listviewdnd.cpp diff --git a/tdevdesigner/designer/listviewdnd.h b/kdevdesigner/designer/listviewdnd.h similarity index 100% rename from tdevdesigner/designer/listviewdnd.h rename to kdevdesigner/designer/listviewdnd.h diff --git a/tdevdesigner/designer/listvieweditor.ui b/kdevdesigner/designer/listvieweditor.ui similarity index 100% rename from tdevdesigner/designer/listvieweditor.ui rename to kdevdesigner/designer/listvieweditor.ui diff --git a/tdevdesigner/designer/listvieweditorimpl.cpp b/kdevdesigner/designer/listvieweditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/listvieweditorimpl.cpp rename to kdevdesigner/designer/listvieweditorimpl.cpp diff --git a/tdevdesigner/designer/listvieweditorimpl.h b/kdevdesigner/designer/listvieweditorimpl.h similarity index 100% rename from tdevdesigner/designer/listvieweditorimpl.h rename to kdevdesigner/designer/listvieweditorimpl.h diff --git a/tdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp similarity index 99% rename from tdevdesigner/designer/mainwindow.cpp rename to kdevdesigner/designer/mainwindow.cpp index 3f53e004..3d900532 100644 --- a/tdevdesigner/designer/mainwindow.cpp +++ b/kdevdesigner/designer/mainwindow.cpp @@ -117,7 +117,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" static bool mblockNewForms = FALSE; extern TQMap *qwf_forms; @@ -149,7 +149,7 @@ static TQString textNoAccel( const TQString& text) } -MainWindow::MainWindow( TDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir ) +MainWindow::MainWindow( KDevDesignerPart *part, bool asClient, bool single, const TQString &plgDir ) : TQMainWindow( 0, "designer_mainwindow"/*, WType_TopLevel | (single ? 0 : WDestructiveClose) | WGroupLeader*/ ), grd( 10, 10 ), sGrid( TRUE ), snGrid( TRUE ), restoreConfig( TRUE ), splashScreen( TRUE ), fileFilter( i18n( "TQt User-Interface Files (*.ui)" ) ), client( asClient ), @@ -187,7 +187,7 @@ MainWindow::MainWindow( TDevDesignerPart *part, bool asClient, bool single, cons tqApp->setMainWidget( this );*/ TQWidgetFactory::addWidgetFactory( new CustomWidgetFactory ); #ifndef TQ_WS_MACX - setIcon( BarIcon( "designer_appicon.png", TDevDesignerPartFactory::instance() ) ); + setIcon( BarIcon( "designer_appicon.png", KDevDesignerPartFactory::instance() ) ); #endif actionGroupTools = 0; @@ -336,7 +336,7 @@ void MainWindow::setupMDI() vbox->setMargin( 1 ); vbox->setLineWidth( 1 ); qworkspace = new TQWorkspace( vbox ); - qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", TDevDesignerPartFactory::instance() ) ); + qworkspace->setPaletteBackgroundPixmap( UserIcon( "designer_background.png", KDevDesignerPartFactory::instance() ) ); qworkspace->setScrollBarsEnabled( TRUE ); connect( qworkspace, TQT_SIGNAL( windowActivated( TQWidget * ) ), this, TQT_SLOT( activeWindowChanged( TQWidget * ) ) ); @@ -2392,7 +2392,7 @@ void MainWindow::readConfig() if ( l.count() > c ) { w->isContainer = (bool)l[ c++ ].toInt(); } - w->pixmap = new TQPixmap( BarIcon( TQDir::home().absPath() + "/.designer/" + w->className , TDevDesignerPartFactory::instance()) ); + w->pixmap = new TQPixmap( BarIcon( TQDir::home().absPath() + "/.designer/" + w->className , KDevDesignerPartFactory::instance()) ); MetaDataBase::addCustomWidget( w ); } if ( num > 0 ) @@ -3115,7 +3115,7 @@ TemplateWizardInterface * MainWindow::templateWizardInterface( const TQString& c void MainWindow::setupPluginManagers() { - editorPluginManager = new TQPluginManager( IID_Editor, TQApplication::libraryPaths(), "/tdevdesigner" ); + editorPluginManager = new TQPluginManager( IID_Editor, TQApplication::libraryPaths(), "/kdevdesigner" ); MetaDataBase::setEditor( editorPluginManager->featureList() ); templateWizardPluginManager = diff --git a/tdevdesigner/designer/mainwindow.h b/kdevdesigner/designer/mainwindow.h similarity index 98% rename from tdevdesigner/designer/mainwindow.h rename to kdevdesigner/designer/mainwindow.h index f22d371f..1b68c14d 100644 --- a/tdevdesigner/designer/mainwindow.h +++ b/kdevdesigner/designer/mainwindow.h @@ -75,7 +75,7 @@ class TQToolBar; #endif class Preferences; -class TDevDesignerPart; +class KDevDesignerPart; class MainWindow : public TQMainWindow { @@ -85,7 +85,7 @@ class MainWindow : public TQMainWindow public: enum LineMode { Error, Step, StackFrame }; - MainWindow( TDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" ); + MainWindow( KDevDesignerPart *part, bool asClient, bool single = FALSE, const TQString &plgDir = "/designer" ); ~MainWindow(); HierarchyView *objectHierarchy() const; @@ -194,7 +194,7 @@ public: void statusMessage(const TQString &msg); //integration - TDevDesignerPart *part() const { return m_part; } + KDevDesignerPart *part() const { return m_part; } public slots: void showProperties( TQObject *w ); @@ -478,14 +478,14 @@ private: TQString pluginDir; bool sSignalHandlers; - TDevDesignerPart *m_part; + KDevDesignerPart *m_part; public: TQString lastSaveFilter; TQPtrList toolActions; TQPtrList commonWidgetsPage; -friend class TDevDesignerPart; +friend class KDevDesignerPart; }; class SenderObject : public TQObject diff --git a/tdevdesigner/designer/mainwindowactions.cpp b/kdevdesigner/designer/mainwindowactions.cpp similarity index 99% rename from tdevdesigner/designer/mainwindowactions.cpp rename to kdevdesigner/designer/mainwindowactions.cpp index b9d0b1b6..7fa1d1f7 100644 --- a/tdevdesigner/designer/mainwindowactions.cpp +++ b/kdevdesigner/designer/mainwindowactions.cpp @@ -83,7 +83,7 @@ #include "configtoolboxdialog.h" #include "designeraction.h" -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" static const char * whatsthis_image[] = { "16 16 3 1", @@ -114,10 +114,10 @@ const TQString toolbarHelp = "

Toolbars contain a number of buttons to " static TQIconSet createIconSet( const TQString &name ) { - TQIconSet ic( BarIcon( "" + name, TDevDesignerPartFactory::instance() ) ); + TQIconSet ic( BarIcon( "" + name, KDevDesignerPartFactory::instance() ) ); TQString prefix = "designer_"; int right = name.length() - prefix.length(); - ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), TDevDesignerPartFactory::instance() ), + ic.setPixmap( BarIcon( prefix + "d_" + name.right( right ), KDevDesignerPartFactory::instance() ), TQIconSet::Small, TQIconSet::Disabled ); return ic; } diff --git a/tdevdesigner/designer/menubareditor.cpp b/kdevdesigner/designer/menubareditor.cpp similarity index 100% rename from tdevdesigner/designer/menubareditor.cpp rename to kdevdesigner/designer/menubareditor.cpp diff --git a/tdevdesigner/designer/menubareditor.h b/kdevdesigner/designer/menubareditor.h similarity index 100% rename from tdevdesigner/designer/menubareditor.h rename to kdevdesigner/designer/menubareditor.h diff --git a/tdevdesigner/designer/metadatabase.cpp b/kdevdesigner/designer/metadatabase.cpp similarity index 99% rename from tdevdesigner/designer/metadatabase.cpp rename to kdevdesigner/designer/metadatabase.cpp index aa85fc80..7aa004d7 100644 --- a/tdevdesigner/designer/metadatabase.cpp +++ b/kdevdesigner/designer/metadatabase.cpp @@ -34,7 +34,7 @@ #include "project.h" #include "mainwindow.h" -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -1277,7 +1277,7 @@ MetaDataBase::CustomWidget::CustomWidget() includeFile = "mywidget.h"; includePolicy = Local; sizeHint = TQSize( -1, -1 ); - pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", TDevDesignerPartFactory::instance() ) ); + pixmap = new TQPixmap( BarIcon( "designer_customwidget.png", KDevDesignerPartFactory::instance() ) ); id = -1; sizePolicy = TQSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Preferred ); isContainer = FALSE; diff --git a/tdevdesigner/designer/metadatabase.h b/kdevdesigner/designer/metadatabase.h similarity index 100% rename from tdevdesigner/designer/metadatabase.h rename to kdevdesigner/designer/metadatabase.h diff --git a/tdevdesigner/designer/multilineeditor.ui b/kdevdesigner/designer/multilineeditor.ui similarity index 100% rename from tdevdesigner/designer/multilineeditor.ui rename to kdevdesigner/designer/multilineeditor.ui diff --git a/tdevdesigner/designer/multilineeditorimpl.cpp b/kdevdesigner/designer/multilineeditorimpl.cpp similarity index 92% rename from tdevdesigner/designer/multilineeditorimpl.cpp rename to kdevdesigner/designer/multilineeditorimpl.cpp index a3f6093e..ef06f77b 100644 --- a/tdevdesigner/designer/multilineeditorimpl.cpp +++ b/kdevdesigner/designer/multilineeditorimpl.cpp @@ -33,7 +33,7 @@ #include "widgetfactory.h" #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -101,25 +101,25 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget basicToolBar = new TQToolBar( i18n( "Basics" ), this, DockTop ); ToolBarItem *it = new ToolBarItem( this, basicToolBar, i18n( "Italic" ), - "i", BarIcon( "designer_textitalic.png", TDevDesignerPartFactory::instance() ), CTRL+Key_I ); + "i", BarIcon( "designer_textitalic.png", KDevDesignerPartFactory::instance() ), CTRL+Key_I ); it->addTo( stylesMenu ); connect( it, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *b = new ToolBarItem( this, basicToolBar, i18n( "Bold" ), - "b", BarIcon( "designer_textbold.png", TDevDesignerPartFactory::instance() ), CTRL+Key_B ); + "b", BarIcon( "designer_textbold.png", KDevDesignerPartFactory::instance() ), CTRL+Key_B ); b->addTo( stylesMenu ); connect( b, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ul = new ToolBarItem( this, basicToolBar, i18n( "Underline" ), - "u", BarIcon( "designer_textunderline.png" , TDevDesignerPartFactory::instance()), CTRL+Key_U ); + "u", BarIcon( "designer_textunderline.png" , KDevDesignerPartFactory::instance()), CTRL+Key_U ); ul->addTo( stylesMenu ); connect( ul, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *tt = new ToolBarItem( this, basicToolBar, i18n( "Typewriter" ), - "tt", BarIcon( "designer_textteletext.png", TDevDesignerPartFactory::instance() ) ); + "tt", BarIcon( "designer_textteletext.png", KDevDesignerPartFactory::instance() ) ); tt->addTo( stylesMenu ); connect( tt, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); @@ -130,14 +130,14 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget menuBar->insertItem( i18n( "&Layout" ), layoutMenu ); TQAction *brAction = new TQAction( this ); - brAction->setIconSet( BarIcon( "designer_textlinebreak.png", TDevDesignerPartFactory::instance() ) ); + brAction->setIconSet( BarIcon( "designer_textlinebreak.png", KDevDesignerPartFactory::instance() ) ); brAction->setText( i18n("Break" ) ); brAction->addTo( basicToolBar ); brAction->addTo( layoutMenu ); connect( brAction, TQT_SIGNAL( activated() ) , this, TQT_SLOT( insertBR() ) ); ToolBarItem *p = new ToolBarItem( this, basicToolBar, i18n( "Paragraph" ), - "p", BarIcon( "designer_textparagraph.png", TDevDesignerPartFactory::instance() ) ); + "p", BarIcon( "designer_textparagraph.png", KDevDesignerPartFactory::instance() ) ); p->addTo( layoutMenu ); connect( p, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); @@ -145,25 +145,25 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget basicToolBar->addSeparator(); ToolBarItem *al = new ToolBarItem( this, basicToolBar, i18n( "Align left" ), - "p align=\"left\"", BarIcon( "designer_textleft.png", TDevDesignerPartFactory::instance() ) ); + "p align=\"left\"", BarIcon( "designer_textleft.png", KDevDesignerPartFactory::instance() ) ); al->addTo( layoutMenu ); connect( al, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ac = new ToolBarItem( this, basicToolBar, i18n( "Align center" ), - "p align=\"center\"", BarIcon( "designer_textcenter.png", TDevDesignerPartFactory::instance() ) ); + "p align=\"center\"", BarIcon( "designer_textcenter.png", KDevDesignerPartFactory::instance() ) ); ac->addTo( layoutMenu ); connect( ac, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *ar = new ToolBarItem( this, basicToolBar, i18n( "Align right" ), - "p align=\"right\"", BarIcon( "designer_textright.png", TDevDesignerPartFactory::instance() ) ); + "p align=\"right\"", BarIcon( "designer_textright.png", KDevDesignerPartFactory::instance() ) ); ar->addTo( layoutMenu ); connect( ar, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *block = new ToolBarItem( this, basicToolBar, i18n( "Blockquote" ), - "blockquote", BarIcon( "designer_textjustify.png", TDevDesignerPartFactory::instance() ) ); + "blockquote", BarIcon( "designer_textjustify.png", KDevDesignerPartFactory::instance() ) ); block->addTo( layoutMenu ); connect( block, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); @@ -175,7 +175,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget fontToolBar = new TQToolBar( "Fonts", this, DockTop ); TQAction *fontAction = new TQAction( this ); - fontAction->setIconSet( BarIcon( "designer_textfont.png", TDevDesignerPartFactory::instance() ) ); + fontAction->setIconSet( BarIcon( "designer_textfont.png", KDevDesignerPartFactory::instance() ) ); fontAction->setText( i18n("Font" ) ); fontAction->addTo( fontToolBar ); fontAction->addTo( fontMenu ); @@ -183,27 +183,27 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget ToolBarItem *fp1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize +1" ), - "font size=\"+1\"", BarIcon( "designer_textlarger.png", TDevDesignerPartFactory::instance() ) ); + "font size=\"+1\"", BarIcon( "designer_textlarger.png", KDevDesignerPartFactory::instance() ) ); connect( fp1, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *fm1 = new ToolBarItem( this, fontToolBar, i18n( "Fontsize -1" ), - "font size=\"-1\"", BarIcon( "designer_textsmaller.png", TDevDesignerPartFactory::instance() ) ); + "font size=\"-1\"", BarIcon( "designer_textsmaller.png", KDevDesignerPartFactory::instance() ) ); connect( fm1, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h1 = new ToolBarItem( this, fontToolBar, i18n( "Headline 1" ), - "h1", BarIcon( "designer_texth1.png", TDevDesignerPartFactory::instance() ) ); + "h1", BarIcon( "designer_texth1.png", KDevDesignerPartFactory::instance() ) ); connect( h1, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h2 = new ToolBarItem( this, fontToolBar, i18n( "Headline 2" ), - "h2", BarIcon( "designer_texth2.png", TDevDesignerPartFactory::instance() ) ); + "h2", BarIcon( "designer_texth2.png", KDevDesignerPartFactory::instance() ) ); connect( h2, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); ToolBarItem *h3 = new ToolBarItem( this, fontToolBar, i18n( "Headline 3" ), - "h3", BarIcon( "designer_texth3.png", TDevDesignerPartFactory::instance() ) ); + "h3", BarIcon( "designer_texth3.png", KDevDesignerPartFactory::instance() ) ); connect( h3, TQT_SIGNAL( clicked( const TQString& ) ), this, TQT_SLOT( insertTags( const TQString& ))); @@ -213,7 +213,7 @@ MultiLineEditor::MultiLineEditor( bool call_static, bool richtextMode, TQWidget optionsToolBar = new TQToolBar( "Options", this, DockTop ); wrapAction = new TQAction( this ); wrapAction->setToggleAction( TRUE ); - wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", TDevDesignerPartFactory::instance() ) ); + wrapAction->setIconSet( BarIcon( "designer_wordwrap.png", KDevDesignerPartFactory::instance() ) ); wrapAction->setText( i18n( "Word Wrapping" ) ); wrapAction->addTo( optionsToolBar ); wrapAction->addTo( optionsMenu ); diff --git a/tdevdesigner/designer/multilineeditorimpl.h b/kdevdesigner/designer/multilineeditorimpl.h similarity index 100% rename from tdevdesigner/designer/multilineeditorimpl.h rename to kdevdesigner/designer/multilineeditorimpl.h diff --git a/tdevdesigner/designer/myiconloader.cpp b/kdevdesigner/designer/myiconloader.cpp similarity index 91% rename from tdevdesigner/designer/myiconloader.cpp rename to kdevdesigner/designer/myiconloader.cpp index 72a1bdfb..80bbc5ba 100644 --- a/tdevdesigner/designer/myiconloader.cpp +++ b/kdevdesigner/designer/myiconloader.cpp @@ -18,15 +18,15 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ #include "myiconloader.h" -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include TQPixmap BarIcon2( const TQString & name ) { - return BarIcon(name, TDevDesignerPartFactory::instance()); + return BarIcon(name, KDevDesignerPartFactory::instance()); } TQPixmap SmallIcon2( const TQString & name) { - return SmallIcon(name, TDevDesignerPartFactory::instance()); + return SmallIcon(name, KDevDesignerPartFactory::instance()); } diff --git a/tdevdesigner/designer/myiconloader.h b/kdevdesigner/designer/myiconloader.h similarity index 100% rename from tdevdesigner/designer/myiconloader.h rename to kdevdesigner/designer/myiconloader.h diff --git a/tdevdesigner/designer/newform.ui b/kdevdesigner/designer/newform.ui similarity index 100% rename from tdevdesigner/designer/newform.ui rename to kdevdesigner/designer/newform.ui diff --git a/tdevdesigner/designer/newformimpl.cpp b/kdevdesigner/designer/newformimpl.cpp similarity index 95% rename from tdevdesigner/designer/newformimpl.cpp rename to kdevdesigner/designer/newformimpl.cpp index b5cc7c58..0cdc738b 100644 --- a/tdevdesigner/designer/newformimpl.cpp +++ b/kdevdesigner/designer/newformimpl.cpp @@ -38,7 +38,7 @@ #include "sourcefile.h" #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -252,7 +252,7 @@ void NewForm::insertTemplates( TQIconView *tView, ProjectItem *pi = new ProjectItem( tView, i18n("%1 Project" ).arg( *it ) ); allItems.append( pi ); pi->setLanguage( *it ); - pi->setPixmap( BarIcon( "designer_project.png" , TDevDesignerPartFactory::instance()) ); + pi->setPixmap( BarIcon( "designer_project.png" , KDevDesignerPartFactory::instance()) ); pi->setDragEnabled( FALSE ); } } @@ -260,24 +260,24 @@ void NewForm::insertTemplates( TQIconView *tView, FormItem *fi = new FormItem( tView,i18n( "Dialog" ) ); allItems.append( fi ); fi->setFormType( FormItem::Dialog ); - fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) ); + fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); fi->setDragEnabled( FALSE ); cur = fi; if ( !MainWindow::self->singleProjectMode() ) { fi = new FormItem( tView,i18n( "Wizard" ) ); allItems.append( fi ); fi->setFormType( FormItem::Wizard ); - fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) ); + fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); fi->setDragEnabled( FALSE ); fi = new FormItem( tView, i18n( "Widget" ) ); allItems.append( fi ); fi->setFormType( FormItem::Widget ); - fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) ); + fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); fi->setDragEnabled( FALSE ); fi = new FormItem( tView, i18n( "Main Window" ) ); allItems.append( fi ); fi->setFormType( FormItem::MainWindow ); - fi->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) ); + fi->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); fi->setDragEnabled( FALSE ); TQString templPath = templatePath; @@ -310,7 +310,7 @@ void NewForm::insertTemplates( TQIconView *tView, CustomFormItem *ci = new CustomFormItem( tView, name ); allItems.append( ci ); ci->setDragEnabled( FALSE ); - ci->setPixmap( BarIcon( "designer_newform.png" , TDevDesignerPartFactory::instance()) ); + ci->setPixmap( BarIcon( "designer_newform.png" , KDevDesignerPartFactory::instance()) ); ci->setTemplateFile( fi->absFilePath() ); } } @@ -328,7 +328,7 @@ void NewForm::insertTemplates( TQIconView *tView, allItems.append( si ); si->setExtension( eit.key() ); si->setLanguage( *it ); - si->setPixmap( BarIcon( "designer_filenew.png", TDevDesignerPartFactory::instance() ) ); + si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) ); si->setDragEnabled( FALSE ); } iface->release(); @@ -345,7 +345,7 @@ void NewForm::insertTemplates( TQIconView *tView, allItems.append( si ); si->setTemplate( *sit ); si->setLanguage( siface->language( *sit ) ); - si->setPixmap( BarIcon( "designer_filenew.png", TDevDesignerPartFactory::instance() ) ); + si->setPixmap( BarIcon( "designer_filenew.png", KDevDesignerPartFactory::instance() ) ); si->setDragEnabled( FALSE ); siface->release(); } diff --git a/tdevdesigner/designer/newformimpl.h b/kdevdesigner/designer/newformimpl.h similarity index 100% rename from tdevdesigner/designer/newformimpl.h rename to kdevdesigner/designer/newformimpl.h diff --git a/tdevdesigner/designer/orderindicator.cpp b/kdevdesigner/designer/orderindicator.cpp similarity index 100% rename from tdevdesigner/designer/orderindicator.cpp rename to kdevdesigner/designer/orderindicator.cpp diff --git a/tdevdesigner/designer/orderindicator.h b/kdevdesigner/designer/orderindicator.h similarity index 100% rename from tdevdesigner/designer/orderindicator.h rename to kdevdesigner/designer/orderindicator.h diff --git a/tdevdesigner/designer/outputwindow.cpp b/kdevdesigner/designer/outputwindow.cpp similarity index 100% rename from tdevdesigner/designer/outputwindow.cpp rename to kdevdesigner/designer/outputwindow.cpp diff --git a/tdevdesigner/designer/outputwindow.h b/kdevdesigner/designer/outputwindow.h similarity index 100% rename from tdevdesigner/designer/outputwindow.h rename to kdevdesigner/designer/outputwindow.h diff --git a/tdevdesigner/designer/paletteeditor.ui b/kdevdesigner/designer/paletteeditor.ui similarity index 100% rename from tdevdesigner/designer/paletteeditor.ui rename to kdevdesigner/designer/paletteeditor.ui diff --git a/tdevdesigner/designer/paletteeditoradvanced.ui b/kdevdesigner/designer/paletteeditoradvanced.ui similarity index 100% rename from tdevdesigner/designer/paletteeditoradvanced.ui rename to kdevdesigner/designer/paletteeditoradvanced.ui diff --git a/tdevdesigner/designer/paletteeditoradvancedimpl.cpp b/kdevdesigner/designer/paletteeditoradvancedimpl.cpp similarity index 100% rename from tdevdesigner/designer/paletteeditoradvancedimpl.cpp rename to kdevdesigner/designer/paletteeditoradvancedimpl.cpp diff --git a/tdevdesigner/designer/paletteeditoradvancedimpl.h b/kdevdesigner/designer/paletteeditoradvancedimpl.h similarity index 100% rename from tdevdesigner/designer/paletteeditoradvancedimpl.h rename to kdevdesigner/designer/paletteeditoradvancedimpl.h diff --git a/tdevdesigner/designer/paletteeditorimpl.cpp b/kdevdesigner/designer/paletteeditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/paletteeditorimpl.cpp rename to kdevdesigner/designer/paletteeditorimpl.cpp diff --git a/tdevdesigner/designer/paletteeditorimpl.h b/kdevdesigner/designer/paletteeditorimpl.h similarity index 100% rename from tdevdesigner/designer/paletteeditorimpl.h rename to kdevdesigner/designer/paletteeditorimpl.h diff --git a/tdevdesigner/designer/pics/CMakeLists.txt b/kdevdesigner/designer/pics/CMakeLists.txt similarity index 98% rename from tdevdesigner/designer/pics/CMakeLists.txt rename to kdevdesigner/designer/pics/CMakeLists.txt index 940ecd0d..3b6367c0 100644 --- a/tdevdesigner/designer/pics/CMakeLists.txt +++ b/kdevdesigner/designer/pics/CMakeLists.txt @@ -81,5 +81,5 @@ install( designer_undo.png designer_up.png designer_uparrow.png designer_vsplit.png designer_wait.png designer_widgetstack.png designer_wizarddata.png designer_wizarddialog.png designer_wordwrap.png - DESTINATION ${DATA_INSTALL_DIR}/tdevdesignerpart/pics + DESTINATION ${DATA_INSTALL_DIR}/kdevdesignerpart/pics ) diff --git a/tdevdesigner/designer/pics/Makefile.am b/kdevdesigner/designer/pics/Makefile.am similarity index 99% rename from tdevdesigner/designer/pics/Makefile.am rename to kdevdesigner/designer/pics/Makefile.am index be65c4d5..8749186b 100644 --- a/tdevdesigner/designer/pics/Makefile.am +++ b/kdevdesigner/designer/pics/Makefile.am @@ -1,2 +1,2 @@ -picsdirdir = $(kde_datadir)/tdevdesignerpart/pics +picsdirdir = $(kde_datadir)/kdevdesignerpart/pics picsdir_DATA = designer_adjustsize.png designer_appicon.png designer_arrow.png designer_background.png designer_book.png designer_buttongroup.png designer_checkbox.png designer_combobox.png designer_connecttool.png designer_cross.png designer_customwidget.png designer_d_adjustsize.png designer_d_book.png designer_d_buttongroup.png designer_d_checkbox.png designer_d_combobox.png designer_d_connecttool.png designer_d_customwidget.png designer_d_databrowser.png designer_d_datatable.png designer_d_dataview.png designer_d_dateedit.png designer_d_datetimeedit.png designer_d_dial.png designer_d_down.png designer_d_editbreaklayout.png designer_d_editcopy.png designer_d_editcut.png designer_d_editdelete.png designer_d_editgrid.png designer_d_edithlayout.png designer_d_edithlayoutsplit.png designer_d_editlower.png designer_d_editpaste.png designer_d_editraise.png designer_d_editslots.png designer_d_editvlayout.png designer_d_editvlayoutsplit.png designer_d_filenew.png designer_d_fileopen.png designer_d_filesave.png designer_d_folder.png designer_d_form.png designer_d_frame.png designer_d_groupbox.png designer_d_help.png designer_d_home.png designer_d_iconview.png designer_d_image.png designer_d_label.png designer_d_layout.png designer_d_lcdnumber.png designer_d_left.png designer_d_line.png designer_d_lineedit.png designer_d_listbox.png designer_d_listview.png designer_d_multilineedit.png designer_d_newform.png designer_d_ordertool.png designer_d_pixlabel.png designer_d_pointer.png designer_d_print.png designer_d_progress.png designer_d_project.png designer_d_pushbutton.png designer_d_radiobutton.png designer_d_redo.png designer_d_richtextedit.png designer_d_right.png designer_d_scrollbar.png designer_d_searchfind.png designer_d_setbuddy.png designer_d_slider.png designer_d_spacer.png designer_d_spinbox.png designer_d_table.png designer_d_tabwidget.png designer_d_textbold.png designer_d_textbrowser.png designer_d_textcenter.png designer_d_textedit.png designer_d_textfont.png designer_d_texth1.png designer_d_texth2.png designer_d_texth3.png designer_d_textitalic.png designer_d_textjustify.png designer_d_textlarger.png designer_d_textleft.png designer_d_textlinebreak.png designer_d_textparagraph.png designer_d_textright.png designer_d_textsmaller.png designer_d_textteletext.png designer_d_textunderline.png designer_d_textview.png designer_d_timeedit.png designer_d_toolbox.png designer_d_toolbutton.png designer_d_undo.png designer_d_up.png designer_d_widgetstack.png designer_d_wizarddata.png designer_d_wizarddialog.png designer_d_wordwrap.png designer_databrowser.png designer_datatable.png designer_dataview.png designer_dateedit.png designer_datetimeedit.png designer_dial.png designer_down.png designer_editbreaklayout.png designer_editcopy.png designer_editcut.png designer_editdelete.png designer_editgrid.png designer_edithlayout.png designer_edithlayoutsplit.png designer_editlower.png designer_editpaste.png designer_editraise.png designer_editslots.png designer_editvlayout.png designer_editvlayoutsplit.png designer_filenew.png designer_fileopen.png designer_filesave.png designer_folder.png designer_form.png designer_frame.png designer_groupbox.png designer_hand.png designer_help.png designer_home.png designer_hsplit.png designer_ibeam.png designer_iconview.png designer_image.png designer_label.png designer_layout.png designer_lcdnumber.png designer_left.png designer_line.png designer_lineedit.png designer_listbox.png designer_listview.png designer_multilineedit.png designer_newform.png designer_no.png designer_object.png designer_ordertool.png designer_pixlabel.png designer_pointer.png designer_print.png designer_progress.png designer_project.png designer_pushbutton.png designer_qtlogo.png designer_radiobutton.png designer_redo.png designer_resetproperty.png designer_richtextedit.png designer_right.png designer_s_down.png designer_s_editcut.png designer_s_left.png designer_s_right.png designer_s_up.png designer_scrollbar.png designer_searchfind.png designer_setbuddy.png designer_sizeall.png designer_sizeb.png designer_sizef.png designer_sizeh.png designer_sizev.png designer_slider.png designer_spacer.png designer_spinbox.png designer_splash.png designer_table.png designer_tabwidget.png designer_textbold.png designer_textbrowser.png designer_textcenter.png designer_textedit.png designer_textfont.png designer_texth1.png designer_texth2.png designer_texth3.png designer_textitalic.png designer_textjustify.png designer_textlarger.png designer_textleft.png designer_textlinebreak.png designer_textparagraph.png designer_textright.png designer_textsmaller.png designer_textteletext.png designer_textunderline.png designer_textview.png designer_timeedit.png designer_toolbox.png designer_toolbutton.png designer_undo.png designer_up.png designer_uparrow.png designer_vsplit.png designer_wait.png designer_widgetstack.png designer_wizarddata.png designer_wizarddialog.png designer_wordwrap.png diff --git a/tdevdesigner/designer/pics/designer_adjustsize.png b/kdevdesigner/designer/pics/designer_adjustsize.png similarity index 100% rename from tdevdesigner/designer/pics/designer_adjustsize.png rename to kdevdesigner/designer/pics/designer_adjustsize.png diff --git a/tdevdesigner/designer/pics/designer_appicon.png b/kdevdesigner/designer/pics/designer_appicon.png similarity index 100% rename from tdevdesigner/designer/pics/designer_appicon.png rename to kdevdesigner/designer/pics/designer_appicon.png diff --git a/tdevdesigner/designer/pics/designer_arrow.png b/kdevdesigner/designer/pics/designer_arrow.png similarity index 100% rename from tdevdesigner/designer/pics/designer_arrow.png rename to kdevdesigner/designer/pics/designer_arrow.png diff --git a/tdevdesigner/designer/pics/designer_background.png b/kdevdesigner/designer/pics/designer_background.png similarity index 100% rename from tdevdesigner/designer/pics/designer_background.png rename to kdevdesigner/designer/pics/designer_background.png diff --git a/tdevdesigner/designer/pics/designer_book.png b/kdevdesigner/designer/pics/designer_book.png similarity index 100% rename from tdevdesigner/designer/pics/designer_book.png rename to kdevdesigner/designer/pics/designer_book.png diff --git a/tdevdesigner/designer/pics/designer_buttongroup.png b/kdevdesigner/designer/pics/designer_buttongroup.png similarity index 100% rename from tdevdesigner/designer/pics/designer_buttongroup.png rename to kdevdesigner/designer/pics/designer_buttongroup.png diff --git a/tdevdesigner/designer/pics/designer_checkbox.png b/kdevdesigner/designer/pics/designer_checkbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_checkbox.png rename to kdevdesigner/designer/pics/designer_checkbox.png diff --git a/tdevdesigner/designer/pics/designer_combobox.png b/kdevdesigner/designer/pics/designer_combobox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_combobox.png rename to kdevdesigner/designer/pics/designer_combobox.png diff --git a/tdevdesigner/designer/pics/designer_connecttool.png b/kdevdesigner/designer/pics/designer_connecttool.png similarity index 100% rename from tdevdesigner/designer/pics/designer_connecttool.png rename to kdevdesigner/designer/pics/designer_connecttool.png diff --git a/tdevdesigner/designer/pics/designer_cross.png b/kdevdesigner/designer/pics/designer_cross.png similarity index 100% rename from tdevdesigner/designer/pics/designer_cross.png rename to kdevdesigner/designer/pics/designer_cross.png diff --git a/tdevdesigner/designer/pics/designer_customwidget.png b/kdevdesigner/designer/pics/designer_customwidget.png similarity index 100% rename from tdevdesigner/designer/pics/designer_customwidget.png rename to kdevdesigner/designer/pics/designer_customwidget.png diff --git a/tdevdesigner/designer/pics/designer_d_adjustsize.png b/kdevdesigner/designer/pics/designer_d_adjustsize.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_adjustsize.png rename to kdevdesigner/designer/pics/designer_d_adjustsize.png diff --git a/tdevdesigner/designer/pics/designer_d_book.png b/kdevdesigner/designer/pics/designer_d_book.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_book.png rename to kdevdesigner/designer/pics/designer_d_book.png diff --git a/tdevdesigner/designer/pics/designer_d_buttongroup.png b/kdevdesigner/designer/pics/designer_d_buttongroup.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_buttongroup.png rename to kdevdesigner/designer/pics/designer_d_buttongroup.png diff --git a/tdevdesigner/designer/pics/designer_d_checkbox.png b/kdevdesigner/designer/pics/designer_d_checkbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_checkbox.png rename to kdevdesigner/designer/pics/designer_d_checkbox.png diff --git a/tdevdesigner/designer/pics/designer_d_combobox.png b/kdevdesigner/designer/pics/designer_d_combobox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_combobox.png rename to kdevdesigner/designer/pics/designer_d_combobox.png diff --git a/tdevdesigner/designer/pics/designer_d_connecttool.png b/kdevdesigner/designer/pics/designer_d_connecttool.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_connecttool.png rename to kdevdesigner/designer/pics/designer_d_connecttool.png diff --git a/tdevdesigner/designer/pics/designer_d_customwidget.png b/kdevdesigner/designer/pics/designer_d_customwidget.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_customwidget.png rename to kdevdesigner/designer/pics/designer_d_customwidget.png diff --git a/tdevdesigner/designer/pics/designer_d_databrowser.png b/kdevdesigner/designer/pics/designer_d_databrowser.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_databrowser.png rename to kdevdesigner/designer/pics/designer_d_databrowser.png diff --git a/tdevdesigner/designer/pics/designer_d_datatable.png b/kdevdesigner/designer/pics/designer_d_datatable.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_datatable.png rename to kdevdesigner/designer/pics/designer_d_datatable.png diff --git a/tdevdesigner/designer/pics/designer_d_dataview.png b/kdevdesigner/designer/pics/designer_d_dataview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_dataview.png rename to kdevdesigner/designer/pics/designer_d_dataview.png diff --git a/tdevdesigner/designer/pics/designer_d_dateedit.png b/kdevdesigner/designer/pics/designer_d_dateedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_dateedit.png rename to kdevdesigner/designer/pics/designer_d_dateedit.png diff --git a/tdevdesigner/designer/pics/designer_d_datetimeedit.png b/kdevdesigner/designer/pics/designer_d_datetimeedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_datetimeedit.png rename to kdevdesigner/designer/pics/designer_d_datetimeedit.png diff --git a/tdevdesigner/designer/pics/designer_d_dial.png b/kdevdesigner/designer/pics/designer_d_dial.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_dial.png rename to kdevdesigner/designer/pics/designer_d_dial.png diff --git a/tdevdesigner/designer/pics/designer_d_down.png b/kdevdesigner/designer/pics/designer_d_down.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_down.png rename to kdevdesigner/designer/pics/designer_d_down.png diff --git a/tdevdesigner/designer/pics/designer_d_editbreaklayout.png b/kdevdesigner/designer/pics/designer_d_editbreaklayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editbreaklayout.png rename to kdevdesigner/designer/pics/designer_d_editbreaklayout.png diff --git a/tdevdesigner/designer/pics/designer_d_editcopy.png b/kdevdesigner/designer/pics/designer_d_editcopy.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editcopy.png rename to kdevdesigner/designer/pics/designer_d_editcopy.png diff --git a/tdevdesigner/designer/pics/designer_d_editcut.png b/kdevdesigner/designer/pics/designer_d_editcut.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editcut.png rename to kdevdesigner/designer/pics/designer_d_editcut.png diff --git a/tdevdesigner/designer/pics/designer_d_editdelete.png b/kdevdesigner/designer/pics/designer_d_editdelete.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editdelete.png rename to kdevdesigner/designer/pics/designer_d_editdelete.png diff --git a/tdevdesigner/designer/pics/designer_d_editgrid.png b/kdevdesigner/designer/pics/designer_d_editgrid.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editgrid.png rename to kdevdesigner/designer/pics/designer_d_editgrid.png diff --git a/tdevdesigner/designer/pics/designer_d_edithlayout.png b/kdevdesigner/designer/pics/designer_d_edithlayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_edithlayout.png rename to kdevdesigner/designer/pics/designer_d_edithlayout.png diff --git a/tdevdesigner/designer/pics/designer_d_edithlayoutsplit.png b/kdevdesigner/designer/pics/designer_d_edithlayoutsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_edithlayoutsplit.png rename to kdevdesigner/designer/pics/designer_d_edithlayoutsplit.png diff --git a/tdevdesigner/designer/pics/designer_d_editlower.png b/kdevdesigner/designer/pics/designer_d_editlower.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editlower.png rename to kdevdesigner/designer/pics/designer_d_editlower.png diff --git a/tdevdesigner/designer/pics/designer_d_editpaste.png b/kdevdesigner/designer/pics/designer_d_editpaste.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editpaste.png rename to kdevdesigner/designer/pics/designer_d_editpaste.png diff --git a/tdevdesigner/designer/pics/designer_d_editraise.png b/kdevdesigner/designer/pics/designer_d_editraise.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editraise.png rename to kdevdesigner/designer/pics/designer_d_editraise.png diff --git a/tdevdesigner/designer/pics/designer_d_editslots.png b/kdevdesigner/designer/pics/designer_d_editslots.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editslots.png rename to kdevdesigner/designer/pics/designer_d_editslots.png diff --git a/tdevdesigner/designer/pics/designer_d_editvlayout.png b/kdevdesigner/designer/pics/designer_d_editvlayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editvlayout.png rename to kdevdesigner/designer/pics/designer_d_editvlayout.png diff --git a/tdevdesigner/designer/pics/designer_d_editvlayoutsplit.png b/kdevdesigner/designer/pics/designer_d_editvlayoutsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_editvlayoutsplit.png rename to kdevdesigner/designer/pics/designer_d_editvlayoutsplit.png diff --git a/tdevdesigner/designer/pics/designer_d_filenew.png b/kdevdesigner/designer/pics/designer_d_filenew.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_filenew.png rename to kdevdesigner/designer/pics/designer_d_filenew.png diff --git a/tdevdesigner/designer/pics/designer_d_fileopen.png b/kdevdesigner/designer/pics/designer_d_fileopen.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_fileopen.png rename to kdevdesigner/designer/pics/designer_d_fileopen.png diff --git a/tdevdesigner/designer/pics/designer_d_filesave.png b/kdevdesigner/designer/pics/designer_d_filesave.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_filesave.png rename to kdevdesigner/designer/pics/designer_d_filesave.png diff --git a/tdevdesigner/designer/pics/designer_d_folder.png b/kdevdesigner/designer/pics/designer_d_folder.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_folder.png rename to kdevdesigner/designer/pics/designer_d_folder.png diff --git a/tdevdesigner/designer/pics/designer_d_form.png b/kdevdesigner/designer/pics/designer_d_form.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_form.png rename to kdevdesigner/designer/pics/designer_d_form.png diff --git a/tdevdesigner/designer/pics/designer_d_frame.png b/kdevdesigner/designer/pics/designer_d_frame.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_frame.png rename to kdevdesigner/designer/pics/designer_d_frame.png diff --git a/tdevdesigner/designer/pics/designer_d_groupbox.png b/kdevdesigner/designer/pics/designer_d_groupbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_groupbox.png rename to kdevdesigner/designer/pics/designer_d_groupbox.png diff --git a/tdevdesigner/designer/pics/designer_d_help.png b/kdevdesigner/designer/pics/designer_d_help.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_help.png rename to kdevdesigner/designer/pics/designer_d_help.png diff --git a/tdevdesigner/designer/pics/designer_d_home.png b/kdevdesigner/designer/pics/designer_d_home.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_home.png rename to kdevdesigner/designer/pics/designer_d_home.png diff --git a/tdevdesigner/designer/pics/designer_d_iconview.png b/kdevdesigner/designer/pics/designer_d_iconview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_iconview.png rename to kdevdesigner/designer/pics/designer_d_iconview.png diff --git a/tdevdesigner/designer/pics/designer_d_image.png b/kdevdesigner/designer/pics/designer_d_image.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_image.png rename to kdevdesigner/designer/pics/designer_d_image.png diff --git a/tdevdesigner/designer/pics/designer_d_label.png b/kdevdesigner/designer/pics/designer_d_label.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_label.png rename to kdevdesigner/designer/pics/designer_d_label.png diff --git a/tdevdesigner/designer/pics/designer_d_layout.png b/kdevdesigner/designer/pics/designer_d_layout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_layout.png rename to kdevdesigner/designer/pics/designer_d_layout.png diff --git a/tdevdesigner/designer/pics/designer_d_lcdnumber.png b/kdevdesigner/designer/pics/designer_d_lcdnumber.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_lcdnumber.png rename to kdevdesigner/designer/pics/designer_d_lcdnumber.png diff --git a/tdevdesigner/designer/pics/designer_d_left.png b/kdevdesigner/designer/pics/designer_d_left.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_left.png rename to kdevdesigner/designer/pics/designer_d_left.png diff --git a/tdevdesigner/designer/pics/designer_d_line.png b/kdevdesigner/designer/pics/designer_d_line.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_line.png rename to kdevdesigner/designer/pics/designer_d_line.png diff --git a/tdevdesigner/designer/pics/designer_d_lineedit.png b/kdevdesigner/designer/pics/designer_d_lineedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_lineedit.png rename to kdevdesigner/designer/pics/designer_d_lineedit.png diff --git a/tdevdesigner/designer/pics/designer_d_listbox.png b/kdevdesigner/designer/pics/designer_d_listbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_listbox.png rename to kdevdesigner/designer/pics/designer_d_listbox.png diff --git a/tdevdesigner/designer/pics/designer_d_listview.png b/kdevdesigner/designer/pics/designer_d_listview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_listview.png rename to kdevdesigner/designer/pics/designer_d_listview.png diff --git a/tdevdesigner/designer/pics/designer_d_multilineedit.png b/kdevdesigner/designer/pics/designer_d_multilineedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_multilineedit.png rename to kdevdesigner/designer/pics/designer_d_multilineedit.png diff --git a/tdevdesigner/designer/pics/designer_d_newform.png b/kdevdesigner/designer/pics/designer_d_newform.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_newform.png rename to kdevdesigner/designer/pics/designer_d_newform.png diff --git a/tdevdesigner/designer/pics/designer_d_ordertool.png b/kdevdesigner/designer/pics/designer_d_ordertool.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_ordertool.png rename to kdevdesigner/designer/pics/designer_d_ordertool.png diff --git a/tdevdesigner/designer/pics/designer_d_pixlabel.png b/kdevdesigner/designer/pics/designer_d_pixlabel.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_pixlabel.png rename to kdevdesigner/designer/pics/designer_d_pixlabel.png diff --git a/tdevdesigner/designer/pics/designer_d_pointer.png b/kdevdesigner/designer/pics/designer_d_pointer.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_pointer.png rename to kdevdesigner/designer/pics/designer_d_pointer.png diff --git a/tdevdesigner/designer/pics/designer_d_print.png b/kdevdesigner/designer/pics/designer_d_print.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_print.png rename to kdevdesigner/designer/pics/designer_d_print.png diff --git a/tdevdesigner/designer/pics/designer_d_progress.png b/kdevdesigner/designer/pics/designer_d_progress.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_progress.png rename to kdevdesigner/designer/pics/designer_d_progress.png diff --git a/tdevdesigner/designer/pics/designer_d_project.png b/kdevdesigner/designer/pics/designer_d_project.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_project.png rename to kdevdesigner/designer/pics/designer_d_project.png diff --git a/tdevdesigner/designer/pics/designer_d_pushbutton.png b/kdevdesigner/designer/pics/designer_d_pushbutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_pushbutton.png rename to kdevdesigner/designer/pics/designer_d_pushbutton.png diff --git a/tdevdesigner/designer/pics/designer_d_radiobutton.png b/kdevdesigner/designer/pics/designer_d_radiobutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_radiobutton.png rename to kdevdesigner/designer/pics/designer_d_radiobutton.png diff --git a/tdevdesigner/designer/pics/designer_d_redo.png b/kdevdesigner/designer/pics/designer_d_redo.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_redo.png rename to kdevdesigner/designer/pics/designer_d_redo.png diff --git a/tdevdesigner/designer/pics/designer_d_richtextedit.png b/kdevdesigner/designer/pics/designer_d_richtextedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_richtextedit.png rename to kdevdesigner/designer/pics/designer_d_richtextedit.png diff --git a/tdevdesigner/designer/pics/designer_d_right.png b/kdevdesigner/designer/pics/designer_d_right.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_right.png rename to kdevdesigner/designer/pics/designer_d_right.png diff --git a/tdevdesigner/designer/pics/designer_d_scrollbar.png b/kdevdesigner/designer/pics/designer_d_scrollbar.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_scrollbar.png rename to kdevdesigner/designer/pics/designer_d_scrollbar.png diff --git a/tdevdesigner/designer/pics/designer_d_searchfind.png b/kdevdesigner/designer/pics/designer_d_searchfind.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_searchfind.png rename to kdevdesigner/designer/pics/designer_d_searchfind.png diff --git a/tdevdesigner/designer/pics/designer_d_setbuddy.png b/kdevdesigner/designer/pics/designer_d_setbuddy.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_setbuddy.png rename to kdevdesigner/designer/pics/designer_d_setbuddy.png diff --git a/tdevdesigner/designer/pics/designer_d_slider.png b/kdevdesigner/designer/pics/designer_d_slider.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_slider.png rename to kdevdesigner/designer/pics/designer_d_slider.png diff --git a/tdevdesigner/designer/pics/designer_d_spacer.png b/kdevdesigner/designer/pics/designer_d_spacer.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_spacer.png rename to kdevdesigner/designer/pics/designer_d_spacer.png diff --git a/tdevdesigner/designer/pics/designer_d_spinbox.png b/kdevdesigner/designer/pics/designer_d_spinbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_spinbox.png rename to kdevdesigner/designer/pics/designer_d_spinbox.png diff --git a/tdevdesigner/designer/pics/designer_d_table.png b/kdevdesigner/designer/pics/designer_d_table.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_table.png rename to kdevdesigner/designer/pics/designer_d_table.png diff --git a/tdevdesigner/designer/pics/designer_d_tabwidget.png b/kdevdesigner/designer/pics/designer_d_tabwidget.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_tabwidget.png rename to kdevdesigner/designer/pics/designer_d_tabwidget.png diff --git a/tdevdesigner/designer/pics/designer_d_textbold.png b/kdevdesigner/designer/pics/designer_d_textbold.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textbold.png rename to kdevdesigner/designer/pics/designer_d_textbold.png diff --git a/tdevdesigner/designer/pics/designer_d_textbrowser.png b/kdevdesigner/designer/pics/designer_d_textbrowser.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textbrowser.png rename to kdevdesigner/designer/pics/designer_d_textbrowser.png diff --git a/tdevdesigner/designer/pics/designer_d_textcenter.png b/kdevdesigner/designer/pics/designer_d_textcenter.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textcenter.png rename to kdevdesigner/designer/pics/designer_d_textcenter.png diff --git a/tdevdesigner/designer/pics/designer_d_textedit.png b/kdevdesigner/designer/pics/designer_d_textedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textedit.png rename to kdevdesigner/designer/pics/designer_d_textedit.png diff --git a/tdevdesigner/designer/pics/designer_d_textfont.png b/kdevdesigner/designer/pics/designer_d_textfont.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textfont.png rename to kdevdesigner/designer/pics/designer_d_textfont.png diff --git a/tdevdesigner/designer/pics/designer_d_texth1.png b/kdevdesigner/designer/pics/designer_d_texth1.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_texth1.png rename to kdevdesigner/designer/pics/designer_d_texth1.png diff --git a/tdevdesigner/designer/pics/designer_d_texth2.png b/kdevdesigner/designer/pics/designer_d_texth2.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_texth2.png rename to kdevdesigner/designer/pics/designer_d_texth2.png diff --git a/tdevdesigner/designer/pics/designer_d_texth3.png b/kdevdesigner/designer/pics/designer_d_texth3.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_texth3.png rename to kdevdesigner/designer/pics/designer_d_texth3.png diff --git a/tdevdesigner/designer/pics/designer_d_textitalic.png b/kdevdesigner/designer/pics/designer_d_textitalic.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textitalic.png rename to kdevdesigner/designer/pics/designer_d_textitalic.png diff --git a/tdevdesigner/designer/pics/designer_d_textjustify.png b/kdevdesigner/designer/pics/designer_d_textjustify.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textjustify.png rename to kdevdesigner/designer/pics/designer_d_textjustify.png diff --git a/tdevdesigner/designer/pics/designer_d_textlarger.png b/kdevdesigner/designer/pics/designer_d_textlarger.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textlarger.png rename to kdevdesigner/designer/pics/designer_d_textlarger.png diff --git a/tdevdesigner/designer/pics/designer_d_textleft.png b/kdevdesigner/designer/pics/designer_d_textleft.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textleft.png rename to kdevdesigner/designer/pics/designer_d_textleft.png diff --git a/tdevdesigner/designer/pics/designer_d_textlinebreak.png b/kdevdesigner/designer/pics/designer_d_textlinebreak.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textlinebreak.png rename to kdevdesigner/designer/pics/designer_d_textlinebreak.png diff --git a/tdevdesigner/designer/pics/designer_d_textparagraph.png b/kdevdesigner/designer/pics/designer_d_textparagraph.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textparagraph.png rename to kdevdesigner/designer/pics/designer_d_textparagraph.png diff --git a/tdevdesigner/designer/pics/designer_d_textright.png b/kdevdesigner/designer/pics/designer_d_textright.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textright.png rename to kdevdesigner/designer/pics/designer_d_textright.png diff --git a/tdevdesigner/designer/pics/designer_d_textsmaller.png b/kdevdesigner/designer/pics/designer_d_textsmaller.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textsmaller.png rename to kdevdesigner/designer/pics/designer_d_textsmaller.png diff --git a/tdevdesigner/designer/pics/designer_d_textteletext.png b/kdevdesigner/designer/pics/designer_d_textteletext.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textteletext.png rename to kdevdesigner/designer/pics/designer_d_textteletext.png diff --git a/tdevdesigner/designer/pics/designer_d_textunderline.png b/kdevdesigner/designer/pics/designer_d_textunderline.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textunderline.png rename to kdevdesigner/designer/pics/designer_d_textunderline.png diff --git a/tdevdesigner/designer/pics/designer_d_textview.png b/kdevdesigner/designer/pics/designer_d_textview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_textview.png rename to kdevdesigner/designer/pics/designer_d_textview.png diff --git a/tdevdesigner/designer/pics/designer_d_timeedit.png b/kdevdesigner/designer/pics/designer_d_timeedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_timeedit.png rename to kdevdesigner/designer/pics/designer_d_timeedit.png diff --git a/tdevdesigner/designer/pics/designer_d_toolbox.png b/kdevdesigner/designer/pics/designer_d_toolbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_toolbox.png rename to kdevdesigner/designer/pics/designer_d_toolbox.png diff --git a/tdevdesigner/designer/pics/designer_d_toolbutton.png b/kdevdesigner/designer/pics/designer_d_toolbutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_toolbutton.png rename to kdevdesigner/designer/pics/designer_d_toolbutton.png diff --git a/tdevdesigner/designer/pics/designer_d_undo.png b/kdevdesigner/designer/pics/designer_d_undo.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_undo.png rename to kdevdesigner/designer/pics/designer_d_undo.png diff --git a/tdevdesigner/designer/pics/designer_d_up.png b/kdevdesigner/designer/pics/designer_d_up.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_up.png rename to kdevdesigner/designer/pics/designer_d_up.png diff --git a/tdevdesigner/designer/pics/designer_d_widgetstack.png b/kdevdesigner/designer/pics/designer_d_widgetstack.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_widgetstack.png rename to kdevdesigner/designer/pics/designer_d_widgetstack.png diff --git a/tdevdesigner/designer/pics/designer_d_wizarddata.png b/kdevdesigner/designer/pics/designer_d_wizarddata.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_wizarddata.png rename to kdevdesigner/designer/pics/designer_d_wizarddata.png diff --git a/tdevdesigner/designer/pics/designer_d_wizarddialog.png b/kdevdesigner/designer/pics/designer_d_wizarddialog.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_wizarddialog.png rename to kdevdesigner/designer/pics/designer_d_wizarddialog.png diff --git a/tdevdesigner/designer/pics/designer_d_wordwrap.png b/kdevdesigner/designer/pics/designer_d_wordwrap.png similarity index 100% rename from tdevdesigner/designer/pics/designer_d_wordwrap.png rename to kdevdesigner/designer/pics/designer_d_wordwrap.png diff --git a/tdevdesigner/designer/pics/designer_databrowser.png b/kdevdesigner/designer/pics/designer_databrowser.png similarity index 100% rename from tdevdesigner/designer/pics/designer_databrowser.png rename to kdevdesigner/designer/pics/designer_databrowser.png diff --git a/tdevdesigner/designer/pics/designer_datatable.png b/kdevdesigner/designer/pics/designer_datatable.png similarity index 100% rename from tdevdesigner/designer/pics/designer_datatable.png rename to kdevdesigner/designer/pics/designer_datatable.png diff --git a/tdevdesigner/designer/pics/designer_dataview.png b/kdevdesigner/designer/pics/designer_dataview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_dataview.png rename to kdevdesigner/designer/pics/designer_dataview.png diff --git a/tdevdesigner/designer/pics/designer_dateedit.png b/kdevdesigner/designer/pics/designer_dateedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_dateedit.png rename to kdevdesigner/designer/pics/designer_dateedit.png diff --git a/tdevdesigner/designer/pics/designer_datetimeedit.png b/kdevdesigner/designer/pics/designer_datetimeedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_datetimeedit.png rename to kdevdesigner/designer/pics/designer_datetimeedit.png diff --git a/tdevdesigner/designer/pics/designer_dial.png b/kdevdesigner/designer/pics/designer_dial.png similarity index 100% rename from tdevdesigner/designer/pics/designer_dial.png rename to kdevdesigner/designer/pics/designer_dial.png diff --git a/tdevdesigner/designer/pics/designer_down.png b/kdevdesigner/designer/pics/designer_down.png similarity index 100% rename from tdevdesigner/designer/pics/designer_down.png rename to kdevdesigner/designer/pics/designer_down.png diff --git a/tdevdesigner/designer/pics/designer_editbreaklayout.png b/kdevdesigner/designer/pics/designer_editbreaklayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editbreaklayout.png rename to kdevdesigner/designer/pics/designer_editbreaklayout.png diff --git a/tdevdesigner/designer/pics/designer_editcopy.png b/kdevdesigner/designer/pics/designer_editcopy.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editcopy.png rename to kdevdesigner/designer/pics/designer_editcopy.png diff --git a/tdevdesigner/designer/pics/designer_editcut.png b/kdevdesigner/designer/pics/designer_editcut.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editcut.png rename to kdevdesigner/designer/pics/designer_editcut.png diff --git a/tdevdesigner/designer/pics/designer_editdelete.png b/kdevdesigner/designer/pics/designer_editdelete.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editdelete.png rename to kdevdesigner/designer/pics/designer_editdelete.png diff --git a/tdevdesigner/designer/pics/designer_editgrid.png b/kdevdesigner/designer/pics/designer_editgrid.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editgrid.png rename to kdevdesigner/designer/pics/designer_editgrid.png diff --git a/tdevdesigner/designer/pics/designer_edithlayout.png b/kdevdesigner/designer/pics/designer_edithlayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_edithlayout.png rename to kdevdesigner/designer/pics/designer_edithlayout.png diff --git a/tdevdesigner/designer/pics/designer_edithlayoutsplit.png b/kdevdesigner/designer/pics/designer_edithlayoutsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_edithlayoutsplit.png rename to kdevdesigner/designer/pics/designer_edithlayoutsplit.png diff --git a/tdevdesigner/designer/pics/designer_editlower.png b/kdevdesigner/designer/pics/designer_editlower.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editlower.png rename to kdevdesigner/designer/pics/designer_editlower.png diff --git a/tdevdesigner/designer/pics/designer_editpaste.png b/kdevdesigner/designer/pics/designer_editpaste.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editpaste.png rename to kdevdesigner/designer/pics/designer_editpaste.png diff --git a/tdevdesigner/designer/pics/designer_editraise.png b/kdevdesigner/designer/pics/designer_editraise.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editraise.png rename to kdevdesigner/designer/pics/designer_editraise.png diff --git a/tdevdesigner/designer/pics/designer_editslots.png b/kdevdesigner/designer/pics/designer_editslots.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editslots.png rename to kdevdesigner/designer/pics/designer_editslots.png diff --git a/tdevdesigner/designer/pics/designer_editvlayout.png b/kdevdesigner/designer/pics/designer_editvlayout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editvlayout.png rename to kdevdesigner/designer/pics/designer_editvlayout.png diff --git a/tdevdesigner/designer/pics/designer_editvlayoutsplit.png b/kdevdesigner/designer/pics/designer_editvlayoutsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_editvlayoutsplit.png rename to kdevdesigner/designer/pics/designer_editvlayoutsplit.png diff --git a/tdevdesigner/designer/pics/designer_filenew.png b/kdevdesigner/designer/pics/designer_filenew.png similarity index 100% rename from tdevdesigner/designer/pics/designer_filenew.png rename to kdevdesigner/designer/pics/designer_filenew.png diff --git a/tdevdesigner/designer/pics/designer_fileopen.png b/kdevdesigner/designer/pics/designer_fileopen.png similarity index 100% rename from tdevdesigner/designer/pics/designer_fileopen.png rename to kdevdesigner/designer/pics/designer_fileopen.png diff --git a/tdevdesigner/designer/pics/designer_filesave.png b/kdevdesigner/designer/pics/designer_filesave.png similarity index 100% rename from tdevdesigner/designer/pics/designer_filesave.png rename to kdevdesigner/designer/pics/designer_filesave.png diff --git a/tdevdesigner/designer/pics/designer_folder.png b/kdevdesigner/designer/pics/designer_folder.png similarity index 100% rename from tdevdesigner/designer/pics/designer_folder.png rename to kdevdesigner/designer/pics/designer_folder.png diff --git a/tdevdesigner/designer/pics/designer_form.png b/kdevdesigner/designer/pics/designer_form.png similarity index 100% rename from tdevdesigner/designer/pics/designer_form.png rename to kdevdesigner/designer/pics/designer_form.png diff --git a/tdevdesigner/designer/pics/designer_frame.png b/kdevdesigner/designer/pics/designer_frame.png similarity index 100% rename from tdevdesigner/designer/pics/designer_frame.png rename to kdevdesigner/designer/pics/designer_frame.png diff --git a/tdevdesigner/designer/pics/designer_groupbox.png b/kdevdesigner/designer/pics/designer_groupbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_groupbox.png rename to kdevdesigner/designer/pics/designer_groupbox.png diff --git a/tdevdesigner/designer/pics/designer_hand.png b/kdevdesigner/designer/pics/designer_hand.png similarity index 100% rename from tdevdesigner/designer/pics/designer_hand.png rename to kdevdesigner/designer/pics/designer_hand.png diff --git a/tdevdesigner/designer/pics/designer_help.png b/kdevdesigner/designer/pics/designer_help.png similarity index 100% rename from tdevdesigner/designer/pics/designer_help.png rename to kdevdesigner/designer/pics/designer_help.png diff --git a/tdevdesigner/designer/pics/designer_home.png b/kdevdesigner/designer/pics/designer_home.png similarity index 100% rename from tdevdesigner/designer/pics/designer_home.png rename to kdevdesigner/designer/pics/designer_home.png diff --git a/tdevdesigner/designer/pics/designer_hsplit.png b/kdevdesigner/designer/pics/designer_hsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_hsplit.png rename to kdevdesigner/designer/pics/designer_hsplit.png diff --git a/tdevdesigner/designer/pics/designer_ibeam.png b/kdevdesigner/designer/pics/designer_ibeam.png similarity index 100% rename from tdevdesigner/designer/pics/designer_ibeam.png rename to kdevdesigner/designer/pics/designer_ibeam.png diff --git a/tdevdesigner/designer/pics/designer_iconview.png b/kdevdesigner/designer/pics/designer_iconview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_iconview.png rename to kdevdesigner/designer/pics/designer_iconview.png diff --git a/tdevdesigner/designer/pics/designer_image.png b/kdevdesigner/designer/pics/designer_image.png similarity index 100% rename from tdevdesigner/designer/pics/designer_image.png rename to kdevdesigner/designer/pics/designer_image.png diff --git a/tdevdesigner/designer/pics/designer_label.png b/kdevdesigner/designer/pics/designer_label.png similarity index 100% rename from tdevdesigner/designer/pics/designer_label.png rename to kdevdesigner/designer/pics/designer_label.png diff --git a/tdevdesigner/designer/pics/designer_layout.png b/kdevdesigner/designer/pics/designer_layout.png similarity index 100% rename from tdevdesigner/designer/pics/designer_layout.png rename to kdevdesigner/designer/pics/designer_layout.png diff --git a/tdevdesigner/designer/pics/designer_lcdnumber.png b/kdevdesigner/designer/pics/designer_lcdnumber.png similarity index 100% rename from tdevdesigner/designer/pics/designer_lcdnumber.png rename to kdevdesigner/designer/pics/designer_lcdnumber.png diff --git a/tdevdesigner/designer/pics/designer_left.png b/kdevdesigner/designer/pics/designer_left.png similarity index 100% rename from tdevdesigner/designer/pics/designer_left.png rename to kdevdesigner/designer/pics/designer_left.png diff --git a/tdevdesigner/designer/pics/designer_line.png b/kdevdesigner/designer/pics/designer_line.png similarity index 100% rename from tdevdesigner/designer/pics/designer_line.png rename to kdevdesigner/designer/pics/designer_line.png diff --git a/tdevdesigner/designer/pics/designer_lineedit.png b/kdevdesigner/designer/pics/designer_lineedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_lineedit.png rename to kdevdesigner/designer/pics/designer_lineedit.png diff --git a/tdevdesigner/designer/pics/designer_listbox.png b/kdevdesigner/designer/pics/designer_listbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_listbox.png rename to kdevdesigner/designer/pics/designer_listbox.png diff --git a/tdevdesigner/designer/pics/designer_listview.png b/kdevdesigner/designer/pics/designer_listview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_listview.png rename to kdevdesigner/designer/pics/designer_listview.png diff --git a/tdevdesigner/designer/pics/designer_multilineedit.png b/kdevdesigner/designer/pics/designer_multilineedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_multilineedit.png rename to kdevdesigner/designer/pics/designer_multilineedit.png diff --git a/tdevdesigner/designer/pics/designer_newform.png b/kdevdesigner/designer/pics/designer_newform.png similarity index 100% rename from tdevdesigner/designer/pics/designer_newform.png rename to kdevdesigner/designer/pics/designer_newform.png diff --git a/tdevdesigner/designer/pics/designer_no.png b/kdevdesigner/designer/pics/designer_no.png similarity index 100% rename from tdevdesigner/designer/pics/designer_no.png rename to kdevdesigner/designer/pics/designer_no.png diff --git a/tdevdesigner/designer/pics/designer_object.png b/kdevdesigner/designer/pics/designer_object.png similarity index 100% rename from tdevdesigner/designer/pics/designer_object.png rename to kdevdesigner/designer/pics/designer_object.png diff --git a/tdevdesigner/designer/pics/designer_ordertool.png b/kdevdesigner/designer/pics/designer_ordertool.png similarity index 100% rename from tdevdesigner/designer/pics/designer_ordertool.png rename to kdevdesigner/designer/pics/designer_ordertool.png diff --git a/tdevdesigner/designer/pics/designer_pixlabel.png b/kdevdesigner/designer/pics/designer_pixlabel.png similarity index 100% rename from tdevdesigner/designer/pics/designer_pixlabel.png rename to kdevdesigner/designer/pics/designer_pixlabel.png diff --git a/tdevdesigner/designer/pics/designer_pointer.png b/kdevdesigner/designer/pics/designer_pointer.png similarity index 100% rename from tdevdesigner/designer/pics/designer_pointer.png rename to kdevdesigner/designer/pics/designer_pointer.png diff --git a/tdevdesigner/designer/pics/designer_print.png b/kdevdesigner/designer/pics/designer_print.png similarity index 100% rename from tdevdesigner/designer/pics/designer_print.png rename to kdevdesigner/designer/pics/designer_print.png diff --git a/tdevdesigner/designer/pics/designer_progress.png b/kdevdesigner/designer/pics/designer_progress.png similarity index 100% rename from tdevdesigner/designer/pics/designer_progress.png rename to kdevdesigner/designer/pics/designer_progress.png diff --git a/tdevdesigner/designer/pics/designer_project.png b/kdevdesigner/designer/pics/designer_project.png similarity index 100% rename from tdevdesigner/designer/pics/designer_project.png rename to kdevdesigner/designer/pics/designer_project.png diff --git a/tdevdesigner/designer/pics/designer_pushbutton.png b/kdevdesigner/designer/pics/designer_pushbutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_pushbutton.png rename to kdevdesigner/designer/pics/designer_pushbutton.png diff --git a/tdevdesigner/designer/pics/designer_qtlogo.png b/kdevdesigner/designer/pics/designer_qtlogo.png similarity index 100% rename from tdevdesigner/designer/pics/designer_qtlogo.png rename to kdevdesigner/designer/pics/designer_qtlogo.png diff --git a/tdevdesigner/designer/pics/designer_radiobutton.png b/kdevdesigner/designer/pics/designer_radiobutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_radiobutton.png rename to kdevdesigner/designer/pics/designer_radiobutton.png diff --git a/tdevdesigner/designer/pics/designer_redo.png b/kdevdesigner/designer/pics/designer_redo.png similarity index 100% rename from tdevdesigner/designer/pics/designer_redo.png rename to kdevdesigner/designer/pics/designer_redo.png diff --git a/tdevdesigner/designer/pics/designer_resetproperty.png b/kdevdesigner/designer/pics/designer_resetproperty.png similarity index 100% rename from tdevdesigner/designer/pics/designer_resetproperty.png rename to kdevdesigner/designer/pics/designer_resetproperty.png diff --git a/tdevdesigner/designer/pics/designer_richtextedit.png b/kdevdesigner/designer/pics/designer_richtextedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_richtextedit.png rename to kdevdesigner/designer/pics/designer_richtextedit.png diff --git a/tdevdesigner/designer/pics/designer_right.png b/kdevdesigner/designer/pics/designer_right.png similarity index 100% rename from tdevdesigner/designer/pics/designer_right.png rename to kdevdesigner/designer/pics/designer_right.png diff --git a/tdevdesigner/designer/pics/designer_s_down.png b/kdevdesigner/designer/pics/designer_s_down.png similarity index 100% rename from tdevdesigner/designer/pics/designer_s_down.png rename to kdevdesigner/designer/pics/designer_s_down.png diff --git a/tdevdesigner/designer/pics/designer_s_editcut.png b/kdevdesigner/designer/pics/designer_s_editcut.png similarity index 100% rename from tdevdesigner/designer/pics/designer_s_editcut.png rename to kdevdesigner/designer/pics/designer_s_editcut.png diff --git a/tdevdesigner/designer/pics/designer_s_left.png b/kdevdesigner/designer/pics/designer_s_left.png similarity index 100% rename from tdevdesigner/designer/pics/designer_s_left.png rename to kdevdesigner/designer/pics/designer_s_left.png diff --git a/tdevdesigner/designer/pics/designer_s_right.png b/kdevdesigner/designer/pics/designer_s_right.png similarity index 100% rename from tdevdesigner/designer/pics/designer_s_right.png rename to kdevdesigner/designer/pics/designer_s_right.png diff --git a/tdevdesigner/designer/pics/designer_s_up.png b/kdevdesigner/designer/pics/designer_s_up.png similarity index 100% rename from tdevdesigner/designer/pics/designer_s_up.png rename to kdevdesigner/designer/pics/designer_s_up.png diff --git a/tdevdesigner/designer/pics/designer_scrollbar.png b/kdevdesigner/designer/pics/designer_scrollbar.png similarity index 100% rename from tdevdesigner/designer/pics/designer_scrollbar.png rename to kdevdesigner/designer/pics/designer_scrollbar.png diff --git a/tdevdesigner/designer/pics/designer_searchfind.png b/kdevdesigner/designer/pics/designer_searchfind.png similarity index 100% rename from tdevdesigner/designer/pics/designer_searchfind.png rename to kdevdesigner/designer/pics/designer_searchfind.png diff --git a/tdevdesigner/designer/pics/designer_setbuddy.png b/kdevdesigner/designer/pics/designer_setbuddy.png similarity index 100% rename from tdevdesigner/designer/pics/designer_setbuddy.png rename to kdevdesigner/designer/pics/designer_setbuddy.png diff --git a/tdevdesigner/designer/pics/designer_sizeall.png b/kdevdesigner/designer/pics/designer_sizeall.png similarity index 100% rename from tdevdesigner/designer/pics/designer_sizeall.png rename to kdevdesigner/designer/pics/designer_sizeall.png diff --git a/tdevdesigner/designer/pics/designer_sizeb.png b/kdevdesigner/designer/pics/designer_sizeb.png similarity index 100% rename from tdevdesigner/designer/pics/designer_sizeb.png rename to kdevdesigner/designer/pics/designer_sizeb.png diff --git a/tdevdesigner/designer/pics/designer_sizef.png b/kdevdesigner/designer/pics/designer_sizef.png similarity index 100% rename from tdevdesigner/designer/pics/designer_sizef.png rename to kdevdesigner/designer/pics/designer_sizef.png diff --git a/tdevdesigner/designer/pics/designer_sizeh.png b/kdevdesigner/designer/pics/designer_sizeh.png similarity index 100% rename from tdevdesigner/designer/pics/designer_sizeh.png rename to kdevdesigner/designer/pics/designer_sizeh.png diff --git a/tdevdesigner/designer/pics/designer_sizev.png b/kdevdesigner/designer/pics/designer_sizev.png similarity index 100% rename from tdevdesigner/designer/pics/designer_sizev.png rename to kdevdesigner/designer/pics/designer_sizev.png diff --git a/tdevdesigner/designer/pics/designer_slider.png b/kdevdesigner/designer/pics/designer_slider.png similarity index 100% rename from tdevdesigner/designer/pics/designer_slider.png rename to kdevdesigner/designer/pics/designer_slider.png diff --git a/tdevdesigner/designer/pics/designer_spacer.png b/kdevdesigner/designer/pics/designer_spacer.png similarity index 100% rename from tdevdesigner/designer/pics/designer_spacer.png rename to kdevdesigner/designer/pics/designer_spacer.png diff --git a/tdevdesigner/designer/pics/designer_spinbox.png b/kdevdesigner/designer/pics/designer_spinbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_spinbox.png rename to kdevdesigner/designer/pics/designer_spinbox.png diff --git a/tdevdesigner/designer/pics/designer_splash.png b/kdevdesigner/designer/pics/designer_splash.png similarity index 100% rename from tdevdesigner/designer/pics/designer_splash.png rename to kdevdesigner/designer/pics/designer_splash.png diff --git a/tdevdesigner/designer/pics/designer_table.png b/kdevdesigner/designer/pics/designer_table.png similarity index 100% rename from tdevdesigner/designer/pics/designer_table.png rename to kdevdesigner/designer/pics/designer_table.png diff --git a/tdevdesigner/designer/pics/designer_tabwidget.png b/kdevdesigner/designer/pics/designer_tabwidget.png similarity index 100% rename from tdevdesigner/designer/pics/designer_tabwidget.png rename to kdevdesigner/designer/pics/designer_tabwidget.png diff --git a/tdevdesigner/designer/pics/designer_textbold.png b/kdevdesigner/designer/pics/designer_textbold.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textbold.png rename to kdevdesigner/designer/pics/designer_textbold.png diff --git a/tdevdesigner/designer/pics/designer_textbrowser.png b/kdevdesigner/designer/pics/designer_textbrowser.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textbrowser.png rename to kdevdesigner/designer/pics/designer_textbrowser.png diff --git a/tdevdesigner/designer/pics/designer_textcenter.png b/kdevdesigner/designer/pics/designer_textcenter.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textcenter.png rename to kdevdesigner/designer/pics/designer_textcenter.png diff --git a/tdevdesigner/designer/pics/designer_textedit.png b/kdevdesigner/designer/pics/designer_textedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textedit.png rename to kdevdesigner/designer/pics/designer_textedit.png diff --git a/tdevdesigner/designer/pics/designer_textfont.png b/kdevdesigner/designer/pics/designer_textfont.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textfont.png rename to kdevdesigner/designer/pics/designer_textfont.png diff --git a/tdevdesigner/designer/pics/designer_texth1.png b/kdevdesigner/designer/pics/designer_texth1.png similarity index 100% rename from tdevdesigner/designer/pics/designer_texth1.png rename to kdevdesigner/designer/pics/designer_texth1.png diff --git a/tdevdesigner/designer/pics/designer_texth2.png b/kdevdesigner/designer/pics/designer_texth2.png similarity index 100% rename from tdevdesigner/designer/pics/designer_texth2.png rename to kdevdesigner/designer/pics/designer_texth2.png diff --git a/tdevdesigner/designer/pics/designer_texth3.png b/kdevdesigner/designer/pics/designer_texth3.png similarity index 100% rename from tdevdesigner/designer/pics/designer_texth3.png rename to kdevdesigner/designer/pics/designer_texth3.png diff --git a/tdevdesigner/designer/pics/designer_textitalic.png b/kdevdesigner/designer/pics/designer_textitalic.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textitalic.png rename to kdevdesigner/designer/pics/designer_textitalic.png diff --git a/tdevdesigner/designer/pics/designer_textjustify.png b/kdevdesigner/designer/pics/designer_textjustify.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textjustify.png rename to kdevdesigner/designer/pics/designer_textjustify.png diff --git a/tdevdesigner/designer/pics/designer_textlarger.png b/kdevdesigner/designer/pics/designer_textlarger.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textlarger.png rename to kdevdesigner/designer/pics/designer_textlarger.png diff --git a/tdevdesigner/designer/pics/designer_textleft.png b/kdevdesigner/designer/pics/designer_textleft.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textleft.png rename to kdevdesigner/designer/pics/designer_textleft.png diff --git a/tdevdesigner/designer/pics/designer_textlinebreak.png b/kdevdesigner/designer/pics/designer_textlinebreak.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textlinebreak.png rename to kdevdesigner/designer/pics/designer_textlinebreak.png diff --git a/tdevdesigner/designer/pics/designer_textparagraph.png b/kdevdesigner/designer/pics/designer_textparagraph.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textparagraph.png rename to kdevdesigner/designer/pics/designer_textparagraph.png diff --git a/tdevdesigner/designer/pics/designer_textright.png b/kdevdesigner/designer/pics/designer_textright.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textright.png rename to kdevdesigner/designer/pics/designer_textright.png diff --git a/tdevdesigner/designer/pics/designer_textsmaller.png b/kdevdesigner/designer/pics/designer_textsmaller.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textsmaller.png rename to kdevdesigner/designer/pics/designer_textsmaller.png diff --git a/tdevdesigner/designer/pics/designer_textteletext.png b/kdevdesigner/designer/pics/designer_textteletext.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textteletext.png rename to kdevdesigner/designer/pics/designer_textteletext.png diff --git a/tdevdesigner/designer/pics/designer_textunderline.png b/kdevdesigner/designer/pics/designer_textunderline.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textunderline.png rename to kdevdesigner/designer/pics/designer_textunderline.png diff --git a/tdevdesigner/designer/pics/designer_textview.png b/kdevdesigner/designer/pics/designer_textview.png similarity index 100% rename from tdevdesigner/designer/pics/designer_textview.png rename to kdevdesigner/designer/pics/designer_textview.png diff --git a/tdevdesigner/designer/pics/designer_timeedit.png b/kdevdesigner/designer/pics/designer_timeedit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_timeedit.png rename to kdevdesigner/designer/pics/designer_timeedit.png diff --git a/tdevdesigner/designer/pics/designer_toolbox.png b/kdevdesigner/designer/pics/designer_toolbox.png similarity index 100% rename from tdevdesigner/designer/pics/designer_toolbox.png rename to kdevdesigner/designer/pics/designer_toolbox.png diff --git a/tdevdesigner/designer/pics/designer_toolbutton.png b/kdevdesigner/designer/pics/designer_toolbutton.png similarity index 100% rename from tdevdesigner/designer/pics/designer_toolbutton.png rename to kdevdesigner/designer/pics/designer_toolbutton.png diff --git a/tdevdesigner/designer/pics/designer_undo.png b/kdevdesigner/designer/pics/designer_undo.png similarity index 100% rename from tdevdesigner/designer/pics/designer_undo.png rename to kdevdesigner/designer/pics/designer_undo.png diff --git a/tdevdesigner/designer/pics/designer_up.png b/kdevdesigner/designer/pics/designer_up.png similarity index 100% rename from tdevdesigner/designer/pics/designer_up.png rename to kdevdesigner/designer/pics/designer_up.png diff --git a/tdevdesigner/designer/pics/designer_uparrow.png b/kdevdesigner/designer/pics/designer_uparrow.png similarity index 100% rename from tdevdesigner/designer/pics/designer_uparrow.png rename to kdevdesigner/designer/pics/designer_uparrow.png diff --git a/tdevdesigner/designer/pics/designer_vsplit.png b/kdevdesigner/designer/pics/designer_vsplit.png similarity index 100% rename from tdevdesigner/designer/pics/designer_vsplit.png rename to kdevdesigner/designer/pics/designer_vsplit.png diff --git a/tdevdesigner/designer/pics/designer_wait.png b/kdevdesigner/designer/pics/designer_wait.png similarity index 100% rename from tdevdesigner/designer/pics/designer_wait.png rename to kdevdesigner/designer/pics/designer_wait.png diff --git a/tdevdesigner/designer/pics/designer_widgetstack.png b/kdevdesigner/designer/pics/designer_widgetstack.png similarity index 100% rename from tdevdesigner/designer/pics/designer_widgetstack.png rename to kdevdesigner/designer/pics/designer_widgetstack.png diff --git a/tdevdesigner/designer/pics/designer_wizarddata.png b/kdevdesigner/designer/pics/designer_wizarddata.png similarity index 100% rename from tdevdesigner/designer/pics/designer_wizarddata.png rename to kdevdesigner/designer/pics/designer_wizarddata.png diff --git a/tdevdesigner/designer/pics/designer_wizarddialog.png b/kdevdesigner/designer/pics/designer_wizarddialog.png similarity index 100% rename from tdevdesigner/designer/pics/designer_wizarddialog.png rename to kdevdesigner/designer/pics/designer_wizarddialog.png diff --git a/tdevdesigner/designer/pics/designer_wordwrap.png b/kdevdesigner/designer/pics/designer_wordwrap.png similarity index 100% rename from tdevdesigner/designer/pics/designer_wordwrap.png rename to kdevdesigner/designer/pics/designer_wordwrap.png diff --git a/tdevdesigner/designer/pixmapchooser.cpp b/kdevdesigner/designer/pixmapchooser.cpp similarity index 98% rename from tdevdesigner/designer/pixmapchooser.cpp rename to kdevdesigner/designer/pixmapchooser.cpp index 279997ba..92d68ac1 100644 --- a/tdevdesigner/designer/pixmapchooser.cpp +++ b/kdevdesigner/designer/pixmapchooser.cpp @@ -32,7 +32,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include "pixmapchooser.h" #include "formwindow.h" @@ -196,7 +196,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T if ( dia.exec() == TQDialog::Accepted ) { TQPixmap pix; // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that - pix.convertFromImage( BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ).convertToImage() ); + pix.convertFromImage( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ).convertToImage() ); MetaDataBase::setPixmapArgument( TQT_TQOBJECT(fw), pix.serialNumber(), dia.editArguments->text() ); return pix; @@ -211,7 +211,7 @@ TQPixmap qChoosePixmap( TQWidget *parent, FormWindow *fw, const TQPixmap &old, T } ImageIconProvider::ImageIconProvider( TQWidget *parent, const char *name ) - : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ) ) + : TQFileIconProvider( TQT_TQOBJECT(parent), name ), imagepm( BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ) ) { fmts = TQImage::inputFormats(); } diff --git a/tdevdesigner/designer/pixmapchooser.h b/kdevdesigner/designer/pixmapchooser.h similarity index 100% rename from tdevdesigner/designer/pixmapchooser.h rename to kdevdesigner/designer/pixmapchooser.h diff --git a/tdevdesigner/designer/pixmapcollection.cpp b/kdevdesigner/designer/pixmapcollection.cpp similarity index 100% rename from tdevdesigner/designer/pixmapcollection.cpp rename to kdevdesigner/designer/pixmapcollection.cpp diff --git a/tdevdesigner/designer/pixmapcollection.h b/kdevdesigner/designer/pixmapcollection.h similarity index 100% rename from tdevdesigner/designer/pixmapcollection.h rename to kdevdesigner/designer/pixmapcollection.h diff --git a/tdevdesigner/designer/pixmapcollectioneditor.ui b/kdevdesigner/designer/pixmapcollectioneditor.ui similarity index 100% rename from tdevdesigner/designer/pixmapcollectioneditor.ui rename to kdevdesigner/designer/pixmapcollectioneditor.ui diff --git a/tdevdesigner/designer/pixmapcollectioneditor.ui.h b/kdevdesigner/designer/pixmapcollectioneditor.ui.h similarity index 100% rename from tdevdesigner/designer/pixmapcollectioneditor.ui.h rename to kdevdesigner/designer/pixmapcollectioneditor.ui.h diff --git a/tdevdesigner/designer/pixmapfunction.ui b/kdevdesigner/designer/pixmapfunction.ui similarity index 100% rename from tdevdesigner/designer/pixmapfunction.ui rename to kdevdesigner/designer/pixmapfunction.ui diff --git a/tdevdesigner/designer/popupmenueditor.cpp b/kdevdesigner/designer/popupmenueditor.cpp similarity index 100% rename from tdevdesigner/designer/popupmenueditor.cpp rename to kdevdesigner/designer/popupmenueditor.cpp diff --git a/tdevdesigner/designer/popupmenueditor.h b/kdevdesigner/designer/popupmenueditor.h similarity index 100% rename from tdevdesigner/designer/popupmenueditor.h rename to kdevdesigner/designer/popupmenueditor.h diff --git a/tdevdesigner/designer/preferences.ui b/kdevdesigner/designer/preferences.ui similarity index 100% rename from tdevdesigner/designer/preferences.ui rename to kdevdesigner/designer/preferences.ui diff --git a/tdevdesigner/designer/previewframe.cpp b/kdevdesigner/designer/previewframe.cpp similarity index 100% rename from tdevdesigner/designer/previewframe.cpp rename to kdevdesigner/designer/previewframe.cpp diff --git a/tdevdesigner/designer/previewframe.h b/kdevdesigner/designer/previewframe.h similarity index 100% rename from tdevdesigner/designer/previewframe.h rename to kdevdesigner/designer/previewframe.h diff --git a/tdevdesigner/designer/previewwidget.ui b/kdevdesigner/designer/previewwidget.ui similarity index 100% rename from tdevdesigner/designer/previewwidget.ui rename to kdevdesigner/designer/previewwidget.ui diff --git a/tdevdesigner/designer/previewwidgetimpl.cpp b/kdevdesigner/designer/previewwidgetimpl.cpp similarity index 100% rename from tdevdesigner/designer/previewwidgetimpl.cpp rename to kdevdesigner/designer/previewwidgetimpl.cpp diff --git a/tdevdesigner/designer/previewwidgetimpl.h b/kdevdesigner/designer/previewwidgetimpl.h similarity index 100% rename from tdevdesigner/designer/previewwidgetimpl.h rename to kdevdesigner/designer/previewwidgetimpl.h diff --git a/tdevdesigner/designer/project.cpp b/kdevdesigner/designer/project.cpp similarity index 100% rename from tdevdesigner/designer/project.cpp rename to kdevdesigner/designer/project.cpp diff --git a/tdevdesigner/designer/project.h b/kdevdesigner/designer/project.h similarity index 100% rename from tdevdesigner/designer/project.h rename to kdevdesigner/designer/project.h diff --git a/tdevdesigner/designer/projectsettings.ui b/kdevdesigner/designer/projectsettings.ui similarity index 100% rename from tdevdesigner/designer/projectsettings.ui rename to kdevdesigner/designer/projectsettings.ui diff --git a/tdevdesigner/designer/projectsettingsimpl.cpp b/kdevdesigner/designer/projectsettingsimpl.cpp similarity index 100% rename from tdevdesigner/designer/projectsettingsimpl.cpp rename to kdevdesigner/designer/projectsettingsimpl.cpp diff --git a/tdevdesigner/designer/projectsettingsimpl.h b/kdevdesigner/designer/projectsettingsimpl.h similarity index 100% rename from tdevdesigner/designer/projectsettingsimpl.h rename to kdevdesigner/designer/projectsettingsimpl.h diff --git a/tdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp similarity index 99% rename from tdevdesigner/designer/propertyeditor.cpp rename to kdevdesigner/designer/propertyeditor.cpp index c22e9b22..e7a5d387 100644 --- a/tdevdesigner/designer/propertyeditor.cpp +++ b/kdevdesigner/designer/propertyeditor.cpp @@ -47,7 +47,7 @@ #include #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -405,7 +405,7 @@ void PropertyItem::createResetButton() resetButton->parentWidget()->lower(); return; } - const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , TDevDesignerPartFactory::instance()); + const TQPixmap DesignerResetPix = SmallIcon( "designer_resetproperty.png" , KDevDesignerPartFactory::instance()); TQHBox *hbox = new TQHBox( listview->viewport() ); hbox->setFrameStyle( TQFrame::StyledPanel | TQFrame::Sunken ); @@ -2362,20 +2362,20 @@ TQComboBox *PropertyCursorItem::combo() comb->hide(); TQBitmap cur; - const TQPixmap ArrowPix = SmallIcon( "designer_arrow.png" , TDevDesignerPartFactory::instance()); - const TQPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , TDevDesignerPartFactory::instance()); - const TQPixmap CrossPix = SmallIcon( "designer_cross.png" , TDevDesignerPartFactory::instance()); - const TQPixmap WaitPix = SmallIcon( "designer_wait.png" , TDevDesignerPartFactory::instance()); - const TQPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , TDevDesignerPartFactory::instance()); - const TQPixmap SizeVPix = SmallIcon( "designer_sizev.png" , TDevDesignerPartFactory::instance()); - const TQPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , TDevDesignerPartFactory::instance()); - const TQPixmap SizeFPix = SmallIcon( "designer_sizef.png" , TDevDesignerPartFactory::instance()); - const TQPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , TDevDesignerPartFactory::instance()); - const TQPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , TDevDesignerPartFactory::instance()); - const TQPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , TDevDesignerPartFactory::instance()); - const TQPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , TDevDesignerPartFactory::instance()); - const TQPixmap HandPix = SmallIcon( "designer_hand.png" , TDevDesignerPartFactory::instance()); - const TQPixmap NoPix = SmallIcon( "designer_no.png" , TDevDesignerPartFactory::instance()); + const TQPixmap ArrowPix = SmallIcon( "designer_arrow.png" , KDevDesignerPartFactory::instance()); + const TQPixmap UpArrowPix = SmallIcon( "designer_uparrow.png" , KDevDesignerPartFactory::instance()); + const TQPixmap CrossPix = SmallIcon( "designer_cross.png" , KDevDesignerPartFactory::instance()); + const TQPixmap WaitPix = SmallIcon( "designer_wait.png" , KDevDesignerPartFactory::instance()); + const TQPixmap IBeamPix = SmallIcon( "designer_ibeam.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeVPix = SmallIcon( "designer_sizev.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeHPix = SmallIcon( "designer_sizeh.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeFPix = SmallIcon( "designer_sizef.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeBPix = SmallIcon( "designer_sizeb.png" , KDevDesignerPartFactory::instance()); + const TQPixmap SizeAllPix = SmallIcon( "designer_sizeall.png" , KDevDesignerPartFactory::instance()); + const TQPixmap VSplitPix = SmallIcon( "designer_vsplit.png" , KDevDesignerPartFactory::instance()); + const TQPixmap HSplitPix = SmallIcon( "designer_hsplit.png" , KDevDesignerPartFactory::instance()); + const TQPixmap HandPix = SmallIcon( "designer_hand.png" , KDevDesignerPartFactory::instance()); + const TQPixmap NoPix = SmallIcon( "designer_no.png" , KDevDesignerPartFactory::instance()); comb->insertItem( ArrowPix, i18n("Arrow"), TQObject::ArrowCursor); comb->insertItem( UpArrowPix, i18n("Up-Arrow"), TQObject::UpArrowCursor ); @@ -3958,7 +3958,7 @@ void EventList::setup() if ( !formWindow ) return; LanguageInterface *iface = MetaDataBase::languageInterface( formWindow->project()->language() ); - const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()); + const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); TQStrList sigs; if ( iface ) { @@ -4004,7 +4004,7 @@ void EventList::contentsMouseDoubleClickEvent( TQMouseEvent *e ) s = TQString( editor->widget()->name() ) + "_" + i->text( 0 ); } - const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()); + const TQPixmap DesignerEditSlotsPix = SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()); insertEntry( i, DesignerEditSlotsPix , s ); } @@ -4028,8 +4028,8 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) TQPopupMenu menu; const int NEW_ITEM = 1; const int DEL_ITEM = 2; - menu.insertItem( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()), i18n( "New Signal Handler" ), NEW_ITEM ); - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), i18n( "Delete Signal Handler" ), DEL_ITEM ); + menu.insertItem( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()), i18n( "New Signal Handler" ), NEW_ITEM ); + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "Delete Signal Handler" ), DEL_ITEM ); int res = menu.exec( pos ); if ( res == NEW_ITEM ) { TQString s; @@ -4042,7 +4042,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos ) } else { s = TQString( editor->widget()->name() ) + "_" + ( i->parent() ? i->parent() : i )->text( 0 ); } - insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , TDevDesignerPartFactory::instance()), s ); + insertEntry( i->parent() ? i->parent() : i, SmallIcon( "designer_editslots.png" , KDevDesignerPartFactory::instance()), s ); } else if ( res == DEL_ITEM && i->parent() ) { MetaDataBase::Connection conn; conn.sender = editor->widget(); @@ -4100,7 +4100,7 @@ void EventList::renamed( TQListViewItem *i ) funcname += "(" + sig + ")"; } - //normally add a function in tdevdesigner + //normally add a function in kdevdesigner AddFunctionCommand *cmd2 = new AddFunctionCommand( i18n( "Add Function" ), formWindow, funcname.latin1(), "virtual", "public", diff --git a/tdevdesigner/designer/propertyeditor.h b/kdevdesigner/designer/propertyeditor.h similarity index 100% rename from tdevdesigner/designer/propertyeditor.h rename to kdevdesigner/designer/propertyeditor.h diff --git a/tdevdesigner/designer/propertyobject.cpp b/kdevdesigner/designer/propertyobject.cpp similarity index 100% rename from tdevdesigner/designer/propertyobject.cpp rename to kdevdesigner/designer/propertyobject.cpp diff --git a/tdevdesigner/designer/propertyobject.h b/kdevdesigner/designer/propertyobject.h similarity index 100% rename from tdevdesigner/designer/propertyobject.h rename to kdevdesigner/designer/propertyobject.h diff --git a/tdevdesigner/designer/qcompletionedit.cpp b/kdevdesigner/designer/qcompletionedit.cpp similarity index 100% rename from tdevdesigner/designer/qcompletionedit.cpp rename to kdevdesigner/designer/qcompletionedit.cpp diff --git a/tdevdesigner/designer/qcompletionedit.h b/kdevdesigner/designer/qcompletionedit.h similarity index 100% rename from tdevdesigner/designer/qcompletionedit.h rename to kdevdesigner/designer/qcompletionedit.h diff --git a/tdevdesigner/designer/replacedialog.ui b/kdevdesigner/designer/replacedialog.ui similarity index 100% rename from tdevdesigner/designer/replacedialog.ui rename to kdevdesigner/designer/replacedialog.ui diff --git a/tdevdesigner/designer/replacedialog.ui.h b/kdevdesigner/designer/replacedialog.ui.h similarity index 100% rename from tdevdesigner/designer/replacedialog.ui.h rename to kdevdesigner/designer/replacedialog.ui.h diff --git a/tdevdesigner/designer/resource.cpp b/kdevdesigner/designer/resource.cpp similarity index 99% rename from tdevdesigner/designer/resource.cpp rename to kdevdesigner/designer/resource.cpp index 26b46a68..a6285db5 100644 --- a/tdevdesigner/designer/resource.cpp +++ b/kdevdesigner/designer/resource.cpp @@ -85,7 +85,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" static TQString makeIndent( int indent ) { @@ -1299,7 +1299,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* if ( mainwindow && mainwindow->currProject() ) { pix = mainwindow->currProject()->pixmapCollection()->pixmap( arg ); } else { - pix = BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ); + pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( pix.convertToImage() ); } @@ -1307,7 +1307,7 @@ TQPixmap Resource::loadPixmap( const TQDomElement &e, const TQString &/*tagname* MetaDataBase::setPixmapKey( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); return pix; } - TQPixmap pix = BarIcon( "designer_image.png", TDevDesignerPartFactory::instance() ); + TQPixmap pix = BarIcon( "designer_image.png", KDevDesignerPartFactory::instance() ); // we have to force the pixmap to get a new and unique serial number. Unfortunately detatch() doesn't do that pix.convertFromImage( pix.convertToImage() ); MetaDataBase::setPixmapArgument( TQT_TQOBJECT(formwindow), pix.serialNumber(), arg ); diff --git a/tdevdesigner/designer/resource.h b/kdevdesigner/designer/resource.h similarity index 100% rename from tdevdesigner/designer/resource.h rename to kdevdesigner/designer/resource.h diff --git a/tdevdesigner/designer/richtextfontdialog.ui b/kdevdesigner/designer/richtextfontdialog.ui similarity index 100% rename from tdevdesigner/designer/richtextfontdialog.ui rename to kdevdesigner/designer/richtextfontdialog.ui diff --git a/tdevdesigner/designer/richtextfontdialog.ui.h b/kdevdesigner/designer/richtextfontdialog.ui.h similarity index 100% rename from tdevdesigner/designer/richtextfontdialog.ui.h rename to kdevdesigner/designer/richtextfontdialog.ui.h diff --git a/tdevdesigner/designer/sizehandle.cpp b/kdevdesigner/designer/sizehandle.cpp similarity index 100% rename from tdevdesigner/designer/sizehandle.cpp rename to kdevdesigner/designer/sizehandle.cpp diff --git a/tdevdesigner/designer/sizehandle.h b/kdevdesigner/designer/sizehandle.h similarity index 100% rename from tdevdesigner/designer/sizehandle.h rename to kdevdesigner/designer/sizehandle.h diff --git a/tdevdesigner/designer/sourceeditor.cpp b/kdevdesigner/designer/sourceeditor.cpp similarity index 98% rename from tdevdesigner/designer/sourceeditor.cpp rename to kdevdesigner/designer/sourceeditor.cpp index 43d18cba..2850e20e 100644 --- a/tdevdesigner/designer/sourceeditor.cpp +++ b/kdevdesigner/designer/sourceeditor.cpp @@ -38,7 +38,7 @@ #include "hierarchyview.h" #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageInterface *liface ) : TQVBox( parent, 0, WDestructiveClose ), iFace( iface ), lIface( liface ), obj( 0 ), pro( 0 ) @@ -49,7 +49,7 @@ SourceEditor::SourceEditor( TQWidget *parent, EditorInterface *iface, LanguageIn this, MainWindow::self->designerInterface() ); iFace->onBreakPointChange( TQT_TQOBJECT(MainWindow::self), TQT_SLOT( breakPointsChanged() ) ); resize( 600, 400 ); - setIcon( SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) ); + setIcon( SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } SourceEditor::~SourceEditor() diff --git a/tdevdesigner/designer/sourceeditor.h b/kdevdesigner/designer/sourceeditor.h similarity index 100% rename from tdevdesigner/designer/sourceeditor.h rename to kdevdesigner/designer/sourceeditor.h diff --git a/tdevdesigner/designer/sourcefile.cpp b/kdevdesigner/designer/sourcefile.cpp similarity index 100% rename from tdevdesigner/designer/sourcefile.cpp rename to kdevdesigner/designer/sourcefile.cpp diff --git a/tdevdesigner/designer/sourcefile.h b/kdevdesigner/designer/sourcefile.h similarity index 100% rename from tdevdesigner/designer/sourcefile.h rename to kdevdesigner/designer/sourcefile.h diff --git a/tdevdesigner/designer/startdialog.ui b/kdevdesigner/designer/startdialog.ui similarity index 100% rename from tdevdesigner/designer/startdialog.ui rename to kdevdesigner/designer/startdialog.ui diff --git a/tdevdesigner/designer/startdialogimpl.cpp b/kdevdesigner/designer/startdialogimpl.cpp similarity index 98% rename from tdevdesigner/designer/startdialogimpl.cpp rename to kdevdesigner/designer/startdialogimpl.cpp index e7099068..adff44fd 100644 --- a/tdevdesigner/designer/startdialogimpl.cpp +++ b/kdevdesigner/designer/startdialogimpl.cpp @@ -18,7 +18,7 @@ #include #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include "mainwindow.h" #include "startdialogimpl.h" @@ -138,7 +138,7 @@ void StartDialog::insertRecentItems( TQStringList &files, bool isProject ) TQFileInfo fi( *it ); item = new TQIconViewItem( recentView, fi.fileName() ); recentFiles[recentView->index( item )] = *it; - item->setPixmap( BarIcon( iconName, TDevDesignerPartFactory::instance() ) ); + item->setPixmap( BarIcon( iconName, KDevDesignerPartFactory::instance() ) ); item->setDragEnabled( FALSE ); } } diff --git a/tdevdesigner/designer/startdialogimpl.h b/kdevdesigner/designer/startdialogimpl.h similarity index 100% rename from tdevdesigner/designer/startdialogimpl.h rename to kdevdesigner/designer/startdialogimpl.h diff --git a/tdevdesigner/designer/styledbutton.cpp b/kdevdesigner/designer/styledbutton.cpp similarity index 100% rename from tdevdesigner/designer/styledbutton.cpp rename to kdevdesigner/designer/styledbutton.cpp diff --git a/tdevdesigner/designer/styledbutton.h b/kdevdesigner/designer/styledbutton.h similarity index 100% rename from tdevdesigner/designer/styledbutton.h rename to kdevdesigner/designer/styledbutton.h diff --git a/tdevdesigner/designer/syntaxhighlighter_html.cpp b/kdevdesigner/designer/syntaxhighlighter_html.cpp similarity index 100% rename from tdevdesigner/designer/syntaxhighlighter_html.cpp rename to kdevdesigner/designer/syntaxhighlighter_html.cpp diff --git a/tdevdesigner/designer/syntaxhighlighter_html.h b/kdevdesigner/designer/syntaxhighlighter_html.h similarity index 100% rename from tdevdesigner/designer/syntaxhighlighter_html.h rename to kdevdesigner/designer/syntaxhighlighter_html.h diff --git a/tdevdesigner/designer/tableeditor.ui b/kdevdesigner/designer/tableeditor.ui similarity index 100% rename from tdevdesigner/designer/tableeditor.ui rename to kdevdesigner/designer/tableeditor.ui diff --git a/tdevdesigner/designer/tableeditorimpl.cpp b/kdevdesigner/designer/tableeditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/tableeditorimpl.cpp rename to kdevdesigner/designer/tableeditorimpl.cpp diff --git a/tdevdesigner/designer/tableeditorimpl.h b/kdevdesigner/designer/tableeditorimpl.h similarity index 100% rename from tdevdesigner/designer/tableeditorimpl.h rename to kdevdesigner/designer/tableeditorimpl.h diff --git a/tdevdesigner/designer/timestamp.cpp b/kdevdesigner/designer/timestamp.cpp similarity index 100% rename from tdevdesigner/designer/timestamp.cpp rename to kdevdesigner/designer/timestamp.cpp diff --git a/tdevdesigner/designer/timestamp.h b/kdevdesigner/designer/timestamp.h similarity index 100% rename from tdevdesigner/designer/timestamp.h rename to kdevdesigner/designer/timestamp.h diff --git a/tdevdesigner/designer/variabledialog.ui b/kdevdesigner/designer/variabledialog.ui similarity index 100% rename from tdevdesigner/designer/variabledialog.ui rename to kdevdesigner/designer/variabledialog.ui diff --git a/tdevdesigner/designer/variabledialogimpl.cpp b/kdevdesigner/designer/variabledialogimpl.cpp similarity index 100% rename from tdevdesigner/designer/variabledialogimpl.cpp rename to kdevdesigner/designer/variabledialogimpl.cpp diff --git a/tdevdesigner/designer/variabledialogimpl.h b/kdevdesigner/designer/variabledialogimpl.h similarity index 100% rename from tdevdesigner/designer/variabledialogimpl.h rename to kdevdesigner/designer/variabledialogimpl.h diff --git a/tdevdesigner/designer/widgetaction.cpp b/kdevdesigner/designer/widgetaction.cpp similarity index 100% rename from tdevdesigner/designer/widgetaction.cpp rename to kdevdesigner/designer/widgetaction.cpp diff --git a/tdevdesigner/designer/widgetaction.h b/kdevdesigner/designer/widgetaction.h similarity index 100% rename from tdevdesigner/designer/widgetaction.h rename to kdevdesigner/designer/widgetaction.h diff --git a/tdevdesigner/designer/widgetfactory.cpp b/kdevdesigner/designer/widgetfactory.cpp similarity index 99% rename from tdevdesigner/designer/widgetfactory.cpp rename to kdevdesigner/designer/widgetfactory.cpp index 1271e84e..9d04535a 100644 --- a/tdevdesigner/designer/widgetfactory.cpp +++ b/kdevdesigner/designer/widgetfactory.cpp @@ -45,7 +45,7 @@ #include "menubareditor.h" #include "popupmenueditor.h" -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include @@ -797,7 +797,7 @@ TQWidget *WidgetFactory::createWidget( const TQString &className, TQWidget *pare } else if ( className == "PixmapLabel" ) { QDesignerLabel *l = new QDesignerLabel( parent, name ); if ( init ) { - l->setPixmap( BarIcon( "designer_qtlogo.png", TDevDesignerPartFactory::instance() ) ); + l->setPixmap( BarIcon( "designer_qtlogo.png", KDevDesignerPartFactory::instance() ) ); l->setScaledContents( TRUE ); MetaDataBase::addEntry( TQT_TQOBJECT(l) ); MetaDataBase::setPropertyChanged( TQT_TQOBJECT(l), "pixmap", TRUE ); diff --git a/tdevdesigner/designer/widgetfactory.h b/kdevdesigner/designer/widgetfactory.h similarity index 100% rename from tdevdesigner/designer/widgetfactory.h rename to kdevdesigner/designer/widgetfactory.h diff --git a/tdevdesigner/designer/wizardeditor.ui b/kdevdesigner/designer/wizardeditor.ui similarity index 100% rename from tdevdesigner/designer/wizardeditor.ui rename to kdevdesigner/designer/wizardeditor.ui diff --git a/tdevdesigner/designer/wizardeditorimpl.cpp b/kdevdesigner/designer/wizardeditorimpl.cpp similarity index 100% rename from tdevdesigner/designer/wizardeditorimpl.cpp rename to kdevdesigner/designer/wizardeditorimpl.cpp diff --git a/tdevdesigner/designer/wizardeditorimpl.h b/kdevdesigner/designer/wizardeditorimpl.h similarity index 100% rename from tdevdesigner/designer/wizardeditorimpl.h rename to kdevdesigner/designer/wizardeditorimpl.h diff --git a/tdevdesigner/designer/workspace.cpp b/kdevdesigner/designer/workspace.cpp similarity index 97% rename from tdevdesigner/designer/workspace.cpp rename to kdevdesigner/designer/workspace.cpp index 7eb7f86f..b806cc6c 100644 --- a/tdevdesigner/designer/workspace.cpp +++ b/kdevdesigner/designer/workspace.cpp @@ -37,7 +37,7 @@ #include "propertyeditor.h" #include -#include "tdevdesigner_part.h" +#include "kdevdesigner_part.h" #include #include @@ -59,7 +59,7 @@ WorkspaceItem::WorkspaceItem( TQListView *parent, Project* p ) init(); project = p; t = ProjectType; - setPixmap( 0, SmallIcon( "designer_folder.png" , TDevDesignerPartFactory::instance()) ); + setPixmap( 0, SmallIcon( "designer_folder.png" , KDevDesignerPartFactory::instance()) ); setExpandable( FALSE ); } @@ -69,7 +69,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, SourceFile* sf ) init(); sourceFile = sf; t = SourceFileType; - setPixmap( 0, SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) ); + setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) @@ -79,7 +79,7 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, TQObject *o, Project *p ) object = o; project = p; t = ObjectType; - setPixmap( 0, SmallIcon( "designer_object.png" , TDevDesignerPartFactory::instance()) ); + setPixmap( 0, SmallIcon( "designer_object.png" , KDevDesignerPartFactory::instance()) ); TQObject::connect( p->fakeFormFileFor( o ), TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update() ) ); } @@ -91,13 +91,13 @@ WorkspaceItem::WorkspaceItem( TQListViewItem *parent, FormFile* ff, Type type ) formFile = ff; t = type; if ( type == FormFileType ) { - setPixmap( 0, SmallIcon( "designer_form.png" , TDevDesignerPartFactory::instance()) ); + setPixmap( 0, SmallIcon( "designer_form.png" , KDevDesignerPartFactory::instance()) ); TQObject::connect( ff, TQT_SIGNAL( somethingChanged(FormFile*) ), listView(), TQT_SLOT( update(FormFile*) ) ); if ( formFile->supportsCodeFile() ) { (void) new WorkspaceItem( this, formFile, FormSourceType ); } } else if ( type == FormSourceType ) { - setPixmap( 0, SmallIcon( "designer_filenew.png" , TDevDesignerPartFactory::instance()) ); + setPixmap( 0, SmallIcon( "designer_filenew.png" , KDevDesignerPartFactory::instance()) ); } } @@ -597,23 +597,23 @@ void Workspace::rmbClicked( TQListViewItem *i, const TQPoint& pos ) case WorkspaceItem::SourceFileType: menu.insertItem( i18n( "&Open Source File" ), OPEN_SOURCE ); menu.insertSeparator(); - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "&Remove Source File From Project" ), REMOVE_SOURCE ); break; case WorkspaceItem::FormFileType: menu.insertItem( i18n( "&Open Form" ), OPEN_FORM ); menu.insertSeparator(); - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "&Remove Form From Project" ), REMOVE_FORM ); break; case WorkspaceItem::FormSourceType: menu.insertItem( i18n( "&Open Form Source" ), OPEN_FORM_SOURCE ); menu.insertSeparator(); if ( project->isCpp() ) - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "&Remove Source File From Form" ), REMOVE_FORM_SOURCE ); else - menu.insertItem( SmallIcon( "designer_editcut.png" , TDevDesignerPartFactory::instance()), + menu.insertItem( SmallIcon( "designer_editcut.png" , KDevDesignerPartFactory::instance()), i18n( "&Remove Form From Project" ), REMOVE_FORM ); break; case WorkspaceItem::ProjectType: diff --git a/tdevdesigner/designer/workspace.h b/kdevdesigner/designer/workspace.h similarity index 100% rename from tdevdesigner/designer/workspace.h rename to kdevdesigner/designer/workspace.h diff --git a/tdevdesigner/interfaces/actioninterface.h b/kdevdesigner/interfaces/actioninterface.h similarity index 100% rename from tdevdesigner/interfaces/actioninterface.h rename to kdevdesigner/interfaces/actioninterface.h diff --git a/tdevdesigner/interfaces/classbrowserinterface.h b/kdevdesigner/interfaces/classbrowserinterface.h similarity index 100% rename from tdevdesigner/interfaces/classbrowserinterface.h rename to kdevdesigner/interfaces/classbrowserinterface.h diff --git a/tdevdesigner/interfaces/designerinterface.h b/kdevdesigner/interfaces/designerinterface.h similarity index 100% rename from tdevdesigner/interfaces/designerinterface.h rename to kdevdesigner/interfaces/designerinterface.h diff --git a/tdevdesigner/interfaces/editorinterface.h b/kdevdesigner/interfaces/editorinterface.h similarity index 100% rename from tdevdesigner/interfaces/editorinterface.h rename to kdevdesigner/interfaces/editorinterface.h diff --git a/tdevdesigner/interfaces/filterinterface.h b/kdevdesigner/interfaces/filterinterface.h similarity index 100% rename from tdevdesigner/interfaces/filterinterface.h rename to kdevdesigner/interfaces/filterinterface.h diff --git a/tdevdesigner/interfaces/interpreterinterface.h b/kdevdesigner/interfaces/interpreterinterface.h similarity index 100% rename from tdevdesigner/interfaces/interpreterinterface.h rename to kdevdesigner/interfaces/interpreterinterface.h diff --git a/tdevdesigner/interfaces/languageinterface.h b/kdevdesigner/interfaces/languageinterface.h similarity index 100% rename from tdevdesigner/interfaces/languageinterface.h rename to kdevdesigner/interfaces/languageinterface.h diff --git a/tdevdesigner/interfaces/preferenceinterface.h b/kdevdesigner/interfaces/preferenceinterface.h similarity index 100% rename from tdevdesigner/interfaces/preferenceinterface.h rename to kdevdesigner/interfaces/preferenceinterface.h diff --git a/tdevdesigner/interfaces/projectsettingsiface.h b/kdevdesigner/interfaces/projectsettingsiface.h similarity index 100% rename from tdevdesigner/interfaces/projectsettingsiface.h rename to kdevdesigner/interfaces/projectsettingsiface.h diff --git a/tdevdesigner/interfaces/sourcetemplateiface.h b/kdevdesigner/interfaces/sourcetemplateiface.h similarity index 100% rename from tdevdesigner/interfaces/sourcetemplateiface.h rename to kdevdesigner/interfaces/sourcetemplateiface.h diff --git a/tdevdesigner/interfaces/templatewizardiface.h b/kdevdesigner/interfaces/templatewizardiface.h similarity index 100% rename from tdevdesigner/interfaces/templatewizardiface.h rename to kdevdesigner/interfaces/templatewizardiface.h diff --git a/tdevdesigner/interfaces/widgetinterface.h b/kdevdesigner/interfaces/widgetinterface.h similarity index 100% rename from tdevdesigner/interfaces/widgetinterface.h rename to kdevdesigner/interfaces/widgetinterface.h diff --git a/kdevdesigner/plugins/Makefile.am b/kdevdesigner/plugins/Makefile.am new file mode 100644 index 00000000..defe80c4 --- /dev/null +++ b/kdevdesigner/plugins/Makefile.am @@ -0,0 +1,8 @@ +INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) +METASOURCES = AUTO +kdevdesignerdir = $(kde_moduledir)/plugins/kdevdesigner +kdevdesigner_LTLIBRARIES = libkdevdesigner_lang.la +libkdevdesigner_lang_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevdesigner_lang_la_SOURCES = languageinterfaceimpl.cpp +libkdevdesigner_lang_la_LIBADD = $(LIB_QT) + diff --git a/tdevdesigner/plugins/languageinterfaceimpl.cpp b/kdevdesigner/plugins/languageinterfaceimpl.cpp similarity index 100% rename from tdevdesigner/plugins/languageinterfaceimpl.cpp rename to kdevdesigner/plugins/languageinterfaceimpl.cpp diff --git a/tdevdesigner/plugins/languageinterfaceimpl.h b/kdevdesigner/plugins/languageinterfaceimpl.h similarity index 100% rename from tdevdesigner/plugins/languageinterfaceimpl.h rename to kdevdesigner/plugins/languageinterfaceimpl.h diff --git a/tdevdesigner/shared/CMakeLists.txt b/kdevdesigner/shared/CMakeLists.txt similarity index 100% rename from tdevdesigner/shared/CMakeLists.txt rename to kdevdesigner/shared/CMakeLists.txt diff --git a/tdevdesigner/shared/Makefile.am b/kdevdesigner/shared/Makefile.am similarity index 100% rename from tdevdesigner/shared/Makefile.am rename to kdevdesigner/shared/Makefile.am diff --git a/tdevdesigner/shared/domtool.cpp b/kdevdesigner/shared/domtool.cpp similarity index 100% rename from tdevdesigner/shared/domtool.cpp rename to kdevdesigner/shared/domtool.cpp diff --git a/tdevdesigner/shared/domtool.h b/kdevdesigner/shared/domtool.h similarity index 100% rename from tdevdesigner/shared/domtool.h rename to kdevdesigner/shared/domtool.h diff --git a/tdevdesigner/shared/globaldefs.h b/kdevdesigner/shared/globaldefs.h similarity index 100% rename from tdevdesigner/shared/globaldefs.h rename to kdevdesigner/shared/globaldefs.h diff --git a/tdevdesigner/shared/parser.cpp b/kdevdesigner/shared/parser.cpp similarity index 100% rename from tdevdesigner/shared/parser.cpp rename to kdevdesigner/shared/parser.cpp diff --git a/tdevdesigner/shared/parser.h b/kdevdesigner/shared/parser.h similarity index 100% rename from tdevdesigner/shared/parser.h rename to kdevdesigner/shared/parser.h diff --git a/tdevdesigner/shared/ui2uib.cpp b/kdevdesigner/shared/ui2uib.cpp similarity index 100% rename from tdevdesigner/shared/ui2uib.cpp rename to kdevdesigner/shared/ui2uib.cpp diff --git a/tdevdesigner/shared/ui2uib.h b/kdevdesigner/shared/ui2uib.h similarity index 100% rename from tdevdesigner/shared/ui2uib.h rename to kdevdesigner/shared/ui2uib.h diff --git a/tdevdesigner/shared/uib.cpp b/kdevdesigner/shared/uib.cpp similarity index 100% rename from tdevdesigner/shared/uib.cpp rename to kdevdesigner/shared/uib.cpp diff --git a/tdevdesigner/shared/uib.h b/kdevdesigner/shared/uib.h similarity index 100% rename from tdevdesigner/shared/uib.h rename to kdevdesigner/shared/uib.h diff --git a/tdevdesigner/shared/widgetdatabase.cpp b/kdevdesigner/shared/widgetdatabase.cpp similarity index 99% rename from tdevdesigner/shared/widgetdatabase.cpp rename to kdevdesigner/shared/widgetdatabase.cpp index c2635a9d..be4b6091 100644 --- a/tdevdesigner/shared/widgetdatabase.cpp +++ b/kdevdesigner/shared/widgetdatabase.cpp @@ -27,7 +27,7 @@ #include "widgetdatabase.h" #include "../interfaces/widgetinterface.h" -#include "../designer/tdevdesigner_part.h" +#include "../designer/kdevdesigner_part.h" #include #include @@ -646,7 +646,7 @@ TQIconSet WidgetDatabase::iconSet( int id ) if ( !r->icon ) { if ( r->iconSet.isEmpty() ) return TQIconSet(); - TQPixmap pix = BarIcon( r->iconSet, TDevDesignerPartFactory::instance() ); + TQPixmap pix = BarIcon( r->iconSet, KDevDesignerPartFactory::instance() ); if ( pix.isNull() ) pix = TQPixmap( r->iconSet ); r->icon = new TQIconSet( pix ); diff --git a/tdevdesigner/shared/widgetdatabase.h b/kdevdesigner/shared/widgetdatabase.h similarity index 100% rename from tdevdesigner/shared/widgetdatabase.h rename to kdevdesigner/shared/widgetdatabase.h diff --git a/tdevdesigner/src/CMakeLists.txt b/kdevdesigner/src/CMakeLists.txt similarity index 66% rename from tdevdesigner/src/CMakeLists.txt rename to kdevdesigner/src/CMakeLists.txt index e7cf1615..c232cd2f 100644 --- a/tdevdesigner/src/CMakeLists.txt +++ b/kdevdesigner/src/CMakeLists.txt @@ -23,14 +23,14 @@ link_directories( ##### other data ################################ -install( FILES tdevdesigner.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) -install( FILES tdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdesigner ) +install( FILES kdevdesigner.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install( FILES kdevdesigner_shell.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdesigner ) -##### tdevdesigner (executable) ################# +##### kdevdesigner (executable) ################# -tde_add_executable( tdevdesigner AUTOMOC - SOURCES main.cpp tdevdesigner.cpp +tde_add_executable( kdevdesigner AUTOMOC + SOURCES main.cpp kdevdesigner.cpp LINK tdeparts-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdevdesigner/src/Makefile.am b/kdevdesigner/src/Makefile.am similarity index 72% rename from tdevdesigner/src/Makefile.am rename to kdevdesigner/src/Makefile.am index c88a016d..e5e68a98 100644 --- a/tdevdesigner/src/Makefile.am +++ b/kdevdesigner/src/Makefile.am @@ -2,13 +2,13 @@ INCLUDES = $(all_includes) # these are the headers for your project -noinst_HEADERS = tdevdesigner.h +noinst_HEADERS = kdevdesigner.h # let automoc handle all of the meta source files (moc) METASOURCES = AUTO messages: rc.cpp - $(XGETTEXT) *.cpp -o $(podir)/tdevdesigner.pot + $(XGETTEXT) *.cpp -o $(podir)/kdevdesigner.pot # this Makefile creates both a KPart application and a KPart @@ -17,21 +17,21 @@ messages: rc.cpp ######################################################################### # this is the program that gets installed. it's name is used for all # of the other Makefile.am variables -bin_PROGRAMS = tdevdesigner +bin_PROGRAMS = kdevdesigner # the application source, library search path, and link libraries -tdevdesigner_SOURCES = main.cpp tdevdesigner.cpp -tdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -tdevdesigner_LDADD = $(LIB_TDEPARTS) +kdevdesigner_SOURCES = main.cpp kdevdesigner.cpp +kdevdesigner_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdevdesigner_LDADD = $(LIB_TDEPARTS) # this is where the desktop file will go #shelldesktopdir = $(kde_appsdir)/Development -#shelldesktop_DATA = tdevdesigner.desktop -xdg_apps_DATA = tdevdesigner.desktop +#shelldesktop_DATA = kdevdesigner.desktop +xdg_apps_DATA = kdevdesigner.desktop # this is where the shell's XML-GUI resource file goes -shellrcdir = $(kde_datadir)/tdevdesigner -shellrc_DATA = tdevdesigner_shell.rc +shellrcdir = $(kde_datadir)/kdevdesigner +shellrc_DATA = kdevdesigner_shell.rc ######################################################################### # KPART SECTION @@ -44,4 +44,4 @@ shellrc_DATA = tdevdesigner_shell.rc partdesktopdir = $(kde_servicesdir) # this is where the part's XML-GUI resource file goes -partrcdir = $(kde_datadir)/tdevdesignerpart +partrcdir = $(kde_datadir)/kdevdesignerpart diff --git a/tdevdesigner/src/tdevdesigner.cpp b/kdevdesigner/src/kdevdesigner.cpp similarity index 86% rename from tdevdesigner/src/tdevdesigner.cpp rename to kdevdesigner/src/kdevdesigner.cpp index bcc9423d..f846e99b 100644 --- a/tdevdesigner/src/tdevdesigner.cpp +++ b/kdevdesigner/src/kdevdesigner.cpp @@ -18,7 +18,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "tdevdesigner.h" +#include "kdevdesigner.h" #include #include @@ -37,11 +37,11 @@ #include #include -TDevDesigner::TDevDesigner() - : KParts::MainWindow( 0L, "TDevDesigner" ) +KDevDesigner::KDevDesigner() + : KParts::MainWindow( 0L, "KDevDesigner" ) { // set the shell's ui resource file - setXMLFile("tdevdesigner_shell.rc"); + setXMLFile("kdevdesigner_shell.rc"); // then, setup our actions setupActions(); @@ -52,7 +52,7 @@ TDevDesigner::TDevDesigner() // this routine will find and load our Part. it finds the Part by // name which is a bad idea usually.. but it's alright in this // case since our Part is made for this Shell - KLibFactory *factory = KLibLoader::self()->factory("libtdevdesignerpart"); + KLibFactory *factory = KLibLoader::self()->factory("libkdevdesignerpart"); if (factory) { // now that the Part is loaded, we cast it to a Part to get @@ -60,7 +60,7 @@ TDevDesigner::TDevDesigner() TQStringList args; args.append("in shell"); m_part = static_cast(factory->create(TQT_TQOBJECT(this), - "tdevdesigner_part", "KParts::ReadWritePart", args)); + "kdevdesigner_part", "KParts::ReadWritePart", args)); if (m_part) { @@ -75,7 +75,7 @@ TDevDesigner::TDevDesigner() { // if we couldn't find our Part, we exit since the Shell by // itself can't do anything useful - KMessageBox::error(this, i18n("Could not find the TDevDesigner part.")); + KMessageBox::error(this, i18n("Could not find the KDevDesigner part.")); kapp->quit(); // we return here, cause kapp->quit() only means "exit the // next time we enter the event loop... @@ -88,16 +88,16 @@ TDevDesigner::TDevDesigner() setAutoSaveSettings(); } -TDevDesigner::~TDevDesigner() +KDevDesigner::~KDevDesigner() { } -void TDevDesigner::load(const KURL& url) +void KDevDesigner::load(const KURL& url) { m_part->openURL( url ); } -void TDevDesigner::setupActions() +void KDevDesigner::setupActions() { /* KStdAction::openNew(TQT_TQOBJECT(this), TQT_SLOT(fileNew()), actionCollection()); KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());*/ @@ -111,14 +111,14 @@ void TDevDesigner::setupActions() KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(optionsConfigureToolbars()), actionCollection()); } -void TDevDesigner::saveProperties(TDEConfig* /*config*/) +void KDevDesigner::saveProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. anything you write here will be available // later when this app is restored } -void TDevDesigner::readProperties(TDEConfig* /*config*/) +void KDevDesigner::readProperties(TDEConfig* /*config*/) { // the 'config' object points to the session managed // config file. this function is automatically called whenever @@ -126,7 +126,7 @@ void TDevDesigner::readProperties(TDEConfig* /*config*/) // in 'saveProperties' } -void TDevDesigner::fileNew() +void KDevDesigner::fileNew() { // this slot is called whenever the File->New menu is selected, // the New shortcut is pressed (usually CTRL+N) or the New toolbar @@ -138,12 +138,12 @@ void TDevDesigner::fileNew() // in its initial state. This is what we do here.. if ( ! m_part->url().isEmpty() || m_part->isModified() ) { - (new TDevDesigner)->show(); + (new KDevDesigner)->show(); }; } -void TDevDesigner::optionsShowToolbar() +void KDevDesigner::optionsShowToolbar() { // this is all very cut and paste code for showing/hiding the // toolbar @@ -153,7 +153,7 @@ void TDevDesigner::optionsShowToolbar() toolBar()->hide(); } -void TDevDesigner::optionsShowStatusbar() +void KDevDesigner::optionsShowStatusbar() { // this is all very cut and paste code for showing/hiding the // statusbar @@ -163,12 +163,12 @@ void TDevDesigner::optionsShowStatusbar() statusBar()->hide(); } -void TDevDesigner::optionsConfigureKeys() +void KDevDesigner::optionsConfigureKeys() { - KKeyDialog::configureKeys(m_part->actionCollection(), "tdevdesigner_part.rc"); + KKeyDialog::configureKeys(m_part->actionCollection(), "kdevdesigner_part.rc"); } -void TDevDesigner::optionsConfigureToolbars() +void KDevDesigner::optionsConfigureToolbars() { saveMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); @@ -179,12 +179,12 @@ void TDevDesigner::optionsConfigureToolbars() dlg.exec(); } -void TDevDesigner::applyNewToolbarConfig() +void KDevDesigner::applyNewToolbarConfig() { applyMainWindowSettings(TDEGlobal::config(), autoSaveGroup()); } -void TDevDesigner::fileOpen() +void KDevDesigner::fileOpen() { // this slot is called whenever the File->Open menu is selected, // the Open shortcut is pressed (usually CTRL+O) or the Open toolbar @@ -206,11 +206,11 @@ void TDevDesigner::fileOpen() else { // we open the file in a new window... - TDevDesigner* newWin = new TDevDesigner; + KDevDesigner* newWin = new KDevDesigner; newWin->load( url ); newWin->show(); } } } -#include "tdevdesigner.moc" +#include "kdevdesigner.moc" diff --git a/tdevdesigner/src/tdevdesigner.desktop b/kdevdesigner/src/kdevdesigner.desktop similarity index 97% rename from tdevdesigner/src/tdevdesigner.desktop rename to kdevdesigner/src/kdevdesigner.desktop index d2989142..1cd245f1 100644 --- a/tdevdesigner/src/tdevdesigner.desktop +++ b/kdevdesigner/src/kdevdesigner.desktop @@ -55,10 +55,10 @@ GenericName[sv]=Gränssnittsdesign GenericName[tr]=Arayüz Tasarlayıcısı GenericName[zh_CN]=界面设计师 GenericName[zh_TW]=介面設計器 -Exec=tdevdesigner %i -caption "%c" -Icon=tdevdesigner +Exec=kdevdesigner %i -caption "%c" +Icon=kdevdesigner Type=Application -DocPath=tdevdesigner/index.html +DocPath=kdevdesigner/index.html Comment=GUI Designer for Qt/TDE Comment[ca]=Dissenyador de IGU per Qt/TDE Comment[da]=Grafisk brugerfladedesigner til Qt/TDE diff --git a/tdevdesigner/src/tdevdesigner.h b/kdevdesigner/src/kdevdesigner.h similarity index 94% rename from tdevdesigner/src/tdevdesigner.h rename to kdevdesigner/src/kdevdesigner.h index dc5113fe..a497dc5c 100644 --- a/tdevdesigner/src/tdevdesigner.h +++ b/kdevdesigner/src/kdevdesigner.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef _TDEVDESIGNER_H_ -#define _TDEVDESIGNER_H_ +#ifndef _KDEVDESIGNER_H_ +#define _KDEVDESIGNER_H_ #ifdef HAVE_CONFIG_H #include @@ -39,7 +39,7 @@ class TDEToggleAction; * @author Alexander Dymo * @version 0.1 */ -class TDevDesigner : public KParts::MainWindow +class KDevDesigner : public KParts::MainWindow { Q_OBJECT @@ -47,12 +47,12 @@ public: /** * Default Constructor */ - TDevDesigner(); + KDevDesigner(); /** * Default Destructor */ - virtual ~TDevDesigner(); + virtual ~KDevDesigner(); /** * Use this method to load whatever file/URL you have @@ -94,4 +94,4 @@ private: TDEToggleAction *m_statusbarAction; }; -#endif // _TDEVDESIGNER_H_ +#endif // _KDEVDESIGNER_H_ diff --git a/tdevdesigner/src/tdevdesigner_shell.rc b/kdevdesigner/src/kdevdesigner_shell.rc similarity index 95% rename from tdevdesigner/src/tdevdesigner_shell.rc rename to kdevdesigner/src/kdevdesigner_shell.rc index a6a81fd3..1bb33a25 100644 --- a/tdevdesigner/src/tdevdesigner_shell.rc +++ b/kdevdesigner/src/kdevdesigner_shell.rc @@ -1,5 +1,5 @@ - +

&File diff --git a/tdevdesigner/src/main.cpp b/kdevdesigner/src/main.cpp similarity index 90% rename from tdevdesigner/src/main.cpp rename to kdevdesigner/src/main.cpp index 0ada9f98..f70b9285 100644 --- a/tdevdesigner/src/main.cpp +++ b/kdevdesigner/src/main.cpp @@ -20,7 +20,7 @@ #include #include -#include "tdevdesigner.h" +#include "kdevdesigner.h" #include #include #include @@ -40,8 +40,8 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData about("tdevdesigner", I18N_NOOP("TDevDesigner"), version, description, - TDEAboutData::License_GPL, "TDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0); + TDEAboutData about("kdevdesigner", I18N_NOOP("KDevDesigner"), version, description, + TDEAboutData::License_GPL, "KDevDesigner Copyright: (C) 2004-2005 Alexander Dymo\nTQt Designer Copyright: (C) 2000-2005 Trolltech AS All Rights Reserved", 0, 0); about.addAuthor( "Trolltech AS", "TQt Designer code (Free Edition)" ); about.addAuthor( "Alexander Dymo", "Port to KDE, partification", "adymo@kdevelop.org" ); TDECmdLineArgs::init(argc, argv, &about); @@ -51,13 +51,13 @@ int main(int argc, char **argv) // see if we are starting with session management if (app.isRestored()) { - RESTORE(TDevDesigner); + RESTORE(KDevDesigner); } else { // no session.. just start up normally TQSplashScreen * splash = 0; - TQString splashFile = locate("data", "tdevelop/pics/tdevdesigner-splash.png"); + TQString splashFile = locate("data", "tdevelop/pics/kdevdesigner-splash.png"); if (!splashFile.isNull()) { TQPixmap pm; @@ -72,7 +72,7 @@ int main(int argc, char **argv) if ( args->count() == 0 ) { - TDevDesigner *widget = new TDevDesigner; + KDevDesigner *widget = new KDevDesigner; widget->show(); } else @@ -80,7 +80,7 @@ int main(int argc, char **argv) int i = 0; for (; i < args->count(); i++ ) { - TDevDesigner *widget = new TDevDesigner; + KDevDesigner *widget = new KDevDesigner; widget->show(); widget->load( args->url( i ) ); } diff --git a/tdevdesigner/uilib/CMakeLists.txt b/kdevdesigner/uilib/CMakeLists.txt similarity index 76% rename from tdevdesigner/uilib/CMakeLists.txt rename to kdevdesigner/uilib/CMakeLists.txt index 588c2366..3aa1c78f 100644 --- a/tdevdesigner/uilib/CMakeLists.txt +++ b/kdevdesigner/uilib/CMakeLists.txt @@ -10,18 +10,18 @@ ################################################# include_directories( - ${CMAKE_SOURCE_DIR}/tdevdesigner/shared + ${CMAKE_SOURCE_DIR}/kdevdesigner/shared ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} ) -##### tdevqui (static) ########################## +##### kdevqui (static) ########################## set( SRCS database.cpp qwidgetfactory.cpp ) tde_moc( SRCS database2.h ) -tde_add_library( tdevqui STATIC_PIC +tde_add_library( kdevqui STATIC_PIC SOURCES ${SRCS} ) diff --git a/kdevdesigner/uilib/Makefile.am b/kdevdesigner/uilib/Makefile.am new file mode 100644 index 00000000..0480cd50 --- /dev/null +++ b/kdevdesigner/uilib/Makefile.am @@ -0,0 +1,9 @@ +KDE_CXXFLAGS=-UQT_NO_ASCII_CAST + +INCLUDES = -I$(top_srcdir)/kdevdesigner/shared $(all_includes) +METASOURCES = AUTO + +noinst_LTLIBRARIES = libkdevqui.la +libkdevqui_la_SOURCES = database.cpp qwidgetfactory.cpp + +libkdevqui_la_LDFLAGS = $(all_libraries) diff --git a/tdevdesigner/uilib/database.cpp b/kdevdesigner/uilib/database.cpp similarity index 100% rename from tdevdesigner/uilib/database.cpp rename to kdevdesigner/uilib/database.cpp diff --git a/tdevdesigner/uilib/database2.h b/kdevdesigner/uilib/database2.h similarity index 100% rename from tdevdesigner/uilib/database2.h rename to kdevdesigner/uilib/database2.h diff --git a/tdevdesigner/uilib/qwidgetfactory.cpp b/kdevdesigner/uilib/qwidgetfactory.cpp similarity index 100% rename from tdevdesigner/uilib/qwidgetfactory.cpp rename to kdevdesigner/uilib/qwidgetfactory.cpp diff --git a/tdevdesigner/uilib/qwidgetfactory.h b/kdevdesigner/uilib/qwidgetfactory.h similarity index 100% rename from tdevdesigner/uilib/qwidgetfactory.h rename to kdevdesigner/uilib/qwidgetfactory.h diff --git a/tdevprj2tdevelop b/kdevprj2tdevelop old mode 100644 new mode 100755 similarity index 97% rename from tdevprj2tdevelop rename to kdevprj2tdevelop index 79966df0..09d3ebaa --- a/tdevprj2tdevelop +++ b/kdevprj2tdevelop @@ -98,7 +98,7 @@ if ($project_type eq "normal_c" } # Choose project management -$projectmanagement = "TDevCustomProject"; +$projectmanagement = "KDevCustomProject"; if ($project_type =~ /normal_kde|mini_kde|normalogl_kde|normal_kde2|mini_kde2|mdi_kde2/ || $project_type =~ /kde2_normal|kicker_app|tdeio_slave|kc_module|kpart_plugin|ktheme/) { $projectmanagement = "KDevTDEAutoProject"; @@ -175,7 +175,7 @@ if ($projectmanagement eq "KDevAutoProject" || $projectmanagement eq "KDevTDEAut EOF } -if ($project_management eq "TDevCustomProject") { +if ($project_management eq "KDevCustomProject") { print FILE < @@ -194,7 +194,7 @@ EOF # file view print FILE < + EOF @@ -209,8 +209,8 @@ EOF print FILE < - - + + gtk gnustep @@ -218,7 +218,7 @@ print FILE <php perl - + EOF if ($projectmanagement eq "KDevAutoProject" @@ -242,7 +242,7 @@ close FILE; ## Write file list ## -if ($projectmanagement eq "TDevCustomProject") { +if ($projectmanagement eq "KDevCustomProject") { $filelistfilename = $filename; $filelistfilename =~ s/^(.*).kdevprj$/$1.filelist/; open(FILE, ">$filelistfilename"); diff --git a/languages/ada/CMakeLists.txt b/languages/ada/CMakeLists.txt index 5b5d412b..e8d351b9 100644 --- a/languages/ada/CMakeLists.txt +++ b/languages/ada/CMakeLists.txt @@ -33,13 +33,13 @@ link_directories( ##### other data ################################ -install( FILES tdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevadasupport ) +install( FILES kdevadasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevadasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevadasupport ) -##### libtdevadasupport (module) ################ +##### libkdevadasupport (module) ################ -tde_add_kpart( libtdevadasupport AUTOMOC +tde_add_kpart( libkdevadasupport AUTOMOC SOURCES adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui diff --git a/languages/ada/Makefile.am b/languages/ada/Makefile.am index 61536e92..d45a2add 100644 --- a/languages/ada/Makefile.am +++ b/languages/ada/Makefile.am @@ -7,11 +7,11 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevadasupport.la -libtdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) -libtdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la +kde_module_LTLIBRARIES = libkdevadasupport.la +libkdevadasupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +libkdevadasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la -libtdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp +libkdevadasupport_la_SOURCES = adasupportpart.cpp problemreporter.cpp backgroundparser.cpp addclassdlg.ui addclass.cpp configproblemreporter.ui ada_utils.cpp adasupport.cpp AdaLexer.cpp AdaParser.cpp AdaTreeParserSuper.cpp AdaStoreWalker.cpp METASOURCES = AUTO @@ -33,9 +33,9 @@ genparser: antlr ada.g && antlr ada.tree.g && antlr -glib ada.tree.g ada.store.g servicedir = $(kde_servicesdir) -service_DATA = tdevadasupport.desktop +service_DATA = kdevadasupport.desktop -rcdir = $(kde_datadir)/tdevadasupport -rc_DATA = tdevadasupport.rc +rcdir = $(kde_datadir)/kdevadasupport +rc_DATA = kdevadasupport.rc KDE_OPTIONS = nofinal diff --git a/languages/ada/adasupportpart.cpp b/languages/ada/adasupportpart.cpp index 53c4af48..aac02610 100644 --- a/languages/ada/adasupportpart.cpp +++ b/languages/ada/adasupportpart.cpp @@ -18,11 +18,11 @@ #include #include -#include "tdevgenericfactory.h" -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" +#include "kdevgenericfactory.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" #include "codemodel.h" #include "adasupportpart.h" #include "problemreporter.h" @@ -33,15 +33,15 @@ #include "AdaStoreWalker.hpp" #include "AdaAST.hpp" -#include +#include enum { KDEV_DB_VERSION = 6 }; enum { KDEV_PCS_VERSION = 6 }; -typedef TDevGenericFactory AdaSupportPartFactory; +typedef KDevGenericFactory AdaSupportPartFactory; -static const TDevPluginInfo data("tdevadasupport"); -K_EXPORT_COMPONENT_FACTORY (libtdevadasupport, AdaSupportPartFactory (data)) +static const KDevPluginInfo data("kdevadasupport"); +K_EXPORT_COMPONENT_FACTORY (libkdevadasupport, AdaSupportPartFactory (data)) struct AdaSupportPartData { @@ -51,7 +51,7 @@ struct AdaSupportPartData { }; AdaSupportPart::AdaSupportPart (TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) + : KDevLanguageSupport (&data, parent, name ? name : "AdaSupportPart"), d (new AdaSupportPartData()) { setInstance (AdaSupportPartFactory::instance ()); @@ -93,9 +93,9 @@ AdaSupportPart::~AdaSupportPart () } -TDevLanguageSupport::Features AdaSupportPart::features () +KDevLanguageSupport::Features AdaSupportPart::features () { - return TDevLanguageSupport::Features + return KDevLanguageSupport::Features ( // TBD: Classes | Functions | Namespaces); } diff --git a/languages/ada/adasupportpart.h b/languages/ada/adasupportpart.h index 32160b38..eb9e2630 100644 --- a/languages/ada/adasupportpart.h +++ b/languages/ada/adasupportpart.h @@ -2,7 +2,7 @@ #ifndef __ADASUPPORTPART_H__ #define __ADASUPPORTPART_H__ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include @@ -10,7 +10,7 @@ class AdaSupportPartData; class KDialogBase; class TQStringList; -class AdaSupportPart : public TDevLanguageSupport +class AdaSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/ada/app_templates/adahello/CMakeLists.txt b/languages/ada/app_templates/adahello/CMakeLists.txt index ba3a3eb5..cbd00e6e 100644 --- a/languages/ada/app_templates/adahello/CMakeLists.txt +++ b/languages/ada/app_templates/adahello/CMakeLists.txt @@ -15,8 +15,8 @@ add_custom_target( adahello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/adahello.tar.gz adahello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - adahello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + adahello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/ada/app_templates/adahello/Makefile.am b/languages/ada/app_templates/adahello/Makefile.am index 5cc49953..5a970c91 100644 --- a/languages/ada/app_templates/adahello/Makefile.am +++ b/languages/ada/app_templates/adahello/Makefile.am @@ -1,10 +1,10 @@ dataFiles = main.adb app.tdevelop ada-Makefile app.tdevelop.filelist ### no need to change below: -template_DATA = adahello.tdevtemplate +template_DATA = adahello.kdevtemplate templatedir = ${appwizarddatadir}/templates -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard adahello.tar.gz: $(TAR) -cf adahello.tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 adahello.tar diff --git a/languages/ada/app_templates/adahello/adahello.tdevtemplate b/languages/ada/app_templates/adahello/adahello.kdevtemplate similarity index 99% rename from languages/ada/app_templates/adahello/adahello.tdevtemplate rename to languages/ada/app_templates/adahello/adahello.kdevtemplate index 810315a6..0cc09da2 100644 --- a/languages/ada/app_templates/adahello/adahello.tdevtemplate +++ b/languages/ada/app_templates/adahello/adahello.kdevtemplate @@ -70,7 +70,7 @@ Archive=adahello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/ada/app_templates/adahello/app.tdevelop b/languages/ada/app_templates/adahello/app.tdevelop index 83815aa1..a94f7e34 100644 --- a/languages/ada/app_templates/adahello/app.tdevelop +++ b/languages/ada/app_templates/adahello/app.tdevelop @@ -4,14 +4,14 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Ada Ada Code - + build / @@ -25,8 +25,8 @@ make - - + + bash bash_bugs @@ -73,12 +73,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/ada/doc/CMakeLists.txt b/languages/ada/doc/CMakeLists.txt index 32d4281c..62b3ef26 100644 --- a/languages/ada/doc/CMakeLists.txt +++ b/languages/ada/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES ada.toc ada_bugs_gcc.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/ada/doc/Makefile.am b/languages/ada/doc/Makefile.am index da0655f6..ff5f8a32 100644 --- a/languages/ada/doc/Makefile.am +++ b/languages/ada/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = ada.toc ada_bugs_gcc.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/ada/file_templates/CMakeLists.txt b/languages/ada/file_templates/CMakeLists.txt index 7eb47fdc..21d16b69 100644 --- a/languages/ada/file_templates/CMakeLists.txt +++ b/languages/ada/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES adb ads - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/ada/file_templates/Makefile.am b/languages/ada/file_templates/Makefile.am index 4635979e..58bbd907 100644 --- a/languages/ada/file_templates/Makefile.am +++ b/languages/ada/file_templates/Makefile.am @@ -1,3 +1,3 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = adb ads diff --git a/languages/ada/tdevadasupport.desktop b/languages/ada/kdevadasupport.desktop similarity index 99% rename from languages/ada/tdevadasupport.desktop rename to languages/ada/kdevadasupport.desktop index 6bee2461..f1ae3bf1 100644 --- a/languages/ada/tdevadasupport.desktop +++ b/languages/ada/kdevadasupport.desktop @@ -82,6 +82,6 @@ GenericName[tr]=Ada Dil Desteği GenericName[zh_CN]=Ada 语言支持 GenericName[zh_TW]=Ada 語言支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevadasupport +X-TDE-Library=libkdevadasupport X-TDevelop-Version=5 X-TDevelop-Language=Ada diff --git a/languages/ada/tdevadasupport.rc b/languages/ada/kdevadasupport.rc similarity index 100% rename from languages/ada/tdevadasupport.rc rename to languages/ada/kdevadasupport.rc diff --git a/languages/ada/problemreporter.cpp b/languages/ada/problemreporter.cpp index cfd9acc7..6bac0253 100644 --- a/languages/ada/problemreporter.cpp +++ b/languages/ada/problemreporter.cpp @@ -19,8 +19,8 @@ #include "problemreporter.h" #include "adasupportpart.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "configproblemreporter.h" #include "backgroundparser.h" diff --git a/languages/bash/CMakeLists.txt b/languages/bash/CMakeLists.txt index eca8c096..9998693d 100644 --- a/languages/bash/CMakeLists.txt +++ b/languages/bash/CMakeLists.txt @@ -29,13 +29,13 @@ link_directories( ##### other data ################################ -install( FILES tdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevbashsupport ) +install( FILES kdevbashsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevbashsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevbashsupport ) -##### libtdevbashsupport (module) ############### +##### libkdevbashsupport (module) ############### -tde_add_kpart( libtdevbashsupport AUTOMOC +tde_add_kpart( libkdevbashsupport AUTOMOC SOURCES bashsupport_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/bash/Makefile.am b/languages/bash/Makefile.am index 2f750d63..5916563a 100644 --- a/languages/bash/Makefile.am +++ b/languages/bash/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = app_templates doc -kde_module_LTLIBRARIES = libtdevbashsupport.la -libtdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevbashsupport.la +libkdevbashsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevbashsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevbashsupport_la_SOURCES = bashsupport_part.cpp +libkdevbashsupport_la_SOURCES = bashsupport_part.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevbashsupport.desktop +service_DATA = kdevbashsupport.desktop -rcdir = $(kde_datadir)/tdevbashsupport -rc_DATA = tdevbashsupport.rc +rcdir = $(kde_datadir)/kdevbashsupport +rc_DATA = kdevbashsupport.rc diff --git a/languages/bash/app_templates/bashhello/CMakeLists.txt b/languages/bash/app_templates/bashhello/CMakeLists.txt index 0c002f83..69abf15c 100644 --- a/languages/bash/app_templates/bashhello/CMakeLists.txt +++ b/languages/bash/app_templates/bashhello/CMakeLists.txt @@ -15,8 +15,8 @@ add_custom_target( bashhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/bashhello.tar.gz bashhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - bashhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + bashhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/bash/app_templates/bashhello/Makefile.am b/languages/bash/app_templates/bashhello/Makefile.am index ed84d271..b26692b4 100644 --- a/languages/bash/app_templates/bashhello/Makefile.am +++ b/languages/bash/app_templates/bashhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.sh app.tdevelop templateName = bashhello ### 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/bash/app_templates/bashhello/app.tdevelop b/languages/bash/app_templates/bashhello/app.tdevelop index bbc04992..cab08799 100644 --- a/languages/bash/app_templates/bashhello/app.tdevelop +++ b/languages/bash/app_templates/bashhello/app.tdevelop @@ -11,22 +11,22 @@ KDevdistpart - TDevDebugger + KDevDebugger - + src *.sh *~ - - + + - - + + ada ada_bugs_gcc @@ -73,10 +73,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/bash/app_templates/bashhello/bashhello.tdevtemplate b/languages/bash/app_templates/bashhello/bashhello.kdevtemplate similarity index 100% rename from languages/bash/app_templates/bashhello/bashhello.tdevtemplate rename to languages/bash/app_templates/bashhello/bashhello.kdevtemplate diff --git a/languages/bash/bashsupport_part.cpp b/languages/bash/bashsupport_part.cpp index 7cfd9889..9f1be201 100644 --- a/languages/bash/bashsupport_part.cpp +++ b/languages/bash/bashsupport_part.cpp @@ -14,7 +14,7 @@ #include #include -#include +#include #include #include #include @@ -22,25 +22,25 @@ #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include -typedef TDevGenericFactory BashSupportFactory; -static const TDevPluginInfo data("tdevbashsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevbashsupport, BashSupportFactory( data ) ) +typedef KDevGenericFactory BashSupportFactory; +static const KDevPluginInfo data("kdevbashsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevbashsupport, BashSupportFactory( data ) ) BashSupportPart::BashSupportPart(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) +: KDevLanguageSupport (&data, parent, name ? name : "BashSupportPart" ) { setInstance(BashSupportFactory::instance()); - setXMLFile("tdevbashsupport.rc"); + setXMLFile("kdevbashsupport.rc"); TDEAction *action; action = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -182,12 +182,12 @@ void BashSupportPart::savedFile(const KURL &fileName) void BashSupportPart::startApplication(const TQString &program) { kdDebug() << "starting application" << program << endl; - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, TRUE); } -TDevLanguageSupport::Features BashSupportPart::features() +KDevLanguageSupport::Features BashSupportPart::features() { return Features(Variables | Functions); } diff --git a/languages/bash/bashsupport_part.h b/languages/bash/bashsupport_part.h index b1fff80e..284e4f4c 100644 --- a/languages/bash/bashsupport_part.h +++ b/languages/bash/bashsupport_part.h @@ -3,8 +3,8 @@ */ -#ifndef __TDEVPART_BASHSUPPORT_H__ -#define __TDEVPART_BASHSUPPORT_H__ +#ifndef __KDEVPART_BASHSUPPORT_H__ +#define __KDEVPART_BASHSUPPORT_H__ #include @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -47,7 +47,7 @@ class BashCodeCompletion : TQObject KTextEditor::ViewCursorInterface *m_cursorInterface; }; -class BashSupportPart : public TDevLanguageSupport +class BashSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/bash/doc/CMakeLists.txt b/languages/bash/doc/CMakeLists.txt index 09ad4e33..0d2d2a83 100644 --- a/languages/bash/doc/CMakeLists.txt +++ b/languages/bash/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES bash.toc bash_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/bash/doc/Makefile.am b/languages/bash/doc/Makefile.am index ab1c4f52..1474d939 100644 --- a/languages/bash/doc/Makefile.am +++ b/languages/bash/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = bash.toc bash_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/bash/tdevbashsupport.desktop b/languages/bash/kdevbashsupport.desktop similarity index 98% rename from languages/bash/tdevbashsupport.desktop rename to languages/bash/kdevbashsupport.desktop index 854201e7..91a98e3e 100644 --- a/languages/bash/tdevbashsupport.desktop +++ b/languages/bash/kdevbashsupport.desktop @@ -80,6 +80,6 @@ GenericName[tr]=Bash Desteği GenericName[zh_CN]=Bash 支持 GenericName[zh_TW]=Bash 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevbashsupport +X-TDE-Library=libkdevbashsupport X-TDevelop-Version=5 X-TDevelop-Language=Bash diff --git a/languages/bash/tdevbashsupport.rc b/languages/bash/kdevbashsupport.rc similarity index 100% rename from languages/bash/tdevbashsupport.rc rename to languages/bash/kdevbashsupport.rc diff --git a/languages/cpp/CMakeLists.txt b/languages/cpp/CMakeLists.txt index 3da1e579..8d1c569a 100644 --- a/languages/cpp/CMakeLists.txt +++ b/languages/cpp/CMakeLists.txt @@ -45,17 +45,17 @@ link_directories( ##### other data ################################ -install( FILES tdevcppsupport.desktop tdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport ) -install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) -install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport ) +install( FILES kdevcppsupport.desktop kdevcsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevcppsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport ) +install( FILES cpptemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) +install( FILES configuration DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport ) -##### libtdevcppsupport (module) ################ +##### libkdevcppsupport (module) ################ -tde_add_kpart( libtdevcppsupport AUTOMOC +tde_add_kpart( libkdevcppsupport AUTOMOC SOURCES - TDevCppSupportIface.cpp TDevCppSupportIface.skel + KDevCppSupportIface.cpp KDevCppSupportIface.skel addattributedialog.cpp addattributedialogbase.ui addmethoddialog.cpp addmethoddialogbase.ui ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp @@ -72,7 +72,7 @@ tde_add_kpart( libtdevcppsupport AUTOMOC creategettersetterdialog.cpp creategettersetterdialog.h createpcsdialog.cpp createpcsdialogbase.ui doxydoc.cpp includefiles.cpp includepathresolver.cpp - tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp + kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp qtdesignercppintegration.cpp setuphelper.cpp simplecontext.cpp simpletype.cpp simpletypecatalog.cpp simpletypefunction.cpp simpletypenamespace.cpp @@ -80,7 +80,7 @@ tde_add_kpart( libtdevcppsupport AUTOMOC subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp typedesc.cpp LINK - lang_interfaces-shared tdevcppparser-shared - tdevcatalog-shared designerintegration-shared + lang_interfaces-shared kdevcppparser-shared + kdevcatalog-shared designerintegration-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/KDevCppSupportIface.cpp b/languages/cpp/KDevCppSupportIface.cpp new file mode 100644 index 00000000..793516ca --- /dev/null +++ b/languages/cpp/KDevCppSupportIface.cpp @@ -0,0 +1,24 @@ + +#include "KDevCppSupportIface.h" +#include "cppsupportpart.h" + +KDevCppSupportIface::KDevCppSupportIface( CppSupportPart* cppSupport ) + : TQObject( cppSupport ), DCOPObject( "KDevCppSupport" ), m_cppSupport( cppSupport ) +{ +} + +KDevCppSupportIface::~KDevCppSupportIface() +{ +} + +void KDevCppSupportIface::addClass() +{ + m_cppSupport->slotNewClass(); +} + +void KDevCppSupportIface::parseProject() +{ + m_cppSupport->parseProject(); +} + +#include "KDevCppSupportIface.moc" diff --git a/languages/cpp/TDevCppSupportIface.h b/languages/cpp/KDevCppSupportIface.h similarity index 55% rename from languages/cpp/TDevCppSupportIface.h rename to languages/cpp/KDevCppSupportIface.h index c94509ba..cbf8b4f9 100644 --- a/languages/cpp/TDevCppSupportIface.h +++ b/languages/cpp/KDevCppSupportIface.h @@ -1,20 +1,20 @@ -#ifndef TDEVCPPSUPPORTIFACE_H -#define TDEVCPPSUPPORTIFACE_H +#ifndef KDEVCPPSUPPORTIFACE_H +#define KDEVCPPSUPPORTIFACE_H #include #include class CppSupportPart; -class TDevCppSupportIface : public TQObject, public DCOPObject +class KDevCppSupportIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevCppSupportIface( CppSupportPart* cppSupport ); - ~TDevCppSupportIface(); + KDevCppSupportIface( CppSupportPart* cppSupport ); + ~KDevCppSupportIface(); k_dcop: void addClass(); diff --git a/languages/cpp/Makefile.am b/languages/cpp/Makefile.am index dc4974c3..7c506ac1 100644 --- a/languages/cpp/Makefile.am +++ b/languages/cpp/Makefile.am @@ -10,14 +10,14 @@ INCLUDES = -I$(top_srcdir)/languages/lib/designer_integration \ -I$(top_builddir)/languages/lib/designer_integration -I$(top_builddir)/bdb/build_unix -I$(top_srcdir)/bdb/include \ $(all_includes) -kde_module_LTLIBRARIES = libtdevcppsupport.la -libtdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la \ +kde_module_LTLIBRARIES = libkdevcppsupport.la +libkdevcppsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcppsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la \ - $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libtdevinterfaces.la + $(top_builddir)/languages/lib/designer_integration/libdesignerintegration.la $(top_builddir)/lib/interfaces/libkdevinterfaces.la -libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel \ +libkdevcppsupport_la_SOURCES = KDevCppSupportIface.cpp KDevCppSupportIface.skel \ addattributedialog.cpp addattributedialogbase.ui addmethoddialog.cpp addmethoddialogbase.ui \ ast_utils.cpp backgroundparser.cpp ccconfigwidget.cpp ccconfigwidgetbase.ui \ classgeneratorconfig.cpp classgeneratorconfigbase.ui codeinformationrepository.cpp \ @@ -27,7 +27,7 @@ libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel cppsupportfactory.cpp cppsupportpart.cpp creategettersetter.ui \ creategettersetterconfiguration.cpp creategettersetterconfiguration.h creategettersetterdialog.cpp \ creategettersetterdialog.h createpcsdialog.cpp createpcsdialogbase.ui doxydoc.cpp includefiles.cpp \ - includepathresolver.cpp tdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \ + includepathresolver.cpp kdevdriver.cpp problemreporter.cpp qtbuildconfig.cpp \ qtdesignercppintegration.cpp setuphelper.cpp simplecontext.cpp simpletype.cpp simpletypecatalog.cpp \ simpletypefunction.cpp simpletypenamespace.cpp store_walker.cpp storeconverter.cpp \ stringhelpers.cpp subclassingdlg.cpp subclassingdlgbase.ui tag_creator.cpp typedesc.cpp @@ -35,15 +35,15 @@ libtdevcppsupport_la_SOURCES = TDevCppSupportIface.cpp TDevCppSupportIface.skel METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcppsupport.desktop tdevcsupport.desktop +service_DATA = kdevcppsupport.desktop kdevcsupport.desktop -rcdir = $(kde_datadir)/tdevcppsupport -rc_DATA = tdevcppsupport.rc +rcdir = $(kde_datadir)/kdevcppsupport +rc_DATA = kdevcppsupport.rc -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = cpptemplates -configurationdir = ${kde_datadir}/tdevcppsupport +configurationdir = ${kde_datadir}/kdevcppsupport configuration_DATA = configuration AM_CXXFLAGS = -DAST_DEBUG @@ -51,8 +51,8 @@ AM_CXXFLAGS = -DAST_DEBUG #bin_PROGRAMS = r++ #r___LDFLAGS = $(all_libraries) #r___SOURCES = main.cpp -#r___DEPENDENCIES = libtdevcppsupport.la -#r___LDADD = libtdevcppsupport.la $(top_builddir)/lib/catalog/libtdevcatalog.la $(top_builddir)/lib/cppparser/libtdevcppparser.la +#r___DEPENDENCIES = libkdevcppsupport.la +#r___LDADD = libkdevcppsupport.la $(top_builddir)/lib/catalog/libkdevcatalog.la $(top_builddir)/lib/cppparser/libkdevcppparser.la noinst_HEADERS = cppevaluation.h cppimplementationwidget.h \ cppsplitheadersourceconfig.h declarationinfo.h expressioninfo.h includefiles.h includepathresolver.h \ qtdesignercppintegration.h setuphelper.h simplecontext.h simpletypecatalog.h simpletypefunction.h \ diff --git a/languages/cpp/README.dox b/languages/cpp/README.dox index 527e50ab..460c4cc7 100644 --- a/languages/cpp/README.dox +++ b/languages/cpp/README.dox @@ -4,7 +4,7 @@ Provides C/C++ language support for KDevelop. Well the first thing you should read is lib/catalog it contains the source of the persistant class store after that languages/cpp/tag_creator.* it is the component that stores the informations collected by the c++ parser into the PCS -then you can play with TDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/* +then you can play with KDevPCSImporter the code of the dialog is in languages/cpp/createpcsdialog* and languages/cpp/pcsimporter/* and of course lib/interfaces/kdevpcsimporter.* and if you want play with the c++ parser go to lib/cppparser/, the best is to start to read driver.* diff --git a/languages/cpp/TDevCppSupportIface.cpp b/languages/cpp/TDevCppSupportIface.cpp deleted file mode 100644 index 54977c4c..00000000 --- a/languages/cpp/TDevCppSupportIface.cpp +++ /dev/null @@ -1,24 +0,0 @@ - -#include "TDevCppSupportIface.h" -#include "cppsupportpart.h" - -TDevCppSupportIface::TDevCppSupportIface( CppSupportPart* cppSupport ) - : TQObject( cppSupport ), DCOPObject( "TDevCppSupport" ), m_cppSupport( cppSupport ) -{ -} - -TDevCppSupportIface::~TDevCppSupportIface() -{ -} - -void TDevCppSupportIface::addClass() -{ - m_cppSupport->slotNewClass(); -} - -void TDevCppSupportIface::parseProject() -{ - m_cppSupport->parseProject(); -} - -#include "TDevCppSupportIface.moc" diff --git a/languages/cpp/addattributedialog.cpp b/languages/cpp/addattributedialog.cpp index 705678cd..6a9a1fbc 100644 --- a/languages/cpp/addattributedialog.cpp +++ b/languages/cpp/addattributedialog.cpp @@ -23,7 +23,7 @@ #include "backgroundparser.h" #include "cppsupport_utils.h" -#include +#include #include diff --git a/languages/cpp/addmethoddialog.cpp b/languages/cpp/addmethoddialog.cpp index f9e9c602..c9593844 100644 --- a/languages/cpp/addmethoddialog.cpp +++ b/languages/cpp/addmethoddialog.cpp @@ -24,8 +24,8 @@ #include "cppsupport_utils.h" #include "domutil.h" -#include -#include +#include +#include #include #include @@ -236,7 +236,7 @@ void AddMethodDialog::accept() TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) { - if ( TDevCreateFile * createFileSupp = m_cppSupport->extension( "TDevelop/CreateFile" ) ) + if ( KDevCreateFile * createFileSupp = m_cppSupport->extension( "TDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); } diff --git a/languages/cpp/app_templates/CMakeLists.txt b/languages/cpp/app_templates/CMakeLists.txt index 2ed5ec56..52229fc6 100644 --- a/languages/cpp/app_templates/CMakeLists.txt +++ b/languages/cpp/app_templates/CMakeLists.txt @@ -9,14 +9,14 @@ # ################################################# -add_subdirectory( tdeapp ) +add_subdirectory( kapp ) add_subdirectory( kpartapp ) add_subdirectory( kpartplugin ) add_subdirectory( tdecmodule ) add_subdirectory( kicker ) add_subdirectory( tdeioslave ) -add_subdirectory( tdevpart ) -add_subdirectory( tdevpart2 ) +add_subdirectory( kdevpart ) +add_subdirectory( kdevpart2 ) add_subdirectory( chello ) add_subdirectory( cpphello ) add_subdirectory( tdescreensaver ) @@ -32,11 +32,11 @@ add_subdirectory( khello2 ) add_subdirectory( kateplugin ) add_subdirectory( kateplugin2 ) add_subdirectory( qtopiaapp ) -add_subdirectory( tdedcop ) +add_subdirectory( kdedcop ) add_subdirectory( wxhello ) add_subdirectory( cppsdlhello ) add_subdirectory( tdeconfig35 ) -add_subdirectory( tdevlang ) +add_subdirectory( kdevlang ) add_subdirectory( noatunvisual ) add_subdirectory( noatunui ) add_subdirectory( kmod ) @@ -64,7 +64,7 @@ add_subdirectory( qmakeempty ) add_subdirectory( automakeempty ) add_subdirectory( makefileempty ) add_subdirectory( qtopia4app ) -add_subdirectory( tde4app ) +add_subdirectory( kde4app ) install( FILES c.appwizard @@ -75,5 +75,5 @@ install( FILES DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE ) install( FILES - tdecpp.appwizard + kdecpp.appwizard DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE ) diff --git a/languages/cpp/app_templates/Makefile.am b/languages/cpp/app_templates/Makefile.am index e594ce4e..8350118d 100644 --- a/languages/cpp/app_templates/Makefile.am +++ b/languages/cpp/app_templates/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = tdeapp kpartapp kpartplugin tdecmodule kicker tdeioslave tdevpart tdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp tdedcop wxhello cppsdlhello tdeconfig35 tdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app tde4app +SUBDIRS = kapp kpartapp kpartplugin tdecmodule kicker tdeioslave kdevpart kdevpart2 chello cpphello tdescreensaver kofficepart chello_gba dcopservice konqnavpanel qmakesimple qmakeapp qt4makeapp khello khello2 kateplugin kateplugin2 qtopiaapp kdedcop wxhello cppsdlhello tdeconfig35 kdevlang noatunvisual noatunui kmod tdefileplugin clanlib opieapp opieapplet opieinput opiemenu opienet opietoday kxt gtk2mmapp cppcurseshello win32hello win32gui cmakesimple cmakesimplec cmakelibcpp cmakelibc kscons_kxt kscons_tdemdi qt4hello qmakeempty automakeempty makefileempty qtopia4app kde4app profilescdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CIDE profilesc_DATA = c.appwizard @@ -6,5 +6,5 @@ profilesc_DATA = c.appwizard profilescppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE profilescpp_DATA = cpp.appwizard -profilestdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE -profilestdecpp_DATA = tdecpp.appwizard +profileskdecppdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/CandCppIDE/CppIDE/TDECppIDE +profileskdecpp_DATA = kdecpp.appwizard diff --git a/languages/cpp/app_templates/automakeempty/CMakeLists.txt b/languages/cpp/app_templates/automakeempty/CMakeLists.txt index 8757cdce..6785106a 100644 --- a/languages/cpp/app_templates/automakeempty/CMakeLists.txt +++ b/languages/cpp/app_templates/automakeempty/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( automakeempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/automakeempty.tar.gz automakeempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - automakeempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + automakeempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/automakeempty/Makefile.am b/languages/cpp/app_templates/automakeempty/Makefile.am index 8c6ceb16..06f9a94c 100644 --- a/languages/cpp/app_templates/automakeempty/Makefile.am +++ b/languages/cpp/app_templates/automakeempty/Makefile.am @@ -3,10 +3,10 @@ dataFiles = automakeempty-Makefile.am automakeempty-Makefile.cvs \ templateName = automakeempty ### 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/cpp/app_templates/automakeempty/app.tdevelop b/languages/cpp/app_templates/automakeempty/app.tdevelop index f30a3dfc..ab12095d 100644 --- a/languages/cpp/app_templates/automakeempty/app.tdevelop +++ b/languages/cpp/app_templates/automakeempty/app.tdevelop @@ -11,7 +11,7 @@ Code - + @@ -33,8 +33,8 @@ -O0 -g3 - - + + ada ada_bugs_gcc @@ -79,23 +79,23 @@ TDE Libraries (Doxygen) - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate similarity index 97% rename from languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate rename to languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate index 6581b4fa..a1ced086 100644 --- a/languages/cpp/app_templates/automakeempty/automakeempty.tdevtemplate +++ b/languages/cpp/app_templates/automakeempty/automakeempty.kdevtemplate @@ -53,11 +53,11 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE2] Type=install diff --git a/languages/cpp/app_templates/chello/CMakeLists.txt b/languages/cpp/app_templates/chello/CMakeLists.txt index 9df341e8..5d792072 100644 --- a/languages/cpp/app_templates/chello/CMakeLists.txt +++ b/languages/cpp/app_templates/chello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( chello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/chello.tar.gz chello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - chello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + chello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/chello/Makefile.am b/languages/cpp/app_templates/chello/Makefile.am index 3c77d4fb..0a51e6fd 100644 --- a/languages/cpp/app_templates/chello/Makefile.am +++ b/languages/cpp/app_templates/chello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.c src-Makefile.am c-Makefile.am c-Makefile.cvs \ templateName = chello ### 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} ${dataFiles} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/chello/app.tdevelop b/languages/cpp/app_templates/chello/app.tdevelop index 825cf9a3..41866d9f 100644 --- a/languages/cpp/app_templates/chello/app.tdevelop +++ b/languages/cpp/app_templates/chello/app.tdevelop @@ -11,7 +11,7 @@ Code - + src/%{APPNAMELC} debug @@ -37,8 +37,8 @@ -O0 -g3 %{CFLAGS} - - + + ada ada_bugs_gcc @@ -85,23 +85,23 @@ TDE Libraries (Doxygen) - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/chello/chello.tdevtemplate b/languages/cpp/app_templates/chello/chello.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/chello/chello.tdevtemplate rename to languages/cpp/app_templates/chello/chello.kdevtemplate index 1368d851..6dc5fb77 100644 --- a/languages/cpp/app_templates/chello/chello.tdevtemplate +++ b/languages/cpp/app_templates/chello/chello.kdevtemplate @@ -211,11 +211,11 @@ Archive=chello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/chello_gba/CMakeLists.txt b/languages/cpp/app_templates/chello_gba/CMakeLists.txt index 6810ed53..b11230fe 100644 --- a/languages/cpp/app_templates/chello_gba/CMakeLists.txt +++ b/languages/cpp/app_templates/chello_gba/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( chellogba.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/chellogba.tar.gz chellogba.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - chellogba.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + chellogba.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/chello_gba/Makefile.am b/languages/cpp/app_templates/chello_gba/Makefile.am index afaf8c0b..fbc6c2b4 100644 --- a/languages/cpp/app_templates/chello_gba/Makefile.am +++ b/languages/cpp/app_templates/chello_gba/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.c font.raw.c master.pal.c src-Makefile.am c-Makefile.am \ templateName = chellogba ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/chello_gba/app.tdevelop b/languages/cpp/app_templates/chello_gba/app.tdevelop index 3c38bcf4..2f59c978 100644 --- a/languages/cpp/app_templates/chello_gba/app.tdevelop +++ b/languages/cpp/app_templates/chello_gba/app.tdevelop @@ -11,10 +11,10 @@ GBA - TDevDebugger + KDevDebugger - + src/%{APPNAMELC} @@ -33,11 +33,11 @@ -nostartfiles - - + + src/%{APPNAMELC}.gba - - + + ada ada_bugs_gcc @@ -84,17 +84,17 @@ TDE Libraries (Doxygen) - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate rename to languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate index e6ea8c90..ef89357f 100644 --- a/languages/cpp/app_templates/chello_gba/chellogba.tdevtemplate +++ b/languages/cpp/app_templates/chello_gba/chellogba.kdevtemplate @@ -68,11 +68,11 @@ Archive=chellogba.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/clanlib/CMakeLists.txt b/languages/cpp/app_templates/clanlib/CMakeLists.txt index c8fdfe2d..e0b99cc2 100644 --- a/languages/cpp/app_templates/clanlib/CMakeLists.txt +++ b/languages/cpp/app_templates/clanlib/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( clanlib.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/clanlib.tar.gz clanlib.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - clanlib.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + clanlib.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/clanlib/Makefile.am b/languages/cpp/app_templates/clanlib/Makefile.am index b6aa9150..84e0459b 100644 --- a/languages/cpp/app_templates/clanlib/Makefile.am +++ b/languages/cpp/app_templates/clanlib/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app-Makefile.am main.cpp app.tdevelop \ templateName = clanlib ### 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/cpp/app_templates/clanlib/app.tdevelop b/languages/cpp/app_templates/clanlib/app.tdevelop index 15418279..d2e9e430 100644 --- a/languages/cpp/app_templates/clanlib/app.tdevelop +++ b/languages/cpp/app_templates/clanlib/app.tdevelop @@ -12,7 +12,7 @@ ClanLib - + src/%{APPNAMELC} debug @@ -43,8 +43,8 @@ - - + + ada ada_bugs_gcc @@ -90,17 +90,17 @@ TDE Libraries (Doxygen) - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/clanlib/clanlib.tdevtemplate rename to languages/cpp/app_templates/clanlib/clanlib.kdevtemplate index 89243557..1b39badc 100644 --- a/languages/cpp/app_templates/clanlib/clanlib.tdevtemplate +++ b/languages/cpp/app_templates/clanlib/clanlib.kdevtemplate @@ -68,7 +68,7 @@ Archive=clanlib.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt index df6ec7b7..841853d8 100644 --- a/languages/cpp/app_templates/cmakelibc/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibc/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cmakelibc.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakelibc.tar.gz cmakelibc.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakelibc.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakelibc.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakelibc/Makefile.am b/languages/cpp/app_templates/cmakelibc/Makefile.am index f4fb8bb2..c10e704a 100644 --- a/languages/cpp/app_templates/cmakelibc/Makefile.am +++ b/languages/cpp/app_templates/cmakelibc/Makefile.am @@ -2,10 +2,10 @@ dataFiles = test.c lib.h lib.c cmakelibc.png CMakeLists.txt CMakeLists.txt.src templateName = cmakelibc ### 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/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate b/languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/cmakelibc/cmakelibc.tdevtemplate rename to languages/cpp/app_templates/cmakelibc/cmakelibc.kdevtemplate diff --git a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt index cbd6bd5f..26d7f3e2 100644 --- a/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakelibcpp/CMakeLists.txt @@ -18,10 +18,10 @@ add_custom_target( cmakelibcpp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakelibcpp.tar.gz cmakelibcpp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakelibcpp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakelibcpp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakelibcpp/Makefile.am b/languages/cpp/app_templates/cmakelibcpp/Makefile.am index 0c3b275e..395bb107 100644 --- a/languages/cpp/app_templates/cmakelibcpp/Makefile.am +++ b/languages/cpp/app_templates/cmakelibcpp/Makefile.am @@ -2,10 +2,10 @@ dataFiles = test.cpp lib.h lib.cpp cmakelibcpp.png CMakeLists.txt CMakeLists.txt templateName = cmakelibcpp ### 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/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate b/languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.tdevtemplate rename to languages/cpp/app_templates/cmakelibcpp/cmakelibcpp.kdevtemplate diff --git a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt index 88bb2d36..b69d898f 100644 --- a/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakeqt3app/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( cmakeqt3app.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakeqt3app.tar.gz cmakeqt3app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakeqt3app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakeqt3app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakeqt3app/Makefile.am b/languages/cpp/app_templates/cmakeqt3app/Makefile.am index e42bdcbf..24bd6c35 100644 --- a/languages/cpp/app_templates/cmakeqt3app/Makefile.am +++ b/languages/cpp/app_templates/cmakeqt3app/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp cmakeqt3app.cpp cmakeqt3app.h cmakeqt3app.png \ templateName = cmakeqt3app ### 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/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate b/languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.tdevtemplate rename to languages/cpp/app_templates/cmakeqt3app/cmakeqt3app.kdevtemplate diff --git a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt index d5e417c3..621dd48a 100644 --- a/languages/cpp/app_templates/cmakesimple/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( cmakesimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakesimple.tar.gz cmakesimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakesimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakesimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakesimple/Makefile.am b/languages/cpp/app_templates/cmakesimple/Makefile.am index e6ff1e4d..243ed01d 100644 --- a/languages/cpp/app_templates/cmakesimple/Makefile.am +++ b/languages/cpp/app_templates/cmakesimple/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp cmakesimple.png CMakeLists.txt README templateName = cmakesimple ### 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/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate b/languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/cmakesimple/cmakesimple.tdevtemplate rename to languages/cpp/app_templates/cmakesimple/cmakesimple.kdevtemplate diff --git a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt index 70e65075..4d07a4d6 100644 --- a/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt +++ b/languages/cpp/app_templates/cmakesimplec/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( cmakesimplec.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cmakesimplec.tar.gz cmakesimplec.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cmakesimplec.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cmakesimplec.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cmakesimplec/Makefile.am b/languages/cpp/app_templates/cmakesimplec/Makefile.am index df69719d..f5a1c3e7 100644 --- a/languages/cpp/app_templates/cmakesimplec/Makefile.am +++ b/languages/cpp/app_templates/cmakesimplec/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.c cmakesimplec.png CMakeLists.txt templateName = cmakesimplec ### 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/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate b/languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/cmakesimplec/cmakesimplec.tdevtemplate rename to languages/cpp/app_templates/cmakesimplec/cmakesimplec.kdevtemplate diff --git a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt index bfdd6d10..ccb2dd4a 100644 --- a/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt +++ b/languages/cpp/app_templates/cppcurseshello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cppcurseshello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cppcurseshello.tar.gz cppcurseshello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cppcurseshello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cppcurseshello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cppcurseshello/Makefile.am b/languages/cpp/app_templates/cppcurseshello/Makefile.am index 17175bfa..ef3623f6 100644 --- a/languages/cpp/app_templates/cppcurseshello/Makefile.am +++ b/languages/cpp/app_templates/cppcurseshello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs\ templateName = cppcurseshello ### 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/cpp/app_templates/cppcurseshello/app.tdevelop b/languages/cpp/app_templates/cppcurseshello/app.tdevelop index d771aedf..98919071 100644 --- a/languages/cpp/app_templates/cppcurseshello/app.tdevelop +++ b/languages/cpp/app_templates/cppcurseshello/app.tdevelop @@ -11,7 +11,7 @@ Code - + src/%{APPNAMELC} debug @@ -37,8 +37,8 @@ -O0 -g3 - - + + ada ada_bugs_gcc @@ -83,23 +83,23 @@ TDE Libraries (Doxygen) - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate rename to languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate index 5bd7ebe2..27f85c21 100644 --- a/languages/cpp/app_templates/cppcurseshello/cppcurseshello.tdevtemplate +++ b/languages/cpp/app_templates/cppcurseshello/cppcurseshello.kdevtemplate @@ -68,11 +68,11 @@ Archive=cppcurseshello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cpphello/CMakeLists.txt b/languages/cpp/app_templates/cpphello/CMakeLists.txt index 9227cfcd..d77effea 100644 --- a/languages/cpp/app_templates/cpphello/CMakeLists.txt +++ b/languages/cpp/app_templates/cpphello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cpphello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cpphello.tar.gz cpphello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cpphello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cpphello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cpphello/Makefile.am b/languages/cpp/app_templates/cpphello/Makefile.am index 930a46e5..2ba017c2 100644 --- a/languages/cpp/app_templates/cpphello/Makefile.am +++ b/languages/cpp/app_templates/cpphello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs \ templateName = cpphello ### 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/cpp/app_templates/cpphello/app.tdevelop b/languages/cpp/app_templates/cpphello/app.tdevelop index d771aedf..98919071 100644 --- a/languages/cpp/app_templates/cpphello/app.tdevelop +++ b/languages/cpp/app_templates/cpphello/app.tdevelop @@ -11,7 +11,7 @@ Code - + src/%{APPNAMELC} debug @@ -37,8 +37,8 @@ -O0 -g3 - - + + ada ada_bugs_gcc @@ -83,23 +83,23 @@ TDE Libraries (Doxygen) - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/cpphello/cpphello.tdevtemplate rename to languages/cpp/app_templates/cpphello/cpphello.kdevtemplate index 1b4fc2fc..ee529159 100644 --- a/languages/cpp/app_templates/cpphello/cpphello.tdevtemplate +++ b/languages/cpp/app_templates/cpphello/cpphello.kdevtemplate @@ -69,11 +69,11 @@ Archive=cpphello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt index 46e4a57f..b5e16259 100644 --- a/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt +++ b/languages/cpp/app_templates/cppsdlhello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( cppsdlhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/cppsdlhello.tar.gz cppsdlhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - cppsdlhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + cppsdlhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/cppsdlhello/Makefile.am b/languages/cpp/app_templates/cppsdlhello/Makefile.am index 3743cf77..c0357370 100644 --- a/languages/cpp/app_templates/cppsdlhello/Makefile.am +++ b/languages/cpp/app_templates/cppsdlhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp src-Makefile.am cpp-Makefile.am cpp-Makefile.cvs configur templateName = cppsdlhello ### 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/cpp/app_templates/cppsdlhello/app.tdevelop b/languages/cpp/app_templates/cppsdlhello/app.tdevelop index 39760184..3a60526f 100644 --- a/languages/cpp/app_templates/cppsdlhello/app.tdevelop +++ b/languages/cpp/app_templates/cppsdlhello/app.tdevelop @@ -12,7 +12,7 @@ SDL - + src/%{APPNAMELC} debug @@ -43,8 +43,8 @@ -lSDL - - + + ada ada_bugs_gcc @@ -87,17 +87,17 @@ TDE Libraries (Doxygen) - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate rename to languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate index e99f52ab..5e559acb 100644 --- a/languages/cpp/app_templates/cppsdlhello/cppsdlhello.tdevtemplate +++ b/languages/cpp/app_templates/cppsdlhello/cppsdlhello.kdevtemplate @@ -69,11 +69,11 @@ Archive=cppsdlhello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/dcopservice/CMakeLists.txt b/languages/cpp/app_templates/dcopservice/CMakeLists.txt index d2e5458b..c3a2397b 100644 --- a/languages/cpp/app_templates/dcopservice/CMakeLists.txt +++ b/languages/cpp/app_templates/dcopservice/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( dcopservice.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/dcopservice.tar.gz dcopservice.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - dcopservice.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + dcopservice.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/dcopservice/Makefile.am b/languages/cpp/app_templates/dcopservice/Makefile.am index 35b114d2..dddb4916 100644 --- a/languages/cpp/app_templates/dcopservice/Makefile.am +++ b/languages/cpp/app_templates/dcopservice/Makefile.am @@ -4,10 +4,10 @@ dataFiles = dcopservice.desktop dcopservice.png dcopservice.h \ templateName = dcopservice ### 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/cpp/app_templates/dcopservice/dcopservice.tdevtemplate b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/dcopservice/dcopservice.tdevtemplate rename to languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate index 0174747d..a4c08a28 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevtemplate +++ b/languages/cpp/app_templates/dcopservice/dcopservice.kdevtemplate @@ -69,11 +69,11 @@ Archive=dcopservice.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/cpp/app_templates/dcopservice/dcopservice.tdevelop b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop index dfdea3b8..59569583 100644 --- a/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop +++ b/languages/cpp/app_templates/dcopservice/dcopservice.tdevelop @@ -14,15 +14,15 @@ tdeioslave - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + debug @@ -43,15 +43,15 @@ -O0 -g3 - - + + - - + + ada ada_bugs_gcc @@ -88,22 +88,22 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/generichello/Makefile.am b/languages/cpp/app_templates/generichello/Makefile.am index 5f5bf6ed..75bad862 100644 --- a/languages/cpp/app_templates/generichello/Makefile.am +++ b/languages/cpp/app_templates/generichello/Makefile.am @@ -5,10 +5,10 @@ templateName = cppgenerichello # png-filename differs from archive file name ### 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/cpp/app_templates/generichello/app.prj b/languages/cpp/app_templates/generichello/app.prj index c6466824..a1eeca82 100644 --- a/languages/cpp/app_templates/generichello/app.prj +++ b/languages/cpp/app_templates/generichello/app.prj @@ -1,8 +1,8 @@ - + gcc -o %{APPNAMELC} %{APPNAMELC}.cpp - + diff --git a/languages/cpp/app_templates/generichello/app.tdevelop b/languages/cpp/app_templates/generichello/app.tdevelop index a719a726..63f5ce16 100644 --- a/languages/cpp/app_templates/generichello/app.tdevelop +++ b/languages/cpp/app_templates/generichello/app.tdevelop @@ -4,14 +4,14 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevGenericProject + KDevGenericProject C++ C++ Code - + ShellScript %{APPNAMELC}.prj @@ -39,23 +39,23 @@ -O0 -g3 - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/generichello/generichello.tdevtemplate b/languages/cpp/app_templates/generichello/generichello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/generichello/generichello.tdevtemplate rename to languages/cpp/app_templates/generichello/generichello.kdevtemplate index 27f78afe..f30eea5b 100644 --- a/languages/cpp/app_templates/generichello/generichello.tdevtemplate +++ b/languages/cpp/app_templates/generichello/generichello.kdevtemplate @@ -68,7 +68,7 @@ Archive=generichello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/gnome2mmapp/Makefile.am b/languages/cpp/app_templates/gnome2mmapp/Makefile.am index a0d9505e..9d73ddd6 100644 --- a/languages/cpp/app_templates/gnome2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gnome2mmapp/Makefile.am @@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gnome2mm.glade main_window.cc \ templateName = gnome2mmapp ### 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/cpp/app_templates/gnome2mmapp/app.tdevelop b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop index 177611f0..19fbacb7 100644 --- a/languages/cpp/app_templates/gnome2mmapp/app.tdevelop +++ b/languages/cpp/app_templates/gnome2mmapp/app.tdevelop @@ -12,7 +12,7 @@ GNOME - + src/%{APPNAMELC} debug @@ -39,8 +39,8 @@ -O0 -g3 - - + + @@ -48,22 +48,22 @@ - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate rename to languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate index 363ffd5a..f692d342 100644 --- a/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.tdevtemplate +++ b/languages/cpp/app_templates/gnome2mmapp/gnome2mmapp.kdevtemplate @@ -67,15 +67,15 @@ Archive=gnome2mmapp.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNOME2] Type=include -File=%{tdevelop}/template-common/gnome2.tdevtemplate +File=%{tdevelop}/template-common/gnome2.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt index 75d52e80..45544ac9 100644 --- a/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt +++ b/languages/cpp/app_templates/gtk2mmapp/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( gtk2mmapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gtk2mmapp.tar.gz gtk2mmapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - gtk2mmapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + gtk2mmapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/gtk2mmapp/Makefile.am b/languages/cpp/app_templates/gtk2mmapp/Makefile.am index 422f7b00..c44ba568 100644 --- a/languages/cpp/app_templates/gtk2mmapp/Makefile.am +++ b/languages/cpp/app_templates/gtk2mmapp/Makefile.am @@ -7,10 +7,10 @@ dataFiles = acconfig.h autogen.sh gtk2mm.glade main_window.cc \ templateName = gtk2mmapp ### 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/cpp/app_templates/gtk2mmapp/app.tdevelop b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop index f9335dad..6f691439 100644 --- a/languages/cpp/app_templates/gtk2mmapp/app.tdevelop +++ b/languages/cpp/app_templates/gtk2mmapp/app.tdevelop @@ -12,7 +12,7 @@ GTK - + src/%{APPNAMELC} debug @@ -39,8 +39,8 @@ -O0 -g3 - - + + @@ -48,8 +48,8 @@ - - + + ada ada_bugs_gcc @@ -92,22 +92,22 @@ TDE Libraries (Doxygen) - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate rename to languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate index 4559f2d8..a8948d26 100644 --- a/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.tdevtemplate +++ b/languages/cpp/app_templates/gtk2mmapp/gtk2mmapp.kdevtemplate @@ -59,11 +59,11 @@ Archive=gtk2mmapp.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/tdeapp/CMakeLists.txt b/languages/cpp/app_templates/kapp/CMakeLists.txt similarity index 55% rename from languages/cpp/app_templates/tdeapp/CMakeLists.txt rename to languages/cpp/app_templates/kapp/CMakeLists.txt index 10c09f9f..bfe6d93d 100644 --- a/languages/cpp/app_templates/tdeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/kapp/CMakeLists.txt @@ -9,19 +9,19 @@ # ################################################# -add_custom_target( tdeapp.tar.gz ALL - COMMAND tar zcf tdeapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( kapp.tar.gz ALL + COMMAND tar zcf kapp.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.cpp app.h pref.cpp pref.h appview.cpp appview.h appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am - tdeapp.png app.tdevelop subdirs README + kapp.png app.tdevelop subdirs README ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdeapp.tar.gz tdeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + ${CMAKE_CURRENT_BINARY_DIR}/kapp.tar.gz kapp.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeapp/Makefile.am b/languages/cpp/app_templates/kapp/Makefile.am similarity index 71% rename from languages/cpp/app_templates/tdeapp/Makefile.am rename to languages/cpp/app_templates/kapp/Makefile.am index 6adf4430..145551d3 100644 --- a/languages/cpp/app_templates/tdeapp/Makefile.am +++ b/languages/cpp/app_templates/kapp/Makefile.am @@ -1,14 +1,14 @@ dataFiles = app.cpp app.h pref.cpp pref.h appview.cpp appview.h \ appiface.h app_client.cpp main.cpp appui.rc src-Makefile.am \ - tdeapp.png app.tdevelop subdirs README + kapp.png app.tdevelop subdirs README -templateName = tdeapp +templateName = kapp ### 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/cpp/app_templates/tdeapp/README b/languages/cpp/app_templates/kapp/README similarity index 100% rename from languages/cpp/app_templates/tdeapp/README rename to languages/cpp/app_templates/kapp/README diff --git a/languages/cpp/app_templates/tdeapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp similarity index 100% rename from languages/cpp/app_templates/tdeapp/app.cpp rename to languages/cpp/app_templates/kapp/app.cpp diff --git a/languages/cpp/app_templates/tdeapp/app.desktop b/languages/cpp/app_templates/kapp/app.desktop similarity index 100% rename from languages/cpp/app_templates/tdeapp/app.desktop rename to languages/cpp/app_templates/kapp/app.desktop diff --git a/languages/cpp/app_templates/tdeapp/app.h b/languages/cpp/app_templates/kapp/app.h similarity index 100% rename from languages/cpp/app_templates/tdeapp/app.h rename to languages/cpp/app_templates/kapp/app.h diff --git a/languages/cpp/app_templates/tdeapp/app.tdevses b/languages/cpp/app_templates/kapp/app.kdevses similarity index 100% rename from languages/cpp/app_templates/tdeapp/app.tdevses rename to languages/cpp/app_templates/kapp/app.kdevses diff --git a/languages/cpp/app_templates/tdeapp/app.tdevelop b/languages/cpp/app_templates/kapp/app.tdevelop similarity index 91% rename from languages/cpp/app_templates/tdeapp/app.tdevelop rename to languages/cpp/app_templates/kapp/app.tdevelop index e1523988..6a53f237 100644 --- a/languages/cpp/app_templates/tdeapp/app.tdevelop +++ b/languages/cpp/app_templates/kapp/app.tdevelop @@ -17,15 +17,15 @@ - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + src/%{APPNAMELC} debug @@ -61,8 +61,8 @@ -O0 -g3 - - + + @@ -74,8 +74,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -110,8 +110,8 @@ qmake User Guide - - + + libtool @@ -125,16 +125,16 @@ false true - - + + - - + + -f -dP @@ -143,7 +143,7 @@ -u3 -p - + @@ -155,14 +155,14 @@ true - + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdeapp/app_client.cpp b/languages/cpp/app_templates/kapp/app_client.cpp similarity index 100% rename from languages/cpp/app_templates/tdeapp/app_client.cpp rename to languages/cpp/app_templates/kapp/app_client.cpp diff --git a/languages/cpp/app_templates/tdeapp/appiface.h b/languages/cpp/app_templates/kapp/appiface.h similarity index 100% rename from languages/cpp/app_templates/tdeapp/appiface.h rename to languages/cpp/app_templates/kapp/appiface.h diff --git a/languages/cpp/app_templates/tdeapp/appui.rc b/languages/cpp/app_templates/kapp/appui.rc similarity index 100% rename from languages/cpp/app_templates/tdeapp/appui.rc rename to languages/cpp/app_templates/kapp/appui.rc diff --git a/languages/cpp/app_templates/tdeapp/appview.cpp b/languages/cpp/app_templates/kapp/appview.cpp similarity index 100% rename from languages/cpp/app_templates/tdeapp/appview.cpp rename to languages/cpp/app_templates/kapp/appview.cpp diff --git a/languages/cpp/app_templates/tdeapp/appview.h b/languages/cpp/app_templates/kapp/appview.h similarity index 100% rename from languages/cpp/app_templates/tdeapp/appview.h rename to languages/cpp/app_templates/kapp/appview.h diff --git a/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate b/languages/cpp/app_templates/kapp/kapp.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate rename to languages/cpp/app_templates/kapp/kapp.kdevtemplate index 0902455d..86675a50 100644 --- a/languages/cpp/app_templates/tdeapp/tdeapp.tdevtemplate +++ b/languages/cpp/app_templates/kapp/kapp.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=C++/TDE Comment=Generates a simple TDE 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ó per al TDE 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 @@ -67,11 +67,11 @@ Archive=kapp.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/cpp/app_templates/tde4app/tde4app.png b/languages/cpp/app_templates/kapp/kapp.png similarity index 100% rename from languages/cpp/app_templates/tde4app/tde4app.png rename to languages/cpp/app_templates/kapp/kapp.png diff --git a/languages/cpp/app_templates/tdeapp/main.cpp b/languages/cpp/app_templates/kapp/main.cpp similarity index 100% rename from languages/cpp/app_templates/tdeapp/main.cpp rename to languages/cpp/app_templates/kapp/main.cpp diff --git a/languages/cpp/app_templates/tdeapp/pref.cpp b/languages/cpp/app_templates/kapp/pref.cpp similarity index 100% rename from languages/cpp/app_templates/tdeapp/pref.cpp rename to languages/cpp/app_templates/kapp/pref.cpp diff --git a/languages/cpp/app_templates/tdeapp/pref.h b/languages/cpp/app_templates/kapp/pref.h similarity index 100% rename from languages/cpp/app_templates/tdeapp/pref.h rename to languages/cpp/app_templates/kapp/pref.h diff --git a/languages/cpp/app_templates/tdeapp/src-Makefile.am b/languages/cpp/app_templates/kapp/src-Makefile.am similarity index 100% rename from languages/cpp/app_templates/tdeapp/src-Makefile.am rename to languages/cpp/app_templates/kapp/src-Makefile.am diff --git a/languages/cpp/app_templates/tdeapp/subdirs b/languages/cpp/app_templates/kapp/subdirs similarity index 100% rename from languages/cpp/app_templates/tdeapp/subdirs rename to languages/cpp/app_templates/kapp/subdirs diff --git a/languages/cpp/app_templates/kateplugin/CMakeLists.txt b/languages/cpp/app_templates/kateplugin/CMakeLists.txt index 2361b5e9..354218ad 100644 --- a/languages/cpp/app_templates/kateplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/kateplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kateplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kateplugin.tar.gz kateplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kateplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kateplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kateplugin/Makefile.am b/languages/cpp/app_templates/kateplugin/Makefile.am index 75b44829..81c1a586 100644 --- a/languages/cpp/app_templates/kateplugin/Makefile.am +++ b/languages/cpp/app_templates/kateplugin/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h\ plugin.tdevelop subdirs plugin.desktop ### 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/cpp/app_templates/kateplugin/kateplugin.tdevtemplate b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kateplugin/kateplugin.tdevtemplate rename to languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate index a3dc2dc8..3c308223 100644 --- a/languages/cpp/app_templates/kateplugin/kateplugin.tdevtemplate +++ b/languages/cpp/app_templates/kateplugin/kateplugin.kdevtemplate @@ -67,11 +67,11 @@ Archive=kateplugin.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/cpp/app_templates/kateplugin/plugin.tdevelop b/languages/cpp/app_templates/kateplugin/plugin.tdevelop index c96d48cc..799ac6d5 100644 --- a/languages/cpp/app_templates/kateplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/kateplugin/plugin.tdevelop @@ -13,15 +13,15 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + src/lib%{APPNAMELC}plugin.la debug @@ -43,8 +43,8 @@ -O0 -g3 - - + + @@ -52,8 +52,8 @@ - - + + ada ada_bugs_gcc @@ -90,24 +90,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt index 1546b2b7..c4a47fba 100644 --- a/languages/cpp/app_templates/kateplugin2/CMakeLists.txt +++ b/languages/cpp/app_templates/kateplugin2/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kateplugin2.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kateplugin2.tar.gz kateplugin2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kateplugin2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kateplugin2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kateplugin2/Makefile.am b/languages/cpp/app_templates/kateplugin2/Makefile.am index 99969725..b12a6477 100644 --- a/languages/cpp/app_templates/kateplugin2/Makefile.am +++ b/languages/cpp/app_templates/kateplugin2/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \ templateName = kateplugin2 ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate rename to languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate index 236c6a9a..3da42f23 100644 --- a/languages/cpp/app_templates/kateplugin2/kateplugin2.tdevtemplate +++ b/languages/cpp/app_templates/kateplugin2/kateplugin2.kdevtemplate @@ -68,11 +68,11 @@ Archive=kateplugin2.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/cpp/app_templates/kateplugin2/plugin.tdevelop b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop index 01c48bfc..831365dc 100644 --- a/languages/cpp/app_templates/kateplugin2/plugin.tdevelop +++ b/languages/cpp/app_templates/kateplugin2/plugin.tdevelop @@ -13,15 +13,15 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + src/lib%{APPNAMELC}plugin.la @@ -44,8 +44,8 @@ -O0 -g3 - - + + @@ -53,8 +53,8 @@ - - + + ada ada_bugs_gcc @@ -91,24 +91,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kde4app/CMakeLists.txt b/languages/cpp/app_templates/kde4app/CMakeLists.txt new file mode 100644 index 00000000..0399f045 --- /dev/null +++ b/languages/cpp/app_templates/kde4app/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kde4app.tar.gz ALL + COMMAND tar zcf kde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp + kapp4view.h kapp4view_base.ui main.cpp kde4appui.rc + kde4app-CMakeLists.txt kapp4.desktop kapp4.kcfg + settings.kcfgc kde4app.png README kde4app.tdevelop + kde4app.tdevelop.filelist +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kde4app.tar.gz kde4app.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kde4app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kde4app/Makefile.am b/languages/cpp/app_templates/kde4app/Makefile.am new file mode 100644 index 00000000..455acd8d --- /dev/null +++ b/languages/cpp/app_templates/kde4app/Makefile.am @@ -0,0 +1,19 @@ +dataFiles = kapp4.cpp kapp4.h prefs_base.ui kapp4view.cpp kapp4view.h kapp4view_base.ui \ + main.cpp kde4appui.rc CMakeLists.txt kapp4.desktop kapp4.kcfg settings.kcfgc \ + kde4app.png README kde4app.tdevelop kde4app.tdevelop.filelist + +templateName = kde4app + +### no need to change below: +template_DATA = $(templateName).kdevtemplate +templatedir = ${appwizarddatadir}/templates + +appwizarddatadir = ${kde_datadir}/kdevappwizard +$(templateName).tar.gz: ${dataFiles} + $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} + $(GZIP_COMMAND) -f9 $(templateName).tar + +archivedir = ${appwizarddatadir} +archive_DATA = $(templateName).tar.gz ${templateName}.png + +CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/tde4app/README b/languages/cpp/app_templates/kde4app/README similarity index 100% rename from languages/cpp/app_templates/tde4app/README rename to languages/cpp/app_templates/kde4app/README diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4.cpp rename to languages/cpp/app_templates/kde4app/kapp4.cpp diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.desktop b/languages/cpp/app_templates/kde4app/kapp4.desktop similarity index 96% rename from languages/cpp/app_templates/tde4app/tdeapp4.desktop rename to languages/cpp/app_templates/kde4app/kapp4.desktop index 63b359c5..18cdcbe5 100644 --- a/languages/cpp/app_templates/tde4app/tdeapp4.desktop +++ b/languages/cpp/app_templates/kde4app/kapp4.desktop @@ -3,7 +3,7 @@ Name=KApp4 Name[nds]=KProg4 Name[sv]=KDE 4-program Name[zh_TW]=KApp4 程式 -Exec=tdeapp4 %i -caption "%c" +Exec=kapp4 %i -caption "%c" Icon=kapp4 Type=Application DocPath=kapp4/kapp4.html diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.h b/languages/cpp/app_templates/kde4app/kapp4.h similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4.h rename to languages/cpp/app_templates/kde4app/kapp4.h diff --git a/languages/cpp/app_templates/tde4app/tdeapp4.kcfg b/languages/cpp/app_templates/kde4app/kapp4.kcfg similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4.kcfg rename to languages/cpp/app_templates/kde4app/kapp4.kcfg diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view.cpp b/languages/cpp/app_templates/kde4app/kapp4view.cpp similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4view.cpp rename to languages/cpp/app_templates/kde4app/kapp4view.cpp diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view.h b/languages/cpp/app_templates/kde4app/kapp4view.h similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4view.h rename to languages/cpp/app_templates/kde4app/kapp4view.h diff --git a/languages/cpp/app_templates/tde4app/tdeapp4view_base.ui b/languages/cpp/app_templates/kde4app/kapp4view_base.ui similarity index 100% rename from languages/cpp/app_templates/tde4app/tdeapp4view_base.ui rename to languages/cpp/app_templates/kde4app/kapp4view_base.ui diff --git a/languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt b/languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt similarity index 100% rename from languages/cpp/app_templates/tde4app/tde4app-CMakeLists.txt rename to languages/cpp/app_templates/kde4app/kde4app-CMakeLists.txt diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevtemplate b/languages/cpp/app_templates/kde4app/kde4app.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/tde4app/tde4app.tdevtemplate rename to languages/cpp/app_templates/kde4app/kde4app.kdevtemplate diff --git a/languages/cpp/app_templates/tdeapp/tdeapp.png b/languages/cpp/app_templates/kde4app/kde4app.png similarity index 100% rename from languages/cpp/app_templates/tdeapp/tdeapp.png rename to languages/cpp/app_templates/kde4app/kde4app.png diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevelop b/languages/cpp/app_templates/kde4app/kde4app.tdevelop similarity index 93% rename from languages/cpp/app_templates/tde4app/tde4app.tdevelop rename to languages/cpp/app_templates/kde4app/kde4app.tdevelop index 87554ffc..d332fa06 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.tdevelop +++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop @@ -4,7 +4,7 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C++ C++ @@ -18,7 +18,7 @@ - + @@ -30,8 +30,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -66,8 +66,8 @@ qmake User Guide - - + + libtool @@ -81,16 +81,16 @@ false true - - + + - - + + -f -dP @@ -99,7 +99,7 @@ -u3 -p - + @@ -111,7 +111,7 @@ true - + %{dest}/build/%{APPNAMELC} @@ -181,8 +181,8 @@ build - - + + true 4 @@ -191,15 +191,15 @@ /usr/bin/designer-qt4 /usr/lib/qt4 - - + + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist b/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist similarity index 85% rename from languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist rename to languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist index 50a0a4f0..5235563f 100644 --- a/languages/cpp/app_templates/tde4app/tde4app.tdevelop.filelist +++ b/languages/cpp/app_templates/kde4app/kde4app.tdevelop.filelist @@ -1,4 +1,4 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List CMakeLists.txt main.cpp prefs_base.ui diff --git a/languages/cpp/app_templates/tde4app/tde4appui.rc b/languages/cpp/app_templates/kde4app/kde4appui.rc similarity index 100% rename from languages/cpp/app_templates/tde4app/tde4appui.rc rename to languages/cpp/app_templates/kde4app/kde4appui.rc diff --git a/languages/cpp/app_templates/tde4app/main.cpp b/languages/cpp/app_templates/kde4app/main.cpp similarity index 100% rename from languages/cpp/app_templates/tde4app/main.cpp rename to languages/cpp/app_templates/kde4app/main.cpp diff --git a/languages/cpp/app_templates/tde4app/prefs_base.ui b/languages/cpp/app_templates/kde4app/prefs_base.ui similarity index 100% rename from languages/cpp/app_templates/tde4app/prefs_base.ui rename to languages/cpp/app_templates/kde4app/prefs_base.ui diff --git a/languages/cpp/app_templates/tde4app/settings.kcfgc b/languages/cpp/app_templates/kde4app/settings.kcfgc similarity index 100% rename from languages/cpp/app_templates/tde4app/settings.kcfgc rename to languages/cpp/app_templates/kde4app/settings.kcfgc diff --git a/languages/cpp/app_templates/tdecpp.appwizard b/languages/cpp/app_templates/kdecpp.appwizard similarity index 54% rename from languages/cpp/app_templates/tdecpp.appwizard rename to languages/cpp/app_templates/kdecpp.appwizard index c4f7b2ac..14bcbeaa 100644 --- a/languages/cpp/app_templates/tdecpp.appwizard +++ b/languages/cpp/app_templates/kdecpp.appwizard @@ -1,2 +1,2 @@ [General] -List=kdedcop,tdeioslave,kxt,tdevlang,kmake,kapp,tdeconfig35,tdevlang,tdevpart,kateplugin,tdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi +List=kdedcop,tdeioslave,kxt,kdevlang,kmake,kapp,tdeconfig35,kdevlang,kdevpart,kateplugin,kdevpart2,kopart,noatunui,kateplugin2,tdefileplugin,konqnavpanel,noatunvisual,dcopservice,khello,kpartapp,khello2,kpartplugin,tdecmodule,kicker,tdescreensaver,kscons_kxt,kscons_tdemdi diff --git a/languages/cpp/app_templates/tdedcop/CMakeLists.txt b/languages/cpp/app_templates/kdedcop/CMakeLists.txt similarity index 50% rename from languages/cpp/app_templates/tdedcop/CMakeLists.txt rename to languages/cpp/app_templates/kdedcop/CMakeLists.txt index f5556887..0b7e9a3f 100644 --- a/languages/cpp/app_templates/tdedcop/CMakeLists.txt +++ b/languages/cpp/app_templates/kdedcop/CMakeLists.txt @@ -9,19 +9,19 @@ # ################################################# -add_custom_target( tdedcop.tar.gz ALL - COMMAND tar zcf tdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} +add_custom_target( kdedcop.tar.gz ALL + COMMAND tar zcf kdedcop.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} app.cpp app.h app_iface.h app.tdevelop main.cpp - mainclass.cpp mainclass.h tdedcop.png src-Makefile.am + mainclass.cpp mainclass.h kdedcop.png src-Makefile.am subdirs ) install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdedcop.tar.gz tdedcop.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + ${CMAKE_CURRENT_BINARY_DIR}/kdedcop.tar.gz kdedcop.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdedcop.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kdedcop.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdedcop/Makefile.am b/languages/cpp/app_templates/kdedcop/Makefile.am similarity index 67% rename from languages/cpp/app_templates/tdedcop/Makefile.am rename to languages/cpp/app_templates/kdedcop/Makefile.am index 8a21a2bd..21c39778 100644 --- a/languages/cpp/app_templates/tdedcop/Makefile.am +++ b/languages/cpp/app_templates/kdedcop/Makefile.am @@ -1,13 +1,13 @@ dataFiles = app.cpp app.h app_iface.h app.tdevelop main.cpp mainclass.cpp \ - mainclass.h tdedcop.png src-Makefile.am subdirs + mainclass.h kdedcop.png src-Makefile.am subdirs -templateName = tdedcop +templateName = kdedcop ### 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/cpp/app_templates/tdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp similarity index 100% rename from languages/cpp/app_templates/tdedcop/app.cpp rename to languages/cpp/app_templates/kdedcop/app.cpp diff --git a/languages/cpp/app_templates/tdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h similarity index 100% rename from languages/cpp/app_templates/tdedcop/app.h rename to languages/cpp/app_templates/kdedcop/app.h diff --git a/languages/cpp/app_templates/tdedcop/app.tdevelop b/languages/cpp/app_templates/kdedcop/app.tdevelop similarity index 89% rename from languages/cpp/app_templates/tdedcop/app.tdevelop rename to languages/cpp/app_templates/kdedcop/app.tdevelop index c37bd28d..991381c5 100644 --- a/languages/cpp/app_templates/tdedcop/app.tdevelop +++ b/languages/cpp/app_templates/kdedcop/app.tdevelop @@ -14,16 +14,16 @@ DCOP - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -48,8 +48,8 @@ -O0 -g3 - - + + @@ -57,8 +57,8 @@ - - + + ada ada_bugs_gcc @@ -93,24 +93,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdedcop/app_iface.h b/languages/cpp/app_templates/kdedcop/app_iface.h similarity index 100% rename from languages/cpp/app_templates/tdedcop/app_iface.h rename to languages/cpp/app_templates/kdedcop/app_iface.h diff --git a/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate rename to languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate index 628fadd3..ff6a91c1 100644 --- a/languages/cpp/app_templates/tdedcop/tdedcop.tdevtemplate +++ b/languages/cpp/app_templates/kdedcop/kdedcop.kdevtemplate @@ -67,11 +67,11 @@ Archive=kdedcop.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/cpp/app_templates/tdedcop/tdedcop.png b/languages/cpp/app_templates/kdedcop/kdedcop.png similarity index 100% rename from languages/cpp/app_templates/tdedcop/tdedcop.png rename to languages/cpp/app_templates/kdedcop/kdedcop.png diff --git a/languages/cpp/app_templates/tdedcop/main.cpp b/languages/cpp/app_templates/kdedcop/main.cpp similarity index 100% rename from languages/cpp/app_templates/tdedcop/main.cpp rename to languages/cpp/app_templates/kdedcop/main.cpp diff --git a/languages/cpp/app_templates/tdedcop/mainclass.cpp b/languages/cpp/app_templates/kdedcop/mainclass.cpp similarity index 100% rename from languages/cpp/app_templates/tdedcop/mainclass.cpp rename to languages/cpp/app_templates/kdedcop/mainclass.cpp diff --git a/languages/cpp/app_templates/tdedcop/mainclass.h b/languages/cpp/app_templates/kdedcop/mainclass.h similarity index 100% rename from languages/cpp/app_templates/tdedcop/mainclass.h rename to languages/cpp/app_templates/kdedcop/mainclass.h diff --git a/languages/cpp/app_templates/tdedcop/src-Makefile.am b/languages/cpp/app_templates/kdedcop/src-Makefile.am similarity index 100% rename from languages/cpp/app_templates/tdedcop/src-Makefile.am rename to languages/cpp/app_templates/kdedcop/src-Makefile.am diff --git a/languages/cpp/app_templates/tdedcop/subdirs b/languages/cpp/app_templates/kdedcop/subdirs similarity index 100% rename from languages/cpp/app_templates/tdedcop/subdirs rename to languages/cpp/app_templates/kdedcop/subdirs diff --git a/languages/cpp/app_templates/kdevlang/CMakeLists.txt b/languages/cpp/app_templates/kdevlang/CMakeLists.txt new file mode 100644 index 00000000..483f85d9 --- /dev/null +++ b/languages/cpp/app_templates/kdevlang/CMakeLists.txt @@ -0,0 +1,27 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevlang.tar.gz ALL + COMMAND tar zcf kdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevlang_part.cpp kdevlang_part.h + kdevlang.rc kdevlang.desktop app.tdevelop + kdevlang-configure.in.in README.dox +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevlang.tar.gz kdevlang.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevlang.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevlang/Makefile.am b/languages/cpp/app_templates/kdevlang/Makefile.am similarity index 54% rename from languages/cpp/app_templates/tdevlang/Makefile.am rename to languages/cpp/app_templates/kdevlang/Makefile.am index d33ab103..7afa5be8 100644 --- a/languages/cpp/app_templates/tdevlang/Makefile.am +++ b/languages/cpp/app_templates/kdevlang/Makefile.am @@ -1,12 +1,12 @@ -dataFiles = src-Makefile.am tdevlang_part.cpp tdevlang_part.h tdevlang.rc \ - tdevlang.desktop app.tdevelop tdevlang-configure.in.in README.dox -templateName = tdevlang +dataFiles = src-Makefile.am kdevlang_part.cpp kdevlang_part.h kdevlang.rc \ + kdevlang.desktop app.tdevelop kdevlang-configure.in.in README.dox +templateName = kdevlang ### 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/cpp/app_templates/tdevlang/README.dox b/languages/cpp/app_templates/kdevlang/README.dox similarity index 100% rename from languages/cpp/app_templates/tdevlang/README.dox rename to languages/cpp/app_templates/kdevlang/README.dox diff --git a/languages/cpp/app_templates/tdevlang/app.tdevelop b/languages/cpp/app_templates/kdevlang/app.tdevelop similarity index 89% rename from languages/cpp/app_templates/tdevlang/app.tdevelop rename to languages/cpp/app_templates/kdevlang/app.tdevelop index d6648708..3f477a08 100644 --- a/languages/cpp/app_templates/tdevlang/app.tdevelop +++ b/languages/cpp/app_templates/kdevlang/app.tdevelop @@ -14,16 +14,16 @@ KDevelop - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} @@ -47,8 +47,8 @@ -O0 -g3 - - + + @@ -56,8 +56,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in similarity index 81% rename from languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in rename to languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in index a7e792f2..2e3823b0 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang-configure.in.in +++ b/languages/cpp/app_templates/kdevlang/kdevlang-configure.in.in @@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION}) AC_C_BIGENDIAN AC_CHECK_TDEMAXPATHLEN -KDE_CHECK_HEADERS([tdevelop/tdevcore.h]) +KDE_CHECK_HEADERS([tdevelop/kdevcore.h]) KDE_CHECK_LIB([tdevelop],main, [LIBTDEVELOP="-ltdevelop"]) AC_SUBST(LIBTDEVELOP) diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.desktop b/languages/cpp/app_templates/kdevlang/kdevlang.desktop similarity index 89% rename from languages/cpp/app_templates/tdevlang/tdevlang.desktop rename to languages/cpp/app_templates/kdevlang/kdevlang.desktop index 78fac402..93bb3c3b 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.desktop +++ b/languages/cpp/app_templates/kdevlang/kdevlang.desktop @@ -10,5 +10,5 @@ Name[ta]=கெடெவ்%{APPNAME} Icon=tdevelop ServiceTypes=TDevelop/LanguageSupport X-TDevelop-Language=ChangeMe -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate similarity index 97% rename from languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate rename to languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate index 8692af7e..6d852324 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang.tdevtemplate +++ b/languages/cpp/app_templates/kdevlang/kdevlang.kdevtemplate @@ -60,15 +60,15 @@ Comment[zh_CN]=这将生成 TDevelop 的语言支持插件，可以在 TDevelop Comment[zh_TW]=產生一個 TDevelop 語言支援外掛程式，建立在 TDevelop 程式源碼樹之外。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAMELC}_part.cpp -Archive=tdevlang.tar.gz +Archive=kdevlang.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 [FILE1] Type=install @@ -88,7 +88,7 @@ Dest=%{dest}/Makefile.cvs [FILE5] Type=install -Source=%{src}/tdevlang-configure.in.in +Source=%{src}/kdevlang-configure.in.in Dest=%{dest}/configure.in.in [MkDir1] @@ -102,23 +102,23 @@ Dest=%{dest}/src/Makefile.am [FILE7] Type=install -Source=%{src}/tdevlang_part.cpp +Source=%{src}/kdevlang_part.cpp Dest=%{dest}/src/%{APPNAMELC}_part.cpp [FILE8] Type=install -Source=%{src}/tdevlang_part.h +Source=%{src}/kdevlang_part.h Dest=%{dest}/src/%{APPNAMELC}_part.h [FILE9] Type=install EscapeXML=true -Source=%{src}/tdevlang.rc +Source=%{src}/kdevlang.rc Dest=%{dest}/src/kdev%{APPNAMELC}.rc [FILE10] Type=install -Source=%{src}/tdevlang.desktop +Source=%{src}/kdevlang.desktop Dest=%{dest}/src/kdev%{APPNAMELC}.desktop [FILE11] diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.png b/languages/cpp/app_templates/kdevlang/kdevlang.png similarity index 100% rename from languages/cpp/app_templates/tdevlang/tdevlang.png rename to languages/cpp/app_templates/kdevlang/kdevlang.png diff --git a/languages/cpp/app_templates/tdevlang/tdevlang.rc b/languages/cpp/app_templates/kdevlang/kdevlang.rc similarity index 100% rename from languages/cpp/app_templates/tdevlang/tdevlang.rc rename to languages/cpp/app_templates/kdevlang/kdevlang.rc diff --git a/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp similarity index 90% rename from languages/cpp/app_templates/tdevlang/tdevlang_part.cpp rename to languages/cpp/app_templates/kdevlang/kdevlang_part.cpp index 488f494a..559a931b 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang_part.cpp +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp @@ -6,10 +6,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -18,14 +18,14 @@ #include "%{APPNAMELC}_part.h" typedef KGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( "tdev%{APPNAMELC}" ) ); -static const TDevPluginInfo data("tdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( "kdev%{APPNAMELC}" ) ); +static const KDevPluginInfo data("kdev%{APPNAMELC}"); %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) +: KDevLanguageSupport(&data, parent, name ? name : "%{APPNAME}Part" ) { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdevlang_%{APPNAMELC}.rc"); + setXMLFile("kdevlang_%{APPNAMELC}.rc"); m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -47,7 +47,7 @@ static const TDevPluginInfo data("tdev%{APPNAMELC}"); delete m_build; } -TDevLanguageSupport::Features %{APPNAME}Part::features() +KDevLanguageSupport::Features %{APPNAME}Part::features() { return Features(Variables | Functions); } diff --git a/languages/cpp/app_templates/tdevlang/tdevlang_part.h b/languages/cpp/app_templates/kdevlang/kdevlang_part.h similarity index 88% rename from languages/cpp/app_templates/tdevlang/tdevlang_part.h rename to languages/cpp/app_templates/kdevlang/kdevlang_part.h index 9b0f2513..1cce0fa6 100644 --- a/languages/cpp/app_templates/tdevlang/tdevlang_part.h +++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.h @@ -4,9 +4,9 @@ #define __TDEVPART_%{APPNAMEUC}_H__ -#include +#include #include -#include +#include #include #include @@ -15,7 +15,7 @@ class TDEAction; /* Please read the README.dox file for more info about this part */ -class %{APPNAME}Part : public TDevLanguageSupport +class %{APPNAME}Part : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevlang/src-Makefile.am b/languages/cpp/app_templates/kdevlang/src-Makefile.am similarity index 62% rename from languages/cpp/app_templates/tdevlang/src-Makefile.am rename to languages/cpp/app_templates/kdevlang/src-Makefile.am index 6de535df..18b7a21a 100644 --- a/languages/cpp/app_templates/tdevlang/src-Makefile.am +++ b/languages/cpp/app_templates/kdevlang/src-Makefile.am @@ -1,9 +1,9 @@ AM_CPPFLAGS = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util -I$(kde_includes)/kinterfacedesigner $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}_part.cpp METASOURCES = AUTO diff --git a/languages/cpp/app_templates/kdevpart/CMakeLists.txt b/languages/cpp/app_templates/kdevpart/CMakeLists.txt new file mode 100644 index 00000000..53293ea9 --- /dev/null +++ b/languages/cpp/app_templates/kdevpart/CMakeLists.txt @@ -0,0 +1,29 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevpart.tar.gz ALL + COMMAND tar zcf kdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevpart_part.cpp kdevpart_part.h + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc + kdevpart.desktop app.tdevelop README.dox + globalconfigbase.ui globalconfig.h globalconfig.cpp + projectconfigbase.ui projectconfig.h projectconfig.cpp +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevpart.tar.gz kdevpart.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevpart.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart/Makefile.am b/languages/cpp/app_templates/kdevpart/Makefile.am similarity index 54% rename from languages/cpp/app_templates/tdevpart/Makefile.am rename to languages/cpp/app_templates/kdevpart/Makefile.am index 6aa1f606..11c12dfe 100644 --- a/languages/cpp/app_templates/tdevpart/Makefile.am +++ b/languages/cpp/app_templates/kdevpart/Makefile.am @@ -1,14 +1,14 @@ -dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h \ - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc \ - tdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \ +dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h \ + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc \ + kdevpart.desktop app.tdevelop README.dox globalconfigbase.ui globalconfig.h \ globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp -templateName = tdevpart +templateName = kdevpart ### 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/cpp/app_templates/tdevpart/README.dox b/languages/cpp/app_templates/kdevpart/README.dox similarity index 100% rename from languages/cpp/app_templates/tdevpart/README.dox rename to languages/cpp/app_templates/kdevpart/README.dox diff --git a/languages/cpp/app_templates/tdevpart/app.tdevelop b/languages/cpp/app_templates/kdevpart/app.tdevelop similarity index 89% rename from languages/cpp/app_templates/tdevpart/app.tdevelop rename to languages/cpp/app_templates/kdevpart/app.tdevelop index 473da16e..d16492cd 100644 --- a/languages/cpp/app_templates/tdevpart/app.tdevelop +++ b/languages/cpp/app_templates/kdevpart/app.tdevelop @@ -14,16 +14,16 @@ KDevelop - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -48,8 +48,8 @@ -O0 -g3 - - + + @@ -57,8 +57,8 @@ - - + + ada ada_bugs_gcc @@ -93,24 +93,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdevpart/globalconfig.cpp b/languages/cpp/app_templates/kdevpart/globalconfig.cpp similarity index 100% rename from languages/cpp/app_templates/tdevpart/globalconfig.cpp rename to languages/cpp/app_templates/kdevpart/globalconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart/globalconfig.h b/languages/cpp/app_templates/kdevpart/globalconfig.h similarity index 100% rename from languages/cpp/app_templates/tdevpart/globalconfig.h rename to languages/cpp/app_templates/kdevpart/globalconfig.h diff --git a/languages/cpp/app_templates/tdevpart/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart/globalconfigbase.ui similarity index 100% rename from languages/cpp/app_templates/tdevpart/globalconfigbase.ui rename to languages/cpp/app_templates/kdevpart/globalconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart.desktop b/languages/cpp/app_templates/kdevpart/kdevpart.desktop similarity index 98% rename from languages/cpp/app_templates/tdevpart2/tdevpart.desktop rename to languages/cpp/app_templates/kdevpart/kdevpart.desktop index c3eb6a81..a3029ac6 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart.desktop +++ b/languages/cpp/app_templates/kdevpart/kdevpart.desktop @@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR} X-TDevelop-Args= X-TDevelop-Scope=%{SCOPE} -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 X-TDevelop-Properties=%{PROPS} diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate rename to languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate index 8bdb87e3..c1860597 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart.tdevtemplate +++ b/languages/cpp/app_templates/kdevpart/kdevpart.kdevtemplate @@ -58,7 +58,7 @@ Comment[zh_CN]=这将生成 TDevelop 的插件，该插件需要与 TDevelop 源 Comment[zh_TW]=產生一個 TDevelop 外掛程式，建立於 TDevelop 程式源碼樹內。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}part.cpp -Archive=tdevpart.tar.gz +Archive=kdevpart.tar.gz [SCOPE] Type = value @@ -142,28 +142,28 @@ Dest=%{dest}/Makefile.am [FILE3] Type=install -Source=%{src}/tdevpart_part.cpp +Source=%{src}/kdevpart_part.cpp Dest=%{dest}/%{APPNAMELC}part.cpp [FILE4] Type=install -Source=%{src}/tdevpart_part.h +Source=%{src}/kdevpart_part.h Dest=%{dest}/%{APPNAMELC}part.h [FILE5] Type=install -Source=%{src}/tdevpart_widget.cpp +Source=%{src}/kdevpart_widget.cpp Dest=%{dest}/%{APPNAMELC}widget.cpp [FILE6] Type=install -Source=%{src}/tdevpart_widget.h +Source=%{src}/kdevpart_widget.h Dest=%{dest}/%{APPNAMELC}widget.h [FILE7] Type=install EscapeXML=true -Source=%{src}/tdevpart_part.rc +Source=%{src}/kdevpart_part.rc Dest=%{dest}/kdev%{APPNAMELC}.rc [FILE71] @@ -200,7 +200,7 @@ Dest=%{dest}/%{APPNAMELC}projectconfig.cpp [FILE8] Type=install -Source=%{src}/tdevpart.desktop +Source=%{src}/kdevpart.desktop Dest=%{dest}/kdev%{APPNAMELC}.desktop [FILE9] diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.png b/languages/cpp/app_templates/kdevpart/kdevpart.png similarity index 100% rename from languages/cpp/app_templates/tdevpart/tdevpart.png rename to languages/cpp/app_templates/kdevpart/kdevpart.png diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp similarity index 93% rename from languages/cpp/app_templates/tdevpart/tdevpart_part.cpp rename to languages/cpp/app_templates/kdevpart/kdevpart_part.cpp index 0d846d38..aa950c8a 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp @@ -10,29 +10,29 @@ #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #include "%{APPNAMELC}widget.h" #include "%{APPNAMELC}globalconfig.h" #include "%{APPNAMELC}projectconfig.h" -typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -TDevPluginInfo data("tdev%{APPNAMELC}"); -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); +typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +KDevPluginInfo data("kdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdev%{APPNAMELC}.rc"); + setXMLFile("kdev%{APPNAMELC}.rc"); m_widget = new %{APPNAME}Widget(this); m_widget->setCaption("widget caption"); @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.h b/languages/cpp/app_templates/kdevpart/kdevpart_part.h similarity index 93% rename from languages/cpp/app_templates/tdevpart/tdevpart_part.h rename to languages/cpp/app_templates/kdevpart/kdevpart_part.h index 1d61dd0c..9414d448 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.h @@ -2,7 +2,7 @@ #ifndef TDEV%{APPNAMEUC}_H #define TDEV%{APPNAMEUC}_H -#include +#include #include @@ -16,7 +16,7 @@ class %{APPNAME}Widget; /** Please read the README.dox file for more info about this part */ -class %{APPNAME}Part: public TDevPlugin +class %{APPNAME}Part: public KDevPlugin { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_part.rc b/languages/cpp/app_templates/kdevpart/kdevpart_part.rc similarity index 100% rename from languages/cpp/app_templates/tdevpart/tdevpart_part.rc rename to languages/cpp/app_templates/kdevpart/kdevpart_part.rc diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp similarity index 94% rename from languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp rename to languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp index 1f356afd..65bb996e 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "%{APPNAMELC}part.h" diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h similarity index 94% rename from languages/cpp/app_templates/tdevpart2/tdevpart_widget.h rename to languages/cpp/app_templates/kdevpart/kdevpart_widget.h index e9762de3..e54abd4d 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart/kdevpart_widget.h @@ -5,7 +5,7 @@ #include #include -class TDevProject; +class KDevProject; class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget diff --git a/languages/cpp/app_templates/tdevpart/projectconfig.cpp b/languages/cpp/app_templates/kdevpart/projectconfig.cpp similarity index 100% rename from languages/cpp/app_templates/tdevpart/projectconfig.cpp rename to languages/cpp/app_templates/kdevpart/projectconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart/projectconfig.h b/languages/cpp/app_templates/kdevpart/projectconfig.h similarity index 100% rename from languages/cpp/app_templates/tdevpart/projectconfig.h rename to languages/cpp/app_templates/kdevpart/projectconfig.h diff --git a/languages/cpp/app_templates/tdevpart/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart/projectconfigbase.ui similarity index 100% rename from languages/cpp/app_templates/tdevpart/projectconfigbase.ui rename to languages/cpp/app_templates/kdevpart/projectconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart/src-Makefile.am b/languages/cpp/app_templates/kdevpart/src-Makefile.am similarity index 69% rename from languages/cpp/app_templates/tdevpart/src-Makefile.am rename to languages/cpp/app_templates/kdevpart/src-Makefile.am index e082adff..5fe18f43 100644 --- a/languages/cpp/app_templates/tdevpart/src-Makefile.am +++ b/languages/cpp/app_templates/kdevpart/src-Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) -libtdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEPARTS) +libkdev%{APPNAMELC}_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \ +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp \ %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp \ %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp diff --git a/languages/cpp/app_templates/kdevpart2/CMakeLists.txt b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt new file mode 100644 index 00000000..080603a8 --- /dev/null +++ b/languages/cpp/app_templates/kdevpart2/CMakeLists.txt @@ -0,0 +1,30 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kdevpart2.tar.gz ALL + COMMAND tar zcf kdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + src-Makefile.am kdevpart_part.cpp kdevpart_part.h + kdevpart_widget.h kdevpart_widget.cpp kdevpart_part.rc + kdevpart.desktop app.tdevelop kdevpart-configure.in.in + README.dox subdirs globalconfigbase.ui globalconfig.h + globalconfig.cpp projectconfigbase.ui projectconfig.h + projectconfig.cpp +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kdevpart2.tar.gz kdevpart2.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kdevpart2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart2/Makefile.am b/languages/cpp/app_templates/kdevpart2/Makefile.am similarity index 52% rename from languages/cpp/app_templates/tdevpart2/Makefile.am rename to languages/cpp/app_templates/kdevpart2/Makefile.am index ae1df924..436f919c 100644 --- a/languages/cpp/app_templates/tdevpart2/Makefile.am +++ b/languages/cpp/app_templates/kdevpart2/Makefile.am @@ -1,16 +1,16 @@ -dataFiles = src-Makefile.am tdevpart_part.cpp tdevpart_part.h\ - tdevpart_widget.h tdevpart_widget.cpp \ - tdevpart_part.rc tdevpart.desktop app.tdevelop \ - tdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \ +dataFiles = src-Makefile.am kdevpart_part.cpp kdevpart_part.h\ + kdevpart_widget.h kdevpart_widget.cpp \ + kdevpart_part.rc kdevpart.desktop app.tdevelop \ + kdevpart-configure.in.in README.dox subdirs globalconfigbase.ui globalconfig.h \ globalconfig.cpp projectconfigbase.ui projectconfig.h projectconfig.cpp -templateName = tdevpart2 +templateName = kdevpart2 ### 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/cpp/app_templates/tdevpart2/README.dox b/languages/cpp/app_templates/kdevpart2/README.dox similarity index 100% rename from languages/cpp/app_templates/tdevpart2/README.dox rename to languages/cpp/app_templates/kdevpart2/README.dox diff --git a/languages/cpp/app_templates/tdevpart2/app.tdevelop b/languages/cpp/app_templates/kdevpart2/app.tdevelop similarity index 91% rename from languages/cpp/app_templates/tdevpart2/app.tdevelop rename to languages/cpp/app_templates/kdevpart2/app.tdevelop index ac470cdc..1b7aab6e 100644 --- a/languages/cpp/app_templates/tdevpart2/app.tdevelop +++ b/languages/cpp/app_templates/kdevpart2/app.tdevelop @@ -14,7 +14,7 @@ KDevelop - + src/%{APPNAMELC} debug @@ -46,8 +46,8 @@ - - + + @@ -60,8 +60,8 @@ false true - - + + ada ada_bugs_gcc @@ -96,21 +96,21 @@ qmake User Guide - - + + libtool - - + + - - + + -f @@ -120,13 +120,13 @@ -C -d -P -u3 -p - - + + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner true @@ -138,11 +138,11 @@ 250 400 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdevpart2/globalconfig.cpp b/languages/cpp/app_templates/kdevpart2/globalconfig.cpp similarity index 100% rename from languages/cpp/app_templates/tdevpart2/globalconfig.cpp rename to languages/cpp/app_templates/kdevpart2/globalconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart2/globalconfig.h b/languages/cpp/app_templates/kdevpart2/globalconfig.h similarity index 100% rename from languages/cpp/app_templates/tdevpart2/globalconfig.h rename to languages/cpp/app_templates/kdevpart2/globalconfig.h diff --git a/languages/cpp/app_templates/tdevpart2/globalconfigbase.ui b/languages/cpp/app_templates/kdevpart2/globalconfigbase.ui similarity index 100% rename from languages/cpp/app_templates/tdevpart2/globalconfigbase.ui rename to languages/cpp/app_templates/kdevpart2/globalconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in similarity index 77% rename from languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in rename to languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in index f08ae2b7..55f2f614 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart-configure.in.in +++ b/languages/cpp/app_templates/kdevpart2/kdevpart-configure.in.in @@ -4,7 +4,7 @@ AM_INIT_AUTOMAKE(%{APPNAMELC}, %{VERSION}) AC_C_BIGENDIAN AC_CHECK_TDEMAXPATHLEN -KDE_CHECK_HEADERS([tdevelop/interfaces/tdevcore.h]) +KDE_CHECK_HEADERS([tdevelop/interfaces/kdevcore.h]) KDE_CHECK_LIB([tdevelop],main, [LIBTDEVELOP="-ltdevelop"]) AC_SUBST(LIBTDEVELOP) diff --git a/languages/cpp/app_templates/tdevpart/tdevpart.desktop b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop similarity index 98% rename from languages/cpp/app_templates/tdevpart/tdevpart.desktop rename to languages/cpp/app_templates/kdevpart2/kdevpart.desktop index c3eb6a81..a3029ac6 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart.desktop +++ b/languages/cpp/app_templates/kdevpart2/kdevpart.desktop @@ -78,6 +78,6 @@ X-TDevelop-Plugin-Copyright=(C) by %{AUTHOR} X-TDevelop-Args= X-TDevelop-Scope=%{SCOPE} -X-TDE-Library=libtdev%{APPNAMELC} +X-TDE-Library=libkdev%{APPNAMELC} X-TDevelop-Version=3 X-TDevelop-Properties=%{PROPS} diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate similarity index 97% rename from languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate rename to languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate index b0431099..5aeda5d1 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart2.tdevtemplate +++ b/languages/cpp/app_templates/kdevpart2/kdevpart2.kdevtemplate @@ -60,7 +60,7 @@ Comment[zh_CN]=这将生成一个 TDevelop 的 KPart，可以在 TDevelop 源代 Comment[zh_TW]=產生一個 TDevelop 的 KPart 元件，建立在 TDevelop 程式源碼樹之外。 FileTemplates=h,CStyle,cpp,CStyle ShowFilesAfterGeneration=%{dest}/%{APPNAMELC}_part.cpp -Archive=tdevpart2.tar.gz +Archive=kdevpart2.tar.gz [SCOPE] Type = value @@ -133,11 +133,11 @@ Default= [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 [FILE1] Type=install @@ -162,7 +162,7 @@ Dest=%{dest}/subdirs [FILE5] Type=install -Source=%{src}/tdevpart-configure.in.in +Source=%{src}/kdevpart-configure.in.in Dest=%{dest}/configure.in.in [MkDir1] @@ -176,7 +176,7 @@ Dest=%{dest}/src/Makefile.am [FILE7] Type=install -Source=%{src}/tdevpart_part.cpp +Source=%{src}/kdevpart_part.cpp Dest=%{dest}/src/%{APPNAMELC}part.cpp [FILE71] @@ -213,28 +213,28 @@ Dest=%{dest}/src/%{APPNAMELC}projectconfig.cpp [FILE8] Type=install -Source=%{src}/tdevpart_part.h +Source=%{src}/kdevpart_part.h Dest=%{dest}/src/%{APPNAMELC}part.h [FILE9] Type=install -Source=%{src}/tdevpart_widget.cpp +Source=%{src}/kdevpart_widget.cpp Dest=%{dest}/src/%{APPNAMELC}widget.cpp [FILE10] Type=install -Source=%{src}/tdevpart_widget.h +Source=%{src}/kdevpart_widget.h Dest=%{dest}/src/%{APPNAMELC}widget.h [FILE11] Type=install EscapeXML=true -Source=%{src}/tdevpart_part.rc +Source=%{src}/kdevpart_part.rc Dest=%{dest}/src/kdev%{APPNAMELC}.rc [FILE12] Type=install -Source=%{src}/tdevpart.desktop +Source=%{src}/kdevpart.desktop Dest=%{dest}/src/kdev%{APPNAMELC}.desktop [FILE13] diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart2.png b/languages/cpp/app_templates/kdevpart2/kdevpart2.png similarity index 100% rename from languages/cpp/app_templates/tdevpart2/tdevpart2.png rename to languages/cpp/app_templates/kdevpart2/kdevpart2.png diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp similarity index 93% rename from languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp rename to languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp index 0d846d38..aa950c8a 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_part.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp @@ -10,29 +10,29 @@ #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #include "%{APPNAMELC}widget.h" #include "%{APPNAMELC}globalconfig.h" #include "%{APPNAMELC}projectconfig.h" -typedef TDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; -TDevPluginInfo data("tdev%{APPNAMELC}"); -K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); +typedef KDevGenericFactory<%{APPNAME}Part> %{APPNAME}Factory; +KDevPluginInfo data("kdev%{APPNAMELC}"); +K_EXPORT_COMPONENT_FACTORY( libkdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 %{APPNAME}Part::%{APPNAME}Part(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") + : KDevPlugin(&data, parent, name ? name : "%{APPNAME}Part") { setInstance(%{APPNAME}Factory::instance()); - setXMLFile("tdev%{APPNAMELC}.rc"); + setXMLFile("kdev%{APPNAMELC}.rc"); m_widget = new %{APPNAME}Widget(this); m_widget->setCaption("widget caption"); @@ -40,7 +40,7 @@ K_EXPORT_COMPONENT_FACTORY( libtdev%{APPNAMELC}, %{APPNAME}Factory( data ) ); TQWhatsThis::add(m_widget, i18n("WHAT DOES THIS PART DO?")); - // now you decide what should happen to the widget. Take a look at tdevcore.h + // now you decide what should happen to the widget. Take a look at kdevcore.h // or at other plugins how to embed it. // if you want to embed your widget as an outputview, simply uncomment diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.h b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h similarity index 93% rename from languages/cpp/app_templates/tdevpart2/tdevpart_part.h rename to languages/cpp/app_templates/kdevpart2/kdevpart_part.h index 1d61dd0c..9414d448 100644 --- a/languages/cpp/app_templates/tdevpart2/tdevpart_part.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.h @@ -2,7 +2,7 @@ #ifndef TDEV%{APPNAMEUC}_H #define TDEV%{APPNAMEUC}_H -#include +#include #include @@ -16,7 +16,7 @@ class %{APPNAME}Widget; /** Please read the README.dox file for more info about this part */ -class %{APPNAME}Part: public TDevPlugin +class %{APPNAME}Part: public KDevPlugin { Q_OBJECT diff --git a/languages/cpp/app_templates/tdevpart2/tdevpart_part.rc b/languages/cpp/app_templates/kdevpart2/kdevpart_part.rc similarity index 100% rename from languages/cpp/app_templates/tdevpart2/tdevpart_part.rc rename to languages/cpp/app_templates/kdevpart2/kdevpart_part.rc diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp similarity index 94% rename from languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp rename to languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp index 1f356afd..65bb996e 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_widget.cpp +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include "%{APPNAMELC}part.h" diff --git a/languages/cpp/app_templates/tdevpart/tdevpart_widget.h b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h similarity index 94% rename from languages/cpp/app_templates/tdevpart/tdevpart_widget.h rename to languages/cpp/app_templates/kdevpart2/kdevpart_widget.h index e9762de3..e54abd4d 100644 --- a/languages/cpp/app_templates/tdevpart/tdevpart_widget.h +++ b/languages/cpp/app_templates/kdevpart2/kdevpart_widget.h @@ -5,7 +5,7 @@ #include #include -class TDevProject; +class KDevProject; class %{APPNAME}Part; class %{APPNAME}Widget: public TQWidget diff --git a/languages/cpp/app_templates/tdevpart2/projectconfig.cpp b/languages/cpp/app_templates/kdevpart2/projectconfig.cpp similarity index 100% rename from languages/cpp/app_templates/tdevpart2/projectconfig.cpp rename to languages/cpp/app_templates/kdevpart2/projectconfig.cpp diff --git a/languages/cpp/app_templates/tdevpart2/projectconfig.h b/languages/cpp/app_templates/kdevpart2/projectconfig.h similarity index 100% rename from languages/cpp/app_templates/tdevpart2/projectconfig.h rename to languages/cpp/app_templates/kdevpart2/projectconfig.h diff --git a/languages/cpp/app_templates/tdevpart2/projectconfigbase.ui b/languages/cpp/app_templates/kdevpart2/projectconfigbase.ui similarity index 100% rename from languages/cpp/app_templates/tdevpart2/projectconfigbase.ui rename to languages/cpp/app_templates/kdevpart2/projectconfigbase.ui diff --git a/languages/cpp/app_templates/tdevpart2/src-Makefile.am b/languages/cpp/app_templates/kdevpart2/src-Makefile.am similarity index 69% rename from languages/cpp/app_templates/tdevpart2/src-Makefile.am rename to languages/cpp/app_templates/kdevpart2/src-Makefile.am index 407d9565..c5995af4 100644 --- a/languages/cpp/app_templates/tdevpart2/src-Makefile.am +++ b/languages/cpp/app_templates/kdevpart2/src-Makefile.am @@ -1,9 +1,9 @@ INCLUDES = -I$(kde_includes)/tdevelop/interfaces -I$(kde_includes)/tdevelop/util $(all_includes) -kde_module_LTLIBRARIES = libtdev%{APPNAMELC}.la -libtdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) -libtdev%{APPNAMELC}_la_LIBADD = -ltdevelop -libtdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp +kde_module_LTLIBRARIES = libkdev%{APPNAMELC}.la +libkdev%{APPNAMELC}_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) $(KDE_PLUGIN) +libkdev%{APPNAMELC}_la_LIBADD = -ltdevelop +libkdev%{APPNAMELC}_la_SOURCES = %{APPNAMELC}part.cpp %{APPNAMELC}widget.cpp %{APPNAMELC}globalconfigbase.ui %{APPNAMELC}globalconfig.cpp %{APPNAMELC}projectconfigbase.ui %{APPNAMELC}projectconfig.cpp METASOURCES = AUTO diff --git a/languages/cpp/app_templates/tdevpart2/subdirs b/languages/cpp/app_templates/kdevpart2/subdirs similarity index 100% rename from languages/cpp/app_templates/tdevpart2/subdirs rename to languages/cpp/app_templates/kdevpart2/subdirs diff --git a/languages/cpp/app_templates/khello/CMakeLists.txt b/languages/cpp/app_templates/khello/CMakeLists.txt index 3ed5e064..360e792e 100644 --- a/languages/cpp/app_templates/khello/CMakeLists.txt +++ b/languages/cpp/app_templates/khello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( khello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/khello.tar.gz khello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - khello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + khello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/khello/Makefile.am b/languages/cpp/app_templates/khello/Makefile.am index 49feb06a..56df4792 100644 --- a/languages/cpp/app_templates/khello/Makefile.am +++ b/languages/cpp/app_templates/khello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName = khello ### 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/cpp/app_templates/khello/app.tdevelop b/languages/cpp/app_templates/khello/app.tdevelop index 029288aa..9c25500e 100644 --- a/languages/cpp/app_templates/khello/app.tdevelop +++ b/languages/cpp/app_templates/khello/app.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -47,8 +47,8 @@ -O0 -g3 - - + + @@ -56,8 +56,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/khello/khello.tdevtemplate b/languages/cpp/app_templates/khello/khello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/khello/khello.tdevtemplate rename to languages/cpp/app_templates/khello/khello.kdevtemplate index 2bce3511..81d20c5a 100644 --- a/languages/cpp/app_templates/khello/khello.tdevtemplate +++ b/languages/cpp/app_templates/khello/khello.kdevtemplate @@ -68,11 +68,11 @@ Archive=khello.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/cpp/app_templates/khello2/CMakeLists.txt b/languages/cpp/app_templates/khello2/CMakeLists.txt index 151fb079..8e9fdb9d 100644 --- a/languages/cpp/app_templates/khello2/CMakeLists.txt +++ b/languages/cpp/app_templates/khello2/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( khello2.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/khello2.tar.gz khello2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - khello2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + khello2.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/khello2/Makefile.am b/languages/cpp/app_templates/khello2/Makefile.am index 96774e3b..14445170 100644 --- a/languages/cpp/app_templates/khello2/Makefile.am +++ b/languages/cpp/app_templates/khello2/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName = khello2 ### 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/cpp/app_templates/khello2/app.tdevelop b/languages/cpp/app_templates/khello2/app.tdevelop index b51226ee..a079670d 100644 --- a/languages/cpp/app_templates/khello2/app.tdevelop +++ b/languages/cpp/app_templates/khello2/app.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -47,8 +47,8 @@ -O0 -g3 - - + + @@ -56,8 +56,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/khello2/khello2.tdevtemplate b/languages/cpp/app_templates/khello2/khello2.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/khello2/khello2.tdevtemplate rename to languages/cpp/app_templates/khello2/khello2.kdevtemplate index 66666212..b85e11fb 100644 --- a/languages/cpp/app_templates/khello2/khello2.tdevtemplate +++ b/languages/cpp/app_templates/khello2/khello2.kdevtemplate @@ -64,11 +64,11 @@ Archive=khello2.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/cpp/app_templates/kicker/CMakeLists.txt b/languages/cpp/app_templates/kicker/CMakeLists.txt index fba98f58..c1a1d7d5 100644 --- a/languages/cpp/app_templates/kicker/CMakeLists.txt +++ b/languages/cpp/app_templates/kicker/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( kicker.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kicker.tar.gz kicker.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kicker.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kicker.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kicker/Makefile.am b/languages/cpp/app_templates/kicker/Makefile.am index 254e5917..82095d72 100644 --- a/languages/cpp/app_templates/kicker/Makefile.am +++ b/languages/cpp/app_templates/kicker/Makefile.am @@ -3,10 +3,10 @@ dataFiles = applet.cpp applet.h applet.desktop applet.tdevelop \ templateName = kicker ### 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/cpp/app_templates/kicker/applet.tdevelop b/languages/cpp/app_templates/kicker/applet.tdevelop index 88bf952d..929b3c49 100644 --- a/languages/cpp/app_templates/kicker/applet.tdevelop +++ b/languages/cpp/app_templates/kicker/applet.tdevelop @@ -14,16 +14,16 @@ Kicker - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}.la debug @@ -45,8 +45,8 @@ -O0 -g3 - - + + @@ -54,8 +54,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kicker/kicker.tdevtemplate b/languages/cpp/app_templates/kicker/kicker.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kicker/kicker.tdevtemplate rename to languages/cpp/app_templates/kicker/kicker.kdevtemplate index ba1252de..5185eb20 100644 --- a/languages/cpp/app_templates/kicker/kicker.tdevtemplate +++ b/languages/cpp/app_templates/kicker/kicker.kdevtemplate @@ -65,11 +65,11 @@ Archive=kicker.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/cpp/app_templates/kmake/Makefile.am b/languages/cpp/app_templates/kmake/Makefile.am index 35238c7e..b7bd96f9 100644 --- a/languages/cpp/app_templates/kmake/Makefile.am +++ b/languages/cpp/app_templates/kmake/Makefile.am @@ -2,10 +2,10 @@ dataFiles = appui.rc app.desktop app.cpp mainviewimp.cpp mainviewimp.h mainview. templateName = kmake ### 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/cpp/app_templates/kmake/app.tdevelop b/languages/cpp/app_templates/kmake/app.tdevelop index ffcb6370..ba82ff4b 100644 --- a/languages/cpp/app_templates/kmake/app.tdevelop +++ b/languages/cpp/app_templates/kmake/app.tdevelop @@ -10,16 +10,16 @@ Qt - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + @@ -30,8 +30,8 @@ false *.o,*.lo,CVS - - + + bash bash_bugs @@ -68,8 +68,8 @@ TDE Libraries (Doxygen) - - + + @@ -84,28 +84,28 @@ true - - + + ./bin/%{APPNAMELC} - + - + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kmake/kmake.tdevtemplate b/languages/cpp/app_templates/kmake/kmake.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/kmake/kmake.tdevtemplate rename to languages/cpp/app_templates/kmake/kmake.kdevtemplate diff --git a/languages/cpp/app_templates/kmod/CMakeLists.txt b/languages/cpp/app_templates/kmod/CMakeLists.txt index ff891946..af575a10 100644 --- a/languages/cpp/app_templates/kmod/CMakeLists.txt +++ b/languages/cpp/app_templates/kmod/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( kmod.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kmod.tar.gz kmod.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kmod.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kmod.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kmod/Makefile.am b/languages/cpp/app_templates/kmod/Makefile.am index bae9772c..f4b1ec98 100644 --- a/languages/cpp/app_templates/kmod/Makefile.am +++ b/languages/cpp/app_templates/kmod/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile kmod.tdevelop kmod-driver.c templateName = kmod ### 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/cpp/app_templates/kmod/kmod.tdevtemplate b/languages/cpp/app_templates/kmod/kmod.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kmod/kmod.tdevtemplate rename to languages/cpp/app_templates/kmod/kmod.kdevtemplate index c47912f8..069d5103 100644 --- a/languages/cpp/app_templates/kmod/kmod.tdevtemplate +++ b/languages/cpp/app_templates/kmod/kmod.kdevtemplate @@ -66,7 +66,7 @@ Archive=kmod.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/kmod/kmod.tdevelop b/languages/cpp/app_templates/kmod/kmod.tdevelop index 55d6f2b6..6ce5f390 100644 --- a/languages/cpp/app_templates/kmod/kmod.tdevelop +++ b/languages/cpp/app_templates/kmod/kmod.tdevelop @@ -4,10 +4,10 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C - TDevDebugger + KDevDebugger C @@ -15,13 +15,13 @@ Kernel - + - - + + make @@ -35,8 +35,8 @@ - - + + ada ada_bugs_gcc @@ -83,11 +83,11 @@ TDE Libraries (Doxygen) - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kofficepart/CMakeLists.txt b/languages/cpp/app_templates/kofficepart/CMakeLists.txt index 460b3293..955225bc 100644 --- a/languages/cpp/app_templates/kofficepart/CMakeLists.txt +++ b/languages/cpp/app_templates/kofficepart/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( kopart.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kopart.tar.gz kopart.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kopart.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kopart.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kofficepart/Makefile.am b/languages/cpp/app_templates/kofficepart/Makefile.am index d602a552..a38746b1 100644 --- a/languages/cpp/app_templates/kofficepart/Makefile.am +++ b/languages/cpp/app_templates/kofficepart/Makefile.am @@ -7,10 +7,10 @@ dataFiles = kopart.tdevelop kopart_aboutdata.h kopart_part.cpp kopart_view.h \ templateName = kopart ### 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/cpp/app_templates/kofficepart/kopart.tdevtemplate b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kofficepart/kopart.tdevtemplate rename to languages/cpp/app_templates/kofficepart/kopart.kdevtemplate index 076b650a..0273e0ca 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.tdevtemplate +++ b/languages/cpp/app_templates/kofficepart/kopart.kdevtemplate @@ -63,11 +63,11 @@ Archive=kopart.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/cpp/app_templates/kofficepart/kopart.tdevelop b/languages/cpp/app_templates/kofficepart/kopart.tdevelop index 7c4b0e4c..194157d7 100644 --- a/languages/cpp/app_templates/kofficepart/kopart.tdevelop +++ b/languages/cpp/app_templates/kofficepart/kopart.tdevelop @@ -14,16 +14,16 @@ tdeioslave - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}part.la debug @@ -45,15 +45,15 @@ -O0 -g3 - - + + - - + + ada ada_bugs_gcc @@ -90,24 +90,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt index c683f536..e38fc279 100644 --- a/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt +++ b/languages/cpp/app_templates/konqnavpanel/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( konqnavpanel.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/konqnavpanel.tar.gz konqnavpanel.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - konqnavpanel.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + konqnavpanel.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/konqnavpanel/Makefile.am b/languages/cpp/app_templates/konqnavpanel/Makefile.am index a901456b..6fccbf38 100644 --- a/languages/cpp/app_templates/konqnavpanel/Makefile.am +++ b/languages/cpp/app_templates/konqnavpanel/Makefile.am @@ -4,10 +4,10 @@ dataFiles = konqnavpanel.cpp konqnavpanel.h konqnavpanel.desktop \ templateName = konqnavpanel ### 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/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate rename to languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate index 01a924df..e6f1a23e 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevtemplate +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.kdevtemplate @@ -65,11 +65,11 @@ Archive=konqnavpanel.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/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop index 88bf952d..929b3c49 100644 --- a/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop +++ b/languages/cpp/app_templates/konqnavpanel/konqnavpanel.tdevelop @@ -14,16 +14,16 @@ Kicker - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}.la debug @@ -45,8 +45,8 @@ -O0 -g3 - - + + @@ -54,8 +54,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kpartapp/CMakeLists.txt b/languages/cpp/app_templates/kpartapp/CMakeLists.txt index ab0ed3b0..9f3d8119 100644 --- a/languages/cpp/app_templates/kpartapp/CMakeLists.txt +++ b/languages/cpp/app_templates/kpartapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kpartapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kpartapp.tar.gz kpartapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kpartapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kpartapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kpartapp/Makefile.am b/languages/cpp/app_templates/kpartapp/Makefile.am index 45c41564..bfb8ceed 100644 --- a/languages/cpp/app_templates/kpartapp/Makefile.am +++ b/languages/cpp/app_templates/kpartapp/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am app.cpp app.h app_part.cpp\ kpartapp.png app.tdevelop subdirs templateName = kpartapp ### 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/cpp/app_templates/kpartapp/app.tdevelop b/languages/cpp/app_templates/kpartapp/app.tdevelop index 56e6f467..a8628fe3 100644 --- a/languages/cpp/app_templates/kpartapp/app.tdevelop +++ b/languages/cpp/app_templates/kpartapp/app.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -47,8 +47,8 @@ -O0 -g3 - - + + @@ -56,8 +56,8 @@ - - + + ada ada_bugs_gcc @@ -92,24 +92,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate rename to languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate index 11aaaabb..773cc0d8 100644 --- a/languages/cpp/app_templates/kpartapp/kpartapp.tdevtemplate +++ b/languages/cpp/app_templates/kpartapp/kpartapp.kdevtemplate @@ -65,11 +65,11 @@ Archive=kpartapp.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/cpp/app_templates/kpartplugin/CMakeLists.txt b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt index a1d063b0..00f4c664 100644 --- a/languages/cpp/app_templates/kpartplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/kpartplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( kpartplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kpartplugin.tar.gz kpartplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kpartplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kpartplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kpartplugin/Makefile.am b/languages/cpp/app_templates/kpartplugin/Makefile.am index dd0a5612..057be667 100644 --- a/languages/cpp/app_templates/kpartplugin/Makefile.am +++ b/languages/cpp/app_templates/kpartplugin/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h \ templateName = kpartplugin ### 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/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate rename to languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate index dc3b3e04..59ca51d8 100644 --- a/languages/cpp/app_templates/kpartplugin/kpartplugin.tdevtemplate +++ b/languages/cpp/app_templates/kpartplugin/kpartplugin.kdevtemplate @@ -64,11 +64,11 @@ Archive=kpartplugin.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/cpp/app_templates/kpartplugin/plugin.tdevelop b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop index 2a61c8d5..c94ba886 100644 --- a/languages/cpp/app_templates/kpartplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/kpartplugin/plugin.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}.la debug @@ -44,8 +44,8 @@ -O0 -g3 - - + + @@ -53,8 +53,8 @@ - - + + ada ada_bugs_gcc @@ -91,24 +91,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt index 2aa03b98..bf1be9f6 100644 --- a/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt +++ b/languages/cpp/app_templates/kscons_kxt/CMakeLists.txt @@ -21,9 +21,9 @@ add_custom_target( kscons_kxt.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kscons_kxt.tar.gz kscons_kxt.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kscons_kxt.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kscons_kxt.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_kxt/Makefile.am b/languages/cpp/app_templates/kscons_kxt/Makefile.am index 5f00c212..59a58ee1 100644 --- a/languages/cpp/app_templates/kscons_kxt/Makefile.am +++ b/languages/cpp/app_templates/kscons_kxt/Makefile.am @@ -7,10 +7,10 @@ QUICKSTART INSTALL README templateName= kscons_kxt ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kscons_kxt/app.tdevelop b/languages/cpp/app_templates/kscons_kxt/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kscons_kxt/app.tdevelop +++ b/languages/cpp/app_templates/kscons_kxt/app.tdevelop @@ -17,16 +17,16 @@ - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -62,8 +62,8 @@ -O0 -g3 - - + + @@ -75,8 +75,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -111,8 +111,8 @@ qmake User Guide - - + + libtool @@ -126,16 +126,16 @@ false true - - + + - - + + -f -dP @@ -144,7 +144,7 @@ -u3 -p - + @@ -156,14 +156,14 @@ true - + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate rename to languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate index fd709e79..20d35070 100644 --- a/languages/cpp/app_templates/kscons_kxt/kscons_kxt.tdevtemplate +++ b/languages/cpp/app_templates/kscons_kxt/kscons_kxt.kdevtemplate @@ -65,7 +65,7 @@ Archive=kscons_kxt.tar.gz [SCONS] Type=include -File=%{tdevelop}/template-common/scons.tdevtemplate +File=%{tdevelop}/template-common/scons.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt index d8af0f23..c05f1bb1 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt +++ b/languages/cpp/app_templates/kscons_tdemdi/CMakeLists.txt @@ -22,9 +22,9 @@ add_custom_target( kscons_tdemdi.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kscons_tdemdi.tar.gz kscons_tdemdi.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kscons_tdemdi.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kscons_tdemdi.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am index b51e2bdb..191ea8ee 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/Makefile.am +++ b/languages/cpp/app_templates/kscons_tdemdi/Makefile.am @@ -7,10 +7,10 @@ app_part.cpp app_part.h app_part.rc app_shell.rc templateName= kscons_tdemdi ### 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} ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop +++ b/languages/cpp/app_templates/kscons_tdemdi/app.tdevelop @@ -17,16 +17,16 @@ - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -62,8 +62,8 @@ -O0 -g3 - - + + @@ -75,8 +75,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -111,8 +111,8 @@ qmake User Guide - - + + libtool @@ -126,16 +126,16 @@ false true - - + + - - + + -f -dP @@ -144,7 +144,7 @@ -u3 -p - + @@ -156,14 +156,14 @@ true - + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate rename to languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate index 4b71d06c..2a297d60 100644 --- a/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.tdevtemplate +++ b/languages/cpp/app_templates/kscons_tdemdi/kscons_tdemdi.kdevtemplate @@ -64,7 +64,7 @@ Archive=kscons_tdemdi.tar.gz [SCONS] Type=include -File=%{tdevelop}/template-common/scons.tdevtemplate +File=%{tdevelop}/template-common/scons.kdevtemplate [MKDIR_DOCBOOK1] Type=mkdir diff --git a/languages/cpp/app_templates/kxt/CMakeLists.txt b/languages/cpp/app_templates/kxt/CMakeLists.txt index c7de3e19..4b203750 100644 --- a/languages/cpp/app_templates/kxt/CMakeLists.txt +++ b/languages/cpp/app_templates/kxt/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( kxt.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/kxt.tar.gz kxt.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - kxt.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + kxt.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/kxt/Makefile.am b/languages/cpp/app_templates/kxt/Makefile.am index 96333456..8321742a 100644 --- a/languages/cpp/app_templates/kxt/Makefile.am +++ b/languages/cpp/app_templates/kxt/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName= kxt ### 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/cpp/app_templates/kxt/app.tdevelop b/languages/cpp/app_templates/kxt/app.tdevelop index b32b6656..317a4cbc 100644 --- a/languages/cpp/app_templates/kxt/app.tdevelop +++ b/languages/cpp/app_templates/kxt/app.tdevelop @@ -17,16 +17,16 @@ - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/%{APPNAMELC} debug @@ -62,8 +62,8 @@ -O0 -g3 - - + + @@ -75,8 +75,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -111,8 +111,8 @@ qmake User Guide - - + + libtool @@ -126,16 +126,16 @@ false true - - + + - - + + -f -dP @@ -144,7 +144,7 @@ -u3 -p - + @@ -156,14 +156,14 @@ true - + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/kxt/kxt.tdevtemplate b/languages/cpp/app_templates/kxt/kxt.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/kxt/kxt.tdevtemplate rename to languages/cpp/app_templates/kxt/kxt.kdevtemplate index 7b6583f1..79789759 100644 --- a/languages/cpp/app_templates/kxt/kxt.tdevtemplate +++ b/languages/cpp/app_templates/kxt/kxt.kdevtemplate @@ -67,11 +67,11 @@ Archive=kxt.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/cpp/app_templates/makefileempty/CMakeLists.txt b/languages/cpp/app_templates/makefileempty/CMakeLists.txt index 25f86b01..48a6e3dd 100644 --- a/languages/cpp/app_templates/makefileempty/CMakeLists.txt +++ b/languages/cpp/app_templates/makefileempty/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( makefileempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/makefileempty.tar.gz makefileempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - makefileempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + makefileempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/makefileempty/Makefile.am b/languages/cpp/app_templates/makefileempty/Makefile.am index 60035c3d..ec381a04 100644 --- a/languages/cpp/app_templates/makefileempty/Makefile.am +++ b/languages/cpp/app_templates/makefileempty/Makefile.am @@ -3,10 +3,10 @@ dataFiles = makefileempty-Makefile \ templateName = makefileempty ### 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/cpp/app_templates/makefileempty/app.tdevelop b/languages/cpp/app_templates/makefileempty/app.tdevelop index e3b8de97..da576369 100644 --- a/languages/cpp/app_templates/makefileempty/app.tdevelop +++ b/languages/cpp/app_templates/makefileempty/app.tdevelop @@ -4,14 +4,14 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C++ C++ Code - + @@ -33,8 +33,8 @@ -O0 -g3 - - + + ada ada_bugs_gcc @@ -79,23 +79,23 @@ TDE Libraries (Doxygen) - - + + - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate rename to languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate index 97c3f238..b69317d7 100644 --- a/languages/cpp/app_templates/makefileempty/makefileempty.tdevtemplate +++ b/languages/cpp/app_templates/makefileempty/makefileempty.kdevtemplate @@ -53,7 +53,7 @@ Dest=%{dest}/%{APPNAMELC}.tdevelop [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE2] Type=install diff --git a/languages/cpp/app_templates/noatunui/CMakeLists.txt b/languages/cpp/app_templates/noatunui/CMakeLists.txt index 698684c1..332a960a 100644 --- a/languages/cpp/app_templates/noatunui/CMakeLists.txt +++ b/languages/cpp/app_templates/noatunui/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( noatunui.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/noatunui.tar.gz noatunui.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - noatunui.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + noatunui.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/noatunui/Makefile.am b/languages/cpp/app_templates/noatunui/Makefile.am index d72a928d..a222f235 100644 --- a/languages/cpp/app_templates/noatunui/Makefile.am +++ b/languages/cpp/app_templates/noatunui/Makefile.am @@ -3,10 +3,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_impl.cpp plugin_impl.h \ templateName = noatunui ### 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/cpp/app_templates/noatunui/noatunui.tdevtemplate b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/noatunui/noatunui.tdevtemplate rename to languages/cpp/app_templates/noatunui/noatunui.kdevtemplate index 3324640f..a91349c3 100644 --- a/languages/cpp/app_templates/noatunui/noatunui.tdevtemplate +++ b/languages/cpp/app_templates/noatunui/noatunui.kdevtemplate @@ -63,11 +63,11 @@ Archive=noatunui.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/cpp/app_templates/noatunui/plugin.tdevelop b/languages/cpp/app_templates/noatunui/plugin.tdevelop index bc17550d..66986f2a 100644 --- a/languages/cpp/app_templates/noatunui/plugin.tdevelop +++ b/languages/cpp/app_templates/noatunui/plugin.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/noatun_%{APPNAMELC}plugin.la debug @@ -44,8 +44,8 @@ -O0 -g3 - - + + @@ -53,8 +53,8 @@ - - + + bash bash_bugs @@ -88,24 +88,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt index adac7be4..8b5668ec 100644 --- a/languages/cpp/app_templates/noatunvisual/CMakeLists.txt +++ b/languages/cpp/app_templates/noatunvisual/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( noatunvisual.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/noatunvisual.tar.gz noatunvisual.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - noatunvisual.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + noatunvisual.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/noatunvisual/Makefile.am b/languages/cpp/app_templates/noatunvisual/Makefile.am index e32b274e..d7466e24 100644 --- a/languages/cpp/app_templates/noatunvisual/Makefile.am +++ b/languages/cpp/app_templates/noatunvisual/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am plugin_app.cpp plugin_app.h plugin_impl.cpp \ templateName = noatunvisual ### 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/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate rename to languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate index 0a91ba64..c747925c 100644 --- a/languages/cpp/app_templates/noatunvisual/noatunvisual.tdevtemplate +++ b/languages/cpp/app_templates/noatunvisual/noatunvisual.kdevtemplate @@ -67,11 +67,11 @@ Archive=noatunvisual.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/cpp/app_templates/noatunvisual/plugin.tdevelop b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop index 6833abad..78193361 100644 --- a/languages/cpp/app_templates/noatunvisual/plugin.tdevelop +++ b/languages/cpp/app_templates/noatunvisual/plugin.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/noatun_%{APPNAMELC}plugin.la debug @@ -49,8 +49,8 @@ -lSDL - - + + @@ -58,8 +58,8 @@ - - + + bash bash_bugs @@ -95,24 +95,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opieapp/CMakeLists.txt b/languages/cpp/app_templates/opieapp/CMakeLists.txt index 45dc1b61..4f2b2824 100644 --- a/languages/cpp/app_templates/opieapp/CMakeLists.txt +++ b/languages/cpp/app_templates/opieapp/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieapp.tar.gz opieapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieapp/Makefile.am b/languages/cpp/app_templates/opieapp/Makefile.am index 854f4c54..10a1f2a1 100644 --- a/languages/cpp/app_templates/opieapp/Makefile.am +++ b/languages/cpp/app_templates/opieapp/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Example.png app.tdevelop example.desktop Makefile.am \ templateName = opieapp ### 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/cpp/app_templates/opieapp/app.tdevelop b/languages/cpp/app_templates/opieapp/app.tdevelop index 94c86a45..9bdb127e 100644 --- a/languages/cpp/app_templates/opieapp/app.tdevelop +++ b/languages/cpp/app_templates/opieapp/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + true @@ -93,15 +93,15 @@ -qws - - + + - + @@ -120,11 +120,11 @@ true - + true 2 - - + + -f -dP @@ -133,11 +133,11 @@ -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opieapp/opieapp.tdevtemplate b/languages/cpp/app_templates/opieapp/opieapp.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opieapp/opieapp.tdevtemplate rename to languages/cpp/app_templates/opieapp/opieapp.kdevtemplate diff --git a/languages/cpp/app_templates/opieapplet/CMakeLists.txt b/languages/cpp/app_templates/opieapplet/CMakeLists.txt index 6c8edbbe..e4dc42f0 100644 --- a/languages/cpp/app_templates/opieapplet/CMakeLists.txt +++ b/languages/cpp/app_templates/opieapplet/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieapplet.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieapplet.tar.gz opieapplet.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieapplet.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieapplet.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieapplet/Makefile.am b/languages/cpp/app_templates/opieapplet/Makefile.am index 845411c7..6bbb09ac 100644 --- a/languages/cpp/app_templates/opieapplet/Makefile.am +++ b/languages/cpp/app_templates/opieapplet/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opieapplet ### 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/cpp/app_templates/opieapplet/app.tdevelop b/languages/cpp/app_templates/opieapplet/app.tdevelop index da3b91d4..c5544656 100644 --- a/languages/cpp/app_templates/opieapplet/app.tdevelop +++ b/languages/cpp/app_templates/opieapplet/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + true @@ -108,15 +108,15 @@ fi -qws - - + + - + @@ -135,11 +135,11 @@ fi true - + true 2 - - + + -f -dP @@ -148,11 +148,11 @@ fi -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate b/languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opieapplet/opieapplet.tdevtemplate rename to languages/cpp/app_templates/opieapplet/opieapplet.kdevtemplate diff --git a/languages/cpp/app_templates/opieinput/CMakeLists.txt b/languages/cpp/app_templates/opieinput/CMakeLists.txt index 5246ccdb..f7bba492 100644 --- a/languages/cpp/app_templates/opieinput/CMakeLists.txt +++ b/languages/cpp/app_templates/opieinput/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opieinput.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opieinput.tar.gz opieinput.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opieinput.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opieinput.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opieinput/Makefile.am b/languages/cpp/app_templates/opieinput/Makefile.am index fee564a7..9a3e5ffd 100644 --- a/languages/cpp/app_templates/opieinput/Makefile.am +++ b/languages/cpp/app_templates/opieinput/Makefile.am @@ -3,10 +3,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opieinput ### 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/cpp/app_templates/opieinput/app.tdevelop b/languages/cpp/app_templates/opieinput/app.tdevelop index 9a81ebba..cc61122f 100644 --- a/languages/cpp/app_templates/opieinput/app.tdevelop +++ b/languages/cpp/app_templates/opieinput/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + false @@ -109,15 +109,15 @@ fi -qws - - + + - + @@ -136,11 +136,11 @@ fi true - + true 2 - - + + -f -dP @@ -149,11 +149,11 @@ fi -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opieinput/opieinput.tdevtemplate b/languages/cpp/app_templates/opieinput/opieinput.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opieinput/opieinput.tdevtemplate rename to languages/cpp/app_templates/opieinput/opieinput.kdevtemplate diff --git a/languages/cpp/app_templates/opiemenu/CMakeLists.txt b/languages/cpp/app_templates/opiemenu/CMakeLists.txt index 12eedcdc..c321604c 100644 --- a/languages/cpp/app_templates/opiemenu/CMakeLists.txt +++ b/languages/cpp/app_templates/opiemenu/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( opiemenu.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opiemenu.tar.gz opiemenu.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opiemenu.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opiemenu.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opiemenu/Makefile.am b/languages/cpp/app_templates/opiemenu/Makefile.am index 91d1c2ba..343a2bfa 100644 --- a/languages/cpp/app_templates/opiemenu/Makefile.am +++ b/languages/cpp/app_templates/opiemenu/Makefile.am @@ -4,10 +4,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opiemenu ### 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/cpp/app_templates/opiemenu/app.tdevelop b/languages/cpp/app_templates/opiemenu/app.tdevelop index da3b91d4..c5544656 100644 --- a/languages/cpp/app_templates/opiemenu/app.tdevelop +++ b/languages/cpp/app_templates/opiemenu/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + true @@ -108,15 +108,15 @@ fi -qws - - + + - + @@ -135,11 +135,11 @@ fi true - + true 2 - - + + -f -dP @@ -148,11 +148,11 @@ fi -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate b/languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opiemenu/opiemenu.tdevtemplate rename to languages/cpp/app_templates/opiemenu/opiemenu.kdevtemplate diff --git a/languages/cpp/app_templates/opienet/CMakeLists.txt b/languages/cpp/app_templates/opienet/CMakeLists.txt index 19c969d3..a08e71be 100644 --- a/languages/cpp/app_templates/opienet/CMakeLists.txt +++ b/languages/cpp/app_templates/opienet/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( opienet.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opienet.tar.gz opienet.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opienet.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opienet.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opienet/Makefile.am b/languages/cpp/app_templates/opienet/Makefile.am index d23c835b..5245c17e 100644 --- a/languages/cpp/app_templates/opienet/Makefile.am +++ b/languages/cpp/app_templates/opienet/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro \ templateName = opienet ### 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/cpp/app_templates/opienet/app.tdevelop b/languages/cpp/app_templates/opienet/app.tdevelop index 1292af0e..7717a098 100644 --- a/languages/cpp/app_templates/opienet/app.tdevelop +++ b/languages/cpp/app_templates/opienet/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + false @@ -93,15 +93,15 @@ -qws - - + + - + @@ -120,11 +120,11 @@ true - + true 2 - - + + -f -dP @@ -133,11 +133,11 @@ -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opienet/opienet.tdevtemplate b/languages/cpp/app_templates/opienet/opienet.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opienet/opienet.tdevtemplate rename to languages/cpp/app_templates/opienet/opienet.kdevtemplate diff --git a/languages/cpp/app_templates/opietoday/CMakeLists.txt b/languages/cpp/app_templates/opietoday/CMakeLists.txt index 2f9e0dd1..6c7c4d66 100644 --- a/languages/cpp/app_templates/opietoday/CMakeLists.txt +++ b/languages/cpp/app_templates/opietoday/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( opietoday.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/opietoday.tar.gz opietoday.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - opietoday.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + opietoday.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/opietoday/Makefile.am b/languages/cpp/app_templates/opietoday/Makefile.am index 8c9ec514..6c999369 100644 --- a/languages/cpp/app_templates/opietoday/Makefile.am +++ b/languages/cpp/app_templates/opietoday/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Makefile.am Example.png app.tdevelop app.pro exampleplugin.cpp \ templateName = opietoday ### 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/cpp/app_templates/opietoday/app.tdevelop b/languages/cpp/app_templates/opietoday/app.tdevelop index 043326d3..c387911b 100644 --- a/languages/cpp/app_templates/opietoday/app.tdevelop +++ b/languages/cpp/app_templates/opietoday/app.tdevelop @@ -13,7 +13,7 @@ - + @@ -24,8 +24,8 @@ false *.o,*.lo,CVS - - + + gtk gnustep @@ -52,8 +52,8 @@ libbonobo libbonoboui - - + + -qws @@ -66,8 +66,8 @@ false true - - + + false @@ -93,15 +93,15 @@ -qws - - + + - + @@ -120,11 +120,11 @@ true - + true 2 - - + + -f -dP @@ -133,11 +133,11 @@ -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/opietoday/opietoday.tdevtemplate b/languages/cpp/app_templates/opietoday/opietoday.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/opietoday/opietoday.tdevtemplate rename to languages/cpp/app_templates/opietoday/opietoday.kdevtemplate diff --git a/languages/cpp/app_templates/prc-tool/Makefile.am b/languages/cpp/app_templates/prc-tool/Makefile.am index ee4e2182..06f097a4 100644 --- a/languages/cpp/app_templates/prc-tool/Makefile.am +++ b/languages/cpp/app_templates/prc-tool/Makefile.am @@ -3,10 +3,10 @@ dataFiles = prc-tool.png src-Makefile prc-tool.tdevelop callback.h \ templateName = prc-tool ### 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/cpp/app_templates/prc-tool/prc-tool.tdevtemplate b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate similarity index 99% rename from languages/cpp/app_templates/prc-tool/prc-tool.tdevtemplate rename to languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate index 23b0013e..8cfea15f 100644 --- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevtemplate +++ b/languages/cpp/app_templates/prc-tool/prc-tool.kdevtemplate @@ -65,7 +65,7 @@ Archive=prc-tool.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop index cb31f8a1..9015718f 100644 --- a/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop +++ b/languages/cpp/app_templates/prc-tool/prc-tool.tdevelop @@ -4,23 +4,23 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C - TDevDebugger + KDevDebugger C PalmOS - + - - + + make test @@ -40,12 +40,12 @@ - + - + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt index f23ed602..4af3dc73 100644 --- a/languages/cpp/app_templates/qmakeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakeapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qmakeapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakeapp.tar.gz qmakeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakeapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakeapp/Makefile.am b/languages/cpp/app_templates/qmakeapp/Makefile.am index 11a39e79..233717d7 100644 --- a/languages/cpp/app_templates/qmakeapp/Makefile.am +++ b/languages/cpp/app_templates/qmakeapp/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp qmakeapp.cpp qmakeapp.h qmakeapp.png qmakeapp.tdevelop \ templateName = qmakeapp ### 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/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate b/languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qmakeapp/qmakeapp.tdevtemplate rename to languages/cpp/app_templates/qmakeapp/qmakeapp.kdevtemplate diff --git a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop index 04ec68cb..48a9bd99 100644 --- a/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop +++ b/languages/cpp/app_templates/qmakeapp/qmakeapp.tdevelop @@ -10,7 +10,7 @@ Qt - + @@ -21,18 +21,18 @@ false *.o,*.lo,CVS - - + + true 3 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner %{QTDIR} %{QMAKE} - - + + bash bash_bugs @@ -69,8 +69,8 @@ TDE Libraries (Doxygen) - - + + @@ -85,28 +85,28 @@ true - - + + ./bin/%{APPNAMELC} - + - + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt index f8bba7c6..bc109590 100644 --- a/languages/cpp/app_templates/qmakeempty/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakeempty/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( qmakeempty.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakeempty.tar.gz qmakeempty.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakeempty.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakeempty.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakeempty/Makefile.am b/languages/cpp/app_templates/qmakeempty/Makefile.am index 2eb31a4f..9d62ad0a 100644 --- a/languages/cpp/app_templates/qmakeempty/Makefile.am +++ b/languages/cpp/app_templates/qmakeempty/Makefile.am @@ -4,10 +4,10 @@ dataFiles = qmakeempty.tdevelop \ templateName = qmakeempty ### 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/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate b/languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qmakeempty/qmakeempty.tdevtemplate rename to languages/cpp/app_templates/qmakeempty/qmakeempty.kdevtemplate diff --git a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop +++ b/languages/cpp/app_templates/qmakeempty/qmakeempty.tdevelop @@ -10,7 +10,7 @@ Qt - + @@ -21,8 +21,8 @@ false *.o,*.lo,CVS - - + + true 4 @@ -31,8 +31,8 @@ %{QMAKE} %{DESIGNER} - - + + bash bash_bugs @@ -69,8 +69,8 @@ TDE Libraries (Doxygen) - - + + @@ -85,17 +85,17 @@ true - - + + ./bin/%{APPNAMELC} - + - + @@ -103,11 +103,11 @@ - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt index 71d9301b..64b3b0bd 100644 --- a/languages/cpp/app_templates/qmakesimple/CMakeLists.txt +++ b/languages/cpp/app_templates/qmakesimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( qmakesimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qmakesimple.tar.gz qmakesimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qmakesimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qmakesimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qmakesimple/Makefile.am b/languages/cpp/app_templates/qmakesimple/Makefile.am index 728d63ba..ac17219f 100644 --- a/languages/cpp/app_templates/qmakesimple/Makefile.am +++ b/languages/cpp/app_templates/qmakesimple/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.cpp qmakesimple.png app.tdevelop app.pro src.pro templateName = qmakesimple ### 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/cpp/app_templates/qmakesimple/app.tdevelop b/languages/cpp/app_templates/qmakesimple/app.tdevelop index a8e39ca6..2af4f7ad 100644 --- a/languages/cpp/app_templates/qmakesimple/app.tdevelop +++ b/languages/cpp/app_templates/qmakesimple/app.tdevelop @@ -10,25 +10,25 @@ Qt - + - - + + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner %{QTDIR} %{QMAKE} - - + + ada ada_bugs_gcc @@ -66,8 +66,8 @@ TDE Libraries (Doxygen) - - + + /usr/bin/gdb @@ -76,25 +76,25 @@ false - - + + ./bin/%{APPNAMELC} - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate b/languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qmakesimple/qmakesimple.tdevtemplate rename to languages/cpp/app_templates/qmakesimple/qmakesimple.kdevtemplate diff --git a/languages/cpp/app_templates/qt4hello/CMakeLists.txt b/languages/cpp/app_templates/qt4hello/CMakeLists.txt index d1aee7bd..7ec55256 100644 --- a/languages/cpp/app_templates/qt4hello/CMakeLists.txt +++ b/languages/cpp/app_templates/qt4hello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( qt4hello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qt4hello.tar.gz qt4hello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qt4hello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qt4hello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qt4hello/Makefile.am b/languages/cpp/app_templates/qt4hello/Makefile.am index 20edc902..3f735466 100644 --- a/languages/cpp/app_templates/qt4hello/Makefile.am +++ b/languages/cpp/app_templates/qt4hello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = main.cpp qt4hello.png qt4hello.tdevelop \ templateName = qt4hello ### 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/cpp/app_templates/qt4hello/qt4hello.tdevtemplate b/languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qt4hello/qt4hello.tdevtemplate rename to languages/cpp/app_templates/qt4hello/qt4hello.kdevtemplate diff --git a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop +++ b/languages/cpp/app_templates/qt4hello/qt4hello.tdevelop @@ -10,7 +10,7 @@ Qt - + @@ -21,8 +21,8 @@ false *.o,*.lo,CVS - - + + true 4 @@ -31,8 +31,8 @@ %{QMAKE} %{DESIGNER} - - + + bash bash_bugs @@ -69,8 +69,8 @@ TDE Libraries (Doxygen) - - + + @@ -85,17 +85,17 @@ true - - + + ./bin/%{APPNAMELC} - + - + @@ -103,11 +103,11 @@ - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt index 5fe14da0..422740dc 100644 --- a/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qt4makeapp/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( qt4makeapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qt4makeapp.tar.gz qt4makeapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qt4makeapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qt4makeapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qt4makeapp/Makefile.am b/languages/cpp/app_templates/qt4makeapp/Makefile.am index 265a5cd9..68f78acb 100644 --- a/languages/cpp/app_templates/qt4makeapp/Makefile.am +++ b/languages/cpp/app_templates/qt4makeapp/Makefile.am @@ -5,10 +5,10 @@ dataFiles = main.cpp qt4makeapp.cpp qt4makeapp.h qt4makeapp.png qt4makeapp.tdeve templateName = qt4makeapp ### 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/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevtemplate rename to languages/cpp/app_templates/qt4makeapp/qt4makeapp.kdevtemplate diff --git a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop index c35d2fe9..3dc8acbb 100644 --- a/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop +++ b/languages/cpp/app_templates/qt4makeapp/qt4makeapp.tdevelop @@ -10,7 +10,7 @@ Qt - + @@ -21,8 +21,8 @@ false *.o,*.lo,CVS - - + + true 4 @@ -31,8 +31,8 @@ %{QMAKE} %{DESIGNER} - - + + bash bash_bugs @@ -69,8 +69,8 @@ TDE Libraries (Doxygen) - - + + @@ -85,17 +85,17 @@ true - - + + ./bin/%{APPNAMELC} - + - + @@ -103,11 +103,11 @@ - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt index ef38e012..57849362 100644 --- a/languages/cpp/app_templates/qtopia4app/CMakeLists.txt +++ b/languages/cpp/app_templates/qtopia4app/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qtopia4app.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtopia4app.tar.gz qtopia4app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtopia4app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtopia4app.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qtopia4app/Makefile.am b/languages/cpp/app_templates/qtopia4app/Makefile.am index 8dcaa585..324291bb 100644 --- a/languages/cpp/app_templates/qtopia4app/Makefile.am +++ b/languages/cpp/app_templates/qtopia4app/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.desktop \ templateName = qtopia4app ### 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 -f9 $(templateName).tar diff --git a/languages/cpp/app_templates/qtopia4app/app.tdevelop b/languages/cpp/app_templates/qtopia4app/app.tdevelop index 320ae4d7..b890135e 100644 --- a/languages/cpp/app_templates/qtopia4app/app.tdevelop +++ b/languages/cpp/app_templates/qtopia4app/app.tdevelop @@ -11,7 +11,7 @@ - + @@ -22,8 +22,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -61,8 +61,8 @@ TDE Libraries (Doxygen) - - + + libtool @@ -75,8 +75,8 @@ false true - - + + @@ -105,11 +105,11 @@ - - + + - + @@ -128,11 +128,11 @@ true - + true 2 - - + + -f -dP @@ -141,14 +141,14 @@ -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - - + + true 4 @@ -159,5 +159,5 @@ /opt/Qtopia/SDK/4.2.4/x86/bin/designer - + diff --git a/languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate b/languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qtopia4app/qtopia4app.tdevtemplate rename to languages/cpp/app_templates/qtopia4app/qtopia4app.kdevtemplate diff --git a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt index 74826ef3..424d19bc 100644 --- a/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt +++ b/languages/cpp/app_templates/qtopiaapp/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( qtopiaapp.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/qtopiaapp.tar.gz qtopiaapp.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - qtopiaapp.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + qtopiaapp.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/qtopiaapp/Makefile.am b/languages/cpp/app_templates/qtopiaapp/Makefile.am index 342e2a96..afaaf294 100644 --- a/languages/cpp/app_templates/qtopiaapp/Makefile.am +++ b/languages/cpp/app_templates/qtopiaapp/Makefile.am @@ -5,10 +5,10 @@ dataFiles = Example.png app.tdevelop example.control example.desktop \ templateName = qtopiaapp ### 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/cpp/app_templates/qtopiaapp/app.tdevelop b/languages/cpp/app_templates/qtopiaapp/app.tdevelop index 67916b05..962f4622 100644 --- a/languages/cpp/app_templates/qtopiaapp/app.tdevelop +++ b/languages/cpp/app_templates/qtopiaapp/app.tdevelop @@ -11,7 +11,7 @@ - + @@ -22,8 +22,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -61,8 +61,8 @@ TDE Libraries (Doxygen) - - + + libtool @@ -75,8 +75,8 @@ false true - - + + @@ -85,11 +85,11 @@ -qws - - + + - + @@ -108,11 +108,11 @@ true - + true 2 - - + + -f -dP @@ -121,11 +121,11 @@ -u3 -p - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate b/languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate similarity index 100% rename from languages/cpp/app_templates/qtopiaapp/qtopiaapp.tdevtemplate rename to languages/cpp/app_templates/qtopiaapp/qtopiaapp.kdevtemplate diff --git a/languages/cpp/app_templates/tde4app/CMakeLists.txt b/languages/cpp/app_templates/tde4app/CMakeLists.txt deleted file mode 100644 index 29997b2c..00000000 --- a/languages/cpp/app_templates/tde4app/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tde4app.tar.gz ALL - COMMAND tar zcf tde4app.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp - tdeapp4view.h tdeapp4view_base.ui main.cpp tde4appui.rc - tde4app-CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg - settings.kcfgc tde4app.png README tde4app.tdevelop - tde4app.tdevelop.filelist -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tde4app.tar.gz tde4app.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tde4app.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tde4app/Makefile.am b/languages/cpp/app_templates/tde4app/Makefile.am deleted file mode 100644 index 3fc82b7a..00000000 --- a/languages/cpp/app_templates/tde4app/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ -dataFiles = tdeapp4.cpp tdeapp4.h prefs_base.ui tdeapp4view.cpp tdeapp4view.h tdeapp4view_base.ui \ - main.cpp tde4appui.rc CMakeLists.txt tdeapp4.desktop tdeapp4.kcfg settings.kcfgc \ - tde4app.png README tde4app.tdevelop tde4app.tdevelop.filelist - -templateName = tde4app - -### no need to change below: -template_DATA = $(templateName).tdevtemplate -templatedir = ${appwizarddatadir}/templates - -appwizarddatadir = ${kde_datadir}/tdevappwizard -$(templateName).tar.gz: ${dataFiles} - $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} - $(GZIP_COMMAND) -f9 $(templateName).tar - -archivedir = ${appwizarddatadir} -archive_DATA = $(templateName).tar.gz ${templateName}.png - -CLEANFILES = *.tar.gz diff --git a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt index 40e12016..072f5f5e 100644 --- a/languages/cpp/app_templates/tdecmodule/CMakeLists.txt +++ b/languages/cpp/app_templates/tdecmodule/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( tdecmodule.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdecmodule.tar.gz tdecmodule.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdecmodule.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdecmodule.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdecmodule/Makefile.am b/languages/cpp/app_templates/tdecmodule/Makefile.am index 0938012d..b3b19611 100644 --- a/languages/cpp/app_templates/tdecmodule/Makefile.am +++ b/languages/cpp/app_templates/tdecmodule/Makefile.am @@ -3,10 +3,10 @@ dataFiles = module.cpp module.h module.desktop module.tdevelop \ templateName = tdecmodule ### 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/cpp/app_templates/tdecmodule/module.tdevelop b/languages/cpp/app_templates/tdecmodule/module.tdevelop index 4f2d0606..7b5a57c0 100644 --- a/languages/cpp/app_templates/tdecmodule/module.tdevelop +++ b/languages/cpp/app_templates/tdecmodule/module.tdevelop @@ -13,15 +13,15 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + src/%{APPNAMELC} debug @@ -43,8 +43,8 @@ -O0 -g3 - - + + @@ -52,8 +52,8 @@ - - + + ada ada_bugs_gcc @@ -90,24 +90,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate rename to languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate index 06d6657a..f646c242 100644 --- a/languages/cpp/app_templates/tdecmodule/tdecmodule.tdevtemplate +++ b/languages/cpp/app_templates/tdecmodule/tdecmodule.kdevtemplate @@ -69,11 +69,11 @@ Archive=tdecmodule.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/cpp/app_templates/tdeconfig35/CMakeLists.txt b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt index 1025eb0b..32dd830c 100644 --- a/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeconfig35/CMakeLists.txt @@ -20,9 +20,9 @@ add_custom_target( tdeconfig35.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdeconfig35.tar.gz tdeconfig35.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeconfig35.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdeconfig35.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeconfig35/Makefile.am b/languages/cpp/app_templates/tdeconfig35/Makefile.am index dc6c56d1..a172f05f 100644 --- a/languages/cpp/app_templates/tdeconfig35/Makefile.am +++ b/languages/cpp/app_templates/tdeconfig35/Makefile.am @@ -5,10 +5,10 @@ dataFiles = src-Makefile.am app.cpp app.h main.cpp appui.rc app.tdevelop \ templateName= tdeconfig35 ### 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/cpp/app_templates/tdeconfig35/app.tdevelop b/languages/cpp/app_templates/tdeconfig35/app.tdevelop index e1523988..6a53f237 100644 --- a/languages/cpp/app_templates/tdeconfig35/app.tdevelop +++ b/languages/cpp/app_templates/tdeconfig35/app.tdevelop @@ -17,15 +17,15 @@ - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - - + + src/%{APPNAMELC} debug @@ -61,8 +61,8 @@ -O0 -g3 - - + + @@ -74,8 +74,8 @@ false *.o,*.lo,CVS - - + + ada ada_bugs_gcc @@ -110,8 +110,8 @@ qmake User Guide - - + + libtool @@ -125,16 +125,16 @@ false true - - + + - - + + -f -dP @@ -143,7 +143,7 @@ -u3 -p - + @@ -155,14 +155,14 @@ true - + true 2 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate rename to languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate index 485b9eb9..b9edfb7a 100644 --- a/languages/cpp/app_templates/tdeconfig35/tdeconfig35.tdevtemplate +++ b/languages/cpp/app_templates/tdeconfig35/tdeconfig35.kdevtemplate @@ -52,11 +52,11 @@ Archive=tdeconfig35.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/cpp/app_templates/tdefileplugin/CMakeLists.txt b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt index d6998c33..5462742c 100644 --- a/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt +++ b/languages/cpp/app_templates/tdefileplugin/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( tdefileplugin.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdefileplugin.tar.gz tdefileplugin.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdefileplugin.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdefileplugin.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdefileplugin/Makefile.am b/languages/cpp/app_templates/tdefileplugin/Makefile.am index 2896e774..019d2d7c 100644 --- a/languages/cpp/app_templates/tdefileplugin/Makefile.am +++ b/languages/cpp/app_templates/tdefileplugin/Makefile.am @@ -4,10 +4,10 @@ dataFiles = README.devel tdefile_plugin.cpp tdefile_plugin.desktop \ templateName = tdefileplugin ### 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/cpp/app_templates/tdefileplugin/plugin.tdevelop b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop index cb6caa43..f09030c1 100644 --- a/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop +++ b/languages/cpp/app_templates/tdefileplugin/plugin.tdevelop @@ -13,16 +13,16 @@ TDE - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/tdefile_%{APPNAMELC}.la debug @@ -44,8 +44,8 @@ -O0 -g3 - - + + @@ -53,8 +53,8 @@ - - + + ada ada_bugs_gcc @@ -91,24 +91,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate rename to languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate index 4ef025de..2e53acc7 100644 --- a/languages/cpp/app_templates/tdefileplugin/tdefileplugin.tdevtemplate +++ b/languages/cpp/app_templates/tdefileplugin/tdefileplugin.kdevtemplate @@ -65,11 +65,11 @@ Archive=tdefileplugin.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/cpp/app_templates/tdeioslave/CMakeLists.txt b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt index 730f65e2..584bdc19 100644 --- a/languages/cpp/app_templates/tdeioslave/CMakeLists.txt +++ b/languages/cpp/app_templates/tdeioslave/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( tdeioslave.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdeioslave.tar.gz tdeioslave.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdeioslave.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdeioslave.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdeioslave/Makefile.am b/languages/cpp/app_templates/tdeioslave/Makefile.am index 003040b4..bee7ddb6 100644 --- a/languages/cpp/app_templates/tdeioslave/Makefile.am +++ b/languages/cpp/app_templates/tdeioslave/Makefile.am @@ -3,10 +3,10 @@ dataFiles = slave.cpp slave.h slave.protocol slave.tdevelop \ templateName = tdeioslave ### 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/cpp/app_templates/tdeioslave/slave.tdevelop b/languages/cpp/app_templates/tdeioslave/slave.tdevelop index 5cbbe5e0..cb257385 100644 --- a/languages/cpp/app_templates/tdeioslave/slave.tdevelop +++ b/languages/cpp/app_templates/tdeioslave/slave.tdevelop @@ -14,16 +14,16 @@ tdeioslave - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}.la debug @@ -45,15 +45,15 @@ -O0 -g3 - - + + - - + + bash bash_bugs @@ -91,23 +91,23 @@ Qt Designer Manual Qt Reference Documentation - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate rename to languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate index 6ced25c6..2ff27786 100644 --- a/languages/cpp/app_templates/tdeioslave/tdeioslave.tdevtemplate +++ b/languages/cpp/app_templates/tdeioslave/tdeioslave.kdevtemplate @@ -56,11 +56,11 @@ Archive=tdeioslave.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/cpp/app_templates/tdescreensaver/CMakeLists.txt b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt index eae96197..b1149d88 100644 --- a/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt +++ b/languages/cpp/app_templates/tdescreensaver/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( tdescreensaver.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/tdescreensaver.tar.gz tdescreensaver.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - tdescreensaver.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + tdescreensaver.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdescreensaver/Makefile.am b/languages/cpp/app_templates/tdescreensaver/Makefile.am index 1f9e6179..bee93bbc 100644 --- a/languages/cpp/app_templates/tdescreensaver/Makefile.am +++ b/languages/cpp/app_templates/tdescreensaver/Makefile.am @@ -5,10 +5,10 @@ dataFiles = tdescreensaver.desktop tdescreensaver.png tdescreensaver.h \ templateName= tdescreensaver ### 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/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate rename to languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate index 0500fdd5..91510f04 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevtemplate +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.kdevtemplate @@ -68,11 +68,11 @@ Archive=tdescreensaver.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/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop index c3ae15db..28e0a678 100644 --- a/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop +++ b/languages/cpp/app_templates/tdescreensaver/tdescreensaver.tdevelop @@ -14,16 +14,16 @@ tdeioslave - + 3 true 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner - + - + src/lib%{APPNAMELC}.la debug @@ -45,15 +45,15 @@ -O0 -g3 - - + + - - + + ada ada_bugs_gcc @@ -90,24 +90,24 @@ qmake User Guide - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/tdevlang/CMakeLists.txt b/languages/cpp/app_templates/tdevlang/CMakeLists.txt deleted file mode 100644 index a5768a94..00000000 --- a/languages/cpp/app_templates/tdevlang/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevlang.tar.gz ALL - COMMAND tar zcf tdevlang.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevlang_part.cpp tdevlang_part.h - tdevlang.rc tdevlang.desktop app.tdevelop - tdevlang-configure.in.in README.dox -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevlang.tar.gz tdevlang.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevlang.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart/CMakeLists.txt b/languages/cpp/app_templates/tdevpart/CMakeLists.txt deleted file mode 100644 index e952ce8a..00000000 --- a/languages/cpp/app_templates/tdevpart/CMakeLists.txt +++ /dev/null @@ -1,29 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevpart.tar.gz ALL - COMMAND tar zcf tdevpart.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevpart_part.cpp tdevpart_part.h - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc - tdevpart.desktop app.tdevelop README.dox - globalconfigbase.ui globalconfig.h globalconfig.cpp - projectconfigbase.ui projectconfig.h projectconfig.cpp -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevpart.tar.gz tdevpart.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevpart.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/tdevpart2/CMakeLists.txt b/languages/cpp/app_templates/tdevpart2/CMakeLists.txt deleted file mode 100644 index d48daf45..00000000 --- a/languages/cpp/app_templates/tdevpart2/CMakeLists.txt +++ /dev/null @@ -1,30 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdevpart2.tar.gz ALL - COMMAND tar zcf tdevpart2.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - src-Makefile.am tdevpart_part.cpp tdevpart_part.h - tdevpart_widget.h tdevpart_widget.cpp tdevpart_part.rc - tdevpart.desktop app.tdevelop tdevpart-configure.in.in - README.dox subdirs globalconfigbase.ui globalconfig.h - globalconfig.cpp projectconfigbase.ui projectconfig.h - projectconfig.cpp -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdevpart2.tar.gz tdevpart2.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdevpart2.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32gui/CMakeLists.txt b/languages/cpp/app_templates/win32gui/CMakeLists.txt index 3e7bf9d0..09d0bc52 100644 --- a/languages/cpp/app_templates/win32gui/CMakeLists.txt +++ b/languages/cpp/app_templates/win32gui/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( win32gui.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/win32gui.tar.gz win32gui.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - win32gui.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + win32gui.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32gui/Makefile.am b/languages/cpp/app_templates/win32gui/Makefile.am index d315f718..a29fa6a8 100644 --- a/languages/cpp/app_templates/win32gui/Makefile.am +++ b/languages/cpp/app_templates/win32gui/Makefile.am @@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32gui-Makefile.am win32gui-Makefile.cvs \ templateName = win32gui ### 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/cpp/app_templates/win32gui/app.tdevelop b/languages/cpp/app_templates/win32gui/app.tdevelop index 53ec087b..eb9bbdbd 100644 --- a/languages/cpp/app_templates/win32gui/app.tdevelop +++ b/languages/cpp/app_templates/win32gui/app.tdevelop @@ -16,7 +16,7 @@ - + src/%{APPNAMELC} debug @@ -103,8 +103,8 @@ 0 - - + + clanlib opengl @@ -120,15 +120,15 @@ TDE Libraries (Doxygen) - - + + - - + + @@ -139,14 +139,14 @@ *.o,*.lo,CVS false - + .h .cpp - + true true @@ -164,8 +164,8 @@ TDElibs ksjembed - - + + @@ -182,11 +182,11 @@ true 10 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/win32gui/win32gui.tdevtemplate rename to languages/cpp/app_templates/win32gui/win32gui.kdevtemplate index cd15f549..dec00262 100644 --- a/languages/cpp/app_templates/win32gui/win32gui.tdevtemplate +++ b/languages/cpp/app_templates/win32gui/win32gui.kdevtemplate @@ -64,11 +64,11 @@ Archive=win32gui.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/win32hello/CMakeLists.txt b/languages/cpp/app_templates/win32hello/CMakeLists.txt index 9cc35db0..bc1c8d80 100644 --- a/languages/cpp/app_templates/win32hello/CMakeLists.txt +++ b/languages/cpp/app_templates/win32hello/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( win32hello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/win32hello.tar.gz win32hello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - win32hello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + win32hello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/win32hello/Makefile.am b/languages/cpp/app_templates/win32hello/Makefile.am index 813c591f..a55bcebc 100644 --- a/languages/cpp/app_templates/win32hello/Makefile.am +++ b/languages/cpp/app_templates/win32hello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = app.cpp src-Makefile.am win32-Makefile.am win32-Makefile.cvs \ templateName = win32hello ### 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/cpp/app_templates/win32hello/app.tdevelop b/languages/cpp/app_templates/win32hello/app.tdevelop index 3ee2b1af..672646c4 100644 --- a/languages/cpp/app_templates/win32hello/app.tdevelop +++ b/languages/cpp/app_templates/win32hello/app.tdevelop @@ -16,7 +16,7 @@ - + src/%{APPNAMELC} default @@ -75,8 +75,8 @@ 0 - - + + clanlib opengl @@ -92,15 +92,15 @@ TDE Libraries (Doxygen) - - + + - - + + @@ -111,14 +111,14 @@ *.o,*.lo,CVS false - + .h .cpp - + true true @@ -136,8 +136,8 @@ TDElibs ksjembed - - + + @@ -154,11 +154,11 @@ true 10 - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/win32hello/win32hello.tdevtemplate rename to languages/cpp/app_templates/win32hello/win32hello.kdevtemplate index ce8804a7..3b5f4f3e 100644 --- a/languages/cpp/app_templates/win32hello/win32hello.tdevtemplate +++ b/languages/cpp/app_templates/win32hello/win32hello.kdevtemplate @@ -63,11 +63,11 @@ Archive=win32hello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/cpp/app_templates/wxhello/CMakeLists.txt b/languages/cpp/app_templates/wxhello/CMakeLists.txt index 48d382bd..f1a8ffec 100644 --- a/languages/cpp/app_templates/wxhello/CMakeLists.txt +++ b/languages/cpp/app_templates/wxhello/CMakeLists.txt @@ -18,9 +18,9 @@ add_custom_target( wxhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/wxhello.tar.gz wxhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - wxhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + wxhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/cpp/app_templates/wxhello/Makefile.am b/languages/cpp/app_templates/wxhello/Makefile.am index f0e0839e..c45b1d10 100644 --- a/languages/cpp/app_templates/wxhello/Makefile.am +++ b/languages/cpp/app_templates/wxhello/Makefile.am @@ -4,10 +4,10 @@ dataFiles = src-Makefile.am app.cpp app.h app.tdevelop subdirs \ templateName = wxhello ### 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/cpp/app_templates/wxhello/app.tdevelop b/languages/cpp/app_templates/wxhello/app.tdevelop index 9a3f0821..9de4fa75 100644 --- a/languages/cpp/app_templates/wxhello/app.tdevelop +++ b/languages/cpp/app_templates/wxhello/app.tdevelop @@ -12,7 +12,7 @@ wxWidgets - + src/%{APPNAMELC} debug @@ -37,16 +37,16 @@ -O0 -g3 - - + + - - + + ada ada_bugs_gcc @@ -91,24 +91,24 @@ TDE Libraries (Doxygen) - - + + libtool - - + + - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate similarity index 98% rename from languages/cpp/app_templates/wxhello/wxhello.tdevtemplate rename to languages/cpp/app_templates/wxhello/wxhello.kdevtemplate index dab3c253..ed1cbc6a 100644 --- a/languages/cpp/app_templates/wxhello/wxhello.tdevtemplate +++ b/languages/cpp/app_templates/wxhello/wxhello.kdevtemplate @@ -64,7 +64,7 @@ Archive=wxhello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [WXARCH] Type=install archive @@ -97,7 +97,7 @@ Dest=%{dest}/doc/en/index.docbook [WX] Type=include -File=%{tdevelop}/template-common/wx.tdevtemplate +File=%{tdevelop}/template-common/wx.kdevtemplate [FILE4] Type=install diff --git a/languages/cpp/backgroundparser.cpp b/languages/cpp/backgroundparser.cpp index 51311dac..730a090f 100644 --- a/languages/cpp/backgroundparser.cpp +++ b/languages/cpp/backgroundparser.cpp @@ -15,8 +15,8 @@ #include "codeinformationrepository.h" #include "cppcodecompletion.h" #include "ast_utils.h" -#include "tdevdeepcopy.h" -#include "tdevdriver.h" +#include "kdevdeepcopy.h" +#include "kdevdriver.h" #include @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -39,9 +39,9 @@ #include -class BackgroundTDevDriver : public TDevDriver { +class BackgroundKDevDriver : public KDevDriver { public: - BackgroundTDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : TDevDriver( cppSupport, false ), m_backgroundParser(bp) { + BackgroundKDevDriver( CppSupportPart* cppSupport, BackgroundParser* bp ) : KDevDriver( cppSupport, false ), m_backgroundParser(bp) { } virtual void fileParsed( ParsedFile& fileName ); virtual void addDependence( const TQString& fileName, const Dependence& dep ); @@ -255,7 +255,7 @@ BackgroundParser::BackgroundParser( CppSupportPart* part, TQWaitCondition* consu : m_consumed( consumed ), m_cppSupport( part ), m_close( false ), m_saveMemory( false ) { m_fileList = new SynchronizedFileList(); - m_driver = new BackgroundTDevDriver( m_cppSupport, this ); + m_driver = new BackgroundKDevDriver( m_cppSupport, this ); m_driver->setSourceProvider( new KDevSourceProvider( m_cppSupport, m_mutex ) ); TQString conf_file_name = m_cppSupport->specialHeaderName(); @@ -347,14 +347,14 @@ void BackgroundParser::removeFile( const TQString& fileName ) m_isEmpty.wakeAll(); } -void BackgroundTDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { +void BackgroundKDevDriver::addDependence( const TQString& fileName, const Dependence& dep ) { //give waiting threads a chance to perform their actions m_backgroundParser->m_mutex.unlock(); m_backgroundParser->m_mutex.lock(); - TDevDriver::addDependence( fileName, dep ); + KDevDriver::addDependence( fileName, dep ); } -void BackgroundTDevDriver::fileParsed( ParsedFile& fileName ) { +void BackgroundKDevDriver::fileParsed( ParsedFile& fileName ) { m_backgroundParser->fileParsed( fileName ); } diff --git a/languages/cpp/backgroundparser.h b/languages/cpp/backgroundparser.h index bd21fd6f..f3cd86fd 100644 --- a/languages/cpp/backgroundparser.h +++ b/languages/cpp/backgroundparser.h @@ -24,7 +24,7 @@ class CppSupportPart; class TranslationUnitAST; class SynchronizedFileList; -class BackgroundTDevDriver; +class BackgroundKDevDriver; class Unit { public: @@ -94,14 +94,14 @@ public: virtual void run(); protected: - friend class BackgroundTDevDriver; + friend class BackgroundKDevDriver; void fileParsed( ParsedFile& fileName ); Unit* findUnit( const TQString& fileName ); void parseFile( const TQString& fileName, bool readFromDisk, bool lock = false ) ; private: - class TDevDriver* m_driver; + class KDevDriver* m_driver; TQString m_currentFile; TQWaitCondition m_canParse; TQWaitCondition m_isEmpty; diff --git a/languages/cpp/ccconfigwidget.cpp b/languages/cpp/ccconfigwidget.cpp index 6e285019..99a6db12 100644 --- a/languages/cpp/ccconfigwidget.cpp +++ b/languages/cpp/ccconfigwidget.cpp @@ -25,7 +25,7 @@ #include // kde includes -#include +#include #include #include #include @@ -41,9 +41,9 @@ #include // tdevelop includes #include -#include -#include -#include +#include +#include +#include #include // std includes #include @@ -440,11 +440,11 @@ void CCConfigWidget::initTQtTab() isExecutable( m_qmakePath->url() ); m_designerPath->setURL( c->designerPath() ); isExecutable( m_designerPath->url() ); - if ( c->designerIntegration() == "EmbeddedTDevDesigner" ) + if ( c->designerIntegration() == "EmbeddedKDevDesigner" ) { m_kdevembedded->setChecked( true ); } - else if ( c->designerIntegration() == "ExternalTDevDesigner" ) + else if ( c->designerIntegration() == "ExternalKDevDesigner" ) { m_kdevexternal->setChecked( true ); }else @@ -507,11 +507,11 @@ void CCConfigWidget::saveTQtTab() c->setDesignerPath( m_designerPath->url() ); if( m_kdevembedded->isChecked() ) { - c->setDesignerIntegration( "EmbeddedTDevDesigner" ); + c->setDesignerIntegration( "EmbeddedKDevDesigner" ); } else if ( m_kdevexternal->isChecked() ) { - c->setDesignerIntegration( "ExternalTDevDesigner" ); + c->setDesignerIntegration( "ExternalKDevDesigner" ); }else { c->setDesignerIntegration( "ExternalDesigner" ); diff --git a/languages/cpp/codeinformationrepository.cpp b/languages/cpp/codeinformationrepository.cpp index de256b00..a1ad79b0 100644 --- a/languages/cpp/codeinformationrepository.cpp +++ b/languages/cpp/codeinformationrepository.cpp @@ -12,7 +12,7 @@ #include "codeinformationrepository.h" #include "cpp_tags.h" -#include +#include #include /// @todo move in utils.cpp @@ -39,7 +39,7 @@ my_unique( const TQValueList& entryList ) return l; } -CodeInformationRepository::CodeInformationRepository( TDevCodeRepository* rep ) +CodeInformationRepository::CodeInformationRepository( KDevCodeRepository* rep ) : m_rep( rep ) {} diff --git a/languages/cpp/codeinformationrepository.h b/languages/cpp/codeinformationrepository.h index 4b46ce0e..54610e50 100644 --- a/languages/cpp/codeinformationrepository.h +++ b/languages/cpp/codeinformationrepository.h @@ -23,12 +23,12 @@ struct TypeProcessor { virtual TQString parentType() = 0; }; -class TDevCodeRepository; +class KDevCodeRepository; class CodeInformationRepository { public: - CodeInformationRepository( TDevCodeRepository* rep ); + CodeInformationRepository( KDevCodeRepository* rep ); virtual ~CodeInformationRepository(); static TQValueList toEntryList( const TQValueList& tags, @@ -46,7 +46,7 @@ public: private: TQValueList m_globalEntries; - TDevCodeRepository* m_rep; + KDevCodeRepository* m_rep; private: CodeInformationRepository( const CodeInformationRepository& source ); diff --git a/languages/cpp/compiler/Makefile.am b/languages/cpp/compiler/Makefile.am index ab237cd4..128e715f 100644 --- a/languages/cpp/compiler/Makefile.am +++ b/languages/cpp/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = gccoptions diff --git a/languages/cpp/compiler/gccoptions/CMakeLists.txt b/languages/cpp/compiler/gccoptions/CMakeLists.txt index ed9b49d4..35c6159d 100644 --- a/languages/cpp/compiler/gccoptions/CMakeLists.txt +++ b/languages/cpp/compiler/gccoptions/CMakeLists.txt @@ -26,15 +26,15 @@ link_directories( ##### other data ################################ install( FILES - tdevgccoptions.desktop tdevgppoptions.desktop - tdevg77options.desktop + kdevgccoptions.desktop kdevgppoptions.desktop + kdevg77options.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevgccoptions (module) ################ +##### libkdevgccoptions (module) ################ -tde_add_kpart( libtdevgccoptions AUTOMOC +tde_add_kpart( libkdevgccoptions AUTOMOC SOURCES gccoptionsplugin.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/compiler/gccoptions/Makefile.am b/languages/cpp/compiler/gccoptions/Makefile.am index 23c8a752..e90edb63 100644 --- a/languages/cpp/compiler/gccoptions/Makefile.am +++ b/languages/cpp/compiler/gccoptions/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevgccoptions.la -libtdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevgccoptions.la +libkdevgccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevgccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevgccoptions_la_SOURCES = gccoptionsplugin.cpp +libkdevgccoptions_la_SOURCES = gccoptionsplugin.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevgccoptions.desktop tdevgppoptions.desktop tdevg77options.desktop +service_DATA = kdevgccoptions.desktop kdevgppoptions.desktop kdevg77options.desktop diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp index d43bf094..37470a49 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.cpp @@ -24,7 +24,7 @@ #include "flagboxes.h" #include "gccoptionsplugin.h" -K_EXPORT_COMPONENT_FACTORY( libtdevgccoptions, KGenericFactory( "tdevgccoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevgccoptions, KGenericFactory( "kdevgccoptions" ) ) class GeneralTab : public TQWidget { @@ -650,7 +650,7 @@ TQString GccOptionsDialog::flags() const GccOptionsPlugin::GccOptionsPlugin( TQObject *parent, const char *name, const TQStringList &args ) - : TDevCompilerOptions( parent, name ) + : KDevCompilerOptions( parent, name ) { gcctype = Unknown; diff --git a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h index 3332809a..656bd289 100644 --- a/languages/cpp/compiler/gccoptions/gccoptionsplugin.h +++ b/languages/cpp/compiler/gccoptions/gccoptionsplugin.h @@ -14,7 +14,7 @@ #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" class GeneralTab; @@ -24,7 +24,7 @@ class Warnings1Tab; class Warnings2Tab; -class GccOptionsPlugin : public TDevCompilerOptions +class GccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/cpp/compiler/gccoptions/tdevg77options.desktop b/languages/cpp/compiler/gccoptions/kdevg77options.desktop similarity index 98% rename from languages/cpp/compiler/gccoptions/tdevg77options.desktop rename to languages/cpp/compiler/gccoptions/kdevg77options.desktop index bbe1f47c..e2a806f5 100644 --- a/languages/cpp/compiler/gccoptions/tdevg77options.desktop +++ b/languages/cpp/compiler/gccoptions/kdevg77options.desktop @@ -49,7 +49,7 @@ Name[tg]=G77Интихобҳо Name[tr]=G77Seçenekleri Name[zh_TW]=G77 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=g77 diff --git a/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop similarity index 98% rename from languages/cpp/compiler/gccoptions/tdevgccoptions.desktop rename to languages/cpp/compiler/gccoptions/kdevgccoptions.desktop index ce01a066..14bc62df 100644 --- a/languages/cpp/compiler/gccoptions/tdevgccoptions.desktop +++ b/languages/cpp/compiler/gccoptions/kdevgccoptions.desktop @@ -46,7 +46,7 @@ Name[ta]=Gccவிருப்பங்கள் Name[tr]=GccSeçenekleri Name[zh_TW]=Gcc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=C X-TDevelop-Args=gcc diff --git a/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop similarity index 98% rename from languages/cpp/compiler/gccoptions/tdevgppoptions.desktop rename to languages/cpp/compiler/gccoptions/kdevgppoptions.desktop index b5fe552e..d8487596 100644 --- a/languages/cpp/compiler/gccoptions/tdevgppoptions.desktop +++ b/languages/cpp/compiler/gccoptions/kdevgppoptions.desktop @@ -48,7 +48,7 @@ Name[ta]=Gppவிருப்பங்கள் Name[tr]=GppSeçenekleri Name[zh_TW]=Gpp 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevgccoptions +X-TDE-Library=libkdevgccoptions X-TDevelop-Version=5 X-TDevelop-Language=C++ X-TDevelop-Args=g++ diff --git a/languages/cpp/configproblemreporter.ui.h b/languages/cpp/configproblemreporter.ui.h index 2b1ad2a3..97cc66e1 100644 --- a/languages/cpp/configproblemreporter.ui.h +++ b/languages/cpp/configproblemreporter.ui.h @@ -8,7 +8,7 @@ #include "cppsupportpart.h" -#include +#include #include #include diff --git a/languages/cpp/cppcodecompletion.cpp b/languages/cpp/cppcodecompletion.cpp index adfc1c7d..bf4bef5a 100644 --- a/languages/cpp/cppcodecompletion.cpp +++ b/languages/cpp/cppcodecompletion.cpp @@ -59,10 +59,10 @@ email : david.nolden.kdevelop@art-master.de #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -1470,7 +1470,7 @@ void CppCodeCompletion::popupDefinitionAction( int number ) { } void CppCodeCompletion::selectItem( ItemDom item ) { - Extensions::TDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); + Extensions::KDevCodeBrowserFrontend * f = m_pSupport->extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); if ( f != 0 ) { ItemDom itemDom( &( *item ) ); diff --git a/languages/cpp/cppimplementationwidget.cpp b/languages/cpp/cppimplementationwidget.cpp index 5fc00da3..35069349 100644 --- a/languages/cpp/cppimplementationwidget.cpp +++ b/languages/cpp/cppimplementationwidget.cpp @@ -31,12 +31,12 @@ #include #include -#include -#include +#include +#include #include #include -CppImplementationWidget::CppImplementationWidget( TDevLanguageSupport *part, +CppImplementationWidget::CppImplementationWidget( KDevLanguageSupport *part, TQWidget *parent, const char *name, bool modal ) : ImplementationWidget( part, parent, name, modal ) {} @@ -45,7 +45,7 @@ TQStringList CppImplementationWidget::createClassFiles() { TQString template_h = "#ifndef $DEFTEXT$_H\n#define $DEFTEXT$_H\n\n#include \"$BASEINCLUDE$\"\n\nclass $CLASSNAME$: public $BASECLASSNAME$ {\nQ_OBJECT\n\npublic:\n $CLASSNAME$(TQWidget *parent = 0, const char *name = 0);\n};\n\n#endif\n"; TQString template_cpp = "#include \"$CLASSINCLUDE$\"\n\n$CLASSNAME$::$CLASSNAME$(TQWidget *parent, const char *name)\n :$BASECLASSNAME$(parent, name)\n{\n}\n"; - if ( m_part->project() ->options() == TDevProject::UsesAutotoolsBuildSystem ) + if ( m_part->project() ->options() == KDevProject::UsesAutotoolsBuildSystem ) template_cpp += "\n#include \"$MOCINCLUDE$\"\n"; TQFileInfo formInfo( m_formName ); diff --git a/languages/cpp/cppimplementationwidget.h b/languages/cpp/cppimplementationwidget.h index 6040cf69..c8569c03 100644 --- a/languages/cpp/cppimplementationwidget.h +++ b/languages/cpp/cppimplementationwidget.h @@ -32,7 +32,7 @@ class CppImplementationWidget : public ImplementationWidget Q_OBJECT public: - CppImplementationWidget( TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); + CppImplementationWidget( KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false ); protected: virtual TQStringList createClassFiles(); diff --git a/languages/cpp/cppnewclassdlg.cpp b/languages/cpp/cppnewclassdlg.cpp index 84c8fe4e..6289da44 100644 --- a/languages/cpp/cppnewclassdlg.cpp +++ b/languages/cpp/cppnewclassdlg.cpp @@ -40,10 +40,10 @@ #include #include "cppsupportpart.h" -#include "tdevproject.h" -#include "tdevsourceformatter.h" -#include "tdevcoderepository.h" -#include "tdevpartcontroller.h" +#include "kdevproject.h" +#include "kdevsourceformatter.h" +#include "kdevcoderepository.h" +#include "kdevpartcontroller.h" #include "backgroundparser.h" #include "domutil.h" #include "filetemplate.h" @@ -65,7 +65,7 @@ CppNewClassDialog::CppNewClassDialog( CppSupportPart *part, TQWidget *parent, co implementationModified = false; m_part = part; // read file template configuration - // TDevProject *project = part->project(); + // KDevProject *project = part->project(); TQDomDocument &dom = *part->projectDom(); interface_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/interfaceURL" ); implementation_url = DomUtil::readEntry( dom, "/cppsupportpart/filetemplates/implementationURL" ); @@ -1342,7 +1342,7 @@ bool CppNewClassDialog::ClassGenerator::validateInput() } /// \FIXME - if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) ) + if ( ( header.find( '/' ) != -1 || implementation.find( '/' ) != -1 ) && !( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { KMessageBox::error( &dlg, i18n( "Generated files will always be added to the " "active directory, so you must not give an " @@ -1376,7 +1376,7 @@ bool CppNewClassDialog::ClassGenerator::generate() return false; } - if( ( dlg.m_part->project() ->options() & TDevProject::UsesTQMakeBuildSystem) ) + if( ( dlg.m_part->project() ->options() & KDevProject::UsesTQMakeBuildSystem) ) { TQDir dir( TQFileInfo( project->projectDirectory()+TQString( TQChar( TQDir::separator() ) )+project->activeDirectory() + TQString( TQChar( TQDir::separator() ) ) + header ).dirPath() ); kdDebug(9024) << "Dir for new file:" << dir.absPath() << endl; @@ -1818,7 +1818,7 @@ void CppNewClassDialog::ClassGenerator::gen_implementation() classImpl.replace( TQRegExp( "\\$NAMESPACEEND\\$" ), namespaceEnd ); classImpl.replace( TQRegExp( "\\$FILENAME\\$" ), implementation ); - if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & TDevProject::UsesAutotoolsBuildSystem ) ) + if ( ( dlg.m_part->project() ) && ( childClass || qobject ) && ( dlg.m_part->project() ->options() & KDevProject::UsesAutotoolsBuildSystem ) ) { TQString moc = header; moc.replace( TQRegExp( "\\..*" ), ".moc" ); diff --git a/languages/cpp/cppnewclassdlg.h b/languages/cpp/cppnewclassdlg.h index 30aed9e4..e7f969db 100644 --- a/languages/cpp/cppnewclassdlg.h +++ b/languages/cpp/cppnewclassdlg.h @@ -24,7 +24,7 @@ #include "cppnewclassdlgbase.h" class CppSupportPart; -class TDevProject; +class KDevProject; class TQPopupMenu; class TDECompletion; class CodeModel; @@ -257,7 +257,7 @@ private: TQString advConstructorsHeader; TQString advConstructorsSource; - TDevProject *project; + KDevProject *project; TQString subDir, headerPath, implementationPath; TQString doc; TQString namespaceStr; diff --git a/languages/cpp/cppsupport_events.h b/languages/cpp/cppsupport_events.h index b8d9909f..b40fc0ec 100644 --- a/languages/cpp/cppsupport_events.h +++ b/languages/cpp/cppsupport_events.h @@ -12,7 +12,7 @@ #ifndef __cppsupport_events_h #define __cppsupport_events_h -#include "tdevdeepcopy.h" +#include "kdevdeepcopy.h" #include #include diff --git a/languages/cpp/cppsupportfactory.cpp b/languages/cpp/cppsupportfactory.cpp index ca98f2f3..41335cdb 100644 --- a/languages/cpp/cppsupportfactory.cpp +++ b/languages/cpp/cppsupportfactory.cpp @@ -11,21 +11,21 @@ #include #include -#include +#include #include "cppsupportfactory.h" -K_EXPORT_COMPONENT_FACTORY( libtdevcppsupport, CppSupportFactory ) +K_EXPORT_COMPONENT_FACTORY( libkdevcppsupport, CppSupportFactory ) -static const TDevPluginInfo data("tdevcppsupport"); +static const KDevPluginInfo data("kdevcppsupport"); CppSupportFactory::CppSupportFactory() -: TDevGenericFactory( data ) +: KDevGenericFactory( data ) { } TDEInstance *CppSupportFactory::createInstance() { - TDEInstance *instance = TDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); TDEStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevcppsupport/newclass/" ); dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevcppsupport/pcs/" ); @@ -33,7 +33,7 @@ TDEInstance *CppSupportFactory::createInstance() return instance; } -const TDevPluginInfo * CppSupportFactory::info() +const KDevPluginInfo * CppSupportFactory::info() { return &data; } diff --git a/languages/cpp/cppsupportfactory.h b/languages/cpp/cppsupportfactory.h index 0ece65e9..f543c4fc 100644 --- a/languages/cpp/cppsupportfactory.h +++ b/languages/cpp/cppsupportfactory.h @@ -12,17 +12,17 @@ #ifndef _CPPSUPPORTFACTORY_H_ #define _CPPSUPPORTFACTORY_H_ -#include +#include #include "cppsupportpart.h" -class TDevPluginInfo; +class KDevPluginInfo; -class CppSupportFactory : public TDevGenericFactory +class CppSupportFactory : public KDevGenericFactory { public: CppSupportFactory(); - static const TDevPluginInfo *info(); + static const KDevPluginInfo *info(); protected: virtual TDEInstance *createInstance(); diff --git a/languages/cpp/cppsupportpart.cpp b/languages/cpp/cppsupportpart.cpp index f02b967b..35739045 100644 --- a/languages/cpp/cppsupportpart.cpp +++ b/languages/cpp/cppsupportpart.cpp @@ -25,11 +25,11 @@ #include "ast_utils.h" #include "cppcodecompletion.h" #include "ccconfigwidget.h" -#include "TDevCppSupportIface.h" +#include "KDevCppSupportIface.h" #include "cppsupportfactory.h" #include "catalog.h" #include "cpp_tags.h" -#include "tdevdriver.h" +#include "kdevdriver.h" #include "cppcodecompletionconfig.h" #include "cppsplitheadersourceconfig.h" #include "tag_creator.h" @@ -37,10 +37,10 @@ #include "classgeneratorconfig.h" #include "urlutil.h" #include "creategettersetterconfiguration.h" -#include "tdevsourceformatter.h" -#include "tdevcreatefile.h" +#include "kdevsourceformatter.h" +#include "kdevcreatefile.h" #include "qtbuildconfig.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include #include // wizards @@ -93,14 +93,14 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include @@ -116,10 +116,10 @@ TQStringList CppSupportPart::m_headerMimeTypes = TQStringList() << "text/x-chdr" TQStringList CppSupportPart::m_sourceExtensions = TQStringList::split( ",", "c,C,cc,cpp,c++,cxx,m,mm,M" ); TQStringList CppSupportPart::m_headerExtensions = TQStringList::split( ",", "h,H,hh,h++,hxx,hpp,inl,tlh,diff,ui.h" ); -class CppDriver: public TDevDriver +class CppDriver: public KDevDriver { public: - CppDriver( CppSupportPart* cppSupport ) : TDevDriver( cppSupport, true ) + CppDriver( CppSupportPart* cppSupport ) : KDevDriver( cppSupport, true ) {} void fileParsed( ParsedFile& fileName ) @@ -192,7 +192,7 @@ public: CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStringList &args ) -: TDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "TDevCppSupport" ), m_backgroundParser(0), +: KDevLanguageSupport( CppSupportFactory::info(), parent, name ? name : "KDevCppSupport" ), m_backgroundParser(0), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_projectClosing( false ), m_valid( false ), m_isTyping( false ), m_hadErrors( false ), _jd(0) @@ -232,7 +232,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri m_saveMemoryTimer->start( 240000, false ); //Free some memory every 4 minutes // connect( m_functionHintTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotFunctionHint()) ); - setXMLFile( "tdevcppsupport.rc" ); + setXMLFile( "kdevcppsupport.rc" ); m_catalogList.setAutoDelete( true ); @@ -309,7 +309,7 @@ CppSupportPart::CppSupportPart( TQObject *parent, const char *name, const TQStri connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - new TDevCppSupportIface( this ); + new KDevCppSupportIface( this ); //(void) dcopClient(); m_lockupTester = new UIBlockTester( 100 ); @@ -611,7 +611,7 @@ void CppSupportPart::projectClosed( ) } DomUtil::writeListEntry( *project() ->projectDom(), "kdevcppsupport/references", "pcs", enabledPCSs ); - for ( TQMap::const_iterator it = m_designers.begin(); + for ( TQMap::const_iterator it = m_designers.begin(); it != m_designers.end(); ++it ) { kdDebug( 9007 ) << "calling save settings fro designer integration" << endl; @@ -840,7 +840,7 @@ void CppSupportPart::contextMenu( TQPopupMenu *popup, const Context *context ) { m_contextFileName = url.path(); int id = popup->insertItem( i18n( "Create or Select Implementation..." ), this, TQT_SLOT( slotCreateSubclass() ) ); - popup->setWhatsThis( id, i18n( "Create or select implementation

Creates or selects a subclass of selected form for use with integrated TDevDesigner." ) ); + popup->setWhatsThis( id, i18n( "Create or select implementation

Creates or selects a subclass of selected form for use with integrated KDevDesigner." ) ); } } } @@ -1342,7 +1342,7 @@ void CppSupportPart::jumpToCodeModelItem( const ItemDom& item, bool scrollOnly ) lastSyncedUrl = url; } -TDevLanguageSupport::Features CppSupportPart::features() +KDevLanguageSupport::Features CppSupportPart::features() { if ( withcpp ) return Features( Classes | Structs | Functions | Variables | Namespaces | Declarations @@ -2065,7 +2065,7 @@ void CppSupportPart::codeCompletionConfigStored( ) /* m_backgroundParser->updateParserConfiguration(); - TDevDriver* d = dynamic_cast( m_driver ); //The foreground-parse isn't used anymore, and could be removed + KDevDriver* d = dynamic_cast( m_driver ); //The foreground-parse isn't used anymore, and could be removed if( d ) { d->setup(); d->makeMacrosPersistent(); @@ -2144,7 +2144,7 @@ TQString CppSupportPart::formatModelItem( const CodeModelItem *item, bool shortD return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } void CppSupportPart::addClass() @@ -2677,7 +2677,7 @@ void CppSupportPart::slotCursorPositionChanged() { unsigned int line = 0; unsigned int column = 0; - if ( TDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast( partController()->activePart() ) ) ) + if ( KDevEditorUtil::currentPositionReal( &line, &column, dynamic_cast( partController()->activePart() ) ) ) { TQString typeInfoString = codeCompletion()->createTypeInfoString( line, column ); mainWindow()->statusBar()->message( typeInfoString ); @@ -2738,7 +2738,7 @@ void CppSupportPart::updateParserConfiguration() TQString conf_file_name = specialHeaderName(); m_driver->removeAllMacrosInFile( conf_file_name ); - dynamic_cast(m_driver)->setup(); + dynamic_cast(m_driver)->setup(); m_driver->parseFile( conf_file_name, true, true, true ); m_buildSafeFileSetTimer->start( 500, true ); @@ -2753,9 +2753,9 @@ Driver* CppSupportPart::driver() { return m_driver; } -TDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type ) +KDevDesignerIntegration * CppSupportPart::designer( KInterfaceDesigner::DesignerType type ) { - TDevDesignerIntegration * des = 0; + KDevDesignerIntegration * des = 0; switch ( type ) { case KInterfaceDesigner::Glade: @@ -2847,7 +2847,7 @@ void CppSupportPart::addMethod( ClassDom aClass, const TQString& name, const TQS TQFileInfo info( aClass->fileName() ); TQString implementationFile = info.dirPath( true ) + "/" + info.baseName() + ".cpp" ; TQFileInfo fileInfo( implementationFile ); - TDevCreateFile* createFileSupport = extension( "TDevelop/CreateFile" ); + KDevCreateFile* createFileSupport = extension( "TDevelop/CreateFile" ); if ( !TQFile::exists( fileInfo.absFilePath() ) && createFileSupport != 0 ) createFileSupport->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.baseName() ); diff --git a/languages/cpp/cppsupportpart.h b/languages/cpp/cppsupportpart.h index ec00cd9c..7de698c0 100644 --- a/languages/cpp/cppsupportpart.h +++ b/languages/cpp/cppsupportpart.h @@ -18,8 +18,8 @@ #ifndef _CPPSUPPORTPART_H_ #define _CPPSUPPORTPART_H_ -#include -#include +#include +#include #include #include @@ -153,7 +153,7 @@ private: SetType m_fileSet; }; -class CppSupportPart : public TDevLanguageSupport +class CppSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -243,7 +243,7 @@ public: //uses the old simple algorithm to find the header TQString findHeaderSimple( const TQString &header ); - virtual TDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); + virtual KDevDesignerIntegration *designer( KInterfaceDesigner::DesignerType type ); void setTyping( bool typing ); @@ -284,7 +284,7 @@ signals: void synchronousParseReady( const TQString& file, ParsedFilePointer unit ); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); virtual TQString formatClassName( const TQString &name ); virtual TQString unformatClassName( const TQString &name ); @@ -435,7 +435,7 @@ private: KTextEditor::ViewCursorInterface* m_activeViewCursor; TQString m_activeFileName; - TQMap m_designers; + TQMap m_designers; TQWaitCondition m_eventConsumed; bool m_projectClosed; @@ -623,7 +623,7 @@ private: static TQStringList m_sourceExtensions; static TQStringList m_headerExtensions; - friend class TDevCppSupportIface; + friend class KDevCppSupportIface; friend class CppDriver; // we need something to plug actions that are not in any menu diff --git a/languages/cpp/createpcsdialog.cpp b/languages/cpp/createpcsdialog.cpp index 0f390477..9cca7ef8 100644 --- a/languages/cpp/createpcsdialog.cpp +++ b/languages/cpp/createpcsdialog.cpp @@ -17,8 +17,8 @@ #include "setuphelper.h" #include -#include -#include +#include +#include #include @@ -132,12 +132,12 @@ private: class PCSListViewItem: public TDEListViewItem { public: - PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListViewItem* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListViewItem* parent ) : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); } - PCSListViewItem( KService::Ptr ptr, TDevPCSImporter* importer, TQListView* parent ) + PCSListViewItem( KService::Ptr ptr, KDevPCSImporter* importer, TQListView* parent ) : TDEListViewItem( parent ), m_importer( importer ) { init( ptr ); @@ -155,13 +155,13 @@ public: setPixmap( 0, SmallIcon( ptr->icon() ) ); } - TDevPCSImporter* importer() + KDevPCSImporter* importer() { return m_importer; } private: - TDevPCSImporter* m_importer; + KDevPCSImporter* m_importer; }; class CreatePCSDialog::PCSJobData @@ -212,7 +212,7 @@ CreatePCSDialog::CreatePCSDialog( CppSupportPart* part, TQWidget* parent, const KService::Ptr ptr = *it; int error = 0; - TDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); + KDevPCSImporter* importer = KParts::ComponentFactory::createInstanceFromService( ptr, TQT_TQOBJECT(this), ptr->name().latin1(), TQStringList(), &error ); if ( importer ) { new PCSListViewItem( ptr, importer, importerListView ); @@ -272,7 +272,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) if ( m_settings ) delete( m_settings ); - TDevPCSImporter* importer = static_cast( importerListView->selectedItem() ) ->importer(); + KDevPCSImporter* importer = static_cast( importerListView->selectedItem() ) ->importer(); m_settings = importer->createSettingsPage( settingsPage ); setNextEnabled( currentPage(), false ); setHelpEnabled( currentPage(), false ); @@ -286,7 +286,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) } else if ( currentPage() == descriptionPage ) { - TDevPCSImporter* importer = static_cast( importerListView->selectedItem() )->importer(); + KDevPCSImporter* importer = static_cast( importerListView->selectedItem() )->importer(); filename_edit->setText( importer->dbName() ); } else if ( currentPage() == finalPage ) @@ -294,7 +294,7 @@ void CreatePCSDialog::slotSelected( const TQString & ) setBackEnabled( currentPage(), false ); setNextEnabled( currentPage(), false ); - TDevPCSImporter* importer = static_cast( importerListView->selectedItem() )->importer(); + KDevPCSImporter* importer = static_cast( importerListView->selectedItem() )->importer(); TQStringList fileList = importer->fileList(); progressBar->setTotalSteps( fileList.size() ); progressBar->setPercentageVisible( true ); diff --git a/languages/cpp/debugger/CMakeLists.txt b/languages/cpp/debugger/CMakeLists.txt index d5b91df2..4b660c1d 100644 --- a/languages/cpp/debugger/CMakeLists.txt +++ b/languages/cpp/debugger/CMakeLists.txt @@ -33,13 +33,13 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger ) +install( FILES kdevdebugger.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdebugger.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger ) -##### libtdevdebugger (module) ################## +##### libkdevdebugger (module) ################## -tde_add_kpart( libtdevdebugger AUTOMOC +tde_add_kpart( libkdevdebugger AUTOMOC SOURCES debuggerdcopinterface.skel debuggerpart.cpp dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp @@ -50,6 +50,6 @@ tde_add_kpart( libtdevdebugger AUTOMOC debuggerconfigwidgetbase.ui debuggertracingdialogbase.ui gdboutputwidget.cpp gdbtable.cpp debuggertracingdialog.cpp label_with_double_click.cpp - LINK gdbmi_parser-shared lang_debugger-shared tdevwidgets-shared tdevelop-shared + LINK gdbmi_parser-shared lang_debugger-shared kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/debugger/Makefile.am b/languages/cpp/debugger/Makefile.am index 40aba33a..09c147ad 100644 --- a/languages/cpp/debugger/Makefile.am +++ b/languages/cpp/debugger/Makefile.am @@ -7,13 +7,13 @@ 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 = libtdevdebugger.la -libtdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) \ +kde_module_LTLIBRARIES = libkdevdebugger.la +libkdevdebugger_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdebugger_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) \ $(top_builddir)/languages/lib/debugger/liblang_debugger.la \ $(top_builddir)/languages/cpp/debugger/mi/libgdbmi_parser.la -libtdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \ +libkdevdebugger_la_SOURCES = debuggerdcopinterface.skel debuggerpart.cpp \ dbgcontroller.cpp gdbcontroller.cpp gdbcommand.cpp \ gdbparser.cpp stty.cpp breakpoint.cpp variablewidget.cpp \ gdbbreakpointwidget.cpp framestackwidget.cpp disassemblewidget.cpp \ @@ -26,8 +26,8 @@ METASOURCES = AUTO KDE_ICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdebugger.desktop +service_DATA = kdevdebugger.desktop -rcdir = $(kde_datadir)/tdevdebugger -rc_DATA = tdevdebugger.rc +rcdir = $(kde_datadir)/kdevdebugger +rc_DATA = kdevdebugger.rc noinst_HEADERS = gdbtable.h diff --git a/languages/cpp/debugger/debuggerconfigwidget.cpp b/languages/cpp/debugger/debuggerconfigwidget.cpp index dab4486b..2b8523ae 100644 --- a/languages/cpp/debugger/debuggerconfigwidget.cpp +++ b/languages/cpp/debugger/debuggerconfigwidget.cpp @@ -14,7 +14,7 @@ #include "debuggerconfigwidget.h" #include "debuggerpart.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "domutil.h" #include diff --git a/languages/cpp/debugger/debuggerpart.cpp b/languages/cpp/debugger/debuggerpart.cpp index f2379ccb..3cae3762 100644 --- a/languages/cpp/debugger/debuggerpart.cpp +++ b/languages/cpp/debugger/debuggerpart.cpp @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include @@ -37,12 +37,12 @@ #include #include -#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 "gdbbreakpointwidget.h" @@ -61,7 +61,7 @@ #include -#include +#include #include @@ -71,13 +71,13 @@ namespace GDBDebugger { -static const TDevPluginInfo data("tdevdebugger"); +static const KDevPluginInfo data("kdevdebugger"); -typedef TDevGenericFactory DebuggerFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevdebugger, DebuggerFactory( data ) ) +typedef KDevGenericFactory DebuggerFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevdebugger, DebuggerFactory( data ) ) DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringList & ) : - TDevPlugin( &data, parent, name ? name : "DebuggerPart" ), + KDevPlugin( &data, parent, name ? name : "DebuggerPart" ), controller(0), previousDebuggerState_(s_dbgNotStarted), justRestarted_(false), needRebuild_(true), running_(false) @@ -85,7 +85,7 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi setObjId("DebuggerInterface"); setInstance(DebuggerFactory::instance()); - setXMLFile("tdevdebugger.rc"); + setXMLFile("kdevdebugger.rc"); m_debugger = new Debugger( partController() ); @@ -333,8 +333,8 @@ DebuggerPart::DebuggerPart( TQObject *parent, const char *name, const TQStringLi 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()) ); @@ -858,7 +858,7 @@ void DebuggerPart::slotRun() if (rebuild) { disconnect(TQT_SIGNAL(buildProject())); - // The TDevProject has no method to build the project, + // The KDevProject has no method to build the project, // so try connecting to a slot has is present to all // existing project managers. // Note: this assumes that 'slotBuild' will save @@ -984,7 +984,7 @@ bool DebuggerPart::attachProcess(int pid) } -void DebuggerPart::slotStop(TDevPlugin* which) +void DebuggerPart::slotStop(KDevPlugin* which) { if( which != 0 && which != this ) return; @@ -1259,12 +1259,12 @@ bool DebuggerPart::haveModifiedFiles() } -TDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( ) +KDevAppFrontend * GDBDebugger::DebuggerPart::appFrontend( ) { - return extension("TDevelop/AppFrontend"); + return extension("TDevelop/AppFrontend"); } -TDevDebugger * GDBDebugger::DebuggerPart::debugger() +KDevDebugger * GDBDebugger::DebuggerPart::debugger() { return m_debugger; } diff --git a/languages/cpp/debugger/debuggerpart.h b/languages/cpp/debugger/debuggerpart.h index f1f27d23..50479249 100644 --- a/languages/cpp/debugger/debuggerpart.h +++ b/languages/cpp/debugger/debuggerpart.h @@ -15,8 +15,8 @@ #define _DEBUGGERPART_H_ #include -#include "tdevplugin.h" -#include "tdevcore.h" +#include "kdevplugin.h" +#include "kdevcore.h" #include "gdbcontroller.h" #include "debuggerdcopinterface.h" @@ -28,8 +28,8 @@ class TQPopupMenu; class KDialogBase; class ProcessWidget; class ProcessLineMaker; -class TDevAppFrontend; -class TDevDebugger; +class KDevAppFrontend; +class KDevDebugger; namespace GDBDebugger { @@ -44,7 +44,7 @@ class VariableWidget; class GDBOutputWidget; class ViewerWidget; -class DebuggerPart : public TDevPlugin, virtual public DebuggerDCOPInterface +class DebuggerPart : public KDevPlugin, virtual public DebuggerDCOPInterface { Q_OBJECT @@ -82,7 +82,7 @@ private slots: void slotExamineCore(); void slotAttachProcess(); void slotStopDebugger(); - void slotStop(TDevPlugin* which = 0); + void slotStop(KDevPlugin* which = 0); void slotPause(); void slotRunToCursor(); void slotJumpToCursor(); @@ -116,8 +116,8 @@ private slots: void slotEvent(GDBController::event_t); private: - TDevAppFrontend *appFrontend(); - TDevDebugger *debugger(); + KDevAppFrontend *appFrontend(); + KDevDebugger *debugger(); bool attachProcess(int pid); bool startDebugger(); @@ -139,7 +139,7 @@ private: TQString m_contextIdent; TQCString m_drkonqi; - TDevDebugger *m_debugger; + KDevDebugger *m_debugger; int previousDebuggerState_; // Set to true after each debugger restart // Currently used to auto-show variables view diff --git a/languages/cpp/debugger/tdevdebugger.desktop b/languages/cpp/debugger/kdevdebugger.desktop similarity index 99% rename from languages/cpp/debugger/tdevdebugger.desktop rename to languages/cpp/debugger/kdevdebugger.desktop index 9db31510..beaf17f3 100644 --- a/languages/cpp/debugger/tdevdebugger.desktop +++ b/languages/cpp/debugger/kdevdebugger.desktop @@ -34,7 +34,7 @@ Comment[tg]=Ин модул дар GDB интерфейсро ба ихтиёр Comment[tr]=Bu eklenti, C, C++ ve daha fazlası için bir kaynak-düzeyinde hata ayıklayıcı olan GDB için bir önucu sağlar. http://sources.redhat.com/gdb/ Comment[zh_CN]=这个插件是一个 GDB 前端，一个 C、C++ 和其它语言的源代码调试器。http://sources.redhat.com/gdb/ Comment[zh_TW]=這個外掛程式提供 GDB 的前端介面。GDB 是一個 C/C++ 還有其它語言的除錯器。http://sources.redhat.com/gdb/ -Name=TDevDebugger +Name=KDevDebugger Name[da]=TDevelop Debugger Name[de]=Debugger (TDevelop) Name[hi]=के-डेव-डिबगर @@ -80,7 +80,7 @@ GenericName[zh_CN]=调试器前端 GenericName[zh_TW]=除錯器前端 Icon=debugger ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevdebugger +X-TDE-Library=libkdevdebugger X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CompiledDevelopment diff --git a/languages/cpp/debugger/tdevdebugger.rc b/languages/cpp/debugger/kdevdebugger.rc similarity index 98% rename from languages/cpp/debugger/tdevdebugger.rc rename to languages/cpp/debugger/kdevdebugger.rc index 99a10f3c..801cadb8 100644 --- a/languages/cpp/debugger/tdevdebugger.rc +++ b/languages/cpp/debugger/kdevdebugger.rc @@ -1,5 +1,5 @@ - +

&Debug diff --git a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop index fc68be33..54214a1b 100644 --- a/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop +++ b/languages/cpp/debugger/tests/breakpoints/breakpoints.tdevelop @@ -4,14 +4,14 @@ Vladimir Prus ghost@ghostwalk $VERSION$ - TDevCustomProject + KDevCustomProject C++ . false - + breakpoints executable @@ -38,8 +38,8 @@ - - + + @@ -56,8 +56,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -102,16 +102,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -143,8 +143,8 @@ true Vertical - - + + false false @@ -153,7 +153,7 @@ *.o,*.lo,CVS false - + .h diff --git a/languages/cpp/debugger/tests/dll/dll.tdevelop b/languages/cpp/debugger/tests/dll/dll.tdevelop index b875ae48..f92f1d08 100644 --- a/languages/cpp/debugger/tests/dll/dll.tdevelop +++ b/languages/cpp/debugger/tests/dll/dll.tdevelop @@ -4,14 +4,14 @@ Vladimir Prus ghost@ghostwalk $VERSION$ - TDevCustomProject + KDevCustomProject C++ . false - + main executable @@ -38,8 +38,8 @@ - - + + @@ -56,8 +56,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -102,22 +102,22 @@ KDE Libraries (Doxygen) - - + + - + .h .cpp - + false 3 @@ -144,8 +144,8 @@ true - - + + false false @@ -154,5 +154,5 @@ *.o,*.lo,CVS false - + diff --git a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop index 3096faea..267a73d8 100644 --- a/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop +++ b/languages/cpp/debugger/tests/infinite_loop/infinite_loop.tdevelop @@ -4,22 +4,22 @@ Vladimir Prus ghost@zigzag $VERSION$ - TDevCustomProject + KDevCustomProject C++ - + infinite_loop executable - - + + - - + + ada ada_bugs_gcc @@ -64,16 +64,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -95,8 +95,8 @@ true false - - + + false false @@ -105,5 +105,5 @@ *.o,*.lo,CVS false - + diff --git a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop index fc7f4d19..a838d09d 100644 --- a/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop +++ b/languages/cpp/debugger/tests/print_pointers/print_pointers.tdevelop @@ -4,7 +4,7 @@ Vladimir Prus ghost@cs.msu.su $VERSION$ - TDevCustomProject + KDevCustomProject C++ kdevsecurity @@ -18,7 +18,7 @@ print_pointers - + print_pointers executable @@ -62,8 +62,8 @@ CMakeLists.txt - - + + @@ -80,8 +80,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -126,22 +126,22 @@ KDE Libraries (Doxygen) - - + + - + .h .cpp - + true true @@ -185,7 +185,7 @@ 3 /usr/share/qt3 3 - EmbeddedTDevDesigner + EmbeddedKDevDesigner /usr/bin/qmake-qt3 /usr/bin/designer @@ -195,8 +195,8 @@ true Vertical - - + + false false @@ -205,8 +205,8 @@ *.o,*.lo,CVS false - - + + VisualBoyAdvance @@ -214,5 +214,5 @@ false -f0 -1 - + diff --git a/languages/cpp/debugger/tests/segfault/segfault.tdevelop b/languages/cpp/debugger/tests/segfault/segfault.tdevelop index e48ed4e4..4eccf2e1 100644 --- a/languages/cpp/debugger/tests/segfault/segfault.tdevelop +++ b/languages/cpp/debugger/tests/segfault/segfault.tdevelop @@ -4,14 +4,14 @@ Vladimir Prus ghost@zigzag $VERSION$ - TDevCustomProject + KDevCustomProject C++ . false - + segfault executable @@ -38,8 +38,8 @@ - - + + @@ -56,8 +56,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -102,16 +102,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -143,8 +143,8 @@ true Vertical - - + + false false @@ -153,7 +153,7 @@ *.o,*.lo,CVS false - + .h diff --git a/languages/cpp/debugger/tests/threads/threads.tdevelop b/languages/cpp/debugger/tests/threads/threads.tdevelop index c730bfc4..048b3aed 100644 --- a/languages/cpp/debugger/tests/threads/threads.tdevelop +++ b/languages/cpp/debugger/tests/threads/threads.tdevelop @@ -4,22 +4,22 @@ Vladimir Prus ghost@zigzag $VERSION$ - TDevCustomProject + KDevCustomProject C++ - + threads executable - - + + - - + + ada ada_bugs_gcc @@ -64,16 +64,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -87,8 +87,8 @@ 400 250 - - + + false false @@ -97,5 +97,5 @@ *.o,*.lo,CVS false - + diff --git a/languages/cpp/debugger/tests/tracing/tracing.tdevelop b/languages/cpp/debugger/tests/tracing/tracing.tdevelop index ab1846ef..56743de1 100644 --- a/languages/cpp/debugger/tests/tracing/tracing.tdevelop +++ b/languages/cpp/debugger/tests/tracing/tracing.tdevelop @@ -4,14 +4,14 @@ Vladimir Prus ghost@ghostwalk $VERSION$ - TDevCustomProject + KDevCustomProject C++ . false - + tracing executable @@ -38,8 +38,8 @@ - - + + @@ -56,8 +56,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -102,16 +102,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -143,8 +143,8 @@ true Vertical - - + + false false @@ -153,7 +153,7 @@ *.o,*.lo,CVS false - + .h diff --git a/languages/cpp/debugger/tests/two_module/two_module.tdevelop b/languages/cpp/debugger/tests/two_module/two_module.tdevelop index e4a9ae33..a6d22c2a 100644 --- a/languages/cpp/debugger/tests/two_module/two_module.tdevelop +++ b/languages/cpp/debugger/tests/two_module/two_module.tdevelop @@ -4,14 +4,14 @@ Vladimir Prus ghost@ghostwalk $VERSION$ - TDevCustomProject + KDevCustomProject C++ . false - + two_module executable @@ -38,8 +38,8 @@ - - + + @@ -56,8 +56,8 @@ true 10 - - + + ada ada_bugs_gcc @@ -102,16 +102,16 @@ KDE Libraries (Doxygen) - - + + - - + + true @@ -143,8 +143,8 @@ true Vertical - - + + false false @@ -153,7 +153,7 @@ *.o,*.lo,CVS false - + .h diff --git a/languages/cpp/doc/CMakeLists.txt b/languages/cpp/doc/CMakeLists.txt index a6371ae2..9a2b4e11 100644 --- a/languages/cpp/doc/CMakeLists.txt +++ b/languages/cpp/doc/CMakeLists.txt @@ -10,8 +10,8 @@ ################################################# install( FILES - libc.toc libstdc++.toc tdetemplates.toc stl.toc - qt-tdev3.toc tde2book.toc gnustep.toc gnome1.toc + libc.toc libstdc++.toc kdetemplates.toc stl.toc + qt-kdev3.toc kde2book.toc gnustep.toc gnome1.toc clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc wxwidgets_bugs.toc cppannotations.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/cpp/doc/Makefile.am b/languages/cpp/doc/Makefile.am index cf1ecd60..55571124 100644 --- a/languages/cpp/doc/Makefile.am +++ b/languages/cpp/doc/Makefile.am @@ -1,5 +1,5 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs -toc_DATA = libc.toc libstdc++.toc tdetemplates.toc stl.toc qt-tdev3.toc tde2book.toc \ +tocdir = ${kde_datadir}/kdevdocumentation/tocs +toc_DATA = libc.toc libstdc++.toc kdetemplates.toc stl.toc qt-kdev3.toc kde2book.toc \ gnustep.toc gnome1.toc clanlib.toc c++_bugs_gcc.toc gtk_bugs.toc wxwidgets_bugs.toc \ cppannotations.toc diff --git a/languages/cpp/doc/clanlib.toc b/languages/cpp/doc/clanlib.toc index 82cfe409..2cad8dcd 100644 --- a/languages/cpp/doc/clanlib.toc +++ b/languages/cpp/doc/clanlib.toc @@ -7,7 +7,7 @@ - + diff --git a/languages/cpp/doc/gnome1.toc b/languages/cpp/doc/gnome1.toc index 3cb995d3..577d61af 100644 --- a/languages/cpp/doc/gnome1.toc +++ b/languages/cpp/doc/gnome1.toc @@ -124,7 +124,7 @@ - + diff --git a/languages/cpp/doc/tde2book.toc b/languages/cpp/doc/kde2book.toc similarity index 98% rename from languages/cpp/doc/tde2book.toc rename to languages/cpp/doc/kde2book.toc index 79ceb137..d806e440 100644 --- a/languages/cpp/doc/tde2book.toc +++ b/languages/cpp/doc/kde2book.toc @@ -472,15 +472,15 @@ - - + + - - + + @@ -667,7 +667,7 @@ - + @@ -897,7 +897,7 @@ - + @@ -912,7 +912,7 @@ - + @@ -1061,7 +1061,7 @@ - + @@ -1170,8 +1170,8 @@ - - + + @@ -1637,7 +1637,7 @@ - + @@ -2149,7 +2149,7 @@ - + @@ -2259,7 +2259,7 @@ - + @@ -2313,14 +2313,14 @@ - - - - - - - - + + + + + + + + @@ -2353,8 +2353,8 @@ - - + + @@ -2463,13 +2463,13 @@ - - - - - - - + + + + + + + @@ -2479,17 +2479,17 @@ - - - - + + + + - - - - - + + + + + @@ -2836,8 +2836,8 @@ - - + + diff --git a/languages/cpp/doc/tdetemplates.toc b/languages/cpp/doc/kdetemplates.toc similarity index 100% rename from languages/cpp/doc/tdetemplates.toc rename to languages/cpp/doc/kdetemplates.toc diff --git a/languages/cpp/doc/qt-tdev3.toc b/languages/cpp/doc/qt-kdev3.toc similarity index 76% rename from languages/cpp/doc/qt-tdev3.toc rename to languages/cpp/doc/qt-kdev3.toc index 3f6ffff0..af086cf5 100644 --- a/languages/cpp/doc/qt-tdev3.toc +++ b/languages/cpp/doc/qt-kdev3.toc @@ -1,6 +1,6 @@ -Qt Designer-3 and TDevelop-3 +Qt Designer-3 and KDevelop-3 @@ -8,7 +8,7 @@ - + @@ -16,9 +16,9 @@ - + - + @@ -26,13 +26,13 @@ - + - - + + diff --git a/languages/cpp/file_templates/CMakeLists.txt b/languages/cpp/file_templates/CMakeLists.txt index f7dbfda7..17909c7d 100644 --- a/languages/cpp/file_templates/CMakeLists.txt +++ b/languages/cpp/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES c cpp h l ll y yy - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/cpp/file_templates/Makefile.am b/languages/cpp/file_templates/Makefile.am index 722d3091..d688d547 100644 --- a/languages/cpp/file_templates/Makefile.am +++ b/languages/cpp/file_templates/Makefile.am @@ -1,3 +1,3 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = c cpp h l ll y yy diff --git a/languages/cpp/tdevcppsupport.desktop b/languages/cpp/kdevcppsupport.desktop similarity index 98% rename from languages/cpp/tdevcppsupport.desktop rename to languages/cpp/kdevcppsupport.desktop index 93a99f59..cd638819 100644 --- a/languages/cpp/tdevcppsupport.desktop +++ b/languages/cpp/kdevcppsupport.desktop @@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони C++ Comment[tr]=C++ Desteği Comment[zh_CN]=C++ 支持 Comment[zh_TW]=C++ 支援 -Name=TDevCppSupport +Name=KDevCppSupport Name[da]=TDevelop C++ understøttelse Name[hi]=के-डेव-सीपीपी-समर्थन Name[nds]=CPP-Ünnerstütten för TDevelop @@ -80,7 +80,7 @@ GenericName[zh_CN]=C++ 支持 GenericName[zh_TW]=C++ 支援 ServiceTypes=TDevelop/LanguageSupport Icon=source_cpp -X-TDE-Library=libtdevcppsupport +X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C++ X-TDevelop-Args=Cpp diff --git a/languages/cpp/tdevcppsupport.rc b/languages/cpp/kdevcppsupport.rc similarity index 93% rename from languages/cpp/tdevcppsupport.rc rename to languages/cpp/kdevcppsupport.rc index 1bfcf5a8..37e3fa3a 100644 --- a/languages/cpp/tdevcppsupport.rc +++ b/languages/cpp/kdevcppsupport.rc @@ -1,5 +1,5 @@ - + diff --git a/languages/cpp/tdevcsupport.desktop b/languages/cpp/kdevcsupport.desktop similarity index 98% rename from languages/cpp/tdevcsupport.desktop rename to languages/cpp/kdevcsupport.desktop index 7c196ef0..cc54dd73 100644 --- a/languages/cpp/tdevcsupport.desktop +++ b/languages/cpp/kdevcsupport.desktop @@ -79,7 +79,7 @@ GenericName[zh_CN]=C 支持 GenericName[zh_TW]=C 支援 ServiceTypes=TDevelop/LanguageSupport Icon=source_cpp -X-TDE-Library=libtdevcppsupport +X-TDE-Library=libkdevcppsupport X-TDevelop-Version=5 X-TDevelop-Language=C X-TDevelop-Args=C diff --git a/languages/cpp/tdevdeepcopy.h b/languages/cpp/kdevdeepcopy.h similarity index 81% rename from languages/cpp/tdevdeepcopy.h rename to languages/cpp/kdevdeepcopy.h index 3b5d6995..c29ee1e1 100644 --- a/languages/cpp/tdevdeepcopy.h +++ b/languages/cpp/kdevdeepcopy.h @@ -1,5 +1,5 @@ -#ifndef TDEVDEEPCOPY_H -#define TDEVDEEPCOPY_H +#ifndef KDEVDEEPCOPY_H +#define KDEVDEEPCOPY_H #include diff --git a/languages/cpp/tdevdriver.cpp b/languages/cpp/kdevdriver.cpp similarity index 92% rename from languages/cpp/tdevdriver.cpp rename to languages/cpp/kdevdriver.cpp index f2ac1ddb..4a6c45ec 100644 --- a/languages/cpp/tdevdriver.cpp +++ b/languages/cpp/kdevdriver.cpp @@ -1,14 +1,14 @@ #include "tdelocale.h" /* defines [function] i18n */ #include -#include "tdevdriver.h" +#include "kdevdriver.h" #include "cppcodecompletionconfig.h" #include "setuphelper.h" #include #include "includepathresolver.h" -TDevDriver::TDevDriver( CppSupportPart* cppSupport, bool foreground ) +KDevDriver::KDevDriver( CppSupportPart* cppSupport, bool foreground ) : m_cppSupport( cppSupport ), m_includePathResolver(0), m_foreground(foreground), m_shouldParseIncludedFiles(true) { //setupProject(); @@ -16,13 +16,13 @@ TDevDriver::TDevDriver( CppSupportPart* cppSupport, bool foreground ) } -TDevDriver::~TDevDriver() { +KDevDriver::~KDevDriver() { delete m_includePathResolver; } -CppSupportPart* TDevDriver::cppSupport() { return m_cppSupport; } +CppSupportPart* KDevDriver::cppSupport() { return m_cppSupport; } -void TDevDriver::setupProject() +void KDevDriver::setupProject() { TQMap map; @@ -43,7 +43,7 @@ void TDevDriver::setupProject() } } -void TDevDriver::setupLexer( Lexer* lexer ) +void KDevDriver::setupLexer( Lexer* lexer ) { Driver::setupLexer( lexer ); lexer->setReportMessages( true ); @@ -52,7 +52,7 @@ void TDevDriver::setupLexer( Lexer* lexer ) //! setup the preprocessor //! code provided by Reginald Stadlbauer -void TDevDriver::setup() +void KDevDriver::setup() { if( lexerCache() ) lexerCache()->clear(); ///Clear the lexer-cache so missing headers get a chance to be parsed clearMacros(); @@ -167,9 +167,9 @@ void TDevDriver::setup() m_shouldParseIncludedFiles = cfg->parseMissingHeaders(); } -TQStringList TDevDriver::getCustomIncludePath( const TQString& file ) { +TQStringList KDevDriver::getCustomIncludePath( const TQString& file ) { if( !file.startsWith("/") ) - kdDebug( 9007 ) << "TDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; + kdDebug( 9007 ) << "KDevDriver::getCustomIncludePath(..): given file \"" << file << "\" is not absolute" << endl; if( !m_includePathResolver ) return includePaths(); CppTools::PathResolutionResult res = m_includePathResolver->resolveIncludePath( file ); @@ -183,7 +183,7 @@ TQStringList TDevDriver::getCustomIncludePath( const TQString& file ) { return res.path + includePaths(); } -bool TDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { +bool KDevDriver::shouldParseIncludedFile( const ParsedFilePointer& file ) { TQString compoundString = file->fileName() + "||" + TQString("%1").arg(file->usedMacros().valueHash()) + "||" + TQString("%1").arg(file->usedMacros().idHash()); if( !m_shouldParseIncludedFiles ) diff --git a/languages/cpp/tdevdriver.h b/languages/cpp/kdevdriver.h similarity index 86% rename from languages/cpp/tdevdriver.h rename to languages/cpp/kdevdriver.h index 46c7d515..8af87e0c 100644 --- a/languages/cpp/tdevdriver.h +++ b/languages/cpp/kdevdriver.h @@ -1,11 +1,11 @@ -#ifndef __tdevdriver_h -#define __tdevdriver_h +#ifndef __kdevdriver_h +#define __kdevdriver_h #include "cppsupportpart.h" #include "driver.h" -#include +#include #include #include @@ -17,12 +17,12 @@ namespace CppTools { class IncludePathResolver; }; -class TDevDriver: public Driver +class KDevDriver: public Driver { public: ///When the driver is used in a background-thread, foreground MUST be false(else crash) - TDevDriver( CppSupportPart* cppSupport, bool foreground = false ); - ~TDevDriver(); + KDevDriver( CppSupportPart* cppSupport, bool foreground = false ); + ~KDevDriver(); CppSupportPart* cppSupport(); void setupProject(); //! setup the preprocessor diff --git a/languages/cpp/newclass_templates/CMakeLists.txt b/languages/cpp/newclass_templates/CMakeLists.txt index 7847d9a7..73b9bff5 100644 --- a/languages/cpp/newclass_templates/CMakeLists.txt +++ b/languages/cpp/newclass_templates/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES cpp_header cpp_source gtk_header gtk_source objc_header objc_source - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/newclass ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/newclass ) diff --git a/languages/cpp/newclass_templates/Makefile.am b/languages/cpp/newclass_templates/Makefile.am index 2b47443f..5b013d27 100644 --- a/languages/cpp/newclass_templates/Makefile.am +++ b/languages/cpp/newclass_templates/Makefile.am @@ -1,4 +1,4 @@ -cppsupportdatadir = ${kde_datadir}/tdevcppsupport +cppsupportdatadir = ${kde_datadir}/kdevcppsupport newclassdir = ${cppsupportdatadir}/newclass newclass_DATA = cpp_header cpp_source gtk_header gtk_source objc_header objc_source diff --git a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt index 90652509..c2e07bdb 100644 --- a/languages/cpp/pcsimporter/customimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/customimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpcscustomimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevcustompcsimporter (module) ######### +##### libkdevcustompcsimporter (module) ######### -tde_add_kpart( libtdevcustompcsimporter AUTOMOC +tde_add_kpart( libkdevcustompcsimporter AUTOMOC SOURCES - tdevcustomimporter.cpp settingsdialog.cpp + kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/customimporter/Makefile.am b/languages/cpp/pcsimporter/customimporter/Makefile.am index 1a6c1f1d..7e6a7093 100644 --- a/languages/cpp/pcsimporter/customimporter/Makefile.am +++ b/languages/cpp/pcsimporter/customimporter/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevcustompcsimporter.la +kde_module_LTLIBRARIES = libkdevcustompcsimporter.la -noinst_HEADERS = tdevcustomimporter.h -libtdevcustompcsimporter_la_SOURCES = tdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui -libtdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevcustomimporter.h +libkdevcustompcsimporter_la_SOURCES = kdevcustomimporter.cpp settingsdialog.cpp settingsdialogbase.ui +libkdevcustompcsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -kde_services_DATA = tdevpcscustomimporter.desktop +libkdevcustompcsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +kde_services_DATA = kdevpcscustomimporter.desktop diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp similarity index 80% rename from languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp rename to languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp index 33a2bf40..38a41eb8 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.cpp +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.cpp @@ -7,7 +7,7 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#include "tdevcustomimporter.h" +#include "kdevcustomimporter.h" #include "settingsdialog.h" @@ -17,24 +17,24 @@ #include #include -K_EXPORT_COMPONENT_FACTORY( libtdevcustompcsimporter, KGenericFactory( "tdevcustompcsimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevcustompcsimporter, KGenericFactory( "kdevcustompcsimporter" ) ) -TDevCustomImporter::TDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args +KDevCustomImporter::KDevCustomImporter( TQObject* parent, const char* name, const TQStringList & // args ) - : TDevPCSImporter( parent, name ) + : KDevPCSImporter( parent, name ) {} -TDevCustomImporter::~TDevCustomImporter() +KDevCustomImporter::~KDevCustomImporter() {} -TQString TDevCustomImporter::dbName() const +TQString KDevCustomImporter::dbName() const { return m_settings->dbName(); } -TQStringList TDevCustomImporter::fileList( const TQString& path ) +TQStringList KDevCustomImporter::fileList( const TQString& path ) { TQDir dir( path ); if ( !dir.exists() ) @@ -49,7 +49,7 @@ TQStringList TDevCustomImporter::fileList( const TQString& path ) return fileList; } -TQStringList TDevCustomImporter::fileList() +TQStringList KDevCustomImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -67,7 +67,7 @@ TQStringList TDevCustomImporter::fileList() return files; } -TQStringList TDevCustomImporter::includePaths() +TQStringList KDevCustomImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -75,13 +75,13 @@ TQStringList TDevCustomImporter::includePaths() return m_settings->dirs(); } -TQWidget* TDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) +TQWidget* KDevCustomImporter::createSettingsPage( TQWidget* parent, const char* name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; } -void TDevCustomImporter::processDir( const TQString path, TQStringList & files ) +void KDevCustomImporter::processDir( const TQString path, TQStringList & files ) { TQValueStack s; s.push( path ); @@ -114,5 +114,5 @@ void TDevCustomImporter::processDir( const TQString path, TQStringList & files ) while ( !s.isEmpty() ); } -#include "tdevcustomimporter.moc" +#include "kdevcustomimporter.moc" //kate: indent-mode csands; tab-width 4; space-indent off; diff --git a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h similarity index 83% rename from languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h rename to languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h index 925e42f9..884a033d 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevcustomimporter.h +++ b/languages/cpp/pcsimporter/customimporter/kdevcustomimporter.h @@ -7,23 +7,23 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#ifndef TDEVCUSTOMIMPORTER_H -#define TDEVCUSTOMIMPORTER_H +#ifndef KDEVCUSTOMIMPORTER_H +#define KDEVCUSTOMIMPORTER_H -#include "tdevpcsimporter.h" +#include "kdevpcsimporter.h" #include class SettingsDialog; -class TDevCustomImporter : public TDevPCSImporter +class KDevCustomImporter : public KDevPCSImporter { Q_OBJECT public: - TDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); + KDevCustomImporter(TQObject* parent = 0, const char* name = 0, const TQStringList &args = TQStringList()); - ~TDevCustomImporter(); + ~KDevCustomImporter(); virtual TQString dbName() const; virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop similarity index 97% rename from languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop rename to languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop index 50530ef8..b351a8e3 100644 --- a/languages/cpp/pcsimporter/customimporter/tdevpcscustomimporter.desktop +++ b/languages/cpp/pcsimporter/customimporter/kdevpcscustomimporter.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Name=TDevPCSCustomImporter +Name=KDevPCSCustomImporter Name[da]=TDevelop brugerdefineret PCS-importør Name[nds]=EgenPCS-Import för TDevelop Name[pl]=KDevWłasnyImportPCS @@ -40,5 +40,5 @@ Comment[zh_CN]=TDevelop 自定义目录的 PCS 导入器 Comment[zh_TW]=TDevelop 自訂目錄 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevcustompcsimporter +X-TDE-Library=libkdevcustompcsimporter X-TDevelop-PCSImporter= diff --git a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt index 908c66fc..8e29fdec 100644 --- a/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt +++ b/languages/cpp/pcsimporter/qt4importer/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevqt4importer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevqt4importer (module) ############### +##### libkdevqt4importer (module) ############### -tde_add_kpart( libtdevqt4importer AUTOMOC +tde_add_kpart( libkdevqt4importer AUTOMOC SOURCES - tdevqt4importer.cpp settingsdialogbase.ui + kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/qt4importer/Makefile.am b/languages/cpp/pcsimporter/qt4importer/Makefile.am index 935c7d49..12f12104 100644 --- a/languages/cpp/pcsimporter/qt4importer/Makefile.am +++ b/languages/cpp/pcsimporter/qt4importer/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevqt4importer.la +kde_module_LTLIBRARIES = libkdevqt4importer.la -noinst_HEADERS = tdevqt4importer.h settingsdialog.h -libtdevqt4importer_la_SOURCES = tdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevqt4importer.desktop -libtdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevqt4importer.h settingsdialog.h +libkdevqt4importer_la_SOURCES = kdevqt4importer.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevqt4importer.desktop +libkdevqt4importer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevqt4importer_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp similarity index 85% rename from languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp rename to languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp index fefa57ee..0289c7a4 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.cpp +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevqt4importer.h" -#include "tdevqt4importer.moc" +#include "kdevqt4importer.h" +#include "kdevqt4importer.moc" #include "settingsdialog.h" #include @@ -22,15 +22,15 @@ #include #include -K_EXPORT_COMPONENT_FACTORY( libtdevqt4importer, KGenericFactory( "tdevqt4importer" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqt4importer, KGenericFactory( "kdevqt4importer" ) ) -TDevQt4Importer::TDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevQt4Importer::KDevQt4Importer( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) { m_qtfile = 0; } -TDevQt4Importer::~TDevQt4Importer() +KDevQt4Importer::~KDevQt4Importer() { if (m_qtfile) delete m_qtfile; @@ -38,7 +38,7 @@ TDevQt4Importer::~TDevQt4Importer() m_qtfile = 0; } -TQStringList TDevQt4Importer::fileList() +TQStringList KDevQt4Importer::fileList() { if( !m_settings ) return TQStringList(); @@ -86,7 +86,7 @@ TQStringList TDevQt4Importer::fileList() return m_qtfile->name(); } -TQStringList TDevQt4Importer::includePaths() +TQStringList KDevQt4Importer::includePaths() { if( !m_settings || !m_qtfile) return TQStringList(); @@ -99,7 +99,7 @@ TQStringList TDevQt4Importer::includePaths() return includePaths; } -TQWidget * TDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevQt4Importer::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop similarity index 91% rename from languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop rename to languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop index cf42c497..5d91d917 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.desktop +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Service -Name=TDevQt4Importer +Name=KDevQt4Importer Name[de]=Qt4-PCS-Import (TDevelop) -Name[fr]=TDevQtImporter +Name[fr]=KDevQtImporter Name[nds]=Qt4-PCS-Import (TDevelop) -Name[ru]=TDevQt 4Importer +Name[ru]=KDevQt 4Importer Name[sv]=TDevelop QT4-import Comment=TDevelop Qt4 PCS Importer Comment[ca]=Importador PCS de Qt4 per a TDevelop @@ -29,6 +29,6 @@ Comment[sv]=TDevelop QT4 PCS-import Comment[zh_TW]=TDevelop Qt4 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevqt4importer +X-TDE-Library=libkdevqt4importer X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h similarity index 84% rename from languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h rename to languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h index 53f6a18e..3b9563f3 100644 --- a/languages/cpp/pcsimporter/qt4importer/tdevqt4importer.h +++ b/languages/cpp/pcsimporter/qt4importer/kdevqt4importer.h @@ -9,22 +9,22 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include +#include #include class SettingsDialog; class KTempFile; -class TDevQt4Importer : public TDevPCSImporter +class KDevQt4Importer : public KDevPCSImporter { Q_OBJECT public: - TDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevQt4Importer(); + KDevQt4Importer( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevQt4Importer(); virtual TQString dbName() const { return TQString::fromLatin1("TQt4"); } virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt index 9af966d9..64e95d39 100644 --- a/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/qtimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevqtimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevqtimporter (module) ################ +##### libkdevqtimporter (module) ################ -tde_add_kpart( libtdevqtimporter AUTOMOC +tde_add_kpart( libkdevqtimporter AUTOMOC SOURCES - tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp + kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/cpp/pcsimporter/qtimporter/Makefile.am b/languages/cpp/pcsimporter/qtimporter/Makefile.am index 23a60885..80ccc8be 100644 --- a/languages/cpp/pcsimporter/qtimporter/Makefile.am +++ b/languages/cpp/pcsimporter/qtimporter/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevqtimporter.la +kde_module_LTLIBRARIES = libkdevqtimporter.la -noinst_HEADERS = tdevqtimporter.h settingsdialog.h -libtdevqtimporter_la_SOURCES = tdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevqtimporter.desktop -libtdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevqtimporter.h settingsdialog.h +libkdevqtimporter_la_SOURCES = kdevqtimporter.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevqtimporter.desktop +libkdevqtimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevqtimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp similarity index 80% rename from languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp rename to languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp index b3b94019..62eb38fd 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.cpp +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevqtimporter.h" -#include "tdevqtimporter.moc" +#include "kdevqtimporter.h" +#include "kdevqtimporter.moc" #include "settingsdialog.h" #include @@ -18,16 +18,16 @@ #include #include -K_EXPORT_COMPONENT_FACTORY( libtdevqtimporter, KGenericFactory( "tdevqtimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevqtimporter, KGenericFactory( "kdevqtimporter" ) ) -TDevQtImporter::TDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevQtImporter::KDevQtImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} -TDevQtImporter::~TDevQtImporter() +KDevQtImporter::~KDevQtImporter() {} -TQStringList TDevQtImporter::fileList() +TQStringList KDevQtImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -50,7 +50,7 @@ TQStringList TDevQtImporter::fileList() return fileList; } -TQStringList TDevQtImporter::includePaths() +TQStringList KDevQtImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -64,7 +64,7 @@ TQStringList TDevQtImporter::includePaths() return includePaths; } -TQWidget * TDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevQtImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop similarity index 96% rename from languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop rename to languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop index f9b02306..72161838 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.desktop +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Service -Name=TDevQtImporter +Name=KDevQtImporter Name[da]=TDevelop Qt-importør Name[de]=Qt-PCS-Import (TDevelop) Name[hi]=के-डेव-क्यूटी-आयातक @@ -32,6 +32,6 @@ Comment[sv]=TDevelop QT3 PCS-import Comment[zh_TW]=TDevelop Qt3 PCS 匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevqtimporter +X-TDE-Library=libkdevqtimporter X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h similarity index 84% rename from languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h rename to languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h index 3f7d1ac8..bad9973e 100644 --- a/languages/cpp/pcsimporter/qtimporter/tdevqtimporter.h +++ b/languages/cpp/pcsimporter/qtimporter/kdevqtimporter.h @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include +#include #include class SettingsDialog; -class TDevQtImporter : public TDevPCSImporter +class KDevQtImporter : public KDevPCSImporter { Q_OBJECT public: - TDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevQtImporter(); + KDevQtImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevQtImporter(); virtual TQString dbName() const { return TQString::fromLatin1("TQt"); } virtual TQStringList fileList(); diff --git a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt index 4dbf0d0c..d48bad5a 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt +++ b/languages/cpp/pcsimporter/tdelibsimporter/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### other data ################################ -install( FILES tdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevtdelibsimporter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevtdelibsimporter (module) ########### +##### libkdevtdelibsimporter (module) ########### -tde_add_kpart( libtdevtdelibsimporter AUTOMOC +tde_add_kpart( libkdevtdelibsimporter AUTOMOC SOURCES - tdevtdelibsimporter.cpp settingsdialogbase.ui + kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp LINK lang_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am index e7c846d4..14efcabc 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am +++ b/languages/cpp/pcsimporter/tdelibsimporter/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/languages/lib/interfaces \ -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevtdelibsimporter.la +kde_module_LTLIBRARIES = libkdevtdelibsimporter.la -noinst_HEADERS = tdevtdelibsimporter.h settingsdialog.h -libtdevtdelibsimporter_la_SOURCES = tdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp -kde_services_DATA = tdevtdelibsimporter.desktop -libtdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +noinst_HEADERS = kdevtdelibsimporter.h settingsdialog.h +libkdevtdelibsimporter_la_SOURCES = kdevtdelibsimporter.cpp settingsdialogbase.ui settingsdialog.cpp +kde_services_DATA = kdevtdelibsimporter.desktop +libkdevtdelibsimporter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/languages/lib/interfaces/liblang_interfaces.la -libtdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevtdelibsimporter_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp similarity index 85% rename from languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp rename to languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp index 6f83e483..d3f5795b 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.cpp +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.cpp @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#include "tdevtdelibsimporter.h" -#include "tdevtdelibsimporter.moc" +#include "kdevtdelibsimporter.h" +#include "kdevtdelibsimporter.moc" #include "settingsdialog.h" #include @@ -21,16 +21,16 @@ #include #include -K_EXPORT_COMPONENT_FACTORY( libtdevtdelibsimporter, KGenericFactory( "tdevtdelibsimporter" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevtdelibsimporter, KGenericFactory( "kdevtdelibsimporter" ) ) -TDevTDELibsImporter::TDevTDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) - : TDevPCSImporter( parent, name ) +KDevKDELibsImporter::KDevKDELibsImporter( TQObject * parent, const char * name, const TQStringList& ) + : KDevPCSImporter( parent, name ) {} -TDevTDELibsImporter::~TDevTDELibsImporter() +KDevKDELibsImporter::~KDevKDELibsImporter() {} -TQStringList TDevTDELibsImporter::fileList( const TQString& path ) +TQStringList KDevKDELibsImporter::fileList( const TQString& path ) { TQDir dir( path ); TQStringList lst = dir.entryList( "*.h" ); @@ -43,7 +43,7 @@ TQStringList TDevTDELibsImporter::fileList( const TQString& path ) } -TQStringList TDevTDELibsImporter::fileList() +TQStringList KDevKDELibsImporter::fileList() { if ( !m_settings ) return TQStringList(); @@ -99,7 +99,7 @@ TQStringList TDevTDELibsImporter::fileList() return files; } -TQStringList TDevTDELibsImporter::includePaths() +TQStringList KDevKDELibsImporter::includePaths() { if ( !m_settings ) return TQStringList(); @@ -109,7 +109,7 @@ TQStringList TDevTDELibsImporter::includePaths() return includePaths; } -TQWidget * TDevTDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) +TQWidget * KDevKDELibsImporter::createSettingsPage( TQWidget * parent, const char * name ) { m_settings = new SettingsDialog( parent, name ); return m_settings; diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop similarity index 96% rename from languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop rename to languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop index 54cd2996..7433518e 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.desktop +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Service -Name=TDevTDELibsImporter +Name=KDevKDELibsImporter Name[da]=TDevelop KDELibs-importør Name[de]=KDELibs-PCS-Import (TDevelop) Name[hi]=के-डेव-केडीई-लिब्स-इम्पोर्टर Name[ja]=KDev KDE Name[nds]=KDELibs-PCS-Import (TDevelop) -Name[pl]=TDevTDEImportBib +Name[pl]=KDevKDEImportBib Name[sk]=KDev KDE import knižníc Name[sv]=TDevelop KDE-biblioteksimport Name[ta]=கெடெவ் கெடெலிப்ஸ் இறக்குமதியாளர் @@ -44,6 +44,6 @@ Comment[zh_CN]=TDevelop KDELibs PCS 导入器 Comment[zh_TW]=TDevelop KDE 函式庫匯入器 Icon=gear ServiceTypes=TDevelop/PCSImporter -X-TDE-Library=libtdevtdelibsimporter +X-TDE-Library=libkdevtdelibsimporter X-TDevelop-PCSImporter= X-TDevelop-Version=5 diff --git a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h similarity index 84% rename from languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h rename to languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h index 0d772bba..14fb7cff 100644 --- a/languages/cpp/pcsimporter/tdelibsimporter/tdevtdelibsimporter.h +++ b/languages/cpp/pcsimporter/tdelibsimporter/kdevtdelibsimporter.h @@ -9,21 +9,21 @@ * * ***************************************************************************/ -#ifndef TDEVTQTIMPORTER_H -#define TDEVTQTIMPORTER_H +#ifndef KDEVTQTIMPORTER_H +#define KDEVTQTIMPORTER_H -#include +#include #include class SettingsDialog; -class TDevTDELibsImporter : public TDevPCSImporter +class KDevKDELibsImporter : public KDevPCSImporter { Q_OBJECT public: - TDevTDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); - virtual ~TDevTDELibsImporter(); + KDevKDELibsImporter( TQObject* parent=0, const char* name=0, const TQStringList& args=TQStringList() ); + virtual ~KDevKDELibsImporter(); virtual TQString dbName() const { return TQString::fromLatin1("KDElibs"); } virtual TQStringList fileList(); diff --git a/languages/cpp/problemreporter.cpp b/languages/cpp/problemreporter.cpp index bed0c9ae..eed7a5b6 100644 --- a/languages/cpp/problemreporter.cpp +++ b/languages/cpp/problemreporter.cpp @@ -21,9 +21,9 @@ #include "configproblemreporter.h" #include "backgroundparser.h" -#include -#include -#include +#include +#include +#include #include #include diff --git a/languages/cpp/qtbuildconfig.cpp b/languages/cpp/qtbuildconfig.cpp index 5c42ffb1..c5c87b1c 100644 --- a/languages/cpp/qtbuildconfig.cpp +++ b/languages/cpp/qtbuildconfig.cpp @@ -77,7 +77,7 @@ void QtBuildConfig::init( ) if( m_designerIntegration.isEmpty() ) { if ( m_version == 3 ) - m_designerIntegration = "EmbeddedTDevDesigner"; + m_designerIntegration = "EmbeddedKDevDesigner"; else m_designerIntegration = "ExternalDesigner"; } diff --git a/languages/cpp/qtbuildconfig.h b/languages/cpp/qtbuildconfig.h index 10da233d..118503b6 100644 --- a/languages/cpp/qtbuildconfig.h +++ b/languages/cpp/qtbuildconfig.h @@ -81,7 +81,7 @@ private: TQString m_designerPath; ///< The path including the binary name of TQt Designer TQString m_qmakePath; ///< The path including the binary name of TQMake TQStringList m_designerPluginPaths; ///< The Prefix for Designer - TQString m_designerIntegration; ///< The type of designer used, tdevdesigner or qt designer + TQString m_designerIntegration; ///< The type of designer used, kdevdesigner or qt designer static const TQString m_configRoot; ///< The root path of the configuration }; diff --git a/languages/cpp/qtdesignercppintegration.cpp b/languages/cpp/qtdesignercppintegration.cpp index 715da1a9..db6df895 100644 --- a/languages/cpp/qtdesignercppintegration.cpp +++ b/languages/cpp/qtdesignercppintegration.cpp @@ -32,15 +32,15 @@ #include #include -#include -#include +#include +#include #include "backgroundparser.h" #include "cppsupportpart.h" #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerCppIntegration::QtDesignerCppIntegration( TDevLanguageSupport *part, +QtDesignerCppIntegration::QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ) : QtDesignerIntegration( part, impl, true, 0 ) {} @@ -126,7 +126,7 @@ void QtDesignerCppIntegration::addFunctionToClass( KInterfaceDesigner::Function TQFileInfo fileInfo( implementationFile ); if ( !TQFile::exists( fileInfo.absFilePath() ) ) { - if ( TDevCreateFile * createFileSupp = m_part->extension( "TDevelop/CreateFile" ) ) + if ( KDevCreateFile * createFileSupp = m_part->extension( "TDevelop/CreateFile" ) ) createFileSupp->createNewFile( fileInfo.extension(), fileInfo.dirPath( true ), fileInfo.fileName() ); } diff --git a/languages/cpp/qtdesignercppintegration.h b/languages/cpp/qtdesignercppintegration.h index 143cf180..d156d276 100644 --- a/languages/cpp/qtdesignercppintegration.h +++ b/languages/cpp/qtdesignercppintegration.h @@ -27,7 +27,7 @@ class QtDesignerCppIntegration : public QtDesignerIntegration Q_OBJECT public: - QtDesignerCppIntegration( TDevLanguageSupport *part, ImplementationWidget *impl ); + QtDesignerCppIntegration( KDevLanguageSupport *part, ImplementationWidget *impl ); protected: virtual void addFunctionToClass( KInterfaceDesigner::Function function, ClassDom klass ); diff --git a/languages/cpp/simpletype.cpp b/languages/cpp/simpletype.cpp index ac905c33..db3f9c79 100644 --- a/languages/cpp/simpletype.cpp +++ b/languages/cpp/simpletype.cpp @@ -910,9 +910,9 @@ TQString SimpleTypeImpl::fullTypeResolved( int depth ) { TypeDesc t = desc(); if ( !scope().isEmpty() ) { if ( depth > 10 ) - return "TDeveParseError::ToDeep"; + return "KDevParseError::ToDeep"; if ( !safetyCounter ) - return "TDeveParseError::MaximumCountReached"; + return "KDevParseError::MaximumCountReached"; ifVerbose( dbg() << "fully resolving type " << t.fullName() << endl ); if ( scope().size() != 0 ) { diff --git a/languages/cpp/storeconverter.cpp b/languages/cpp/storeconverter.cpp index 670e69ff..6ad55925 100644 --- a/languages/cpp/storeconverter.cpp +++ b/languages/cpp/storeconverter.cpp @@ -14,7 +14,7 @@ #include -#include +#include #include "cppcodecompletion.h" #include "codeinformationrepository.h" diff --git a/languages/cpp/subclassing_template/CMakeLists.txt b/languages/cpp/subclassing_template/CMakeLists.txt index 4ee02817..3223a7d7 100644 --- a/languages/cpp/subclassing_template/CMakeLists.txt +++ b/languages/cpp/subclassing_template/CMakeLists.txt @@ -12,4 +12,4 @@ install( FILES subclass_template.h subclass_template.cpp subclass_qt4_template.h subclass_qt4_template.cpp - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/subclassing ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/subclassing ) diff --git a/languages/cpp/subclassing_template/Makefile.am b/languages/cpp/subclassing_template/Makefile.am index 850ec6b9..4e722ca0 100644 --- a/languages/cpp/subclassing_template/Makefile.am +++ b/languages/cpp/subclassing_template/Makefile.am @@ -1,4 +1,4 @@ -cppsupportdatadir = ${kde_datadir}/tdevcppsupport +cppsupportdatadir = ${kde_datadir}/kdevcppsupport subclassingdir = ${cppsupportdatadir}/subclassing subclassing_DATA = subclass_template.h subclass_template.cpp \ diff --git a/languages/cpp/subclassingdlg.cpp b/languages/cpp/subclassingdlg.cpp index 26758d09..0982226c 100644 --- a/languages/cpp/subclassingdlg.cpp +++ b/languages/cpp/subclassingdlg.cpp @@ -16,9 +16,9 @@ #include "backgroundparser.h" #include "store_walker.h" #include "cppsupportfactory.h" -#include "tdevsourceformatter.h" -#include "tdevapi.h" -#include "tdevproject.h" +#include "kdevsourceformatter.h" +#include "kdevapi.h" +#include "kdevproject.h" #include "filetemplate.h" #include "codemodel.h" @@ -475,7 +475,7 @@ void SubclassingDlg::accept() TQString basefilename = fi.baseName(true); buffer.replace(TQRegExp("\\$MODULE\\$"),module); buffer.replace(TQRegExp("\\$FILENAME\\$"),basefilename); - if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & TDevProject::UsesAutotoolsBuildSystem)) + if ( (m_cppSupport->project()) && (m_cppSupport->project()->options() & KDevProject::UsesAutotoolsBuildSystem)) buffer += "\n#include \"$NEWFILENAMELC$.moc\"\n"; } else diff --git a/languages/cpp/templates/CMakeLists.txt b/languages/cpp/templates/CMakeLists.txt index c52a25aa..c278a137 100644 --- a/languages/cpp/templates/CMakeLists.txt +++ b/languages/cpp/templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES default.cpp default.h - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/templates ) diff --git a/languages/cpp/templates/Makefile.am b/languages/cpp/templates/Makefile.am index d5d24bcb..21f95fa8 100644 --- a/languages/cpp/templates/Makefile.am +++ b/languages/cpp/templates/Makefile.am @@ -1,2 +1,2 @@ templatesdata_DATA = default.cpp default.h -templatesdatadir = $(kde_datadir)/tdevcppsupport/templates +templatesdatadir = $(kde_datadir)/kdevcppsupport/templates diff --git a/languages/csharp/CMakeLists.txt b/languages/csharp/CMakeLists.txt index 361ce1a1..5e148431 100644 --- a/languages/csharp/CMakeLists.txt +++ b/languages/csharp/CMakeLists.txt @@ -31,17 +31,17 @@ link_directories( ##### other data ################################ install( FILES - tdevcsharpsupport.desktop csharpdoc.protocol + kdevcsharpsupport.desktop csharpdoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevcsharpsupport.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevcsharpsupport ) + kdevcsharpsupport.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevcsharpsupport ) -##### libtdevcsharpsupport (module) ############# +##### libkdevcsharpsupport (module) ############# -tde_add_kpart( libtdevcsharpsupport AUTOMOC +tde_add_kpart( libkdevcsharpsupport AUTOMOC SOURCES csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui diff --git a/languages/csharp/Makefile.am b/languages/csharp/Makefile.am index 313e8bca..75ba9513 100644 --- a/languages/csharp/Makefile.am +++ b/languages/csharp/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevcsharpsupport.la tdeio_csharpdoc.la -libtdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevcsharpsupport.la tdeio_csharpdoc.la +libkdevcsharpsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcsharpsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui +libkdevcsharpsupport_la_SOURCES = csharpsupportpart.cpp csharpconfigwidget.cpp csharpconfigwidgetbase.ui tdeio_csharpdoc_la_SOURCES = csharpdoc.cpp tdeio_csharpdoc_la_LIBADD = $(LIB_TDEIO) @@ -19,7 +19,7 @@ tdeio_csharpdoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcsharpsupport.desktop csharpdoc.protocol +service_DATA = kdevcsharpsupport.desktop csharpdoc.protocol -rcdir = $(kde_datadir)/tdevcsharpsupport -rc_DATA = tdevcsharpsupport.rc +rcdir = $(kde_datadir)/kdevcsharpsupport +rc_DATA = kdevcsharpsupport.rc diff --git a/languages/csharp/csharpsupportpart.cpp b/languages/csharp/csharpsupportpart.cpp index d410441b..154ff911 100644 --- a/languages/csharp/csharpsupportpart.cpp +++ b/languages/csharp/csharpsupportpart.cpp @@ -19,24 +19,24 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" +#include "kdevappfrontend.h" //#include "classstore.h" //#include "parsedclass.h" //#include "parsedmethod.h" @@ -44,16 +44,16 @@ #include "domutil.h" //#include "programmingbycontract.h" -typedef TDevGenericFactory CSharpSupportFactory; -static const TDevPluginInfo data("tdevcsharpsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevcsharpsupport, CSharpSupportFactory( data ) ) +typedef KDevGenericFactory CSharpSupportFactory; +static const KDevPluginInfo data("kdevcsharpsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevcsharpsupport, CSharpSupportFactory( data ) ) CSharpSupportPart::CSharpSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "CSharpSupportPart") { setInstance(CSharpSupportFactory::instance()); - setXMLFile("tdevcsharpsupport.rc"); + setXMLFile("kdevcsharpsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -174,9 +174,9 @@ void CSharpSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features CSharpSupportPart::features() +KDevLanguageSupport::Features CSharpSupportPart::features() { - return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); + return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); // return Functions; } @@ -193,7 +193,7 @@ TQString CSharpSupportPart::interpreter() void CSharpSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevcsharpsupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/csharp/csharpsupportpart.h b/languages/csharp/csharpsupportpart.h index 2256480b..18e5a663 100644 --- a/languages/csharp/csharpsupportpart.h +++ b/languages/csharp/csharpsupportpart.h @@ -12,11 +12,11 @@ #ifndef _CSHARPSUPPORTPART_H_ #define _CSHARPSUPPORTPART_H_ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include // #include "csharpparser.h" -class CSharpSupportPart : public TDevLanguageSupport +class CSharpSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/csharp/doc/Makefile.am b/languages/csharp/doc/Makefile.am index 1e8dbe53..e0dfb9eb 100644 --- a/languages/csharp/doc/Makefile.am +++ b/languages/csharp/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/csharp/file_templates/Makefile.am b/languages/csharp/file_templates/Makefile.am index 40ad2f23..b4f0a30c 100644 --- a/languages/csharp/file_templates/Makefile.am +++ b/languages/csharp/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = diff --git a/languages/csharp/tdevcsharpsupport.desktop b/languages/csharp/kdevcsharpsupport.desktop similarity index 98% rename from languages/csharp/tdevcsharpsupport.desktop rename to languages/csharp/kdevcsharpsupport.desktop index c072003e..a5627cc3 100644 --- a/languages/csharp/tdevcsharpsupport.desktop +++ b/languages/csharp/kdevcsharpsupport.desktop @@ -51,7 +51,7 @@ GenericName[sr@Latn]=Podrška za CSharp GenericName[sv]=C#-stöd GenericName[zh_TW]=C# 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevcsharpsupport +X-TDE-Library=libkdevcsharpsupport X-TDevelop-Version=5 X-TDevelop-Language=CSharp diff --git a/languages/csharp/tdevcsharpsupport.rc b/languages/csharp/kdevcsharpsupport.rc similarity index 100% rename from languages/csharp/tdevcsharpsupport.rc rename to languages/csharp/kdevcsharpsupport.rc diff --git a/languages/fortran/CMakeLists.txt b/languages/fortran/CMakeLists.txt index 8829a5b3..507795aa 100644 --- a/languages/fortran/CMakeLists.txt +++ b/languages/fortran/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfortransupport ) +install( FILES kdevfortransupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfortransupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfortransupport ) -##### libtdevfortransupport (module) ############ +##### libkdevfortransupport (module) ############ -tde_add_kpart( libtdevfortransupport AUTOMOC +tde_add_kpart( libkdevfortransupport AUTOMOC SOURCES fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui diff --git a/languages/fortran/Makefile.am b/languages/fortran/Makefile.am index e6568364..73f4582c 100644 --- a/languages/fortran/Makefile.am +++ b/languages/fortran/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = file_templates app_templates compiler doc -kde_module_LTLIBRARIES = libtdevfortransupport.la -libtdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfortransupport.la +libkdevfortransupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfortransupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui +libkdevfortransupport_la_SOURCES = fortransupportpart.cpp fixedformparser.cpp ftnchekconfigwidget.cpp ftnchekconfigwidgetbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfortransupport.desktop +service_DATA = kdevfortransupport.desktop -rcdir = $(kde_datadir)/tdevfortransupport -rc_DATA = tdevfortransupport.rc +rcdir = $(kde_datadir)/kdevfortransupport +rc_DATA = kdevfortransupport.rc diff --git a/languages/fortran/app_templates/fortranhello/CMakeLists.txt b/languages/fortran/app_templates/fortranhello/CMakeLists.txt index 86254144..74709631 100644 --- a/languages/fortran/app_templates/fortranhello/CMakeLists.txt +++ b/languages/fortran/app_templates/fortranhello/CMakeLists.txt @@ -19,9 +19,9 @@ add_custom_target( fortranhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fortranhello.tar.gz fortranhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fortranhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fortranhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/fortran/app_templates/fortranhello/Makefile.am b/languages/fortran/app_templates/fortranhello/Makefile.am index 15da4c3f..3bf32575 100644 --- a/languages/fortran/app_templates/fortranhello/Makefile.am +++ b/languages/fortran/app_templates/fortranhello/Makefile.am @@ -3,10 +3,10 @@ dataFiles = main.f src-Makefile.am fortran-Makefile.am fortran-Makefile.cvs \ templateName = fortranhello ### 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/fortran/app_templates/fortranhello/app.tdevelop b/languages/fortran/app_templates/fortranhello/app.tdevelop index 238351ec..f97fd76a 100644 --- a/languages/fortran/app_templates/fortranhello/app.tdevelop +++ b/languages/fortran/app_templates/fortranhello/app.tdevelop @@ -14,7 +14,7 @@ KDevCTags - + src/%{APPNAMELC} @@ -26,16 +26,16 @@ - - + + - - + + false false @@ -54,8 +54,8 @@ - - + + ada ada_bugs_gcc @@ -103,11 +103,11 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate similarity index 98% rename from languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate rename to languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate index d25570f7..e4c5cb33 100644 --- a/languages/fortran/app_templates/fortranhello/fortranhello.tdevtemplate +++ b/languages/fortran/app_templates/fortranhello/fortranhello.kdevtemplate @@ -67,11 +67,11 @@ Archive=fortranhello.tar.gz [INCADMIN] Type=include -File=%{tdevelop}/template-common/incadmin.tdevtemplate +File=%{tdevelop}/template-common/incadmin.kdevtemplate [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/fortran/compiler/Makefile.am b/languages/fortran/compiler/Makefile.am index 183131cb..3489a85c 100644 --- a/languages/fortran/compiler/Makefile.am +++ b/languages/fortran/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = pgioptions diff --git a/languages/fortran/compiler/pgioptions/CMakeLists.txt b/languages/fortran/compiler/pgioptions/CMakeLists.txt index 82d0d0a2..2111f2ad 100644 --- a/languages/fortran/compiler/pgioptions/CMakeLists.txt +++ b/languages/fortran/compiler/pgioptions/CMakeLists.txt @@ -25,15 +25,15 @@ link_directories( ##### other data ################################ install( FILES - tdevpghpfoptions.desktop tdevpgf77options.desktop + kdevpghpfoptions.desktop kdevpgf77options.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevpgioptions (module) ################ +##### libkdevpgioptions (module) ################ -tde_add_kpart( libtdevpgioptions AUTOMOC +tde_add_kpart( libkdevpgioptions AUTOMOC SOURCES pgioptionsfactory.cpp pgioptionsplugin.cpp - LINK tdevextras-shared tdeui-shared + LINK kdevextras-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/fortran/compiler/pgioptions/Makefile.am b/languages/fortran/compiler/pgioptions/Makefile.am index c26068e2..893b7950 100644 --- a/languages/fortran/compiler/pgioptions/Makefile.am +++ b/languages/fortran/compiler/pgioptions/Makefile.am @@ -4,15 +4,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ $(all_includes) -kde_module_LTLIBRARIES = libtdevpgioptions.la -libtdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la +kde_module_LTLIBRARIES = libkdevpgioptions.la +libkdevpgioptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevpgioptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la -libtdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp +libkdevpgioptions_la_SOURCES = pgioptionsfactory.cpp pgioptionsplugin.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpghpfoptions.desktop tdevpgf77options.desktop +service_DATA = kdevpghpfoptions.desktop kdevpgf77options.desktop diff --git a/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop similarity index 98% rename from languages/fortran/compiler/pgioptions/tdevpgf77options.desktop rename to languages/fortran/compiler/pgioptions/kdevpgf77options.desktop index 12dadcff..6d2007ea 100644 --- a/languages/fortran/compiler/pgioptions/tdevpgf77options.desktop +++ b/languages/fortran/compiler/pgioptions/kdevpgf77options.desktop @@ -47,7 +47,7 @@ Name[ta]=Pgf77 விருப்பங்கள் Name[tg]=Pgf77Интихобҳо Name[zh_TW]=Pgf77 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevpgioptions +X-TDE-Library=libkdevpgioptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=pgf77 diff --git a/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop similarity index 98% rename from languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop rename to languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop index 7fe27fe8..f3793949 100644 --- a/languages/fortran/compiler/pgioptions/tdevpghpfoptions.desktop +++ b/languages/fortran/compiler/pgioptions/kdevpghpfoptions.desktop @@ -44,7 +44,7 @@ Name[ta]=Pghpf விருப்பங்கள் Name[tg]=PghpfИнтихобҳо Name[zh_TW]=Pghpf 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevpgioptions +X-TDE-Library=libkdevpgioptions X-TDevelop-Version=5 X-TDevelop-Language=Fortran X-TDevelop-Args=pghpf diff --git a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp index 474263f0..6e019589 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsfactory.cpp @@ -17,7 +17,7 @@ extern "C" { - void *init_libtdevpgioptions() + void *init_libkdevpgioptions() { return new PgiOptionsFactory; } @@ -61,7 +61,7 @@ TDEInstance *PgiOptionsFactory::s_instance = 0; TDEInstance *PgiOptionsFactory::instance() { if (!s_instance) - s_instance = new TDEInstance("tdevpgioptions"); + s_instance = new TDEInstance("kdevpgioptions"); return s_instance; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp index 50d907b5..29301c36 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.cpp @@ -300,7 +300,7 @@ TQString PgiOptionsDialog::flags() const PgiOptionsPlugin::PgiOptionsPlugin(Type type, TQObject *parent, const char *name) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { pgitype = type; } diff --git a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h index daa8c99b..d5d80892 100644 --- a/languages/fortran/compiler/pgioptions/pgioptionsplugin.h +++ b/languages/fortran/compiler/pgioptions/pgioptionsplugin.h @@ -14,14 +14,14 @@ #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" class GeneralTab; class OptimizationTab; class HpfTab; -class PgiOptionsPlugin : public TDevCompilerOptions +class PgiOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/fortran/doc/CMakeLists.txt b/languages/fortran/doc/CMakeLists.txt index 423f4cbd..50e2ab71 100644 --- a/languages/fortran/doc/CMakeLists.txt +++ b/languages/fortran/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES fortran_bugs_gcc.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/fortran/doc/Makefile.am b/languages/fortran/doc/Makefile.am index b7f9a188..5e7eab51 100644 --- a/languages/fortran/doc/Makefile.am +++ b/languages/fortran/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = fortran_bugs_gcc.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/fortran/file_templates/CMakeLists.txt b/languages/fortran/file_templates/CMakeLists.txt index b031bbdc..3b5ef22e 100644 --- a/languages/fortran/file_templates/CMakeLists.txt +++ b/languages/fortran/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES f f77 f90 f95 for fpp ftn - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/fortran/file_templates/Makefile.am b/languages/fortran/file_templates/Makefile.am index d935b552..2a8e4365 100644 --- a/languages/fortran/file_templates/Makefile.am +++ b/languages/fortran/file_templates/Makefile.am @@ -1,2 +1,2 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = f f77 f90 f95 for fpp ftn diff --git a/languages/fortran/fortransupportpart.cpp b/languages/fortran/fortransupportpart.cpp index c23a35f3..4f749ed3 100644 --- a/languages/fortran/fortransupportpart.cpp +++ b/languages/fortran/fortransupportpart.cpp @@ -31,29 +31,29 @@ #include #include #include -#include +#include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include -typedef TDevGenericFactory FortranSupportFactory; -static const TDevPluginInfo data("tdevfortransupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevfortransupport, FortranSupportFactory( data ) ) +typedef KDevGenericFactory FortranSupportFactory; +static const KDevPluginInfo data("kdevfortransupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevfortransupport, FortranSupportFactory( data ) ) FortranSupportPart::FortranSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "FortranSupportPart") { setInstance(FortranSupportFactory::instance()); - setXMLFile("tdevfortransupport.rc"); + setXMLFile("kdevfortransupport.rc"); connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); @@ -274,14 +274,14 @@ void FortranSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features FortranSupportPart::features() +KDevLanguageSupport::Features FortranSupportPart::features() { return Features(Functions); } -TDevMakeFrontend * FortranSupportPart::makeFrontend( ) +KDevMakeFrontend * FortranSupportPart::makeFrontend( ) { - return extension("TDevelop/MakeFrontend"); + return extension("TDevelop/MakeFrontend"); } #include "fortransupportpart.moc" diff --git a/languages/fortran/fortransupportpart.h b/languages/fortran/fortransupportpart.h index fe48e364..7ed0f122 100644 --- a/languages/fortran/fortransupportpart.h +++ b/languages/fortran/fortransupportpart.h @@ -15,12 +15,12 @@ class FixedFormParser; class KDialogBase; class TQStringList; -class TDevMakeFrontend; +class KDevMakeFrontend; -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" -class FortranSupportPart : public TDevLanguageSupport +class FortranSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -30,7 +30,7 @@ public: ~FortranSupportPart(); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); private slots: void slotFtnchek(); @@ -46,7 +46,7 @@ private slots: private: void maybeParse(const TQString fileName); - TDevMakeFrontend *makeFrontend(); + KDevMakeFrontend *makeFrontend(); FixedFormParser *parser; }; diff --git a/languages/fortran/tdevfortransupport.desktop b/languages/fortran/kdevfortransupport.desktop similarity index 98% rename from languages/fortran/tdevfortransupport.desktop rename to languages/fortran/kdevfortransupport.desktop index d4da4cba..b6465210 100644 --- a/languages/fortran/tdevfortransupport.desktop +++ b/languages/fortran/kdevfortransupport.desktop @@ -75,6 +75,6 @@ GenericName[tr]=Fortran 77 Desteği GenericName[zh_CN]=Fortran 77 支持 GenericName[zh_TW]=Fortran 77 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevfortransupport +X-TDE-Library=libkdevfortransupport X-TDevelop-Version=5 X-TDevelop-Language=Fortran77 diff --git a/languages/fortran/tdevfortransupport.rc b/languages/fortran/kdevfortransupport.rc similarity index 100% rename from languages/fortran/tdevfortransupport.rc rename to languages/fortran/kdevfortransupport.rc diff --git a/languages/java/CMakeLists.txt b/languages/java/CMakeLists.txt index 546c6ac9..d3f7f5a7 100644 --- a/languages/java/CMakeLists.txt +++ b/languages/java/CMakeLists.txt @@ -35,20 +35,20 @@ link_directories( ##### other data ################################ -install( FILES tdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevjavasupport ) +install( FILES kdevjavasupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevjavasupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevjavasupport ) -##### libtdevjavasupport (module) ############### +##### libkdevjavasupport (module) ############### -tde_add_kpart( libtdevjavasupport AUTOMOC +tde_add_kpart( libkdevjavasupport AUTOMOC SOURCES - JavaLexer.cpp TDevJavaSupportIface.cpp + JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp - tdevdriver.cpp TDevJavaSupportIface.skel - LINK antlr-static tdevcatalog-shared tdevelop-shared + kdevdriver.cpp KDevJavaSupportIface.skel + LINK antlr-static kdevcatalog-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/java/KDevJavaSupportIface.cpp b/languages/java/KDevJavaSupportIface.cpp new file mode 100644 index 00000000..b1225700 --- /dev/null +++ b/languages/java/KDevJavaSupportIface.cpp @@ -0,0 +1,24 @@ + +#include "KDevJavaSupportIface.h" +#include "javasupportpart.h" + +KDevJavaSupportIface::KDevJavaSupportIface( JavaSupportPart* javaSupport ) + : TQObject( javaSupport ), DCOPObject( "KDevJavaSupport" ), m_javaSupport( javaSupport ) +{ +} + +KDevJavaSupportIface::~KDevJavaSupportIface() +{ +} + +void KDevJavaSupportIface::addClass() +{ + m_javaSupport->slotNewClass(); +} + +void KDevJavaSupportIface::parseProject() +{ + m_javaSupport->parseProject(); +} + +#include "KDevJavaSupportIface.moc" diff --git a/languages/java/TDevJavaSupportIface.h b/languages/java/KDevJavaSupportIface.h similarity index 52% rename from languages/java/TDevJavaSupportIface.h rename to languages/java/KDevJavaSupportIface.h index 9732ca51..d0c4d441 100644 --- a/languages/java/TDevJavaSupportIface.h +++ b/languages/java/KDevJavaSupportIface.h @@ -1,20 +1,20 @@ -#ifndef TDEVJAVASUPPORTIFACE_H -#define TDEVJAVASUPPORTIFACE_H +#ifndef KDEVJAVASUPPORTIFACE_H +#define KDEVJAVASUPPORTIFACE_H #include #include class JavaSupportPart; -class TDevJavaSupportIface : public TQObject, public DCOPObject +class KDevJavaSupportIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevJavaSupportIface( JavaSupportPart* javaSupport ); - ~TDevJavaSupportIface(); + KDevJavaSupportIface( JavaSupportPart* javaSupport ); + ~KDevJavaSupportIface(); k_dcop: void addClass(); diff --git a/languages/java/Makefile.am b/languages/java/Makefile.am index 8e19da19..a1a1e812 100644 --- a/languages/java/Makefile.am +++ b/languages/java/Makefile.am @@ -10,13 +10,13 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ $(all_includes) -kde_module_LTLIBRARIES = libtdevjavasupport.la -libtdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la +kde_module_LTLIBRARIES = libkdevjavasupport.la +libkdevjavasupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevjavasupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -libtdevjavasupport_la_SOURCES = JavaLexer.cpp TDevJavaSupportIface.cpp javasupportfactory.cpp \ +libkdevjavasupport_la_SOURCES = JavaLexer.cpp KDevJavaSupportIface.cpp javasupportfactory.cpp \ JavaRecognizer.cpp backgroundparser.cpp configproblemreporter.ui javasupportpart.cpp \ -JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp tdevdriver.cpp TDevJavaSupportIface.skel +JavaStoreWalker.cpp javasupport_utils.cpp problemreporter.cpp driver.cpp kdevdriver.cpp KDevJavaSupportIface.skel EXTRA_DIST = java.g java.tree.g java.store.g @@ -31,7 +31,7 @@ EXTRA_DIST = java.g java.tree.g java.store.g METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevjavasupport.desktop +service_DATA = kdevjavasupport.desktop -rcdir = $(kde_datadir)/tdevjavasupport -rc_DATA = tdevjavasupport.rc +rcdir = $(kde_datadir)/kdevjavasupport +rc_DATA = kdevjavasupport.rc diff --git a/languages/java/TDevJavaSupportIface.cpp b/languages/java/TDevJavaSupportIface.cpp deleted file mode 100644 index b9847558..00000000 --- a/languages/java/TDevJavaSupportIface.cpp +++ /dev/null @@ -1,24 +0,0 @@ - -#include "TDevJavaSupportIface.h" -#include "javasupportpart.h" - -TDevJavaSupportIface::TDevJavaSupportIface( JavaSupportPart* javaSupport ) - : TQObject( javaSupport ), DCOPObject( "TDevJavaSupport" ), m_javaSupport( javaSupport ) -{ -} - -TDevJavaSupportIface::~TDevJavaSupportIface() -{ -} - -void TDevJavaSupportIface::addClass() -{ - m_javaSupport->slotNewClass(); -} - -void TDevJavaSupportIface::parseProject() -{ - m_javaSupport->parseProject(); -} - -#include "TDevJavaSupportIface.moc" diff --git a/languages/java/app_templates/CMakeLists.txt b/languages/java/app_templates/CMakeLists.txt index 34cc305c..f7e7d242 100644 --- a/languages/java/app_templates/CMakeLists.txt +++ b/languages/java/app_templates/CMakeLists.txt @@ -10,7 +10,7 @@ ################################################# add_subdirectory( javahello ) -add_subdirectory( tdeappjava ) +add_subdirectory( kappjava ) add_subdirectory( superwaba ) install( FILES diff --git a/languages/java/app_templates/Makefile.am b/languages/java/app_templates/Makefile.am index f30aefdb..fe3931a3 100644 --- a/languages/java/app_templates/Makefile.am +++ b/languages/java/app_templates/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = javahello tdeappjava superwaba +SUBDIRS = javahello kappjava superwaba profilesdir = $(kde_datadir)/tdevelop/profiles/IDE/CompiledLanguageIDE/JavaIDE profiles_DATA = java.appwizard diff --git a/languages/java/app_templates/java.appwizard b/languages/java/app_templates/java.appwizard index f4f8d6ba..087d6c0c 100644 --- a/languages/java/app_templates/java.appwizard +++ b/languages/java/app_templates/java.appwizard @@ -1,2 +1,2 @@ [General] -List=javahello,tdeappjava,superwaba +List=javahello,kappjava,superwaba diff --git a/languages/java/app_templates/javahello/CMakeLists.txt b/languages/java/app_templates/javahello/CMakeLists.txt index 04fd4963..8129bbc1 100644 --- a/languages/java/app_templates/javahello/CMakeLists.txt +++ b/languages/java/app_templates/javahello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( javahello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/javahello.tar.gz javahello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - javahello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + javahello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/javahello/Makefile.am b/languages/java/app_templates/javahello/Makefile.am index e3e3be27..f47e7056 100644 --- a/languages/java/app_templates/javahello/Makefile.am +++ b/languages/java/app_templates/javahello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = Main.java build.xml javahello.filelist javahello.tdevelop templateName= javahello ### 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/java/app_templates/javahello/javahello.filelist b/languages/java/app_templates/javahello/javahello.filelist index b9ce43ab..97da44be 100644 --- a/languages/java/app_templates/javahello/javahello.filelist +++ b/languages/java/app_templates/javahello/javahello.filelist @@ -1,2 +1,2 @@ -# TDevelop Custom Project File List +# KDevelop Custom Project File List Main.java diff --git a/languages/java/app_templates/javahello/javahello.tdevtemplate b/languages/java/app_templates/javahello/javahello.kdevtemplate similarity index 100% rename from languages/java/app_templates/javahello/javahello.tdevtemplate rename to languages/java/app_templates/javahello/javahello.kdevtemplate diff --git a/languages/java/app_templates/javahello/javahello.tdevelop b/languages/java/app_templates/javahello/javahello.tdevelop index ade81a9a..a41fae72 100644 --- a/languages/java/app_templates/javahello/javahello.tdevelop +++ b/languages/java/app_templates/javahello/javahello.tdevelop @@ -7,15 +7,15 @@ KDevAntProject Java - TDevDebugger + KDevDebugger - + ant - - + + ada ada_bugs_gcc @@ -59,11 +59,11 @@ KDE Libraries (Doxygen) - - + + false *.o,*.lo,CVS - + diff --git a/languages/java/app_templates/kappjava/CMakeLists.txt b/languages/java/app_templates/kappjava/CMakeLists.txt new file mode 100644 index 00000000..042872fd --- /dev/null +++ b/languages/java/app_templates/kappjava/CMakeLists.txt @@ -0,0 +1,26 @@ +################################################# +# +# (C) 2010-2011 Serghei Amelian +# serghei (DOT) amelian (AT) gmail.com +# +# Improvements and feedback are welcome +# +# This file is released under GPL >= 2 +# +################################################# + +add_custom_target( kappjava.tar.gz ALL + COMMAND tar zcf kappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} + app.java pref.java appview.java app_client.java appui.rc + src-Makefile.am kappjava.png app.tdevelop subdirs +) + + +install( FILES + ${CMAKE_CURRENT_BINARY_DIR}/kappjava.tar.gz kappjava.png + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) + + +install( FILES + kappjava.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/tdeappjava/Makefile.am b/languages/java/app_templates/kappjava/Makefile.am similarity index 66% rename from languages/java/app_templates/tdeappjava/Makefile.am rename to languages/java/app_templates/kappjava/Makefile.am index 889abb5a..edbd4468 100644 --- a/languages/java/app_templates/tdeappjava/Makefile.am +++ b/languages/java/app_templates/kappjava/Makefile.am @@ -1,12 +1,12 @@ dataFiles = app.java pref.java appview.java app_client.java appui.rc \ - src-Makefile.am tdeappjava.png app.tdevelop subdirs -templateName = tdeappjava + src-Makefile.am kappjava.png app.tdevelop subdirs +templateName = kappjava ### 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/java/app_templates/tdeappjava/app.desktop b/languages/java/app_templates/kappjava/app.desktop similarity index 100% rename from languages/java/app_templates/tdeappjava/app.desktop rename to languages/java/app_templates/kappjava/app.desktop diff --git a/languages/java/app_templates/tdeappjava/app.java b/languages/java/app_templates/kappjava/app.java similarity index 100% rename from languages/java/app_templates/tdeappjava/app.java rename to languages/java/app_templates/kappjava/app.java diff --git a/languages/java/app_templates/tdeappjava/app.tdevelop b/languages/java/app_templates/kappjava/app.tdevelop similarity index 91% rename from languages/java/app_templates/tdeappjava/app.tdevelop rename to languages/java/app_templates/kappjava/app.tdevelop index 1e07dec0..7ee74558 100644 --- a/languages/java/app_templates/tdeappjava/app.tdevelop +++ b/languages/java/app_templates/kappjava/app.tdevelop @@ -13,15 +13,15 @@ KDE - + src/java src/%{APPNAMELC} - - + + @@ -29,12 +29,12 @@ - - + + - - + + ada ada_bugs_gcc @@ -79,10 +79,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/java/app_templates/tdeappjava/app_client.java b/languages/java/app_templates/kappjava/app_client.java similarity index 100% rename from languages/java/app_templates/tdeappjava/app_client.java rename to languages/java/app_templates/kappjava/app_client.java diff --git a/languages/java/app_templates/tdeappjava/appui.rc b/languages/java/app_templates/kappjava/appui.rc similarity index 100% rename from languages/java/app_templates/tdeappjava/appui.rc rename to languages/java/app_templates/kappjava/appui.rc diff --git a/languages/java/app_templates/tdeappjava/appview.java b/languages/java/app_templates/kappjava/appview.java similarity index 100% rename from languages/java/app_templates/tdeappjava/appview.java rename to languages/java/app_templates/kappjava/appview.java diff --git a/languages/java/app_templates/tdeappjava/tdeappjava b/languages/java/app_templates/kappjava/kappjava similarity index 95% rename from languages/java/app_templates/tdeappjava/tdeappjava rename to languages/java/app_templates/kappjava/kappjava index a62edafa..e199ac25 100644 --- a/languages/java/app_templates/tdeappjava/tdeappjava +++ b/languages/java/app_templates/kappjava/kappjava @@ -2,7 +2,7 @@ [General] Name=Application framework Name[fr]=Squelette d'application -Icon=tdeappjava.png +Icon=kappjava.png Category=Java/KDE Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars. Comment[fr]=Gnre une simple application KDE dans le language JAVA avec une fentre principale, des menus, et des barres d'outils. diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate b/languages/java/app_templates/kappjava/kappjava.kdevtemplate similarity index 96% rename from languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate rename to languages/java/app_templates/kappjava/kappjava.kdevtemplate index b5b35e33..92cf4710 100644 --- a/languages/java/app_templates/tdeappjava/tdeappjava.tdevtemplate +++ b/languages/java/app_templates/kappjava/kappjava.kdevtemplate @@ -30,7 +30,7 @@ Name[sv]=Programramverk Name[tr]=Uygulama Çatısı Name[zh_CN]=应用程序框架 Name[zh_TW]=應用程式框架 -Icon=tdeappjava.png +Icon=kappjava.png Category=Java/KDE Comment=Generates a simple Java KDE application with one toplevel window, menus and toolbars. Comment[ca]=Genera una simple aplicació per al KDE en Java amb una finestra principal, menús i barres d'eines. @@ -61,19 +61,19 @@ Comment[zh_CN]=生成一个简单的带有顶级窗口、菜单和工具栏的 J Comment[zh_TW]=產生一個簡單的 Java KDE 應用程式，內含頂層視窗、選單與工具列。 FileTemplates=java,CStyle ShowFilesAfterGeneration=%{dest}/src/%{APPNAME}View.java -Archive=tdeappjava.tar.gz +Archive=kappjava.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 [DOCBOOK] Type=include -File=%{tdevelop}/template-common/dockbook.tdevtemplate +File=%{tdevelop}/template-common/dockbook.kdevtemplate [FILE4] Type=install diff --git a/languages/java/app_templates/tdeappjava/tdeappjava.png b/languages/java/app_templates/kappjava/kappjava.png similarity index 100% rename from languages/java/app_templates/tdeappjava/tdeappjava.png rename to languages/java/app_templates/kappjava/kappjava.png diff --git a/languages/java/app_templates/tdeappjava/pref.java b/languages/java/app_templates/kappjava/pref.java similarity index 100% rename from languages/java/app_templates/tdeappjava/pref.java rename to languages/java/app_templates/kappjava/pref.java diff --git a/languages/java/app_templates/tdeappjava/src-Makefile.am b/languages/java/app_templates/kappjava/src-Makefile.am similarity index 100% rename from languages/java/app_templates/tdeappjava/src-Makefile.am rename to languages/java/app_templates/kappjava/src-Makefile.am diff --git a/languages/java/app_templates/tdeappjava/subdirs b/languages/java/app_templates/kappjava/subdirs similarity index 100% rename from languages/java/app_templates/tdeappjava/subdirs rename to languages/java/app_templates/kappjava/subdirs diff --git a/languages/java/app_templates/superwaba/CMakeLists.txt b/languages/java/app_templates/superwaba/CMakeLists.txt index ea9517be..58932352 100644 --- a/languages/java/app_templates/superwaba/CMakeLists.txt +++ b/languages/java/app_templates/superwaba/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( superwaba.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/superwaba.tar.gz superwaba.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - superwaba.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + superwaba.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/java/app_templates/superwaba/Makefile.am b/languages/java/app_templates/superwaba/Makefile.am index c9c6aa99..bc706fe6 100644 --- a/languages/java/app_templates/superwaba/Makefile.am +++ b/languages/java/app_templates/superwaba/Makefile.am @@ -2,10 +2,10 @@ dataFiles = superwaba.png sw.java src-Makefile sw.tdevelop sw.filelist templateName = superwaba ### 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/java/app_templates/superwaba/superwaba.tdevtemplate b/languages/java/app_templates/superwaba/superwaba.kdevtemplate similarity index 99% rename from languages/java/app_templates/superwaba/superwaba.tdevtemplate rename to languages/java/app_templates/superwaba/superwaba.kdevtemplate index e792af35..27257770 100644 --- a/languages/java/app_templates/superwaba/superwaba.tdevtemplate +++ b/languages/java/app_templates/superwaba/superwaba.kdevtemplate @@ -162,5 +162,5 @@ Archive=superwaba.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate diff --git a/languages/java/app_templates/superwaba/sw.tdevelop b/languages/java/app_templates/superwaba/sw.tdevelop index 029d3af3..11db7411 100644 --- a/languages/java/app_templates/superwaba/sw.tdevelop +++ b/languages/java/app_templates/superwaba/sw.tdevelop @@ -4,17 +4,17 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Java - TDevDebugger + KDevDebugger Java Code - + make test @@ -34,14 +34,14 @@ - - + + - - + + bash bash_bugs @@ -85,10 +85,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/java/app_templates/tdeappjava/CMakeLists.txt b/languages/java/app_templates/tdeappjava/CMakeLists.txt deleted file mode 100644 index 578b6e9d..00000000 --- a/languages/java/app_templates/tdeappjava/CMakeLists.txt +++ /dev/null @@ -1,26 +0,0 @@ -################################################# -# -# (C) 2010-2011 Serghei Amelian -# serghei (DOT) amelian (AT) gmail.com -# -# Improvements and feedback are welcome -# -# This file is released under GPL >= 2 -# -################################################# - -add_custom_target( tdeappjava.tar.gz ALL - COMMAND tar zcf tdeappjava.tar.gz -C ${CMAKE_CURRENT_SOURCE_DIR} - app.java pref.java appview.java app_client.java appui.rc - src-Makefile.am tdeappjava.png app.tdevelop subdirs -) - - -install( FILES - ${CMAKE_CURRENT_BINARY_DIR}/tdeappjava.tar.gz tdeappjava.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) - - -install( FILES - tdeappjava.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) diff --git a/languages/java/backgroundparser.cpp b/languages/java/backgroundparser.cpp index 006b0127..d6a034e4 100644 --- a/languages/java/backgroundparser.cpp +++ b/languages/java/backgroundparser.cpp @@ -13,8 +13,8 @@ #include "javasupportpart.h" #include "javasupport_events.h" #include "driver.h" -#include "tdevdeepcopy.h" -#include "tdevdriver.h" +#include "kdevdeepcopy.h" +#include "kdevdriver.h" #include @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include #include @@ -178,7 +178,7 @@ BackgroundParser::BackgroundParser( JavaSupportPart* part, TQWaitCondition* cons : m_consumed( consumed ), m_javaSupport( part ), m_close( false ) { m_fileList = new SynchronizedFileList(); - m_driver = new TDevDriver( m_javaSupport ); + m_driver = new KDevDriver( m_javaSupport ); m_driver->setSourceProvider( new KDevSourceProvider(m_javaSupport) ); //disabled for now m_driver->setResolveDependencesEnabled( true ); } diff --git a/languages/java/backgroundparser.h b/languages/java/backgroundparser.h index db197e31..fee2bc78 100644 --- a/languages/java/backgroundparser.h +++ b/languages/java/backgroundparser.h @@ -71,7 +71,7 @@ protected: Unit* parseFile( const TQString& fileName, bool readFromDisk ); private: - class TDevDriver* m_driver; + class KDevDriver* m_driver; TQString m_currentFile; TQWaitCondition m_canParse; TQWaitCondition m_isEmpty; diff --git a/languages/java/doc/CMakeLists.txt b/languages/java/doc/CMakeLists.txt index 23acf492..685a980d 100644 --- a/languages/java/doc/CMakeLists.txt +++ b/languages/java/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES sw.toc java_bugs_gcc.toc java_bugs_sun.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/java/doc/Makefile.am b/languages/java/doc/Makefile.am index f163d148..adb0f24f 100644 --- a/languages/java/doc/Makefile.am +++ b/languages/java/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = sw.toc java_bugs_gcc.toc java_bugs_sun.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/java/file_templates/CMakeLists.txt b/languages/java/file_templates/CMakeLists.txt index cee049fb..848555dd 100644 --- a/languages/java/file_templates/CMakeLists.txt +++ b/languages/java/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES java - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/java/file_templates/Makefile.am b/languages/java/file_templates/Makefile.am index 4d9013d4..dc3b82a9 100644 --- a/languages/java/file_templates/Makefile.am +++ b/languages/java/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = java diff --git a/languages/java/javasupport_events.h b/languages/java/javasupport_events.h index b2022af2..36cda51b 100644 --- a/languages/java/javasupport_events.h +++ b/languages/java/javasupport_events.h @@ -13,7 +13,7 @@ #define __javasupport_events_h #include "driver.h" -#include "tdevdeepcopy.h" +#include "kdevdeepcopy.h" #include #include diff --git a/languages/java/javasupportfactory.cpp b/languages/java/javasupportfactory.cpp index ac1eaadb..94e435f2 100644 --- a/languages/java/javasupportfactory.cpp +++ b/languages/java/javasupportfactory.cpp @@ -11,28 +11,28 @@ #include #include -#include +#include #include "javasupportfactory.h" -static const TDevPluginInfo data("tdevjavasupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevjavasupport, JavaSupportFactory ) +static const KDevPluginInfo data("kdevjavasupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevjavasupport, JavaSupportFactory ) JavaSupportFactory::JavaSupportFactory() - : TDevGenericFactory( data ) + : KDevGenericFactory( data ) { } TDEInstance *JavaSupportFactory::createInstance() { - TDEInstance *instance = TDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); TDEStandardDirs *dirs = instance->dirs(); - dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "tdevjavasupport/newclass/" ); - dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "tdevjavasupport/pcs/" ); + dirs->addResourceType( "newclasstemplates", TDEStandardDirs::kde_default("data") + "kdevjavasupport/newclass/" ); + dirs->addResourceType( "pcs", TDEStandardDirs::kde_default( "data" ) + "kdevjavasupport/pcs/" ); return instance; } -const TDevPluginInfo *JavaSupportFactory::info() +const KDevPluginInfo *JavaSupportFactory::info() { return &data; } diff --git a/languages/java/javasupportfactory.h b/languages/java/javasupportfactory.h index cb231d34..e5ae52b4 100644 --- a/languages/java/javasupportfactory.h +++ b/languages/java/javasupportfactory.h @@ -12,17 +12,17 @@ #ifndef _JAVASUPPORTFACTORY_H_ #define _JAVASUPPORTFACTORY_H_ -#include +#include #include "javasupportpart.h" -class TDevPluginInfo; +class KDevPluginInfo; -class JavaSupportFactory : public TDevGenericFactory +class JavaSupportFactory : public KDevGenericFactory { public: JavaSupportFactory(); - static const TDevPluginInfo *info(); + static const KDevPluginInfo *info(); protected: virtual TDEInstance *createInstance(); diff --git a/languages/java/javasupportpart.cpp b/languages/java/javasupportpart.cpp index 3c2090e8..63b174fc 100644 --- a/languages/java/javasupportpart.cpp +++ b/languages/java/javasupportpart.cpp @@ -17,10 +17,10 @@ #include "javasupport_events.h" #include "problemreporter.h" #include "backgroundparser.h" -#include "TDevJavaSupportIface.h" +#include "KDevJavaSupportIface.h" #include "javasupportfactory.h" #include "catalog.h" -#include "tdevdriver.h" +#include "kdevdriver.h" #include "javasupport_utils.h" #include "JavaStoreWalker.hpp" @@ -63,12 +63,12 @@ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include #include @@ -77,11 +77,11 @@ enum { KDEV_DB_VERSION = 7 }; enum { KDEV_PCS_VERSION = 8 }; -class JavaDriver: public TDevDriver +class JavaDriver: public KDevDriver { public: JavaDriver( JavaSupportPart* javaSupport ) - : TDevDriver( javaSupport ) + : KDevDriver( javaSupport ) { } @@ -119,7 +119,7 @@ public: }; JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "TDevJavaSupport"), + : KDevLanguageSupport(JavaSupportFactory::info(), parent, name ? name : "KDevJavaSupport"), m_activeDocument( 0 ), m_activeView( 0 ), m_activeSelection( 0 ), m_activeEditor( 0 ), m_activeViewCursor( 0 ), m_projectClosed( true ), m_valid( false ) { @@ -127,7 +127,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr m_driver = new JavaDriver( this ); - setXMLFile( "tdevjavasupport.rc" ); + setXMLFile( "kdevjavasupport.rc" ); m_catalogList.setAutoDelete( true ); setupCatalog(); @@ -167,7 +167,7 @@ JavaSupportPart::JavaSupportPart(TQObject *parent, const char *name, const TQStr connect( core( ), TQT_SIGNAL( projectConfigWidget( KDialogBase* ) ), this, TQT_SLOT( projectConfigWidget( KDialogBase* ) ) ); - new TDevJavaSupportIface( this ); + new KDevJavaSupportIface( this ); //(void) dcopClient(); } @@ -434,7 +434,7 @@ TQString JavaSupportPart::findSourceFile() return m_activeFileName; } -TDevLanguageSupport::Features JavaSupportPart::features() +KDevLanguageSupport::Features JavaSupportPart::features() { return Features( Classes | Functions | Variables ); } @@ -830,7 +830,7 @@ TQString JavaSupportPart::formatModelItem( const CodeModelItem *item, bool short return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } void JavaSupportPart::addClass( ) diff --git a/languages/java/javasupportpart.h b/languages/java/javasupportpart.h index 6154cb8f..a69e3524 100644 --- a/languages/java/javasupportpart.h +++ b/languages/java/javasupportpart.h @@ -16,8 +16,8 @@ #ifndef _JAVASUPPORTPART_H_ #define _JAVASUPPORTPART_H_ -#include -#include +#include +#include #include #include @@ -46,7 +46,7 @@ namespace KTextEditor class ViewCursorInterface; } -class JavaSupportPart : public TDevLanguageSupport +class JavaSupportPart : public KDevLanguageSupport { Q_OBJECT @@ -82,7 +82,7 @@ signals: void fileParsed( const TQString& fileName ); protected: - virtual TDevLanguageSupport::Features features(); + virtual KDevLanguageSupport::Features features(); virtual KMimeType::List mimeTypes(); virtual TQString formatClassName(const TQString &name); virtual TQString unformatClassName(const TQString &name); @@ -159,7 +159,7 @@ private: FunctionDom m_activeFunction; VariableDom m_activeVariable; - friend class TDevJavaSupportIface; + friend class KDevJavaSupportIface; friend class JavaDriver; }; diff --git a/languages/java/tdevdeepcopy.h b/languages/java/kdevdeepcopy.h similarity index 77% rename from languages/java/tdevdeepcopy.h rename to languages/java/kdevdeepcopy.h index c4f889c1..dd4d8f4d 100644 --- a/languages/java/tdevdeepcopy.h +++ b/languages/java/kdevdeepcopy.h @@ -1,5 +1,5 @@ -#ifndef TDEVDEEPCOPY_H -#define TDEVDEEPCOPY_H +#ifndef KDEVDEEPCOPY_H +#define KDEVDEEPCOPY_H #include diff --git a/languages/java/tdevdriver.cpp b/languages/java/kdevdriver.cpp similarity index 73% rename from languages/java/tdevdriver.cpp rename to languages/java/kdevdriver.cpp index d36a23f3..d19a20c3 100644 --- a/languages/java/tdevdriver.cpp +++ b/languages/java/kdevdriver.cpp @@ -1,20 +1,20 @@ -#include "tdevdriver.h" +#include "kdevdriver.h" #include "JavaLexer.hpp" #include #include -TDevDriver::TDevDriver( JavaSupportPart* javaSupport ) +KDevDriver::KDevDriver( JavaSupportPart* javaSupport ) : m_javaSupport( javaSupport ) { } -JavaSupportPart* TDevDriver::javaSupport() +JavaSupportPart* KDevDriver::javaSupport() { return m_javaSupport; } -void TDevDriver::setupProject() +void KDevDriver::setupProject() { TQMap map; @@ -38,7 +38,7 @@ void TDevDriver::setupProject() } } -void TDevDriver::setupLexer( JavaLexer* lexer ) +void KDevDriver::setupLexer( JavaLexer* lexer ) { Driver::setupLexer( lexer ); } diff --git a/languages/java/tdevdriver.h b/languages/java/kdevdriver.h similarity index 66% rename from languages/java/tdevdriver.h rename to languages/java/kdevdriver.h index 27fd7854..cc0a1393 100644 --- a/languages/java/tdevdriver.h +++ b/languages/java/kdevdriver.h @@ -1,10 +1,10 @@ -#ifndef __tdevdriver_h -#define __tdevdriver_h +#ifndef __kdevdriver_h +#define __kdevdriver_h #include "javasupportpart.h" -#include +#include #include #include "driver.h" @@ -12,10 +12,10 @@ #include #include -class TDevDriver: public Driver +class KDevDriver: public Driver { public: - TDevDriver( JavaSupportPart* javaSupport ); + KDevDriver( JavaSupportPart* javaSupport ); JavaSupportPart* javaSupport(); void setupProject(); diff --git a/languages/java/tdevjavasupport.desktop b/languages/java/kdevjavasupport.desktop similarity index 98% rename from languages/java/tdevjavasupport.desktop rename to languages/java/kdevjavasupport.desktop index 6d3553d7..620fb10f 100644 --- a/languages/java/tdevjavasupport.desktop +++ b/languages/java/kdevjavasupport.desktop @@ -35,7 +35,7 @@ Comment[tg]=Ёрӣ намудани забони Java Comment[tr]=Java Desteği Comment[zh_CN]=Java 支持 Comment[zh_TW]=Java 支援 -Name=TDevJavaSupport +Name=KDevJavaSupport Name[da]=TDevelop Java-understøttelse Name[de]=Unterstützung für Java (TDevelop) Name[hi]=के-डेव-जावा-समर्थन @@ -79,7 +79,7 @@ GenericName[tr]=Java Desteği GenericName[zh_CN]=Java 支持 GenericName[zh_TW]=Java 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevjavasupport +X-TDE-Library=libkdevjavasupport X-TDevelop-Version=5 X-TDevelop-Language=Java X-TDevelop-Args=Java diff --git a/languages/java/tdevjavasupport.rc b/languages/java/kdevjavasupport.rc similarity index 54% rename from languages/java/tdevjavasupport.rc rename to languages/java/kdevjavasupport.rc index 66c7975c..e9b80d0d 100644 --- a/languages/java/tdevjavasupport.rc +++ b/languages/java/kdevjavasupport.rc @@ -1,4 +1,4 @@ - + diff --git a/languages/java/newclass_templates/Makefile.am b/languages/java/newclass_templates/Makefile.am index f8b9e3bd..d24c99ef 100644 --- a/languages/java/newclass_templates/Makefile.am +++ b/languages/java/newclass_templates/Makefile.am @@ -1,4 +1,4 @@ -javasupportdatadir = ${kde_datadir}/tdevjavasupport +javasupportdatadir = ${kde_datadir}/kdevjavasupport newclassdir = ${javasupportdatadir}/newclass newclass_DATA = java_source diff --git a/languages/java/problemreporter.cpp b/languages/java/problemreporter.cpp index 6b6a46e6..4d4f47af 100644 --- a/languages/java/problemreporter.cpp +++ b/languages/java/problemreporter.cpp @@ -21,8 +21,8 @@ #include "configproblemreporter.h" #include "backgroundparser.h" -#include -#include +#include +#include #include #include diff --git a/languages/kjssupport/Makefile.am b/languages/kjssupport/Makefile.am index 1fd1839b..72cc722b 100644 --- a/languages/kjssupport/Makefile.am +++ b/languages/kjssupport/Makefile.am @@ -1,22 +1,22 @@ INCLUDES = -I$(kde_includes)/tdevelop $(all_includes) -kde_module_LTLIBRARIES = libtdevkjssupport.la -libtdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop -libtdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui +kde_module_LTLIBRARIES = libkdevkjssupport.la +libkdevkjssupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevkjssupport_la_LIBADD = -lkjsembed -ltdevelop +libkdevkjssupport_la_SOURCES = kjssupport_part.cpp kjsproblems.cpp jscodecompletion.cpp subclassingdlg.cpp subclassingdlgbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevkjssupport.desktop +service_DATA = kdevkjssupport.desktop mimesrcdir = $(kde_mimedir)/text mimesrc_DATA = x-javascript-source.desktop EXTRA_DIST = $(mimesrc_DATA) -rcdir = $(kde_datadir)/tdevkjssupport -rc_DATA = tdevkjssupport.rc +rcdir = $(kde_datadir)/kdevkjssupport +rc_DATA = kdevkjssupport.rc SUBDIRS = template subclassing_template noinst_HEADERS = kjsproblems.h diff --git a/languages/kjssupport/jscodecompletion.cpp b/languages/kjssupport/jscodecompletion.cpp index b8f361a4..436e0a95 100644 --- a/languages/kjssupport/jscodecompletion.cpp +++ b/languages/kjssupport/jscodecompletion.cpp @@ -28,12 +28,12 @@ #include -#include +#include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/languages/kjssupport/jscodecompletion.h b/languages/kjssupport/jscodecompletion.h index 9e4434bb..f1d18a70 100644 --- a/languages/kjssupport/jscodecompletion.h +++ b/languages/kjssupport/jscodecompletion.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include diff --git a/languages/kjssupport/tdevkjssupport.desktop b/languages/kjssupport/kdevkjssupport.desktop similarity index 98% rename from languages/kjssupport/tdevkjssupport.desktop rename to languages/kjssupport/kdevkjssupport.desktop index 02640f78..e972cd18 100644 --- a/languages/kjssupport/tdevkjssupport.desktop +++ b/languages/kjssupport/kdevkjssupport.desktop @@ -50,5 +50,5 @@ GenericName[zh_TW]=TDE JavaScript 支援 Icon=tdevelop ServiceTypes=TDevelop/LanguageSupport X-TDevelop-Language=Javascript -X-TDE-Library=libtdevkjssupport +X-TDE-Library=libkdevkjssupport X-TDevelop-Version=3 diff --git a/languages/kjssupport/tdevkjssupport.rc b/languages/kjssupport/kdevkjssupport.rc similarity index 100% rename from languages/kjssupport/tdevkjssupport.rc rename to languages/kjssupport/kdevkjssupport.rc diff --git a/languages/kjssupport/kjssupport_part.cpp b/languages/kjssupport/kjssupport_part.cpp index 69311ac3..4a3dbc25 100644 --- a/languages/kjssupport/kjssupport_part.cpp +++ b/languages/kjssupport/kjssupport_part.cpp @@ -26,15 +26,15 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include -#include +#include #include #include #include @@ -42,16 +42,16 @@ #include #include -#include +#include #include "kjssupport_part.h" #include "kjsproblems.h" #include "jscodecompletion.h" #include "subclassingdlg.h" -typedef TDevGenericFactory kjsSupportFactory; -static const TDevPluginInfo data("tdevkjssupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevkjssupport, kjsSupportFactory( data ) ); +typedef KDevGenericFactory kjsSupportFactory; +static const KDevPluginInfo data("kdevkjssupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevkjssupport, kjsSupportFactory( data ) ); class typeProperty @@ -63,10 +63,10 @@ class typeProperty }; kjsSupportPart::kjsSupportPart(TQObject *parent, const char *name, const TQStringList& ) -: TDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) +: KDevLanguageSupport(&data, parent, name ? name : "kjsSupportPart" ) { setInstance(kjsSupportFactory::instance()); - setXMLFile("tdevkjssupport.rc"); + setXMLFile("kdevkjssupport.rc"); m_build = new TDEAction( i18n("&Run"), "exec",Key_F9,this, TQT_SLOT(slotRun()),actionCollection(), "build_execute" ); @@ -104,7 +104,7 @@ kjsSupportPart::~kjsSupportPart() delete m_js; } -TDevLanguageSupport::Features kjsSupportPart::features() +KDevLanguageSupport::Features kjsSupportPart::features() { return Features(Classes | Variables | Functions); } diff --git a/languages/kjssupport/kjssupport_part.h b/languages/kjssupport/kjssupport_part.h index 59b5dae4..4572b9a2 100644 --- a/languages/kjssupport/kjssupport_part.h +++ b/languages/kjssupport/kjssupport_part.h @@ -17,13 +17,13 @@ */ -#ifndef __TDEVPART_KJSSUPPORT_H__ -#define __TDEVPART_KJSSUPPORT_H__ +#ifndef __KDEVPART_KJSSUPPORT_H__ +#define __KDEVPART_KJSSUPPORT_H__ #include #include -#include +#include #include #include #include @@ -43,7 +43,7 @@ class Context; class typeProperty; -class kjsSupportPart : public TDevLanguageSupport +class kjsSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/kjssupport/subclassing_template/Makefile.am b/languages/kjssupport/subclassing_template/Makefile.am index bafadb4e..8c99d172 100644 --- a/languages/kjssupport/subclassing_template/Makefile.am +++ b/languages/kjssupport/subclassing_template/Makefile.am @@ -1,3 +1,3 @@ -kjssupportdatadir = ${kde_datadir}/tdevkjssupport +kjssupportdatadir = ${kde_datadir}/kdevkjssupport subclassingdir = ${kjssupportdatadir}/subclassing subclassing_DATA = subclass_template.js diff --git a/languages/kjssupport/subclassingdlg.cpp b/languages/kjssupport/subclassingdlg.cpp index 260e2d49..513e0180 100644 --- a/languages/kjssupport/subclassingdlg.cpp +++ b/languages/kjssupport/subclassingdlg.cpp @@ -17,7 +17,7 @@ #include "store_walker.h" #include "cppsupportfactory.h"*/ #include -#include +#include #include #include diff --git a/languages/kjssupport/template/Makefile.am b/languages/kjssupport/template/Makefile.am index fd902e1a..284227b7 100644 --- a/languages/kjssupport/template/Makefile.am +++ b/languages/kjssupport/template/Makefile.am @@ -1,4 +1,4 @@ -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard commondatadir = ${appwizarddatadir}/template-common jshellodir = ${appwizarddatadir}/template-jshello templatedir = ${appwizarddatadir}/templates diff --git a/languages/kjssupport/template/app.tdevelop b/languages/kjssupport/template/app.tdevelop index d1e55b10..cbef8262 100644 --- a/languages/kjssupport/template/app.tdevelop +++ b/languages/kjssupport/template/app.tdevelop @@ -10,24 +10,24 @@ Javascript - TDevFileView + KDevFileView KDevdistpart - TDevDebugger + KDevDebugger - + src *.js *~ - - + + - - + + kde gtk @@ -36,10 +36,10 @@ perl php - - + + - + diff --git a/languages/kjssupport/template/script b/languages/kjssupport/template/script index 3ed2602c..1473d762 100644 --- a/languages/kjssupport/template/script +++ b/languages/kjssupport/template/script @@ -1,4 +1,4 @@ -#!perl -I/usr/kde/3.1/share/apps/tdevappwizard/template-common +#!perl -I/usr/kde/3.1/share/apps/kdevappwizard/template-common use gideon; diff --git a/languages/lib/debugger/CMakeLists.txt b/languages/lib/debugger/CMakeLists.txt index fbd121e4..c159528b 100644 --- a/languages/lib/debugger/CMakeLists.txt +++ b/languages/lib/debugger/CMakeLists.txt @@ -24,14 +24,14 @@ link_directories( ##### headers ################################### install( FILES - debugger.h tdevdebugger.h + debugger.h kdevdebugger.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/debugger ) ##### lang_debugger (shared) #################### tde_add_library( lang_debugger SHARED AUTOMOC - SOURCES tdevdebugger.cpp debugger.cpp + SOURCES kdevdebugger.cpp debugger.cpp VERSION 0.0.0 LINK tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/languages/lib/debugger/Makefile.am b/languages/lib/debugger/Makefile.am index 3ca4e3a8..fc8923aa 100644 --- a/languages/lib/debugger/Makefile.am +++ b/languages/lib/debugger/Makefile.am @@ -3,11 +3,11 @@ METASOURCES = AUTO lib_LTLIBRARIES = liblang_debugger.la liblang_debugger_la_LDFLAGS = $(all_libraries) liblang_debugger_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEPARTS) -ltdetexteditor -liblang_debugger_la_SOURCES = tdevdebugger.cpp debugger.cpp +liblang_debugger_la_SOURCES = kdevdebugger.cpp debugger.cpp langincludedirdir = $(includedir)/tdevelop/languages/debugger -langincludedir_HEADERS = debugger.h tdevdebugger.h +langincludedir_HEADERS = debugger.h kdevdebugger.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Debugger Support Library -DOXYGEN_DOCDIRPREFIX = tdevlang +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Debugger Support Library +DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/debugger/debugger.cpp b/languages/lib/debugger/debugger.cpp index 341abecd..bc8356b7 100644 --- a/languages/lib/debugger/debugger.cpp +++ b/languages/lib/debugger/debugger.cpp @@ -6,14 +6,14 @@ #include // #include "editorproxy.h" -#include +#include using namespace KTextEditor; Debugger *Debugger::s_instance = 0; -Debugger::Debugger(TDevPartController *partController) +Debugger::Debugger(KDevPartController *partController) :m_partController(partController) { connect( m_partController, TQT_SIGNAL(partAdded(KParts::Part*)), diff --git a/languages/lib/debugger/debugger.h b/languages/lib/debugger/debugger.h index 1f5cbae8..d4112490 100644 --- a/languages/lib/debugger/debugger.h +++ b/languages/lib/debugger/debugger.h @@ -3,7 +3,7 @@ #include -#include "tdevdebugger.h" +#include "kdevdebugger.h" #include #include @@ -11,7 +11,7 @@ #include #include -class TDevPartController; +class KDevPartController; /** * Describes a single breakpoint in the system @@ -54,7 +54,7 @@ private: * point of the debugger. * We may change, add or remove breakpoints in this class. */ -class Debugger : public TDevDebugger +class Debugger : public KDevDebugger { Q_OBJECT @@ -94,7 +94,7 @@ public: // protected: - Debugger(TDevPartController *partController); + Debugger(KDevPartController *partController); ~Debugger(); private slots: @@ -126,7 +126,7 @@ private: }; static Debugger *s_instance; - TDevPartController *m_partController; + KDevPartController *m_partController; TQValueList BPList; }; diff --git a/languages/lib/debugger/tdevdebugger.cpp b/languages/lib/debugger/kdevdebugger.cpp similarity index 88% rename from languages/lib/debugger/tdevdebugger.cpp rename to languages/lib/debugger/kdevdebugger.cpp index e005491f..b9ee4a05 100644 --- a/languages/lib/debugger/tdevdebugger.cpp +++ b/languages/lib/debugger/kdevdebugger.cpp @@ -17,19 +17,19 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdebugger.h" +#include "kdevdebugger.h" -TDevDebugger::TDevDebugger(TQObject *parent, const char *name) +KDevDebugger::KDevDebugger(TQObject *parent, const char *name) : TQObject(parent, name) { } -TDevDebugger::~TDevDebugger() +KDevDebugger::~KDevDebugger() { } -const TQPixmap* TDevDebugger::inactiveBreakpointPixmap() +const TQPixmap* KDevDebugger::inactiveBreakpointPixmap() { const char*breakpoint_gr_xpm[]={ "11 16 6 1", @@ -59,7 +59,7 @@ const TQPixmap* TDevDebugger::inactiveBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::activeBreakpointPixmap() +const TQPixmap* KDevDebugger::activeBreakpointPixmap() { const char* breakpoint_xpm[]={ "11 16 6 1", @@ -89,7 +89,7 @@ const TQPixmap* TDevDebugger::activeBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::reachedBreakpointPixmap() +const TQPixmap* KDevDebugger::reachedBreakpointPixmap() { const char*breakpoint_bl_xpm[]={ "11 16 7 1", @@ -120,7 +120,7 @@ const TQPixmap* TDevDebugger::reachedBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::disabledBreakpointPixmap() +const TQPixmap* KDevDebugger::disabledBreakpointPixmap() { const char*breakpoint_wh_xpm[]={ "11 16 7 1", @@ -151,7 +151,7 @@ const TQPixmap* TDevDebugger::disabledBreakpointPixmap() return &pixmap; } -const TQPixmap* TDevDebugger::executionPointPixmap() +const TQPixmap* KDevDebugger::executionPointPixmap() { const char*exec_xpm[]={ "11 16 4 1", @@ -179,4 +179,4 @@ const TQPixmap* TDevDebugger::executionPointPixmap() return &pixmap; } -#include "tdevdebugger.moc" +#include "kdevdebugger.moc" diff --git a/languages/lib/debugger/tdevdebugger.h b/languages/lib/debugger/kdevdebugger.h similarity index 93% rename from languages/lib/debugger/tdevdebugger.h rename to languages/lib/debugger/kdevdebugger.h index 3cfcd5de..4cb7df3f 100644 --- a/languages/lib/debugger/tdevdebugger.h +++ b/languages/lib/debugger/kdevdebugger.h @@ -17,8 +17,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVDEBUGGER_H_ -#define _TDEVDEBUGGER_H_ +#ifndef _KDEVDEBUGGER_H_ +#define _KDEVDEBUGGER_H_ #include @@ -31,15 +31,15 @@ * Base class to handle signals from the editor that relate to breakpoints * and the execution point of the debugger. */ -class TDevDebugger : public TQObject +class KDevDebugger : public TQObject { Q_OBJECT public: - TDevDebugger(TQObject *parent=0, const char *name=0); - ~TDevDebugger(); + KDevDebugger(TQObject *parent=0, const char *name=0); + ~KDevDebugger(); /** * Sets a breakpoint in the editor document belong to fileName. diff --git a/languages/lib/designer_integration/Mainpage.dox b/languages/lib/designer_integration/Mainpage.dox index 43070931..1f2db949 100644 --- a/languages/lib/designer_integration/Mainpage.dox +++ b/languages/lib/designer_integration/Mainpage.dox @@ -10,18 +10,18 @@ This library contains base classes to implement GUI designer integration in lang \section usingintegration Using designer integration support library Each language support which wants to use integrated designer, must reimplement @code -virtual TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) +virtual KDevDesignerIntegration *KDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) @endcode -method and return designer integration object (@ref TDevLanguageSupport base class returns 0). +method and return designer integration object (@ref KDevLanguageSupport base class returns 0). Qt designer integration can be easily implemented by reusing @ref QtDesignerIntegration base class. For example, designer method of a language support could look like: @code -TDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type) +KDevDesignerIntegration * MyLanguageSupportPart::designer(KInterfaceDesigner::DesignerType type) { - TDevDesignerIntegration *des = 0; + KDevDesignerIntegration *des = 0; switch (type) { case KInterfaceDesigner::QtDesigner: @@ -40,7 +40,7 @@ return des; @endcode In the code above m_designers is a designer cache declared as: @code -QMap m_designers; +QMap m_designers; @endcode MyLanguageImplementationWidget and MyLanguageQtDesignerIntegration classes are subclasses of @ref QtDesignerIntegration and @ref ImplementationWidget base classes. diff --git a/languages/lib/designer_integration/Makefile.am b/languages/lib/designer_integration/Makefile.am index 41c0395d..6e9680a9 100644 --- a/languages/lib/designer_integration/Makefile.am +++ b/languages/lib/designer_integration/Makefile.am @@ -4,13 +4,13 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ METASOURCES = AUTO libdesignerintegration_la_LDFLAGS = $(all_libraries) lib_LTLIBRARIES = libdesignerintegration.la -libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) +libdesignerintegration_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) libdesignerintegration_la_SOURCES = implementationwidgetbase.ui \ implementationwidget.cpp qtdesignerintegration.cpp langincludedirdir = $(includedir)/tdevelop/languages/designer_integration langincludedir_HEADERS = qtdesignerintegration.h implementationwidget.h implementationwidgetbase.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Designer Integration Support Library +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Designer Integration Support Library include ../../../Doxyfile.am diff --git a/languages/lib/designer_integration/implementationwidget.cpp b/languages/lib/designer_integration/implementationwidget.cpp index 314e9eeb..bdca4558 100644 --- a/languages/lib/designer_integration/implementationwidget.cpp +++ b/languages/lib/designer_integration/implementationwidget.cpp @@ -32,10 +32,10 @@ #include #include -#include +#include #include #include -#include +#include namespace ImplUtils{ class ClassItem: public TDEListViewItem{ @@ -61,7 +61,7 @@ private: }; } -ImplementationWidget::ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) +ImplementationWidget::ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent, const char* name, bool modal) :CreateImplemenationWidgetBase(parent, name, modal), m_part(part) { } diff --git a/languages/lib/designer_integration/implementationwidget.h b/languages/lib/designer_integration/implementationwidget.h index c74947be..3dd53763 100644 --- a/languages/lib/designer_integration/implementationwidget.h +++ b/languages/lib/designer_integration/implementationwidget.h @@ -26,7 +26,7 @@ #include class TDEListViewItem; -class TDevLanguageSupport; +class KDevLanguageSupport; /** Base class for implementation creation widgets. @@ -42,7 +42,7 @@ class ImplementationWidget : public CreateImplemenationWidgetBase Q_OBJECT public: - ImplementationWidget(TDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); + ImplementationWidget(KDevLanguageSupport *part, TQWidget* parent = 0, const char* name = 0, bool modal = false); virtual ~ImplementationWidget(); /*$PUBLIC_FUNCTIONS$*/ @@ -77,7 +77,7 @@ protected slots: virtual void accept(); protected: - TDevLanguageSupport *m_part; + KDevLanguageSupport *m_part; ClassDom m_selectedClass; TQString m_formName; TQString m_baseClassName; diff --git a/languages/lib/designer_integration/qtdesignerintegration.cpp b/languages/lib/designer_integration/qtdesignerintegration.cpp index c2b9ab34..26912ba1 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.cpp +++ b/languages/lib/designer_integration/qtdesignerintegration.cpp @@ -30,16 +30,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "codemodel_utils.h" #include "implementationwidget.h" -QtDesignerIntegration::QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name) - :TDevDesignerIntegration(part, name), m_part(part), m_impl(impl), +QtDesignerIntegration::QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name) + :KDevDesignerIntegration(part, name), m_part(part), m_impl(impl), m_classHasDefinitions(classHasDefinitions) { } diff --git a/languages/lib/designer_integration/qtdesignerintegration.h b/languages/lib/designer_integration/qtdesignerintegration.h index faafec58..f76eecba 100644 --- a/languages/lib/designer_integration/qtdesignerintegration.h +++ b/languages/lib/designer_integration/qtdesignerintegration.h @@ -23,24 +23,24 @@ #include #include -#include "tdevdesignerintegration.h" +#include "kdevdesignerintegration.h" -class TDevLanguageSupport; +class KDevLanguageSupport; class ImplementationWidget; /** TQt Designer integration base class. -Contains language-independent implementation part of a @ref TDevDesignerIntegration interface. +Contains language-independent implementation part of a @ref KDevDesignerIntegration interface. Ready to use in KDevelop language support plugins. Subclasses of this class should reimplement only pure virtual functions in the common case. */ -class QtDesignerIntegration : public TDevDesignerIntegration +class QtDesignerIntegration : public KDevDesignerIntegration { Q_OBJECT public: - QtDesignerIntegration(TDevLanguageSupport *part, ImplementationWidget *impl, + QtDesignerIntegration(KDevLanguageSupport *part, ImplementationWidget *impl, bool classHasDefinitions, const char* name = 0); virtual ~QtDesignerIntegration(); @@ -73,7 +73,7 @@ protected: //Form file - derived class name TQMap m_implementations; - TDevLanguageSupport *m_part; + KDevLanguageSupport *m_part; ImplementationWidget *m_impl; bool m_classHasDefinitions; }; diff --git a/languages/lib/interfaces/CMakeLists.txt b/languages/lib/interfaces/CMakeLists.txt index e8af2f36..370eece3 100644 --- a/languages/lib/interfaces/CMakeLists.txt +++ b/languages/lib/interfaces/CMakeLists.txt @@ -22,7 +22,7 @@ link_directories( ##### headers ################################### -install( FILES tdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces ) +install( FILES kdevpcsimporter.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/languages/interfaces ) ##### other data ################################ @@ -33,7 +33,7 @@ install( FILES tdeveloppcsimporter.desktop DESTINATION ${SERVICETYPES_INSTALL_DI ##### lang_interfaces (shared) ################## tde_add_library( lang_interfaces SHARED AUTOMOC - SOURCES tdevpcsimporter.cpp + SOURCES kdevpcsimporter.cpp VERSION 0.0.0 LINK ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} diff --git a/languages/lib/interfaces/Makefile.am b/languages/lib/interfaces/Makefile.am index 127999e6..c3ed3d00 100644 --- a/languages/lib/interfaces/Makefile.am +++ b/languages/lib/interfaces/Makefile.am @@ -3,14 +3,14 @@ METASOURCES = AUTO langincludedirdir = $(includedir)/tdevelop/languages/interfaces lib_LTLIBRARIES = liblang_interfaces.la liblang_interfaces_la_LDFLAGS = $(all_libraries) -liblang_interfaces_la_SOURCES = tdevpcsimporter.cpp +liblang_interfaces_la_SOURCES = kdevpcsimporter.cpp liblang_interfaces_la_LIBADD = $(LIB_QT) -langincludedir_HEADERS = tdevpcsimporter.h +langincludedir_HEADERS = kdevpcsimporter.h INCLUDES = $(all_includes) servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdeveloppcsimporter.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces tdevutil -DOXYGEN_PROJECTNAME = TDevelop Language Support Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdevlang +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces kdevutil +DOXYGEN_PROJECTNAME = KDevelop Language Support Interfaces Library +DOXYGEN_DOCDIRPREFIX = kdevlang include ../../../Doxyfile.am diff --git a/languages/lib/interfaces/tdevpcsimporter.cpp b/languages/lib/interfaces/kdevpcsimporter.cpp similarity index 81% rename from languages/lib/interfaces/tdevpcsimporter.cpp rename to languages/lib/interfaces/kdevpcsimporter.cpp index 66e29c13..166cc862 100644 --- a/languages/lib/interfaces/tdevpcsimporter.cpp +++ b/languages/lib/interfaces/kdevpcsimporter.cpp @@ -17,19 +17,19 @@ Boston, MA 02110-1301, USA. */ -#include "tdevpcsimporter.h" -#include "tdevpcsimporter.moc" +#include "kdevpcsimporter.h" +#include "kdevpcsimporter.moc" -TDevPCSImporter::TDevPCSImporter( TQObject * parent, const char * name ) +KDevPCSImporter::KDevPCSImporter( TQObject * parent, const char * name ) : TQObject( parent, name ) { } -TDevPCSImporter::~ TDevPCSImporter( ) +KDevPCSImporter::~ KDevPCSImporter( ) { } -TQWidget * TDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) +TQWidget * KDevPCSImporter::createSettingsPage( TQWidget * /*parent*/, const char * /*name*/ ) { return 0; } diff --git a/languages/lib/interfaces/tdevpcsimporter.h b/languages/lib/interfaces/kdevpcsimporter.h similarity index 86% rename from languages/lib/interfaces/tdevpcsimporter.h rename to languages/lib/interfaces/kdevpcsimporter.h index 62878973..870865cb 100644 --- a/languages/lib/interfaces/tdevpcsimporter.h +++ b/languages/lib/interfaces/kdevpcsimporter.h @@ -17,8 +17,8 @@ Boston, MA 02110-1301, USA. */ -#ifndef TDEVPCSIMPORTER_H -#define TDEVPCSIMPORTER_H +#ifndef KDEVPCSIMPORTER_H +#define KDEVPCSIMPORTER_H #include #include @@ -32,13 +32,13 @@ These plugins are used by language support plugins to fill symbol stores with symbol information from certain files. The purpose of the importer is to provide file selection wizard. */ -class TDevPCSImporter: public TQObject +class KDevPCSImporter: public TQObject { Q_OBJECT public: - TDevPCSImporter( TQObject* parent=0, const char* name=0 ); - virtual ~TDevPCSImporter(); + KDevPCSImporter( TQObject* parent=0, const char* name=0 ); + virtual ~KDevPCSImporter(); virtual TQString dbName() const = 0; virtual TQStringList includePaths() = 0; @@ -47,4 +47,4 @@ public: virtual TQWidget* createSettingsPage( TQWidget* parent, const char* name=0 ); }; -#endif // TDEVPCSIMPORTER_H +#endif // KDEVPCSIMPORTER_H diff --git a/languages/pascal/CMakeLists.txt b/languages/pascal/CMakeLists.txt index cd398415..7449570e 100644 --- a/languages/pascal/CMakeLists.txt +++ b/languages/pascal/CMakeLists.txt @@ -34,18 +34,18 @@ link_directories( ##### other data ################################ -install( FILES tdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpascalsupport ) -install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/templates ) +install( FILES kdevpascalsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpascalsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpascalsupport ) +install( FILES pascaltemplates DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/templates ) -##### libtdevpascalsupport (module) ############# +##### libkdevpascalsupport (module) ############# -tde_add_kpart( libtdevpascalsupport AUTOMOC +tde_add_kpart( libkdevpascalsupport AUTOMOC SOURCES pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp - LINK antlr-static tdevcatalog-shared tdevelop-shared + LINK antlr-static kdevcatalog-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/Makefile.am b/languages/pascal/Makefile.am index 403f37f9..9d168734 100644 --- a/languages/pascal/Makefile.am +++ b/languages/pascal/Makefile.am @@ -5,19 +5,19 @@ INCLUDES = -I$(top_srcdir)/lib/antlr -I$(top_srcdir)/lib/catalog \ $(all_includes) SUBDIRS = file_templates app_templates compiler doc -kde_module_LTLIBRARIES = libtdevpascalsupport.la -libtdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) -libtdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libtdevcatalog.la +kde_module_LTLIBRARIES = libkdevpascalsupport.la +libkdevpascalsupport_la_LDFLAGS = $(LEXLIB) $(all_libraries) $(KDE_PLUGIN) +libkdevpascalsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/antlr/src/libantlr.la $(top_builddir)/lib/catalog/libkdevcatalog.la -libtdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp +libkdevpascalsupport_la_SOURCES = pascalsupport_part.cpp PascalLexer.cpp PascalParser.cpp PascalStoreWalker.cpp backgroundparser.cpp configproblemreporter.ui problemreporter.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpascalsupport.desktop +service_DATA = kdevpascalsupport.desktop -rcdir = $(kde_datadir)/tdevpascalsupport -rc_DATA = tdevpascalsupport.rc +rcdir = $(kde_datadir)/kdevpascalsupport +rc_DATA = kdevpascalsupport.rc genparser: antlr pascal.g && antlr pascal.tree.g @@ -29,5 +29,5 @@ genparser: #PascalStoreWalker.hpp PascalStoreWalker.cpp: pascal.tree.g # antlr pascal.tree.g -templatedir = ${kde_datadir}/tdevabbrev/templates +templatedir = ${kde_datadir}/kdevabbrev/templates template_DATA = pascaltemplates diff --git a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt index b4a2e071..eb16e978 100644 --- a/languages/pascal/app_templates/fpcgtk/CMakeLists.txt +++ b/languages/pascal/app_templates/fpcgtk/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpcgtk.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpcgtk.tar.gz fpcgtk.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpcgtk.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpcgtk.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpcgtk/Makefile.am b/languages/pascal/app_templates/fpcgtk/Makefile.am index e9744c9b..5c4c116f 100644 --- a/languages/pascal/app_templates/fpcgtk/Makefile.am +++ b/languages/pascal/app_templates/fpcgtk/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpcgtk ### 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/pascal/app_templates/fpcgtk/app.tdevelop b/languages/pascal/app_templates/fpcgtk/app.tdevelop index bbd6d777..e7b3a147 100644 --- a/languages/pascal/app_templates/fpcgtk/app.tdevelop +++ b/languages/pascal/app_templates/fpcgtk/app.tdevelop @@ -11,7 +11,7 @@ Code - + default @@ -26,8 +26,8 @@ false - - + + ada ada_bugs_gcc @@ -75,12 +75,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate similarity index 99% rename from languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate rename to languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate index d0103844..45bb7eea 100644 --- a/languages/pascal/app_templates/fpcgtk/fpcgtk.tdevtemplate +++ b/languages/pascal/app_templates/fpcgtk/fpcgtk.kdevtemplate @@ -64,7 +64,7 @@ Archive=fpcgtk.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/fpchello/CMakeLists.txt b/languages/pascal/app_templates/fpchello/CMakeLists.txt index 37ac3aa9..12941440 100644 --- a/languages/pascal/app_templates/fpchello/CMakeLists.txt +++ b/languages/pascal/app_templates/fpchello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpchello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpchello.tar.gz fpchello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpchello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpchello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpchello/Makefile.am b/languages/pascal/app_templates/fpchello/Makefile.am index f5567a09..744bc214 100644 --- a/languages/pascal/app_templates/fpchello/Makefile.am +++ b/languages/pascal/app_templates/fpchello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpchello ### 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/pascal/app_templates/fpchello/app.tdevelop b/languages/pascal/app_templates/fpchello/app.tdevelop index 603e6e6b..a2f83092 100644 --- a/languages/pascal/app_templates/fpchello/app.tdevelop +++ b/languages/pascal/app_templates/fpchello/app.tdevelop @@ -11,7 +11,7 @@ Code - + default @@ -26,8 +26,8 @@ true - - + + ada ada_bugs_gcc @@ -75,12 +75,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate similarity index 99% rename from languages/pascal/app_templates/fpchello/fpchello.tdevtemplate rename to languages/pascal/app_templates/fpchello/fpchello.kdevtemplate index 21c213f4..65c46115 100644 --- a/languages/pascal/app_templates/fpchello/fpchello.tdevtemplate +++ b/languages/pascal/app_templates/fpchello/fpchello.kdevtemplate @@ -65,7 +65,7 @@ Archive=fpchello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt index 779eda2d..52a5e4f7 100644 --- a/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt +++ b/languages/pascal/app_templates/fpcsharedlib/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( fpcsharedlib.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/fpcsharedlib.tar.gz fpcsharedlib.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - fpcsharedlib.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + fpcsharedlib.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/fpcsharedlib/Makefile.am b/languages/pascal/app_templates/fpcsharedlib/Makefile.am index 13194e81..d1d0eef4 100644 --- a/languages/pascal/app_templates/fpcsharedlib/Makefile.am +++ b/languages/pascal/app_templates/fpcsharedlib/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = fpcsharedlib ### 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/pascal/app_templates/fpcsharedlib/app.tdevelop b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop index e0289480..8249e017 100644 --- a/languages/pascal/app_templates/fpcsharedlib/app.tdevelop +++ b/languages/pascal/app_templates/fpcsharedlib/app.tdevelop @@ -11,7 +11,7 @@ Code - + default @@ -26,8 +26,8 @@ true - - + + ada ada_bugs_gcc @@ -75,12 +75,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate similarity index 99% rename from languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate rename to languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate index 3c4e93bf..35835599 100644 --- a/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.tdevtemplate +++ b/languages/pascal/app_templates/fpcsharedlib/fpcsharedlib.kdevtemplate @@ -65,7 +65,7 @@ Archive=fpcsharedlib.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/app_templates/pascalhello/CMakeLists.txt b/languages/pascal/app_templates/pascalhello/CMakeLists.txt index a9d1b313..3422a8ff 100644 --- a/languages/pascal/app_templates/pascalhello/CMakeLists.txt +++ b/languages/pascal/app_templates/pascalhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( pascalhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/pascalhello.tar.gz pascalhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - pascalhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + pascalhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/pascal/app_templates/pascalhello/Makefile.am b/languages/pascal/app_templates/pascalhello/Makefile.am index 96ce40c7..3e72435c 100644 --- a/languages/pascal/app_templates/pascalhello/Makefile.am +++ b/languages/pascal/app_templates/pascalhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = main.pp app.tdevelop templateName = pascalhello ### 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/pascal/app_templates/pascalhello/app.tdevelop b/languages/pascal/app_templates/pascalhello/app.tdevelop index 8e571db2..51e8c65e 100644 --- a/languages/pascal/app_templates/pascalhello/app.tdevelop +++ b/languages/pascal/app_templates/pascalhello/app.tdevelop @@ -11,7 +11,7 @@ Code - + default @@ -23,8 +23,8 @@ true - - + + ada ada_bugs_gcc @@ -72,12 +72,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate similarity index 99% rename from languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate rename to languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate index e70ca533..ed7104cb 100644 --- a/languages/pascal/app_templates/pascalhello/pascalhello.tdevtemplate +++ b/languages/pascal/app_templates/pascalhello/pascalhello.kdevtemplate @@ -67,7 +67,7 @@ Archive=pascalhello.tar.gz [GNU] Type=include -File=%{tdevelop}/template-common/gnu.tdevtemplate +File=%{tdevelop}/template-common/gnu.kdevtemplate [FILE1] Type=install diff --git a/languages/pascal/compiler/Makefile.am b/languages/pascal/compiler/Makefile.am index 400962be..c9f7528b 100644 --- a/languages/pascal/compiler/Makefile.am +++ b/languages/pascal/compiler/Makefile.am @@ -1,6 +1,6 @@ # This is the collection of plugins. In contrast to the parts # directory, these are 'transient' in a sense and don't -# share the complete TDevComponent interface. +# share the complete KDevComponent interface. SUBDIRS = dccoptions fpcoptions diff --git a/languages/pascal/compiler/dccoptions/CMakeLists.txt b/languages/pascal/compiler/dccoptions/CMakeLists.txt index 3e7fbcdd..ae6c6388 100644 --- a/languages/pascal/compiler/dccoptions/CMakeLists.txt +++ b/languages/pascal/compiler/dccoptions/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdccoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevdccoptions (module) ################ +##### libkdevdccoptions (module) ################ -tde_add_kpart( libtdevdccoptions AUTOMOC +tde_add_kpart( libkdevdccoptions AUTOMOC SOURCES dccoptionsplugin.cpp optiontabs.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/compiler/dccoptions/Makefile.am b/languages/pascal/compiler/dccoptions/Makefile.am index f913ae45..734e63c5 100644 --- a/languages/pascal/compiler/dccoptions/Makefile.am +++ b/languages/pascal/compiler/dccoptions/Makefile.am @@ -3,14 +3,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevdccoptions.la -libtdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevdccoptions.la +libkdevdccoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevdccoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp +libkdevdccoptions_la_SOURCES = dccoptionsplugin.cpp optiontabs.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdccoptions.desktop +service_DATA = kdevdccoptions.desktop diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp index cffbbdd5..8a8ffc54 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.cpp @@ -19,10 +19,10 @@ #include "optiontabs.h" -K_EXPORT_COMPONENT_FACTORY( libtdevdccoptions, KGenericFactory( "tdevdccoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevdccoptions, KGenericFactory( "kdevdccoptions" ) ) DccOptionsPlugin::DccOptionsPlugin(TQObject *parent, const char *name, const TQStringList/* &args*/) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { } diff --git a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h index b0db639d..d8465520 100644 --- a/languages/pascal/compiler/dccoptions/dccoptionsplugin.h +++ b/languages/pascal/compiler/dccoptions/dccoptionsplugin.h @@ -13,9 +13,9 @@ #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" -class DccOptionsPlugin : public TDevCompilerOptions +class DccOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop similarity index 98% rename from languages/pascal/compiler/dccoptions/tdevdccoptions.desktop rename to languages/pascal/compiler/dccoptions/kdevdccoptions.desktop index 3631eeb9..e99e9385 100644 --- a/languages/pascal/compiler/dccoptions/tdevdccoptions.desktop +++ b/languages/pascal/compiler/dccoptions/kdevdccoptions.desktop @@ -48,7 +48,7 @@ Name[ta]=Dccவிருப்பங்கள் Name[tg]=DccИнтихобҳо Name[zh_TW]=Dcc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevdccoptions +X-TDE-Library=libkdevdccoptions X-TDevelop-Version=5 X-TDevelop-Language=Pascal X-TDevelop-Args=dcc diff --git a/languages/pascal/compiler/fpcoptions/CMakeLists.txt b/languages/pascal/compiler/fpcoptions/CMakeLists.txt index 7d9a010f..12c9ef89 100644 --- a/languages/pascal/compiler/fpcoptions/CMakeLists.txt +++ b/languages/pascal/compiler/fpcoptions/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfpcoptions.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevfpcoptions (module) ################ +##### libkdevfpcoptions (module) ################ -tde_add_kpart( libtdevfpcoptions AUTOMOC +tde_add_kpart( libkdevfpcoptions AUTOMOC SOURCES fpcoptionsplugin.cpp optiontabs.cpp - LINK tdevwidgets-shared tdevextras-shared + LINK kdevwidgets-shared kdevextras-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/languages/pascal/compiler/fpcoptions/Makefile.am b/languages/pascal/compiler/fpcoptions/Makefile.am index 3d105f6f..70579448 100644 --- a/languages/pascal/compiler/fpcoptions/Makefile.am +++ b/languages/pascal/compiler/fpcoptions/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extras \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevfpcoptions.la -libtdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevfpcoptions.la +libkdevfpcoptions_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +libkdevfpcoptions_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(LIB_TDEHTML) -libtdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp +libkdevfpcoptions_la_SOURCES = fpcoptionsplugin.cpp optiontabs.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfpcoptions.desktop +service_DATA = kdevfpcoptions.desktop diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp index 31babced..0b01fb01 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.cpp @@ -16,10 +16,10 @@ #include "optiontabs.h" #include "fpcoptionsplugin.h" -K_EXPORT_COMPONENT_FACTORY( libtdevfpcoptions, KGenericFactory( "tdevfpcoptions" ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevfpcoptions, KGenericFactory( "kdevfpcoptions" ) ) FpcOptionsPlugin::FpcOptionsPlugin(TQObject *parent, const char *name, const TQStringList& /*args*/) - : TDevCompilerOptions(parent, name) + : KDevCompilerOptions(parent, name) { } diff --git a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h index cee18e79..e30b33c0 100644 --- a/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h +++ b/languages/pascal/compiler/fpcoptions/fpcoptionsplugin.h @@ -13,9 +13,9 @@ #include -#include "tdevcompileroptions.h" +#include "kdevcompileroptions.h" -class FpcOptionsPlugin : public TDevCompilerOptions +class FpcOptionsPlugin : public KDevCompilerOptions { Q_OBJECT diff --git a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop similarity index 98% rename from languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop rename to languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop index da25b683..660e973d 100644 --- a/languages/pascal/compiler/fpcoptions/tdevfpcoptions.desktop +++ b/languages/pascal/compiler/fpcoptions/kdevfpcoptions.desktop @@ -47,7 +47,7 @@ Name[ta]=Fpcவிருப்பங்கள் Name[tg]=FpcИнтихобҳо Name[zh_TW]=Fpc 選項 ServiceTypes=TDevelop/CompilerOptions -X-TDE-Library=libtdevfpcoptions +X-TDE-Library=libkdevfpcoptions X-TDevelop-Version=5 X-TDevelop-Language=Pascal X-TDevelop-Args=fpc diff --git a/languages/pascal/doc/CMakeLists.txt b/languages/pascal/doc/CMakeLists.txt index 37627f81..ade55abb 100644 --- a/languages/pascal/doc/CMakeLists.txt +++ b/languages/pascal/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES pascal_bugs_fp.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/pascal/doc/Makefile.am b/languages/pascal/doc/Makefile.am index bf36ead8..a7829d08 100644 --- a/languages/pascal/doc/Makefile.am +++ b/languages/pascal/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = pascal_bugs_fp.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/pascal/file_templates/CMakeLists.txt b/languages/pascal/file_templates/CMakeLists.txt index 5a55baad..812d0398 100644 --- a/languages/pascal/file_templates/CMakeLists.txt +++ b/languages/pascal/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES dpr pas-program pas-unit pp-program pp-unit - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/pascal/file_templates/Makefile.am b/languages/pascal/file_templates/Makefile.am index fe16bfb0..94891c97 100644 --- a/languages/pascal/file_templates/Makefile.am +++ b/languages/pascal/file_templates/Makefile.am @@ -1,2 +1,2 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = dpr pas-program pas-unit pp-program pp-unit diff --git a/languages/pascal/tdevpascalsupport.desktop b/languages/pascal/kdevpascalsupport.desktop similarity index 99% rename from languages/pascal/tdevpascalsupport.desktop rename to languages/pascal/kdevpascalsupport.desktop index 85c50c20..65e9f851 100644 --- a/languages/pascal/tdevpascalsupport.desktop +++ b/languages/pascal/kdevpascalsupport.desktop @@ -79,6 +79,6 @@ GenericName[tr]=Pascal Dil Desteği GenericName[zh_CN]=Pascal 语言支持 GenericName[zh_TW]=Pascal 語言支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevpascalsupport +X-TDE-Library=libkdevpascalsupport X-TDevelop-Version=5 X-TDevelop-Language=Pascal diff --git a/languages/pascal/tdevpascalsupport.rc b/languages/pascal/kdevpascalsupport.rc similarity index 100% rename from languages/pascal/tdevpascalsupport.rc rename to languages/pascal/kdevpascalsupport.rc diff --git a/languages/pascal/pascalsupport_part.cpp b/languages/pascal/pascalsupport_part.cpp index 3b9d8263..69cbebf8 100644 --- a/languages/pascal/pascalsupport_part.cpp +++ b/languages/pascal/pascalsupport_part.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include #include @@ -23,11 +23,11 @@ #include #include "catalog.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include "pascalsupport_part.h" #include "problemreporter.h" @@ -43,16 +43,16 @@ struct PascalSupportPartData{ {} }; -typedef TDevGenericFactory PascalSupportFactory; -static const TDevPluginInfo data("tdevpascalsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevpascalsupport, PascalSupportFactory( data ) ) +typedef KDevGenericFactory PascalSupportFactory; +static const KDevPluginInfo data("kdevpascalsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevpascalsupport, PascalSupportFactory( data ) ) PascalSupportPart::PascalSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), + : KDevLanguageSupport(&data, parent, name ? name : "KDevPascalSupport" ), d( new PascalSupportPartData() ) { setInstance(PascalSupportFactory::instance()); - setXMLFile("tdevpascalsupport.rc"); + setXMLFile("kdevpascalsupport.rc"); d->problemReporter = new ProblemReporter( this ); connect( core(), TQT_SIGNAL(configWidget(KDialogBase*)), @@ -317,7 +317,7 @@ TQString PascalSupportPart::formatModelItem( const CodeModelItem * item, bool sh return arg.stripWhiteSpace(); } else - return TDevLanguageSupport::formatModelItem( item, shortDescription ); + return KDevLanguageSupport::formatModelItem( item, shortDescription ); } #include "pascalsupport_part.moc" diff --git a/languages/pascal/pascalsupport_part.h b/languages/pascal/pascalsupport_part.h index bac5c25b..5c99c2ae 100644 --- a/languages/pascal/pascalsupport_part.h +++ b/languages/pascal/pascalsupport_part.h @@ -7,11 +7,11 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * ***************************************************************************/ -#ifndef __TDEVPART_PASCALSUPPORT_H__ -#define __TDEVPART_PASCALSUPPORT_H__ +#ifndef __KDEVPART_PASCALSUPPORT_H__ +#define __KDEVPART_PASCALSUPPORT_H__ #include -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" class PascalSupportWidget; class KDialogBase; @@ -19,7 +19,7 @@ class TQPopupMenu; class Context; class PascalSupportPartData; -class PascalSupportPart : public TDevLanguageSupport +class PascalSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/languages/pascal/problemreporter.cpp b/languages/pascal/problemreporter.cpp index 0d33aec1..2b477063 100644 --- a/languages/pascal/problemreporter.cpp +++ b/languages/pascal/problemreporter.cpp @@ -18,8 +18,8 @@ #include "problemreporter.h" #include "pascalsupport_part.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "configproblemreporter.h" #include "backgroundparser.h" diff --git a/languages/perl/CMakeLists.txt b/languages/perl/CMakeLists.txt index 01327acb..e458c240 100644 --- a/languages/perl/CMakeLists.txt +++ b/languages/perl/CMakeLists.txt @@ -30,13 +30,13 @@ link_directories( ##### other data ################################ -install( FILES tdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevperlsupport ) +install( FILES kdevperlsupport.desktop perldoc.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevperlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevperlsupport ) -##### libtdevperlsupport (module) ############### +##### libkdevperlsupport (module) ############### -tde_add_kpart( libtdevperlsupport AUTOMOC +tde_add_kpart( libkdevperlsupport AUTOMOC SOURCES perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui diff --git a/languages/perl/Makefile.am b/languages/perl/Makefile.am index f498dfd3..fcedfa23 100644 --- a/languages/perl/Makefile.am +++ b/languages/perl/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ SUBDIRS = app_templates file_templates doc -kde_module_LTLIBRARIES = libtdevperlsupport.la tdeio_perldoc.la -libtdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevperlsupport.la tdeio_perldoc.la +libkdevperlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevperlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui +libkdevperlsupport_la_SOURCES = perlparser.cpp perlsupportpart.cpp perlconfigwidget.cpp perlconfigwidgetbase.ui tdeio_perldoc_la_SOURCES = perldoc.cpp tdeio_perldoc_la_LIBADD = $(LIB_TDEIO) @@ -19,7 +19,7 @@ tdeio_perldoc_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevperlsupport.desktop perldoc.protocol +service_DATA = kdevperlsupport.desktop perldoc.protocol -rcdir = $(kde_datadir)/tdevperlsupport -rc_DATA = tdevperlsupport.rc +rcdir = $(kde_datadir)/kdevperlsupport +rc_DATA = kdevperlsupport.rc diff --git a/languages/perl/app_templates/perlhello/CMakeLists.txt b/languages/perl/app_templates/perlhello/CMakeLists.txt index 6537b51c..bf51d851 100644 --- a/languages/perl/app_templates/perlhello/CMakeLists.txt +++ b/languages/perl/app_templates/perlhello/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( perlhello.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/perlhello.tar.gz perlhello.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - perlhello.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + perlhello.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/perl/app_templates/perlhello/Makefile.am b/languages/perl/app_templates/perlhello/Makefile.am index a7987969..b483b35b 100644 --- a/languages/perl/app_templates/perlhello/Makefile.am +++ b/languages/perl/app_templates/perlhello/Makefile.am @@ -2,10 +2,10 @@ dataFiles = app.pl app.tdevelop templateName = perlhello ### no need to change below: -template_DATA = $(templateName).tdevtemplate +template_DATA = $(templateName).kdevtemplate templatedir = ${appwizarddatadir}/templates -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard $(templateName).tar.gz: ${dataFiles} $(TAR) -cf $(templateName).tar -C $(srcdir) ${dataFiles} $(GZIP_COMMAND) -f9 $(templateName).tar diff --git a/languages/perl/app_templates/perlhello/app.tdevelop b/languages/perl/app_templates/perlhello/app.tdevelop index 2ae93215..a83391b7 100644 --- a/languages/perl/app_templates/perlhello/app.tdevelop +++ b/languages/perl/app_templates/perlhello/app.tdevelop @@ -9,7 +9,7 @@ . false - + ./%{APPNAMELC}.pl @@ -17,8 +17,8 @@ *.pl,*.pm *~ - - + + ada ada_bugs_gcc @@ -65,13 +65,13 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/perl/app_templates/perlhello/perlhello.tdevtemplate b/languages/perl/app_templates/perlhello/perlhello.kdevtemplate similarity index 100% rename from languages/perl/app_templates/perlhello/perlhello.tdevtemplate rename to languages/perl/app_templates/perlhello/perlhello.kdevtemplate diff --git a/languages/perl/doc/CMakeLists.txt b/languages/perl/doc/CMakeLists.txt index 2e8ed498..653dc0d7 100644 --- a/languages/perl/doc/CMakeLists.txt +++ b/languages/perl/doc/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES perl.toc perl_bugs.toc - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/tocs ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/tocs ) diff --git a/languages/perl/doc/Makefile.am b/languages/perl/doc/Makefile.am index b62295ed..dae5d699 100644 --- a/languages/perl/doc/Makefile.am +++ b/languages/perl/doc/Makefile.am @@ -1,4 +1,4 @@ -tocdir = ${kde_datadir}/tdevdocumentation/tocs +tocdir = ${kde_datadir}/kdevdocumentation/tocs toc_DATA = perl.toc perl_bugs.toc #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/perl/file_templates/CMakeLists.txt b/languages/perl/file_templates/CMakeLists.txt index 96c5fa74..7faec8fc 100644 --- a/languages/perl/file_templates/CMakeLists.txt +++ b/languages/perl/file_templates/CMakeLists.txt @@ -11,4 +11,4 @@ install( FILES pl pm - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/languages/perl/file_templates/Makefile.am b/languages/perl/file_templates/Makefile.am index 5dd94646..f1f8457d 100644 --- a/languages/perl/file_templates/Makefile.am +++ b/languages/perl/file_templates/Makefile.am @@ -1,4 +1,4 @@ -templatedir = $(kde_datadir)/tdevfilecreate/file-templates +templatedir = $(kde_datadir)/kdevfilecreate/file-templates template_DATA = pl pm diff --git a/languages/perl/tdevperlsupport.desktop b/languages/perl/kdevperlsupport.desktop similarity index 98% rename from languages/perl/tdevperlsupport.desktop rename to languages/perl/kdevperlsupport.desktop index 472be4f3..9c637679 100644 --- a/languages/perl/tdevperlsupport.desktop +++ b/languages/perl/kdevperlsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=Perl Desteği GenericName[zh_CN]=Perl 支持 GenericName[zh_TW]=Perl 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevperlsupport +X-TDE-Library=libkdevperlsupport X-TDevelop-Version=5 X-TDevelop-Language=Perl diff --git a/languages/perl/tdevperlsupport.rc b/languages/perl/kdevperlsupport.rc similarity index 100% rename from languages/perl/tdevperlsupport.rc rename to languages/perl/kdevperlsupport.rc diff --git a/languages/perl/perlparser.cpp b/languages/perl/perlparser.cpp index ca7b8dff..60cca8f5 100644 --- a/languages/perl/perlparser.cpp +++ b/languages/perl/perlparser.cpp @@ -22,7 +22,7 @@ #include #include -perlparser::perlparser(TDevCore* core,CodeModel* model, TQString interpreter) { +perlparser::perlparser(KDevCore* core,CodeModel* model, TQString interpreter) { m_core = core; m_model = model; m_interpreter=interpreter; diff --git a/languages/perl/perlparser.h b/languages/perl/perlparser.h index 6249ce15..b536596b 100644 --- a/languages/perl/perlparser.h +++ b/languages/perl/perlparser.h @@ -18,7 +18,7 @@ #ifndef PERLPARSER_H #define PERLPARSER_H -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include @@ -28,7 +28,7 @@ class perlparser { public: - perlparser(TDevCore* core,CodeModel* model, TQString interpreter); + perlparser(KDevCore* core,CodeModel* model, TQString interpreter); perlparser(); ~perlparser(); @@ -70,7 +70,7 @@ class perlparser { //CodeModel CodeModel* m_model; - TDevCore* m_core; + KDevCore* m_core; FileDom m_file; //this willhav a list of INC paths diff --git a/languages/perl/perlsupportpart.cpp b/languages/perl/perlsupportpart.cpp index 08627ea5..c8379c77 100644 --- a/languages/perl/perlsupportpart.cpp +++ b/languages/perl/perlsupportpart.cpp @@ -19,24 +19,24 @@ #include #include #include -#include +#include #include #include #include #include #include #include -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" +#include "kdevappfrontend.h" //#include "classstore.h" //#include "parsedclass.h" //#include "parsedmethod.h" @@ -44,16 +44,16 @@ #include "domutil.h" //#include "programmingbycontract.h" -typedef TDevGenericFactory PerlSupportFactory; -static const TDevPluginInfo data("tdevperlsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevperlsupport, PerlSupportFactory( data ) ) +typedef KDevGenericFactory PerlSupportFactory; +static const KDevPluginInfo data("kdevperlsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevperlsupport, PerlSupportFactory( data ) ) PerlSupportPart::PerlSupportPart(TQObject *parent, const char *name, const TQStringList &) - : TDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") + : KDevLanguageSupport(&data, parent, name ? name : "PerlSupportPart") { setInstance(PerlSupportFactory::instance()); - setXMLFile("tdevperlsupport.rc"); + setXMLFile("kdevperlsupport.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); @@ -174,9 +174,9 @@ void PerlSupportPart::savedFile(const KURL &fileName) } -TDevLanguageSupport::Features PerlSupportPart::features() +KDevLanguageSupport::Features PerlSupportPart::features() { - return TDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); + return KDevLanguageSupport::Features(Classes | Functions | Variables | Namespaces | /*Scripts | */NewClass | AddMethod | AddAttribute /*| NewScript*/); // return Functions; } @@ -193,7 +193,7 @@ TQString PerlSupportPart::interpreter() void PerlSupportPart::startApplication(const TQString &program) { bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevperlsupport/run/terminal"); - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), program, inTerminal); } diff --git a/languages/perl/perlsupportpart.h b/languages/perl/perlsupportpart.h index b6517bbc..00c6bc69 100644 --- a/languages/perl/perlsupportpart.h +++ b/languages/perl/perlsupportpart.h @@ -12,11 +12,11 @@ #ifndef _PERLSUPPORTPART_H_ #define _PERLSUPPORTPART_H_ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include #include "perlparser.h" -class PerlSupportPart : public TDevLanguageSupport +class PerlSupportPart : public KDevLanguageSupport { Q_OBJECT 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 @@ KDevVisualBoyAdvance - + *.php,*.phps,*.php3,*.inc - - + + ada ada_bugs_gcc @@ -65,23 +65,23 @@ KDE Libraries (Doxygen) - - + + true true true - - + + - - + + - + diff --git a/languages/php/app_templates/phphello/phphello.tdevtemplate b/languages/php/app_templates/phphello/phphello.kdevtemplate similarity index 100% rename from languages/php/app_templates/phphello/phphello.tdevtemplate rename to 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 similarity index 98% rename from languages/php/tdevphpsupport.desktop rename to 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 similarity index 100% rename from languages/php/tdevphpsupport.rc rename to 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 +#include #include #include #include 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 #include -#include +#include #include #include @@ -36,7 +36,7 @@ #include -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 -#include -#include +#include +#include +#include #include #include 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 #include -#include +#include #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 #include -#include -#include -#include +#include +#include +#include #include #include 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 +#include /** *@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 #include -#include -#include +#include +#include #include #include 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 #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include -#include +#include #include #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 #include -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include -#include +#include #include @@ -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 PHPSupportFactory; +typedef KDevGenericFactory PHPSupportFactory; #endif 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 @@ - + ./%{APPNAMELC}.py - - + + ada ada_bugs_gcc @@ -61,8 +61,8 @@ KDE Libraries (Doxygen) - - + + false *.o,*.lo,CVS @@ -71,11 +71,11 @@ - - + + - + diff --git a/languages/python/app_templates/pyqt/pyqt.tdevtemplate b/languages/python/app_templates/pyqt/pyqt.kdevtemplate similarity index 99% rename from languages/python/app_templates/pyqt/pyqt.tdevtemplate rename to 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 @@ - + %{APPNAMELC}.py - - + + ada ada_bugs_gcc @@ -66,8 +66,8 @@ KDE Libraries (Doxygen) - - + + false *.o,*.lo,CVS @@ -75,10 +75,10 @@ - - + + - + diff --git a/languages/python/app_templates/pythonhello/pythonhello.tdevtemplate b/languages/python/app_templates/pythonhello/pythonhello.kdevtemplate similarity index 100% rename from languages/python/app_templates/pythonhello/pythonhello.tdevtemplate rename to 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 @@ - + %{APPNAMELC}.py - - + + ada ada_bugs_gcc @@ -64,8 +64,8 @@ KDE Libraries (Doxygen) - - + + false *.o,*.lo,CVS @@ -73,10 +73,10 @@ - - + + - + diff --git a/languages/python/app_templates/pytk/pytk.tdevtemplate b/languages/python/app_templates/pytk/pytk.kdevtemplate similarity index 100% rename from languages/python/app_templates/pytk/pytk.tdevtemplate rename to 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 old mode 100644 new mode 100755 similarity index 100% rename from languages/python/tde_pydoc.py rename to languages/python/kde_pydoc.py diff --git a/languages/python/tdevpythonsupport.desktop b/languages/python/kdevpythonsupport.desktop similarity index 98% rename from languages/python/tdevpythonsupport.desktop rename to 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 similarity index 100% rename from languages/python/tdevpythonsupport.rc rename to 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 #include -#include -#include +#include +#include -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 -#include -#include -#include +#include +#include +#include +#include #include #include @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include @@ -38,16 +38,16 @@ #include "qtdesignerpythonintegration.h" #include "pythonimplementationwidget.h" -typedef TDevGenericFactory PythonSupportFactory; -static const TDevPluginInfo data("tdepythonsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevpythonsupport, PythonSupportFactory( data ) ) +typedef KDevGenericFactory 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("Create or select implementation

Creates or selects a subclass of selected form for use with integrated TDevDesigner.")); + popup->setWhatsThis(id, i18n("Create or select implementation

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("TDevelop/AppFrontend")) + bool inTerminal = DomUtil::readBoolEntry(*projectDom(), "/kdevpythonsupport/run/terminal"); + if (KDevAppFrontend *appFrontend = extension("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 m_designers; + TQMap 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 #include -#include -#include -#include +#include +#include +#include #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(); 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 @@ KDE - + src/%{APPNAMELC} - - + + - - + + ada ada_bugs_gcc @@ -63,29 +63,29 @@ qmake User Guide - - + + libtool - - + + - - + + ruby false 3 src/main.rb - - + + Doxygen Documentation Collection %{APPNAMELC}.tag - + diff --git a/languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate b/languages/ruby/app_templates/dcopservice/dcopserviceruby.kdevtemplate similarity index 98% rename from languages/ruby/app_templates/dcopservice/dcopserviceruby.tdevtemplate rename to 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 similarity index 60% rename from languages/ruby/app_templates/tdeapp/CMakeLists.txt rename to 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 similarity index 81% rename from languages/ruby/app_templates/tdeapp/Makefile.am rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/README rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/app-Makefile.am rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/app-configure.in.in rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/app.cpp rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/app.desktop rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/app.rb rename to 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 similarity index 89% rename from languages/ruby/app_templates/tdeapp/app.tdevelop rename to 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 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + src/%{APPNAMELC} - - + + false CVS,.svn @@ -35,8 +35,8 @@ - - + + ada ada_bugs_gcc @@ -72,19 +72,19 @@ w3c-uaag10 wxwindows_bugs - - + + - - + + ruby false 3 src/main.rb - + diff --git a/languages/ruby/app_templates/tdeapp/app_client.rb b/languages/ruby/app_templates/kapp/app_client.rb similarity index 100% rename from languages/ruby/app_templates/tdeapp/app_client.rb rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/appiface.rb rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/appui.rc rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/appview.rb rename to 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 similarity index 98% rename from languages/ruby/app_templates/tdeapp/tdeappruby.tdevtemplate rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/tdeappruby.png rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/main.rb rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/pref.rb rename to 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 similarity index 100% rename from languages/ruby/app_templates/tdeapp/src-Makefile.am rename to languages/ruby/app_templates/kapp/src-Makefile.am diff --git a/languages/ruby/app_templates/tdeapp/subdirs b/languages/ruby/app_templates/kapp/subdirs similarity index 100% rename from languages/ruby/app_templates/tdeapp/subdirs rename to 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 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + src/%{APPNAMELC} - - + + false CVS,.svn @@ -35,8 +35,8 @@ - - + + ada ada_bugs_gcc @@ -72,19 +72,19 @@ w3c-uaag10 wxwindows_bugs - - + + - - + + ruby false 3 src/main.rb - + diff --git a/languages/ruby/app_templates/kxt/kxtruby.tdevtemplate b/languages/ruby/app_templates/kxt/kxtruby.kdevtemplate similarity index 98% rename from languages/ruby/app_templates/kxt/kxtruby.tdevtemplate rename to 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} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Ruby Ruby @@ -14,15 +14,15 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + - - + + false CVS,.svn @@ -31,8 +31,8 @@ - - + + ada ada_bugs_gcc @@ -68,18 +68,18 @@ w3c-uaag10 wxwindows_bugs - - + + - - + + ./%{APPNAMELC}.rb ruby false - + diff --git a/languages/ruby/app_templates/qtruby/qtruby.tdevtemplate b/languages/ruby/app_templates/qtruby/qtruby.kdevtemplate similarity index 100% rename from languages/ruby/app_templates/qtruby/qtruby.tdevtemplate rename to 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 similarity index 100% rename from languages/ruby/app_templates/qtruby4app/qtruby4app.tdevtemplate rename to 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} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Ruby Ruby Qt - + - - + + @@ -27,8 +27,8 @@ false CVS,.svn - - + + bash bash_bugs @@ -63,21 +63,21 @@ KDE Libraries (Doxygen) - + - + - - + + ruby false ./main.rb - + 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 similarity index 100% rename from languages/ruby/app_templates/qtrubyapp/qtrubyapp.tdevtemplate rename to 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} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Ruby Ruby Qt - + - - + + @@ -27,8 +27,8 @@ false CVS,.svn - - + + bash bash_bugs @@ -63,21 +63,21 @@ KDE Libraries (Doxygen) - + - + - - + + ruby false ./main.rb - + 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 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + *.rb,*.rhtml,*.rxml,*.rjs,*.css,*.js,*.html.erb,*.js.rjs,*.xml.builder *~ - - + + @@ -34,8 +34,8 @@ - - + + ada ada_bugs_gcc @@ -82,8 +82,8 @@ KDE Libraries (Doxygen) - - + + @@ -95,13 +95,13 @@ - - + + ruby %{dest}/script/console false script/server - + diff --git a/languages/ruby/app_templates/rails/rails.tdevtemplate b/languages/ruby/app_templates/rails/rails.kdevtemplate similarity index 100% rename from languages/ruby/app_templates/rails/rails.tdevtemplate rename to 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 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + *.rb *~ - - + + - - + + ada ada_bugs_gcc @@ -74,18 +74,18 @@ KDE Libraries (Doxygen) - - + + - - + + ./%{APPNAMELC}.rb ruby false - + diff --git a/languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate b/languages/ruby/app_templates/rubyhello/rubyhello.kdevtemplate similarity index 100% rename from languages/ruby/app_templates/rubyhello/rubyhello.tdevtemplate rename to 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 #include #include -#include +#include #include #include #include @@ -40,12 +40,12 @@ #include #include -#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 -#include +#include #include namespace RDBDebugger { -static const TDevPluginInfo data("tdevrbdebugger"); +static const KDevPluginInfo data("kdevrbdebugger"); -typedef TDevGenericFactory RubyDebuggerFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevrbdebugger, RubyDebuggerFactory( data ) ) +typedef KDevGenericFactory 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("TDevelop/AppFrontend"); + return extension("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 -#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 similarity index 99% rename from languages/ruby/debugger/tdevrbdebugger.desktop rename to 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 similarity index 100% rename from languages/ruby/debugger/tdevrbdebugger.rc rename to 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 similarity index 98% rename from languages/ruby/tdevrubysupport.desktop rename to 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 similarity index 100% rename from languages/ruby/tdevrubysupport.rc rename to 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 #include -#include -#include -#include +#include +#include +#include #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 #include -#include -#include +#include +#include -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 #include @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include @@ -37,15 +37,15 @@ #include -typedef TDevGenericFactory RubySupportFactory; -static const TDevPluginInfo data("tdevrubysupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevrubysupport, RubySupportFactory( data ) ) +typedef KDevGenericFactory 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("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("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("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("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("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("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::const_iterator it = m_designers.begin(); + for (TQMap::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("Create or select implementation

Creates or selects a subclass of selected form for use with integrated TDevDesigner.")); + popup->setWhatsThis(id, i18n("Create or select implementation

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 -#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 m_designers; + TQMap m_designers; TQString m_contextFileName; TQCString m_shell; - TQGuardedPtr m_shellWidget; + TQGuardedPtr m_shellWidget; }; diff --git a/languages/sql/CMakeLists.txt b/languages/sql/CMakeLists.txt index 67d5aef5..8e7d41cc 100644 --- a/languages/sql/CMakeLists.txt +++ b/languages/sql/CMakeLists.txt @@ -30,13 +30,13 @@ link_directories( ##### other data ################################ -install( FILES tdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsqlsupport ) +install( FILES kdevsqlsupport.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevsqlsupport.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsqlsupport ) -##### libtdevsqlsupport (module) ################ +##### libkdevsqlsupport (module) ################ -tde_add_kpart( libtdevsqlsupport AUTOMOC +tde_add_kpart( libkdevsqlsupport AUTOMOC SOURCES sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp diff --git a/languages/sql/Makefile.am b/languages/sql/Makefile.am index eb48a72f..ba410a98 100644 --- a/languages/sql/Makefile.am +++ b/languages/sql/Makefile.am @@ -5,16 +5,16 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ $(all_includes) SUBDIRS = app_templates doc -kde_module_LTLIBRARIES = libtdevsqlsupport.la -libtdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevsqlsupport.la +libkdevsqlsupport_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsqlsupport_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp +libkdevsqlsupport_la_SOURCES = sqlconfigwidget.ui sqlsupport_part.cpp sqlactions.cpp sqloutputwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevsqlsupport.desktop +service_DATA = kdevsqlsupport.desktop -rcdir = $(kde_datadir)/tdevsqlsupport -rc_DATA = tdevsqlsupport.rc +rcdir = $(kde_datadir)/kdevsqlsupport +rc_DATA = kdevsqlsupport.rc diff --git a/languages/sql/app_templates/sqlsimple/CMakeLists.txt b/languages/sql/app_templates/sqlsimple/CMakeLists.txt index 290dd962..05ddb17f 100644 --- a/languages/sql/app_templates/sqlsimple/CMakeLists.txt +++ b/languages/sql/app_templates/sqlsimple/CMakeLists.txt @@ -17,9 +17,9 @@ add_custom_target( sqlsimple.tar.gz ALL install( FILES ${CMAKE_CURRENT_BINARY_DIR}/sqlsimple.tar.gz sqlsimple.png - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) install( FILES - sqlsimple.tdevtemplate - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/templates ) + sqlsimple.kdevtemplate + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/templates ) diff --git a/languages/sql/app_templates/sqlsimple/Makefile.am b/languages/sql/app_templates/sqlsimple/Makefile.am index 1b49cc21..6bfae1c4 100644 --- a/languages/sql/app_templates/sqlsimple/Makefile.am +++ b/languages/sql/app_templates/sqlsimple/Makefile.am @@ -2,10 +2,10 @@ templateName = sqlsimple dataFiles = app.sql app.tdevelop ### 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/sql/app_templates/sqlsimple/app.tdevelop b/languages/sql/app_templates/sqlsimple/app.tdevelop index 6977b304..7fc4efc9 100644 --- a/languages/sql/app_templates/sqlsimple/app.tdevelop +++ b/languages/sql/app_templates/sqlsimple/app.tdevelop @@ -11,22 +11,22 @@ KDevdistpart - TDevDebugger + KDevDebugger - + src *.sql *~ - - + + - - + + ada ada_bugs_gcc @@ -75,10 +75,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate b/languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate similarity index 100% rename from languages/sql/app_templates/sqlsimple/sqlsimple.tdevtemplate rename to languages/sql/app_templates/sqlsimple/sqlsimple.kdevtemplate diff --git a/languages/sql/doc/Makefile.am b/languages/sql/doc/Makefile.am index f6fd6d52..d42aec82 100644 --- a/languages/sql/doc/Makefile.am +++ b/languages/sql/doc/Makefile.am @@ -1,4 +1,4 @@ -#tocdir = ${kde_datadir}/tdevdoctreeview/tocs +#tocdir = ${kde_datadir}/kdevdoctreeview/tocs #toc_DATA = #indexdir = ${kde_datadir}/devdoctreeview/indices diff --git a/languages/sql/tdevsqlsupport.desktop b/languages/sql/kdevsqlsupport.desktop similarity index 98% rename from languages/sql/tdevsqlsupport.desktop rename to languages/sql/kdevsqlsupport.desktop index 5357d127..f5ee67ab 100644 --- a/languages/sql/tdevsqlsupport.desktop +++ b/languages/sql/kdevsqlsupport.desktop @@ -79,7 +79,7 @@ GenericName[tr]=SQL Desteği GenericName[zh_CN]=SQL 支持 GenericName[zh_TW]=SQL 支援 ServiceTypes=TDevelop/LanguageSupport -X-TDE-Library=libtdevsqlsupport +X-TDE-Library=libkdevsqlsupport X-TDevelop-Version=5 X-TDevelop-Language=SQL X-TDevelop-Args=SQL diff --git a/languages/sql/tdevsqlsupport.rc b/languages/sql/kdevsqlsupport.rc similarity index 100% rename from languages/sql/tdevsqlsupport.rc rename to languages/sql/kdevsqlsupport.rc diff --git a/languages/sql/sqlactions.cpp b/languages/sql/sqlactions.cpp index f737b694..1d1a5b14 100644 --- a/languages/sql/sqlactions.cpp +++ b/languages/sql/sqlactions.cpp @@ -21,8 +21,8 @@ #include #include -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" #include "sqlsupport_part.h" SqlListAction::SqlListAction(SQLSupportPart *part, const TQString &text, diff --git a/languages/sql/sqlconfigwidget.ui.h b/languages/sql/sqlconfigwidget.ui.h index e58930f9..c06413e7 100644 --- a/languages/sql/sqlconfigwidget.ui.h +++ b/languages/sql/sqlconfigwidget.ui.h @@ -195,7 +195,7 @@ void SqlConfigWidget::accept() { Q_ASSERT( doc ); - TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/tdevsqlsupport/servers" ); + TQDomElement dbElem = DomUtil::createElementByPath( *doc, "/kdevsqlsupport/servers" ); DomUtil::makeEmpty( dbElem ); for ( int i = 0; i < dbTable->numRows() - 1; i++ ) { @@ -206,7 +206,7 @@ void SqlConfigWidget::accept() << SQLSupportPart::cryptStr( ((PasswordTableItem*)dbTable->item( i, 5 ))->password ); DomUtil::writeListEntry( *doc, - "/tdevsqlsupport/servers/server" + TQString::number( i ), + "/kdevsqlsupport/servers/server" + TQString::number( i ), "el", db ); } if ( changed ) @@ -227,7 +227,7 @@ void SqlConfigWidget::loadConfig() TQStringList db; int i = 0; while ( true ) { - TQStringList db = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList db = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( db.isEmpty() ) return; diff --git a/languages/sql/sqlsupport_part.cpp b/languages/sql/sqlsupport_part.cpp index c4d0a235..2ecb2ec4 100644 --- a/languages/sql/sqlsupport_part.cpp +++ b/languages/sql/sqlsupport_part.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include @@ -16,28 +16,28 @@ #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevlanguagesupport.h" -#include "tdevpartcontroller.h" -#include "tdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevlanguagesupport.h" +#include "kdevpartcontroller.h" +#include "kdevproject.h" #include "codemodel.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "sqlconfigwidget.h" #include "sqlactions.h" #include "sqloutputwidget.h" #include "domutil.h" -typedef TDevGenericFactory SQLSupportFactory; -static const TDevPluginInfo data("tdevsqlsupport"); -K_EXPORT_COMPONENT_FACTORY( libtdevsqlsupport, SQLSupportFactory( data ) ) +typedef KDevGenericFactory SQLSupportFactory; +static const KDevPluginInfo data("kdevsqlsupport"); +K_EXPORT_COMPONENT_FACTORY( libkdevsqlsupport, SQLSupportFactory( data ) ) SQLSupportPart::SQLSupportPart( TQObject *parent, const char *name, const TQStringList& ) - : TDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) + : KDevLanguageSupport ( &data, parent, name ? name : "SQLSupportPart" ) { setInstance( SQLSupportFactory::instance() ); - setXMLFile( "tdevsqlsupport.rc" ); + setXMLFile( "kdevsqlsupport.rc" ); TDEAction *action; action = new TDEAction( i18n( "&Run" ), "exec", Key_F9, this, TQT_SLOT( slotRun() ), actionCollection(), "build_execute" ); @@ -106,7 +106,7 @@ void SQLSupportPart::loadConfig() int i = 0; TQString conName; while ( true ) { - TQStringList sdb = DomUtil::readListEntry( *doc, "tdevsqlsupport/servers/server" + TQString::number( i ), "el" ); + TQStringList sdb = DomUtil::readListEntry( *doc, "kdevsqlsupport/servers/server" + TQString::number( i ), "el" ); if ( (int)sdb.size() < 6 ) break; @@ -267,7 +267,7 @@ void SQLSupportPart::savedFile( const KURL &fileName ) } } -TDevLanguageSupport::Features SQLSupportPart::features() +KDevLanguageSupport::Features SQLSupportPart::features() { return Features( Classes | Functions ); } diff --git a/languages/sql/sqlsupport_part.h b/languages/sql/sqlsupport_part.h index 4798d7fa..d5efca5b 100644 --- a/languages/sql/sqlsupport_part.h +++ b/languages/sql/sqlsupport_part.h @@ -1,5 +1,5 @@ -#ifndef __TDEVPART_SQLSUPPORT_H__ -#define __TDEVPART_SQLSUPPORT_H__ +#ifndef __KDEVPART_SQLSUPPORT_H__ +#define __KDEVPART_SQLSUPPORT_H__ #include #include @@ -7,14 +7,14 @@ #include #include -#include "tdevplugin.h" -#include "tdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevlanguagesupport.h" class SqlListAction; class SqlOutputWidget; class CodeModel; -class SQLSupportPart : public TDevLanguageSupport +class SQLSupportPart : public KDevLanguageSupport { Q_OBJECT diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index e9088337..0398ddf0 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -31,9 +31,9 @@ link_directories( tde_add_library( tdevelop SHARED SOURCES dummy.cpp VERSION 1.0.0 - EMBED tdevutil-static tdevinterfaces-static + EMBED kdevutil-static kdevinterfaces-static LINK - tdevpropertyeditor-shared + kdevpropertyeditor-shared tdescript-shared tdeparts-shared tdetexteditor-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/Makefile.am b/lib/Makefile.am index 55b974c5..d590051e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -1,4 +1,4 @@ -# Here resides the library of general TDevelop-related utilities, +# Here resides the library of general KDevelop-related utilities, # which may be linked by any plugin or part. This is installed # as a shared library, including header files @@ -6,11 +6,11 @@ INCLUDES = $(all_includes) lib_LTLIBRARIES = libtdevelop.la libtdevelop_la_LDFLAGS = -no-undefined $(all_libraries) -version-info 1:0 -libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la \ - $(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(LIB_TDEIO) +libtdevelop_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la \ + $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(LIB_TDEIO) -# $(top_builddir)/lib/util/libtdevutil.la $(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la \ -# $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la \ +# $(top_builddir)/lib/util/libkdevutil.la $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la \ +# $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la \ # -ltdetexteditor $(LIB_TDEPARTS) $(LIB_TDEIO) -ltdescript libtdevelop_la_SOURCES = dummy.cpp diff --git a/lib/catalog/CMakeLists.txt b/lib/catalog/CMakeLists.txt index 13b008d1..5c1b4f2b 100644 --- a/lib/catalog/CMakeLists.txt +++ b/lib/catalog/CMakeLists.txt @@ -28,9 +28,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/catalog ) -##### tdevcatalog (shared) ###################### +##### kdevcatalog (shared) ###################### -tde_add_library( tdevcatalog SHARED AUTOMOC +tde_add_library( kdevcatalog SHARED AUTOMOC SOURCES tag.cpp catalog.cpp VERSION 0.0.0 LINK tdecore-shared ${BDB_LIBRARY} diff --git a/lib/catalog/Makefile.am b/lib/catalog/Makefile.am index e45a2530..c8c7ddc1 100644 --- a/lib/catalog/Makefile.am +++ b/lib/catalog/Makefile.am @@ -1,13 +1,13 @@ INCLUDES = $(all_includes) $(DB3INCLUDES) -lib_LTLIBRARIES = libtdevcatalog.la -libtdevcatalog_la_SOURCES = tag.cpp catalog.cpp -libtdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS) -libtdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT) +lib_LTLIBRARIES = libkdevcatalog.la +libkdevcatalog_la_SOURCES = tag.cpp catalog.cpp +libkdevcatalog_la_LDFLAGS = -no-undefined $(all_libraries) $(DB3LDFLAGS) +libkdevcatalog_la_LIBADD = -l$(DB3LIB) $(LIB_TDECORE) $(LIB_QT) -tdevcatalogincludedir = $(includedir)/tdevelop/catalog -tdevcataloginclude_HEADERS = catalog.h tag.h +kdevcatalogincludedir = $(includedir)/tdevelop/catalog +kdevcataloginclude_HEADERS = catalog.h tag.h DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils DOXYGEN_PROJECTNAME = TDevelop Catalog Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/cppparser/CMakeLists.txt b/lib/cppparser/CMakeLists.txt index 20db36c5..3b53e900 100644 --- a/lib/cppparser/CMakeLists.txt +++ b/lib/cppparser/CMakeLists.txt @@ -31,13 +31,13 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/cppparser ) -##### tdevcppparser (shared) #################### +##### kdevcppparser (shared) #################### -tde_add_library( tdevcppparser SHARED AUTOMOC +tde_add_library( kdevcppparser SHARED AUTOMOC SOURCES ast.cpp cachemanager.cpp driver.cpp errors.cpp lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp VERSION 0.0.0 - LINK tdevinterfaces-static tdeio-shared + LINK kdevinterfaces-static tdeio-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/lib/cppparser/Makefile.am b/lib/cppparser/Makefile.am index 082c8227..4e62cebf 100644 --- a/lib/cppparser/Makefile.am +++ b/lib/cppparser/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) AM_CXXFLAGS = -DKDEVELOP_BGPARSER -lib_LTLIBRARIES = libtdevcppparser.la -libtdevcppparser_la_LDFLAGS = $(all_libraries) -libtdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libtdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript -libtdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ +lib_LTLIBRARIES = libkdevcppparser.la +libkdevcppparser_la_LDFLAGS = $(all_libraries) +libkdevcppparser_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(top_builddir)/lib/interfaces/libkdevinterfaces.la -lDCOP $(LIB_TDEUI) $(LIB_TDEPARTS) -ltdetexteditor $(LIB_TDEIO) -ltdescript +libkdevcppparser_la_SOURCES = ast.cpp cachemanager.cpp driver.cpp errors.cpp \ lexer.cpp lexercache.cpp lookup.cpp parser.cpp tree_parser.cpp -tdevcppparserincludedir = $(includedir)/tdevelop/cppparser -tdevcppparserinclude_HEADERS = ast.h driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h +kdevcppparserincludedir = $(includedir)/tdevelop/cppparser +kdevcppparserinclude_HEADERS = ast.h driver.h lexer.h parser.h tree_parser.h errors.h lookup.h cachemanager.h lexercache.h macro.h diff --git a/lib/cppparser/lexer.cpp b/lib/cppparser/lexer.cpp index 5f01a19e..5325c80f 100644 --- a/lib/cppparser/lexer.cpp +++ b/lib/cppparser/lexer.cpp @@ -30,7 +30,7 @@ #if defined( KDEVELOP_BGPARSER ) #include -class TDevTread: public TQThread +class KDevTread: public TQThread { public: static void yield() @@ -41,7 +41,7 @@ public: inline void qthread_yield() { - TDevTread::yield(); + KDevTread::yield(); } #endif diff --git a/lib/interfaces/CMakeLists.txt b/lib/interfaces/CMakeLists.txt index 47d6855d..94b07bec 100644 --- a/lib/interfaces/CMakeLists.txt +++ b/lib/interfaces/CMakeLists.txt @@ -27,12 +27,12 @@ include_directories( ##### headers ################################### install( FILES - tdevlanguagesupport.h tdevmainwindow.h tdevpartcontroller.h - tdevplugin.h tdevproject.h tdevcore.h tdevcoderepository.h + kdevlanguagesupport.h kdevmainwindow.h kdevpartcontroller.h + kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.h codemodel.h codemodel_utils.h codemodel_treeparser.h - tdevgenericfactory.h tdevapi.h tdevdesignerintegration.h - tdevplugincontroller.h tdevplugininfo.h TDevCoreIface.h - TDevPartControllerIface.h katedocumentmanagerinterface.h + kdevgenericfactory.h kdevapi.h kdevdesignerintegration.h + kdevplugincontroller.h kdevplugininfo.h KDevCoreIface.h + KDevPartControllerIface.h katedocumentmanagerinterface.h hashedstring.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces ) @@ -42,20 +42,20 @@ install( FILES DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -##### tdevinterfaces (static) ################### +##### kdevinterfaces (static) ################### -tde_add_library( tdevinterfaces STATIC_PIC AUTOMOC +tde_add_library( kdevinterfaces STATIC_PIC AUTOMOC SOURCES - tdevcore.cpp tdevproject.cpp tdevlanguagesupport.cpp - tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel - tdevmainwindow.cpp TDevPartControllerIface.skel - tdevplugin.cpp tdevcoderepository.cpp + kdevcore.cpp kdevproject.cpp kdevlanguagesupport.cpp + kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel + kdevmainwindow.cpp KDevPartControllerIface.skel + kdevplugin.cpp kdevcoderepository.cpp codemodel.cpp codemodel_treeparser.cpp - codemodel_utils.cpp tdevdesignerintegration.cpp - tdevplugincontroller.cpp tdevplugininfo.cpp - TDevCoreIface.cpp TDevPartControllerIface.cpp + codemodel_utils.cpp kdevdesignerintegration.cpp + kdevplugincontroller.cpp kdevplugininfo.cpp + KDevCoreIface.cpp KDevPartControllerIface.cpp katedocumentmanagerinterface.cpp - katedocumentmanagerinterface.skel tdevprojectiface.cpp - tdevprojectiface.skel tdevdesignerintegrationiface.cpp - tdevdesignerintegrationiface.skel hashedstring.cpp + katedocumentmanagerinterface.skel kdevprojectiface.cpp + kdevprojectiface.skel kdevdesignerintegrationiface.cpp + kdevdesignerintegrationiface.skel hashedstring.cpp ) diff --git a/lib/interfaces/TDevCoreIface.cpp b/lib/interfaces/KDevCoreIface.cpp similarity index 80% rename from lib/interfaces/TDevCoreIface.cpp rename to lib/interfaces/KDevCoreIface.cpp index 39d4bb97..aa70e01b 100644 --- a/lib/interfaces/TDevCoreIface.cpp +++ b/lib/interfaces/KDevCoreIface.cpp @@ -22,38 +22,38 @@ */ #include #include -#include "TDevCoreIface.h" -#include "tdevcore.h" +#include "KDevCoreIface.h" +#include "kdevcore.h" -TDevCoreIface::TDevCoreIface(TDevCore *core) - : TQObject(core), DCOPObject("TDevCore"), m_core(core) +KDevCoreIface::KDevCoreIface(KDevCore *core) + : TQObject(core), DCOPObject("KDevCore"), m_core(core) { connect( m_core, TQT_SIGNAL(projectOpened()), this, TQT_SLOT(forwardProjectOpened()) ); connect( m_core, TQT_SIGNAL(projectClosed()), this, TQT_SLOT(forwardProjectClosed()) ); } -TDevCoreIface::~TDevCoreIface() +KDevCoreIface::~KDevCoreIface() {} -void TDevCoreIface::forwardProjectOpened() +void KDevCoreIface::forwardProjectOpened() { kdDebug(9000) << "dcop emitting project opened" << endl; emitDCOPSignal("projectOpened()", TQByteArray()); } -void TDevCoreIface::forwardProjectClosed() +void KDevCoreIface::forwardProjectClosed() { kdDebug(9000) << "dcop emitting project closed" << endl; emitDCOPSignal("projectClosed()", TQByteArray()); } -void TDevCoreIface::openProject( const TQString & projectFileName ) +void KDevCoreIface::openProject( const TQString & projectFileName ) { m_core->openProject(projectFileName); } -#include "TDevCoreIface.moc" +#include "KDevCoreIface.moc" diff --git a/lib/interfaces/TDevCoreIface.h b/lib/interfaces/KDevCoreIface.h similarity index 86% rename from lib/interfaces/TDevCoreIface.h rename to lib/interfaces/KDevCoreIface.h index f259005a..612c8457 100644 --- a/lib/interfaces/TDevCoreIface.h +++ b/lib/interfaces/KDevCoreIface.h @@ -18,16 +18,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVCOREIFACE_H_ -#define _TDEVCOREIFACE_H_ +#ifndef _KDEVCOREIFACE_H_ +#define _KDEVCOREIFACE_H_ #include #include -class TDevCore; +class KDevCore; -class TDevCoreIface : public TQObject, public DCOPObject +class KDevCoreIface : public TQObject, public DCOPObject { Q_OBJECT // @@ -35,8 +35,8 @@ class TDevCoreIface : public TQObject, public DCOPObject public: - TDevCoreIface( TDevCore *core ); - ~TDevCoreIface(); + KDevCoreIface( KDevCore *core ); + ~KDevCoreIface(); k_dcop: void openProject(const TQString& projectFileName); @@ -46,7 +46,7 @@ private slots: void forwardProjectClosed(); private: - TDevCore *m_core; + KDevCore *m_core; }; #endif diff --git a/lib/interfaces/TDevPartControllerIface.cpp b/lib/interfaces/KDevPartControllerIface.cpp similarity index 70% rename from lib/interfaces/TDevPartControllerIface.cpp rename to lib/interfaces/KDevPartControllerIface.cpp index e8bd1bb7..1b184453 100644 --- a/lib/interfaces/TDevPartControllerIface.cpp +++ b/lib/interfaces/KDevPartControllerIface.cpp @@ -21,12 +21,12 @@ #include -#include "TDevPartControllerIface.h" -#include "tdevpartcontroller.h" +#include "KDevPartControllerIface.h" +#include "kdevpartcontroller.h" -TDevPartControllerIface::TDevPartControllerIface(TDevPartController *pc) - : TQObject(pc), DCOPObject("TDevPartController"), m_controller(pc) +KDevPartControllerIface::KDevPartControllerIface(KDevPartController *pc) + : TQObject(pc), DCOPObject("KDevPartController"), m_controller(pc) { connect(pc, TQT_SIGNAL(loadedFile(const KURL &)), this, TQT_SLOT(forwardLoadedFile(const KURL &))); connect(pc, TQT_SIGNAL(savedFile(const KURL &)), this, TQT_SLOT(forwardSavedFile(const KURL &))); @@ -34,62 +34,62 @@ TDevPartControllerIface::TDevPartControllerIface(TDevPartController *pc) } -TDevPartControllerIface::~TDevPartControllerIface() +KDevPartControllerIface::~KDevPartControllerIface() { } -void TDevPartControllerIface::editDocument(const TQString &url, int lineNum) +void KDevPartControllerIface::editDocument(const TQString &url, int lineNum) { m_controller->editDocument(KURL(url), lineNum); } -void TDevPartControllerIface::showDocument(const TQString &url, bool newWin) +void KDevPartControllerIface::showDocument(const TQString &url, bool newWin) { m_controller->showDocument(KURL(url), newWin); } -void TDevPartControllerIface::saveAllFiles() +void KDevPartControllerIface::saveAllFiles() { m_controller->saveAllFiles(); } -void TDevPartControllerIface::revertAllFiles() +void KDevPartControllerIface::revertAllFiles() { m_controller->revertAllFiles(); } -void TDevPartControllerIface::forwardLoadedFile(const KURL &fileName) +void KDevPartControllerIface::forwardLoadedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting loadedFile " << fileName << endl; emitDCOPSignal("projectOpened()", TQByteArray()); } -void TDevPartControllerIface::forwardSavedFile(const KURL &fileName) +void KDevPartControllerIface::forwardSavedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting savedFile " << fileName << endl; emitDCOPSignal("projectClosed()", TQByteArray()); } -void TDevPartControllerIface::forwardClosedFile(const KURL &fileName) +void KDevPartControllerIface::forwardClosedFile(const KURL &fileName) { kdDebug(9000) << "dcop emitting closedFile " << fileName << endl; emitDCOPSignal("projectClosed()", TQByteArray()); } -bool TDevPartControllerIface::closeAllFiles( ) +bool KDevPartControllerIface::closeAllFiles( ) { return m_controller->closeAllFiles(); } -uint TDevPartControllerIface::documentState( const KURL & url ) +uint KDevPartControllerIface::documentState( const KURL & url ) { return (uint) m_controller->documentState(url); } -#include "TDevPartControllerIface.moc" +#include "KDevPartControllerIface.moc" diff --git a/lib/interfaces/TDevPartControllerIface.h b/lib/interfaces/KDevPartControllerIface.h similarity index 83% rename from lib/interfaces/TDevPartControllerIface.h rename to lib/interfaces/KDevPartControllerIface.h index 87a4e04e..8c3647ea 100644 --- a/lib/interfaces/TDevPartControllerIface.h +++ b/lib/interfaces/KDevPartControllerIface.h @@ -16,16 +16,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVPARTCONTROLLERIFACE_H_ -#define _TDEVPARTCONTROLLERIFACE_H_ +#ifndef _KDEVPARTCONTROLLERIFACE_H_ +#define _KDEVPARTCONTROLLERIFACE_H_ #include #include #include -class TDevPartController; +class KDevPartController; -class TDevPartControllerIface : public TQObject, public DCOPObject +class KDevPartControllerIface : public TQObject, public DCOPObject { Q_OBJECT // @@ -33,8 +33,8 @@ class TDevPartControllerIface : public TQObject, public DCOPObject public: - TDevPartControllerIface(TDevPartController *pc); - ~TDevPartControllerIface(); + KDevPartControllerIface(KDevPartController *pc); + ~KDevPartControllerIface(); k_dcop: @@ -56,7 +56,7 @@ private slots: private: - TDevPartController *m_controller; + KDevPartController *m_controller; }; diff --git a/lib/interfaces/Makefile.am b/lib/interfaces/Makefile.am index 93533492..1944f4f9 100644 --- a/lib/interfaces/Makefile.am +++ b/lib/interfaces/Makefile.am @@ -1,27 +1,27 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/cppparser \ $(all_includes) -noinst_LTLIBRARIES = libtdevinterfaces.la +noinst_LTLIBRARIES = libkdevinterfaces.la -libtdevinterfaces_la_SOURCES = tdevcore.cpp tdevproject.cpp \ - tdevlanguagesupport.cpp tdevpartcontroller.cpp tdevapi.cpp TDevCoreIface.skel \ - tdevmainwindow.cpp TDevPartControllerIface.skel tdevplugin.cpp tdevcoderepository.cpp \ +libkdevinterfaces_la_SOURCES = kdevcore.cpp kdevproject.cpp \ + kdevlanguagesupport.cpp kdevpartcontroller.cpp kdevapi.cpp KDevCoreIface.skel \ + kdevmainwindow.cpp KDevPartControllerIface.skel kdevplugin.cpp kdevcoderepository.cpp \ codemodel.cpp codemodel_treeparser.cpp codemodel_utils.cpp \ - tdevdesignerintegration.cpp tdevplugincontroller.cpp tdevplugininfo.cpp TDevCoreIface.cpp \ - TDevPartControllerIface.cpp katedocumentmanagerinterface.cpp katedocumentmanagerinterface.skel \ - tdevprojectiface.cpp tdevprojectiface.skel tdevdesignerintegrationiface.cpp \ - tdevdesignerintegrationiface.skel hashedstring.cpp -libtdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries) -libtdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \ - $(top_builddir)/lib/util/libtdevutil.la \ + kdevdesignerintegration.cpp kdevplugincontroller.cpp kdevplugininfo.cpp KDevCoreIface.cpp \ + KDevPartControllerIface.cpp katedocumentmanagerinterface.cpp katedocumentmanagerinterface.skel \ + kdevprojectiface.cpp kdevprojectiface.skel kdevdesignerintegrationiface.cpp \ + kdevdesignerintegrationiface.skel hashedstring.cpp +libkdevinterfaces_la_LDFLAGS = -no-undefined $(all_libraries) +libkdevinterfaces_la_LIBADD = $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la \ + $(top_builddir)/lib/util/libkdevutil.la \ $(LIB_TDEUI) $(LIB_TDEHTML) $(LIB_TDEPARTS) -ltdetexteditor -ltdescript -lDCOP tdevelopincludedir = $(includedir)/tdevelop/interfaces -tdevelopinclude_HEADERS = tdevlanguagesupport.h tdevmainwindow.h \ - tdevpartcontroller.h tdevplugin.h tdevproject.h tdevcore.h tdevcoderepository.h codemodel.h \ - codemodel_utils.h codemodel_treeparser.h tdevgenericfactory.h tdevapi.h \ - tdevdesignerintegration.h tdevplugincontroller.h tdevplugininfo.h TDevCoreIface.h \ - TDevPartControllerIface.h katedocumentmanagerinterface.h \ +tdevelopinclude_HEADERS = kdevlanguagesupport.h kdevmainwindow.h \ + kdevpartcontroller.h kdevplugin.h kdevproject.h kdevcore.h kdevcoderepository.h codemodel.h \ + codemodel_utils.h codemodel_treeparser.h kdevgenericfactory.h kdevapi.h \ + kdevdesignerintegration.h kdevplugincontroller.h kdevplugininfo.h KDevCoreIface.h \ + KDevPartControllerIface.h katedocumentmanagerinterface.h \ hashedstring.h @@ -33,8 +33,8 @@ METASOURCES = AUTO SUBDIRS = extensions external extras -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil designer_integration tdevcatalog tdevprofileslib tdevextensions +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil designer_integration kdevcatalog kdevprofileslib kdevextensions DOXYGEN_PROJECTNAME = TDevelop Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am -noinst_HEADERS = tdevprojectiface.h tdevdesignerintegrationiface.h +noinst_HEADERS = kdevprojectiface.h kdevdesignerintegrationiface.h diff --git a/lib/interfaces/extensions/CMakeLists.txt b/lib/interfaces/extensions/CMakeLists.txt index cf5514be..459c1197 100644 --- a/lib/interfaces/extensions/CMakeLists.txt +++ b/lib/interfaces/extensions/CMakeLists.txt @@ -22,9 +22,9 @@ include_directories( ##### headers ################################### install( FILES - codebrowserfrontend.h tdevappfrontend.h tdevcreatefile.h - tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h - tdevsourceformatter.h tdevversioncontrol.h + codebrowserfrontend.h kdevappfrontend.h kdevcreatefile.h + kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h + kdevsourceformatter.h kdevversioncontrol.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions ) install( FILES @@ -35,20 +35,20 @@ install( FILES DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -##### tdevextensions (static) ################### +##### kdevextensions (static) ################### add_custom_command( OUTPUT codebrowserfrontend.moc.cpp COMMAND ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h -o codebrowserfrontend.moc.cpp DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/codebrowserfrontend.h ) -add_custom_command( OUTPUT tdevversioncontrol.moc.cpp +add_custom_command( OUTPUT kdevversioncontrol.moc.cpp COMMAND - ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h -o tdevversioncontrol.moc.cpp - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tdevversioncontrol.h ) + ${TMOC_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h -o kdevversioncontrol.moc.cpp + DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/kdevversioncontrol.h ) -tde_add_library( tdevextensions STATIC_PIC AUTOMOC +tde_add_library( kdevextensions STATIC_PIC AUTOMOC SOURCES - tdevappfrontend.cpp tdevappfrontend.cpp tdevmakefrontend.cpp - codebrowserfrontend.moc.cpp tdevversioncontrol.moc.cpp + kdevappfrontend.cpp kdevappfrontend.cpp kdevmakefrontend.cpp + codebrowserfrontend.moc.cpp kdevversioncontrol.moc.cpp ) diff --git a/lib/interfaces/extensions/Mainpage.dox b/lib/interfaces/extensions/Mainpage.dox index 37c72c16..3b493fde 100644 --- a/lib/interfaces/extensions/Mainpage.dox +++ b/lib/interfaces/extensions/Mainpage.dox @@ -10,8 +10,8 @@ This library contains extension interfaces used by TDevelop plugin architecture. \section whatisextension What is the TDevelop extension Extension is a TDevelop plugin which implements one of extension interfaces. -Extension is usually not important enough to be returned by @ref TDevApi and @ref TDevPlugin -methods. Therefore extension instance can be obtained by @ref TDevPlugin::extension method. +Extension is usually not important enough to be returned by @ref KDevApi and @ref KDevPlugin +methods. Therefore extension instance can be obtained by @ref KDevPlugin::extension method. Note: extension plugins can be either core, global and project plugins. They are loaded in the same way other plugins are. But extensions differ from usual plugins. @@ -36,10 +36,10 @@ those should be loaded at a time. This can be accomplished by: @endcode - Define an abstract base class for an extension like: @code - class KDevMyExtension: public TDevPlugin { + class KDevMyExtension: public KDevPlugin { public: - KDevMyExtension(const TDevPluginInfo *info, QObject* parent, const char* name) - :TDevPlugin(info, parent, name) {} + KDevMyExtension(const KDevPluginInfo *info, QObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} virtual void doSomething() = 0; }; diff --git a/lib/interfaces/extensions/Makefile.am b/lib/interfaces/extensions/Makefile.am index 55f4d774..a6d00bc2 100644 --- a/lib/interfaces/extensions/Makefile.am +++ b/lib/interfaces/extensions/Makefile.am @@ -1,7 +1,7 @@ tdevelopincludeextdir = $(includedir)/tdevelop/interfaces/extensions -tdevelopincludeext_HEADERS = codebrowserfrontend.h tdevappfrontend.h \ - tdevcreatefile.h tdevdifffrontend.h tdevmakefrontend.h tdevquickopen.h \ - tdevsourceformatter.h tdevversioncontrol.h +tdevelopincludeext_HEADERS = codebrowserfrontend.h kdevappfrontend.h \ + kdevcreatefile.h kdevdifffrontend.h kdevmakefrontend.h kdevquickopen.h \ + kdevsourceformatter.h kdevversioncontrol.h servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdevelopappfrontend.desktop \ @@ -10,14 +10,14 @@ servicetype_DATA = tdevelopappfrontend.desktop \ tdevelopversioncontrol.desktop SUBDIRS = dcop -libtdevextensions_la_LDFLAGS = $(all_libraries) -noinst_LTLIBRARIES = libtdevextensions.la -libtdevextensions_la_SOURCES = tdevappfrontend.cpp tdevmakefrontend.cpp +libkdevextensions_la_LDFLAGS = $(all_libraries) +noinst_LTLIBRARIES = libkdevextensions.la +libkdevextensions_la_SOURCES = kdevappfrontend.cpp kdevmakefrontend.cpp INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) METASOURCES = AUTO -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Extension Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Extension Interfaces Library +DOXYGEN_DOCDIRPREFIX = kdev include ../../../Doxyfile.am noinst_HEADERS = codebrowserfrontend.h diff --git a/lib/interfaces/extensions/codebrowserfrontend.h b/lib/interfaces/extensions/codebrowserfrontend.h index 68c4e90f..e8158fe4 100644 --- a/lib/interfaces/extensions/codebrowserfrontend.h +++ b/lib/interfaces/extensions/codebrowserfrontend.h @@ -20,18 +20,18 @@ #define CODEBROWSERRONTEND_H -#include +#include #include namespace Extensions { -class TDevCodeBrowserFrontend : public TDevPlugin { +class KDevCodeBrowserFrontend : public KDevPlugin { Q_OBJECT public: - TDevCodeBrowserFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :TDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} + KDevCodeBrowserFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "CodeBrowserFrontend") {} ///Used by the quickopen-plugin to notify extensions that it jumped to a searched item virtual bool jumpedToItem( ItemDom item ) = 0; diff --git a/lib/interfaces/extensions/dcop/CMakeLists.txt b/lib/interfaces/extensions/dcop/CMakeLists.txt index 8658d320..b6255fc6 100644 --- a/lib/interfaces/extensions/dcop/CMakeLists.txt +++ b/lib/interfaces/extensions/dcop/CMakeLists.txt @@ -21,14 +21,14 @@ include_directories( ##### headers ################################### install( FILES - TDevAppFrontendIface.h TDevMakeFrontendIface.h + KDevAppFrontendIface.h KDevMakeFrontendIface.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extensions/dcop ) -##### tdevdcopextensions (static) ############### +##### kdevdcopextensions (static) ############### -tde_add_library( tdevdcopextensions STATIC_PIC +tde_add_library( kdevdcopextensions STATIC_PIC SOURCES - TDevAppFrontendIface.cpp TDevMakeFrontendIface.cpp - TDevAppFrontendIface.skel TDevMakeFrontendIface.skel + KDevAppFrontendIface.cpp KDevMakeFrontendIface.cpp + KDevAppFrontendIface.skel KDevMakeFrontendIface.skel ) diff --git a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp similarity index 69% rename from lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp rename to lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp index a42d0d7d..1eca4bfc 100644 --- a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.cpp @@ -21,56 +21,56 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "TDevAppFrontendIface.h" -#include "tdevappfrontend.h" +#include "KDevAppFrontendIface.h" +#include "kdevappfrontend.h" -TDevAppFrontendIface::TDevAppFrontendIface(TDevAppFrontend *appFrontend) - : DCOPObject("TDevAppFrontend"), m_appFrontend(appFrontend) +KDevAppFrontendIface::KDevAppFrontendIface(KDevAppFrontend *appFrontend) + : DCOPObject("KDevAppFrontend"), m_appFrontend(appFrontend) { } -TDevAppFrontendIface::~TDevAppFrontendIface() +KDevAppFrontendIface::~KDevAppFrontendIface() {} -void TDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal) +void KDevAppFrontendIface::startAppCommand(const TQString &directory, const TQString &command, bool inTerminal) { m_appFrontend->startAppCommand(directory, command, inTerminal); } -void TDevAppFrontendIface::stopApplication( ) +void KDevAppFrontendIface::stopApplication( ) { m_appFrontend->stopApplication(); } -bool TDevAppFrontendIface::isRunning( ) +bool KDevAppFrontendIface::isRunning( ) { return m_appFrontend->isRunning(); } -void TDevAppFrontendIface::clearView( ) +void KDevAppFrontendIface::clearView( ) { m_appFrontend->clearView(); } -void TDevAppFrontendIface::insertStderrLine( const TQCString & line ) +void KDevAppFrontendIface::insertStderrLine( const TQCString & line ) { m_appFrontend->insertStderrLine(line); } -void TDevAppFrontendIface::insertStdoutLine( const TQCString & line ) +void KDevAppFrontendIface::insertStdoutLine( const TQCString & line ) { m_appFrontend->insertStdoutLine(line); } -void TDevAppFrontendIface::addPartialStderrLine( const TQCString& line ) +void KDevAppFrontendIface::addPartialStderrLine( const TQCString& line ) { m_appFrontend->addPartialStderrLine(line); } -void TDevAppFrontendIface::addPartialStdoutLine( const TQCString& line ) +void KDevAppFrontendIface::addPartialStdoutLine( const TQCString& line ) { m_appFrontend->addPartialStdoutLine(line); } diff --git a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h similarity index 85% rename from lib/interfaces/extensions/dcop/TDevAppFrontendIface.h rename to lib/interfaces/extensions/dcop/KDevAppFrontendIface.h index 5061c782..3903e897 100644 --- a/lib/interfaces/extensions/dcop/TDevAppFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevAppFrontendIface.h @@ -19,21 +19,21 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVAPPFRONTENDIFACE_H_ -#define _TDEVAPPFRONTENDIFACE_H_ +#ifndef _KDEVAPPFRONTENDIFACE_H_ +#define _KDEVAPPFRONTENDIFACE_H_ #include -class TDevAppFrontend; +class KDevAppFrontend; -class TDevAppFrontendIface : public DCOPObject +class KDevAppFrontendIface : public DCOPObject { K_DCOP public: - TDevAppFrontendIface( TDevAppFrontend *appFrontend ); - ~TDevAppFrontendIface(); + KDevAppFrontendIface( KDevAppFrontend *appFrontend ); + ~KDevAppFrontendIface(); k_dcop: void startAppCommand(const TQString &directory, const TQString &command, bool inTerminal); @@ -46,7 +46,7 @@ k_dcop: void addPartialStdoutLine(const TQCString &line); private: - TDevAppFrontend *m_appFrontend; + KDevAppFrontend *m_appFrontend; }; #endif diff --git a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp similarity index 78% rename from lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp rename to lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp index 06bd432f..73305e4a 100644 --- a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.cpp +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.cpp @@ -20,27 +20,27 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "TDevMakeFrontendIface.h" -#include "tdevmakefrontend.h" +#include "KDevMakeFrontendIface.h" +#include "kdevmakefrontend.h" -TDevMakeFrontendIface::TDevMakeFrontendIface(TDevMakeFrontend *makeFrontend) - : DCOPObject("TDevMakeFrontend") +KDevMakeFrontendIface::KDevMakeFrontendIface(KDevMakeFrontend *makeFrontend) + : DCOPObject("KDevMakeFrontend") { m_makeFrontend = makeFrontend; } -TDevMakeFrontendIface::~TDevMakeFrontendIface() +KDevMakeFrontendIface::~KDevMakeFrontendIface() {} -void TDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) +void KDevMakeFrontendIface::queueCommand(const TQString &dir, const TQString &command) { m_makeFrontend->queueCommand(dir, command); } -bool TDevMakeFrontendIface::isRunning( ) +bool KDevMakeFrontendIface::isRunning( ) { return m_makeFrontend->isRunning(); } diff --git a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h similarity index 81% rename from lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h rename to lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h index 3aee75be..53217359 100644 --- a/lib/interfaces/extensions/dcop/TDevMakeFrontendIface.h +++ b/lib/interfaces/extensions/dcop/KDevMakeFrontendIface.h @@ -18,28 +18,28 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef _TDEVMAKEFRONTENDIFACE_H_ -#define _TDEVMAKEFRONTENDIFACE_H_ +#ifndef _KDEVMAKEFRONTENDIFACE_H_ +#define _KDEVMAKEFRONTENDIFACE_H_ #include -class TDevMakeFrontend; +class KDevMakeFrontend; -class TDevMakeFrontendIface : public DCOPObject +class KDevMakeFrontendIface : public DCOPObject { K_DCOP public: - TDevMakeFrontendIface( TDevMakeFrontend *makeFrontend ); - ~TDevMakeFrontendIface(); + KDevMakeFrontendIface( KDevMakeFrontend *makeFrontend ); + ~KDevMakeFrontendIface(); k_dcop: void queueCommand(const TQString &dir, const TQString &command); bool isRunning(); private: - TDevMakeFrontend *m_makeFrontend; + KDevMakeFrontend *m_makeFrontend; }; #endif diff --git a/lib/interfaces/extensions/dcop/Makefile.am b/lib/interfaces/extensions/dcop/Makefile.am index e46606ac..116c4979 100644 --- a/lib/interfaces/extensions/dcop/Makefile.am +++ b/lib/interfaces/extensions/dcop/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions $(all_includes) METASOURCES = AUTO -noinst_LTLIBRARIES = libtdevdcopextensions.la -libtdevdcopextensions_la_LDFLAGS = $(all_libraries) -libtdevdcopextensions_la_SOURCES = TDevAppFrontendIface.cpp \ - TDevMakeFrontendIface.cpp TDevAppFrontendIface.skel TDevMakeFrontendIface.skel +noinst_LTLIBRARIES = libkdevdcopextensions.la +libkdevdcopextensions_la_LDFLAGS = $(all_libraries) +libkdevdcopextensions_la_SOURCES = KDevAppFrontendIface.cpp \ + KDevMakeFrontendIface.cpp KDevAppFrontendIface.skel KDevMakeFrontendIface.skel dcopincludeextdir = $(includedir)/tdevelop/interfaces/extensions/dcop -dcopincludeext_HEADERS = TDevAppFrontendIface.h TDevMakeFrontendIface.h +dcopincludeext_HEADERS = KDevAppFrontendIface.h KDevMakeFrontendIface.h diff --git a/lib/interfaces/extensions/kdevappfrontend.cpp b/lib/interfaces/extensions/kdevappfrontend.cpp new file mode 100644 index 00000000..3d918fe2 --- /dev/null +++ b/lib/interfaces/extensions/kdevappfrontend.cpp @@ -0,0 +1,2 @@ +#include "kdevappfrontend.h" +#include "kdevappfrontend.moc" diff --git a/lib/interfaces/extensions/tdevappfrontend.h b/lib/interfaces/extensions/kdevappfrontend.h similarity index 90% rename from lib/interfaces/extensions/tdevappfrontend.h rename to lib/interfaces/extensions/kdevappfrontend.h index 085d3c9d..76952f35 100644 --- a/lib/interfaces/extensions/tdevappfrontend.h +++ b/lib/interfaces/extensions/kdevappfrontend.h @@ -23,14 +23,14 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVAPPFRONTEND_H -#define TDEVAPPFRONTEND_H +#ifndef KDEVAPPFRONTEND_H +#define KDEVAPPFRONTEND_H #include -#include +#include /** -@file tdevappfrontend.h +@file kdevappfrontend.h Application frontend interface. */ @@ -45,16 +45,16 @@ Currently, this interface defines ways to do the following: Instances that implement this interface are available through extension architecture: @code -TDevAppFrontend *apf = extension("TDevelop/AppFrontend"); +KDevAppFrontend *apf = extension("TDevelop/AppFrontend"); if (apf) { // do something } else { // fail } @endcode -@sa TDevPlugin::extension method documentation. +@sa KDevPlugin::extension method documentation. */ -class TDevAppFrontend : public TDevPlugin +class KDevAppFrontend : public KDevPlugin { Q_OBJECT @@ -66,11 +66,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevAppFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :TDevPlugin(info, parent, name ? name : "TDevAppFrontend") {} + KDevAppFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevAppFrontend") {} /**@return Whether the application is currently running.*/ virtual bool isRunning() = 0; diff --git a/lib/interfaces/extensions/tdevcreatefile.h b/lib/interfaces/extensions/kdevcreatefile.h similarity index 91% rename from lib/interfaces/extensions/tdevcreatefile.h rename to lib/interfaces/extensions/kdevcreatefile.h index b1148e94..35b98d19 100644 --- a/lib/interfaces/extensions/tdevcreatefile.h +++ b/lib/interfaces/extensions/kdevcreatefile.h @@ -17,15 +17,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVCREATEFILE_H -#define TDEVCREATEFILE_H +#ifndef KDEVCREATEFILE_H +#define KDEVCREATEFILE_H #include -#include +#include /** -@file tdevcreatefile.h +@file kdevcreatefile.h File creation facility interface. */ @@ -36,20 +36,20 @@ An abstract class for all extensions that are responsible for file creation. Instances that implement this interface are available through extension architecture: @code -TDevCreateFile *cf = extension("TDevelop/CreateFile"); +KDevCreateFile *cf = extension("TDevelop/CreateFile"); if (cf) { // do something } else { // fail } @endcode -@sa TDevPlugin::extension method documentation. +@sa KDevPlugin::extension method documentation. */ -class TDevCreateFile : public TDevPlugin +class KDevCreateFile : public KDevPlugin { public: - /**File created with @ref TDevCreateFile implementation.*/ + /**File created with @ref KDevCreateFile implementation.*/ class CreatedFile { public: @@ -119,11 +119,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevCreateFile(const TDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) - :TDevPlugin(info, parent, name) {} + KDevCreateFile(const KDevPluginInfo *info, TQObject * parent = 0, const char * name = 0) + :KDevPlugin(info, parent, name) {} /**Creates a new file, within or without the project. Supply as much information as you know. Leave what you don't know as TQString(). diff --git a/lib/interfaces/extensions/tdevdifffrontend.cpp b/lib/interfaces/extensions/kdevdifffrontend.cpp similarity index 82% rename from lib/interfaces/extensions/tdevdifffrontend.cpp rename to lib/interfaces/extensions/kdevdifffrontend.cpp index aa7e0b19..745703e4 100644 --- a/lib/interfaces/extensions/tdevdifffrontend.cpp +++ b/lib/interfaces/extensions/kdevdifffrontend.cpp @@ -18,16 +18,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdifffrontend.h" +#include "kdevdifffrontend.h" -TDevDiffFrontend::TDevDiffFrontend(const TDevPluginInfo *info, TQObject *parent, const char *name) - : TDevPlugin(info, parent, name ? name : "TDevDiffFrontend") +KDevDiffFrontend::KDevDiffFrontend(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") { } -TDevDiffFrontend::~TDevDiffFrontend() +KDevDiffFrontend::~KDevDiffFrontend() { } -#include "tdevdifffrontend.moc" +#include "kdevdifffrontend.moc" diff --git a/lib/interfaces/extensions/tdevdifffrontend.h b/lib/interfaces/extensions/kdevdifffrontend.h similarity index 85% rename from lib/interfaces/extensions/tdevdifffrontend.h rename to lib/interfaces/extensions/kdevdifffrontend.h index c0c343cb..6d4cb2b6 100644 --- a/lib/interfaces/extensions/tdevdifffrontend.h +++ b/lib/interfaces/extensions/kdevdifffrontend.h @@ -18,14 +18,14 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVDIFFFRONTEND_H -#define TDEVDIFFFRONTEND_H +#ifndef KDEVDIFFFRONTEND_H +#define KDEVDIFFFRONTEND_H #include -#include +#include /** -@file tdevdifffrontend.h +@file kdevdifffrontend.h Diff frontend interface. */ @@ -36,16 +36,16 @@ files. Instances that implement this interface are available through extension architecture: @code -TDevDiffFrontend *df = extension("TDevelop/DiffFrontend"); +KDevDiffFrontend *df = extension("TDevelop/DiffFrontend"); if (df) { // do something } else { // fail } @endcode -@sa TDevPlugin::extension method documentation. +@sa KDevPlugin::extension method documentation. */ -class TDevDiffFrontend : public TDevPlugin +class KDevDiffFrontend : public KDevPlugin { public: @@ -55,11 +55,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevDiffFrontend( const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :TDevPlugin(info, parent, name ? name : "TDevDiffFrontend") {} + KDevDiffFrontend( const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevDiffFrontend") {} /**Displays the patch. @param diff A string which contains a patch in unified format.*/ diff --git a/lib/interfaces/extensions/kdevmakefrontend.cpp b/lib/interfaces/extensions/kdevmakefrontend.cpp new file mode 100644 index 00000000..5e035270 --- /dev/null +++ b/lib/interfaces/extensions/kdevmakefrontend.cpp @@ -0,0 +1,2 @@ +#include "kdevmakefrontend.h" +#include "kdevmakefrontend.moc" diff --git a/lib/interfaces/extensions/tdevmakefrontend.h b/lib/interfaces/extensions/kdevmakefrontend.h similarity index 89% rename from lib/interfaces/extensions/tdevmakefrontend.h rename to lib/interfaces/extensions/kdevmakefrontend.h index 47b14fc4..52afa3d3 100644 --- a/lib/interfaces/extensions/tdevmakefrontend.h +++ b/lib/interfaces/extensions/kdevmakefrontend.h @@ -23,14 +23,14 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVMAKEFRONTEND_H -#define TDEVMAKEFRONTEND_H +#ifndef KDEVMAKEFRONTEND_H +#define KDEVMAKEFRONTEND_H #include -#include +#include /** -@file tdevmakefrontend.h +@file kdevmakefrontend.h Make frontend interface. */ @@ -41,16 +41,16 @@ or similar commands to build a project, api documentation, etc. Instances that implement this interface are available through extension architecture: @code -TDevMakeFrontend *mf = extension("TDevelop/MakeFrontend"); +KDevMakeFrontend *mf = extension("TDevelop/MakeFrontend"); if (mf) { // do something } else { // fail } @endcode -@sa TDevPlugin::extension method documentation. +@sa KDevPlugin::extension method documentation. */ -class TDevMakeFrontend : public TDevPlugin +class KDevMakeFrontend : public KDevPlugin { Q_OBJECT @@ -63,11 +63,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevMakeFrontend(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) - :TDevPlugin(info, parent, name ? name : "TDevMakeFrontend") {} + KDevMakeFrontend(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0 ) + :KDevPlugin(info, parent, name ? name : "KDevMakeFrontend") {} /**@return The widget where the make output is shown.*/ virtual TQWidget* widget() { return 0L; } diff --git a/lib/interfaces/extensions/tdevquickopen.h b/lib/interfaces/extensions/kdevquickopen.h similarity index 86% rename from lib/interfaces/extensions/tdevquickopen.h rename to lib/interfaces/extensions/kdevquickopen.h index e1fd2f65..91dce7ca 100644 --- a/lib/interfaces/extensions/tdevquickopen.h +++ b/lib/interfaces/extensions/kdevquickopen.h @@ -16,14 +16,14 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVQUICKOPEN_H -#define TDEVQUICKOPEN_H +#ifndef KDEVQUICKOPEN_H +#define KDEVQUICKOPEN_H -#include +#include #include /** -@file tdevquickopen.h +@file kdevquickopen.h Source formatter interface. */ @@ -39,10 +39,10 @@ if (qo) { // fail } @endcode -@sa @ref TDevPlugin::extension method documentation. +@sa @ref KDevPlugin::extension method documentation. @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation. */ -class KDevQuickOpen : public TDevPlugin +class KDevQuickOpen : public KDevPlugin { public: /**Constructor. @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name) - :TDevPlugin(info, parent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ @@ -81,14 +81,14 @@ public: the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVQUICKOPEN_H -#define TDEVQUICKOPEN_H +#ifndef KDEVQUICKOPEN_H +#define KDEVQUICKOPEN_H -#include +#include #include /** -@file tdevquickopen.h +@file kdevquickopen.h Source formatter interface. */ @@ -104,10 +104,10 @@ if (qo) { // fail } @endcode -@sa @ref TDevPlugin::extension method documentation. +@sa @ref KDevPlugin::extension method documentation. @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation. */ -class KDevQuickOpen : public TDevPlugin +class KDevQuickOpen : public KDevPlugin { public: /**Constructor. @@ -116,11 +116,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevQuickOpen(const TDevPluginInfo *info, TQObject* parent, const char* name) - :TDevPlugin(info, parent, name) {} + KDevQuickOpen(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Shows the file selection dialog. @param text A list of urls to open.*/ diff --git a/lib/interfaces/extensions/tdevsourceformatter.h b/lib/interfaces/extensions/kdevsourceformatter.h similarity index 86% rename from lib/interfaces/extensions/tdevsourceformatter.h rename to lib/interfaces/extensions/kdevsourceformatter.h index 3403a5d2..c4a380cf 100644 --- a/lib/interfaces/extensions/tdevsourceformatter.h +++ b/lib/interfaces/extensions/kdevsourceformatter.h @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVSOURCEFORMATTER_H -#define TDEVSOURCEFORMATTER_H +#ifndef KDEVSOURCEFORMATTER_H +#define KDEVSOURCEFORMATTER_H -#include +#include /** -@file tdevsourceformatter.h +@file kdevsourceformatter.h Source formatter interface. */ @@ -39,10 +39,10 @@ if (sf) { // fail } @endcode -@sa @ref TDevPlugin::extension method documentation. +@sa @ref KDevPlugin::extension method documentation. @sa @ref whatisextension and @ref creatingextension sections of Platform API documentation. */ -class KDevSourceFormatter : public TDevPlugin +class KDevSourceFormatter : public KDevPlugin { public: /**Constructor. @@ -51,11 +51,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - KDevSourceFormatter(const TDevPluginInfo *info, TQObject* parent, const char* name) - :TDevPlugin(info, parent, name) {} + KDevSourceFormatter(const KDevPluginInfo *info, TQObject* parent, const char* name) + :KDevPlugin(info, parent, name) {} /**Formats the source. @param text A string with a code. diff --git a/lib/interfaces/extensions/tdevversioncontrol.h b/lib/interfaces/extensions/kdevversioncontrol.h similarity index 91% rename from lib/interfaces/extensions/tdevversioncontrol.h rename to lib/interfaces/extensions/kdevversioncontrol.h index d796e31f..a19c6275 100644 --- a/lib/interfaces/extensions/tdevversioncontrol.h +++ b/lib/interfaces/extensions/kdevversioncontrol.h @@ -20,8 +20,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVVERSIONCONTROL_H -#define TDEVVERSIONCONTROL_H +#ifndef KDEVVERSIONCONTROL_H +#define KDEVVERSIONCONTROL_H #include #include @@ -29,10 +29,10 @@ #include #include -#include +#include /** -@file tdevversioncontrol.h +@file kdevversioncontrol.h Version control system interface and utility classes. */ @@ -112,7 +112,7 @@ This is a type definition: @code TQMap VCSFileInfoMap; @en */ typedef TQMap VCSFileInfoMap; -class TDevVCSFileInfoProvider; +class KDevVCSFileInfoProvider; /** @@ -123,16 +123,16 @@ VCS support plugins should implement this interface. Instances that implement this interface are available through extension architecture: @code -TDevVersionControl *vcs = extension("TDevelop/VersionControl"); +KDevVersionControl *vcs = extension("TDevelop/VersionControl"); if (vcs) { // do something } else { // fail } @endcode -@sa TDevPlugin::extension method documentation. +@sa KDevPlugin::extension method documentation. */ -class TDevVersionControl: public TDevPlugin +class KDevVersionControl: public KDevPlugin { Q_OBJECT @@ -144,11 +144,11 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevVersionControl(const TDevPluginInfo *info, TQObject *parent, const char *name ) - :TDevPlugin(info, parent, name ) {} + KDevVersionControl(const KDevPluginInfo *info, TQObject *parent, const char *name ) + :KDevPlugin(info, parent, name ) {} /**Creates a new project in the passed path @p dir. This should instantiate VCS infrastructure and import a project into the VCS in that directory. @@ -161,7 +161,7 @@ public: virtual bool fetchFromRepository() = 0; /**@return The file info provider for this version control (0 if none is available).*/ - virtual TDevVCSFileInfoProvider *fileInfoProvider() const = 0; + virtual KDevVCSFileInfoProvider *fileInfoProvider() const = 0; /**Checks if the directory is valid for this version control (for example CVS may check for the presence of "/CVS/" subdir and something else) @@ -182,7 +182,7 @@ signals: /** Basic interface for providing info on file registered in a version control repository repository. */ -class TDevVCSFileInfoProvider: public TQObject +class KDevVCSFileInfoProvider: public TQObject { Q_OBJECT @@ -190,7 +190,7 @@ public: /**Constructor. @param parent The parent VCS plugin. @param name The name of a provider object.*/ - TDevVCSFileInfoProvider(TDevVersionControl *parent, const char *name) + KDevVCSFileInfoProvider(KDevVersionControl *parent, const char *name) : TQObject( parent, name ), m_owner(parent) {} /**Gets the status for local files in the specified directory: @@ -226,14 +226,14 @@ signals: protected: /**@return The version control which owns this provider.*/ - TDevVersionControl *owner() const { return m_owner; } + KDevVersionControl *owner() const { return m_owner; } private: - TDevVersionControl *m_owner; + KDevVersionControl *m_owner; private: - TDevVCSFileInfoProvider( const TDevVCSFileInfoProvider & ); - TDevVCSFileInfoProvider &operator=( const TDevVCSFileInfoProvider & ); + KDevVCSFileInfoProvider( const KDevVCSFileInfoProvider & ); + KDevVCSFileInfoProvider &operator=( const KDevVCSFileInfoProvider & ); }; #endif diff --git a/lib/interfaces/extensions/tdevappfrontend.cpp b/lib/interfaces/extensions/tdevappfrontend.cpp deleted file mode 100644 index 4f7c52a7..00000000 --- a/lib/interfaces/extensions/tdevappfrontend.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "tdevappfrontend.h" -#include "tdevappfrontend.moc" diff --git a/lib/interfaces/extensions/tdevmakefrontend.cpp b/lib/interfaces/extensions/tdevmakefrontend.cpp deleted file mode 100644 index 140d074d..00000000 --- a/lib/interfaces/extensions/tdevmakefrontend.cpp +++ /dev/null @@ -1,2 +0,0 @@ -#include "tdevmakefrontend.h" -#include "tdevmakefrontend.moc" diff --git a/lib/interfaces/external/Mainpage.dox b/lib/interfaces/external/Mainpage.dox index 6c2fb2b9..4ed571dd 100644 --- a/lib/interfaces/external/Mainpage.dox +++ b/lib/interfaces/external/Mainpage.dox @@ -30,7 +30,7 @@ are connected to corresponding Q_SLOTS of TDevelop designer integration engine w Each language support which wants to use integrated designer, must reimplement @code -virtual TDevDesignerIntegration *TDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) +virtual KDevDesignerIntegration *KDevLanguageSupport::designer(KInterfaceDesigner::DesignerType type) @endcode method and return designer integration object. @@ -39,15 +39,15 @@ developers. With the convenience library writing %Qt designer integration for th trivial task. -\section tdevdesigner KDevelop Designer technical overview -KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designer. It is called KDevelop Designer (TDevDesigner, tdevdesigner from the command line). TDevDesigner has some important differences: -- TDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. TDevelop IDE embeds TDevDesigner this way. -- TDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system. +\section kdevdesigner KDevelop Designer technical overview +KDevelop version >= 3.1 comes with a customized version (fork ;)) of %Qt Designer. It is called KDevelop Designer (KDevDesigner, kdevdesigner from the command line). KDevDesigner has some important differences: +- KDevDesigner provides a read/write KPart which can be embedded into any application which wants to edit .ui files. TDevelop IDE embeds KDevDesigner this way. +- KDevDesigner uses %KDE icons and dialogs and thus provides better integration with a system. . -It is safe to preview forms with some %KDE widgets from tdeui and tdeio libraries - TDevDesigner part is linked to those libraries so it will not crash under some circumstances. +It is safe to preview forms with some %KDE widgets from tdeui and tdeio libraries - KDevDesigner part is linked to those libraries so it will not crash under some circumstances. -TDevDesigner will not create .ui.h files - this feature is completely disabled. Integrated TDevDesigner will use subclassing approach, standalone does not allow to enter code. +KDevDesigner will not create .ui.h files - this feature is completely disabled. Integrated KDevDesigner will use subclassing approach, standalone does not allow to enter code. \section other Other information diff --git a/lib/interfaces/extras/CMakeLists.txt b/lib/interfaces/extras/CMakeLists.txt index afe233aa..eb4cdb75 100644 --- a/lib/interfaces/extras/CMakeLists.txt +++ b/lib/interfaces/extras/CMakeLists.txt @@ -22,7 +22,7 @@ link_directories( ##### headers ################################### install( FILES - tdevcompileroptions.h tdevvcsintegrator.h + kdevcompileroptions.h kdevvcsintegrator.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/interfaces/extras ) install( FILES @@ -30,10 +30,10 @@ install( FILES DESTINATION ${SERVICETYPES_INSTALL_DIR} ) -##### tdevextras (shared) ####################### +##### kdevextras (shared) ####################### -tde_add_library( tdevextras SHARED AUTOMOC - SOURCES tdevcompileroptions.cpp tdevvcsintegrator.cpp +tde_add_library( kdevextras SHARED AUTOMOC + SOURCES kdevcompileroptions.cpp kdevvcsintegrator.cpp VERSION 0.0.0 LINK ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR} diff --git a/lib/interfaces/extras/Makefile.am b/lib/interfaces/extras/Makefile.am index c504621e..67615223 100644 --- a/lib/interfaces/extras/Makefile.am +++ b/lib/interfaces/extras/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util \ $(all_includes) METASOURCES = AUTO -libtdevextras_la_LIBADD = $(LIB_QT) -libtdevextras_la_LDFLAGS = $(all_libraries) -lib_LTLIBRARIES = libtdevextras.la +libkdevextras_la_LIBADD = $(LIB_QT) +libkdevextras_la_LDFLAGS = $(all_libraries) +lib_LTLIBRARIES = libkdevextras.la tdevelopincludedir = $(includedir)/tdevelop/interfaces/extras servicetypedir = $(kde_servicetypesdir) -tdevelopinclude_HEADERS = tdevcompileroptions.h tdevvcsintegrator.h -libtdevextras_la_SOURCES = tdevcompileroptions.cpp tdevvcsintegrator.cpp +tdevelopinclude_HEADERS = kdevcompileroptions.h kdevvcsintegrator.h +libkdevextras_la_SOURCES = kdevcompileroptions.cpp kdevvcsintegrator.cpp servicetype_DATA = tdevelopcompileroptions.desktop \ tdevelopvcsintegrator.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevinterfaces +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevinterfaces DOXYGEN_PROJECTNAME = TDevelop Extra Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_DOCDIRPREFIX = kdev include ../../../Doxyfile.am diff --git a/lib/interfaces/extras/kdevcompileroptions.cpp b/lib/interfaces/extras/kdevcompileroptions.cpp new file mode 100644 index 00000000..22c701f1 --- /dev/null +++ b/lib/interfaces/extras/kdevcompileroptions.cpp @@ -0,0 +1,8 @@ +#include "kdevcompileroptions.h" + +KDevCompilerOptions::KDevCompilerOptions( TQObject * parent, const char * name ) + :TQObject(parent, name) +{ +} + +#include "kdevcompileroptions.moc" diff --git a/lib/interfaces/extras/tdevcompileroptions.h b/lib/interfaces/extras/kdevcompileroptions.h similarity index 82% rename from lib/interfaces/extras/tdevcompileroptions.h rename to lib/interfaces/extras/kdevcompileroptions.h index b8509a99..6544c5d0 100644 --- a/lib/interfaces/extras/tdevcompileroptions.h +++ b/lib/interfaces/extras/kdevcompileroptions.h @@ -19,12 +19,12 @@ */ /** -@file tdevcompileroptions.h +@file kdevcompileroptions.h The interface to compiler options configuration. */ -#ifndef _TDEVCOMPILEROPTIONS_H_ -#define _TDEVCOMPILEROPTIONS_H_ +#ifndef _KDEVCOMPILEROPTIONS_H_ +#define _KDEVCOMPILEROPTIONS_H_ #include @@ -34,7 +34,7 @@ Used by build systems to give users a compiler options configuration dialog. Common use case: @code -static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) +static KDevCompilerOptions *createCompilerOptions( const TQString &name, TQObject *parent ) { KService::Ptr service = KService::serviceByDesktopName( name ); if ( !service ) @@ -50,17 +50,17 @@ static TDevCompilerOptions *createCompilerOptions( const TQString &name, TQObjec args = TQStringList::split(" ", prop.toString()); TQObject *obj = factory->create(parent, service->name().latin1(), - "TDevCompilerOptions", args); + "KDevCompilerOptions", args); - if (!obj->inherits("TDevCompilerOptions")) + if (!obj->inherits("KDevCompilerOptions")) return 0; - TDevCompilerOptions *dlg = (TDevCompilerOptions*) obj; + KDevCompilerOptions *dlg = (KDevCompilerOptions*) obj; return dlg; } ... -TDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); +KDevCompilerOptions *plugin = createCompilerOptions(compilerName, parent); TQString flags = ""; //old compiler flags if ( plugin ) { @@ -69,13 +69,13 @@ if ( plugin ) } @endcode */ -class TDevCompilerOptions : public TQObject +class KDevCompilerOptions : public TQObject { Q_OBJECT public: - TDevCompilerOptions( TQObject *parent=0, const char *name=0 ); + KDevCompilerOptions( TQObject *parent=0, const char *name=0 ); /** * Opens a dialog which allows the user to configure the diff --git a/lib/interfaces/extras/tdevvcsintegrator.cpp b/lib/interfaces/extras/kdevvcsintegrator.cpp similarity index 87% rename from lib/interfaces/extras/tdevvcsintegrator.cpp rename to lib/interfaces/extras/kdevvcsintegrator.cpp index 26bf915d..5a6ab429 100644 --- a/lib/interfaces/extras/tdevvcsintegrator.cpp +++ b/lib/interfaces/extras/kdevvcsintegrator.cpp @@ -16,11 +16,11 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevvcsintegrator.h" +#include "kdevvcsintegrator.h" -TDevVCSIntegrator::TDevVCSIntegrator(TQObject *parent, const char *name) +KDevVCSIntegrator::KDevVCSIntegrator(TQObject *parent, const char *name) :TQObject(parent, name) { } -#include "tdevvcsintegrator.moc" +#include "kdevvcsintegrator.moc" diff --git a/lib/interfaces/extras/tdevvcsintegrator.h b/lib/interfaces/extras/kdevvcsintegrator.h similarity index 92% rename from lib/interfaces/extras/tdevvcsintegrator.h rename to lib/interfaces/extras/kdevvcsintegrator.h index 23ee6c22..793070b3 100644 --- a/lib/interfaces/extras/tdevvcsintegrator.h +++ b/lib/interfaces/extras/kdevvcsintegrator.h @@ -16,13 +16,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVVCSINTEGRATOR_H -#define TDEVVCSINTEGRATOR_H +#ifndef KDEVVCSINTEGRATOR_H +#define KDEVVCSINTEGRATOR_H #include /** -@file tdevvcsintegrator.h +@file kdevvcsintegrator.h The interface to VCS integrators. */ @@ -62,11 +62,11 @@ The interface to VCS integrators. VCS integrator takes care about setting up VCS for new and existing projects. It can, for example, perform checkout or import operations. */ -class TDevVCSIntegrator: public TQObject { +class KDevVCSIntegrator: public TQObject { Q_OBJECT public: - TDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); + KDevVCSIntegrator(TQObject *parent = 0, const char *name = 0); /**Reimplement to return a dialog to fetch the project from VCS.*/ virtual VCSDialog *fetcher(TQWidget *parent) = 0; diff --git a/lib/interfaces/extras/tdevcompileroptions.cpp b/lib/interfaces/extras/tdevcompileroptions.cpp deleted file mode 100644 index 9eead32f..00000000 --- a/lib/interfaces/extras/tdevcompileroptions.cpp +++ /dev/null @@ -1,8 +0,0 @@ -#include "tdevcompileroptions.h" - -TDevCompilerOptions::TDevCompilerOptions( TQObject * parent, const char * name ) - :TQObject(parent, name) -{ -} - -#include "tdevcompileroptions.moc" diff --git a/lib/interfaces/katedocumentmanagerinterface.cpp b/lib/interfaces/katedocumentmanagerinterface.cpp index 360be1c4..0afbcc81 100644 --- a/lib/interfaces/katedocumentmanagerinterface.cpp +++ b/lib/interfaces/katedocumentmanagerinterface.cpp @@ -17,7 +17,7 @@ Boston, MA 02110-1301, USA. */ #include "katedocumentmanagerinterface.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include #include #include @@ -26,7 +26,7 @@ #include #include -KateDocumentManagerInterface::KateDocumentManagerInterface( TDevPartController *pc) +KateDocumentManagerInterface::KateDocumentManagerInterface( KDevPartController *pc) : TQObject(pc), DCOPObject("KateDocumentManager"), m_controller(pc) { diff --git a/lib/interfaces/katedocumentmanagerinterface.h b/lib/interfaces/katedocumentmanagerinterface.h index 235c7738..8bdbdf8f 100644 --- a/lib/interfaces/katedocumentmanagerinterface.h +++ b/lib/interfaces/katedocumentmanagerinterface.h @@ -23,7 +23,7 @@ #include #include #include -class TDevPartController; +class KDevPartController; /** This is an emulated interface to provide compatibility with Kate scripts. @@ -36,7 +36,7 @@ class KateDocumentManagerInterface : public TQObject, public DCOPObject { // K_DCOP public: - KateDocumentManagerInterface( TDevPartController *pc ); + KateDocumentManagerInterface( KDevPartController *pc ); ~KateDocumentManagerInterface(); @@ -53,7 +53,7 @@ k_dcop: uint documents(); private: - TDevPartController *m_controller; + KDevPartController *m_controller; }; #endif diff --git a/lib/interfaces/tdevapi.cpp b/lib/interfaces/kdevapi.cpp similarity index 70% rename from lib/interfaces/tdevapi.cpp rename to lib/interfaces/kdevapi.cpp index 4f726107..04cf078d 100644 --- a/lib/interfaces/tdevapi.cpp +++ b/lib/interfaces/kdevapi.cpp @@ -17,15 +17,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevapi.h" +#include "kdevapi.h" -#include "tdevcoderepository.h" +#include "kdevcoderepository.h" /////////////////////////////////////////////////////////////////////////////// -// class TDevApi::Private +// class KDevApi::Private /////////////////////////////////////////////////////////////////////////////// -class TDevApi::Private +class KDevApi::Private { public: Private() @@ -34,60 +34,60 @@ public: {} TQDomDocument *m_projectDom; - TDevProject *m_project; - TDevLanguageSupport *m_languageSupport; - TDevCodeRepository* m_codeRepository; + KDevProject *m_project; + KDevLanguageSupport *m_languageSupport; + KDevCodeRepository* m_codeRepository; }; /////////////////////////////////////////////////////////////////////////////// -// class TDevApi +// class KDevApi /////////////////////////////////////////////////////////////////////////////// -TDevApi::TDevApi() +KDevApi::KDevApi() { - d = new TDevApi::Private; - d->m_codeRepository = new TDevCodeRepository(); + d = new KDevApi::Private; + d->m_codeRepository = new KDevCodeRepository(); } -TDevApi::~TDevApi() +KDevApi::~KDevApi() { delete d->m_codeRepository; delete d; } -TDevProject *TDevApi::project() const +KDevProject *KDevApi::project() const { return d->m_project; } -void TDevApi::setProject(TDevProject *project) +void KDevApi::setProject(KDevProject *project) { d->m_project = project; } -TDevLanguageSupport *TDevApi::languageSupport() const +KDevLanguageSupport *KDevApi::languageSupport() const { return d->m_languageSupport; } -void TDevApi::setLanguageSupport(TDevLanguageSupport *languageSupport) +void KDevApi::setLanguageSupport(KDevLanguageSupport *languageSupport) { d->m_languageSupport = languageSupport; } -TQDomDocument *TDevApi::projectDom() const +TQDomDocument *KDevApi::projectDom() const { return d->m_projectDom; } -void TDevApi::setProjectDom(TQDomDocument *dom) +void KDevApi::setProjectDom(TQDomDocument *dom) { d->m_projectDom = dom; } -TDevCodeRepository *TDevApi::codeRepository() const +KDevCodeRepository *KDevApi::codeRepository() const { return d->m_codeRepository; } -#include "tdevapi.moc" +#include "kdevapi.moc" diff --git a/lib/interfaces/tdevapi.h b/lib/interfaces/kdevapi.h similarity index 76% rename from lib/interfaces/tdevapi.h rename to lib/interfaces/kdevapi.h index a2e38f7c..d1f4f5cc 100644 --- a/lib/interfaces/tdevapi.h +++ b/lib/interfaces/kdevapi.h @@ -17,56 +17,56 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVAPI_H -#define TDEVAPI_H +#ifndef KDEVAPI_H +#define KDEVAPI_H #include class TQStringList; class TQDomDocument; -class TDevCore; -class TDevProject; -class TDevLanguageSupport; +class KDevCore; +class KDevProject; +class KDevLanguageSupport; class CodeModel; -class TDevPartController; -class TDevMainWindow; -class TDevCodeRepository; -class TDevPlugin; -class TDevPluginController; +class KDevPartController; +class KDevMainWindow; +class KDevCodeRepository; +class KDevPlugin; +class KDevPluginController; /** -@file tdevapi.h +@file kdevapi.h KDevelop API interface. */ /** The interface to KDevelop's core components. Needs to be implemented in a shell. Developers do not need to use this -class because @ref TDevPlugin already provides API convenience methods. +class because @ref KDevPlugin already provides API convenience methods. */ -class TDevApi: public TQObject +class KDevApi: public TQObject { Q_OBJECT public: /**Constructor.*/ - TDevApi(); + KDevApi(); /**Destructor.*/ - virtual ~TDevApi(); + virtual ~KDevApi(); /**@return A reference to the toplevel widget.*/ - virtual TDevMainWindow *mainWindow() const = 0; + virtual KDevMainWindow *mainWindow() const = 0; /**@return A reference to the part controller which is used to manipulate loaded KParts.*/ - virtual TDevPartController *partController() const = 0; + virtual KDevPartController *partController() const = 0; /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/ - virtual TDevPluginController *pluginController() const = 0; + virtual KDevPluginController *pluginController() const = 0; /**@return A reference to the application core - an object which provides basic functionalities for inter-parts communications / cooperation.*/ - virtual TDevCore *core() const = 0; + virtual KDevCore *core() const = 0; /**@return A reference to the memory symbol store.*/ virtual CodeModel *codeModel() const = 0; @@ -79,22 +79,22 @@ public: void setProjectDom(TQDomDocument *dom); /**@return A reference to the current project component or 0 if no project is loaded.*/ - TDevProject *project() const; + KDevProject *project() const; /**Sets the current project. @param project The project plugin which becames the current project.*/ - void setProject(TDevProject *project); + void setProject(KDevProject *project); /**@return A reference to the language support component or 0 if no support available.*/ - TDevLanguageSupport *languageSupport() const; + KDevLanguageSupport *languageSupport() const; /**Sets the object charged of providing handling for the source files written in particular language (languages support component). @param languageSupport The language support plugin.*/ - void setLanguageSupport(TDevLanguageSupport *languageSupport); + void setLanguageSupport(KDevLanguageSupport *languageSupport); /**@return A reference to the code repository (accessor to persistent symbol stores).*/ - TDevCodeRepository *codeRepository() const; + KDevCodeRepository *codeRepository() const; private: class Private; diff --git a/lib/interfaces/tdevcoderepository.cpp b/lib/interfaces/kdevcoderepository.cpp similarity index 67% rename from lib/interfaces/tdevcoderepository.cpp rename to lib/interfaces/kdevcoderepository.cpp index f5716294..26249544 100644 --- a/lib/interfaces/tdevcoderepository.cpp +++ b/lib/interfaces/kdevcoderepository.cpp @@ -16,56 +16,56 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevcoderepository.h" +#include "kdevcoderepository.h" -struct TDevCodeRepositoryData +struct KDevCodeRepositoryData { Catalog* mainCatalog; TQValueList catalogs; - TDevCodeRepositoryData(): mainCatalog( 0 ) {} + KDevCodeRepositoryData(): mainCatalog( 0 ) {} }; -TDevCodeRepository::TDevCodeRepository( ) - : d( new TDevCodeRepositoryData ) +KDevCodeRepository::KDevCodeRepository( ) + : d( new KDevCodeRepositoryData ) { } -TDevCodeRepository::~TDevCodeRepository( ) +KDevCodeRepository::~KDevCodeRepository( ) { delete( d ); } -Catalog* TDevCodeRepository::mainCatalog() +Catalog* KDevCodeRepository::mainCatalog() { return d->mainCatalog; } -void TDevCodeRepository::setMainCatalog( Catalog * mainCatalog ) +void KDevCodeRepository::setMainCatalog( Catalog * mainCatalog ) { d->mainCatalog = mainCatalog; } -void TDevCodeRepository::registerCatalog( Catalog * catalog ) +void KDevCodeRepository::registerCatalog( Catalog * catalog ) { d->catalogs.append( catalog ); emit catalogRegistered( catalog ); } -void TDevCodeRepository::unregisterCatalog( Catalog * catalog ) +void KDevCodeRepository::unregisterCatalog( Catalog * catalog ) { d->catalogs.remove( catalog ); emit catalogUnregistered( catalog ); } -void TDevCodeRepository::touchCatalog( Catalog * catalog ) +void KDevCodeRepository::touchCatalog( Catalog * catalog ) { emit catalogChanged( catalog ); } -TQValueList< Catalog * > TDevCodeRepository::registeredCatalogs( ) +TQValueList< Catalog * > KDevCodeRepository::registeredCatalogs( ) { return d->catalogs; } -#include "tdevcoderepository.moc" +#include "kdevcoderepository.moc" diff --git a/lib/interfaces/tdevcoderepository.h b/lib/interfaces/kdevcoderepository.h similarity index 92% rename from lib/interfaces/tdevcoderepository.h rename to lib/interfaces/kdevcoderepository.h index b87d66e8..4e1dd765 100644 --- a/lib/interfaces/tdevcoderepository.h +++ b/lib/interfaces/kdevcoderepository.h @@ -16,18 +16,18 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVCODEREPOSITORY_H -#define TDEVCODEREPOSITORY_H +#ifndef KDEVCODEREPOSITORY_H +#define KDEVCODEREPOSITORY_H #include #include /** -@file tdevcoderepository.h +@file kdevcoderepository.h Code repository - the persistent symbol store accessor. */ -class TDevCodeRepositoryData; +class KDevCodeRepositoryData; class Catalog; /** @@ -45,15 +45,15 @@ never or rarely changes. System libraries are perfect examples of such code. Symbols from code contained in project files are better stored in memory symbol store like @ref CodeModel. */ -class TDevCodeRepository : public TQObject +class KDevCodeRepository : public TQObject { Q_OBJECT public: /**Constructor.*/ - TDevCodeRepository(); + KDevCodeRepository(); /**Destructor.*/ - virtual ~TDevCodeRepository(); + virtual ~KDevCodeRepository(); /**@return The main catalog. Each catalog can be marked is main to provide easy access to it.*/ @@ -89,7 +89,7 @@ signals: void catalogChanged( Catalog* catalog ); private: - TDevCodeRepositoryData* d; + KDevCodeRepositoryData* d; }; #endif diff --git a/lib/interfaces/tdevcore.cpp b/lib/interfaces/kdevcore.cpp similarity index 97% rename from lib/interfaces/tdevcore.cpp rename to lib/interfaces/kdevcore.cpp index 726bf2cb..dda66cbf 100644 --- a/lib/interfaces/tdevcore.cpp +++ b/lib/interfaces/kdevcore.cpp @@ -21,8 +21,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "TDevCoreIface.h" -#include "tdevcore.h" +#include "KDevCoreIface.h" +#include "kdevcore.h" #include "urlutil.h" @@ -282,17 +282,17 @@ const ProjectModelItem* ProjectModelItemContext::item() const /////////////////////////////////////////////////////////////////////////////// -// class TDevCore +// class KDevCore /////////////////////////////////////////////////////////////////////////////// -TDevCore::TDevCore( TQObject *parent, const char *name ) +KDevCore::KDevCore( TQObject *parent, const char *name ) : TQObject( parent, name ) { - new TDevCoreIface(this); + new KDevCoreIface(this); } -TDevCore::~TDevCore() +KDevCore::~KDevCore() { } -#include "tdevcore.moc" +#include "kdevcore.moc" diff --git a/lib/interfaces/tdevcore.h b/lib/interfaces/kdevcore.h similarity index 96% rename from lib/interfaces/tdevcore.h rename to lib/interfaces/kdevcore.h index fadcdfde..fad2891a 100644 --- a/lib/interfaces/tdevcore.h +++ b/lib/interfaces/kdevcore.h @@ -25,11 +25,11 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVCORE_H -#define TDEVCORE_H +#ifndef KDEVCORE_H +#define KDEVCORE_H /** -@file tdevcore.h +@file kdevcore.h The interface to the application core and context menu classes. */ @@ -40,7 +40,7 @@ The interface to the application core and context menu classes. #include class KDialogBase; -class TDevPlugin; +class KDevPlugin; class CodeModelItem; class ProjectModelItem; @@ -75,7 +75,7 @@ to if you reimplement TQWidget::contextMenuEvent method. How to fill context menu from a plugin: -# Create a @code contextMenu(TQPopupMenu *, const Context *) @endcode slot in your plugin class. --# Connect TDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in +-# Connect KDevCore::contextMenu(TQPopupMenu *, const Context *) signal to that slot in the constructor of your plugin:\n @code connect(core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), @@ -287,7 +287,7 @@ private: /** -A TDevCore class defines an object which takes care about the cooperation +A KDevCore class defines an object which takes care about the cooperation between the various plug-in which compose KDevelop. It defines: - signals that can be captured for menu customization; @@ -297,7 +297,7 @@ It defines: - etc. . */ -class TDevCore: public TQObject +class KDevCore: public TQObject { Q_OBJECT @@ -305,10 +305,10 @@ public: /**Constructor @param parent The TQObject that's the parent of this class. @param name The name of the class.*/ - TDevCore(TQObject *parent=0, const char *name=0); + KDevCore(TQObject *parent=0, const char *name=0); /**Destructor.*/ - virtual ~TDevCore(); + virtual ~KDevCore(); /**Fills the context menu. This method should be called by a part that wants to show a @@ -322,7 +322,7 @@ public: @param context The pointer to a Context object of this popup menu.*/ virtual void fillContextMenu(TQPopupMenu *popup, const Context *context) = 0; - /**Closes the current project and open the new one. You cannot use the @ref TDevPlugin::project() + /**Closes the current project and open the new one. You cannot use the @ref KDevPlugin::project() * method right after opening a new project, as it will return a null pointer. *You must wait for the eventloop to be reentered, so use a signleshot timer *to do the job needed after the project is opened or connect a slot to the @@ -338,7 +338,7 @@ public: manually by means of stop button. @param which The plugin to mark. @param runs true if plugin is running something, false if it is not.*/ - virtual void running(TDevPlugin *which, bool runs) = 0; + virtual void running(KDevPlugin *which, bool runs) = 0; signals: /**Emitted after the core has done all initializations and @@ -356,8 +356,8 @@ signals: /**The user has clicked the stop button. If all actions should be cancelled, pass 0 to @p which - @param which The TDevPlugin object to stop.*/ - void stopButtonClicked(TDevPlugin *which); + @param which The KDevPlugin object to stop.*/ + void stopButtonClicked(KDevPlugin *which); /**A context menu has been requested somewhere. Components may hook some entries into it. More information on the diff --git a/lib/interfaces/tdevdesignerintegration.cpp b/lib/interfaces/kdevdesignerintegration.cpp similarity index 68% rename from lib/interfaces/tdevdesignerintegration.cpp rename to lib/interfaces/kdevdesignerintegration.cpp index 73fa7999..0ba325ab 100644 --- a/lib/interfaces/tdevdesignerintegration.cpp +++ b/lib/interfaces/kdevdesignerintegration.cpp @@ -16,25 +16,25 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdesignerintegration.h" -#include "tdevdesignerintegrationiface.h" +#include "kdevdesignerintegration.h" +#include "kdevdesignerintegrationiface.h" -class TDevDesignerIntegration::TDevDesignerIntegrationPrivate { +class KDevDesignerIntegration::KDevDesignerIntegrationPrivate { public: - TDevDesignerIntegrationIface *m_iface; + KDevDesignerIntegrationIface *m_iface; }; -TDevDesignerIntegration::TDevDesignerIntegration(TQObject *parent, const char *name) +KDevDesignerIntegration::KDevDesignerIntegration(TQObject *parent, const char *name) : TQObject(parent, name) { - dptr = new TDevDesignerIntegrationPrivate(); + dptr = new KDevDesignerIntegrationPrivate(); - dptr->m_iface = new TDevDesignerIntegrationIface(this); + dptr->m_iface = new KDevDesignerIntegrationIface(this); } -TDevDesignerIntegration::~TDevDesignerIntegration() +KDevDesignerIntegration::~KDevDesignerIntegration() { delete dptr; } -#include "tdevdesignerintegration.moc" +#include "kdevdesignerintegration.moc" diff --git a/lib/interfaces/tdevdesignerintegration.h b/lib/interfaces/kdevdesignerintegration.h similarity index 91% rename from lib/interfaces/tdevdesignerintegration.h rename to lib/interfaces/kdevdesignerintegration.h index 532d8b8b..528926cb 100644 --- a/lib/interfaces/tdevdesignerintegration.h +++ b/lib/interfaces/kdevdesignerintegration.h @@ -16,15 +16,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVDESIGNERINTEGRATION_H -#define TDEVDESIGNERINTEGRATION_H +#ifndef KDEVDESIGNERINTEGRATION_H +#define KDEVDESIGNERINTEGRATION_H #include #include #include /** -@file tdevdesignerintegration.h +@file kdevdesignerintegration.h TDevelop designer integration interface. */ @@ -48,7 +48,7 @@ necessary files at desired line numbers and adds (edits, removes) code for imple For example, TQt Designer integration should be able to create an subclass for a form and reimplement slots defined in the form. */ -class TDevDesignerIntegration : public TQObject +class KDevDesignerIntegration : public TQObject { Q_OBJECT @@ -56,9 +56,9 @@ public: /**Constructor. @param parent Parent object. @param name Internal name.*/ - TDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); + KDevDesignerIntegration(TQObject *parent = 0, const char *name = 0); /**Destructor.*/ - ~TDevDesignerIntegration(); + ~KDevDesignerIntegration(); /**Saves designer integration settings.*/ virtual void saveSettings(TQDomDocument dom, TQString path) = 0; @@ -91,8 +91,8 @@ public slots: @param formName The name of a GUI form.*/ virtual void openSource(const TQString &formName) = 0; private: - class TDevDesignerIntegrationPrivate; - TDevDesignerIntegrationPrivate *dptr; + class KDevDesignerIntegrationPrivate; + KDevDesignerIntegrationPrivate *dptr; }; #endif diff --git a/lib/interfaces/tdevdesignerintegrationiface.cpp b/lib/interfaces/kdevdesignerintegrationiface.cpp similarity index 80% rename from lib/interfaces/tdevdesignerintegrationiface.cpp rename to lib/interfaces/kdevdesignerintegrationiface.cpp index bd4f349b..964ca340 100644 --- a/lib/interfaces/tdevdesignerintegrationiface.cpp +++ b/lib/interfaces/kdevdesignerintegrationiface.cpp @@ -16,46 +16,46 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdesignerintegrationiface.h" +#include "kdevdesignerintegrationiface.h" #include -#include "tdevdesignerintegration.h" +#include "kdevdesignerintegration.h" -TDevDesignerIntegrationIface::TDevDesignerIntegrationIface(TDevDesignerIntegration *p) +KDevDesignerIntegrationIface::KDevDesignerIntegrationIface(KDevDesignerIntegration *p) : DCOPObject("GUIDesigner"), m_designer(p) { //FIXME figure out what number our interface is... } -TDevDesignerIntegrationIface::~TDevDesignerIntegrationIface() +KDevDesignerIntegrationIface::~KDevDesignerIntegrationIface() { } -void TDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) +void KDevDesignerIntegrationIface::addFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void TDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) +void KDevDesignerIntegrationIface::removeFunction( const TQString & formName, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function f = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->addFunction(formName, f); } -void TDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) +void KDevDesignerIntegrationIface::editFunction( const TQString & formName, TQString oldReturnType, TQString oldFunction, TQString oldSpecifier, TQString oldAccess, uint oldType, TQString returnType, TQString function, TQString specifier, TQString access, uint type ) { KInterfaceDesigner::Function fold = {oldReturnType, oldFunction, oldSpecifier, oldAccess, (KInterfaceDesigner::FunctionType)oldType }; KInterfaceDesigner::Function fnew = {returnType, function, specifier, access, (KInterfaceDesigner::FunctionType)type }; m_designer->editFunction(formName,fold,fnew); } -void TDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName ) +void KDevDesignerIntegrationIface::openFunction( const TQString & formName, const TQString & functionName ) { m_designer->openFunction(formName,functionName); } -void TDevDesignerIntegrationIface::openSource( const TQString & formName ) +void KDevDesignerIntegrationIface::openSource( const TQString & formName ) { m_designer->openSource(formName); } diff --git a/lib/interfaces/tdevdesignerintegrationiface.h b/lib/interfaces/kdevdesignerintegrationiface.h similarity index 84% rename from lib/interfaces/tdevdesignerintegrationiface.h rename to lib/interfaces/kdevdesignerintegrationiface.h index 0dd6f8d1..c6c8988a 100644 --- a/lib/interfaces/tdevdesignerintegrationiface.h +++ b/lib/interfaces/kdevdesignerintegrationiface.h @@ -16,23 +16,23 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVDESIGNERINTEGRATIONIFACE_H -#define TDEVDESIGNERINTEGRATIONIFACE_H +#ifndef KDEVDESIGNERINTEGRATIONIFACE_H +#define KDEVDESIGNERINTEGRATIONIFACE_H #include -class TDevDesignerIntegration; +class KDevDesignerIntegration; /** The dcop interface for GUI designers in KDevelop. @author KDevelop Authors */ -class TDevDesignerIntegrationIface : public DCOPObject +class KDevDesignerIntegrationIface : public DCOPObject { K_DCOP public: - TDevDesignerIntegrationIface(TDevDesignerIntegration *p); + KDevDesignerIntegrationIface(KDevDesignerIntegration *p); - ~TDevDesignerIntegrationIface(); + ~KDevDesignerIntegrationIface(); k_dcop: void addFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); void removeFunction(const TQString &formName, TQString returnType, TQString function,TQString specifier,TQString access,uint type); @@ -43,7 +43,7 @@ k_dcop: void openSource(const TQString &formName); private: - TDevDesignerIntegration *m_designer; + KDevDesignerIntegration *m_designer; }; #endif diff --git a/lib/interfaces/tdevgenericfactory.h b/lib/interfaces/kdevgenericfactory.h similarity index 77% rename from lib/interfaces/tdevgenericfactory.h rename to lib/interfaces/kdevgenericfactory.h index 7fdbdb28..6f8d3dc9 100644 --- a/lib/interfaces/tdevgenericfactory.h +++ b/lib/interfaces/kdevgenericfactory.h @@ -21,7 +21,7 @@ #include /** -@file tdevgenericfactory.h +@file kdevgenericfactory.h KDevelop generic plugin factory. */ @@ -32,37 +32,37 @@ Usually it is convenient to use K_EXPORT_COMPONENT_FACTORY macro to create factories for TDevelop plugins. For example, for DummyPlugin the factory can be created (in dummyplugin.cpp file) as: @code -typedef TDevGenericFactory DummyPluginFactory; -K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) ) +typedef KDevGenericFactory DummyPluginFactory; +K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) @endcode Data should be a const static object. This way it complies with the requirements -for data objecs of TDevGenericFactory constructor. +for data objecs of KDevGenericFactory constructor. Important:
There is no need to create @ref TDEAboutData objects. It is more useful to create -a static const @ref TDevPluginInfo object which can be used also in the constructor +a static const @ref KDevPluginInfo object which can be used also in the constructor of a plugin. For example, dummyplugin.cpp file could contain: @code -#include +#include -static const TDevPluginInfo data("KDevDummyPlugin"); -typedef TDevGenericFactory DummyPluginFactory; -K_EXPORT_COMPONENT_FACTORY(libtdevdummyplugin, DummyPluginFactory( data ) ) +static const KDevPluginInfo data("KDevDummyPlugin"); +typedef KDevGenericFactory DummyPluginFactory; +K_EXPORT_COMPONENT_FACTORY(libkdevdummyplugin, DummyPluginFactory( data ) ) DummyPlugin::DummyPlugin(TQObject *parent, const char *name, const TQStringList & ) - :TDevPlugin(&data, parent, name) + :KDevPlugin(&data, parent, name) { } @endcode -In the example above the duplication of information is avoided as same @ref TDevPluginInfo -objects are used for plugin and for plugin factory. This is possible because @ref TDevPluginInfo -class has an operator to cast @ref TDevPluginInfo to @ref TDEAboutData. +In the example above the duplication of information is avoided as same @ref KDevPluginInfo +objects are used for plugin and for plugin factory. This is possible because @ref KDevPluginInfo +class has an operator to cast @ref KDevPluginInfo to @ref TDEAboutData. */ template -class TDevGenericFactory: public KGenericFactory +class KDevGenericFactory: public KGenericFactory { public: /**Constructor. @@ -73,7 +73,7 @@ public: - license type number. . data object should live as long as factory lives.*/ - TDevGenericFactory(TDEAboutData *data) + KDevGenericFactory(TDEAboutData *data) :KGenericFactory(data->appName()), aboutData(data) { } diff --git a/lib/interfaces/tdevlanguagesupport.cpp b/lib/interfaces/kdevlanguagesupport.cpp similarity index 56% rename from lib/interfaces/tdevlanguagesupport.cpp rename to lib/interfaces/kdevlanguagesupport.cpp index d283a434..aa5b560c 100644 --- a/lib/interfaces/tdevlanguagesupport.cpp +++ b/lib/interfaces/kdevlanguagesupport.cpp @@ -26,141 +26,141 @@ #include -#include "tdevdesignerintegration.h" -#include "tdevlanguagesupport.h" +#include "kdevdesignerintegration.h" +#include "kdevlanguagesupport.h" -TDevLanguageSupport::TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name) - : TDevPlugin(info, parent, name ? name : "TDevLanguageSupport" ) +KDevLanguageSupport::KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name ? name : "KDevLanguageSupport" ) { } -TDevLanguageSupport::~TDevLanguageSupport() +KDevLanguageSupport::~KDevLanguageSupport() { } -TDevLanguageSupport::Features TDevLanguageSupport::features() +KDevLanguageSupport::Features KDevLanguageSupport::features() { return Features(0); } -KMimeType::List TDevLanguageSupport::mimeTypes() +KMimeType::List KDevLanguageSupport::mimeTypes() { return KMimeType::List(); } -TQString TDevLanguageSupport::formatTag( const Tag& /*tag*/ ) +TQString KDevLanguageSupport::formatTag( const Tag& /*tag*/ ) { return TQString(); } -TQString TDevLanguageSupport::formatClassName(const TQString &name) +TQString KDevLanguageSupport::formatClassName(const TQString &name) { return name; } -TQString TDevLanguageSupport::unformatClassName(const TQString &name) +TQString KDevLanguageSupport::unformatClassName(const TQString &name) { return name; } -bool TDevLanguageSupport::shouldSplitDocument(const KURL &url) +bool KDevLanguageSupport::shouldSplitDocument(const KURL &url) { return false; } -Qt::Orientation TDevLanguageSupport::splitOrientation() const +Qt::Orientation KDevLanguageSupport::splitOrientation() const { return Qt::Vertical; } -void TDevLanguageSupport::addClass() +void KDevLanguageSupport::addClass() { } -void TDevLanguageSupport::addMethod( ClassDom /*klass*/ ) +void KDevLanguageSupport::addMethod( ClassDom /*klass*/ ) { } -void TDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ ) +void KDevLanguageSupport::implementVirtualMethods( ClassDom /*klass*/ ) { } -void TDevLanguageSupport::addAttribute( ClassDom /*klass*/ ) +void KDevLanguageSupport::addAttribute( ClassDom /*klass*/ ) { } -TQStringList TDevLanguageSupport::subclassWidget(const TQString& /*formName*/) +TQStringList KDevLanguageSupport::subclassWidget(const TQString& /*formName*/) { return TQStringList(); } -TQStringList TDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/) +TQStringList KDevLanguageSupport::updateWidget(const TQString& /*formName*/, const TQString& /*fileName*/) { return TQStringList(); } -TQString TDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) +TQString KDevLanguageSupport::formatModelItem( const CodeModelItem *item, bool /*shortDescription*/ ) { return item->name(); } -void TDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function ) +void KDevLanguageSupport::addFunction( DesignerType type, const TQString & formName, Function function ) { -// kdDebug() << "TDevLanguageSupport::addFunction: 1" << endl; - TDevDesignerIntegration *designerIntegration = designer(type); -// kdDebug() << "TDevLanguageSupport::addFunction: 2" << endl; +// kdDebug() << "KDevLanguageSupport::addFunction: 1" << endl; + KDevDesignerIntegration *designerIntegration = designer(type); +// kdDebug() << "KDevLanguageSupport::addFunction: 2" << endl; if (!designerIntegration) { -// kdDebug() << "TDevLanguageSupport::addFunction: x" << endl; +// kdDebug() << "KDevLanguageSupport::addFunction: x" << endl; return; } -// kdDebug() << "TDevLanguageSupport::addFunction: 3" << endl; +// kdDebug() << "KDevLanguageSupport::addFunction: 3" << endl; designerIntegration->addFunction(formName, function); -// kdDebug() << "TDevLanguageSupport::addFunction: 4" << endl; +// kdDebug() << "KDevLanguageSupport::addFunction: 4" << endl; } -void TDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function ) +void KDevLanguageSupport::editFunction( DesignerType type, const TQString & formName, Function oldFunction, Function function ) { - TDevDesignerIntegration *designerIntegration = designer(type); + KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) return; designerIntegration->editFunction(formName, oldFunction, function); } -void TDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function ) +void KDevLanguageSupport::removeFunction( DesignerType type, const TQString & formName, Function function ) { - TDevDesignerIntegration *designerIntegration = designer(type); + KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) return; designerIntegration->removeFunction(formName, function); } -TDevDesignerIntegration * TDevLanguageSupport::designer( DesignerType // type +KDevDesignerIntegration * KDevLanguageSupport::designer( DesignerType // type ) { return 0; } -void TDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName ) +void KDevLanguageSupport::openFunction( DesignerType type, const TQString & formName, const TQString & functionName ) { - TDevDesignerIntegration *designerIntegration = designer(type); + KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) return; designerIntegration->openFunction(formName, functionName); } -void TDevLanguageSupport::createAccessMethods( ClassDom // theClass +void KDevLanguageSupport::createAccessMethods( ClassDom // theClass , VariableDom // theVariable ) { } -void TDevLanguageSupport::openSource( DesignerType type, const TQString & formName) +void KDevLanguageSupport::openSource( DesignerType type, const TQString & formName) { - TDevDesignerIntegration *designerIntegration = designer(type); + KDevDesignerIntegration *designerIntegration = designer(type); if (!designerIntegration) return; designerIntegration->openSource(formName); } -#include "tdevlanguagesupport.moc" +#include "kdevlanguagesupport.moc" diff --git a/lib/interfaces/tdevlanguagesupport.h b/lib/interfaces/kdevlanguagesupport.h similarity index 92% rename from lib/interfaces/tdevlanguagesupport.h rename to lib/interfaces/kdevlanguagesupport.h index a1778ff6..42221868 100644 --- a/lib/interfaces/tdevlanguagesupport.h +++ b/lib/interfaces/kdevlanguagesupport.h @@ -22,23 +22,23 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVLANGUAGESUPPORT_H -#define TDEVLANGUAGESUPPORT_H +#ifndef KDEVLANGUAGESUPPORT_H +#define KDEVLANGUAGESUPPORT_H #include #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include "codemodel.h" #include /** -@file tdevlanguagesupport.h +@file kdevlanguagesupport.h Interface to programming language specific features. */ class Tag; -class TDevDesignerIntegration; +class KDevDesignerIntegration; using namespace KInterfaceDesigner; @@ -50,15 +50,15 @@ which language support to load. Language support plugin is a good place for: - a language parser which fills memory and persistent symbol store -(see @ref CodeModel and @ref TDevCodeRepository); +(see @ref CodeModel and @ref KDevCodeRepository); - code wizards specific to a programming language (like new class wizard); -- GUI designer integration (see @ref TDevLanguageSupport::designer method -documentation and @ref TDevDesignerIntegration class documentation; +- GUI designer integration (see @ref KDevLanguageSupport::designer method +documentation and @ref KDevDesignerIntegration class documentation; - symbol (class, function, etc.) name formatting to a human-readable convention (pretty formatted name). . */ -class TDevLanguageSupport: public TDevPlugin +class KDevLanguageSupport: public KDevPlugin { Q_OBJECT @@ -91,12 +91,12 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevLanguageSupport(const TDevPluginInfo *info, TQObject *parent, const char *name); + KDevLanguageSupport(const KDevPluginInfo *info, TQObject *parent, const char *name); /**Destructor.*/ - ~TDevLanguageSupport(); + ~KDevLanguageSupport(); /**@return The feature set of the language. This is e.g. used by the class view to decide which organizer items to display and which not.*/ @@ -183,7 +183,7 @@ public: /**Reimplement this method if you want to use integrated GUI designer for the language. Implementation could look like (in pseudo code): @code - TDevDesignerIntegration *des = 0; + KDevDesignerIntegration *des = 0; switch (type) { case KInterfaceDesigner::TQtDesigner: @@ -203,25 +203,25 @@ public: from designerintegration support library. @param type The type of the designer to integrate. @return The pointer to designer integration of given type or 0.*/ - virtual TDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); + virtual KDevDesignerIntegration *designer(KInterfaceDesigner::DesignerType type); public slots: /**Adds a function requested by a GUI designer. No need to reimplement this slot - unless you want to use specific implementation of TDevDesignerIntegration interface. + unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to implement (add).*/ void addFunction(DesignerType type, const TQString &formName, Function function); /**Removes a function requested by a GUI designer. No need to reimplement this slot - unless you want to use specific implementation of TDevDesignerIntegration interface. + unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param function The function to remove.*/ void removeFunction(DesignerType type, const TQString &formName, Function function); /**Edits a function requested by a GUI designer. No need to reimplement this slot - unless you want to use specific implementation of TDevDesignerIntegration interface. + unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param oldFunction The old function signature before editing. @@ -229,14 +229,14 @@ public slots: void editFunction(DesignerType type, const TQString &formName, Function oldFunction, Function function); /**Opens a function requested by a GUI designer. No need to reimplement this slot - unless you want to use specific implementation of TDevDesignerIntegration interface. + unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form. @param functionName The name of a function to seek in the code for.*/ void openFunction(DesignerType type, const TQString &formName, const TQString &functionName); /**Opens a form source requested by a GUI designer. No need to reimplement this slot - unless you want to use specific implementation of TDevDesignerIntegration interface. + unless you want to use specific implementation of KDevDesignerIntegration interface. @param type The type of integrated designer. @param formName The name of a GUI form.*/ void openSource(DesignerType type, const TQString &formName); diff --git a/lib/interfaces/tdevmainwindow.cpp b/lib/interfaces/kdevmainwindow.cpp similarity index 93% rename from lib/interfaces/tdevmainwindow.cpp rename to lib/interfaces/kdevmainwindow.cpp index e73250e9..4b95f669 100644 --- a/lib/interfaces/tdevmainwindow.cpp +++ b/lib/interfaces/kdevmainwindow.cpp @@ -17,12 +17,12 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include #include -KStatusBar *TDevMainWindow::statusBar() +KStatusBar *KDevMainWindow::statusBar() { return main()->statusBar(); } diff --git a/lib/interfaces/tdevmainwindow.h b/lib/interfaces/kdevmainwindow.h similarity index 96% rename from lib/interfaces/tdevmainwindow.h rename to lib/interfaces/kdevmainwindow.h index 83aef3b0..8138ab78 100644 --- a/lib/interfaces/tdevmainwindow.h +++ b/lib/interfaces/kdevmainwindow.h @@ -19,8 +19,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEV_MAINWINDOW_H -#define TDEV_MAINWINDOW_H +#ifndef KDEV_MAINWINDOW_H +#define KDEV_MAINWINDOW_H #include @@ -29,7 +29,7 @@ class KStatusBar; class TDEMainWindow; /** -@file tdevmainwindow.h +@file kdevmainwindow.h KDevelop main window interface. */ @@ -37,11 +37,11 @@ KDevelop main window interface. KDevelop main window interface. Provides methods to control the main window of an application. */ -class TDevMainWindow +class KDevMainWindow { public: /**Destroys the main window*/ - virtual ~TDevMainWindow() {} // must be virtual! + virtual ~KDevMainWindow() {} // must be virtual! /**Embeds a view of a part into the main window. @param view The view to embed. Must be a KPart. diff --git a/lib/interfaces/tdevpartcontroller.cpp b/lib/interfaces/kdevpartcontroller.cpp similarity index 83% rename from lib/interfaces/tdevpartcontroller.cpp rename to lib/interfaces/kdevpartcontroller.cpp index e718ecf4..58f1dc2a 100644 --- a/lib/interfaces/tdevpartcontroller.cpp +++ b/lib/interfaces/kdevpartcontroller.cpp @@ -16,15 +16,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "TDevPartControllerIface.h" -#include "tdevpartcontroller.h" +#include "KDevPartControllerIface.h" +#include "kdevpartcontroller.h" #include "katedocumentmanagerinterface.h" -TDevPartController::TDevPartController(TQWidget *parent) +KDevPartController::KDevPartController(TQWidget *parent) : KParts::PartManager(parent) { - new TDevPartControllerIface(this); + new KDevPartControllerIface(this); new KateDocumentManagerInterface(this); } -#include "tdevpartcontroller.moc" +#include "kdevpartcontroller.moc" diff --git a/lib/interfaces/tdevpartcontroller.h b/lib/interfaces/kdevpartcontroller.h similarity index 97% rename from lib/interfaces/tdevpartcontroller.h rename to lib/interfaces/kdevpartcontroller.h index 2bb593e6..fd8e6830 100644 --- a/lib/interfaces/tdevpartcontroller.h +++ b/lib/interfaces/kdevpartcontroller.h @@ -22,15 +22,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEV_PARTCONTROLLER_H -#define TDEV_PARTCONTROLLER_H +#ifndef KDEV_PARTCONTROLLER_H +#define KDEV_PARTCONTROLLER_H #include #include #include /** -@file tdevpartcontroller.h +@file kdevpartcontroller.h KDevelop part controller interface. */ @@ -53,7 +53,7 @@ Interface to control loaded parts and other documents. Part controller works with embedded into the shell parts. Such parts are usually editors, GUI designers, etc. */ -class TDevPartController: public KParts::PartManager +class KDevPartController: public KParts::PartManager { Q_OBJECT @@ -61,7 +61,7 @@ class TDevPartController: public KParts::PartManager public: /**Constructor. @param parent The parent object.*/ - TDevPartController(TQWidget *parent); + KDevPartController(TQWidget *parent); /**Call this before a call to @ref editDocument to set the encoding of the document to be opened. diff --git a/lib/interfaces/tdevplugin.cpp b/lib/interfaces/kdevplugin.cpp similarity index 69% rename from lib/interfaces/tdevplugin.cpp rename to lib/interfaces/kdevplugin.cpp index 42d30cc8..31717446 100644 --- a/lib/interfaces/tdevplugin.cpp +++ b/lib/interfaces/kdevplugin.cpp @@ -24,13 +24,13 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevplugin.h" +#include "kdevplugin.h" -#include "tdevapi.h" -#include "tdevcore.h" -#include "tdevplugininfo.h" -#include "tdevpartcontroller.h" -#include "tdevplugincontroller.h" +#include "kdevapi.h" +#include "kdevcore.h" +#include "kdevplugininfo.h" +#include "kdevpartcontroller.h" +#include "kdevplugincontroller.h" #include #include @@ -42,23 +42,23 @@ #include /////////////////////////////////////////////////////////////////////////////// -// struct TDevPlugin::Private +// struct KDevPlugin::Private /////////////////////////////////////////////////////////////////////////////// -struct TDevPlugin::Private +struct KDevPlugin::Private { - const TDevPluginInfo *info; + const KDevPluginInfo *info; }; /////////////////////////////////////////////////////////////////////////////// -// class TDevPlugin +// class KDevPlugin /////////////////////////////////////////////////////////////////////////////// -TDevPlugin::TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name) +KDevPlugin::KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name) :TQObject(parent, name), d(new Private) { - assert(parent->inherits( "TDevApi" )); - m_api = static_cast( parent ); + assert(parent->inherits( "KDevApi" )); + m_api = static_cast( parent ); actionCollection()->setHighlightingEnabled( true ); @@ -66,74 +66,74 @@ TDevPlugin::TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char TDEGlobal::iconLoader()->addAppDir("tdevelop"); } -TDevPlugin::~TDevPlugin() +KDevPlugin::~KDevPlugin() { delete( d ); } -TDevMainWindow *TDevPlugin::mainWindow() +KDevMainWindow *KDevPlugin::mainWindow() { return m_api->mainWindow(); } -TDevCore *TDevPlugin::core() const +KDevCore *KDevPlugin::core() const { return m_api->core(); } -TDevProject *TDevPlugin::project() const +KDevProject *KDevPlugin::project() const { return m_api->project(); } -CodeModel *TDevPlugin::codeModel() const +CodeModel *KDevPlugin::codeModel() const { return m_api->codeModel(); } -TQDomDocument *TDevPlugin::projectDom() const +TQDomDocument *KDevPlugin::projectDom() const { return m_api->projectDom(); } -TDevLanguageSupport *TDevPlugin::languageSupport() const +KDevLanguageSupport *KDevPlugin::languageSupport() const { return m_api->languageSupport(); } -TDevPartController *TDevPlugin::partController() const +KDevPartController *KDevPlugin::partController() const { return m_api->partController(); } -TDevPluginController *TDevPlugin::pluginController() const +KDevPluginController *KDevPlugin::pluginController() const { return m_api->pluginController(); } -void TDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/) +void KDevPlugin::restorePartialProjectSession(const TQDomElement* /*el*/) { // there's still nothing to do in the base class } -void TDevPlugin::savePartialProjectSession(TQDomElement* /*el*/) +void KDevPlugin::savePartialProjectSession(TQDomElement* /*el*/) { // there's still nothing to do in the base class } -TDevCodeRepository * TDevPlugin::codeRepository() const +KDevCodeRepository * KDevPlugin::codeRepository() const { return m_api->codeRepository(); } -TDevPlugin * TDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint) +KDevPlugin * KDevPlugin::extension_internal(const TQString &serviceType, const TQString &constraint) { return m_api->pluginController()->extension(serviceType, constraint); } -const TDevPluginInfo *TDevPlugin::info() +const KDevPluginInfo *KDevPlugin::info() { return d->info; } -#include "tdevplugin.moc" +#include "kdevplugin.moc" diff --git a/lib/interfaces/tdevplugin.h b/lib/interfaces/kdevplugin.h similarity index 87% rename from lib/interfaces/tdevplugin.h rename to lib/interfaces/kdevplugin.h index eaa66146..31cc5550 100644 --- a/lib/interfaces/tdevplugin.h +++ b/lib/interfaces/kdevplugin.h @@ -17,26 +17,26 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVPLUGIN_H -#define TDEVPLUGIN_H +#ifndef KDEVPLUGIN_H +#define KDEVPLUGIN_H #include #include -#include "tdevapi.h" - -class TDevCore; -class TDevProject; -class TDevVersionControl; -class TDevLanguageSupport; -class TDevPartController; -class TDevMainWindow; -class TDevCodeRepository; +#include "kdevapi.h" + +class KDevCore; +class KDevProject; +class KDevVersionControl; +class KDevLanguageSupport; +class KDevPartController; +class KDevMainWindow; +class KDevCodeRepository; class CodeModel; -class TDevPluginInfo; +class KDevPluginInfo; class TQDomElement; /** -@file tdevplugin.h +@file kdevplugin.h TDevelop plugin interface. */ @@ -92,19 +92,19 @@ Plugin scope can be either: - Global - Project . -Global plugins are plugins which require only shell to be loaded and do not operate on @ref TDevProject interface and/or do not use project wide information.\n +Global plugins are plugins which require only shell to be loaded and do not operate on @ref KDevProject interface and/or do not use project wide information.\n Core plugins are global plugins which offer some important "core" functionality and thus are not selectable by user in plugin configuration pages.\n Project plugins require a project to be loaded and are usually loaded/unloaded among with the project. -If your plugin use @ref TDevProject interface and/or operate on project-related information then this is the project plugin. +If your plugin use @ref KDevProject interface and/or operate on project-related information then this is the project plugin. -@sa TDevGenericFactory class documentation for an information about plugin instantiation +@sa KDevGenericFactory class documentation for an information about plugin instantiation and writing factories for plugins. -@sa TDevCore class documentation for an information about features which are available to plugins +@sa KDevCore class documentation for an information about features which are available to plugins from shell applications. */ -class TDevPlugin: public TQObject, public KXMLGUIClient +class KDevPlugin: public TQObject, public KXMLGUIClient { Q_OBJECT @@ -116,30 +116,30 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevPlugin(const TDevPluginInfo *info, TQObject *parent, const char *name = 0); + KDevPlugin(const KDevPluginInfo *info, TQObject *parent, const char *name = 0); /**Destructs a plugin.*/ - virtual ~TDevPlugin(); + virtual ~KDevPlugin(); /**Provides an information about the plugin. @return TDEAboutData object which was initialized in the constructor.*/ - const TDevPluginInfo* info(); + const KDevPluginInfo* info(); /**@return A reference to the toplevel widget.*/ - TDevMainWindow *mainWindow(); + KDevMainWindow *mainWindow(); /**@return A reference to the application core - an object which provides basic functionalities for inter-parts communications / cooperation.*/ - TDevCore *core() const; + KDevCore *core() const; /**@return A reference to the current project component or 0 if no project is loaded.*/ - TDevProject *project() const; + KDevProject *project() const; /**@return A reference to the language support component or 0 if no support available.*/ - TDevLanguageSupport *languageSupport() const; + KDevLanguageSupport *languageSupport() const; /**@return A reference to the memory symbol store.*/ CodeModel *codeModel() const; @@ -148,13 +148,13 @@ public: TQDomDocument *projectDom() const; /**@return A reference to the part controller which is used to manipulate loaded KParts.*/ - TDevPartController *partController() const; + KDevPartController *partController() const; /**@return A reference to the plugin controller which is used to manipulate loaded plugin.*/ - virtual TDevPluginController *pluginController() const; + virtual KDevPluginController *pluginController() const; /**@return A reference to the code repository (accessor to persistent symbol stores).*/ - TDevCodeRepository* codeRepository() const; + KDevCodeRepository* codeRepository() const; /**Queries for the plugin which supports given service type (such plugins are called extensions in KDevelop). All already loaded plugins will be queried and the first loaded one to support @@ -162,7 +162,7 @@ public: entry is required in .desktop file for that plugin. Template argument is used as a type to cast the result to. This is done because extension - is usually derived from a certain base class and not directly from TDevPlugin. + is usually derived from a certain base class and not directly from KDevPlugin. @param serviceType The service type of an extension (like "TDevelop/SourceFormatter"). @param constraint The constraint which is applied when quering for the service. This constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). @@ -191,9 +191,9 @@ public: virtual void savePartialProjectSession(TQDomElement* el); private: - TDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = ""); + KDevPlugin *extension_internal(const TQString &serviceType, const TQString &constraint = ""); - TDevApi *m_api; + KDevApi *m_api; class Private; Private *d; }; diff --git a/lib/interfaces/tdevplugincontroller.cpp b/lib/interfaces/kdevplugincontroller.cpp similarity index 76% rename from lib/interfaces/tdevplugincontroller.cpp rename to lib/interfaces/kdevplugincontroller.cpp index bf1eb5e7..1cc6caa3 100644 --- a/lib/interfaces/tdevplugincontroller.cpp +++ b/lib/interfaces/kdevplugincontroller.cpp @@ -16,34 +16,34 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevplugincontroller.h" +#include "kdevplugincontroller.h" -#include "tdevplugin.h" +#include "kdevplugin.h" -TDevPluginController::TDevPluginController() +KDevPluginController::KDevPluginController() { } -TDETrader::OfferList TDevPluginController::query(const TQString &serviceType, +TDETrader::OfferList KDevPluginController::query(const TQString &serviceType, const TQString &constraint) { return TDETrader::self()->query(serviceType, TQString("%1 and [X-TDevelop-Version] == %2").arg(constraint).arg(TDEVELOP_PLUGIN_VERSION)); } -TDETrader::OfferList TDevPluginController::queryPlugins(const TQString &constraint) +TDETrader::OfferList KDevPluginController::queryPlugins(const TQString &constraint) { return query("TDevelop/Plugin", constraint); } -KURL::List TDevPluginController::profileResources(const TQString &/*nameFilter*/) +KURL::List KDevPluginController::profileResources(const TQString &/*nameFilter*/) { return KURL::List(); } -KURL::List TDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/) +KURL::List KDevPluginController::profileResourcesRecursive(const TQString &/*nameFilter*/) { return KURL::List(); } -#include "tdevplugincontroller.moc" +#include "kdevplugincontroller.moc" diff --git a/lib/interfaces/tdevplugincontroller.h b/lib/interfaces/kdevplugincontroller.h similarity index 91% rename from lib/interfaces/tdevplugincontroller.h rename to lib/interfaces/kdevplugincontroller.h index ee44764d..05ee050b 100644 --- a/lib/interfaces/tdevplugincontroller.h +++ b/lib/interfaces/kdevplugincontroller.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVPLUGINCONTROLLER_H -#define TDEVPLUGINCONTROLLER_H +#ifndef KDEVPLUGINCONTROLLER_H +#define KDEVPLUGINCONTROLLER_H #include @@ -25,18 +25,18 @@ #include /** -@file tdevplugincontroller.h +@file kdevplugincontroller.h TDevelop plugin controller interface. */ -class TDevPlugin; +class KDevPlugin; class ProfileEngine; /** The base class for TDevelop plugin controller. Plugin controller is responsible for quering, loading and unloading available plugins. */ -class TDevPluginController: public TQObject +class KDevPluginController: public TQObject { Q_OBJECT @@ -46,7 +46,7 @@ public: * Returns a uniquely specified plugin. If it isn't already loaded, it will be. * Use with caution! See extension for parameter details. */ - virtual TDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0; + virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ) = 0; /** * Unloads the plugin specified by @p plugin @@ -60,7 +60,7 @@ public: virtual void unloadPlugins(TQStringList const &list) = 0; /**@return The list of currently loaded plugins.*/ - virtual const TQValueList loadedPlugins() = 0; + virtual const TQValueList loadedPlugins() = 0; /**Queries for the plugin which supports given service type. All already loaded plugins will be queried and the first one to support the service type @@ -70,7 +70,7 @@ public: @param constraint The constraint which is applied when quering for the service. This constraint is a usual TDETrader constraint statement (like "[X-TDevelop-Foo]=='MyFoo'"). @return A KDevelop extension plugin for given service type or 0 if no plugin supports it*/ - virtual TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0; + virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = "") = 0; /**Queries KDevelop services. Version is checked automatically by adding proper X-TDevelop-Version=N statement into the query. @@ -82,7 +82,7 @@ public: static TDETrader::OfferList query(const TQString &serviceType, const TQString &constraint); /**Queries TDevelop plugins. Works like - TDevPluginController::query with serviceType set to "TDevelop/Plugin". + KDevPluginController::query with serviceType set to "TDevelop/Plugin". @param constraint A constraint for the service. Do not include plugin version number - it is done automatically. @return The list of plugin offers.*/ @@ -112,7 +112,7 @@ signals: protected: /**Constructor.*/ - TDevPluginController(); + KDevPluginController(); }; diff --git a/lib/interfaces/tdevplugininfo.cpp b/lib/interfaces/kdevplugininfo.cpp similarity index 78% rename from lib/interfaces/tdevplugininfo.cpp rename to lib/interfaces/kdevplugininfo.cpp index 2f607431..e80385cb 100644 --- a/lib/interfaces/tdevplugininfo.cpp +++ b/lib/interfaces/kdevplugininfo.cpp @@ -16,16 +16,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include #include #include -#include "tdevplugincontroller.h" +#include "kdevplugincontroller.h" -struct TDevPluginInfo::Private { +struct KDevPluginInfo::Private { TQString m_pluginName; TQString m_rawGenericName; @@ -46,7 +46,7 @@ struct TDevPluginInfo::Private { }; -TDevPluginInfo::TDevPluginInfo(const TQString &pluginName) +KDevPluginInfo::KDevPluginInfo(const TQString &pluginName) :d(new Private()) { d->m_pluginName = pluginName; @@ -89,92 +89,92 @@ TDevPluginInfo::TDevPluginInfo(const TQString &pluginName) } -TDevPluginInfo::operator TDEAboutData *() const +KDevPluginInfo::operator TDEAboutData *() const { return d->m_data; } -TQString TDevPluginInfo::pluginName() const +TQString KDevPluginInfo::pluginName() const { return d->m_pluginName; } -TQString TDevPluginInfo::genericName() const +TQString KDevPluginInfo::genericName() const { return d->m_genericName; } -TQString TDevPluginInfo::icon() const +TQString KDevPluginInfo::icon() const { return d->m_icon; } -TQString TDevPluginInfo::description() const +TQString KDevPluginInfo::description() const { return d->m_description; } -TQString TDevPluginInfo::version() const +TQString KDevPluginInfo::version() const { return d->m_version; } -int TDevPluginInfo::licenseType() const +int KDevPluginInfo::licenseType() const { return d->m_licenseType; } -TQString TDevPluginInfo::license() const +TQString KDevPluginInfo::license() const { - TDevPluginInfo &info = *const_cast(this); + KDevPluginInfo &info = *const_cast(this); // return TDEAboutData(info).license(); TDEAboutData *data = info; return data->license(); } -TQString TDevPluginInfo::copyrightStatement() const +TQString KDevPluginInfo::copyrightStatement() const { return d->m_copyrightStatement; } -TQString TDevPluginInfo::homePageAddress() const +TQString KDevPluginInfo::homePageAddress() const { return d->m_homePageAddress; } -TQString TDevPluginInfo::bugsEmailAddress() const +TQString KDevPluginInfo::bugsEmailAddress() const { return d->m_bugsEmailAddress; } -TQVariant TDevPluginInfo::property(const TQString &name) const +TQVariant KDevPluginInfo::property(const TQString &name) const { - TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->property(name); return TQVariant(); } -TQVariant TDevPluginInfo::operator [](const TQString &name) const +TQVariant KDevPluginInfo::operator [](const TQString &name) const { return property(name); } -TQStringList TDevPluginInfo::propertyNames( ) const +TQStringList KDevPluginInfo::propertyNames( ) const { - TDETrader::OfferList offers = TDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); + TDETrader::OfferList offers = KDevPluginController::queryPlugins(TQString("Name='%1'").arg(d->m_pluginName)); if (offers.count() == 1) return offers.first()->propertyNames(); return TQStringList(); } -void TDevPluginInfo::addAuthor(const char *name, const char *task, +void KDevPluginInfo::addAuthor(const char *name, const char *task, const char *emailAddress, const char *webAddress) { d->m_authors.append(TDEAboutPerson(name, task, emailAddress, webAddress)); } -void TDevPluginInfo::addCredit(const char *name, const char *task, +void KDevPluginInfo::addCredit(const char *name, const char *task, const char *emailAddress, const char *webAddress) { d->m_credits.append(TDEAboutPerson(name, task, emailAddress, webAddress)); diff --git a/lib/interfaces/tdevplugininfo.h b/lib/interfaces/kdevplugininfo.h similarity index 91% rename from lib/interfaces/tdevplugininfo.h rename to lib/interfaces/kdevplugininfo.h index 419d61aa..ffd1c46e 100644 --- a/lib/interfaces/tdevplugininfo.h +++ b/lib/interfaces/kdevplugininfo.h @@ -16,15 +16,15 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVPLUGININFO_H -#define TDEVPLUGININFO_H +#ifndef KDEVPLUGININFO_H +#define KDEVPLUGININFO_H #include #include /** -@file tdevplugininfo.h +@file kdevplugininfo.h TDevelop plugin information container class. */ @@ -32,20 +32,20 @@ TDevelop plugin information container class. Information about TDevelop plugin. It uses plugin name to query plugin .desktop files and retrieve most information. Names of authors and credits to other people -must be added manually using TDevPluginInfo::addAuthor and TDevPluginInfo::addCredit +must be added manually using KDevPluginInfo::addAuthor and KDevPluginInfo::addCredit methods. -@sa TDevPlugin class documentation for more information about .desktop files. +@sa KDevPlugin class documentation for more information about .desktop files. */ -class TDevPluginInfo +class KDevPluginInfo { public: /**Constructor. @param pluginName A name of a plugin. Must be the same as the name of a .desktop file and the same as the location of plugin resource files.*/ - TDevPluginInfo(const TQString &pluginName); + KDevPluginInfo(const TQString &pluginName); - /**Casts TDevPluginInfo to TDEAboutData. Uses TDevPluginInfo::pluginName as TDEAboutData::appName, - TDevPluginInfo::rawGenericName as TDEAboutData::programName TDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/ + /**Casts KDevPluginInfo to TDEAboutData. Uses KDevPluginInfo::pluginName as TDEAboutData::appName, + KDevPluginInfo::rawGenericName as TDEAboutData::programName KDevPluginInfo::licenseType as TDEAboutData::licenseType. Other parameters are ignored.*/ operator TDEAboutData*() const; /**@return A name of a plugin (always untranslated).*/ diff --git a/lib/interfaces/tdevproject.cpp b/lib/interfaces/kdevproject.cpp similarity index 78% rename from lib/interfaces/tdevproject.cpp rename to lib/interfaces/kdevproject.cpp index 77136ca0..e8616df1 100644 --- a/lib/interfaces/tdevproject.cpp +++ b/lib/interfaces/kdevproject.cpp @@ -24,21 +24,21 @@ #include -#include "tdevproject.h" +#include "kdevproject.h" #include #include #include -#include "tdevprojectiface.h" +#include "kdevprojectiface.h" -struct TDevProject::Private { +struct KDevProject::Private { TQMap m_absToRel; TQStringList m_symlinkList; TQTimer *m_timer; - TDevProjectIface *m_iface; + KDevProjectIface *m_iface; }; -TDevProject::TDevProject(const TDevPluginInfo *info, TQObject *parent, const char *name) - : TDevPlugin(info, parent, name), d(new TDevProject::Private()) +KDevProject::KDevProject(const KDevPluginInfo *info, TQObject *parent, const char *name) + : KDevPlugin(info, parent, name), d(new KDevProject::Private()) { connect( this, TQT_SIGNAL(addedFilesToProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); connect( this, TQT_SIGNAL(removedFilesFromProject(const TQStringList& )), this, TQT_SLOT(buildFileMap()) ); @@ -48,10 +48,10 @@ TDevProject::TDevProject(const TDevPluginInfo *info, TQObject *parent, const cha d->m_timer = new TQTimer(this); connect(d->m_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotBuildFileMap())); - d->m_iface = new TDevProjectIface(this); + d->m_iface = new KDevProjectIface(this); } -TDevProject::~TDevProject() +KDevProject::~KDevProject() { d->m_timer->stop(); delete d->m_iface; @@ -59,7 +59,7 @@ TDevProject::~TDevProject() delete d; } -void TDevProject::changedFile( const TQString & fileName ) +void KDevProject::changedFile( const TQString & fileName ) { TQStringList fileList; fileList.append ( fileName ); @@ -68,35 +68,35 @@ void TDevProject::changedFile( const TQString & fileName ) } -void TDevProject::changedFiles( const TQStringList & fileList ) +void KDevProject::changedFiles( const TQStringList & fileList ) { emit changedFilesInProject( fileList ); } -TDevProject::Options TDevProject::options() const +KDevProject::Options KDevProject::options() const { - return (TDevProject::Options)0; + return (KDevProject::Options)0; } -bool TDevProject::isProjectFile( const TQString & absFileName ) +bool KDevProject::isProjectFile( const TQString & absFileName ) { return d->m_absToRel.contains( absFileName ); } -TQString TDevProject::relativeProjectFile( const TQString & absFileName ) +TQString KDevProject::relativeProjectFile( const TQString & absFileName ) { if( isProjectFile(absFileName) ) return d->m_absToRel[ absFileName ]; return TQString(); } -void TDevProject::buildFileMap() +void KDevProject::buildFileMap() { d->m_timer->stop(); d->m_timer->start(0, true); } -void TDevProject::slotBuildFileMap() +void KDevProject::slotBuildFileMap() { kdDebug(9000) << k_funcinfo << endl; @@ -115,22 +115,22 @@ void TDevProject::slotBuildFileMap() } } -void TDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ ) +void KDevProject::openProject( const TQString & /*dirName*/, const TQString & /*projectName*/ ) { buildFileMap(); } -TQStringList TDevProject::symlinkProjectFiles( ) +TQStringList KDevProject::symlinkProjectFiles( ) { return d->m_symlinkList; } -TQString TDevProject::defaultRunDirectory(const TQString& projectPluginName) const +TQString KDevProject::defaultRunDirectory(const TQString& projectPluginName) const { return DomUtil::readEntry(*projectDom(), "/" + projectPluginName + "/run/globalcwd"); } -void TDevProject::slotAddFilesToFileMap( const TQStringList & fileList ) +void KDevProject::slotAddFilesToFileMap( const TQStringList & fileList ) { TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) @@ -147,7 +147,7 @@ void TDevProject::slotAddFilesToFileMap( const TQStringList & fileList ) } } -void TDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList ) +void KDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList ) { TQStringList::ConstIterator it = fileList.begin(); while( it != fileList.end() ) @@ -161,4 +161,4 @@ void TDevProject::slotRemoveFilesFromFileMap( const TQStringList & fileList ) } } -#include "tdevproject.moc" +#include "kdevproject.moc" diff --git a/lib/interfaces/tdevproject.h b/lib/interfaces/kdevproject.h similarity index 96% rename from lib/interfaces/tdevproject.h rename to lib/interfaces/kdevproject.h index fa320edf..256b0c0c 100644 --- a/lib/interfaces/tdevproject.h +++ b/lib/interfaces/kdevproject.h @@ -22,17 +22,17 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVPROJECT_H -#define TDEVPROJECT_H +#ifndef KDEVPROJECT_H +#define KDEVPROJECT_H -#include "tdevplugin.h" +#include "kdevplugin.h" #include "domutil.h" #include #include /** -@file tdevproject.h +@file kdevproject.h KDevelop project interface. */ @@ -40,12 +40,12 @@ class TQTimer; /** KDevelop project interface. -Plugins implementing the TDevProject interfaces are used to manage projects. +Plugins implementing the KDevProject interfaces are used to manage projects. Project can be considered as a way of grouping files (in text editors) or as a way of providing support for a build system (like it is done in TDevelop IDE buildtools). */ -class TDevProject: public TDevPlugin +class KDevProject: public KDevPlugin { Q_OBJECT @@ -56,12 +56,12 @@ public: plugin information in various places like "about application" dialog, plugin selector dialog, etc. Plugin does not take ownership on info object, also its lifetime should be equal to the lifetime of the plugin. - @param parent The parent object for the plugin. Parent object must implement @ref TDevApi + @param parent The parent object for the plugin. Parent object must implement @ref KDevApi interface. Otherwise the plugin will not be constructed. @param name The internal name which identifies the plugin.*/ - TDevProject(const TDevPluginInfo *info, TQObject *parent=0, const char *name=0); + KDevProject(const KDevPluginInfo *info, TQObject *parent=0, const char *name=0); /**Destructor.*/ - virtual ~TDevProject(); + virtual ~KDevProject(); /**Options of the project plugin.*/ enum Options { @@ -83,7 +83,7 @@ public: virtual void closeProject() = 0; /**Reimplement this method to set project plugin options. Default implementation - returns TDevProject::UsesOtherBuildSystem.*/ + returns KDevProject::UsesOtherBuildSystem.*/ virtual Options options() const; /**@return The canonical absolute directory of the project. Canonical means that diff --git a/lib/interfaces/tdevprojectiface.cpp b/lib/interfaces/kdevprojectiface.cpp similarity index 57% rename from lib/interfaces/tdevprojectiface.cpp rename to lib/interfaces/kdevprojectiface.cpp index 625a4118..28d4501c 100644 --- a/lib/interfaces/tdevprojectiface.cpp +++ b/lib/interfaces/kdevprojectiface.cpp @@ -19,168 +19,168 @@ Boston, MA 02110-1301, USA. */ -#include "tdevprojectiface.h" -#include "tdevproject.h" +#include "kdevprojectiface.h" +#include "kdevproject.h" #include "domutil.h" -TDevProjectIface::TDevProjectIface(TDevProject *prj) - : TQObject(prj), DCOPObject("TDevProject"), m_prj(prj) +KDevProjectIface::KDevProjectIface(KDevProject *prj) + : TQObject(prj), DCOPObject("KDevProject"), m_prj(prj) { } -TDevProjectIface::~TDevProjectIface() +KDevProjectIface::~KDevProjectIface() { } -void TDevProjectIface::openProject( const TQString & dirName, const TQString & projectName ) +void KDevProjectIface::openProject( const TQString & dirName, const TQString & projectName ) { m_prj->openProject(dirName,projectName); } -void TDevProjectIface::closeProject( ) +void KDevProjectIface::closeProject( ) { m_prj->closeProject(); } -uint TDevProjectIface::options( ) const +uint KDevProjectIface::options( ) const { return (uint)m_prj->options(); } -TQString TDevProjectIface::projectDirectory( ) const +TQString KDevProjectIface::projectDirectory( ) const { return m_prj->projectDirectory(); } -TQString TDevProjectIface::projectName( ) const +TQString KDevProjectIface::projectName( ) const { return m_prj->projectName(); } -TQString TDevProjectIface::mainProgram() const +TQString KDevProjectIface::mainProgram() const { return m_prj->mainProgram(); } -TQString TDevProjectIface::runDirectory( ) const +TQString KDevProjectIface::runDirectory( ) const { return m_prj->runDirectory(); } -TQString TDevProjectIface::activeDirectory( ) const +TQString KDevProjectIface::activeDirectory( ) const { return m_prj->activeDirectory(); } -TQString TDevProjectIface::buildDirectory( ) const +TQString KDevProjectIface::buildDirectory( ) const { return m_prj->buildDirectory(); } -TQStringList TDevProjectIface::allFiles( ) const +TQStringList KDevProjectIface::allFiles( ) const { return m_prj->allFiles(); } -TQStringList TDevProjectIface::distFiles( ) const +TQStringList KDevProjectIface::distFiles( ) const { return m_prj->distFiles(); } -void TDevProjectIface::addFiles( const TQStringList & fileList ) +void KDevProjectIface::addFiles( const TQStringList & fileList ) { m_prj->addFiles(fileList); } -void TDevProjectIface::addFile( const TQString & fileName ) +void KDevProjectIface::addFile( const TQString & fileName ) { m_prj->addFile(fileName); } -void TDevProjectIface::removeFiles( const TQStringList & fileList ) +void KDevProjectIface::removeFiles( const TQStringList & fileList ) { m_prj->removeFiles(fileList); } -void TDevProjectIface::removeFile( const TQString & fileName ) +void KDevProjectIface::removeFile( const TQString & fileName ) { m_prj->removeFile(fileName); } -void TDevProjectIface::changedFiles( const TQStringList & fileList ) +void KDevProjectIface::changedFiles( const TQStringList & fileList ) { m_prj->changedFiles(fileList); } -void TDevProjectIface::changedFile( const TQString & fileName ) +void KDevProjectIface::changedFile( const TQString & fileName ) { m_prj->changedFile(fileName); } -bool TDevProjectIface::isProjectFile( const TQString & absFileName ) +bool KDevProjectIface::isProjectFile( const TQString & absFileName ) { return m_prj->isProjectFile(absFileName); } -TQString TDevProjectIface::relativeProjectFile( const TQString & absFileName ) +TQString KDevProjectIface::relativeProjectFile( const TQString & absFileName ) { return m_prj->relativeProjectFile(absFileName); } -TQStringList TDevProjectIface::symlinkProjectFiles( ) +TQStringList KDevProjectIface::symlinkProjectFiles( ) { return m_prj->symlinkProjectFiles(); } -TQString TDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry ) +TQString KDevProjectIface::readEntry( const TQString & path, const TQString & defaultEntry ) { return DomUtil::readEntry( *m_prj->projectDom(), path, defaultEntry); } -int TDevProjectIface::readIntEntry( const TQString & path, int defaultEntry ) +int KDevProjectIface::readIntEntry( const TQString & path, int defaultEntry ) { return DomUtil::readIntEntry(*m_prj->projectDom(), path,defaultEntry); } -bool TDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry ) +bool KDevProjectIface::readBoolEntry( const TQString & path, bool defaultEntry ) { return DomUtil::readBoolEntry(*m_prj->projectDom(), path, defaultEntry); } -TQStringList TDevProjectIface::readListEntry( const TQString & path, const TQString & tag ) +TQStringList KDevProjectIface::readListEntry( const TQString & path, const TQString & tag ) { return DomUtil::readListEntry(*m_prj->projectDom(), path, tag); } -TQMap< TQString, TQString > TDevProjectIface::readMapEntry( const TQString & path ) +TQMap< TQString, TQString > KDevProjectIface::readMapEntry( const TQString & path ) { return DomUtil::readMapEntry(*m_prj->projectDom(), path); } -void TDevProjectIface::writeEntry( const TQString & path, const TQString & value ) +void KDevProjectIface::writeEntry( const TQString & path, const TQString & value ) { DomUtil::writeEntry(*m_prj->projectDom(), path, value); } -void TDevProjectIface::writeIntEntry( const TQString & path, int value ) +void KDevProjectIface::writeIntEntry( const TQString & path, int value ) { DomUtil::writeIntEntry(*m_prj->projectDom(), path, value); } -void TDevProjectIface::writeBoolEntry( const TQString & path, bool value ) +void KDevProjectIface::writeBoolEntry( const TQString & path, bool value ) { DomUtil::writeBoolEntry(*m_prj->projectDom(), path, value); } -void TDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value ) +void KDevProjectIface::writeListEntry( const TQString & path, const TQString & tag, const TQStringList & value ) { DomUtil::writeListEntry(*m_prj->projectDom(), path, tag, value); } -void TDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map ) +void KDevProjectIface::writeMapEntry( const TQString & path, const TQMap< TQString, TQString > & map ) { DomUtil::writeMapEntry(*m_prj->projectDom(), path, map); } -#include "tdevprojectiface.moc" +#include "kdevprojectiface.moc" diff --git a/lib/interfaces/tdevprojectiface.h b/lib/interfaces/kdevprojectiface.h similarity index 90% rename from lib/interfaces/tdevprojectiface.h rename to lib/interfaces/kdevprojectiface.h index c3e0ddd4..e30cd6cc 100644 --- a/lib/interfaces/tdevprojectiface.h +++ b/lib/interfaces/kdevprojectiface.h @@ -17,29 +17,29 @@ Boston, MA 02110-1301, USA. */ -#ifndef TDEVPROJECTIFACE_H -#define TDEVPROJECTIFACE_H +#ifndef KDEVPROJECTIFACE_H +#define KDEVPROJECTIFACE_H #include #include #include -class TDevProject; +class KDevProject; /** -DCOP Interface for the @ref TDevProject object. +DCOP Interface for the @ref KDevProject object. @author KDevelop Authors */ -class TDevProjectIface : public TQObject, public DCOPObject +class KDevProjectIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevProjectIface(TDevProject *prj); + KDevProjectIface(KDevProject *prj); - ~TDevProjectIface(); + ~KDevProjectIface(); k_dcop: void openProject(const TQString &dirName, const TQString &projectName); void closeProject(); @@ -76,7 +76,7 @@ k_dcop: void writeMapEntry(const TQString& path, const TQMap &map); private: - TDevProject *m_prj; + KDevProject *m_prj; }; #endif diff --git a/lib/util/CMakeLists.txt b/lib/util/CMakeLists.txt index 0114b5ae..1eb17f35 100644 --- a/lib/util/CMakeLists.txt +++ b/lib/util/CMakeLists.txt @@ -26,13 +26,13 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/util ) -##### tdevutil (static) ######################### +##### kdevutil (static) ######################### -tde_add_library( tdevutil STATIC_PIC AUTOMOC +tde_add_library( kdevutil STATIC_PIC AUTOMOC SOURCES blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp execcommand.cpp filetemplate.cpp - tdeveditorutil.cpp tdevjobtimer.cpp - tdevshellwidget.cpp tdescriptactionmanager.cpp + kdeveditorutil.cpp kdevjobtimer.cpp + kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp ) diff --git a/lib/util/Makefile.am b/lib/util/Makefile.am index 52ededb0..8bf28091 100644 --- a/lib/util/Makefile.am +++ b/lib/util/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo $(all_includes) -noinst_LTLIBRARIES = libtdevutil.la +noinst_LTLIBRARIES = libkdevutil.la -libtdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \ - execcommand.cpp filetemplate.cpp tdeveditorutil.cpp tdevjobtimer.cpp \ - tdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp +libkdevutil_la_SOURCES = blockingkprocess.cpp configwidgetproxy.cpp domutil.cpp \ + execcommand.cpp filetemplate.cpp kdeveditorutil.cpp kdevjobtimer.cpp \ + kdevshellwidget.cpp tdescriptactionmanager.cpp rurl.cpp settings.cpp urlutil.cpp METASOURCES = AUTO @@ -12,10 +12,10 @@ tdevelopincludedir = $(includedir)/tdevelop/util tdevelopinclude_HEADERS = domutil.h execcommand.h filetemplate.h urlutil.h \ configwidgetproxy.h rurl.h tdescriptactionmanager.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevextensions tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Utility Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevextensions kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Utility Library +DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am -noinst_HEADERS = blockingkprocess.h tdeveditorutil.h tdevjobtimer.h \ - tdevshellwidget.h settings.h +noinst_HEADERS = blockingkprocess.h kdeveditorutil.h kdevjobtimer.h \ + kdevshellwidget.h settings.h diff --git a/lib/util/configwidgetproxy.cpp b/lib/util/configwidgetproxy.cpp index c2251158..bea1c79a 100644 --- a/lib/util/configwidgetproxy.cpp +++ b/lib/util/configwidgetproxy.cpp @@ -26,13 +26,13 @@ #include #include -#include +#include #include "configwidgetproxy.h" -ConfigWidgetProxy::ConfigWidgetProxy( TDevCore * core ) +ConfigWidgetProxy::ConfigWidgetProxy( KDevCore * core ) { connect( core, TQT_SIGNAL(configWidget(KDialogBase*)), this, TQT_SLOT(slotConfigWidget( KDialogBase*)) ); connect( core, TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(slotProjectConfigWidget( KDialogBase*)) ); diff --git a/lib/util/configwidgetproxy.h b/lib/util/configwidgetproxy.h index f1ced178..7881f830 100644 --- a/lib/util/configwidgetproxy.h +++ b/lib/util/configwidgetproxy.h @@ -24,7 +24,7 @@ #include #include -class TDevCore; +class KDevCore; class KDialogBase; /** @@ -65,8 +65,8 @@ void MyPart::insertConfigWidget( TQObject const * dlg, TQWidget * page, unsigned } @endcode -Note that this replaces the functionality of typical TDevCore::configWidget() and -TDevCore::projectConfigWidget() slots. +Note that this replaces the functionality of typical KDevCore::configWidget() and +KDevCore::projectConfigWidget() slots. */ class ConfigWidgetProxy : public TQObject { @@ -76,7 +76,7 @@ Q_OBJECT public: /**Constructor. @param core An instance of KDevelop Core.*/ - ConfigWidgetProxy( TDevCore * core ); + ConfigWidgetProxy( KDevCore * core ); virtual ~ConfigWidgetProxy(); /** diff --git a/lib/util/filetemplate.cpp b/lib/util/filetemplate.cpp index 4d0facdf..c2454580 100644 --- a/lib/util/filetemplate.cpp +++ b/lib/util/filetemplate.cpp @@ -27,12 +27,12 @@ #include -#include "tdevplugin.h" -#include "tdevproject.h" +#include "kdevplugin.h" +#include "kdevproject.h" #include "domutil.h" -bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p) +bool FileTemplate::exists(KDevPlugin *part, const TQString &name, Policy p) { //TQString fileName = (p == Default) ? // (part->project()->projectDirectory() + "/templates/" + name) : name; @@ -40,17 +40,17 @@ bool FileTemplate::exists(TDevPlugin *part, const TQString &name, Policy p) return TQFile::exists( fullPathForName(part,name,p) ); } -TQString FileTemplate::read(TDevPlugin *part, const TQString &name, Policy p) +TQString FileTemplate::read(KDevPlugin *part, const TQString &name, Policy p) { - //TDevProject *project = part->project(); + //KDevProject *project = part->project(); //TQString fileName = (p == Default) ? (project->projectDirectory() + // "/templates/" + name) : name; return readFile(part, fullPathForName(part, name, p) ); } -TQString FileTemplate::readFile(TDevPlugin *part, const TQString &fileName) +TQString FileTemplate::readFile(KDevPlugin *part, const TQString &fileName) { TQDomDocument &dom = *part->projectDom(); @@ -87,7 +87,7 @@ TQString FileTemplate::makeSubstitutions( TQDomDocument & dom, const TQString & } -bool FileTemplate::copy(TDevPlugin *part, const TQString &name, +bool FileTemplate::copy(KDevPlugin *part, const TQString &name, const TQString &dest, Policy p) { TQString text = read(part, name, p); @@ -109,7 +109,7 @@ bool FileTemplate::copy(TDevPlugin *part, const TQString &name, return true; } -TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name, +TQString FileTemplate::fullPathForName(KDevPlugin *part, const TQString &name, Policy p) { // if Policy is not default, full path is just the name if (p!=Default) return name; @@ -123,6 +123,6 @@ TQString FileTemplate::fullPathForName(TDevPlugin *part, const TQString &name, } // next try global - TQString globalName = ::locate("data", "tdevfilecreate/file-templates/" + name); + TQString globalName = ::locate("data", "kdevfilecreate/file-templates/" + name); return globalName.isNull() ? fileName : globalName; } diff --git a/lib/util/filetemplate.h b/lib/util/filetemplate.h index 7802f9b7..8f863535 100644 --- a/lib/util/filetemplate.h +++ b/lib/util/filetemplate.h @@ -22,7 +22,7 @@ #include -class TDevPlugin; +class KDevPlugin; class TQDomDocument; /** @@ -49,21 +49,21 @@ public: * exists in the current project. File templates * are stored in the "templates" subdirectory of a project or in application shared dirs. */ - static bool exists(TDevPlugin *part, const TQString &name, Policy p = Default); + static bool exists(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given name (e.g. "cpp") * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static TQString read(TDevPlugin *part, const TQString &name, Policy p = Default); + static TQString read(KDevPlugin *part, const TQString &name, Policy p = Default); /** * Reads a template with the given URL * and makes variable substitutions (like $AUTHOR$ etc.) * in it. The resulting string is returned. */ - static TQString readFile(TDevPlugin *part, const TQString &fileName); + static TQString readFile(KDevPlugin *part, const TQString &fileName); /** * Makes variable substitutions on a text, based on a specified TQDomDocument @@ -76,13 +76,13 @@ public: * file with the name dest and - while copying - * performs variable substitutions. */ - static bool copy(TDevPlugin *part, const TQString &name, + static bool copy(KDevPlugin *part, const TQString &name, const TQString &dest, Policy p = Default); /** * Translates a template name into a full path, or suggests a full path * for the template in the project directory if it doesn't exist. */ - static TQString fullPathForName(TDevPlugin *part, const TQString &name, Policy p = Default); + static TQString fullPathForName(KDevPlugin *part, const TQString &name, Policy p = Default); }; #endif diff --git a/lib/util/tdeveditorutil.cpp b/lib/util/kdeveditorutil.cpp similarity index 91% rename from lib/util/tdeveditorutil.cpp rename to lib/util/kdeveditorutil.cpp index 455909f8..198e9a42 100644 --- a/lib/util/tdeveditorutil.cpp +++ b/lib/util/kdeveditorutil.cpp @@ -9,7 +9,7 @@ * * ***************************************************************************/ -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include #include @@ -17,7 +17,7 @@ #include #include -bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view ) +bool KDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * col, KTextEditor::Document * doc, KTextEditor::View * view ) { if ( !line || !col ) return false; @@ -33,7 +33,7 @@ bool TDevEditorUtil::currentPositionReal( unsigned int * line, unsigned int * co return true; } -TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast( doc ); if ( !editIface ) return TQString(); @@ -50,7 +50,7 @@ TQString TDevEditorUtil::currentLine( KTextEditor::Document * doc, KTextEditor:: return editIface->textLine(line); } -TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) +TQString KDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor::View * view ) { KTextEditor::EditInterface * editIface = dynamic_cast( doc ); if ( !editIface ) return TQString(); @@ -78,7 +78,7 @@ TQString TDevEditorUtil::currentWord( KTextEditor::Document * doc, KTextEditor:: } -TQString TDevEditorUtil::currentSelection( KTextEditor::Document * doc ) +TQString KDevEditorUtil::currentSelection( KTextEditor::Document * doc ) { KTextEditor::SelectionInterface * selectIface = dynamic_cast( doc ); return selectIface ? selectIface->selection() : TQString(); diff --git a/lib/util/tdeveditorutil.h b/lib/util/kdeveditorutil.h similarity index 95% rename from lib/util/tdeveditorutil.h rename to lib/util/kdeveditorutil.h index d69e914b..79a64fe1 100644 --- a/lib/util/tdeveditorutil.h +++ b/lib/util/kdeveditorutil.h @@ -9,8 +9,8 @@ * * ***************************************************************************/ -#ifndef TDEVEDITOR_H -#define TDEVEDITOR_H +#ifndef KDEVEDITOR_H +#define KDEVEDITOR_H namespace KTextEditor { @@ -25,9 +25,9 @@ Class with some common utility operations not currently supported by KTE @author Jens Dagerbo */ -class TDevEditorUtil +class KDevEditorUtil { - TDevEditorUtil() {} + KDevEditorUtil() {} public: /** diff --git a/lib/util/tdevjobtimer.cpp b/lib/util/kdevjobtimer.cpp similarity index 79% rename from lib/util/tdevjobtimer.cpp rename to lib/util/kdevjobtimer.cpp index 0e1465e0..b0b78250 100644 --- a/lib/util/tdevjobtimer.cpp +++ b/lib/util/kdevjobtimer.cpp @@ -9,31 +9,31 @@ * * ***************************************************************************/ -#include "tdevjobtimer.h" +#include "kdevjobtimer.h" -TDevJobTimer::TDevJobTimer( void * payload, TQObject *parent, const char *name) +KDevJobTimer::KDevJobTimer( void * payload, TQObject *parent, const char *name) : TQTimer(parent, name) { m_payload = payload; connect( this, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotTimeout()) ); } -TDevJobTimer::~TDevJobTimer() +KDevJobTimer::~KDevJobTimer() { } -void TDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload) +void KDevJobTimer::singleShot(int msec, TQObject * receiver, const char * member, void * payload) { - TDevJobTimer * p = new TDevJobTimer( payload ); + KDevJobTimer * p = new KDevJobTimer( payload ); p->start( msec, true ); connect( p, TQT_SIGNAL(timeout(void*)), receiver, member ); } -void TDevJobTimer::slotTimeout() +void KDevJobTimer::slotTimeout() { emit timeout( m_payload ); m_payload = 0; deleteLater(); } -#include "tdevjobtimer.moc" +#include "kdevjobtimer.moc" diff --git a/lib/util/tdevjobtimer.h b/lib/util/kdevjobtimer.h similarity index 86% rename from lib/util/tdevjobtimer.h rename to lib/util/kdevjobtimer.h index 313e56e5..b0fa829e 100644 --- a/lib/util/tdevjobtimer.h +++ b/lib/util/kdevjobtimer.h @@ -9,12 +9,12 @@ * * ***************************************************************************/ -#ifndef TDEVJOBTIMER_H -#define TDEVJOBTIMER_H +#ifndef KDEVJOBTIMER_H +#define KDEVJOBTIMER_H #include -class TDevJobTimer : public TQTimer +class KDevJobTimer : public TQTimer { Q_OBJECT @@ -25,8 +25,8 @@ signals: void timeout(void*); private: - TDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); - ~TDevJobTimer(); + KDevJobTimer( void * payload, TQObject *parent = 0, const char *name = 0); + ~KDevJobTimer(); private slots: void slotTimeout(); diff --git a/lib/util/tdevshellwidget.cpp b/lib/util/kdevshellwidget.cpp similarity index 85% rename from lib/util/tdevshellwidget.cpp rename to lib/util/kdevshellwidget.cpp index b5b8d195..b9220250 100644 --- a/lib/util/tdevshellwidget.cpp +++ b/lib/util/kdevshellwidget.cpp @@ -18,25 +18,25 @@ #include #include -#include "tdevshellwidget.h" +#include "kdevshellwidget.h" -TDevShellWidget::TDevShellWidget(TQWidget *parent, const char *name) +KDevShellWidget::KDevShellWidget(TQWidget *parent, const char *name) : TQVBox(parent, name), m_doAutoActivate( false ), m_isRunning( false ) { } -TDevShellWidget::~TDevShellWidget() +KDevShellWidget::~KDevShellWidget() { } -void TDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments ) +void KDevShellWidget::setShell( const TQString & shell, const TQStrList & arguments ) { m_shellName = shell; m_shellArguments = arguments; } -void TDevShellWidget::activate( ) +void KDevShellWidget::activate( ) { KLibFactory *factory = KLibLoader::self()->factory("libkonsolepart"); if ( !factory ) return; @@ -67,7 +67,7 @@ void TDevShellWidget::activate( ) } -void TDevShellWidget::partDestroyed( ) +void KDevShellWidget::partDestroyed( ) { if ( m_doAutoActivate ) { @@ -75,7 +75,7 @@ void TDevShellWidget::partDestroyed( ) } } -void TDevShellWidget::processExited( TDEProcess * proc ) +void KDevShellWidget::processExited( TDEProcess * proc ) { m_isRunning = false; @@ -89,7 +89,7 @@ void TDevShellWidget::processExited( TDEProcess * proc ) emit shellSignalled( proc->exitSignal() ); } -void TDevShellWidget::sendInput( const TQString & text ) +void KDevShellWidget::sendInput( const TQString & text ) { if ( !m_konsolePart ) return; TerminalInterface* ti = static_cast( m_konsolePart->tqt_cast( "TerminalInterface" ) ); @@ -98,12 +98,12 @@ void TDevShellWidget::sendInput( const TQString & text ) ti->sendInput( text ); } -bool TDevShellWidget::isRunning( ) +bool KDevShellWidget::isRunning( ) { return m_isRunning; } -void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) +void KDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) { // to auto reactivate can be dangerous, do it like this to avoid // reactivating with a non-working setting (the partDestroyed() @@ -114,12 +114,12 @@ void TDevShellWidget::setAutoReactivateOnClose( bool doAutoActivate ) m_doAutoActivate = false; } -void TDevShellWidget::setAutoReactivateOnCloseDelayed( ) +void KDevShellWidget::setAutoReactivateOnCloseDelayed( ) { m_doAutoActivate = true; } -#include "tdevshellwidget.moc" +#include "kdevshellwidget.moc" // kate: space-indent off; indent-width 4; tab-width 4; show-tabs off; diff --git a/lib/util/tdevshellwidget.h b/lib/util/kdevshellwidget.h similarity index 93% rename from lib/util/tdevshellwidget.h rename to lib/util/kdevshellwidget.h index f6476814..6bb6a8d7 100644 --- a/lib/util/tdevshellwidget.h +++ b/lib/util/kdevshellwidget.h @@ -10,8 +10,8 @@ ***************************************************************************/ -#ifndef TDEVSHELLWIDGET_H -#define TDEVSHELLWIDGET_H +#ifndef KDEVSHELLWIDGET_H +#define KDEVSHELLWIDGET_H #include #include @@ -23,15 +23,15 @@ namespace KParts class ReadOnlyPart; } -class TDevShellWidget : public TQVBox +class KDevShellWidget : public TQVBox { Q_OBJECT public: - TDevShellWidget(TQWidget *parent = 0, const char *name = 0); - virtual ~TDevShellWidget(); + KDevShellWidget(TQWidget *parent = 0, const char *name = 0); + virtual ~KDevShellWidget(); /** * Stores the shell name and arguments, that will be used in @ref activate() diff --git a/lib/widgets/CMakeLists.txt b/lib/widgets/CMakeLists.txt index 86303b6d..30e0ba3e 100644 --- a/lib/widgets/CMakeLists.txt +++ b/lib/widgets/CMakeLists.txt @@ -28,22 +28,22 @@ link_directories( install( FILES tdelistviewaction.h qcomboview.h flagboxes.h ksavealldialog.h resizablecombo.h kcomboview.h - tdevhtmlpart.h processlinemaker.h processwidget.h + kdevhtmlpart.h processlinemaker.h processwidget.h fancylistviewitem.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/widgets ) ##### other data ################################ -install( FILES tdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop ) +install( FILES kdevhtml_partui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevelop ) -##### tdevwidgets (shared) ###################### +##### kdevwidgets (shared) ###################### -tde_add_library( tdevwidgets SHARED AUTOMOC +tde_add_library( kdevwidgets SHARED AUTOMOC SOURCES flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp - kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp + kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp VERSION 0.0.0 diff --git a/lib/widgets/Makefile.am b/lib/widgets/Makefile.am index 7181151e..69be7a11 100644 --- a/lib/widgets/Makefile.am +++ b/lib/widgets/Makefile.am @@ -2,29 +2,29 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces $(all_inclu METASOURCES = AUTO -lib_LTLIBRARIES = libtdevwidgets.la +lib_LTLIBRARIES = libkdevwidgets.la -tdevwidgetsincludedir = $(includedir)/tdevelop/widgets +kdevwidgetsincludedir = $(includedir)/tdevelop/widgets -libtdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \ - kcomboview.cpp resizablecombo.cpp tdevhtmlpart.cpp processlinemaker.cpp \ +libkdevwidgets_la_SOURCES = flagboxes.cpp qcomboview.cpp tdelistviewaction.cpp \ + kcomboview.cpp resizablecombo.cpp kdevhtmlpart.cpp processlinemaker.cpp \ processwidget.cpp ksavealldialog.cpp fancylistviewitem.cpp -tdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \ - ksavealldialog.h resizablecombo.h kcomboview.h tdevhtmlpart.h processlinemaker.h \ +kdevwidgetsinclude_HEADERS = tdelistviewaction.h qcomboview.h flagboxes.h \ + ksavealldialog.h resizablecombo.h kcomboview.h kdevhtmlpart.h processlinemaker.h \ processwidget.h fancylistviewitem.h SUBDIRS = propeditor -libtdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libtdevinterfaces.la -libtdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries) +libkdevwidgets_la_LIBADD = $(top_builddir)/lib/interfaces/libkdevinterfaces.la +libkdevwidgets_la_LDFLAGS = -no-undefined $(all_libraries) rcdir = $(kde_datadir)/tdevelop -rc_DATA = tdevhtml_partui.rc +rc_DATA = kdevhtml_partui.rc -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Widgets Library -DOXYGEN_DOCDIRPREFIX = tdev +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Widgets Library +DOXYGEN_DOCDIRPREFIX = kdev include ../../Doxyfile.am diff --git a/lib/widgets/tdevhtml_partui.rc b/lib/widgets/kdevhtml_partui.rc similarity index 91% rename from lib/widgets/tdevhtml_partui.rc rename to lib/widgets/kdevhtml_partui.rc index a62fa22f..5a55b7bf 100644 --- a/lib/widgets/tdevhtml_partui.rc +++ b/lib/widgets/kdevhtml_partui.rc @@ -1,5 +1,5 @@ - +

&File diff --git a/lib/widgets/tdevhtmlpart.cpp b/lib/widgets/kdevhtmlpart.cpp similarity index 91% rename from lib/widgets/tdevhtmlpart.cpp rename to lib/widgets/kdevhtmlpart.cpp index 6ec74651..76697cfa 100644 --- a/lib/widgets/tdevhtmlpart.cpp +++ b/lib/widgets/kdevhtmlpart.cpp @@ -14,15 +14,15 @@ #include #include -#include +#include -#include "tdevhtmlpart.h" +#include "kdevhtmlpart.h" -TDevHTMLPart::TDevHTMLPart() - : TDEHTMLPart(0L, 0L, 0L, "TDevHTMLPart", DefaultGUI ) +KDevHTMLPart::KDevHTMLPart() + : TDEHTMLPart(0L, 0L, 0L, "KDevHTMLPart", DefaultGUI ) { - setXMLFile(locate("data", "tdevelop/tdevhtml_partui.rc"), true); + setXMLFile(locate("data", "tdevelop/kdevhtml_partui.rc"), true); connect(browserExtension(), TQT_SIGNAL(openURLRequestDelayed(const KURL &,const KParts::URLArgs &)), this, TQT_SLOT(openURLRequest(const KURL &)) ); @@ -87,7 +87,7 @@ TDevHTMLPart::TDevHTMLPart() setZoomFactor(appConfig->readEntry("Zoom", "100").toInt()); } -void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) +void KDevHTMLPart::popup( const TQString & url, const TQPoint & p ) { // TDEPopupMenu popup( i18n( "Documentation Viewer" ), this->widget() ); TDEPopupMenu popup(this->widget()); @@ -143,11 +143,11 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) kdDebug() << "processing relative url: " << url << endl; if (url.startsWith("#")) { - kurl = KURL(TDevHTMLPart::url()); + kurl = KURL(KDevHTMLPart::url()); kurl.setRef(url.mid(1)); } else - kurl = KURL(TDevHTMLPart::url().upURL().url(true)+url); + kurl = KURL(KDevHTMLPart::url().upURL().url(true)+url); } else kurl = KURL(url); @@ -157,13 +157,13 @@ void TDevHTMLPart::popup( const TQString & url, const TQPoint & p ) } } -void TDevHTMLPart::setContext(const TQString &context) +void KDevHTMLPart::setContext(const TQString &context) { m_context = context; } -TQString TDevHTMLPart::context() const +TQString KDevHTMLPart::context() const { return m_context; } @@ -250,7 +250,7 @@ done: #undef I #undef X -TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url) +TQString KDevHTMLPart::resolveEnvVarsInURL(const TQString& url) { // check for environment variables and make necessary translations TQString path = url; @@ -318,7 +318,7 @@ TQString TDevHTMLPart::resolveEnvVarsInURL(const TQString& url) return path; } -bool TDevHTMLPart::openURL(const KURL &url) +bool KDevHTMLPart::openURL(const KURL &url) { TQString path = resolveEnvVarsInURL(url.url()); KURL newUrl(path); @@ -339,47 +339,47 @@ bool TDevHTMLPart::openURL(const KURL &url) return retval; } -void TDevHTMLPart::openURLRequest(const KURL &url) +void KDevHTMLPart::openURLRequest(const KURL &url) { openURL( url ); } -void TDevHTMLPart::slotReload( ) +void KDevHTMLPart::slotReload( ) { openURL( url() ); } -void TDevHTMLPart::slotStop( ) +void KDevHTMLPart::slotStop( ) { closeURL(); } -void TDevHTMLPart::slotStarted( TDEIO::Job * ) +void KDevHTMLPart::slotStarted( TDEIO::Job * ) { stopAction->setEnabled(true); } -void TDevHTMLPart::slotCompleted( ) +void KDevHTMLPart::slotCompleted( ) { stopAction->setEnabled(false); } -void TDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ ) +void KDevHTMLPart::slotCancelled( const TQString & /*errMsg*/ ) { stopAction->setEnabled(false); } -/*void TDevHTMLPart::slotDuplicate( ) +/*void KDevHTMLPart::slotDuplicate( ) { PartController::getInstance()->showDocument(url(), true); }*/ -void TDevHTMLPart::slotPrint( ) +void KDevHTMLPart::slotPrint( ) { view()->print(); } -void TDevHTMLPart::slotBack() +void KDevHTMLPart::slotBack() { if ( m_Current != m_history.begin() ) { @@ -390,7 +390,7 @@ void TDevHTMLPart::slotBack() } } -void TDevHTMLPart::slotForward() +void KDevHTMLPart::slotForward() { if ( m_Current != m_history.fromLast() ) { @@ -401,7 +401,7 @@ void TDevHTMLPart::slotForward() } } -void TDevHTMLPart::slotBackAboutToShow() +void KDevHTMLPart::slotBackAboutToShow() { TDEPopupMenu *popup = m_backAction->popupMenu(); popup->clear(); @@ -426,7 +426,7 @@ void TDevHTMLPart::slotBackAboutToShow() } } -void TDevHTMLPart::slotForwardAboutToShow() +void KDevHTMLPart::slotForwardAboutToShow() { TDEPopupMenu *popup = m_forwardAction->popupMenu(); popup->clear(); @@ -451,7 +451,7 @@ void TDevHTMLPart::slotForwardAboutToShow() } } -void TDevHTMLPart::slotPopupActivated( int id ) +void KDevHTMLPart::slotPopupActivated( int id ) { kdDebug(9000) << "id: " << id << endl; @@ -471,7 +471,7 @@ void TDevHTMLPart::slotPopupActivated( int id ) } } -void TDevHTMLPart::addHistoryEntry() +void KDevHTMLPart::addHistoryEntry() { TQValueList::Iterator it = m_Current; @@ -491,7 +491,7 @@ void TDevHTMLPart::addHistoryEntry() } } -void TDevHTMLPart::slotCopy( ) +void KDevHTMLPart::slotCopy( ) { TQString text = selectedText(); text.replace( TQChar( 0xa0 ), ' ' ); @@ -501,7 +501,7 @@ void TDevHTMLPart::slotCopy( ) connect( cb, TQT_SIGNAL( selectionChanged() ), this, TQT_SLOT( slotClearSelection() ) ); } -void TDevHTMLPart::slotSelectionChanged( ) +void KDevHTMLPart::slotSelectionChanged( ) { if (selectedText().isEmpty()) copyAction->setEnabled(false); @@ -509,4 +509,4 @@ void TDevHTMLPart::slotSelectionChanged( ) copyAction->setEnabled(true); } -#include "tdevhtmlpart.moc" +#include "kdevhtmlpart.moc" diff --git a/lib/widgets/tdevhtmlpart.h b/lib/widgets/kdevhtmlpart.h similarity index 94% rename from lib/widgets/tdevhtmlpart.h rename to lib/widgets/kdevhtmlpart.h index e822488b..6c8f7dc3 100644 --- a/lib/widgets/tdevhtmlpart.h +++ b/lib/widgets/kdevhtmlpart.h @@ -1,5 +1,5 @@ -#ifndef __TDEVHTMLPART_H__ -#define __TDEVHTMLPART_H__ +#ifndef __KDEVHTMLPART_H__ +#define __KDEVHTMLPART_H__ #include @@ -8,7 +8,7 @@ #include /** -@file tdevhtmlpart.h +@file kdevhtmlpart.h Customized TDEHTML part for KDevelop. */ @@ -41,7 +41,7 @@ Represents customized BrowserViewGUI mode of TDEHTMLPart. Provides also actions . It has it's own popup menu and font/zoom settings. */ -class TDevHTMLPart : public TDEHTMLPart +class KDevHTMLPart : public TDEHTMLPart { Q_OBJECT @@ -50,7 +50,7 @@ public: enum Options { CanDuplicate=1, CanOpenInNewWindow=2 }; - TDevHTMLPart(); + KDevHTMLPart(); void setContext(const TQString &context); TQString context() const; diff --git a/lib/widgets/tdevtabwidget.cpp b/lib/widgets/kdevtabwidget.cpp similarity index 92% rename from lib/widgets/tdevtabwidget.cpp rename to lib/widgets/kdevtabwidget.cpp index adfd4566..33c9f733 100644 --- a/lib/widgets/tdevtabwidget.cpp +++ b/lib/widgets/kdevtabwidget.cpp @@ -16,9 +16,9 @@ #include #include -#include "tdevtabwidget.h" +#include "kdevtabwidget.h" -TDevTabWidget::TDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) +KDevTabWidget::KDevTabWidget(TQWidget *parent, const char *name) : TQTabWidget(parent,name) { m_pTabBar = new KTabBar(this, "tabbar"); setTabBar(m_pTabBar); @@ -55,7 +55,7 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTab *tab = selectTab(e->pos() ); if( tab == 0L ) return; - m_pPage = ((TDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); + m_pPage = ((KDevTabWidget*)parent())->page(indexOf(tab->identifier() ) ); if(m_pPage == 0L) return; m_pPopupMenu->exec(mapToGlobal(e->pos())); @@ -63,4 +63,4 @@ void KTabBar::mousePressEvent(TQMouseEvent *e) TQTabBar::mousePressEvent(e); } -#include "tdevtabwidget.moc" +#include "kdevtabwidget.moc" diff --git a/lib/widgets/propeditor/CMakeLists.txt b/lib/widgets/propeditor/CMakeLists.txt index 1cffb908..2620aaa0 100644 --- a/lib/widgets/propeditor/CMakeLists.txt +++ b/lib/widgets/propeditor/CMakeLists.txt @@ -38,9 +38,9 @@ install( FILES DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/propeditor ) -##### tdevpropertyeditor (shared) ############### +##### kdevpropertyeditor (shared) ############### -tde_add_library( tdevpropertyeditor SHARED AUTOMOC +tde_add_library( kdevpropertyeditor SHARED AUTOMOC SOURCES childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp diff --git a/lib/widgets/propeditor/Makefile.am b/lib/widgets/propeditor/Makefile.am index a01eb4d3..e07d5c69 100644 --- a/lib/widgets/propeditor/Makefile.am +++ b/lib/widgets/propeditor/Makefile.am @@ -1,18 +1,18 @@ INCLUDES = -I$(top_srcdir)/lib/compat $(all_includes) METASOURCES = AUTO -lib_LTLIBRARIES = libtdevpropertyeditor.la -libtdevpropertyeditor_la_LIBADD = $(LIB_TDEIO) -libtdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries) -libtdevpropertyeditor_la_SOURCES = childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp pstringlistedit.cpp\ +lib_LTLIBRARIES = libkdevpropertyeditor.la +libkdevpropertyeditor_la_LIBADD = $(LIB_TDEIO) +libkdevpropertyeditor_la_LDFLAGS = -no-undefined $(all_libraries) +libkdevpropertyeditor_la_SOURCES = childproperty.cpp pcombobox.cpp pdummywidget.cpp ppointedit.cpp propertymachinefactory.cpp pstringlistedit.cpp\ multiproperty.cpp pcursoredit.cpp pfontbutton.cpp prectedit.cpp propertywidget.cpp psymbolcombo.cpp\ pcheckbox.cpp pdateedit.cpp pfontcombo.cpp property.cpp psizeedit.cpp purledit.cpp\ pcolorbutton.cpp pdatetimeedit.cpp plineedit.cpp propertyeditor.cpp psizepolicyedit.cpp pyesnobutton.cpp\ pcolorcombo.cpp pdoublenuminput.cpp ppixmapedit.cpp propertylist.cpp pspinbox.cpp propertywidgetproxy.cpp plinestyleedit.cpp qeditlistbox.cpp -tdevpropeditorincludedir = $(includedir)/tdevelop/propeditor -tdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h +kdevpropeditorincludedir = $(includedir)/tdevelop/propeditor +kdevpropeditorinclude_HEADERS = childproperty.h pcombobox.h pdummywidget.h ppointedit.h propertymachinefactory.h pcursoredit.h pfontbutton.h prectedit.h propertywidget.h pdateedit.h pfontcombo.h property.h psizeedit.h pdatetimeedit.h plineedit.h propertyeditor.h psizepolicyedit.h pdoublenuminput.h ppixmapedit.h propertylist.h pspinbox.h propertywidgetproxy.h multiproperty.h pyesnobutton.h purledit.h psymbolcombo.h pstringlistedit.h pcolorcombo.h pcolorbutton.h pcheckbox.h plinestyleedit.h DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils -DOXYGEN_PROJECTNAME = TDevelop Property Editing Library +DOXYGEN_PROJECTNAME = KDevelop Property Editing Library include ../../../Doxyfile.am diff --git a/parts/abbrev/CMakeLists.txt b/parts/abbrev/CMakeLists.txt index 6a61f9d8..219ad73d 100644 --- a/parts/abbrev/CMakeLists.txt +++ b/parts/abbrev/CMakeLists.txt @@ -26,14 +26,14 @@ link_directories( ##### other data ################################ -install( FILES tdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev/sources ) -install( FILES tdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/tdevabbrev ) +install( FILES kdevabbrev.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES qt_classes cpp_keywords DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev/sources ) +install( FILES kdevabbrev.rc DESTINATION ${DATA_INSTALL_DIR}/kdevabbrev ) -##### libtdevabbrev (module) #################### +##### libkdevabbrev (module) #################### -tde_add_kpart( libtdevabbrev AUTOMOC +tde_add_kpart( libkdevabbrev AUTOMOC SOURCES abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp diff --git a/parts/abbrev/Makefile.am b/parts/abbrev/Makefile.am index 1c4f559c..f5c3ec2e 100644 --- a/parts/abbrev/Makefile.am +++ b/parts/abbrev/Makefile.am @@ -2,19 +2,19 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevabbrev.la -libtdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevabbrev.la +libkdevabbrev_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevabbrev_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui +libkdevabbrev_la_SOURCES = abbrevpart.cpp abbrevconfigwidget.cpp abbrevconfigwidgetbase.ui addtemplatedlg.cpp addtemplatedlgbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevabbrev.desktop +service_DATA = kdevabbrev.desktop -sourcesdir = $(kde_datadir)/tdevabbrev/sources +sourcesdir = $(kde_datadir)/kdevabbrev/sources sources_DATA = qt_classes cpp_keywords -rcdir = $(kde_datadir)/tdevabbrev -rc_DATA = tdevabbrev.rc +rcdir = $(kde_datadir)/kdevabbrev +rc_DATA = kdevabbrev.rc diff --git a/parts/abbrev/abbrevpart.cpp b/parts/abbrev/abbrevpart.cpp index 87e44e23..80d26599 100644 --- a/parts/abbrev/abbrevpart.cpp +++ b/parts/abbrev/abbrevpart.cpp @@ -24,35 +24,35 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include #include -#include "tdevcore.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevpartcontroller.h" #include "abbrevconfigwidget.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" -static const TDevPluginInfo data("tdevabbrev"); +static const KDevPluginInfo data("kdevabbrev"); -class AbbrevFactory : public TDevGenericFactory +class AbbrevFactory : public KDevGenericFactory { public: AbbrevFactory() - : TDevGenericFactory( data ) + : KDevGenericFactory( data ) { } virtual TDEInstance *createInstance() { - TDEInstance *instance = TDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); TDEStandardDirs *dirs = instance->dirs(); dirs->addResourceType( "codetemplates", TDEStandardDirs::kde_default( "data" ) + "kdevabbrev/templates/" ); @@ -63,13 +63,13 @@ public: } }; -K_EXPORT_COMPONENT_FACTORY( libtdevabbrev, AbbrevFactory ) +K_EXPORT_COMPONENT_FACTORY( libkdevabbrev, AbbrevFactory ) AbbrevPart::AbbrevPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "AbbrevPart") + : KDevPlugin(&data, parent, name ? name : "AbbrevPart") { setInstance(AbbrevFactory::instance()); - setXMLFile("tdevabbrev.rc"); + setXMLFile("kdevabbrev.rc"); connect(partController(), TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part*)) ); @@ -235,7 +235,7 @@ void AbbrevPart::save() TQString AbbrevPart::currentWord() const { - return TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + return KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); } diff --git a/parts/abbrev/abbrevpart.h b/parts/abbrev/abbrevpart.h index cbb60e50..2b602088 100644 --- a/parts/abbrev/abbrevpart.h +++ b/parts/abbrev/abbrevpart.h @@ -18,7 +18,7 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include @@ -60,7 +60,7 @@ private: TQStringList m_suffixes; }; -class AbbrevPart : public TDevPlugin +class AbbrevPart : public KDevPlugin { Q_OBJECT diff --git a/parts/abbrev/tdevabbrev.desktop b/parts/abbrev/kdevabbrev.desktop similarity index 99% rename from parts/abbrev/tdevabbrev.desktop rename to parts/abbrev/kdevabbrev.desktop index f06bf2eb..5c230dd4 100644 --- a/parts/abbrev/tdevabbrev.desktop +++ b/parts/abbrev/kdevabbrev.desktop @@ -77,7 +77,7 @@ GenericName[zh_CN]=缩写扩展 GenericName[zh_TW]=縮寫擴展 ServiceTypes=TDevelop/Plugin Icon=fontsizeup -X-TDE-Library=libtdevabbrev +X-TDE-Library=libkdevabbrev X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=CodeEditing diff --git a/parts/abbrev/tdevabbrev.rc b/parts/abbrev/kdevabbrev.rc similarity index 100% rename from parts/abbrev/tdevabbrev.rc rename to parts/abbrev/kdevabbrev.rc diff --git a/parts/appwizard/CMakeLists.txt b/parts/appwizard/CMakeLists.txt index 8a69f06e..bdeaf541 100644 --- a/parts/appwizard/CMakeLists.txt +++ b/parts/appwizard/CMakeLists.txt @@ -35,18 +35,18 @@ link_directories( ##### other data ################################ -install( FILES tdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard ) +install( FILES kdevappwizard.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevappwizard.rc DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard ) -##### libtdevappwizard (module) ################# +##### libkdevappwizard (module) ################# -tde_add_kpart( libtdevappwizard AUTOMOC +tde_add_kpart( libkdevappwizard AUTOMOC SOURCES appwizardfactory.cpp appwizardpart.cpp appwizarddlg.cpp importdlg.cpp filepropspagebase.ui filepropspage.cpp appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui - tdevfile.cpp tdevlicense.cpp profilesupport.cpp + kdevfile.cpp kdevlicense.cpp profilesupport.cpp LINK profileengine-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/appwizard/Makefile.am b/parts/appwizard/Makefile.am index 012f6f29..34af3163 100644 --- a/parts/appwizard/Makefile.am +++ b/parts/appwizard/Makefile.am @@ -7,22 +7,22 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extras -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets \ -I$(top_srcdir)/src/profileengine/lib $(all_includes) -kde_module_LTLIBRARIES = libtdevappwizard.la -libtdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/util/libtdevutil.la \ - $(top_builddir)/lib/widgets/propeditor/libtdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la +kde_module_LTLIBRARIES = libkdevappwizard.la +libkdevappwizard_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevappwizard_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/util/libkdevutil.la \ + $(top_builddir)/lib/widgets/propeditor/libkdevpropertyeditor.la $(top_builddir)/src/profileengine/lib/libprofileengine.la -libtdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \ +libkdevappwizard_la_SOURCES = appwizardfactory.cpp appwizardpart.cpp \ appwizarddlg.cpp importdlg.cpp filepropspagebase.ui filepropspage.cpp \ appwizarddlgbase.ui importdlgbase.ui misc.cpp vcs_form.ui\ - tdevfile.cpp tdevlicense.cpp profilesupport.cpp + kdevfile.cpp kdevlicense.cpp profilesupport.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevappwizard.desktop +service_DATA = kdevappwizard.desktop -rcdir = $(kde_datadir)/tdevappwizard -rc_DATA = tdevappwizard.rc +rcdir = $(kde_datadir)/kdevappwizard +rc_DATA = kdevappwizard.rc noinst_HEADERS = profilesupport.h diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp index 4cbf716d..d5160075 100644 --- a/parts/appwizard/appwizarddlg.cpp +++ b/parts/appwizard/appwizarddlg.cpp @@ -64,14 +64,14 @@ #include #include "domutil.h" -#include "tdevversioncontrol.h" -#include "tdevmakefrontend.h" -#include "tdevpartcontroller.h" -#include "tdevplugincontroller.h" -#include "tdevappfrontend.h" -#include "tdevplugininfo.h" -#include "tdevlicense.h" -#include "tdevcore.h" +#include "kdevversioncontrol.h" +#include "kdevmakefrontend.h" +#include "kdevpartcontroller.h" +#include "kdevplugincontroller.h" +#include "kdevappfrontend.h" +#include "kdevplugininfo.h" +#include "kdevlicense.h" +#include "kdevcore.h" #include "appwizardfactory.h" #include "appwizardpart.h" #include "filepropspage.h" @@ -309,8 +309,8 @@ AppWizardDialog::AppWizardDialog(AppWizardPart *part, TQWidget *parent, const ch appname_edit->setValidator(appname_edit_validator); // insert the licenses into the license_combo - TQDict< TDevLicense > lics( licenses() ); - TQDictIterator< TDevLicense > dit(lics); + TQDict< KDevLicense > lics( licenses() ); + TQDictIterator< KDevLicense > dit(lics); int idx=1; for( ; dit.current(); ++dit ) { @@ -356,8 +356,8 @@ void AppWizardDialog::loadVcs() } TQStringList args; TQObject *obj = factory->create(0, service->name().latin1(), - "TDevVCSIntegrator", args); - TDevVCSIntegrator *integrator = (TDevVCSIntegrator*) obj; + "KDevVCSIntegrator", args); + KDevVCSIntegrator *integrator = (KDevVCSIntegrator*) obj; if (!integrator) kdDebug(9010) << " failed to create vcs integrator " << service->name() << endl; @@ -418,20 +418,20 @@ void AppWizardDialog::licenseChanged() edit->setText( TQString() ); } } else { - TDevLicense* lic = licenses()[ license_combo->currentText() ]; + KDevLicense* lic = licenses()[ license_combo->currentText() ]; for (it = m_fileTemplates.begin(); it != m_fileTemplates.end(); ++it) { TQString style = (*it).style; TQMultiLineEdit *edit = (*it).edit; - TDevFile::CommentingStyle commentStyle = TDevFile::CPPStyle; + KDevFile::CommentingStyle commentStyle = KDevFile::CPPStyle; if (style == "PStyle") { - commentStyle = TDevFile::PascalStyle; + commentStyle = KDevFile::PascalStyle; } else if (style == "AdaStyle") { - commentStyle = TDevFile::AdaStyle; + commentStyle = KDevFile::AdaStyle; } else if (style == "ShellStyle") { - commentStyle = TDevFile::BashStyle; + commentStyle = KDevFile::BashStyle; } else if (style == "XMLStyle") { - commentStyle = TDevFile::XMLStyle; + commentStyle = KDevFile::XMLStyle; } TQString text; @@ -577,7 +577,7 @@ void AppWizardDialog::accept() if( license_combo->currentItem() != 0 ) { licenseName = license_combo->currentText(); - TDevLicense* lic = licenses()[ licenseName ]; + KDevLicense* lic = licenses()[ licenseName ]; if( lic ) { TQStringList files( lic->copyFiles() ); @@ -1273,7 +1273,7 @@ void AppWizardDialog::setPermissions(const installFile &file) } } -TQDict AppWizardDialog::licenses() +TQDict AppWizardDialog::licenses() { return m_licenses; } @@ -1291,7 +1291,7 @@ void AppWizardDialog::loadLicenses() TQString licPath( dirs->findResource( "licenses", *it ) ); kdDebug(9010) << "Loading license file: " << licPath << endl; TQString licName = licPath.mid( licPath.findRev('/') + 1 ); - TDevLicense* lic = new TDevLicense( licName, licPath ); + KDevLicense* lic = new KDevLicense( licName, licPath ); m_licenses.insert( licName, lic ); } // kdDebug(9010) << "======================== Done loadLicenses" << endl; diff --git a/parts/appwizard/appwizarddlg.h b/parts/appwizard/appwizarddlg.h index 4a160bd2..392cd1b6 100644 --- a/parts/appwizard/appwizarddlg.h +++ b/parts/appwizard/appwizarddlg.h @@ -32,12 +32,12 @@ class ProfileSupport; #include #include #include -#include "tdevversioncontrol.h" -#include "tdevvcsintegrator.h" +#include "kdevversioncontrol.h" +#include "kdevvcsintegrator.h" #include "appwizarddlgbase.h" #include "vcs_form.h" //#include "autoform.h" -#include "tdevlicense.h" +#include "kdevlicense.h" namespace PropertyLib { class PropertyList; @@ -132,7 +132,7 @@ public: protected: virtual void accept(); - virtual TQDict licenses(); + virtual TQDict licenses(); void loadLicenses(); protected slots: @@ -181,7 +181,7 @@ private: //data TQDict m_categoryMap; TQValueList m_categoryItems; //! A list of currently available version control systems -// TQDict m_availVcs; +// TQDict m_availVcs; TQHBoxLayout *m_custom_options_layout; PropertyLib::PropertyEditor *m_customOptions; @@ -195,8 +195,8 @@ private: //data TDEPopupMenu* m_favouritesMenu; TDEPopupMenu* m_templatesMenu; - TQDict m_licenses; - TQDict m_integrators; + TQDict m_licenses; + TQDict m_integrators; TQMap m_integratorDialogs; ProfileSupport *m_profileSupport; diff --git a/parts/appwizard/appwizardfactory.cpp b/parts/appwizard/appwizardfactory.cpp index 6749add0..5288105d 100644 --- a/parts/appwizard/appwizardfactory.cpp +++ b/parts/appwizard/appwizardfactory.cpp @@ -11,30 +11,30 @@ #include -#include +#include #include "appwizardfactory.h" -static const TDevPluginInfo data("tdevappwizard"); -K_EXPORT_COMPONENT_FACTORY( libtdevappwizard, AppWizardFactory ) +static const KDevPluginInfo data("kdevappwizard"); +K_EXPORT_COMPONENT_FACTORY( libkdevappwizard, AppWizardFactory ) AppWizardFactory::AppWizardFactory() - : TDevGenericFactory( data ) + : KDevGenericFactory( data ) { } TDEInstance *AppWizardFactory::createInstance() { - TDEInstance *instance = TDevGenericFactory::createInstance(); + TDEInstance *instance = KDevGenericFactory::createInstance(); TDEStandardDirs *dirs = instance->dirs(); - dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "tdevappwizard/templates/"); - dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "tdevappwizard/imports/"); - dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "tdevappwizard/importfiles/"); + dirs->addResourceType("apptemplates", TDEStandardDirs::kde_default("data") + "kdevappwizard/templates/"); + dirs->addResourceType("appimports", TDEStandardDirs::kde_default("data") + "kdevappwizard/imports/"); + dirs->addResourceType("appimportfiles", TDEStandardDirs::kde_default("data") + "kdevappwizard/importfiles/"); return instance; } -const TDevPluginInfo *AppWizardFactory::info() +const KDevPluginInfo *AppWizardFactory::info() { return &data; } diff --git a/parts/appwizard/appwizardfactory.h b/parts/appwizard/appwizardfactory.h index 3de35631..3bbc6e1e 100644 --- a/parts/appwizard/appwizardfactory.h +++ b/parts/appwizard/appwizardfactory.h @@ -12,18 +12,18 @@ #ifndef _APPWIZARDFACTORY_H_ #define _APPWIZARDFACTORY_H_ -#include +#include #include "appwizardpart.h" -class TDevPluginInfo; +class KDevPluginInfo; -class AppWizardFactory : public TDevGenericFactory +class AppWizardFactory : public KDevGenericFactory { public: AppWizardFactory(); - static const TDevPluginInfo *info(); + static const KDevPluginInfo *info(); protected: virtual TDEInstance *createInstance(); diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp index ada3b362..dd2fae65 100644 --- a/parts/appwizard/appwizardpart.cpp +++ b/parts/appwizard/appwizardpart.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -28,17 +28,17 @@ #include "importdlg.h" #include "appwizarddlg.h" #include "appwizardfactory.h" -#include -#include -#include -#include +#include +#include +#include +#include #include AppWizardPart::AppWizardPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") + : KDevPlugin(AppWizardFactory::info(), parent, name ? name : "AppWizardPart") { setInstance(AppWizardFactory::instance()); - setXMLFile("tdevappwizard.rc"); + setXMLFile("kdevappwizard.rc"); TDEAction *action; diff --git a/parts/appwizard/appwizardpart.h b/parts/appwizard/appwizardpart.h index 901d51ad..59280631 100644 --- a/parts/appwizard/appwizardpart.h +++ b/parts/appwizard/appwizardpart.h @@ -13,7 +13,7 @@ #define _APPWIZARDPART_H_ #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include #include #include @@ -21,7 +21,7 @@ class AppWizardDialog; -class AppWizardPart : public TDevPlugin +class AppWizardPart : public KDevPlugin { Q_OBJECT diff --git a/parts/appwizard/common/CMakeLists.txt b/parts/appwizard/common/CMakeLists.txt index 81ee38b4..62a5b97b 100644 --- a/parts/appwizard/common/CMakeLists.txt +++ b/parts/appwizard/common/CMakeLists.txt @@ -20,7 +20,7 @@ generate_tar( gnome2.tar.gz gnome2 macros ) generate_tar( gnu.tar.gz gnu AUTHORS COPYING ChangeLog INSTALL NEWS README TODO ) generate_tar( wxwidgets.tar.gz wx macros ) generate_tar( incadmin.tar.gz incadmin config.guess config.sub depcomp install-sh ltmain.sh missing mkinstalldirs ) -generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py ) +generate_tar( scons.tar.gz scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py ) install( FILES ${CMAKE_CURRENT_BINARY_DIR}/admin.tar.gz @@ -29,18 +29,18 @@ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/gnome.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/gnome2.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/wxwidgets.tar.gz - tde-app.lsm tde-Makefile.am tde-Makefile.cvs + kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in tde-index.docbook - tde-po-Makefile.am tde-doc-Makefile.am - tde-doc-en-Makefile.am hi16-app-app.png + kde-po-Makefile.am kde-doc-Makefile.am + kde-doc-en-Makefile.am hi16-app-app.png hi32-app-app.png tde-app.desktop tde-part.desktop gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs gnome-pixmaps-Makefile.am gnome-app.png wx-configure.in wx-Makefile.am wx-Makefile.cvs COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD - Artistic admin.tdevtemplate gnu.tdevtemplate - dockbook.tdevtemplate incadmin.tdevtemplate - gnome2.tdevtemplate scons.tdevtemplate + Artistic admin.kdevtemplate gnu.kdevtemplate + dockbook.kdevtemplate incadmin.kdevtemplate + gnome2.kdevtemplate scons.kdevtemplate ${CMAKE_CURRENT_BINARY_DIR}/scons.tar.gz - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/template-common ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/template-common ) diff --git a/parts/appwizard/common/Makefile.am b/parts/appwizard/common/Makefile.am index e068df5b..2d6e5278 100644 --- a/parts/appwizard/common/Makefile.am +++ b/parts/appwizard/common/Makefile.am @@ -28,19 +28,19 @@ incadmin.tar.gz: gzip incadmin.tar scons.tar.gz: - $(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/tde.py + $(TAR) -cf scons.tar --exclude=.svn -C $(srcdir)/scons configure admin/scons-mini.tar.bz2 admin/generic.py admin/kde.py gzip scons.tar -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard commondatadir = ${appwizarddatadir}/template-common commondata_DATA = admin.tar.gz gnu.tar.gz incadmin.tar.gz gnome.tar.gz gnome2.tar.gz wxwidgets.tar.gz \ - tde-app.lsm tde-Makefile.am tde-Makefile.cvs tde-configure.in.in \ - tde-index.docbook tde-po-Makefile.am tde-doc-Makefile.am tde-doc-en-Makefile.am \ + kde-app.lsm kde-Makefile.am kde-Makefile.cvs tde-configure.in.in \ + tde-index.docbook kde-po-Makefile.am kde-doc-Makefile.am kde-doc-en-Makefile.am \ hi16-app-app.png hi32-app-app.png tde-app.desktop tde-part.desktop \ gnome-app.lsm gnome-Makefile.am gnome-Makefile.cvs \ gnome-pixmaps-Makefile.am gnome-app.png \ wx-configure.in wx-Makefile.am wx-Makefile.cvs \ COPYING COPYING.LIB LICENSE.QPL LICENSE.BSD Artistic \ - admin.tdevtemplate gnu.tdevtemplate dockbook.tdevtemplate\ - incadmin.tdevtemplate gnome2.tdevtemplate scons.tdevtemplate scons.tar.gz + admin.kdevtemplate gnu.kdevtemplate dockbook.kdevtemplate\ + incadmin.kdevtemplate gnome2.kdevtemplate scons.kdevtemplate scons.tar.gz diff --git a/parts/appwizard/common/admin.tdevtemplate b/parts/appwizard/common/admin.kdevtemplate similarity index 100% rename from parts/appwizard/common/admin.tdevtemplate rename to parts/appwizard/common/admin.kdevtemplate diff --git a/parts/appwizard/common/dockbook.tdevtemplate b/parts/appwizard/common/dockbook.kdevtemplate similarity index 100% rename from parts/appwizard/common/dockbook.tdevtemplate rename to parts/appwizard/common/dockbook.kdevtemplate diff --git a/parts/appwizard/common/gnome2.tdevtemplate b/parts/appwizard/common/gnome2.kdevtemplate similarity index 100% rename from parts/appwizard/common/gnome2.tdevtemplate rename to parts/appwizard/common/gnome2.kdevtemplate diff --git a/parts/appwizard/common/gnu.tdevtemplate b/parts/appwizard/common/gnu.kdevtemplate similarity index 100% rename from parts/appwizard/common/gnu.tdevtemplate rename to parts/appwizard/common/gnu.kdevtemplate diff --git a/parts/appwizard/common/incadmin.tdevtemplate b/parts/appwizard/common/incadmin.kdevtemplate similarity index 100% rename from parts/appwizard/common/incadmin.tdevtemplate rename to parts/appwizard/common/incadmin.kdevtemplate diff --git a/parts/appwizard/common/tde-Makefile.am b/parts/appwizard/common/kde-Makefile.am similarity index 100% rename from parts/appwizard/common/tde-Makefile.am rename to parts/appwizard/common/kde-Makefile.am diff --git a/parts/appwizard/common/tde-Makefile.cvs b/parts/appwizard/common/kde-Makefile.cvs similarity index 100% rename from parts/appwizard/common/tde-Makefile.cvs rename to parts/appwizard/common/kde-Makefile.cvs diff --git a/parts/appwizard/common/tde-app.lsm b/parts/appwizard/common/kde-app.lsm similarity index 100% rename from parts/appwizard/common/tde-app.lsm rename to parts/appwizard/common/kde-app.lsm diff --git a/parts/appwizard/common/tde-doc-Makefile.am b/parts/appwizard/common/kde-doc-Makefile.am similarity index 100% rename from parts/appwizard/common/tde-doc-Makefile.am rename to parts/appwizard/common/kde-doc-Makefile.am diff --git a/parts/appwizard/common/tde-doc-en-Makefile.am b/parts/appwizard/common/kde-doc-en-Makefile.am similarity index 100% rename from parts/appwizard/common/tde-doc-en-Makefile.am rename to parts/appwizard/common/kde-doc-en-Makefile.am diff --git a/parts/appwizard/common/tde-po-Makefile.am b/parts/appwizard/common/kde-po-Makefile.am similarity index 100% rename from parts/appwizard/common/tde-po-Makefile.am rename to parts/appwizard/common/kde-po-Makefile.am diff --git a/parts/appwizard/common/scons.tdevtemplate b/parts/appwizard/common/scons.kdevtemplate similarity index 100% rename from parts/appwizard/common/scons.tdevtemplate rename to parts/appwizard/common/scons.kdevtemplate diff --git a/parts/appwizard/common/scons/admin/tde.py b/parts/appwizard/common/scons/admin/kde.py similarity index 99% rename from parts/appwizard/common/scons/admin/tde.py rename to parts/appwizard/common/scons/admin/kde.py index 2fe7a4c9..d194fd84 100644 --- a/parts/appwizard/common/scons/admin/tde.py +++ b/parts/appwizard/common/scons/admin/kde.py @@ -1,4 +1,4 @@ -# Made from scons qt.py and (heavily) modified into tde.py +# Made from scons qt.py and (heavily) modified into kde.py # Thomas Nagy, 2004, 2005 """ diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp index 15f432b2..5f07f5b4 100644 --- a/parts/appwizard/importdlg.cpp +++ b/parts/appwizard/importdlg.cpp @@ -37,9 +37,9 @@ #include #include -#include "tdevcore.h" -#include "tdevversioncontrol.h" -#include "tdevplugincontroller.h" +#include "kdevcore.h" +#include "kdevversioncontrol.h" +#include "kdevplugincontroller.h" #include "domutil.h" #include "settings.h" @@ -272,7 +272,7 @@ void ImportDialog::dirChanged() // KDevelop legacy project? TQStringList files = dir.entryList("*.kdevprj"); if (!files.isEmpty()) { - scanLegacyTDevelopProject(dir.absFilePath(files.first())); + scanLegacyKDevelopProject(dir.absFilePath(files.first())); return; } @@ -328,7 +328,7 @@ void ImportDialog::dirChanged() } -void ImportDialog::scanLegacyTDevelopProject(const TQString &fileName) +void ImportDialog::scanLegacyKDevelopProject(const TQString &fileName) { kdDebug(9010) << "Scanning legacy KDevelop project file " << fileName << endl; @@ -524,7 +524,7 @@ void ImportDialog::slotFinishedCheckout( TQString destinationDir ) void ImportDialog::slotFetchModulesFromRepository() { - TDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() ); + KDevVersionControl *vcs = m_part->versionControlByName( vcsCombo->currentText() ); if (!vcs) return; diff --git a/parts/appwizard/importdlg.h b/parts/appwizard/importdlg.h index af4d3859..5b334668 100644 --- a/parts/appwizard/importdlg.h +++ b/parts/appwizard/importdlg.h @@ -48,7 +48,7 @@ private slots: void slotProjectNameChanged( const TQString &_text ); private: // void scanAvailableVCS(); - void scanLegacyTDevelopProject(const TQString &fileName); + void scanLegacyKDevelopProject(const TQString &fileName); void scanLegacyStudioProject(const TQString &fileName); void scanAutomakeProject(const TQString &dirName); void setProjectType(const TQString &type); diff --git a/parts/appwizard/imports/CMakeLists.txt b/parts/appwizard/imports/CMakeLists.txt index d59750c4..e7b303c3 100644 --- a/parts/appwizard/imports/CMakeLists.txt +++ b/parts/appwizard/imports/CMakeLists.txt @@ -10,16 +10,16 @@ ################################################# install( FILES - c-auto cpp-auto fortran-auto java-auto tde gnome c cpp + c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/imports ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/imports ) install( FILES c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop - java-auto.tdevelop tde.tdevelop gnome.tdevelop + java-auto.tdevelop kde.tdevelop gnome.tdevelop c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop pascal.tdevelop ada.tdevelop - DESTINATION ${DATA_INSTALL_DIR}/tdevappwizard/importfiles ) + DESTINATION ${DATA_INSTALL_DIR}/kdevappwizard/importfiles ) diff --git a/parts/appwizard/imports/Makefile.am b/parts/appwizard/imports/Makefile.am index aaefd91f..c7f74dcd 100644 --- a/parts/appwizard/imports/Makefile.am +++ b/parts/appwizard/imports/Makefile.am @@ -1,7 +1,7 @@ -appwizarddatadir = ${kde_datadir}/tdevappwizard +appwizarddatadir = ${kde_datadir}/kdevappwizard importsdir = ${appwizarddatadir}/imports importfilesdir = ${appwizarddatadir}/importfiles -imports_DATA = c-auto cpp-auto fortran-auto java-auto tde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada -importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop java-auto.tdevelop tde.tdevelop gnome.tdevelop c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop pascal.tdevelop ada.tdevelop +imports_DATA = c-auto cpp-auto fortran-auto java-auto kde gnome c cpp fortran python php perl java java-ant qttmake qtqmake qt4qmake ruby pascal ada +importfiles_DATA = c-auto.tdevelop cpp-auto.tdevelop fortran-auto.tdevelop java-auto.tdevelop kde.tdevelop gnome.tdevelop c.tdevelop cpp.tdevelop fortran.tdevelop python.tdevelop php.tdevelop perl.tdevelop java.tdevelop java-ant.tdevelop qttmake.tdevelop qtqmake.tdevelop qt4qmake.tdevelop ruby.tdevelop pascal.tdevelop ada.tdevelop diff --git a/parts/appwizard/imports/ada.tdevelop b/parts/appwizard/imports/ada.tdevelop index 188fbea6..cdb35b40 100644 --- a/parts/appwizard/imports/ada.tdevelop +++ b/parts/appwizard/imports/ada.tdevelop @@ -11,12 +11,12 @@ Code - + true - - + + bash bash_bugs @@ -63,11 +63,11 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/c-auto.tdevelop b/parts/appwizard/imports/c-auto.tdevelop index 002e6e1d..892dd88d 100644 --- a/parts/appwizard/imports/c-auto.tdevelop +++ b/parts/appwizard/imports/c-auto.tdevelop @@ -9,7 +9,7 @@ - + debug @@ -32,13 +32,13 @@ -O0 -g3 - - + + libtool - - + + ada ada_bugs_gcc @@ -85,12 +85,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/c.tdevelop b/parts/appwizard/imports/c.tdevelop index e578fba4..e0c06089 100644 --- a/parts/appwizard/imports/c.tdevelop +++ b/parts/appwizard/imports/c.tdevelop @@ -4,21 +4,21 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C - + - - + + - - + + ada ada_bugs_gcc @@ -65,12 +65,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/cpp-auto.tdevelop b/parts/appwizard/imports/cpp-auto.tdevelop index 0a1b05b1..74de8db0 100644 --- a/parts/appwizard/imports/cpp-auto.tdevelop +++ b/parts/appwizard/imports/cpp-auto.tdevelop @@ -9,7 +9,7 @@ - + debug @@ -30,13 +30,13 @@ -O0 -g3 - - + + libtool - - + + ada ada_bugs_gcc @@ -81,13 +81,13 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/cpp.tdevelop b/parts/appwizard/imports/cpp.tdevelop index 3eade8de..b351de38 100644 --- a/parts/appwizard/imports/cpp.tdevelop +++ b/parts/appwizard/imports/cpp.tdevelop @@ -4,21 +4,21 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C++ - + - - + + - - + + ada ada_bugs_gcc @@ -63,13 +63,13 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/fortran-auto.tdevelop b/parts/appwizard/imports/fortran-auto.tdevelop index 4be630a6..8fdd5f89 100644 --- a/parts/appwizard/imports/fortran-auto.tdevelop +++ b/parts/appwizard/imports/fortran-auto.tdevelop @@ -9,7 +9,7 @@ - + ada ada_bugs_gcc @@ -57,15 +57,15 @@ KDE Libraries (Doxygen) - - + + libtool - - + + - + diff --git a/parts/appwizard/imports/fortran.tdevelop b/parts/appwizard/imports/fortran.tdevelop index e7141b4f..c852870e 100644 --- a/parts/appwizard/imports/fortran.tdevelop +++ b/parts/appwizard/imports/fortran.tdevelop @@ -4,16 +4,16 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject Fortran77 - + - - + + ada ada_bugs_gcc @@ -61,15 +61,15 @@ KDE Libraries (Doxygen) - - + + - - + + - + diff --git a/parts/appwizard/imports/gnome.tdevelop b/parts/appwizard/imports/gnome.tdevelop index cad92fda..0b8c5c95 100644 --- a/parts/appwizard/imports/gnome.tdevelop +++ b/parts/appwizard/imports/gnome.tdevelop @@ -7,10 +7,10 @@ KDevAutoProject C - TDevJavaDebugger + KDevJavaDebugger - + debug @@ -31,8 +31,8 @@ -O0 -g3 - - + + @@ -40,8 +40,8 @@ - - + + ada ada_bugs_gcc @@ -85,16 +85,16 @@ KDE Libraries (Doxygen) - - + + libtool - - + + - + diff --git a/parts/appwizard/imports/java-ant.tdevelop b/parts/appwizard/imports/java-ant.tdevelop index 1d64dc64..a4db806b 100644 --- a/parts/appwizard/imports/java-ant.tdevelop +++ b/parts/appwizard/imports/java-ant.tdevelop @@ -7,15 +7,15 @@ KDevAntProject Java - TDevDebugger + KDevDebugger - + ant - - + + ada ada_bugs_gcc @@ -59,10 +59,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/java-auto.tdevelop b/parts/appwizard/imports/java-auto.tdevelop index f5de6138..9a42ec82 100644 --- a/parts/appwizard/imports/java-auto.tdevelop +++ b/parts/appwizard/imports/java-auto.tdevelop @@ -7,10 +7,10 @@ KDevAutoProject Java - TDevDebugger + KDevDebugger - + ada ada_bugs_gcc @@ -54,10 +54,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/java.tdevelop b/parts/appwizard/imports/java.tdevelop index f5de6138..9a42ec82 100644 --- a/parts/appwizard/imports/java.tdevelop +++ b/parts/appwizard/imports/java.tdevelop @@ -7,10 +7,10 @@ KDevAutoProject Java - TDevDebugger + KDevDebugger - + ada ada_bugs_gcc @@ -54,10 +54,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/tde b/parts/appwizard/imports/kde similarity index 100% rename from parts/appwizard/imports/tde rename to parts/appwizard/imports/kde diff --git a/parts/appwizard/imports/tde.tdevelop b/parts/appwizard/imports/kde.tdevelop similarity index 92% rename from parts/appwizard/imports/tde.tdevelop rename to parts/appwizard/imports/kde.tdevelop index fe54fadc..5bff727f 100644 --- a/parts/appwizard/imports/tde.tdevelop +++ b/parts/appwizard/imports/kde.tdevelop @@ -11,7 +11,7 @@ KDE - + @@ -19,8 +19,8 @@ - - + + ada ada_bugs_gcc @@ -57,17 +57,17 @@ qmake User Guide - - + + libtool - - + + - + diff --git a/parts/appwizard/imports/pascal.tdevelop b/parts/appwizard/imports/pascal.tdevelop index 7db5a9d8..551ac91e 100644 --- a/parts/appwizard/imports/pascal.tdevelop +++ b/parts/appwizard/imports/pascal.tdevelop @@ -11,12 +11,12 @@ Code - + true - - + + ada ada_bugs_gcc @@ -64,12 +64,12 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/perl.tdevelop b/parts/appwizard/imports/perl.tdevelop index 0b4f4fba..bbf18ee3 100644 --- a/parts/appwizard/imports/perl.tdevelop +++ b/parts/appwizard/imports/perl.tdevelop @@ -9,11 +9,11 @@ - + - - + + ada ada_bugs_gcc @@ -60,10 +60,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/php.tdevelop b/parts/appwizard/imports/php.tdevelop index 4135828b..64651d3b 100644 --- a/parts/appwizard/imports/php.tdevelop +++ b/parts/appwizard/imports/php.tdevelop @@ -11,11 +11,11 @@ KDevdistpart - + - - + + gtk kde @@ -23,15 +23,15 @@ python perl - - + + true true false - - + + ada ada_bugs_gcc @@ -75,10 +75,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/python.tdevelop b/parts/appwizard/imports/python.tdevelop index d85480b9..3c6ece1a 100644 --- a/parts/appwizard/imports/python.tdevelop +++ b/parts/appwizard/imports/python.tdevelop @@ -7,15 +7,15 @@ KDevScriptProject Python - TDevDebugger - TDevJavaDebugger + KDevDebugger + KDevJavaDebugger - + - - + + bash bash_bugs @@ -60,10 +60,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/imports/qt-auto.tdevelop b/parts/appwizard/imports/qt-auto.tdevelop index a8ac37de..b4bba39e 100644 --- a/parts/appwizard/imports/qt-auto.tdevelop +++ b/parts/appwizard/imports/qt-auto.tdevelop @@ -10,7 +10,7 @@ Qt - + @@ -18,8 +18,8 @@ - - + + gtk gnustep @@ -27,17 +27,17 @@ php perl - - + + libtool - - + + - + diff --git a/parts/appwizard/imports/qt.tdevelop b/parts/appwizard/imports/qt.tdevelop index 713510e0..6b716a7b 100644 --- a/parts/appwizard/imports/qt.tdevelop +++ b/parts/appwizard/imports/qt.tdevelop @@ -4,13 +4,13 @@ %{AUTHOR} %{EMAIL} %{VERSION} - TDevCustomProject + KDevCustomProject C++ Qt - + @@ -18,21 +18,21 @@ - - + + - - + + - - + + - + diff --git a/parts/appwizard/imports/qt4qmake.tdevelop b/parts/appwizard/imports/qt4qmake.tdevelop index e211a470..3be6c94c 100644 --- a/parts/appwizard/imports/qt4qmake.tdevelop +++ b/parts/appwizard/imports/qt4qmake.tdevelop @@ -10,15 +10,15 @@ Qt - + - - + + bash bash_bugs @@ -55,26 +55,26 @@ KDE Libraries (Doxygen) - - + + - - + + 4 true 4 ExternalDesigner - - + + - + diff --git a/parts/appwizard/imports/qtqmake.tdevelop b/parts/appwizard/imports/qtqmake.tdevelop index 8a9d6b17..2e9b089a 100644 --- a/parts/appwizard/imports/qtqmake.tdevelop +++ b/parts/appwizard/imports/qtqmake.tdevelop @@ -10,15 +10,15 @@ Qt - + - - + + bash bash_bugs @@ -55,25 +55,25 @@ KDE Libraries (Doxygen) - - + + - - + + 3 true 3 KDevEmbeddedDesigner - - + + - + diff --git a/parts/appwizard/imports/qttmake.tdevelop b/parts/appwizard/imports/qttmake.tdevelop index 015f4278..713655b6 100644 --- a/parts/appwizard/imports/qttmake.tdevelop +++ b/parts/appwizard/imports/qttmake.tdevelop @@ -10,15 +10,15 @@ Qt - + - - + + bash bash_bugs @@ -58,17 +58,17 @@ KDE Libraries (Doxygen) - - + + - - + + - + diff --git a/parts/appwizard/imports/ruby.tdevelop b/parts/appwizard/imports/ruby.tdevelop index 0a29b0a7..90dbe34a 100644 --- a/parts/appwizard/imports/ruby.tdevelop +++ b/parts/appwizard/imports/ruby.tdevelop @@ -13,22 +13,22 @@ KDevDoxygen KDevdistpart KDevVisualBoyAdvance - TDevDebugger + KDevDebugger - + src *.rb *~ - - + + - - + + bash bash_bugs @@ -73,10 +73,10 @@ KDE Libraries (Doxygen) - - + + - + diff --git a/parts/appwizard/tdevappwizard.desktop b/parts/appwizard/kdevappwizard.desktop similarity index 98% rename from parts/appwizard/tdevappwizard.desktop rename to parts/appwizard/kdevappwizard.desktop index bda84ba5..fa9dd541 100644 --- a/parts/appwizard/tdevappwizard.desktop +++ b/parts/appwizard/kdevappwizard.desktop @@ -36,7 +36,7 @@ Comment[tg]=Устои сохтани гузориш Comment[tr]=Uygulama Sihirbazı Comment[zh_CN]=应用程序向导 Comment[zh_TW]=應用程式精靈 -Name=TDevAppWizard +Name=KDevAppWizard Name[da]=TDevelop Programguide Name[de]=Anwendungs-Assistent (TDevelop) Name[hi]=के-डेव-एप-विज़ार्ड @@ -81,7 +81,7 @@ GenericName[tr]=Uygulama Sihirbazı GenericName[zh_CN]=应用程序向导 GenericName[zh_TW]=應用程式精靈 ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevappwizard +X-TDE-Library=libkdevappwizard X-TDevelop-Scope=Core X-TDevelop-Version=5 X-TDevelop-Properties=ProjectCreation diff --git a/parts/appwizard/tdevappwizard.rc b/parts/appwizard/kdevappwizard.rc similarity index 83% rename from parts/appwizard/tdevappwizard.rc rename to parts/appwizard/kdevappwizard.rc index 2705a29f..c86e0f44 100644 --- a/parts/appwizard/tdevappwizard.rc +++ b/parts/appwizard/kdevappwizard.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/appwizard/tdevfile.cpp b/parts/appwizard/kdevfile.cpp similarity index 51% rename from parts/appwizard/tdevfile.cpp rename to parts/appwizard/kdevfile.cpp index 4a748d47..4edb62c7 100644 --- a/parts/appwizard/tdevfile.cpp +++ b/parts/appwizard/kdevfile.cpp @@ -16,31 +16,31 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevfile.h" +#include "kdevfile.h" static struct MimeTypeMapping { const char* szMimeType; - TDevFile::CommentingStyle commentStyle; + KDevFile::CommentingStyle commentStyle; } mimeTypeMapping[] = { -{ "text/x-c++hdr", TDevFile::CPPStyle }, -{ "text/x-c++src", TDevFile::CPPStyle }, -{ "text/x-chdr", TDevFile::CStyle }, -{ "text/x-csrc", TDevFile::CStyle }, -{ "text/adasrc", TDevFile::AdaStyle }, -{ "text/x-pascal", TDevFile::PascalStyle }, -{ "text/x-perl", TDevFile::BashStyle }, -{ "text/xml", TDevFile::XMLStyle }, -{ "text/x-xslt", TDevFile::XMLStyle }, -{ "text/x-xslfo", TDevFile::XMLStyle }, -{ "text/html", TDevFile::XMLStyle }, -{ "text/docbook", TDevFile::XMLStyle }, -{ "application/x-php", TDevFile::CPPStyle }, -{ "application/x-shellscript",TDevFile::BashStyle }, -{ NULL, TDevFile::NoCommenting } +{ "text/x-c++hdr", KDevFile::CPPStyle }, +{ "text/x-c++src", KDevFile::CPPStyle }, +{ "text/x-chdr", KDevFile::CStyle }, +{ "text/x-csrc", KDevFile::CStyle }, +{ "text/adasrc", KDevFile::AdaStyle }, +{ "text/x-pascal", KDevFile::PascalStyle }, +{ "text/x-perl", KDevFile::BashStyle }, +{ "text/xml", KDevFile::XMLStyle }, +{ "text/x-xslt", KDevFile::XMLStyle }, +{ "text/x-xslfo", KDevFile::XMLStyle }, +{ "text/html", KDevFile::XMLStyle }, +{ "text/docbook", KDevFile::XMLStyle }, +{ "application/x-php", KDevFile::CPPStyle }, +{ "application/x-shellscript",KDevFile::BashStyle }, +{ NULL, KDevFile::NoCommenting } }; -TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString& mimeType ) +KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( const TQString& mimeType ) { int idx = 0; while( mimeTypeMapping[idx].szMimeType ) @@ -49,10 +49,10 @@ TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( const TQString& return mimeTypeMapping[idx].commentStyle; idx++; } - return TDevFile::NoCommenting; + return KDevFile::NoCommenting; } -TDevFile::CommentingStyle TDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType ) +KDevFile::CommentingStyle KDevFile::commentingStyleFromMimeType( KMimeType::Ptr mimeType ) { return commentingStyleFromMimeType( mimeType->name() ); } diff --git a/parts/appwizard/tdevfile.h b/parts/appwizard/kdevfile.h similarity index 96% rename from parts/appwizard/tdevfile.h rename to parts/appwizard/kdevfile.h index b1280f54..6b2e2699 100644 --- a/parts/appwizard/tdevfile.h +++ b/parts/appwizard/kdevfile.h @@ -18,18 +18,18 @@ */ /** -@file tdevfile.h +@file kdevfile.h File abstraction layer. */ -#ifndef TDEVFILE_H -#define TDEVFILE_H +#ifndef KDEVFILE_H +#define KDEVFILE_H #include /** File abstraction. */ -class TDevFile +class KDevFile { public: /**Styles of comment-formats a source file can have.*/ diff --git a/parts/appwizard/tdevlicense.cpp b/parts/appwizard/kdevlicense.cpp similarity index 89% rename from parts/appwizard/tdevlicense.cpp rename to parts/appwizard/kdevlicense.cpp index a720c6c3..5e189422 100644 --- a/parts/appwizard/tdevlicense.cpp +++ b/parts/appwizard/kdevlicense.cpp @@ -16,19 +16,19 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevlicense.h" +#include "kdevlicense.h" #include #include #include -TDevLicense::TDevLicense( const TQString& name, const TQString& fileName ) +KDevLicense::KDevLicense( const TQString& name, const TQString& fileName ) : m_name( name ) { readFile( fileName ); } -void TDevLicense::readFile( const TQString& fileName ) +void KDevLicense::readFile( const TQString& fileName ) { TQFile f(fileName); if (!f.open(IO_ReadOnly)) @@ -57,7 +57,7 @@ void TDevLicense::readFile( const TQString& fileName ) } -TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ) +TQString KDevLicense::assemble( KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ) { // first, build a CPP Style license @@ -82,29 +82,29 @@ TQString TDevLicense::assemble( TDevFile::CommentingStyle commentingStyle, const switch( commentingStyle ) { - case TDevFile::CPPStyle: - case TDevFile::CStyle: + case KDevFile::CPPStyle: + case KDevFile::CStyle: return str; - case TDevFile::PascalStyle: + case KDevFile::PascalStyle: str.replace(TQRegExp("/\\**\n \\*"), "{\n "); str.replace(TQRegExp("\\*\n \\*"), " \n "); str.replace(TQRegExp(" *\\**/\n"), "}\n"); return str; - case TDevFile::AdaStyle: + case KDevFile::AdaStyle: str.replace(TQRegExp("/\\*"), "--"); str.replace(TQRegExp(" \\*"), "--"); str.replace(TQRegExp("\\*/"), "*"); return str; - case TDevFile::BashStyle: + case KDevFile::BashStyle: str.replace(TQRegExp("\\*|/"), "#"); str.replace(TQRegExp("\n ##"), "\n##"); str.replace(TQRegExp("\n #"), "\n# "); return str; - case TDevFile::XMLStyle: + case KDevFile::XMLStyle: str.replace(TQRegExp("/\\*"), "\n"); diff --git a/parts/appwizard/tdevlicense.h b/parts/appwizard/kdevlicense.h similarity index 87% rename from parts/appwizard/tdevlicense.h rename to parts/appwizard/kdevlicense.h index d61aebc3..2e81c9ec 100644 --- a/parts/appwizard/tdevlicense.h +++ b/parts/appwizard/kdevlicense.h @@ -16,30 +16,30 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEVLICENSE_H -#define TDEVLICENSE_H +#ifndef KDEVLICENSE_H +#define KDEVLICENSE_H /** -@file tdevfile.h +@file kdevfile.h The interface to installed licenses. */ #include -#include "tdevfile.h" +#include "kdevfile.h" /*The interface to installed licenses.*/ -class TDevLicense +class KDevLicense { public: - /**Constructs a TDevLicense and loads the given license template file. + /**Constructs a KDevLicense and loads the given license template file. @param name The name of this license. @param fileName The file name where license template text is kept.*/ - TDevLicense(const TQString& name, const TQString& fileName); + KDevLicense(const TQString& name, const TQString& fileName); public: /**Assembles the license to a string suitable for replacement of a %{LICENSE} .*/ - TQString assemble(TDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ); + TQString assemble(KDevFile::CommentingStyle commentingStyle, const TQString& author, const TQString& email, int leadingSpaces ); /** * returns the name of this license. diff --git a/parts/appwizard/profilesupport.cpp b/parts/appwizard/profilesupport.cpp index 3c5a5a35..ac5da870 100644 --- a/parts/appwizard/profilesupport.cpp +++ b/parts/appwizard/profilesupport.cpp @@ -24,9 +24,9 @@ #include #include -#include +#include -ProfileSupport::ProfileSupport(TDevPlugin *parent) +ProfileSupport::ProfileSupport(KDevPlugin *parent) { KURL::List resources = parent->pluginController()->profileResourcesRecursive("*.appwizard"); diff --git a/parts/appwizard/profilesupport.h b/parts/appwizard/profilesupport.h index 11e9b201..b18a9620 100644 --- a/parts/appwizard/profilesupport.h +++ b/parts/appwizard/profilesupport.h @@ -20,11 +20,11 @@ #ifndef PROFILESUPPORT_H #define PROFILESUPPORT_H -#include +#include class ProfileSupport{ public: - ProfileSupport(TDevPlugin *parent); + ProfileSupport(KDevPlugin *parent); bool isInTemplateList(const TQString &templateUrl); private: diff --git a/parts/astyle/CMakeLists.txt b/parts/astyle/CMakeLists.txt index aba6c00f..bac3e50a 100644 --- a/parts/astyle/CMakeLists.txt +++ b/parts/astyle/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ -install( FILES tdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/tdevastyle ) +install( FILES kdevastyle.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_astyle.rc DESTINATION ${DATA_INSTALL_DIR}/kdevastyle ) -##### libtdevastyle (module) #################### +##### libkdevastyle (module) #################### -tde_add_kpart( libtdevastyle AUTOMOC +tde_add_kpart( libkdevastyle AUTOMOC SOURCES astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp diff --git a/parts/astyle/Makefile.am b/parts/astyle/Makefile.am index 4247625d..739ba2b8 100644 --- a/parts/astyle/Makefile.am +++ b/parts/astyle/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(top_srcdir)/lib/astyle -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevastyle.la -libtdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +kde_module_LTLIBRARIES = libkdevastyle.la +libkdevastyle_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevastyle_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/lib/astyle/libastyle.la -libtdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp +libkdevastyle_la_SOURCES = astyle_part.cpp astyleconfig.ui astyle_widget.cpp astyle_adaptor.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevastyle.desktop +service_DATA = kdevastyle.desktop -rc_DATA = tdevpart_astyle.rc -rcdir = $(kde_datadir)/tdevastyle +rc_DATA = kdevpart_astyle.rc +rcdir = $(kde_datadir)/kdevastyle diff --git a/parts/astyle/astyle_adaptor.cpp b/parts/astyle/astyle_adaptor.cpp index 6f6bed50..05fb0901 100644 --- a/parts/astyle/astyle_adaptor.cpp +++ b/parts/astyle/astyle_adaptor.cpp @@ -38,7 +38,7 @@ string ASStringIterator::nextLine() } -TDevFormatter::TDevFormatter(const TQMap& options) +KDevFormatter::KDevFormatter(const TQMap& options) { // for ( TQMap::ConstIterator iter = options.begin();iter != options.end();iter++ ) // { @@ -116,7 +116,7 @@ TDevFormatter::TDevFormatter(const TQMap& options) setSingleStatementsMode(!options["KeepStatements"].toBool()); } -TDevFormatter::TDevFormatter( AStyleWidget * widget ) +KDevFormatter::KDevFormatter( AStyleWidget * widget ) { setCStyle(); @@ -215,7 +215,7 @@ TDevFormatter::TDevFormatter( AStyleWidget * widget ) setSingleStatementsMode( !widget->Keep_Statements->isChecked() ); } -bool TDevFormatter::predefinedStyle( const TQString & style ) +bool KDevFormatter::predefinedStyle( const TQString & style ) { if (style == "ANSI") { diff --git a/parts/astyle/astyle_adaptor.h b/parts/astyle/astyle_adaptor.h index df2ab818..21398fbb 100644 --- a/parts/astyle/astyle_adaptor.h +++ b/parts/astyle/astyle_adaptor.h @@ -33,12 +33,12 @@ private: class AStyleWidget; -class TDevFormatter : public astyle::ASFormatter +class KDevFormatter : public astyle::ASFormatter { public: - TDevFormatter(const TQMap& options); - TDevFormatter( AStyleWidget * widget ); + KDevFormatter(const TQMap& options); + KDevFormatter( AStyleWidget * widget ); TQString indentString() const { return m_indentString; diff --git a/parts/astyle/astyle_part.cpp b/parts/astyle/astyle_part.cpp index 57d032c8..16d590ab 100644 --- a/parts/astyle/astyle_part.cpp +++ b/parts/astyle/astyle_part.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include @@ -17,10 +17,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -33,22 +33,22 @@ #include "astyle_widget.h" #include "astyle_adaptor.h" -static const TDevPluginInfo data("tdevastyle"); +static const KDevPluginInfo data("kdevastyle"); namespace { const char* defaultFormatExtensions = "*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm"; } -typedef TDevGenericFactory AStyleFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevastyle, AStyleFactory( data ) ) +typedef KDevGenericFactory AStyleFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevastyle, AStyleFactory( data ) ) AStylePart::AStylePart(TQObject *parent, const char *name, const TQStringList &) : KDevSourceFormatter(&data, parent, name ? name : "AStylePart") { setInstance(AStyleFactory::instance()); - setXMLFile("tdevpart_astyle.rc"); + setXMLFile("kdevpart_astyle.rc"); formatTextAction = new TDEAction(i18n("&Reformat Source"), 0, this, TQT_SLOT(beautifySource()), actionCollection(), "edit_astyle"); formatTextAction->setEnabled(false); @@ -161,7 +161,7 @@ void AStylePart::beautifySource() //if there is a selection, we only format it. ASStringIterator is(has_selection ? sel_iface->selection() : iface->text()); - TDevFormatter formatter(m_project); + KDevFormatter formatter(m_project); formatter.init(&is); @@ -346,7 +346,7 @@ void AStylePart::activePartChanged ( KParts::Part *part ) TQString AStylePart::formatSource( const TQString text, AStyleWidget * widget, const TQMap& options ) { ASStringIterator is(text); - TDevFormatter * formatter = ( widget)? new TDevFormatter( widget ) : new TDevFormatter(options); + KDevFormatter * formatter = ( widget)? new KDevFormatter( widget ) : new KDevFormatter(options); formatter->init(&is); @@ -390,7 +390,7 @@ TQString AStylePart::formatSource( const TQString text ) TQString AStylePart::indentString( ) const { - TDevFormatter formatter(m_project); + KDevFormatter formatter(m_project); return formatter.indentString(); } diff --git a/parts/astyle/astyle_part.h b/parts/astyle/astyle_part.h index 675bada5..61b5a382 100644 --- a/parts/astyle/astyle_part.h +++ b/parts/astyle/astyle_part.h @@ -3,14 +3,14 @@ */ -#ifndef __TDEVPART_ASTYLE_H__ -#define __TDEVPART_ASTYLE_H__ +#ifndef __KDEVPART_ASTYLE_H__ +#define __KDEVPART_ASTYLE_H__ class KDialogBase; -#include +#include #include #include -#include +#include #include #include #include diff --git a/parts/astyle/astyle_widget.cpp b/parts/astyle/astyle_widget.cpp index bcb810e5..a70c6771 100644 --- a/parts/astyle/astyle_widget.cpp +++ b/parts/astyle/astyle_widget.cpp @@ -10,7 +10,7 @@ #include #include #include -#include +#include AStyleWidget::AStyleWidget(AStylePart * part, bool global, TQWidget *parent, const char *name) diff --git a/parts/astyle/astyle_widget.h b/parts/astyle/astyle_widget.h index 89b3f2cd..91963e54 100644 --- a/parts/astyle/astyle_widget.h +++ b/parts/astyle/astyle_widget.h @@ -4,7 +4,7 @@ #include "astyleconfig.h" class AStylePart; -class TDevPart; +class KDevPart; class AStyleWidget : public AStyleConfig diff --git a/parts/astyle/tdevastyle.desktop b/parts/astyle/kdevastyle.desktop similarity index 99% rename from parts/astyle/tdevastyle.desktop rename to parts/astyle/kdevastyle.desktop index b77c4745..ceeaabfc 100644 --- a/parts/astyle/tdevastyle.desktop +++ b/parts/astyle/kdevastyle.desktop @@ -76,7 +76,7 @@ GenericName[zh_CN]=源代码格式化 GenericName[zh_TW]=程式源碼格式器 Icon=tdevelop ServiceTypes=TDevelop/SourceFormatter -X-TDE-Library=libtdevastyle +X-TDE-Library=libkdevastyle X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CDevelopment,CPPDevelopment,JavaDevelopment diff --git a/parts/astyle/tdevpart_astyle.rc b/parts/astyle/kdevpart_astyle.rc similarity index 100% rename from parts/astyle/tdevpart_astyle.rc rename to parts/astyle/kdevpart_astyle.rc diff --git a/parts/bookmarks/CMakeLists.txt b/parts/bookmarks/CMakeLists.txt index 98022378..0422965c 100644 --- a/parts/bookmarks/CMakeLists.txt +++ b/parts/bookmarks/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevbookmarks.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevbookmarks (module) ################# +##### libkdevbookmarks (module) ################# -tde_add_kpart( libtdevbookmarks AUTOMOC +tde_add_kpart( libkdevbookmarks AUTOMOC SOURCES bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp diff --git a/parts/bookmarks/Makefile.am b/parts/bookmarks/Makefile.am index 6f2e6b8d..2ac7b233 100644 --- a/parts/bookmarks/Makefile.am +++ b/parts/bookmarks/Makefile.am @@ -1,14 +1,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevbookmarks.la -libtdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevbookmarks.la +libkdevbookmarks_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevbookmarks_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp +libkdevbookmarks_la_SOURCES = bookmarks_part.cpp bookmarks_widget.cpp bookmarks_settings_base.ui bookmarks_settings.cpp bookmarks_config.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevbookmarks.desktop +service_DATA = kdevbookmarks.desktop noinst_HEADERS = bookmarks_settings.h bookmarks_config.h diff --git a/parts/bookmarks/bookmarks_part.cpp b/parts/bookmarks/bookmarks_part.cpp index 50672642..f7ac78cb 100644 --- a/parts/bookmarks/bookmarks_part.cpp +++ b/parts/bookmarks/bookmarks_part.cpp @@ -18,16 +18,16 @@ #include #include #include -#include +#include #include #include #include #include #include -#include -#include -#include +#include +#include +#include #include "domutil.h" #include "bookmarks_widget.h" @@ -36,16 +36,16 @@ #include "bookmarks_config.h" #include -#include +#include #define BOOKMARKSETTINGSPAGE 1 -typedef TDevGenericFactory BookmarksFactory; -static const TDevPluginInfo data("tdevbookmarks"); -K_EXPORT_COMPONENT_FACTORY( libtdevbookmarks, BookmarksFactory( data ) ) +typedef KDevGenericFactory BookmarksFactory; +static const KDevPluginInfo data("kdevbookmarks"); +K_EXPORT_COMPONENT_FACTORY( libkdevbookmarks, BookmarksFactory( data ) ) BookmarksPart::BookmarksPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "BookmarksPart" ) + : KDevPlugin(&data, parent, name ? name : "BookmarksPart" ) { setInstance(BookmarksFactory::instance()); diff --git a/parts/bookmarks/bookmarks_part.h b/parts/bookmarks/bookmarks_part.h index b8015f54..f51603d7 100644 --- a/parts/bookmarks/bookmarks_part.h +++ b/parts/bookmarks/bookmarks_part.h @@ -10,8 +10,8 @@ ***************************************************************************/ -#ifndef __TDEVPART_BOOKMARKS_H__ -#define __TDEVPART_BOOKMARKS_H__ +#ifndef __KDEVPART_BOOKMARKS_H__ +#define __KDEVPART_BOOKMARKS_H__ #include @@ -22,7 +22,7 @@ #include #include -#include +#include class TQTimer; class KDialogBase; @@ -38,7 +38,7 @@ struct EditorData class BookmarksWidget; class TQDomElement; -class BookmarksPart : public TDevPlugin +class BookmarksPart : public KDevPlugin { Q_OBJECT @@ -48,7 +48,7 @@ public: BookmarksPart(TQObject *parent, const char *name, const TQStringList &); ~BookmarksPart(); - // reimplemented from TDevPlugin + // reimplemented from KDevPlugin void restorePartialProjectSession( const TQDomElement * el ); void savePartialProjectSession( TQDomElement * el ); diff --git a/parts/bookmarks/bookmarks_widget.cpp b/parts/bookmarks/bookmarks_widget.cpp index dbf892fe..cc7316c8 100644 --- a/parts/bookmarks/bookmarks_widget.cpp +++ b/parts/bookmarks/bookmarks_widget.cpp @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include #include "bookmarks_part.h" diff --git a/parts/bookmarks/tdevbookmarks.desktop b/parts/bookmarks/kdevbookmarks.desktop similarity index 99% rename from parts/bookmarks/tdevbookmarks.desktop rename to parts/bookmarks/kdevbookmarks.desktop index 0ec9ae11..3cbdb233 100644 --- a/parts/bookmarks/tdevbookmarks.desktop +++ b/parts/bookmarks/kdevbookmarks.desktop @@ -80,6 +80,6 @@ GenericName[zh_TW]=書籤 Icon=bookmark ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Project -X-TDE-Library=libtdevbookmarks +X-TDE-Library=libkdevbookmarks X-TDevelop-Version=5 X-TDevelop-Properties=CodeEditing diff --git a/parts/classview/CMakeLists.txt b/parts/classview/CMakeLists.txt index a5ec68dc..2d19388a 100644 --- a/parts/classview/CMakeLists.txt +++ b/parts/classview/CMakeLists.txt @@ -30,17 +30,17 @@ link_directories( ##### other data ################################ -install( FILES tdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevclassview ) +install( FILES kdevclassview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclassview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevclassview ) -##### libtdevclassview (module) ################# +##### libkdevclassview (module) ################# -tde_add_kpart( libtdevclassview AUTOMOC +tde_add_kpart( libkdevclassview AUTOMOC SOURCES classviewpart.cpp classviewwidget.cpp digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp LINK - tdevextensions-static tdevelop-shared tdevwidgets-shared + kdevextensions-static tdevelop-shared kdevwidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/classview/Makefile.am b/parts/classview/Makefile.am index ccc02078..3041259e 100644 --- a/parts/classview/Makefile.am +++ b/parts/classview/Makefile.am @@ -3,20 +3,20 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \ -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevclassview.la -libtdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevclassview.la +libkdevclassview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevclassview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \ +libkdevclassview_la_SOURCES = classviewpart.cpp classviewwidget.cpp \ digraphview.cpp hierarchydlg.cpp navigator.cpp viewcombos.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevclassview.desktop +service_DATA = kdevclassview.desktop -rcdir = $(kde_datadir)/tdevclassview -rc_DATA = tdevclassview.rc +rcdir = $(kde_datadir)/kdevclassview +rc_DATA = kdevclassview.rc QTDIR = /home/bernd/kdesrc/qt-copy diff --git a/parts/classview/classtooldlg.cpp b/parts/classview/classtooldlg.cpp index f0c49d46..c0cc21a2 100644 --- a/parts/classview/classtooldlg.cpp +++ b/parts/classview/classtooldlg.cpp @@ -20,7 +20,7 @@ #include #include -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "classstore.h" #include "parsedclass.h" #include "classviewpart.h" @@ -119,8 +119,8 @@ ClassToolDialog::ClassToolDialog( ClassViewPart *part ) connect( methods_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewMethods())); connect( attributes_button, TQT_SIGNAL(clicked()), TQT_SLOT(viewAttributes())); - connect( part, TQT_SIGNAL(setLanguageSupport(TDevLanguageSupport*)), - this, TQT_SLOT(setLanguageSupport(TDevLanguageSupport*)) ); + connect( part, TQT_SIGNAL(setLanguageSupport(KDevLanguageSupport*)), + this, TQT_SLOT(setLanguageSupport(KDevLanguageSupport*)) ); m_part->registerClassToolDialog(this); } @@ -132,7 +132,7 @@ ClassToolDialog::~ClassToolDialog() } -void ClassToolDialog::setLanguageSupport(TDevLanguageSupport *ls) +void ClassToolDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) { disconnect(ls, 0, this, 0); diff --git a/parts/classview/classtooldlg.h b/parts/classview/classtooldlg.h index c4b2e79a..d143e66e 100644 --- a/parts/classview/classtooldlg.h +++ b/parts/classview/classtooldlg.h @@ -59,7 +59,7 @@ public slots: void viewAttributes(); private slots: - void setLanguageSupport(TDevLanguageSupport *ls); + void setLanguageSupport(KDevLanguageSupport *ls); void refresh(); void delayedClose(); @@ -85,7 +85,7 @@ private: /** Store that holds all classes in the system. */ ClassStore *m_store; - TDevLanguageSupport *m_ls; + KDevLanguageSupport *m_ls; ClassViewPart *m_part; /** The class we are currently viewing. */ diff --git a/parts/classview/classtreebase.cpp b/parts/classview/classtreebase.cpp index 66e23173..9e052418 100644 --- a/parts/classview/classtreebase.cpp +++ b/parts/classview/classtreebase.cpp @@ -22,10 +22,10 @@ #include #include -#include "tdevcore.h" -#include "tdevlanguagesupport.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevlanguagesupport.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" #include "classstore.h" #include "classviewpart.h" @@ -36,10 +36,10 @@ TDEPopupMenu *ClassTreeItem::createPopup() if (!m_item || m_item->itemType() == PIT_SCOPE) return 0; - TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); + KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); TDEPopupMenu *popup = new TDEPopupMenu(); - if (features & TDevLanguageSupport::Declarations) + if (features & KDevLanguageSupport::Declarations) popup->insertItem( i18n("Go to Declaration"), classTree(), TQT_SLOT(slotGotoDeclaration()) ); if (m_item->itemType() == PIT_METHOD) popup->insertItem( i18n("Go to Definition"), classTree(), TQT_SLOT(slotGotoImplementation()) ); @@ -49,8 +49,8 @@ TDEPopupMenu *ClassTreeItem::createPopup() case PIT_CLASS: { title = i18n("Class"); - bool hasAddMethod = features & TDevLanguageSupport::AddMethod; - bool hasAddAttribute = features & TDevLanguageSupport::AddAttribute; + bool hasAddMethod = features & KDevLanguageSupport::AddMethod; + bool hasAddAttribute = features & KDevLanguageSupport::AddAttribute; if (hasAddMethod) popup->insertItem( i18n("Add Method..."), classTree(), TQT_SLOT(slotAddMethod())); if (hasAddAttribute) @@ -168,7 +168,7 @@ void ClassTreeScopeItem::setOpen(bool o) ClassTreeItem *lastItem = 0; // Ok, this is a hack... - TDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); + KDevLanguageSupport::Features features = classTree()->m_part->languageSupport()->features(); // Add namespaces TQValueList scopeList = pScope->getSortedScopeList(); @@ -176,7 +176,7 @@ void ClassTreeScopeItem::setOpen(bool o) for (it = scopeList.begin(); it != scopeList.end(); ++it) lastItem = new ClassTreeScopeItem(this, lastItem, *it); - if (features & TDevLanguageSupport::Classes) { + if (features & KDevLanguageSupport::Classes) { // Add classes TQValueList classList = pScope->getSortedClassList(); TQValueList::ConstIterator it; @@ -184,7 +184,7 @@ void ClassTreeScopeItem::setOpen(bool o) lastItem = new ClassTreeClassItem(this, lastItem, *it); } - if (features & TDevLanguageSupport::Structs) { + if (features & KDevLanguageSupport::Structs) { // Add structs TQValueList structList = pScope->getSortedStructList(); TQValueList::ConstIterator it; @@ -192,7 +192,7 @@ void ClassTreeScopeItem::setOpen(bool o) lastItem = new ClassTreeClassItem(this, lastItem, *it, true); } - if (features & TDevLanguageSupport::Functions) { + if (features & KDevLanguageSupport::Functions) { // Add functions TQValueList methodList = pScope->getSortedMethodList(); TQValueList::ConstIterator it; @@ -200,7 +200,7 @@ void ClassTreeScopeItem::setOpen(bool o) lastItem = new ClassTreeMethodItem(this, lastItem, *it); } - if (features & TDevLanguageSupport::Variables) { + if (features & KDevLanguageSupport::Variables) { // Add attributes TQValueList attrList = pScope->getSortedAttributeList(); TQValueList::ConstIterator it; diff --git a/parts/classview/classviewpart.cpp b/parts/classview/classviewpart.cpp index 7cdf8cbd..92e26bd0 100644 --- a/parts/classview/classviewpart.cpp +++ b/parts/classview/classviewpart.cpp @@ -26,19 +26,19 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include #include @@ -138,17 +138,17 @@ class FunctionCompletion : public CustomCompleter { }; -typedef TDevGenericFactory ClassViewFactory; -static const TDevPluginInfo data("tdevclassview"); -K_EXPORT_COMPONENT_FACTORY( libtdevclassview, ClassViewFactory( data ) ) +typedef KDevGenericFactory ClassViewFactory; +static const KDevPluginInfo data("kdevclassview"); +K_EXPORT_COMPONENT_FACTORY( libkdevclassview, ClassViewFactory( data ) ) ClassViewPart::ClassViewPart(TQObject *parent, const char *name, const TQStringList& ) - :/// TDevPlugin( &data, parent, name ? name : "ClassViewPart" ), - TDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), + :/// KDevPlugin( &data, parent, name ? name : "ClassViewPart" ), + KDevCodeBrowserFrontend( &data, parent, name ? name : "ClassViewPart" ), m_activeDocument(0), m_activeView(0), m_activeSelection(0), m_activeEditor(0), m_activeViewCursor(0), m_hierarchyDlg(0) { setInstance(ClassViewFactory::instance()); - setXMLFile("tdevclassview.rc"); + setXMLFile("kdevclassview.rc"); navigator = new Navigator(this); @@ -207,7 +207,7 @@ void ClassViewPart::setupActions( ) new TDEAction( i18n("Focus Navigator"), 0, this, TQT_SLOT(slotFocusNavbar()), actionCollection(), "focus_navigator" ); - if (langHasFeature(TDevLanguageSupport::Classes)) + if (langHasFeature(KDevLanguageSupport::Classes)) { TDEAction *ac = new TDEAction(i18n("Class Inheritance Diagram"), "view_tree", 0, this, TQT_SLOT(graphicalClassView()), actionCollection(), "inheritance_dia"); ac->setToolTip(i18n("Class inheritance diagram")); @@ -216,7 +216,7 @@ void ClassViewPart::setupActions( ) } } -bool ClassViewPart::langHasFeature(TDevLanguageSupport::Features feature) +bool ClassViewPart::langHasFeature(KDevLanguageSupport::Features feature) { bool result = false; if (languageSupport()) diff --git a/parts/classview/classviewpart.h b/parts/classview/classviewpart.h index 70d00cc9..16e18def 100644 --- a/parts/classview/classviewpart.h +++ b/parts/classview/classviewpart.h @@ -18,16 +18,16 @@ * */ -#ifndef __TDEVPART_CLASSVIEW_H__ -#define __TDEVPART_CLASSVIEW_H__ +#ifndef __KDEVPART_CLASSVIEW_H__ +#define __KDEVPART_CLASSVIEW_H__ -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "viewcombos.h" #include #include -#include +#include #include #include @@ -52,7 +52,7 @@ class TDEToolBarPopupAction; class NamespaceItem; class Navigator; class HierarchyDialog; -class ClassViewPart : public Extensions::TDevCodeBrowserFrontend +class ClassViewPart : public Extensions::KDevCodeBrowserFrontend { Q_OBJECT @@ -60,7 +60,7 @@ public: ClassViewPart(TQObject *parent, const char *name, const TQStringList &); virtual ~ClassViewPart(); - bool langHasFeature(TDevLanguageSupport::Features feature); + bool langHasFeature(KDevLanguageSupport::Features feature); TDEListViewAction *m_functionsnav; Navigator *navigator; diff --git a/parts/classview/classviewwidget.cpp b/parts/classview/classviewwidget.cpp index cede06f3..22b865ef 100644 --- a/parts/classview/classviewwidget.cpp +++ b/parts/classview/classviewwidget.cpp @@ -31,10 +31,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include @@ -252,7 +252,7 @@ void ClassViewWidget::insertFile( const TQString& fileName ) } break; - case TDevelop2ViewMode: + case KDevelop2ViewMode: { } break; @@ -293,7 +293,7 @@ void ClassViewWidget::removeFile( const TQString& fileName ) } break; - case TDevelop2ViewMode: + case KDevelop2ViewMode: { } break; @@ -332,19 +332,19 @@ void ClassViewWidget::contentsContextMenuEvent( TQContextMenuEvent * ev ) bool sep = false; if( item && item->isClass() ){ - if( m_part->langHasFeature(TDevLanguageSupport::AddMethod) ) { + if( m_part->langHasFeature(KDevLanguageSupport::AddMethod) ) { m_actionAddMethod->plug( &menu ); sep = true; } - if( m_part->langHasFeature(TDevLanguageSupport::AddAttribute) ) { + if( m_part->langHasFeature(KDevLanguageSupport::AddAttribute) ) { m_actionAddAttribute->plug( &menu ); sep = true; } } if (item && item->isVariable()){ - if( m_part->langHasFeature(TDevLanguageSupport::CreateAccessMethods) ) + if( m_part->langHasFeature(KDevLanguageSupport::CreateAccessMethods) ) m_actionCreateAccessMethods->plug( &menu ); } @@ -1108,7 +1108,7 @@ TQString VariableDomBrowserItem::key( int , bool ) const void ClassViewWidget::slotNewClass( ) { - if( m_part->languageSupport()->features() & TDevLanguageSupport::NewClass ) + if( m_part->languageSupport()->features() & KDevLanguageSupport::NewClass ) m_part->languageSupport()->addClass(); } @@ -1116,7 +1116,7 @@ void ClassViewWidget::slotAddMethod( ) { if ( !selectedItem() ) return; - if( m_part->languageSupport()->features() & TDevLanguageSupport::AddMethod ) + if( m_part->languageSupport()->features() & KDevLanguageSupport::AddMethod ) m_part->languageSupport()->addMethod( static_cast( selectedItem() )->dom() ); } @@ -1124,7 +1124,7 @@ void ClassViewWidget::slotAddAttribute( ) { if ( !selectedItem() ) return; - if( m_part->languageSupport()->features() & TDevLanguageSupport::AddAttribute ) + if( m_part->languageSupport()->features() & KDevLanguageSupport::AddAttribute ) m_part->languageSupport()->addAttribute( static_cast( selectedItem() )->dom() ); } @@ -1271,7 +1271,7 @@ void ClassViewWidget::slotCreateAccessMethods( ) { if ( !selectedItem() ) return; - if( m_part->languageSupport()->features() & TDevLanguageSupport::CreateAccessMethods ) + if( m_part->languageSupport()->features() & KDevLanguageSupport::CreateAccessMethods ) { VariableDomBrowserItem* item = dynamic_cast( selectedItem() ); if (item == 0) diff --git a/parts/classview/classviewwidget.h b/parts/classview/classviewwidget.h index 1d17efec..d74448f5 100644 --- a/parts/classview/classviewwidget.h +++ b/parts/classview/classviewwidget.h @@ -31,7 +31,7 @@ #include #include -class TDevProject; +class KDevProject; class ClassViewPart; class ClassViewItem; class FolderBrowserItem; @@ -51,7 +51,7 @@ public: enum ViewMode { KDevelop3ViewMode = 0, - TDevelop2ViewMode, + KDevelop2ViewMode, JavaLikeViewMode }; diff --git a/parts/classview/hierarchydlg.cpp b/parts/classview/hierarchydlg.cpp index 6901926b..c8761861 100644 --- a/parts/classview/hierarchydlg.cpp +++ b/parts/classview/hierarchydlg.cpp @@ -28,7 +28,7 @@ #include #include -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "kcomboview.h" #include "classviewpart.h" @@ -105,7 +105,7 @@ void HierarchyDialog::save() { TQFileInfo fi(dlg.selectedURL().pathOrURL()); TQApplication::setOverrideCursor( TQt::waitCursor ); - TDevLanguageSupport *ls = m_part->languageSupport(); + KDevLanguageSupport *ls = m_part->languageSupport(); for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it) { kdDebug(9003) << "Adding class to graph: " << it.key() << endl; @@ -134,7 +134,7 @@ void HierarchyDialog::refresh() ViewCombosOp::refreshNamespaces(m_part, namespace_combo); processNamespace("", m_part->codeModel()->globalNamespace()); - TDevLanguageSupport *ls = m_part->languageSupport(); + KDevLanguageSupport *ls = m_part->languageSupport(); for (TQMap::const_iterator it = classes.begin(); it != classes.end(); ++it) { @@ -154,7 +154,7 @@ void HierarchyDialog::refresh() digraph->process(); } -void HierarchyDialog::setLanguageSupport(TDevLanguageSupport *ls) +void HierarchyDialog::setLanguageSupport(KDevLanguageSupport *ls) { if (ls) connect(ls, TQT_SIGNAL(updatedSourceInfo()), this, TQT_SLOT(refresh())); @@ -169,7 +169,7 @@ void HierarchyDialog::slotClassComboChoice(TQListViewItem * item) if (!ci) return; - TDevLanguageSupport *ls = m_part->languageSupport(); + KDevLanguageSupport *ls = m_part->languageSupport(); TQString className = ls->formatClassName(uclasses[item->text(0)]); digraph->setSelected(className); @@ -188,7 +188,7 @@ void HierarchyDialog::slotClassComboChoice( const TQString& itemText ) if (!ci) return; - TDevLanguageSupport *ls = m_part->languageSupport(); + KDevLanguageSupport *ls = m_part->languageSupport(); TQString className = ls->formatClassName(uclasses[item->text(0)]); digraph->setSelected(className); @@ -205,10 +205,10 @@ void HierarchyDialog::classSelected(const TQString &/*className*/) /* ParsedClass *currentClass = m_part->classStore()->getClassByName(className); member_tree->clear(); if (currentClass) { - TDevLanguageSupport::Features features = m_part->languageSupport()->features(); - if (features & TDevLanguageSupport::Functions) + KDevLanguageSupport::Features features = m_part->languageSupport()->features(); + if (features & KDevLanguageSupport::Functions) member_tree->insertAllClassMethods(currentClass, (PIAccess)-1); - if (features & TDevLanguageSupport::Variables) + if (features & KDevLanguageSupport::Variables) member_tree->insertAllClassAttributes(currentClass, (PIAccess)-1); }*/ } diff --git a/parts/classview/hierarchydlg.h b/parts/classview/hierarchydlg.h index 9d26ebd0..1c41a8f0 100644 --- a/parts/classview/hierarchydlg.h +++ b/parts/classview/hierarchydlg.h @@ -17,7 +17,7 @@ #include "codemodel.h" class ClassViewPart; -class TDevLanguageSupport; +class KDevLanguageSupport; class DigraphView; class ClassToolWidget; class KComboView; @@ -35,7 +35,7 @@ public slots: void refresh(); private slots: - void setLanguageSupport(TDevLanguageSupport *ls); + void setLanguageSupport(KDevLanguageSupport *ls); void slotClassComboChoice(TQListViewItem *item); void slotNamespaceComboChoice(TQListViewItem *item); void slotClassComboChoice(const TQString&); diff --git a/parts/classview/tdevclassview.desktop b/parts/classview/kdevclassview.desktop similarity index 99% rename from parts/classview/tdevclassview.desktop rename to parts/classview/kdevclassview.desktop index 10200b50..49bfa43c 100644 --- a/parts/classview/tdevclassview.desktop +++ b/parts/classview/kdevclassview.desktop @@ -76,7 +76,7 @@ GenericName[tr]=Sınıf Görünümü GenericName[zh_CN]=类查看器 GenericName[zh_TW]=類別檢視 ServiceTypes=TDevelop/CodeBrowserFrontend -X-TDE-Library=libtdevclassview +X-TDE-Library=libkdevclassview X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CodeNavigation diff --git a/parts/classview/tdevclassview.rc b/parts/classview/kdevclassview.rc similarity index 100% rename from parts/classview/tdevclassview.rc rename to parts/classview/kdevclassview.rc diff --git a/parts/classview/navigator.cpp b/parts/classview/navigator.cpp index a7e3ac85..694aa0d4 100644 --- a/parts/classview/navigator.cpp +++ b/parts/classview/navigator.cpp @@ -31,9 +31,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include "classviewpart.h" #include "classviewwidget.h" diff --git a/parts/ctags2/CMakeLists.txt b/parts/ctags2/CMakeLists.txt index a88415d6..a8f4b582 100644 --- a/parts/ctags2/CMakeLists.txt +++ b/parts/ctags2/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES tdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/tdevctags2 ) +install( FILES kdevctags2.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_ctags2.rc DESTINATION ${DATA_INSTALL_DIR}/kdevctags2 ) -##### libtdevctags2 (module) #################### +##### libkdevctags2 (module) #################### -tde_add_kpart( libtdevctags2 AUTOMOC +tde_add_kpart( libkdevctags2 AUTOMOC SOURCES ctags2_part.cpp readtags.c ctags2_widgetbase.ui ctags2_widget.cpp tags.cpp ctagskinds.cpp diff --git a/parts/ctags2/Makefile.am b/parts/ctags2/Makefile.am index f12fdada..f92a819c 100644 --- a/parts/ctags2/Makefile.am +++ b/parts/ctags2/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevctags2.la -libtdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevctags2.la +libkdevctags2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevctags2_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ +libkdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ ctags2_widget.cpp tags.cpp ctagskinds.cpp ctags2_settingswidgetbase.ui \ ctags2_settingswidget.cpp ctags2_selecttagfilebase.ui ctags2_selecttagfile.cpp \ ctags2_createtagfilebase.ui ctags2_createtagfile.cpp @@ -13,10 +13,10 @@ libtdevctags2_la_SOURCES = ctags2_part.cpp readtags.c ctags2_widgetbase.ui \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevctags2.desktop +service_DATA = kdevctags2.desktop -rc_DATA = tdevpart_ctags2.rc -rcdir = $(kde_datadir)/tdevctags2 +rc_DATA = kdevpart_ctags2.rc +rcdir = $(kde_datadir)/kdevctags2 noinst_HEADERS = ctags2_widget.h tags.h readtags.h ctagskinds.h \ ctags2_settingswidget.h diff --git a/parts/ctags2/ctags2_part.cpp b/parts/ctags2/ctags2_part.cpp index 371ff7e5..324ded8a 100644 --- a/parts/ctags2/ctags2_part.cpp +++ b/parts/ctags2/ctags2_part.cpp @@ -31,16 +31,16 @@ #include #include -#include "tdevappfrontend.h" -#include -#include -#include -#include -#include -#include +#include "kdevappfrontend.h" +#include +#include +#include +#include +#include +#include #include "configwidgetproxy.h" #include "domutil.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include "ctags2_settingswidget.h" #include "ctags2_widget.h" @@ -54,15 +54,15 @@ namespace ctags #include "readtags.h" } -typedef TDevGenericFactory CTags2Factory; -static const TDevPluginInfo data("tdevctags2"); -K_EXPORT_COMPONENT_FACTORY( libtdevctags2, CTags2Factory( data ) ) +typedef KDevGenericFactory CTags2Factory; +static const KDevPluginInfo data("kdevctags2"); +K_EXPORT_COMPONENT_FACTORY( libkdevctags2, CTags2Factory( data ) ) CTags2Part::CTags2Part(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "ctags2Part" ) + : KDevPlugin(&data, parent, name ? name : "ctags2Part" ) { setInstance(CTags2Factory::instance()); - setXMLFile("tdevpart_ctags2.rc"); + setXMLFile("kdevpart_ctags2.rc"); TQDomDocument & dom = *projectDom(); TQString customTagFile = DomUtil::readEntry( dom, "/ctagspart/customTagfilePath" ); @@ -164,7 +164,7 @@ bool CTags2Part::createTagsFile(const TQString& tagFile, const TQString& dir) commandline += " "; commandline += dir; - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(dir, commandline, false); return true; @@ -330,7 +330,7 @@ int CTags2Part::getFileLineFromPattern( KURL const & url, TQString const & patte void CTags2Part::slotLookupDeclaration( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoDeclaration(); @@ -339,7 +339,7 @@ void CTags2Part::slotLookupDeclaration( ) void CTags2Part::slotLookupDefinition( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoDefinition(); @@ -348,7 +348,7 @@ void CTags2Part::slotLookupDefinition( ) void CTags2Part::slotLookup( ) { - m_contextString = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + m_contextString = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( !m_contextString.isEmpty() ) { slotGotoTag(); diff --git a/parts/ctags2/ctags2_part.h b/parts/ctags2/ctags2_part.h index ca33e801..93af5f7f 100644 --- a/parts/ctags2/ctags2_part.h +++ b/parts/ctags2/ctags2_part.h @@ -9,13 +9,13 @@ * * ***************************************************************************/ -#ifndef __TDEVPART_CTAGS2_H__ -#define __TDEVPART_CTAGS2_H__ +#ifndef __KDEVPART_CTAGS2_H__ +#define __KDEVPART_CTAGS2_H__ #include #include -#include +#include #include "tags.h" class TQPopupMenu; @@ -26,7 +26,7 @@ class CTags2Widget; class ConfigWidgetProxy; class KDialogBase; -class CTags2Part : public TDevPlugin +class CTags2Part : public KDevPlugin { Q_OBJECT diff --git a/parts/ctags2/ctags2_settingswidget.cpp b/parts/ctags2/ctags2_settingswidget.cpp index c44f91d6..b45a41be 100644 --- a/parts/ctags2/ctags2_settingswidget.cpp +++ b/parts/ctags2/ctags2_settingswidget.cpp @@ -15,13 +15,13 @@ #include #include -#include +#include #include #include #include #include #include -#include +#include #include #include "ctags2_settingswidget.h" diff --git a/parts/ctags2/ctags2_widget.cpp b/parts/ctags2/ctags2_widget.cpp index cb44937d..bd1b138d 100644 --- a/parts/ctags2/ctags2_widget.cpp +++ b/parts/ctags2/ctags2_widget.cpp @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include "ctags2_widget.h" #include "tags.h" diff --git a/parts/ctags2/tdevctags2.desktop b/parts/ctags2/kdevctags2.desktop similarity index 99% rename from parts/ctags2/tdevctags2.desktop rename to parts/ctags2/kdevctags2.desktop index 86720c8e..db79f503 100644 --- a/parts/ctags2/tdevctags2.desktop +++ b/parts/ctags2/kdevctags2.desktop @@ -77,6 +77,6 @@ GenericName[zh_CN]=CTags前端 GenericName[zh_TW]=CTags 前端介面 ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Project -X-TDE-Library=libtdevctags2 +X-TDE-Library=libkdevctags2 X-TDevelop-Version=5 X-TDevelop-Properties=CodeNavigation diff --git a/parts/ctags2/tdevpart_ctags2.rc b/parts/ctags2/kdevpart_ctags2.rc similarity index 79% rename from parts/ctags2/tdevpart_ctags2.rc rename to parts/ctags2/kdevpart_ctags2.rc index c217c256..e8745b3b 100644 --- a/parts/ctags2/tdevpart_ctags2.rc +++ b/parts/ctags2/kdevpart_ctags2.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/diff/CMakeLists.txt b/parts/diff/CMakeLists.txt index a4135dc6..09987fd7 100644 --- a/parts/diff/CMakeLists.txt +++ b/parts/diff/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdiff ) +install( FILES kdevdiff.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdiff.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdiff ) -##### libtdevdiff (module) ###################### +##### libkdevdiff (module) ###################### -tde_add_kpart( libtdevdiff AUTOMOC +tde_add_kpart( libkdevdiff AUTOMOC SOURCES diffpart.cpp diffwidget.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/diff/Makefile.am b/parts/diff/Makefile.am index 3d9396eb..ea521442 100644 --- a/parts/diff/Makefile.am +++ b/parts/diff/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions $(all_includes) -kde_module_LTLIBRARIES = libtdevdiff.la -libtdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevdiff.la +libkdevdiff_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdiff_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp +libkdevdiff_la_SOURCES = diffpart.cpp diffwidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdiff.desktop +service_DATA = kdevdiff.desktop -rcdir = $(kde_datadir)/tdevdiff -rc_DATA = tdevdiff.rc +rcdir = $(kde_datadir)/kdevdiff +rc_DATA = kdevdiff.rc diff --git a/parts/diff/diffpart.cpp b/parts/diff/diffpart.cpp index b48e8136..a0dbafdd 100644 --- a/parts/diff/diffpart.cpp +++ b/parts/diff/diffpart.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include #include #include @@ -28,24 +28,24 @@ #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" #include "diffdlg.h" #include "diffwidget.h" -static const TDevPluginInfo data("tdevdiff"); +static const KDevPluginInfo data("kdevdiff"); -typedef TDevGenericFactory DiffFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevdiff, DiffFactory( data ) ) +typedef KDevGenericFactory DiffFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevdiff, DiffFactory( data ) ) DiffPart::DiffPart(TQObject *parent, const char *name, const TQStringList &) - : TDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) + : KDevDiffFrontend(&data, parent, name ? name : "DiffPart"), proc(0) { setInstance(DiffFactory::instance()); - setXMLFile("tdevdiff.rc"); + setXMLFile("kdevdiff.rc"); diffWidget = new DiffWidget(this, 0, "diffWidget"); diffWidget->setIcon( SmallIcon("editcopy") ); @@ -83,7 +83,7 @@ static bool urlIsEqual(const KURL &a, const KURL &b) return a == b; } -static KParts::ReadWritePart* partForURL(const KURL &url, TDevPartController* pc) +static KParts::ReadWritePart* partForURL(const KURL &url, KDevPartController* pc) { if ( !pc ) return 0; diff --git a/parts/diff/diffpart.h b/parts/diff/diffpart.h index 984c2c06..6fe89efe 100644 --- a/parts/diff/diffpart.h +++ b/parts/diff/diffpart.h @@ -15,8 +15,8 @@ #include #include -#include "tdevplugin.h" -#include "tdevdifffrontend.h" +#include "kdevplugin.h" +#include "kdevdifffrontend.h" class TQPopupMenu; class Context; @@ -24,7 +24,7 @@ class TDEProcess; class DiffWidget; class TQCString; -class DiffPart : public TDevDiffFrontend +class DiffPart : public KDevDiffFrontend { Q_OBJECT diff --git a/parts/diff/diffwidget.cpp b/parts/diff/diffwidget.cpp index 24435611..51dabcaf 100644 --- a/parts/diff/diffwidget.cpp +++ b/parts/diff/diffwidget.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include "diffpart.h" #include "diffwidget.h" diff --git a/parts/diff/tdevdiff.desktop b/parts/diff/kdevdiff.desktop similarity index 98% rename from parts/diff/tdevdiff.desktop rename to parts/diff/kdevdiff.desktop index db2d0428..13b22e9f 100644 --- a/parts/diff/tdevdiff.desktop +++ b/parts/diff/kdevdiff.desktop @@ -35,7 +35,7 @@ Comment[tg]=Намоишгари фарқкунанда Comment[tr]=Fark Görüntüleyicisi Comment[zh_CN]=差别查看器 Comment[zh_TW]=比較檢視器 -Name=TDevDiff +Name=KDevDiff Name[da]=TDevelop diff-fremviser Name[de]=Abweichungsansicht (TDevelop) Name[hi]=के-डेव-डिफ़ @@ -78,7 +78,7 @@ GenericName[tr]=Fark Görüntüleyicisi GenericName[zh_CN]=差别查看器 GenericName[zh_TW]=比較檢視器 ServiceTypes=TDevelop/DiffFrontend -X-TDE-Library=libtdevdiff +X-TDE-Library=libkdevdiff X-TDevelop-Version=5 X-TDevelop-Properties=CodeEditing X-TDevelop-Scope=Core diff --git a/parts/diff/tdevdiff.rc b/parts/diff/kdevdiff.rc similarity index 81% rename from parts/diff/tdevdiff.rc rename to parts/diff/kdevdiff.rc index ca944508..37059573 100644 --- a/parts/diff/tdevdiff.rc +++ b/parts/diff/kdevdiff.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/distpart/CMakeLists.txt b/parts/distpart/CMakeLists.txt index 586b5346..15fcb85e 100644 --- a/parts/distpart/CMakeLists.txt +++ b/parts/distpart/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdistpart ) +install( FILES kdevdistpart.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_distpart.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdistpart ) -##### libtdevdistpart (module) ################## +##### libkdevdistpart (module) ################## -tde_add_kpart( libtdevdistpart AUTOMOC +tde_add_kpart( libkdevdistpart AUTOMOC SOURCES distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp diff --git a/parts/distpart/Makefile.am b/parts/distpart/Makefile.am index 8b5e69db..52f4a5ba 100644 --- a/parts/distpart/Makefile.am +++ b/parts/distpart/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevdistpart.la -libtdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevdistpart.la +libkdevdistpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdistpart_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp +libkdevdistpart_la_SOURCES = distpart_ui.ui distpart_part.cpp distpart_widget.cpp packagebase.cpp lsmsupport.cpp specsupport.cpp METASOURCES = AUTO KDEICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdistpart.desktop +service_DATA = kdevdistpart.desktop -rc_DATA = tdevpart_distpart.rc -rcdir = $(kde_datadir)/tdevdistpart +rc_DATA = kdevpart_distpart.rc +rcdir = $(kde_datadir)/kdevdistpart diff --git a/parts/distpart/distpart_part.cpp b/parts/distpart/distpart_part.cpp index 01ef30b0..e8a3e11a 100644 --- a/parts/distpart/distpart_part.cpp +++ b/parts/distpart/distpart_part.cpp @@ -23,27 +23,27 @@ #include #include -#include +#include #include -#include "tdevcore.h" -#include +#include "kdevcore.h" +#include #include "distpart_widget.h" #include -typedef TDevGenericFactory DistpartFactory; -static const TDevPluginInfo data("tdevdistpart"); -K_EXPORT_COMPONENT_FACTORY( libtdevdistpart, DistpartFactory( data ) ) +typedef KDevGenericFactory DistpartFactory; +static const KDevPluginInfo data("kdevdistpart"); +K_EXPORT_COMPONENT_FACTORY( libkdevdistpart, DistpartFactory( data ) ) DistpartPart::DistpartPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "DistpartPart") { + : KDevPlugin(&data, parent, name ? name : "DistpartPart") { kdDebug(9007) << "DistpartPart::DistpartPart()" << endl; setInstance(DistpartFactory::instance()); - setXMLFile("tdevpart_distpart.rc"); + setXMLFile("kdevpart_distpart.rc"); m_action = new TDEAction( i18n("Distribution && Publishing"), "package", 0, this, TQT_SLOT(show()), diff --git a/parts/distpart/distpart_part.h b/parts/distpart/distpart_part.h index d1d05a24..aa019c4d 100644 --- a/parts/distpart/distpart_part.h +++ b/parts/distpart/distpart_part.h @@ -19,12 +19,12 @@ ***************************************************************************/ -#ifndef __TDEVPART_DISTPART_H__ -#define __TDEVPART_DISTPART_H__ +#ifndef __KDEVPART_DISTPART_H__ +#define __KDEVPART_DISTPART_H__ #include -#include +#include #include #include "packagebase.h" @@ -32,7 +32,7 @@ class DistpartDialog; class KDialogBase; -class DistpartPart : public TDevPlugin { +class DistpartPart : public KDevPlugin { Q_OBJECT diff --git a/parts/distpart/distpart_widget.cpp b/parts/distpart/distpart_widget.cpp index 0999ca72..c628fe26 100644 --- a/parts/distpart/distpart_widget.cpp +++ b/parts/distpart/distpart_widget.cpp @@ -27,12 +27,12 @@ #include #include #include -#include "tdevproject.h" +#include "kdevproject.h" #include "domutil.h" #include #include -#include +#include #include #include #include @@ -44,7 +44,7 @@ #include #include #include -#include "tdevmakefrontend.h" +#include "kdevmakefrontend.h" #include #include diff --git a/parts/distpart/distpart_widget.h b/parts/distpart/distpart_widget.h index 1e5bf68f..7a684a5a 100644 --- a/parts/distpart/distpart_widget.h +++ b/parts/distpart/distpart_widget.h @@ -32,7 +32,7 @@ #include #include -class TDevProject; +class KDevProject; class DistpartPart; class TQUrlOperator; class TDEProcess; diff --git a/parts/distpart/tdevdistpart.desktop b/parts/distpart/kdevdistpart.desktop similarity index 99% rename from parts/distpart/tdevdistpart.desktop rename to parts/distpart/kdevdistpart.desktop index 290a0a8d..1b3d095d 100644 --- a/parts/distpart/tdevdistpart.desktop +++ b/parts/distpart/kdevdistpart.desktop @@ -64,7 +64,7 @@ GenericName[zh_CN]=最终打包支持 GenericName[zh_TW]=最終包裝支援 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevdistpart +X-TDE-Library=libkdevdistpart X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectPackaging diff --git a/parts/distpart/tdevpart_distpart.rc b/parts/distpart/kdevpart_distpart.rc similarity index 100% rename from parts/distpart/tdevpart_distpart.rc rename to parts/distpart/kdevpart_distpart.rc diff --git a/parts/distpart/specsupport.cpp b/parts/distpart/specsupport.cpp index 38f8f385..06a0bb67 100644 --- a/parts/distpart/specsupport.cpp +++ b/parts/distpart/specsupport.cpp @@ -19,8 +19,8 @@ ***************************************************************************/ #include "specsupport.h" -#include "tdevproject.h" -#include "tdevmakefrontend.h" +#include "kdevproject.h" +#include "kdevmakefrontend.h" #include "distpart_widget.h" #include @@ -79,11 +79,11 @@ void SpecSupport::slotbuildAllPushButtonPressed() { return; } else - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) + " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir")))); } - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -ba " + m_part->project()->projectName() + ".spec"); } @@ -178,11 +178,11 @@ void SpecSupport::slotsrcPackagePushButtonPressed() { return; } else - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote(dir) + " && cp " + TDEProcess::quote(getAppSource()) + " " + TDEProcess::quote(*(map.find("_sourcedir")))); } - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir,"cd " + TDEProcess::quote((((it = map.find("_specdir")) != map.end()) ? (*it) : dir)) + " && rpmbuild -bs " + m_part->project()->projectName() + ".spec"); } diff --git a/parts/documentation/CMakeLists.txt b/parts/documentation/CMakeLists.txt index 4b13b342..accc3401 100644 --- a/parts/documentation/CMakeLists.txt +++ b/parts/documentation/CMakeLists.txt @@ -33,13 +33,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation ) +install( FILES kdevdocumentation.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_documentation.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation ) -##### libtdevdocumentation (module) ############# +##### libkdevdocumentation (module) ############# -tde_add_kpart( libtdevdocumentation AUTOMOC +tde_add_kpart( libkdevdocumentation AUTOMOC SOURCES documentation_part.cpp documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui @@ -50,8 +50,8 @@ tde_add_kpart( libtdevdocumentation AUTOMOC find_documentation.cpp find_documentation_optionsbase.ui find_documentation_options.cpp selecttopicbase.ui selecttopic.cpp docprojectconfigwidgetbase.ui - docprojectconfigwidget.cpp TDevDocumentationIface.cpp - TDevDocumentationIface.skel addcatalogdlgbase.ui + docprojectconfigwidget.cpp KDevDocumentationIface.cpp + KDevDocumentationIface.skel addcatalogdlgbase.ui addcatalogdlg.cpp LINK documentation_interfaces-shared tdevelop-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/documentation/TDevDocumentationIface.cpp b/parts/documentation/KDevDocumentationIface.cpp similarity index 71% rename from parts/documentation/TDevDocumentationIface.cpp rename to parts/documentation/KDevDocumentationIface.cpp index 0441eb4a..329b8474 100644 --- a/parts/documentation/TDevDocumentationIface.cpp +++ b/parts/documentation/KDevDocumentationIface.cpp @@ -17,67 +17,67 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "TDevDocumentationIface.h" +#include "KDevDocumentationIface.h" #include "documentation_part.h" -TDevDocumentationIface::TDevDocumentationIface(DocumentationPart *part) - :TQObject(part), DCOPObject("TDevDocumentation"), m_part(part) +KDevDocumentationIface::KDevDocumentationIface(DocumentationPart *part) + :TQObject(part), DCOPObject("KDevDocumentation"), m_part(part) { } -TDevDocumentationIface::~TDevDocumentationIface() +KDevDocumentationIface::~KDevDocumentationIface() { } -void TDevDocumentationIface::lookupInIndex(TQString term) +void KDevDocumentationIface::lookupInIndex(TQString term) { m_part->lookInDocumentationIndex(term); } -void TDevDocumentationIface::findInFinder(TQString term) +void KDevDocumentationIface::findInFinder(TQString term) { m_part->findInDocumentation(term); } -void TDevDocumentationIface::searchInDocumentation(TQString term) +void KDevDocumentationIface::searchInDocumentation(TQString term) { m_part->searchInDocumentation(term); } -void TDevDocumentationIface::lookupInIndex() +void KDevDocumentationIface::lookupInIndex() { m_part->lookInDocumentationIndex(); } -void TDevDocumentationIface::searchInDocumentation() +void KDevDocumentationIface::searchInDocumentation() { m_part->searchInDocumentation(); } -void TDevDocumentationIface::manPage(TQString term) +void KDevDocumentationIface::manPage(TQString term) { m_part->manPage(term); } -void TDevDocumentationIface::infoPage(TQString term) +void KDevDocumentationIface::infoPage(TQString term) { m_part->infoPage(term); } -void TDevDocumentationIface::manPage() +void KDevDocumentationIface::manPage() { m_part->manPage(); } -void TDevDocumentationIface::infoPage() +void KDevDocumentationIface::infoPage() { m_part->infoPage(); } -void TDevDocumentationIface::findInFinder( ) +void KDevDocumentationIface::findInFinder( ) { m_part->findInDocumentation(); } -#include "TDevDocumentationIface.moc" +#include "KDevDocumentationIface.moc" diff --git a/parts/documentation/TDevDocumentationIface.h b/parts/documentation/KDevDocumentationIface.h similarity index 90% rename from parts/documentation/TDevDocumentationIface.h rename to parts/documentation/KDevDocumentationIface.h index 565070f3..c55143e7 100644 --- a/parts/documentation/TDevDocumentationIface.h +++ b/parts/documentation/KDevDocumentationIface.h @@ -17,21 +17,21 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVDOCUMENTATIONIFACE_H -#define TDEVDOCUMENTATIONIFACE_H +#ifndef KDEVDOCUMENTATIONIFACE_H +#define KDEVDOCUMENTATIONIFACE_H #include #include class DocumentationPart; -class TDevDocumentationIface : public TQObject, public DCOPObject { +class KDevDocumentationIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevDocumentationIface(DocumentationPart *part); - ~TDevDocumentationIface(); + KDevDocumentationIface(DocumentationPart *part); + ~KDevDocumentationIface(); k_dcop: void lookupInIndex(TQString term); diff --git a/parts/documentation/Makefile.am b/parts/documentation/Makefile.am index 118c8041..13c4db3f 100644 --- a/parts/documentation/Makefile.am +++ b/parts/documentation/Makefile.am @@ -1,31 +1,31 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/parts/documentation/interfaces $(all_includes) -kde_module_LTLIBRARIES = libtdevdocumentation.la -libtdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ +kde_module_LTLIBRARIES = libkdevdocumentation.la +libkdevdocumentation_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdocumentation_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ $(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la $(LIB_TDEHTML) -libtdevdocumentation_la_SOURCES = documentation_part.cpp \ +libkdevdocumentation_la_SOURCES = documentation_part.cpp \ documentation_widget.cpp contentsview.cpp indexview.cpp docglobalconfigwidgetbase.ui \ docglobalconfigwidget.cpp docconfiglistview.cpp editcatalogdlgbase.ui editcatalogdlg.cpp \ docutils.cpp searchview.cpp bookmarkview.cpp editbookmarkdlg.ui \ find_documentationbase.ui find_documentation.cpp find_documentation_optionsbase.ui \ find_documentation_options.cpp selecttopicbase.ui selecttopic.cpp docprojectconfigwidgetbase.ui \ - docprojectconfigwidget.cpp TDevDocumentationIface.cpp TDevDocumentationIface.skel \ + docprojectconfigwidget.cpp KDevDocumentationIface.cpp KDevDocumentationIface.skel \ addcatalogdlgbase.ui addcatalogdlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdocumentation.desktop +service_DATA = kdevdocumentation.desktop -rcdir = $(kde_datadir)/tdevdocumentation -rc_DATA = tdevpart_documentation.rc +rcdir = $(kde_datadir)/kdevdocumentation +rc_DATA = kdevpart_documentation.rc noinst_HEADERS = contentsview.h indexview.h docglobalconfigwidget.h \ docconfiglistview.h editcatalogdlg.h docutils.h searchview.h bookmarkview.h selecttopic.h \ - docprojectconfigwidget.h TDevDocumentationIface.h addcatalogdlg.h + docprojectconfigwidget.h KDevDocumentationIface.h addcatalogdlg.h SUBDIRS = interfaces plugins tools data protocols DOXYGEN_EMPTY = YES diff --git a/parts/documentation/addcatalogdlg.cpp b/parts/documentation/addcatalogdlg.cpp index 51e6fe96..21913089 100644 --- a/parts/documentation/addcatalogdlg.cpp +++ b/parts/documentation/addcatalogdlg.cpp @@ -29,7 +29,7 @@ #include #include "docutils.h" -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" AddCatalogDlg::AddCatalogDlg( TQValueList const & plugins, TQWidget* parent, const char* name, bool modal, WFlags fl) diff --git a/parts/documentation/bookmarkview.cpp b/parts/documentation/bookmarkview.cpp index 9e6f85df..f626e246 100644 --- a/parts/documentation/bookmarkview.cpp +++ b/parts/documentation/bookmarkview.cpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include "documentation_part.h" #include "documentation_widget.h" @@ -44,7 +44,7 @@ DocBookmarkManager::DocBookmarkManager(DocumentationPart */*part*/) :KBookmarkManager(locateLocal("data", - "tdevdocumentation/bookmarks/bookmarks.xml"), false) + "kdevdocumentation/bookmarks/bookmarks.xml"), false) { setEditorOptions(i18n("Documentation"), false); } diff --git a/parts/documentation/contentsview.cpp b/parts/documentation/contentsview.cpp index ff3c9a31..532feefd 100644 --- a/parts/documentation/contentsview.cpp +++ b/parts/documentation/contentsview.cpp @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include #include "documentation_widget.h" #include "documentation_part.h" diff --git a/parts/documentation/data/CMakeLists.txt b/parts/documentation/data/CMakeLists.txt index 5bb6d766..77d380d4 100644 --- a/parts/documentation/data/CMakeLists.txt +++ b/parts/documentation/data/CMakeLists.txt @@ -11,8 +11,8 @@ install( FILES long.html nomatch.html short.html syntax.html wrapper.html - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/en ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/en ) install( FILES checked.xpm htdig.png star.png star_blank.png unchecked.xpm - DESTINATION ${DATA_INSTALL_DIR}/tdevdocumentation/pics ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdocumentation/pics ) diff --git a/parts/documentation/data/Makefile.am b/parts/documentation/data/Makefile.am index ae52bf11..920c492a 100644 --- a/parts/documentation/data/Makefile.am +++ b/parts/documentation/data/Makefile.am @@ -1,6 +1,6 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) METASOURCES = AUTO -htmldir = $(kde_datadir)/tdevdocumentation/en -picsdir = $(kde_datadir)/tdevdocumentation/pics +htmldir = $(kde_datadir)/kdevdocumentation/en +picsdir = $(kde_datadir)/kdevdocumentation/pics html_DATA = long.html nomatch.html short.html syntax.html wrapper.html pics_DATA = checked.xpm htdig.png star.png star_blank.png unchecked.xpm diff --git a/parts/documentation/data/nomatch.html b/parts/documentation/data/nomatch.html index 5cbd5c49..8951a604 100644 --- a/parts/documentation/data/nomatch.html +++ b/parts/documentation/data/nomatch.html @@ -1,6 +1,6 @@ No match for '$&(LOGICAL_WORDS)' -

+

Search results

No matches were found for '$&(LOGICAL_WORDS)'

@@ -17,5 +17,5 @@ word with "All," try using one or more of the same words with "Any."

-ht://Dig $(VERSION) +ht://Dig $(VERSION) diff --git a/parts/documentation/data/syntax.html b/parts/documentation/data/syntax.html index 21a2ab2a..9701c37f 100644 --- a/parts/documentation/data/syntax.html +++ b/parts/documentation/data/syntax.html @@ -1,6 +1,6 @@ Error in Boolean search for '$&(WORDS)' -

+

Error in Boolean search for '$&(LOGICAL_WORDS)'

Boolean expressions need to be 'correct' in order for the search @@ -14,6 +14,6 @@ $(SYNTAXERROR)
-ht://Dig $(VERSION) +ht://Dig $(VERSION) diff --git a/parts/documentation/data/wrapper.html b/parts/documentation/data/wrapper.html index 187ffd61..20c1bbf2 100644 --- a/parts/documentation/data/wrapper.html +++ b/parts/documentation/data/wrapper.html @@ -1,10 +1,10 @@ Search results for '$&(WORDS)' -

+

Search results for '$&(LOGICAL_WORDS)'

-More *'s indicate a better match. +More *'s indicate a better match.
$(HTSEARCH_RESULTS) @@ -12,5 +12,5 @@ $(PAGEHEADER) $(PREVPAGE) $(PAGELIST) $(NEXTPAGE)
-ht://Dig $(VERSION) +ht://Dig $(VERSION) diff --git a/parts/documentation/docconfiglistview.cpp b/parts/documentation/docconfiglistview.cpp index ba6f30fb..d2753653 100644 --- a/parts/documentation/docconfiglistview.cpp +++ b/parts/documentation/docconfiglistview.cpp @@ -21,7 +21,7 @@ #include -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" DocConfigListView::DocConfigListView(TQWidget *parent, const char *name) :TDEListView(parent, name) diff --git a/parts/documentation/docglobalconfigwidget.cpp b/parts/documentation/docglobalconfigwidget.cpp index 5f66ef4a..cb6c3776 100644 --- a/parts/documentation/docglobalconfigwidget.cpp +++ b/parts/documentation/docglobalconfigwidget.cpp @@ -38,8 +38,8 @@ #include #include -#include "tdevdocumentationplugin.h" -#include "tdevpartcontroller.h" +#include "kdevdocumentationplugin.h" +#include "kdevpartcontroller.h" #include "docconfiglistview.h" #include "documentation_part.h" @@ -67,7 +67,7 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, //read full text search settings config->setGroup("htdig"); TQString databaseDir = kapp->dirs()->saveLocation("data", - "tdevdocumentation/search"); + "kdevdocumentation/search"); databaseDirEdit->setURL(config->readPathEntry("databaseDir", databaseDir)); htdigbinEdit->setURL(config->readPathEntry("htdigbin", kapp->dirs()->findExe("htdig"))); htmergebinEdit->setURL(config->readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge"))); @@ -99,8 +99,8 @@ DocGlobalConfigWidget::DocGlobalConfigWidget(DocumentationPart *part, useAssistant_box->setChecked(m_part->isAssistantUsed()); - // Having app-specific settings isn't pretty, but this setting is nonsensical in tdevassistant - if ( kapp->instanceName().find("tdevassistant") != -1 ) + // Having app-specific settings isn't pretty, but this setting is nonsensical in kdevassistant + if ( kapp->instanceName().find("kdevassistant") != -1 ) useAssistant_box->hide(); //font sizes and zoom levels @@ -182,7 +182,7 @@ void DocGlobalConfigWidget::accept() config->writePathEntry("htsearchbin", DocUtils::envURL(htsearchbinEdit)); //write full text search locations file - TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt"); + TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); TQFile f(ftsLocationsFile); TQStringList locs; if (f.open(IO_ReadWrite | IO_Truncate)) diff --git a/parts/documentation/docprojectconfigwidget.cpp b/parts/documentation/docprojectconfigwidget.cpp index 1d6678d7..a37ad5cb 100644 --- a/parts/documentation/docprojectconfigwidget.cpp +++ b/parts/documentation/docprojectconfigwidget.cpp @@ -27,8 +27,8 @@ #include "domutil.h" #include "urlutil.h" -#include "tdevproject.h" -#include "tdevdocumentationplugin.h" +#include "kdevproject.h" +#include "kdevdocumentationplugin.h" #include "documentation_part.h" #include "documentation_widget.h" @@ -45,7 +45,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget m_plugins[(*it)->pluginName()] = *it; } } - TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docsystem"); + TQString projectDocSystem = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docsystem"); bool hasProjectDoc = false; for (int i = 0; i < docSystemCombo->count(); ++i) @@ -64,7 +64,7 @@ DocProjectConfigWidget::DocProjectConfigWidget(DocumentationPart *part, TQWidget changeDocSystem(docSystemCombo->currentText()); } - manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/usermanualurl")); + manualURL->setURL(DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/usermanualurl")); } void DocProjectConfigWidget::changeDocSystem(const TQString &text) @@ -79,7 +79,7 @@ void DocProjectConfigWidget::changeDocSystem(const TQString &text) catalogURL->setMode(plugin->catalogLocatorProps().first); catalogURL->setFilter(plugin->catalogLocatorProps().second); - TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/tdevdocumentation/projectdoc/docurl"); + TQString projectDocURL = DomUtil::readEntry(*(m_part->projectDom()), "/kdevdocumentation/projectdoc/docurl"); if (!projectDocURL.isEmpty()) projectDocURL = TQDir::cleanDirPath(m_part->project()->projectDirectory() + "/" + projectDocURL); diff --git a/parts/documentation/documentation_part.cpp b/parts/documentation/documentation_part.cpp index 9515fad7..75bb7c13 100644 --- a/parts/documentation/documentation_part.cpp +++ b/parts/documentation/documentation_part.cpp @@ -48,17 +48,17 @@ #include #include -#include "tdevplugininfo.h" -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevgenericfactory.h" -#include "tdevdocumentationplugin.h" +#include "kdevplugininfo.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevgenericfactory.h" +#include "kdevdocumentationplugin.h" #include "configwidgetproxy.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include "domutil.h" #include "urlutil.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include "documentation_widget.h" #include "docglobalconfigwidget.h" @@ -66,22 +66,22 @@ #include "contentsview.h" #include "find_documentation.h" -#include "TDevDocumentationIface.h" +#include "KDevDocumentationIface.h" #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 -static const TDevPluginInfo data("tdevdocumentation"); +static const KDevPluginInfo data("kdevdocumentation"); -typedef TDevGenericFactory DocumentationFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevdocumentation, DocumentationFactory( data ) ) +typedef KDevGenericFactory DocumentationFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevdocumentation, DocumentationFactory( data ) ) DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const TQStringList& ) - :TDevPlugin(&data, parent, name ? name : "DocumentationPart" ), + :KDevPlugin(&data, parent, name ? name : "DocumentationPart" ), m_projectDocumentationPlugin(0), m_userManualPlugin(0), m_hasIndex(false) { setInstance(DocumentationFactory::instance()); - setXMLFile("tdevpart_documentation.rc"); + setXMLFile("kdevpart_documentation.rc"); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Documentation"), GLOBALDOC_OPTIONS, info()->icon() ); @@ -109,7 +109,7 @@ DocumentationPart::DocumentationPart(TQObject *parent, const char *name, const T TQTimer::singleShot(0, this, TQT_SLOT(init())); - new TDevDocumentationIface(this); + new KDevDocumentationIface(this); } DocumentationPart::~DocumentationPart() @@ -250,12 +250,6 @@ void DocumentationPart::setupActions() "all possible sources of documentation like " "table of contents, index, man and info databases, " "Google, etc.")); - action = new TDEAction(i18n("TDevelop Programming Handbook"), 0, - this, TQT_SLOT(programmingHandbook()), - actionCollection(), "help_programming_handbook" ); - action->setToolTip(i18n("Open the TDevelop Programming Handbook")); - action->setWhatsThis(i18n("Open the TDevelop Programming Handbook

Opens Open the TDevelop Programming Handbook.")); - } void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL &url) @@ -265,12 +259,12 @@ void DocumentationPart::emitBookmarkLocation(const TQString &title, const KURL & void DocumentationPart::searchInDocumentation() { - TQString word = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( word.isEmpty() ) { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "searchInDocumentation()" ); + callAssistant ( "KDevDocumentation", "searchInDocumentation()" ); else { mainWindow()->raiseView ( m_widget ); @@ -280,7 +274,7 @@ void DocumentationPart::searchInDocumentation() else { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "searchInDocumentation(TQString)", word ); + callAssistant ( "KDevDocumentation", "searchInDocumentation(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -298,29 +292,24 @@ void DocumentationPart::searchInDocumentation(const TQString &term) void DocumentationPart::contextSearchInDocumentation() { if (isAssistantUsed()) - callAssistant("TDevDocumentation", "searchInDocumentation(TQString)", m_contextStr); + callAssistant("KDevDocumentation", "searchInDocumentation(TQString)", m_contextStr); else searchInDocumentation(m_contextStr); } -void DocumentationPart::programmingHandbook() -{ - kapp->invokeHelp (TQString::null, "tde_app_devel"); -} - void DocumentationPart::manPage() { - TQString word = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( isAssistantUsed() ) { if ( word.isEmpty() ) { - callAssistant ( "TDevDocumentation", "manPage()" ); + callAssistant ( "KDevDocumentation", "manPage()" ); } else { - callAssistant ( "TDevDocumentation", "manPage(TQString)", word ); + callAssistant ( "KDevDocumentation", "manPage(TQString)", word ); } } else @@ -334,17 +323,17 @@ void DocumentationPart::manPage() void DocumentationPart::infoPage() { - TQString word = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( isAssistantUsed() ) { if ( word.isEmpty() ) { - callAssistant ( "TDevDocumentation", "infoPage()" ); + callAssistant ( "KDevDocumentation", "infoPage()" ); } else { - callAssistant ( "TDevDocumentation", "infoPage(TQString)", word ); + callAssistant ( "KDevDocumentation", "infoPage(TQString)", word ); } } else @@ -371,7 +360,7 @@ void DocumentationPart::infoPage(const TQString &term) void DocumentationPart::contextManPage() { if (isAssistantUsed()) - callAssistant("TDevDocumentation", "manPage(TQString)", m_contextStr); + callAssistant("KDevDocumentation", "manPage(TQString)", m_contextStr); else manPage(m_contextStr); } @@ -379,7 +368,7 @@ void DocumentationPart::contextManPage() void DocumentationPart::contextInfoPage() { if (isAssistantUsed()) - callAssistant("TDevDocumentation", "infoPage(TQString)", m_contextStr); + callAssistant("KDevDocumentation", "infoPage(TQString)", m_contextStr); else infoPage(m_contextStr); } @@ -387,19 +376,19 @@ void DocumentationPart::contextInfoPage() void DocumentationPart::contextFindDocumentation() { if (isAssistantUsed()) - callAssistant("TDevDocumentation", "findInFinder(TQString)", m_contextStr); + callAssistant("KDevDocumentation", "findInFinder(TQString)", m_contextStr); else findInDocumentation(m_contextStr); } void DocumentationPart::findInDocumentation() { - TQString word = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( word.isEmpty() ) { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "findInFinder()" ); + callAssistant ( "KDevDocumentation", "findInFinder()" ); else { mainWindow()->raiseView ( m_widget ); @@ -409,7 +398,7 @@ void DocumentationPart::findInDocumentation() else { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "findInFinder(TQString)", word ); + callAssistant ( "KDevDocumentation", "findInFinder(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -426,12 +415,12 @@ void DocumentationPart::findInDocumentation(const TQString &term) void DocumentationPart::lookInDocumentationIndex() { - TQString word = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + TQString word = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); if ( word.isEmpty() ) { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "lookupInIndex()" ); + callAssistant ( "KDevDocumentation", "lookupInIndex()" ); else { mainWindow()->raiseView ( m_widget ); @@ -441,7 +430,7 @@ void DocumentationPart::lookInDocumentationIndex() else { if ( isAssistantUsed() ) - callAssistant ( "TDevDocumentation", "lookupInIndex(TQString)", word ); + callAssistant ( "KDevDocumentation", "lookupInIndex(TQString)", word ); else { mainWindow()->raiseView ( m_widget ); @@ -459,7 +448,7 @@ void DocumentationPart::lookInDocumentationIndex(const TQString &term) void DocumentationPart::contextLookInDocumentationIndex() { if (isAssistantUsed()) - callAssistant("TDevDocumentation", "lookupInIndex(TQString)", m_contextStr); + callAssistant("KDevDocumentation", "lookupInIndex(TQString)", m_contextStr); else lookInDocumentationIndex(m_contextStr); } @@ -575,11 +564,11 @@ void DocumentationPart::setContextFeature(ContextFeature feature, bool b) void DocumentationPart::projectOpened() { - TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem"); - TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl"); + TQString projectDocSystem = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem"); + TQString projectDocURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl"); if (!projectDocURL.isEmpty()) projectDocURL = TQDir::cleanDirPath(project()->projectDirectory() + "/" + projectDocURL); - TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl"); + TQString userManualURL = DomUtil::readEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl"); for (TQValueList::const_iterator it = m_plugins.constBegin(); it != m_plugins.constEnd(); ++it) @@ -613,21 +602,21 @@ void DocumentationPart::saveProjectDocumentationInfo() { if (m_projectDocumentationPlugin) { - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName()); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", m_projectDocumentationPlugin->pluginName()); TQString relPath = URLUtil::extractPathNameRelative(project()->projectDirectory(), m_projectDocumentationPlugin->catalogURL()); - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", relPath); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", relPath); } else { - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docsystem", ""); - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/docurl", ""); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docsystem", ""); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/docurl", ""); } if (m_userManualPlugin) - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL()); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", m_userManualPlugin->catalogURL()); else - DomUtil::writeEntry(*(projectDom()), "/tdevdocumentation/projectdoc/usermanualurl", ""); + DomUtil::writeEntry(*(projectDom()), "/kdevdocumentation/projectdoc/usermanualurl", ""); } TQCString DocumentationPart::startAssistant() @@ -638,7 +627,7 @@ TQCString DocumentationPart::startAssistant() return lastAssistant; const char *function = 0; - TQString app = "tdevassistant"; + TQString app = "kdevassistant"; function = "start_service_by_desktop_name(TQString,TQStringList)"; TQStringList URLs; @@ -676,7 +665,7 @@ TQCString DocumentationPart::startAssistant() kdDebug() << dcopName.data() << endl; //@fixme: is there another way to wait for the remote object to be loaded - while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("TDevDocumentation")) + while (!TDEApplication::dcopClient()->remoteObjects(dcopName).contains("KDevDocumentation")) usleep(500); } } @@ -685,8 +674,8 @@ TQCString DocumentationPart::startAssistant() bool DocumentationPart::isAssistantUsed() const { - // hack to solve BR #90334 - don't call tdevassistant via DCOP if we ARE tdevassistant - if ( kapp->instanceName().find("tdevassistant") != -1 ) + // hack to solve BR #90334 - don't call kdevassistant via DCOP if we ARE kdevassistant + if ( kapp->instanceName().find("kdevassistant") != -1 ) { return false; } @@ -697,7 +686,7 @@ bool DocumentationPart::isAssistantUsed() const void DocumentationPart::setAssistantUsed(bool b) { m_assistantUsed = b; - //use global config to store different settings for tdevassistant and tdevelop + //use global config to store different settings for kdevassistant and tdevelop TDEConfig *config = kapp->config(); config->setGroup("Documentation"); config->writeEntry("UseAssistant", isAssistantUsed()); @@ -750,7 +739,7 @@ void DocumentationPart::loadSettings() config->setGroup("Documentation"); m_assistantUsed = config->readBoolEntry("UseAssistant", false); - if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "tdevassistant") + if (TQString(TDEGlobal::instance()->aboutData()->appName()) == "kdevassistant") { int page = config->readNumEntry("LastPage", 0); switch (page) diff --git a/parts/documentation/documentation_part.h b/parts/documentation/documentation_part.h index aafe1669..722ad4bd 100644 --- a/parts/documentation/documentation_part.h +++ b/parts/documentation/documentation_part.h @@ -17,11 +17,11 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef __TDEVPART_DOCUMENTATION_H__ -#define __TDEVPART_DOCUMENTATION_H__ +#ifndef __KDEVPART_DOCUMENTATION_H__ +#define __KDEVPART_DOCUMENTATION_H__ #include -#include +#include class FindDocumentation; @@ -39,7 +39,7 @@ class TQPopupMenu; /* Please read the README.dox file for more info about this part */ -class DocumentationPart : public TDevPlugin +class DocumentationPart : public KDevPlugin { Q_OBJECT @@ -69,7 +69,6 @@ public slots: void searchInDocumentation(); void searchInDocumentation(const TQString &term); void contextSearchInDocumentation(); - void programmingHandbook(); void manPage(); void manPage(const TQString &term); void contextManPage(); diff --git a/parts/documentation/documentation_widget.cpp b/parts/documentation/documentation_widget.cpp index b69e80a5..b1ab69ca 100644 --- a/parts/documentation/documentation_widget.cpp +++ b/parts/documentation/documentation_widget.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #include "documentation_part.h" #include "contentsview.h" diff --git a/parts/documentation/documentation_widget.h b/parts/documentation/documentation_widget.h index fccd03b9..a813b393 100644 --- a/parts/documentation/documentation_widget.h +++ b/parts/documentation/documentation_widget.h @@ -23,7 +23,7 @@ #include class FindDocumentation; -class TDevProject; +class KDevProject; class DocumentationPart; class ContentsView; class IndexView; diff --git a/parts/documentation/docutils.cpp b/parts/documentation/docutils.cpp index ba00ea83..5360a73f 100644 --- a/parts/documentation/docutils.cpp +++ b/parts/documentation/docutils.cpp @@ -27,9 +27,9 @@ #include #include -#include +#include -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" #include "documentation_part.h" TQString DocUtils::noEnvURL(const TQString &url) diff --git a/parts/documentation/editcatalogdlg.cpp b/parts/documentation/editcatalogdlg.cpp index 2fb81fec..8bdc19d5 100644 --- a/parts/documentation/editcatalogdlg.cpp +++ b/parts/documentation/editcatalogdlg.cpp @@ -26,7 +26,7 @@ #include #include "docutils.h" -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" EditCatalogDlg::EditCatalogDlg(DocumentationPlugin *plugin, TQWidget* parent, const char* name, bool modal, WFlags fl) diff --git a/parts/documentation/find_documentation.cpp b/parts/documentation/find_documentation.cpp index 2f730b81..ebddcd4c 100644 --- a/parts/documentation/find_documentation.cpp +++ b/parts/documentation/find_documentation.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include "documentation_widget.h" #include "documentation_part.h" diff --git a/parts/documentation/indexview.cpp b/parts/documentation/indexview.cpp index 25762451..cae33db5 100644 --- a/parts/documentation/indexview.cpp +++ b/parts/documentation/indexview.cpp @@ -30,8 +30,8 @@ #include #include -#include -#include +#include +#include #include "docutils.h" #include "selecttopic.h" diff --git a/parts/documentation/interfaces/CMakeLists.txt b/parts/documentation/interfaces/CMakeLists.txt index 2e1f0ae3..f4a2ff08 100644 --- a/parts/documentation/interfaces/CMakeLists.txt +++ b/parts/documentation/interfaces/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( ##### headers ################################### install( FILES - tdevdocumentationplugin.h + kdevdocumentationplugin.h DESTINATION ${INCLUDE_INSTALL_DIR}/tdevelop/parts/documentation ) @@ -37,7 +37,7 @@ install( FILES ##### documentation_interfaces (shared) ######### tde_add_library( documentation_interfaces SHARED AUTOMOC - SOURCES tdevdocumentationplugin.cpp + SOURCES kdevdocumentationplugin.cpp VERSION 0.0.0 LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} diff --git a/parts/documentation/interfaces/Makefile.am b/parts/documentation/interfaces/Makefile.am index b0feb598..f128dabc 100644 --- a/parts/documentation/interfaces/Makefile.am +++ b/parts/documentation/interfaces/Makefile.am @@ -5,12 +5,12 @@ partincludedirdir = $(includedir)/tdevelop/parts/documentation lib_LTLIBRARIES = libdocumentation_interfaces.la libdocumentation_interfaces_la_LDFLAGS = $(all_libraries) libdocumentation_interfaces_la_LIBADD = $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) $(LIB_TDEIO) -libdocumentation_interfaces_la_SOURCES = tdevdocumentationplugin.cpp -partincludedir_HEADERS = tdevdocumentationplugin.h +libdocumentation_interfaces_la_SOURCES = kdevdocumentationplugin.cpp +partincludedir_HEADERS = kdevdocumentationplugin.h servicetypedir = $(kde_servicetypesdir) servicetype_DATA = tdevelopdocumentationplugins.desktop -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Documentation Part Interfaces Library -DOXYGEN_DOCDIRPREFIX = tdevdoc +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Documentation Part Interfaces Library +DOXYGEN_DOCDIRPREFIX = kdevdoc include ../../../Doxyfile.am diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.cpp b/parts/documentation/interfaces/kdevdocumentationplugin.cpp similarity index 99% rename from parts/documentation/interfaces/tdevdocumentationplugin.cpp rename to parts/documentation/interfaces/kdevdocumentationplugin.cpp index f3c20841..afc9abad 100644 --- a/parts/documentation/interfaces/tdevdocumentationplugin.cpp +++ b/parts/documentation/interfaces/kdevdocumentationplugin.cpp @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" #include #include @@ -334,7 +334,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item) { kdDebug() << "Creating index cache for " << item->text(0) << endl; - TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->text(0)); + TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->text(0)); TQFile cacheFile(cacheName); if (!cacheFile.open(IO_WriteOnly)) return; @@ -357,7 +357,7 @@ void DocumentationPlugin::cacheIndex(DocumentationCatalogItem *item) bool DocumentationPlugin::loadCachedIndex(IndexBox *index, DocumentationCatalogItem *item) { - TQString cacheName = locateLocal("data", TQString("tdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0)); + TQString cacheName = locateLocal("data", TQString("kdevdocumentation/index/cache_") + item->cacheVersion() + item->text(0)); TQFile cacheFile(cacheName); if (!cacheFile.open(IO_ReadOnly)) return false; @@ -718,4 +718,4 @@ TQString ProjectDocumentationPlugin::catalogURL() const return m_url; } -#include "tdevdocumentationplugin.moc" +#include "kdevdocumentationplugin.moc" diff --git a/parts/documentation/interfaces/tdevdocumentationplugin.h b/parts/documentation/interfaces/kdevdocumentationplugin.h similarity index 99% rename from parts/documentation/interfaces/tdevdocumentationplugin.h rename to parts/documentation/interfaces/kdevdocumentationplugin.h index ed18a86a..a5dbe458 100644 --- a/parts/documentation/interfaces/tdevdocumentationplugin.h +++ b/parts/documentation/interfaces/kdevdocumentationplugin.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef TDEV_DOC_PLUGIN_H -#define TDEV_DOC_PLUGIN_H +#ifndef KDEV_DOC_PLUGIN_H +#define KDEV_DOC_PLUGIN_H #include #include diff --git a/parts/documentation/tdevdocumentation.desktop b/parts/documentation/kdevdocumentation.desktop similarity index 98% rename from parts/documentation/tdevdocumentation.desktop rename to parts/documentation/kdevdocumentation.desktop index 721970e7..674812f4 100644 --- a/parts/documentation/tdevdocumentation.desktop +++ b/parts/documentation/kdevdocumentation.desktop @@ -29,10 +29,10 @@ Comment[sv]=Dokumentationsinsticksprogrammet erbjuder bläddring och sökning i Comment[tr]=Belgelendirme eklentisi, çoklu belgelendirme sistemlerine destek ile, yerel ve çevrimiçi belgelere gözatma ve bu belgelerde arama yapılmasına izin verir. Comment[zh_CN]=文档插件提供了本地和在线文档中提供浏览和搜索功能，支持多种文档系统 Comment[zh_TW]=文件外掛程式提供對本地與線上文件的瀏覽與搜尋功能，並支援多重文件系統。 -Name=TDevDocumentation +Name=KDevDocumentation Name[da]=TDevelop dokumentation Name[nds]=TDevelop-Dokmentatschoon -Name[pt_BR]=TDevDocumentação +Name[pt_BR]=KDevDocumentação Name[sk]=KDev dokumentácia Name[sv]=TDevelop dokumentation Name[ta]=KDev ஆவணமாக்கல் @@ -76,7 +76,7 @@ GenericName[zh_TW]=文件 Icon=khelpcenter ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevdocumentation +X-TDE-Library=libkdevdocumentation X-TDevelop-Version=5 X-TDevelop-Mode=AssistantMode X-TDevelop-Properties=Documentation diff --git a/parts/documentation/tdevpart_documentation.rc b/parts/documentation/kdevpart_documentation.rc similarity index 92% rename from parts/documentation/tdevpart_documentation.rc rename to parts/documentation/kdevpart_documentation.rc index 6fd8b488..f8dac85a 100644 --- a/parts/documentation/tdevpart_documentation.rc +++ b/parts/documentation/kdevpart_documentation.rc @@ -6,7 +6,6 @@

--> - diff --git a/parts/documentation/plugins/CMakeLists.txt b/parts/documentation/plugins/CMakeLists.txt index 116e7674..281c40f8 100644 --- a/parts/documentation/plugins/CMakeLists.txt +++ b/parts/documentation/plugins/CMakeLists.txt @@ -12,6 +12,6 @@ add_subdirectory( qt ) add_subdirectory( doxygen ) add_subdirectory( devhelp ) -add_subdirectory( tdevtoc ) +add_subdirectory( kdevtoc ) add_subdirectory( chm ) add_subdirectory( custom ) diff --git a/parts/documentation/plugins/Makefile.am b/parts/documentation/plugins/Makefile.am index 253a0193..c2002f78 100644 --- a/parts/documentation/plugins/Makefile.am +++ b/parts/documentation/plugins/Makefile.am @@ -1,3 +1,3 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) METASOURCES = AUTO -SUBDIRS = qt doxygen devhelp tdevtoc chm custom +SUBDIRS = qt doxygen devhelp kdevtoc chm custom diff --git a/parts/documentation/plugins/chm/docchmplugin.cpp b/parts/documentation/plugins/chm/docchmplugin.cpp index f3287540..5acecce3 100644 --- a/parts/documentation/plugins/chm/docchmplugin.cpp +++ b/parts/documentation/plugins/chm/docchmplugin.cpp @@ -28,14 +28,14 @@ #include #include #include -#include -#include +#include +#include #include #include "../../../../config.h" -static const TDevPluginInfo data("docchmplugin"); -typedef TDevGenericFactory DocCHMPluginFactory; +static const KDevPluginInfo data("docchmplugin"); +typedef KDevGenericFactory DocCHMPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocchmplugin, DocCHMPluginFactory(data) ) DocCHMPlugin::DocCHMPlugin(TQObject* parent, const char* name, TQStringList // args diff --git a/parts/documentation/plugins/chm/docchmplugin.h b/parts/documentation/plugins/chm/docchmplugin.h index e814248f..452e1c09 100644 --- a/parts/documentation/plugins/chm/docchmplugin.h +++ b/parts/documentation/plugins/chm/docchmplugin.h @@ -20,7 +20,7 @@ #ifndef DOCCHMPLUGIN_H #define DOCCHMPLUGIN_H -#include +#include class DocCHMPlugin :public DocumentationPlugin { diff --git a/parts/documentation/plugins/custom/doccustomplugin.cpp b/parts/documentation/plugins/custom/doccustomplugin.cpp index 55d6c9c6..dd141eba 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.cpp +++ b/parts/documentation/plugins/custom/doccustomplugin.cpp @@ -25,11 +25,11 @@ #include #include -#include -#include +#include +#include -static const TDevPluginInfo data("doccustomplugin"); -typedef TDevGenericFactory DocCustomPluginFactory; +static const KDevPluginInfo data("doccustomplugin"); +typedef KDevGenericFactory DocCustomPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdoccustomplugin, DocCustomPluginFactory(data) ) DocCustomPlugin::DocCustomPlugin(TQObject* parent, const char* name, const TQStringList // args diff --git a/parts/documentation/plugins/custom/doccustomplugin.h b/parts/documentation/plugins/custom/doccustomplugin.h index 315e0864..f83daf1a 100644 --- a/parts/documentation/plugins/custom/doccustomplugin.h +++ b/parts/documentation/plugins/custom/doccustomplugin.h @@ -20,7 +20,7 @@ #ifndef DOCCUSTOMPLUGIN_H #define DOCCUSTOMPLUGIN_H -#include +#include class DocCustomPlugin : public DocumentationPlugin { public: diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp index d644df4f..4f2d50d6 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include "../../../../config.h" @@ -69,8 +69,8 @@ private: }; -static const TDevPluginInfo data("docdevhelpplugin"); -typedef TDevGenericFactory DocDevHelpPluginFactory; +static const KDevPluginInfo data("docdevhelpplugin"); +typedef KDevGenericFactory DocDevHelpPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdevhelpplugin, DocDevHelpPluginFactory(data) ) DocDevHelpPlugin::DocDevHelpPlugin(TQObject* parent, const char* name, diff --git a/parts/documentation/plugins/devhelp/docdevhelpplugin.h b/parts/documentation/plugins/devhelp/docdevhelpplugin.h index 11339098..6436a1d8 100644 --- a/parts/documentation/plugins/devhelp/docdevhelpplugin.h +++ b/parts/documentation/plugins/devhelp/docdevhelpplugin.h @@ -23,7 +23,7 @@ #include #include -#include +#include class DocDevHelpPlugin: public DocumentationPlugin { diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.cpp b/parts/documentation/plugins/djvu/docdjvuplugin.cpp index dafdfa1f..7851a516 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.cpp +++ b/parts/documentation/plugins/djvu/docdjvuplugin.cpp @@ -25,10 +25,10 @@ #include #include -#include +#include static const TDEAboutData data("docdjvuplugin", I18N_NOOP("Djvu documentation plugin"), "1.0"); -typedef TDevGenericFactory DocDjvuPluginFactory; +typedef KDevGenericFactory DocDjvuPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdjvuplugin, DocDjvuPluginFactory(&data) ) DocDjvuPlugin::DocDjvuPlugin(TQObject* parent, const char* name, const TQStringList args) diff --git a/parts/documentation/plugins/djvu/docdjvuplugin.h b/parts/documentation/plugins/djvu/docdjvuplugin.h index 15415c65..6bff409c 100644 --- a/parts/documentation/plugins/djvu/docdjvuplugin.h +++ b/parts/documentation/plugins/djvu/docdjvuplugin.h @@ -20,7 +20,7 @@ #ifndef DOCDJVUPLUGIN_H #define DOCDVJUPLUGIN_H -#include +#include class DocDjvuPlugin : public DocumentationPlugin { public: diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp index e5a7da93..9a5a6912 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.cpp @@ -35,8 +35,8 @@ #include #include -#include -#include +#include +#include #include "../../../../config.h" @@ -60,8 +60,8 @@ private: }; -static const TDevPluginInfo data("docdoxygenplugin"); -typedef TDevGenericFactory DocDoxygenPluginFactory; +static const KDevPluginInfo data("docdoxygenplugin"); +typedef KDevGenericFactory DocDoxygenPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocdoxygenplugin, DocDoxygenPluginFactory(data) ) DocDoxygenPlugin::DocDoxygenPlugin(TQObject* parent, const char* name, const TQStringList) diff --git a/parts/documentation/plugins/doxygen/docdoxygenplugin.h b/parts/documentation/plugins/doxygen/docdoxygenplugin.h index 8382f98e..ebd4a540 100644 --- a/parts/documentation/plugins/doxygen/docdoxygenplugin.h +++ b/parts/documentation/plugins/doxygen/docdoxygenplugin.h @@ -20,7 +20,7 @@ #ifndef DOCDOXYGENPLUGIN_H #define DOCDOXYGENPLUGIN_H -#include +#include class TQDomDocument; class TQDomElement; diff --git a/parts/documentation/plugins/tdevtoc/CMakeLists.txt b/parts/documentation/plugins/kdevtoc/CMakeLists.txt similarity index 79% rename from parts/documentation/plugins/tdevtoc/CMakeLists.txt rename to parts/documentation/plugins/kdevtoc/CMakeLists.txt index f3d1efc2..c12c26e3 100644 --- a/parts/documentation/plugins/tdevtoc/CMakeLists.txt +++ b/parts/documentation/plugins/kdevtoc/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES doctdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES dockdevtocplugin.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libdoctdevtocplugin (module) ############## +##### libdockdevtocplugin (module) ############## -tde_add_kpart( libdoctdevtocplugin AUTOMOC - SOURCES doctdevtocplugin.cpp +tde_add_kpart( libdockdevtocplugin AUTOMOC + SOURCES dockdevtocplugin.cpp LINK documentation_interfaces-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/documentation/plugins/kdevtoc/Makefile.am b/parts/documentation/plugins/kdevtoc/Makefile.am new file mode 100644 index 00000000..22dab380 --- /dev/null +++ b/parts/documentation/plugins/kdevtoc/Makefile.am @@ -0,0 +1,10 @@ +INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ + -I$(top_srcdir)/parts/documentation/interfaces $(all_includes) +METASOURCES = AUTO +kde_module_LTLIBRARIES = libdockdevtocplugin.la +libdockdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) +kde_services_DATA = dockdevtocplugin.desktop +noinst_HEADERS = dockdevtocplugin.h +libdockdevtocplugin_la_SOURCES = dockdevtocplugin.cpp +libdockdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp similarity index 85% rename from parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp rename to parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp index aa603fbd..fa17549b 100644 --- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.cpp +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "doctdevtocplugin.h" +#include "dockdevtocplugin.h" #include @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include "../../../../config.h" @@ -59,38 +59,38 @@ private: }; -static const TDevPluginInfo data("doctdevtocplugin"); -typedef TDevGenericFactory DocTDevTOCPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libdoctdevtocplugin, DocTDevTOCPluginFactory(data) ) +static const KDevPluginInfo data("dockdevtocplugin"); +typedef KDevGenericFactory DocKDevTOCPluginFactory; +K_EXPORT_COMPONENT_FACTORY( libdockdevtocplugin, DocKDevTOCPluginFactory(data) ) -DocTDevTOCPlugin::DocTDevTOCPlugin(TQObject* parent, const char* name, +DocKDevTOCPlugin::DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList /*args*/) - :DocumentationPlugin(DocTDevTOCPluginFactory::instance()->config(), parent, name) + :DocumentationPlugin(DocKDevTOCPluginFactory::instance()->config(), parent, name) { setCapabilities(Index); autoSetup(); } -DocTDevTOCPlugin::~DocTDevTOCPlugin() +DocKDevTOCPlugin::~DocKDevTOCPlugin() { } -TQString DocTDevTOCPlugin::pluginName() const +TQString DocKDevTOCPlugin::pluginName() const { return i18n("TDevelopTOC Documentation Collection"); } -DocumentationCatalogItem* DocTDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) +DocumentationCatalogItem* DocKDevTOCPlugin::createCatalog(TDEListView* contents, const TQString& title, const TQString& url) { return new TOCDocumentationCatalogItem(url, this, contents, title); } -TQPair DocTDevTOCPlugin::catalogLocatorProps() +TQPair DocKDevTOCPlugin::catalogLocatorProps() { return TQPair(KFile::File, "*.toc"); } -TQString DocTDevTOCPlugin::catalogTitle(const TQString& url) +TQString DocKDevTOCPlugin::catalogTitle(const TQString& url) { TQFileInfo fi(url); if (!fi.exists()) @@ -111,19 +111,19 @@ TQString DocTDevTOCPlugin::catalogTitle(const TQString& url) } -TQStringList DocTDevTOCPlugin::fullTextSearchLocations() +TQStringList DocKDevTOCPlugin::fullTextSearchLocations() { return TQStringList(); } -bool DocTDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/) +bool DocKDevTOCPlugin::needRefreshIndex(DocumentationCatalogItem* /*item*/) { return false; } -void DocTDevTOCPlugin::autoSetupPlugin() +void DocKDevTOCPlugin::autoSetupPlugin() { - TQStringList tocsDir = DocTDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "tdevdocumentation/tocs/*.toc"); + TQStringList tocsDir = DocKDevTOCPluginFactory::instance()->dirs()->findAllResources("data", "kdevdocumentation/tocs/*.toc"); for (TQStringList::const_iterator it = tocsDir.begin(); it != tocsDir.end(); ++it) { @@ -132,7 +132,7 @@ void DocTDevTOCPlugin::autoSetupPlugin() } } -void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item) +void DocKDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* item) { TOCDocumentationCatalogItem *tocItem = dynamic_cast(item); if (!tocItem) @@ -177,7 +177,7 @@ void DocTDevTOCPlugin::createIndex(IndexBox* index, DocumentationCatalogItem* it } } -void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item) +void DocKDevTOCPlugin::createTOC(DocumentationCatalogItem* item) { TOCDocumentationCatalogItem *tocItem = dynamic_cast(item); if (!tocItem) @@ -210,7 +210,7 @@ void DocTDevTOCPlugin::createTOC(DocumentationCatalogItem* item) addTocSect(tocItem, childEl, base, 1); } -void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) +void DocKDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childEl, const TQString &base, uint level) { while (!childEl.isNull()) { @@ -229,7 +229,7 @@ void DocTDevTOCPlugin::addTocSect(DocumentationItem *parent, TQDomElement childE } } -void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) +void DocKDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) { TOCDocumentationCatalogItem *tocItem = dynamic_cast(item); if (!tocItem) @@ -264,7 +264,7 @@ void DocTDevTOCPlugin::setCatalogURL(DocumentationCatalogItem* item) } } -TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &url) +TQString DocKDevTOCPlugin::constructURL(const TQString &base, const TQString &url) { if (base.isEmpty() && !url.isEmpty()) return url; @@ -274,4 +274,4 @@ TQString DocTDevTOCPlugin::constructURL(const TQString &base, const TQString &ur return base; } -#include "doctdevtocplugin.moc" +#include "dockdevtocplugin.moc" diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop similarity index 94% rename from parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop rename to parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop index 5f89e8d7..1cae3582 100644 --- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.desktop +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.desktop @@ -1,10 +1,10 @@ [Desktop Entry] Type=Service -Name=DocTDevTOCPlugin -Name[da]=DocTDevTOC-plugin -Name[sk]=Doc TDevTOC modul +Name=DocKDevTOCPlugin +Name[da]=DocKDevTOC-plugin +Name[sk]=Doc KDevTOC modul Name[sv]=TDevelop innehållsförteckning-dokumentationsinsticksmodul -Name[ta]=DocTDevTOC சொருகு +Name[ta]=DocKDevTOC சொருகு Name[zh_TW]=TDevelop 目錄文件外掛程式 Exec=blubb Comment=Documentation plugin for TDevelopTOC documentation @@ -40,4 +40,4 @@ Comment[zh_CN]=TDevelopTOC 文档的文档插件 Comment[zh_TW]=TDevelop 目錄文件外掛程式 ServiceTypes=TDevelop/DocumentationPlugins X-TDevelop-Version=5 -X-TDE-Library=libdoctdevtocplugin +X-TDE-Library=libdockdevtocplugin diff --git a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h similarity index 91% rename from parts/documentation/plugins/tdevtoc/doctdevtocplugin.h rename to parts/documentation/plugins/kdevtoc/dockdevtocplugin.h index 266efb94..7205cc4c 100644 --- a/parts/documentation/plugins/tdevtoc/doctdevtocplugin.h +++ b/parts/documentation/plugins/kdevtoc/dockdevtocplugin.h @@ -17,20 +17,20 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef DOCTDEVTOCPLUGIN_H -#define DOCTDEVTOCPLUGIN_H +#ifndef DOCKDEVTOCPLUGIN_H +#define DOCKDEVTOCPLUGIN_H #include -#include +#include -class DocTDevTOCPlugin : public DocumentationPlugin +class DocKDevTOCPlugin : public DocumentationPlugin { Q_OBJECT public: - DocTDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); - ~DocTDevTOCPlugin(); + DocKDevTOCPlugin(TQObject* parent, const char* name, const TQStringList args = TQStringList()); + ~DocKDevTOCPlugin(); virtual TQString pluginName() const; diff --git a/parts/documentation/plugins/pdb/docpdbplugin.cpp b/parts/documentation/plugins/pdb/docpdbplugin.cpp index b0ebd29d..fc647d34 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.cpp +++ b/parts/documentation/plugins/pdb/docpdbplugin.cpp @@ -25,10 +25,10 @@ #include #include -#include +#include static const TDEAboutData data("docpdbplugin", I18N_NOOP("PalmDoc documentation plugin"), "1.0"); -typedef TDevGenericFactory DocPDBPluginFactory; +typedef KDevGenericFactory DocPDBPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdbplugin, DocPDBPluginFactory(&data) ) DocPDBPlugin::DocPDBPlugin(TQObject* parent, const char* name, const TQStringList args) diff --git a/parts/documentation/plugins/pdb/docpdbplugin.h b/parts/documentation/plugins/pdb/docpdbplugin.h index d1319012..40dd3a15 100644 --- a/parts/documentation/plugins/pdb/docpdbplugin.h +++ b/parts/documentation/plugins/pdb/docpdbplugin.h @@ -20,7 +20,7 @@ #ifndef DOCPDBPLUGIN_H #define DOCPDBPLUGIN_H -#include +#include class DocPDBPlugin : public DocumentationPlugin { public: diff --git a/parts/documentation/plugins/pdf/docpdfplugin.cpp b/parts/documentation/plugins/pdf/docpdfplugin.cpp index 322a33d3..65bddd1b 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.cpp +++ b/parts/documentation/plugins/pdf/docpdfplugin.cpp @@ -25,10 +25,10 @@ #include #include -#include +#include static const TDEAboutData data("docpdfplugin", I18N_NOOP("PDF documentation plugin"), "1.0"); -typedef TDevGenericFactory DocPDFPluginFactory; +typedef KDevGenericFactory DocPDFPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocpdfplugin, DocPDFPluginFactory(&data) ) DocPDFPlugin::DocPDFPlugin(TQObject* parent, const char* name, const TQStringList args) diff --git a/parts/documentation/plugins/pdf/docpdfplugin.h b/parts/documentation/plugins/pdf/docpdfplugin.h index a5410196..d5ecc7eb 100644 --- a/parts/documentation/plugins/pdf/docpdfplugin.h +++ b/parts/documentation/plugins/pdf/docpdfplugin.h @@ -20,7 +20,7 @@ #ifndef DOCPDFPLUGIN_H #define DOCPDFPLUGIN_H -#include +#include class DocPDFPlugin : public DocumentationPlugin { public: diff --git a/parts/documentation/plugins/qt/docqtplugin.cpp b/parts/documentation/plugins/qt/docqtplugin.cpp index 301859ca..10271524 100644 --- a/parts/documentation/plugins/qt/docqtplugin.cpp +++ b/parts/documentation/plugins/qt/docqtplugin.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include "../../../../config.h" @@ -56,8 +56,8 @@ private: TQString m_dcfFile; }; -static const TDevPluginInfo data("docqtplugin"); -typedef TDevGenericFactory DocQtPluginFactory; +static const KDevPluginInfo data("docqtplugin"); +typedef KDevGenericFactory DocQtPluginFactory; K_EXPORT_COMPONENT_FACTORY( libdocqtplugin, DocQtPluginFactory(data) ) DocQtPlugin::DocQtPlugin(TQObject* parent, const char* name, const TQStringList) diff --git a/parts/documentation/plugins/qt/docqtplugin.h b/parts/documentation/plugins/qt/docqtplugin.h index 964ef844..8eac8456 100644 --- a/parts/documentation/plugins/qt/docqtplugin.h +++ b/parts/documentation/plugins/qt/docqtplugin.h @@ -20,7 +20,7 @@ #ifndef DOCTQTPLUGIN_H #define DOCTQTPLUGIN_H -#include +#include #include class TDEConfig; diff --git a/parts/documentation/plugins/tdevtoc/Makefile.am b/parts/documentation/plugins/tdevtoc/Makefile.am deleted file mode 100644 index 4baaaa86..00000000 --- a/parts/documentation/plugins/tdevtoc/Makefile.am +++ /dev/null @@ -1,10 +0,0 @@ -INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ - -I$(top_srcdir)/parts/documentation/interfaces $(all_includes) -METASOURCES = AUTO -kde_module_LTLIBRARIES = libdoctdevtocplugin.la -libdoctdevtocplugin_la_LDFLAGS = -module -avoid-version -no-undefined $(all_libraries) -kde_services_DATA = doctdevtocplugin.desktop -noinst_HEADERS = doctdevtocplugin.h -libdoctdevtocplugin_la_SOURCES = doctdevtocplugin.cpp -libdoctdevtocplugin_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/parts/documentation/interfaces/libdocumentation_interfaces.la diff --git a/parts/documentation/protocols/chm/CMakeLists.txt b/parts/documentation/protocols/chm/CMakeLists.txt index 8d97053e..c444c226 100644 --- a/parts/documentation/protocols/chm/CMakeLists.txt +++ b/parts/documentation/protocols/chm/CMakeLists.txt @@ -43,6 +43,6 @@ tde_add_kpart( tdeio_chm tde_add_kpart( libkchmpart AUTOMOC SOURCES kchmpart.cpp - LINK tdevwidgets-shared + LINK kdevwidgets-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/documentation/protocols/chm/Makefile.am b/parts/documentation/protocols/chm/Makefile.am index de7e0929..5a1092a2 100644 --- a/parts/documentation/protocols/chm/Makefile.am +++ b/parts/documentation/protocols/chm/Makefile.am @@ -9,7 +9,7 @@ tdeio_chm_la_LIBADD = $(LIB_TDEIO) tdeio_chm_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) libkchmpart_la_SOURCES = kchmpart.cpp -libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libtdevwidgets.la +libkchmpart_la_LIBADD = -ltdehtml $(LIB_TDEPARTS) $(top_builddir)/lib/widgets/libkdevwidgets.la libkchmpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) noinst_HEADERS = chm.h chmfile.h decompress.h kchmpart.h diff --git a/parts/documentation/protocols/chm/kchmpart.cpp b/parts/documentation/protocols/chm/kchmpart.cpp index ab688ff7..952228c4 100644 --- a/parts/documentation/protocols/chm/kchmpart.cpp +++ b/parts/documentation/protocols/chm/kchmpart.cpp @@ -67,7 +67,7 @@ TDEInstance* KChmPartFactory::instance() KChmPart::KChmPart( TQWidget * parent, const char * name ) - : TDevHTMLPart( ), m_job(0) + : KDevHTMLPart( ), m_job(0) { TDEInstance * instance = new TDEInstance( "kchmpart" ); setInstance( instance ); @@ -80,7 +80,7 @@ bool KChmPart::openURL( const KURL &url ) KURL chmURL = url; chmURL.setProtocol("ms-its"); chmURL.addPath("/"); - return TDevHTMLPart::openURL(chmURL); + return KDevHTMLPart::openURL(chmURL); } void KChmPart::slotDuplicate() diff --git a/parts/documentation/protocols/chm/kchmpart.h b/parts/documentation/protocols/chm/kchmpart.h index a3c8d9ec..9d1812b1 100644 --- a/parts/documentation/protocols/chm/kchmpart.h +++ b/parts/documentation/protocols/chm/kchmpart.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include @@ -52,7 +52,7 @@ class KChmPartFactory: public KParts::Factory }; -class KChmPart : public TDevHTMLPart +class KChmPart : public KDevHTMLPart { Q_OBJECT diff --git a/parts/documentation/searchview.cpp b/parts/documentation/searchview.cpp index 2893d574..67dca0ed 100644 --- a/parts/documentation/searchview.cpp +++ b/parts/documentation/searchview.cpp @@ -43,8 +43,8 @@ #include #include -#include -#include +#include +#include #include "documentation_part.h" #include "docutils.h" @@ -160,7 +160,7 @@ void SearchView::search() return; } - TQString indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search"); + TQString indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; if (indexdir.isEmpty() || !TQFile::exists(indexdir + "/htdig.conf")) { @@ -177,7 +177,7 @@ void SearchView::search() } } - TQString savedir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search"); + TQString savedir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); if (!d.exists(savedir)) d.mkdir(savedir); @@ -191,7 +191,7 @@ void SearchView::search() kdDebug(9002) << "starting kprocess" << endl; kdDebug(9002) << "htdig line:" << exe << " -c " << (indexdir + "/htdig.conf ") << query << endl; TDEProcess *proc = new TDEProcess; - TQString picdir = kapp->dirs()->findResourceDir("data", "tdevdocumentation/pics/htdig.png"); + TQString picdir = kapp->dirs()->findResourceDir("data", "kdevdocumentation/pics/htdig.png"); proc->setEnvironment("PICDIR", picdir); *proc << exe << "-c" << (indexdir + "/htdig.conf") << query; diff --git a/parts/documentation/selecttopic.h b/parts/documentation/selecttopic.h index e7e850bf..6ca5ad8b 100644 --- a/parts/documentation/selecttopic.h +++ b/parts/documentation/selecttopic.h @@ -22,7 +22,7 @@ #include "selecttopicbase.h" -#include "tdevdocumentationplugin.h" +#include "kdevdocumentationplugin.h" class SelectTopic: public SelectTopicBase{ Q_OBJECT diff --git a/parts/documentation/tools/htdig/htdigindex.cpp b/parts/documentation/tools/htdig/htdigindex.cpp index d422826c..c99c4a2c 100644 --- a/parts/documentation/tools/htdig/htdigindex.cpp +++ b/parts/documentation/tools/htdig/htdigindex.cpp @@ -45,10 +45,10 @@ ProgressDialog::ProgressDialog(bool index, TQWidget *parent, const char *name) { proc = 0; - indexdir = kapp->dirs()->saveLocation("data", "tdevdocumentation/search"); + indexdir = kapp->dirs()->saveLocation("data", "kdevdocumentation/search"); TQDir d; d.mkdir(indexdir); - TDEConfig config("tdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); databaseDir = config.readPathEntry("databaseDir", indexdir); @@ -137,8 +137,8 @@ void ProgressDialog::setFilesDigged(int n) void ProgressDialog::setState(int n) { - TQPixmap unchecked = TQPixmap(locate("data", "tdevdocumentation/pics/unchecked.xpm")); - TQPixmap checked = TQPixmap(locate("data", "tdevdocumentation/pics/checked.xpm")); + TQPixmap unchecked = TQPixmap(locate("data", "kdevdocumentation/pics/unchecked.xpm")); + TQPixmap checked = TQPixmap(locate("data", "kdevdocumentation/pics/checked.xpm")); check1->setPixmap( n > 0 ? checked : unchecked); check2->setPixmap( n > 1 ? checked : unchecked); @@ -182,7 +182,7 @@ void ProgressDialog::addDir(const TQString &dir) void ProgressDialog::scanDirectories() { - TQString ftsLocationsFile = locateLocal("data", "tdevdocumentation/search/locations.txt"); + TQString ftsLocationsFile = locateLocal("data", "kdevdocumentation/search/locations.txt"); TQFile f(ftsLocationsFile); if (!f.open(IO_ReadOnly)) @@ -214,15 +214,15 @@ bool ProgressDialog::createConfig() if (language == "C") language = "en"; - TQString wrapper = locate("data", TQString("tdevdocumentation/%1/wrapper.html").arg(language)); + TQString wrapper = locate("data", TQString("kdevdocumentation/%1/wrapper.html").arg(language)); if (wrapper.isEmpty()) - wrapper = locate("data", TQString("tdevdocumentation/en/wrapper.html")); + wrapper = locate("data", TQString("kdevdocumentation/en/wrapper.html")); if (wrapper.isEmpty()) return false; wrapper = wrapper.left(wrapper.length()-12); // locate the image dir - TQString images = locate("data", "tdevdocumentation/pics/star.png"); + TQString images = locate("data", "kdevdocumentation/pics/star.png"); if (images.isEmpty()) return false; images = images.left(images.length()-8); @@ -300,7 +300,7 @@ bool ProgressDialog::generateIndex() setState(1); procdone = false; // run htdig - TDEConfig config("tdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); exe = config.readPathEntry("htdigbin", kapp->dirs()->findExe("htdig")); if (exe.isEmpty()) @@ -365,7 +365,7 @@ void ProgressDialog::htdigExited(TDEProcess *proc) setFilesDigged(filesToDig); setState(2); - TDEConfig config("tdevdocumentation", true); + TDEConfig config("kdevdocumentation", true); config.setGroup("htdig"); // run htmerge ----------------------------------------------------- exe = config.readPathEntry("htmergebin", kapp->dirs()->findExe("htmerge")); diff --git a/parts/doxygen/CMakeLists.txt b/parts/doxygen/CMakeLists.txt index ed4bfeb9..00a18675 100644 --- a/parts/doxygen/CMakeLists.txt +++ b/parts/doxygen/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ -install( FILES tdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevdoxygen ) +install( FILES kdevdoxygen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevdoxygen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevdoxygen ) -##### libtdevdoxygen (module) ################### +##### libkdevdoxygen (module) ################### -tde_add_kpart( libtdevdoxygen AUTOMOC +tde_add_kpart( libkdevdoxygen AUTOMOC SOURCES doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp diff --git a/parts/doxygen/Makefile.am b/parts/doxygen/Makefile.am index e01fa6eb..703760cb 100644 --- a/parts/doxygen/Makefile.am +++ b/parts/doxygen/Makefile.am @@ -4,16 +4,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/src -DDOXYWIZARD \ $(all_includes) -kde_module_LTLIBRARIES = libtdevdoxygen.la -libtdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevdoxygen.la +libkdevdoxygen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevdoxygen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp +libkdevdoxygen_la_SOURCES = doxygenpart.cpp doxygenconfigwidget.cpp input.cpp config.cpp version.cpp messages.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevdoxygen.desktop +service_DATA = kdevdoxygen.desktop -rcdir = $(kde_datadir)/tdevdoxygen -rc_DATA = tdevdoxygen.rc +rcdir = $(kde_datadir)/kdevdoxygen +rc_DATA = kdevdoxygen.rc diff --git a/parts/doxygen/doxygenpart.cpp b/parts/doxygen/doxygenpart.cpp index 960eef41..d965d98b 100644 --- a/parts/doxygen/doxygenpart.cpp +++ b/parts/doxygen/doxygenpart.cpp @@ -15,19 +15,19 @@ #include "doxygenconfigwidget.h" #include "configwidgetproxy.h" #include "config.h" -#include "tdevappfrontend.h" +#include "kdevappfrontend.h" -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include #include #include -#include +#include #include #include #include @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include @@ -47,15 +47,15 @@ #define PROJECTOPTIONS 1 -typedef TDevGenericFactory DoxygenFactory; -static const TDevPluginInfo data("tdevdoxygen"); -K_EXPORT_COMPONENT_FACTORY( libtdevdoxygen, DoxygenFactory( data ) ) +typedef KDevGenericFactory DoxygenFactory; +static const KDevPluginInfo data("kdevdoxygen"); +K_EXPORT_COMPONENT_FACTORY( libkdevdoxygen, DoxygenFactory( data ) ) DoxygenPart::DoxygenPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) + : KDevPlugin(&data, parent, name ? name : "DoxygenPart"), m_activeEditor(0), m_cursor(0) { setInstance(DoxygenFactory::instance()); - setXMLFile("tdevdoxygen.rc"); + setXMLFile("kdevdoxygen.rc"); TDEAction *action; action = new TDEAction( i18n("Build API Documentation"), 0, @@ -272,7 +272,7 @@ void DoxygenPart::slotDoxygen() kdDebug(9026) << "Doxygen command line: " << cmdline << endl; - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, cmdline); } @@ -340,7 +340,7 @@ void DoxygenPart::slotDoxClean() if (could_be_dirty) { kdDebug(9026) << "Cleaning Doxygen generated API documentation using: " << cmdline << endl; - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(KShellProcess::quote(project()->projectDirectory()), cmdline); } else @@ -350,7 +350,7 @@ void DoxygenPart::slotDoxClean() void DoxygenPart::slotPreviewProcessExited( ) { - TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend"); + KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend"); if ( appFrontend != 0 ) disconnect(appFrontend, 0, this, 0); partController()->showDocument(KURL(m_tmpDir.name()+"html/index.html")); @@ -361,7 +361,7 @@ void DoxygenPart::slotRunPreview( ) if (m_file.isNull()) return; - TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend"); + KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend"); if ( appFrontend == 0 ) return; diff --git a/parts/doxygen/doxygenpart.h b/parts/doxygen/doxygenpart.h index 77bafe46..aaa438de 100644 --- a/parts/doxygen/doxygenpart.h +++ b/parts/doxygen/doxygenpart.h @@ -20,7 +20,7 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" class DoxygenDialog; class TQPopupMenu; @@ -37,7 +37,7 @@ namespace KTextEditor{ class EditInterface; } -class DoxygenPart : public TDevPlugin +class DoxygenPart : public KDevPlugin { Q_OBJECT diff --git a/parts/doxygen/tdevdoxygen.desktop b/parts/doxygen/kdevdoxygen.desktop similarity index 99% rename from parts/doxygen/tdevdoxygen.desktop rename to parts/doxygen/kdevdoxygen.desktop index a69635ab..7d50f15b 100644 --- a/parts/doxygen/tdevdoxygen.desktop +++ b/parts/doxygen/kdevdoxygen.desktop @@ -75,7 +75,7 @@ GenericName[zh_CN]=Doxygen 支持 GenericName[zh_TW]=Doxygen 支援 ServiceTypes=TDevelop/Plugin Icon=tdevelop -X-TDE-Library=libtdevdoxygen +X-TDE-Library=libkdevdoxygen X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=CProjectDocumentation,CPPProjectDocumentation,JavaProjectDocumentation,PHPProjectDocumentation diff --git a/parts/doxygen/tdevdoxygen.rc b/parts/doxygen/kdevdoxygen.rc similarity index 100% rename from parts/doxygen/tdevdoxygen.rc rename to parts/doxygen/kdevdoxygen.rc diff --git a/parts/filecreate/CMakeLists.txt b/parts/filecreate/CMakeLists.txt index 5655e7b9..a562f8e1 100644 --- a/parts/filecreate/CMakeLists.txt +++ b/parts/filecreate/CMakeLists.txt @@ -31,13 +31,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate ) +install( FILES kdevfilecreate.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_filecreate.rc template-info.xml DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate ) -##### libtdevfilecreate (module) ################ +##### libkdevfilecreate (module) ################ -tde_add_kpart( libtdevfilecreate AUTOMOC +tde_add_kpart( libkdevfilecreate AUTOMOC SOURCES filecreate_part.cpp filecreate_listitem.cpp filecreate_filetype.cpp filecreate_filedialog.cpp diff --git a/parts/filecreate/Makefile.am b/parts/filecreate/Makefile.am index ca0f1790..efe204d9 100644 --- a/parts/filecreate/Makefile.am +++ b/parts/filecreate/Makefile.am @@ -5,11 +5,11 @@ SUBDIRS = file-templates INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfilecreate.la -libtdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfilecreate.la +libkdevfilecreate_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfilecreate_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \ +libkdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \ filecreate_filetype.cpp filecreate_filedialog.cpp fcconfigwidgetbase.ui fcconfigwidget.cpp \ fctypeeditbase.ui fctypeedit.cpp fctemplateeditbase.ui fctemplateedit.cpp \ filecreate_newfile.cpp @@ -17,7 +17,7 @@ libtdevfilecreate_la_SOURCES = filecreate_part.cpp filecreate_listitem.cpp \ METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfilecreate.desktop +service_DATA = kdevfilecreate.desktop -rcdir = $(kde_datadir)/tdevfilecreate -rc_DATA = tdevpart_filecreate.rc template-info.xml +rcdir = $(kde_datadir)/kdevfilecreate +rc_DATA = kdevpart_filecreate.rc template-info.xml diff --git a/parts/filecreate/README.dox b/parts/filecreate/README.dox index fc0fbc76..34a7882d 100644 --- a/parts/filecreate/README.dox +++ b/parts/filecreate/README.dox @@ -20,7 +20,7 @@ Example XML: \verbatim - + @@ -28,7 +28,7 @@ Example XML: - + \endverbatim @@ -36,14 +36,14 @@ You can also use global template definitions supplied with the FileCreate part: \verbatim - + - + \endverbatim diff --git a/parts/filecreate/fcconfigwidget.cpp b/parts/filecreate/fcconfigwidget.cpp index 14066c11..7c6fabc4 100644 --- a/parts/filecreate/fcconfigwidget.cpp +++ b/parts/filecreate/fcconfigwidget.cpp @@ -35,8 +35,8 @@ #include "fcconfigwidget.h" #include "filecreate_part.h" #include "filecreate_filetype.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" FCConfigWidget::FCConfigWidget(FileCreatePart * part, bool global, TQWidget *parent, const char *name): @@ -90,7 +90,7 @@ void FCConfigWidget::accept() void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) { - TQString globalXMLFile = ::locate("data", "tdevfilecreate/template-info.xml"); + TQString globalXMLFile = ::locate("data", "kdevfilecreate/template-info.xml"); TQDomDocument globalDom; if (!globalXMLFile.isNull() && DomUtil::openDOMFile(globalDom,globalXMLFile)) { @@ -103,7 +103,7 @@ void FCConfigWidget::loadGlobalConfig(TQListView *view, bool checkmarks) if (checkmarks) { TQDomElement useGlobalTypes = - DomUtil::elementByPath(*(m_part->projectDom()),"/tdevfilecreate/useglobaltypes"); + DomUtil::elementByPath(*(m_part->projectDom()),"/kdevfilecreate/useglobaltypes"); for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) { if (node.isElement() && node.nodeName()=="type") @@ -171,14 +171,14 @@ void FCConfigWidget::saveGlobalConfig() TQDomDocument globalDom; TQDomElement element = globalDom.createElement("tdevelop" ); globalDom.appendChild(element); - TQDomElement apPart = globalDom.createElement("tdevfilecreate"); + TQDomElement apPart = globalDom.createElement("kdevfilecreate"); element.appendChild(apPart); TQDomElement fileTypes = globalDom.createElement( "filetypes" ); apPart.appendChild( fileTypes ); saveConfiguration(globalDom, fileTypes, true); - TQFile config( TDEGlobal::dirs()->saveLocation("data", "tdevfilecreate/", true) + "template-info.xml" ); + TQFile config( TDEGlobal::dirs()->saveLocation("data", "kdevfilecreate/", true) + "template-info.xml" ); config.open(IO_WriteOnly | IO_Truncate); TQTextStream stream(&config); stream << ""; @@ -190,10 +190,10 @@ void FCConfigWidget::saveProjectConfig() { TQDomDocument dom = *m_part->projectDom( ); TQDomElement element = dom.documentElement( ); - TQDomElement apPart = element.namedItem( "tdevfilecreate" ).toElement( ); + TQDomElement apPart = element.namedItem( "kdevfilecreate" ).toElement( ); if( apPart.isNull( ) ) { - apPart = dom.createElement( "tdevfilecreate" ); + apPart = dom.createElement( "kdevfilecreate" ); element.appendChild( apPart ); } @@ -291,7 +291,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element { TQString dest; if (global) - dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true); + dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); else dest = m_part->project()->projectDirectory() + "/templates/"; if (it.current()->text(4) == "create") @@ -318,7 +318,7 @@ void FCConfigWidget::saveConfiguration(TQDomDocument &dom, TQDomElement &element { TQString dest; if (global) - dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true); + dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); else dest = m_part->project()->projectDirectory() + "/templates/"; if (lastChild->text(4) == "create") @@ -440,7 +440,7 @@ void FCConfigWidget::copyToProject_button_clicked() it->parent()->text(1), it->parent()->text(2), it->parent()->text(3), - locate("data", "tdevfilecreate/file-templates/"+ it->parent()->text(0))); + locate("data", "kdevfilecreate/file-templates/"+ it->parent()->text(0))); destParent += it->parent()->text(0) + "-"; TQCheckListItem *chk = dynamic_cast(it->parent()); if (chk) @@ -452,13 +452,13 @@ void FCConfigWidget::copyToProject_button_clicked() it->text(1), it->text(2), it->text(3), - locate("data", "tdevfilecreate/file-templates/"+destParent + it->text(0))); + locate("data", "kdevfilecreate/file-templates/"+destParent + it->text(0))); else it_copy = new TQListViewItem(fc_view, it->text(0), it->text(1), it->text(2), it->text(3), - locate("data", "tdevfilecreate/file-templates/" +destParent+ it->text(0))); + locate("data", "kdevfilecreate/file-templates/" +destParent+ it->text(0))); TQCheckListItem *chk = dynamic_cast(it); if (chk) chk->setOn(false); @@ -470,7 +470,7 @@ void FCConfigWidget::copyToProject_button_clicked() it_child->text(1), it_child->text(2), it_child->text(3), - locate("data", "tdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0))); + locate("data", "kdevfilecreate/file-templates/"+ it_copy->text(0) + "-" + it_child->text(0))); TQCheckListItem *chk_child = dynamic_cast(it_child); if (chk_child) chk_child->setOn(false); @@ -683,7 +683,7 @@ void FCConfigWidget::edit_type_content_button_clicked( ) } else { - TQString dest = TDEGlobal::dirs()->saveLocation("data", "/tdevfilecreate/file-templates/", true); + TQString dest = TDEGlobal::dirs()->saveLocation("data", "/kdevfilecreate/file-templates/", true); TQString typePath = dest + type_name; KURL content; content.setPath(typePath); @@ -691,7 +691,7 @@ void FCConfigWidget::edit_type_content_button_clicked( ) { TQFileInfo fi(dest+type_name); if (!fi.exists()) - copyTemplate(locate("data", "tdevfilecreate/file-templates/" + type_name), dest, type_name); + copyTemplate(locate("data", "kdevfilecreate/file-templates/" + type_name), dest, type_name); m_part->partController()->editDocument(content); } else diff --git a/parts/filecreate/file-templates/CMakeLists.txt b/parts/filecreate/file-templates/CMakeLists.txt index 37b9a309..04405e1a 100644 --- a/parts/filecreate/file-templates/CMakeLists.txt +++ b/parts/filecreate/file-templates/CMakeLists.txt @@ -14,4 +14,4 @@ install( FILES ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc - DESTINATION ${DATA_INSTALL_DIR}/tdevfilecreate/file-templates ) + DESTINATION ${DATA_INSTALL_DIR}/kdevfilecreate/file-templates ) diff --git a/parts/filecreate/file-templates/Makefile.am b/parts/filecreate/file-templates/Makefile.am index 631e3554..672a1cfa 100644 --- a/parts/filecreate/file-templates/Makefile.am +++ b/parts/filecreate/file-templates/Makefile.am @@ -1,2 +1,2 @@ -rcdir = $(kde_datadir)/tdevfilecreate/file-templates +rcdir = $(kde_datadir)/kdevfilecreate/file-templates rc_DATA = ui ui-dialog ui-mainwin ui-confdialog ui-dialogb ui-widget ui-dialogr ui-tabdialog ui-wizard dox ts ui-mainwin-qt4 ui-widget-qt4 ui-dialogb-qt4 ui-dialogr-qt4 ui-dialog-qt4 qrc diff --git a/parts/filecreate/filecreate_filedialog.h b/parts/filecreate/filecreate_filedialog.h index 616e9c2d..54365717 100644 --- a/parts/filecreate/filecreate_filedialog.h +++ b/parts/filecreate/filecreate_filedialog.h @@ -10,8 +10,8 @@ -#ifndef __TDEVPART_FILECREATE_FILEDIALOG_H__ -#define __TDEVPART_FILECREATE_FILEDIALOG_H__ +#ifndef __KDEVPART_FILECREATE_FILEDIALOG_H__ +#define __KDEVPART_FILECREATE_FILEDIALOG_H__ #include diff --git a/parts/filecreate/filecreate_part.cpp b/parts/filecreate/filecreate_part.cpp index 11fcfa6c..19deeb66 100644 --- a/parts/filecreate/filecreate_part.cpp +++ b/parts/filecreate/filecreate_part.cpp @@ -19,7 +19,7 @@ #include #include #include -#include +#include #include #include #include @@ -30,10 +30,10 @@ #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" #include "configwidgetproxy.h" #include "filetemplate.h" @@ -50,23 +50,23 @@ #define PROJECTSETTINGSPAGE 1 #define GLOBALSETTINGSPAGE 2 -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "config.h" -static const TDevPluginInfo data("tdevfilecreate"); +static const KDevPluginInfo data("kdevfilecreate"); -typedef TDevGenericFactory FileCreateFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevfilecreate, FileCreateFactory( data ) ) +typedef KDevGenericFactory FileCreateFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevfilecreate, FileCreateFactory( data ) ) using namespace FileCreate; FileCreatePart::FileCreatePart(TQObject *parent, const char *name, const TQStringList & ) -// : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) - : TDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) +// : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_selectedWidget(-1), m_useSideTab(true), m_subPopups(0) + : KDevCreateFile(&data, parent, name ? name : "FileCreatePart"), m_subPopups(0) { setInstance(FileCreateFactory::instance()); - setXMLFile("tdevpart_filecreate.rc"); + setXMLFile("kdevpart_filecreate.rc"); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); @@ -179,10 +179,10 @@ void FileCreatePart::slotNewFilePopup( int pFileType ) } void FileCreatePart::slotNewFile() { - TDevCreateFile::CreatedFile createdFile = createNewFile(); - if (createdFile.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED) + KDevCreateFile::CreatedFile createdFile = createNewFile(); + if (createdFile.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED) KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid.")); - else if (createdFile.status != TDevCreateFile::CreatedFile::STATUS_CANCELED) + else if (createdFile.status != KDevCreateFile::CreatedFile::STATUS_CANCELED) openCreatedFile(createdFile); } @@ -209,7 +209,7 @@ void FileCreatePart::slotProjectClosed() { void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { - TDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), + KDevCreateFile::CreatedFile createdFile = createNewFile(filetype->ext(), TQString(), TQString(), filetype->subtypeRef()); @@ -217,9 +217,9 @@ void FileCreatePart::slotFiletypeSelected(const FileType * filetype) { openCreatedFile(createdFile); } -void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & createdFile) +void FileCreatePart::openCreatedFile(const KDevCreateFile::CreatedFile & createdFile) { - if ( createdFile.status == TDevCreateFile::CreatedFile::STATUS_OK ) + if ( createdFile.status == KDevCreateFile::CreatedFile::STATUS_OK ) { KURL uu( createdFile.dir + "/" + createdFile.filename ); partController()->editDocument ( uu ); @@ -228,7 +228,7 @@ void FileCreatePart::openCreatedFile(const TDevCreateFile::CreatedFile & created int FileCreatePart::readTypes(const TQDomDocument & dom, TQPtrList &m_filetypes, bool enable) { int numRead = 0; - TQDomElement fileTypes = DomUtil::elementByPath(dom,"/tdevfilecreate/filetypes"); + TQDomElement fileTypes = DomUtil::elementByPath(dom,"/kdevfilecreate/filetypes"); if (!fileTypes.isNull()) { for(TQDomNode node = fileTypes.firstChild();!node.isNull();node=node.nextSibling()) { @@ -324,16 +324,16 @@ FileType * FileCreatePart::getEnabledType(const TQString & ex, const TQString su return NULL; } -// TDevFileCreate interface +// KDevFileCreate interface -TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype) +KDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString dir, TQString name, TQString subtype) { - TDevCreateFile::CreatedFile result; + KDevCreateFile::CreatedFile result; KURL projectURL; if ( !project() ) { - //result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED; + //result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED; //return result; } else @@ -373,7 +373,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString int dialogResult = dialog.exec(); if (dialogResult == KDialogBase::Rejected) { - result.status = TDevCreateFile::CreatedFile::STATUS_CANCELED; + result.status = KDevCreateFile::CreatedFile::STATUS_CANCELED; return result; } @@ -383,8 +383,8 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString selectedURL = dialog.url(); const FileType *selectedFileType = dialog.selectedType(); - if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & TDevProject::UsesTQMakeBuildSystem) ) { - result.status = TDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT; + if (dialog.addToProject() && !projectURL.isParentOf(selectedURL) && !(project()->options() & KDevProject::UsesTQMakeBuildSystem) ) { + result.status = KDevCreateFile::CreatedFile::STATUS_NOTWITHINPROJECT; return result; } @@ -416,7 +416,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString } if (!created) { - result.status = TDevCreateFile::CreatedFile::STATUS_NOTCREATED; + result.status = KDevCreateFile::CreatedFile::STATUS_NOTCREATED; return result; } @@ -425,7 +425,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString // work out the path relative to the project directory // TQString relToProj = URLUtil::relativePath(projectURL, selectedURL, URLUtil::SLASH_PREFIX ); TQString relToProj; - if( project()->options() & TDevProject::UsesTQMakeBuildSystem ) + if( project()->options() & KDevProject::UsesTQMakeBuildSystem ) { relToProj = URLUtil::relativePathToFile( project()->projectDirectory(), fullPath ); project()->addFile(relToProj); @@ -445,7 +445,7 @@ TDevCreateFile::CreatedFile FileCreatePart::createNewFile(TQString ext, TQString result.filename = fileName; result.dir = URLUtil::directory(fullPath); - result.status = TDevCreateFile::CreatedFile::STATUS_OK; + result.status = KDevCreateFile::CreatedFile::STATUS_OK; return result; } @@ -464,7 +464,7 @@ void FileCreatePart::slotInitialize( ) // read in which global templates are to be used for this project TQDomElement useGlobalTypes = - DomUtil::elementByPath(*projectDom(),"/tdevfilecreate/useglobaltypes"); + DomUtil::elementByPath(*projectDom(),"/kdevfilecreate/useglobaltypes"); for(TQDomNode node = useGlobalTypes.firstChild(); !node.isNull();node=node.nextSibling()) { @@ -524,7 +524,7 @@ TQString FileCreatePart::findGlobalXMLFile() const { int version = 0; TQString filename; - TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "tdevfilecreate/template-info.xml"); + TQStringList filenames = TDEGlobal::instance()->dirs()->findAllResources("data", "kdevfilecreate/template-info.xml"); for( TQStringList::const_iterator it = filenames.begin(); it != filenames.end(); ++it ) { TQDomDocument globalDom; diff --git a/parts/filecreate/filecreate_part.h b/parts/filecreate/filecreate_part.h index 0b6e5a01..9d090493 100644 --- a/parts/filecreate/filecreate_part.h +++ b/parts/filecreate/filecreate_part.h @@ -10,16 +10,16 @@ -#ifndef __TDEVPART_FILECREATE_H__ -#define __TDEVPART_FILECREATE_H__ +#ifndef __KDEVPART_FILECREATE_H__ +#define __KDEVPART_FILECREATE_H__ #include #include #include -#include -#include +#include +#include #include "filecreate_typechooser.h" @@ -36,7 +36,7 @@ class ConfigWidgetProxy; using namespace FileCreate; -class FileCreatePart : public TDevCreateFile +class FileCreatePart : public KDevCreateFile { Q_OBJECT @@ -57,7 +57,7 @@ public: * The user will be prompted as necessary for the missing information, and the * file created, and added to the project as necessary. */ - virtual TDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(), + virtual KDevCreateFile::CreatedFile createNewFile(TQString ext = TQString(), TQString dir = TQString(), TQString name = TQString(), TQString subtype = TQString()); @@ -106,7 +106,7 @@ private: /** * If a file has been successfully created, open it */ - void openCreatedFile(const TDevCreateFile::CreatedFile & createdFile); + void openCreatedFile(const KDevCreateFile::CreatedFile & createdFile); /** * Reads in file type definitions from a config DOM and adds them diff --git a/parts/filecreate/filecreate_widget2.cpp b/parts/filecreate/filecreate_widget2.cpp index d57fbf48..4638725c 100644 --- a/parts/filecreate/filecreate_widget2.cpp +++ b/parts/filecreate/filecreate_widget2.cpp @@ -19,9 +19,9 @@ #include #include -#include +#include -#include "tdevproject.h" +#include "kdevproject.h" #include "filecreate_part.h" #include "filecreate_widget2.h" #include "filecreate_filetype.h" diff --git a/parts/filecreate/filecreate_widget2.h b/parts/filecreate/filecreate_widget2.h index 3e4df801..217d37ce 100644 --- a/parts/filecreate/filecreate_widget2.h +++ b/parts/filecreate/filecreate_widget2.h @@ -21,7 +21,7 @@ #include "filecreate_typechooser.h" class TDEIconLoader; -class TDevProject; +class KDevProject; class FileCreatePart; namespace FileCreate { diff --git a/parts/filecreate/filecreate_widget3.cpp b/parts/filecreate/filecreate_widget3.cpp index e541038c..caf1ac74 100644 --- a/parts/filecreate/filecreate_widget3.cpp +++ b/parts/filecreate/filecreate_widget3.cpp @@ -18,11 +18,11 @@ #include #include #include -#include +#include #include "filecreate_widget3.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "filecreate_part.h" #include "filecreate_filetype.h" #include "filecreate_listitem.h" @@ -30,7 +30,7 @@ namespace FileCreate { ListWidget::ListWidget(FileCreatePart *part) - : TDEListView(0, "TDevFileCreate"), TypeChooser(part) + : TDEListView(0, "KDevFileCreate"), TypeChooser(part) { setIcon( SmallIcon("filenew2") ); setCaption(i18n("File Create")); diff --git a/parts/filecreate/filecreate_widget3.h b/parts/filecreate/filecreate_widget3.h index 244bf78d..ac8b866e 100644 --- a/parts/filecreate/filecreate_widget3.h +++ b/parts/filecreate/filecreate_widget3.h @@ -19,7 +19,7 @@ #include "filecreate_typechooser.h" -class TDevProject; +class KDevProject; class FileCreatePart; class TQResizeEvent; diff --git a/parts/filecreate/tdevfilecreate.desktop b/parts/filecreate/kdevfilecreate.desktop similarity index 98% rename from parts/filecreate/tdevfilecreate.desktop rename to parts/filecreate/kdevfilecreate.desktop index d9accc3c..1861090d 100644 --- a/parts/filecreate/tdevfilecreate.desktop +++ b/parts/filecreate/kdevfilecreate.desktop @@ -30,7 +30,7 @@ Comment[ta]= கோப்பு உருவாக்கப்பட்டது Comment[tg]=Устои бунёд кардани файлҳо Comment[zh_CN]=文件创建 Comment[zh_TW]=檔案建立 -Name=TDevFileCreate +Name=KDevFileCreate Name[da]=TDevelop filoprettelse Name[de]=Dateierstellungs-Komponente (TDevelop) Name[hi]=के-डेव-फ़ाइल-क्रिएट @@ -71,7 +71,7 @@ GenericName[zh_CN]=文件创建 GenericName[zh_TW]=檔案建立 Icon=wizard ServiceTypes=TDevelop/CreateFile -X-TDE-Library=libtdevfilecreate +X-TDE-Library=libkdevfilecreate X-TDevelop-Version=5 X-TDevelop-Properties=FileCreation X-TDevelop-Scope=Core diff --git a/parts/filecreate/tdevpart_filecreate.rc b/parts/filecreate/kdevpart_filecreate.rc similarity index 79% rename from parts/filecreate/tdevpart_filecreate.rc rename to parts/filecreate/kdevpart_filecreate.rc index 09a293ee..401a1378 100644 --- a/parts/filecreate/tdevpart_filecreate.rc +++ b/parts/filecreate/kdevpart_filecreate.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/filecreate/template-info.xml b/parts/filecreate/template-info.xml index 9afd9825..664fa376 100644 --- a/parts/filecreate/template-info.xml +++ b/parts/filecreate/template-info.xml @@ -1,6 +1,6 @@ - + @@ -177,5 +177,5 @@ A new empty Qt Linguist translation source file. - + diff --git a/parts/filelist/CMakeLists.txt b/parts/filelist/CMakeLists.txt index 7feb3ae1..ac227b5e 100644 --- a/parts/filelist/CMakeLists.txt +++ b/parts/filelist/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilelist ) +install( FILES kdevfilelist.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfilelist.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilelist ) -##### libtdevfilelist (module) ################## +##### libkdevfilelist (module) ################## -tde_add_kpart( libtdevfilelist AUTOMOC +tde_add_kpart( libkdevfilelist AUTOMOC SOURCES filelist_widget.cpp filelist_item.cpp projectviewprojectconfigbase.ui diff --git a/parts/filelist/Makefile.am b/parts/filelist/Makefile.am index 8652a240..83e36d19 100644 --- a/parts/filelist/Makefile.am +++ b/parts/filelist/Makefile.am @@ -1,20 +1,20 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfilelist.la -libtdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfilelist.la +libkdevfilelist_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfilelist_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \ +libkdevfilelist_la_SOURCES = filelist_widget.cpp filelist_item.cpp \ projectviewprojectconfigbase.ui projectviewprojectconfig.cpp projectviewpart.cpp toolbarguibuilder.cpp \ projectviewconfigbase.ui projectviewconfig.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfilelist.desktop +service_DATA = kdevfilelist.desktop -rcdir = $(kde_datadir)/tdevfilelist +rcdir = $(kde_datadir)/kdevfilelist noinst_HEADERS = filelist_item.h filelist_widget.h projectviewprojectconfig.h \ projectviewpart.h toolbarguibuilder.h projectviewconfig.h fileinfo.h -rc_DATA = tdevfilelist.rc +rc_DATA = kdevfilelist.rc diff --git a/parts/filelist/filelist_item.h b/parts/filelist/filelist_item.h index 2d9322c9..6b88b09e 100644 --- a/parts/filelist/filelist_item.h +++ b/parts/filelist/filelist_item.h @@ -18,7 +18,7 @@ #include -#include +#include class FileListItem : public TQListViewItem { diff --git a/parts/filelist/filelist_widget.cpp b/parts/filelist/filelist_widget.cpp index 4b0b2b48..2e415dcd 100644 --- a/parts/filelist/filelist_widget.cpp +++ b/parts/filelist/filelist_widget.cpp @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #include "projectviewpart.h" #include "filelist_widget.h" diff --git a/parts/filelist/filelist_widget.h b/parts/filelist/filelist_widget.h index f1b4de97..b582a309 100644 --- a/parts/filelist/filelist_widget.h +++ b/parts/filelist/filelist_widget.h @@ -17,7 +17,7 @@ #include #include -#include // for DocumentState +#include // for DocumentState #include #include @@ -25,7 +25,7 @@ #include "projectviewpart.h" -class TDevProject; +class KDevProject; class FileListItem; namespace KParts { class Part; } diff --git a/parts/filelist/tdevfilelist.desktop b/parts/filelist/kdevfilelist.desktop similarity index 99% rename from parts/filelist/tdevfilelist.desktop rename to parts/filelist/kdevfilelist.desktop index 17a20ad6..da37f14b 100644 --- a/parts/filelist/tdevfilelist.desktop +++ b/parts/filelist/kdevfilelist.desktop @@ -71,6 +71,6 @@ GenericName[zh_TW]=檔案列表 Icon=tdevelop ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevfilelist +X-TDE-Library=libkdevfilelist X-TDevelop-Version=5 X-TDevelop-Properties=OpenFileNavigation diff --git a/parts/filelist/tdevfilelist.rc b/parts/filelist/kdevfilelist.rc similarity index 100% rename from parts/filelist/tdevfilelist.rc rename to parts/filelist/kdevfilelist.rc diff --git a/parts/filelist/projectviewpart.cpp b/parts/filelist/projectviewpart.cpp index 76f0c102..517d2f98 100644 --- a/parts/filelist/projectviewpart.cpp +++ b/parts/filelist/projectviewpart.cpp @@ -51,28 +51,28 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #include -typedef TDevGenericFactory projectviewFactory; -TDevPluginInfo data("tdevfilelist"); -K_EXPORT_COMPONENT_FACTORY(libtdevfilelist, projectviewFactory(data)) +typedef KDevGenericFactory projectviewFactory; +KDevPluginInfo data("kdevfilelist"); +K_EXPORT_COMPONENT_FACTORY(libkdevfilelist, projectviewFactory(data)) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 ProjectviewPart::ProjectviewPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "FileListPart") + : KDevPlugin(&data, parent, name ? name : "FileListPart") { setInstance(projectviewFactory::instance()); - setXMLFile("tdevfilelist.rc"); + setXMLFile("kdevfilelist.rc"); setupActions(); m_configProxy = new ConfigWidgetProxy(core()); diff --git a/parts/filelist/projectviewpart.h b/parts/filelist/projectviewpart.h index 72c6efcd..392a9cdf 100644 --- a/parts/filelist/projectviewpart.h +++ b/parts/filelist/projectviewpart.h @@ -18,8 +18,8 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVPROJECTVIEW_H -#define TDEVPROJECTVIEW_H +#ifndef KDEVPROJECTVIEW_H +#define KDEVPROJECTVIEW_H #include "fileinfo.h" @@ -27,7 +27,7 @@ #include #include -#include +#include #include @@ -53,7 +53,7 @@ this is a reimplementation of the project views in Quanta @TODO save html parts too FIXME at project open I get the default view and the open files at last close */ -class ProjectviewPart: public TDevPlugin +class ProjectviewPart: public KDevPlugin { Q_OBJECT @@ -66,7 +66,7 @@ public: ProjectviewPart(TQObject *parent, const char *name, const TQStringList &args); ~ProjectviewPart(); - // reimplemented from TDevPlugin + // reimplemented from KDevPlugin void restorePartialProjectSession(const TQDomElement * el); void savePartialProjectSession(TQDomElement * el); diff --git a/parts/fileselector/CMakeLists.txt b/parts/fileselector/CMakeLists.txt index b310f791..8f18792e 100644 --- a/parts/fileselector/CMakeLists.txt +++ b/parts/fileselector/CMakeLists.txt @@ -27,12 +27,12 @@ link_directories( ##### other data ################################ -install( FILES tdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfileselector.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevfileselector (module) ############## +##### libkdevfileselector (module) ############## -tde_add_kpart( libtdevfileselector AUTOMOC +tde_add_kpart( libkdevfileselector AUTOMOC SOURCES fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp diff --git a/parts/fileselector/Makefile.am b/parts/fileselector/Makefile.am index 43ee404b..f0c2fc35 100644 --- a/parts/fileselector/Makefile.am +++ b/parts/fileselector/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/sourceinfo $(all_includes) -kde_module_LTLIBRARIES = libtdevfileselector.la -libtdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfileselector.la +libkdevfileselector_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfileselector_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp +libkdevfileselector_la_SOURCES = fileselector_part.cpp fileselector_widget.cpp tdeactionselector.cpp kbookmarkhandler.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfileselector.desktop +service_DATA = kdevfileselector.desktop # not used currently -#rcdir = $(kde_datadir)/tdevfileselector -#rc_DATA = tdevfileselector.rc +#rcdir = $(kde_datadir)/kdevfileselector +#rc_DATA = kdevfileselector.rc diff --git a/parts/fileselector/fileselector_part.cpp b/parts/fileselector/fileselector_part.cpp index 331bb639..a6b4a6bb 100644 --- a/parts/fileselector/fileselector_part.cpp +++ b/parts/fileselector/fileselector_part.cpp @@ -13,33 +13,33 @@ #include #include #include -#include +#include #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #include #include "fileselector_widget.h" -typedef TDevGenericFactory FileSelectorFactory; -static const TDevPluginInfo data("tdevfileselector"); -K_EXPORT_COMPONENT_FACTORY( libtdevfileselector, FileSelectorFactory( data ) ) +typedef KDevGenericFactory FileSelectorFactory; +static const KDevPluginInfo data("kdevfileselector"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileselector, FileSelectorFactory( data ) ) FileSelectorPart::FileSelectorPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FileSelectorPart") + : KDevPlugin(&data, parent, name ? name : "FileSelectorPart") { setInstance(FileSelectorFactory::instance()); - m_filetree = new TDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); + m_filetree = new KDevFileSelector( this, mainWindow(), partController(), 0, "fileselectorwidget" ); connect( m_filetree->dirOperator(), TQT_SIGNAL(fileSelected(const KFileItem*)), this, TQT_SLOT(fileSelected(const KFileItem*))); @@ -63,7 +63,7 @@ FileSelectorPart::~FileSelectorPart() mainWindow()->removeView( m_filetree ); } - delete (TDevFileSelector*) m_filetree; + delete (KDevFileSelector*) m_filetree; } void FileSelectorPart::fileSelected( const KFileItem * file ) @@ -90,14 +90,14 @@ void FileSelectorPart::slotConfigWidget( KDialogBase * dlg ) void FileSelectorPart::newFile() { - TDevCreateFile *creator = extension("TDevelop/CreateFile"); + KDevCreateFile *creator = extension("TDevelop/CreateFile"); if (creator) { - TDevCreateFile::CreatedFile file = creator->createNewFile("", + KDevCreateFile::CreatedFile file = creator->createNewFile("", m_filetree->dirOperator()->url().path()); - if (file.status == TDevCreateFile::CreatedFile::STATUS_NOTCREATED) + if (file.status == KDevCreateFile::CreatedFile::STATUS_NOTCREATED) KMessageBox::error(0, i18n("Cannot create file. Check whether the directory and filename are valid.")); - else if (file.status != TDevCreateFile::CreatedFile::STATUS_CANCELED) + else if (file.status != KDevCreateFile::CreatedFile::STATUS_CANCELED) { partController()->editDocument(KURL::fromPathOrURL( file.dir + "/" + file.filename)); diff --git a/parts/fileselector/fileselector_part.h b/parts/fileselector/fileselector_part.h index 80841deb..f415444d 100644 --- a/parts/fileselector/fileselector_part.h +++ b/parts/fileselector/fileselector_part.h @@ -1,17 +1,17 @@ -#ifndef __TDEVPART_FILESELECTOR_H__ -#define __TDEVPART_FILESELECTOR_H__ +#ifndef __KDEVPART_FILESELECTOR_H__ +#define __KDEVPART_FILESELECTOR_H__ -#include +#include #include #include #include -class TDevFileSelector; +class KDevFileSelector; class KDialogBase; -class FileSelectorPart : public TDevPlugin +class FileSelectorPart : public KDevPlugin { Q_OBJECT @@ -33,7 +33,7 @@ private slots: void slotConfigWidget( KDialogBase * ); private: - TQGuardedPtr m_filetree; + TQGuardedPtr m_filetree; TDEAction *m_newFileAction; }; diff --git a/parts/fileselector/fileselector_widget.cpp b/parts/fileselector/fileselector_widget.cpp index 1d6fb154..894bf185 100644 --- a/parts/fileselector/fileselector_widget.cpp +++ b/parts/fileselector/fileselector_widget.cpp @@ -26,9 +26,9 @@ #include "tdeactionselector.h" #include "kbookmarkhandler.h" -#include -#include -#include +#include +#include +#include #include #include @@ -76,32 +76,32 @@ static void silenceTQToolBar(TQtMsgType, const char *) {} -TDevFileSelectorToolBar::TDevFileSelectorToolBar(TQWidget *parent) +KDevFileSelectorToolBar::KDevFileSelectorToolBar(TQWidget *parent) : TDEToolBar( parent, "KDev FileSelector Toolbar", true ) { setMinimumWidth(10); } -TDevFileSelectorToolBar::~TDevFileSelectorToolBar() +KDevFileSelectorToolBar::~KDevFileSelectorToolBar() {} -void TDevFileSelectorToolBar::setMovingEnabled( bool) +void KDevFileSelectorToolBar::setMovingEnabled( bool) { TDEToolBar::setMovingEnabled(false); } -TDevFileSelectorToolBarParent::TDevFileSelectorToolBarParent(TQWidget *parent) +KDevFileSelectorToolBarParent::KDevFileSelectorToolBarParent(TQWidget *parent) :TQFrame(parent),m_tb(0) {} -TDevFileSelectorToolBarParent::~TDevFileSelectorToolBarParent() +KDevFileSelectorToolBarParent::~KDevFileSelectorToolBarParent() {} -void TDevFileSelectorToolBarParent::setToolBar(TDevFileSelectorToolBar *tb) +void KDevFileSelectorToolBarParent::setToolBar(KDevFileSelectorToolBar *tb) { m_tb=tb; } -void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) +void KDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) { if (m_tb) { @@ -113,8 +113,8 @@ void TDevFileSelectorToolBarParent::resizeEvent ( TQResizeEvent * ) //BEGIN Constructor/destructor -TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow, - TDevPartController *partController, +KDevFileSelector::KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow, + KDevPartController *partController, TQWidget * parent, const char * name ) : TQWidget(parent, name), m_part(part), @@ -127,8 +127,8 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main TQtMsgHandler oldHandler = tqInstallMsgHandler( silenceTQToolBar ); - TDevFileSelectorToolBarParent *tbp=new TDevFileSelectorToolBarParent(this); - toolbar = new TDevFileSelectorToolBar(tbp); + KDevFileSelectorToolBarParent *tbp=new KDevFileSelectorToolBarParent(this); + toolbar = new KDevFileSelectorToolBar(tbp); tbp->setToolBar(toolbar); lo->addWidget(tbp); toolbar->setMovingEnabled(false); @@ -142,7 +142,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main lo->addWidget(cmbPath); cmbPath->listBox()->installEventFilter( this ); - dir = new TDevDirOperator(m_part, KURL(), this, "operator"); + dir = new KDevDirOperator(m_part, KURL(), this, "operator"); dir->setView(KFile::/*Simple*/Detail); TDEActionCollection *coll = dir->actionCollection(); @@ -229,7 +229,7 @@ TDevFileSelector::TDevFileSelector( FileSelectorPart *part, TDevMainWindow *main "reapplies the last filter used when toggled on.") ); } -TDevFileSelector::~TDevFileSelector() +KDevFileSelector::~KDevFileSelector() { writeConfig( m_part->instance()->config(), "fileselector" ); } @@ -237,7 +237,7 @@ TDevFileSelector::~TDevFileSelector() //BEGIN Public Methods -void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name) +void KDevFileSelector::readConfig(TDEConfig *config, const TQString & name) { dir->readConfig(config, name + ":dir"); dir->setView( KFile::Default ); @@ -283,12 +283,12 @@ void TDevFileSelector::readConfig(TDEConfig *config, const TQString & name) } -void TDevFileSelector::initialDirChangeHack() +void KDevFileSelector::initialDirChangeHack() { setDir( waitingDir ); } -void TDevFileSelector::setupToolbar( TDEConfig *config ) +void KDevFileSelector::setupToolbar( TDEConfig *config ) { toolbar->clear(); TQStringList tbactions = config->readListEntry( "toolbar actions", ',' ); @@ -311,7 +311,7 @@ void TDevFileSelector::setupToolbar( TDEConfig *config ) } } -void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) +void KDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) { dir->writeConfig(config,name + ":dir"); @@ -332,7 +332,7 @@ void TDevFileSelector::writeConfig(TDEConfig *config, const TQString & name) config->writeEntry( "AutoSyncEvents", autoSyncEvents ); } -void TDevFileSelector::setView(KFile::FileView view) +void KDevFileSelector::setView(KFile::FileView view) { dir->setView(view); } @@ -341,7 +341,7 @@ void TDevFileSelector::setView(KFile::FileView view) //BEGIN Public Slots -void TDevFileSelector::slotFilterChange( const TQString & nf ) +void KDevFileSelector::slotFilterChange( const TQString & nf ) { TQToolTip::remove( btnFilter ); TQString f = nf.stripWhiteSpace(); @@ -371,7 +371,7 @@ void TDevFileSelector::slotFilterChange( const TQString & nf ) btnFilter->setEnabled( !( empty && lastFilter.isEmpty() ) ); } -void TDevFileSelector::setDir( KURL u ) +void KDevFileSelector::setDir( KURL u ) { dir->setURL(u, true); } @@ -380,12 +380,12 @@ void TDevFileSelector::setDir( KURL u ) //BEGIN Private Slots -void TDevFileSelector::cmbPathActivated( const KURL& u ) +void KDevFileSelector::cmbPathActivated( const KURL& u ) { cmbPathReturnPressed( u.url() ); } -void TDevFileSelector::cmbPathReturnPressed( const TQString& u ) +void KDevFileSelector::cmbPathReturnPressed( const TQString& u ) { TQStringList urls = cmbPath->urls(); urls.remove( u ); @@ -395,12 +395,12 @@ void TDevFileSelector::cmbPathReturnPressed( const TQString& u ) dir->setURL( KURL(u), true ); } -void TDevFileSelector::dirUrlEntered( const KURL& u ) +void KDevFileSelector::dirUrlEntered( const KURL& u ) { cmbPath->setURL( u ); } -void TDevFileSelector::dirFinishedLoading() +void KDevFileSelector::dirFinishedLoading() {} @@ -411,7 +411,7 @@ void TDevFileSelector::dirFinishedLoading() If on: Set last filter. */ -void TDevFileSelector::btnFilterClick() +void KDevFileSelector::btnFilterClick() { if ( !btnFilter->isOn() ) { @@ -425,9 +425,9 @@ void TDevFileSelector::btnFilterClick() } -void TDevFileSelector::autoSync() +void KDevFileSelector::autoSync() { - kdDebug()<<"TDevFileSelector::autoSync()"<( part ); if( !doc ) return; // as above, but using document url. - kdDebug()<<"TDevFileSelector::autoSync( KTextEditor::Document )"<url() ); if ( u.isEmpty() ) { @@ -468,15 +468,15 @@ void TDevFileSelector::autoSync( KParts::Part *part ) } } /// \FIXME crash on shutdown -void TDevFileSelector::setActiveDocumentDir() +void KDevFileSelector::setActiveDocumentDir() { - //kdDebug()<<"TDevFileSelector::setActiveDocumentDir()"<setFocus(); } -void TDevFileSelector::showEvent( TQShowEvent * ) +void KDevFileSelector::showEvent( TQShowEvent * ) { // sync if we should if ( autoSyncEvents & GotVisible ) @@ -509,7 +509,7 @@ void TDevFileSelector::showEvent( TQShowEvent * ) } } -bool TDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) +bool KDevFileSelector::eventFilter( TQObject* o, TQEvent *e ) { /* This is rather unfortunate, but: @@ -559,7 +559,7 @@ private: TQString _str; }; -KURL TDevFileSelector::activeDocumentUrl( ) +KURL KDevFileSelector::activeDocumentUrl( ) { KParts::ReadOnlyPart * part = dynamic_cast( partController->activePart() ); if ( part ) @@ -575,7 +575,7 @@ KURL TDevFileSelector::activeDocumentUrl( ) //////////////////////////////////////////////////////////////////////////////// // KFSConfigPage implementation //////////////////////////////////////////////////////////////////////////////// -KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, TDevFileSelector *kfs ) +KFSConfigPage::KFSConfigPage( TQWidget *parent, const char *name, KDevFileSelector *kfs ) : TQWidget( parent, name ), fileSelector( kfs ), bDirty( false ) @@ -706,20 +706,20 @@ void KFSConfigPage::apply() // sync int s = 0; if ( cbSyncActive->isChecked() ) - s |= TDevFileSelector::DocumentChanged; + s |= KDevFileSelector::DocumentChanged; if ( cbSyncOpen->isChecked() ) - s |= TDevFileSelector::DocumentOpened; + s |= KDevFileSelector::DocumentOpened; if ( cbSyncShow->isChecked() ) - s |= TDevFileSelector::GotVisible; + s |= KDevFileSelector::GotVisible; fileSelector->autoSyncEvents = s; // reset connections disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync() ) ); disconnect( fileSelector->partController, 0, fileSelector, TQT_SLOT( autoSync( KParts::Part *) ) ); - if ( s & TDevFileSelector::DocumentChanged ) + if ( s & KDevFileSelector::DocumentChanged ) connect( fileSelector->partController, TQT_SIGNAL( viewChanged() ), fileSelector, TQT_SLOT( autoSync() ) ); - if ( s & TDevFileSelector::DocumentOpened ) + if ( s & KDevFileSelector::DocumentOpened ) connect( fileSelector->partController, TQT_SIGNAL( partAdded(KParts::Part *) ), fileSelector, TQT_SLOT( autoSync(KParts::Part *) ) ); @@ -773,9 +773,9 @@ void KFSConfigPage::init() // sync int s = fileSelector->autoSyncEvents; - cbSyncActive->setChecked( s & TDevFileSelector::DocumentChanged ); - cbSyncOpen->setChecked( s & TDevFileSelector::DocumentOpened ); - cbSyncShow->setChecked( s & TDevFileSelector::GotVisible ); + cbSyncActive->setChecked( s & KDevFileSelector::DocumentChanged ); + cbSyncOpen->setChecked( s & KDevFileSelector::DocumentOpened ); + cbSyncShow->setChecked( s & KDevFileSelector::GotVisible ); // histories sbPathHistLength->setValue( fileSelector->cmbPath->maxItems() ); sbFilterHistLength->setValue( fileSelector->filter->maxCount() ); @@ -791,9 +791,9 @@ void KFSConfigPage::slotChanged() //END KFSConfigPage -//BEGIN TDevDirOperator +//BEGIN KDevDirOperator -void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) +void KDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) { setupMenu(); updateSelectionDependentActions(); @@ -816,6 +816,6 @@ void TDevDirOperator::activatedMenu( const KFileItem *fi, const TQPoint & pos ) popup->popup(pos); } -//END TDevDirOperator +//END KDevDirOperator #include "fileselector_widget.moc" diff --git a/parts/fileselector/fileselector_widget.h b/parts/fileselector/fileselector_widget.h index 1c30eadd..ef64f88c 100644 --- a/parts/fileselector/fileselector_widget.h +++ b/parts/fileselector/fileselector_widget.h @@ -29,8 +29,8 @@ #include #include -class TDevMainWindow; -class TDevPartController; +class KDevMainWindow; +class KDevPartController; class FileSelectorPart; class TDEActionCollection; class TDEActionSelector; @@ -57,39 +57,39 @@ namespace KTextEditor */ /* I think this fix for not moving toolbars is better */ -class TDevFileSelectorToolBar: public TDEToolBar +class KDevFileSelectorToolBar: public TDEToolBar { Q_OBJECT public: - TDevFileSelectorToolBar(TQWidget *parent); - virtual ~TDevFileSelectorToolBar(); + KDevFileSelectorToolBar(TQWidget *parent); + virtual ~KDevFileSelectorToolBar(); virtual void setMovingEnabled( bool b ); }; -class TDevFileSelectorToolBarParent: public TQFrame +class KDevFileSelectorToolBarParent: public TQFrame { Q_OBJECT public: - TDevFileSelectorToolBarParent(TQWidget *parent); - ~TDevFileSelectorToolBarParent(); - void setToolBar(TDevFileSelectorToolBar *tb); + KDevFileSelectorToolBarParent(TQWidget *parent); + ~KDevFileSelectorToolBarParent(); + void setToolBar(KDevFileSelectorToolBar *tb); private: - TDevFileSelectorToolBar *m_tb; + KDevFileSelectorToolBar *m_tb; protected: virtual void resizeEvent ( TQResizeEvent * ); }; -class TDevDirOperator: public KDirOperator +class KDevDirOperator: public KDirOperator { Q_OBJECT public: - TDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) + KDevDirOperator(FileSelectorPart *part, const KURL &urlName=KURL(), TQWidget *parent=0, const char *name=0) :KDirOperator(urlName, parent, name), m_part(part) { } @@ -101,7 +101,7 @@ private: FileSelectorPart *m_part; }; -class TDevFileSelector : public TQWidget +class KDevFileSelector : public TQWidget { Q_OBJECT @@ -112,15 +112,15 @@ public: /* When to sync to current document directory */ enum AutoSyncEvent { DocumentChanged=1, DocumentOpened=2, GotVisible=4 }; - TDevFileSelector( FileSelectorPart *part, TDevMainWindow *mainWindow=0, TDevPartController *partController=0, + KDevFileSelector( FileSelectorPart *part, KDevMainWindow *mainWindow=0, KDevPartController *partController=0, TQWidget * parent = 0, const char * name = 0 ); - ~TDevFileSelector(); + ~KDevFileSelector(); void readConfig( TDEConfig *, const TQString & ); void writeConfig( TDEConfig *, const TQString & ); void setupToolbar( TDEConfig * ); void setView( KFile::FileView ); - TDevDirOperator *dirOperator(){ return dir; } + KDevDirOperator *dirOperator(){ return dir; } TDEActionCollection *actionCollection() { return mActionCollection; }; public slots: @@ -146,18 +146,18 @@ protected: KURL activeDocumentUrl(); private: - class TDevFileSelectorToolBar *toolbar; + class KDevFileSelectorToolBar *toolbar; TDEActionCollection *mActionCollection; class KBookmarkHandler *bookmarkHandler; KURLComboBox *cmbPath; - TDevDirOperator * dir; + KDevDirOperator * dir; class TDEAction *acSyncDir; KHistoryCombo * filter; class TQToolButton *btnFilter; FileSelectorPart *m_part; - TDevMainWindow *mainwin; - TDevPartController *partController; + KDevMainWindow *mainwin; + KDevPartController *partController; TQString lastFilter; int autoSyncEvents; // enabled autosync events @@ -183,7 +183,7 @@ class KFSConfigPage : public TQWidget Q_OBJECT public: - KFSConfigPage( TQWidget* parent=0, const char *name=0, TDevFileSelector *kfs=0); + KFSConfigPage( TQWidget* parent=0, const char *name=0, KDevFileSelector *kfs=0); virtual ~KFSConfigPage() {}; public slots: @@ -194,7 +194,7 @@ public slots: private: void init(); - TDevFileSelector *fileSelector; + KDevFileSelector *fileSelector; bool bDirty; //class TQListBox *lbAvailableActions, *lbUsedActions; TDEActionSelector *acSel; diff --git a/parts/fileselector/kbookmarkhandler.cpp b/parts/fileselector/kbookmarkhandler.cpp index 059f0d78..935b9d86 100644 --- a/parts/fileselector/kbookmarkhandler.cpp +++ b/parts/fileselector/kbookmarkhandler.cpp @@ -35,7 +35,7 @@ #include "kbookmarkhandler.moc" -KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdepopupmenu ) +KBookmarkHandler::KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu* tdepopupmenu ) : TQObject( parent, "KBookmarkHandler" ), KBookmarkOwner(), mParent( parent ), @@ -45,9 +45,9 @@ KBookmarkHandler::KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu* tdep if (!m_menu) m_menu = new TDEPopupMenu( parent, "bookmark menu" ); - TQString file = locate( "data", "tdevfileselector/fsbookmarks.xml" ); + TQString file = locate( "data", "kdevfileselector/fsbookmarks.xml" ); if ( file.isEmpty() ) - file = locateLocal( "data", "tdevfileselector/fsbookmarks.xml" ); + file = locateLocal( "data", "kdevfileselector/fsbookmarks.xml" ); KBookmarkManager *manager = KBookmarkManager::managerForFile( file, false); manager->setUpdate( true ); diff --git a/parts/fileselector/kbookmarkhandler.h b/parts/fileselector/kbookmarkhandler.h index 7d232107..4ec065aa 100644 --- a/parts/fileselector/kbookmarkhandler.h +++ b/parts/fileselector/kbookmarkhandler.h @@ -34,7 +34,7 @@ class KBookmarkHandler : public TQObject, public KBookmarkOwner public: - KBookmarkHandler( TDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 ); + KBookmarkHandler( KDevFileSelector *parent, TDEPopupMenu *tdepopupmenu=0 ); ~KBookmarkHandler(); // KBookmarkOwner interface: @@ -58,7 +58,7 @@ protected: virtual void virtual_hook( int id, void* data ); private: - TDevFileSelector *mParent; + KDevFileSelector *mParent; TDEPopupMenu *m_menu; KBookmarkMenu *m_bookmarkMenu; diff --git a/parts/fileselector/tdevfileselector.desktop b/parts/fileselector/kdevfileselector.desktop similarity index 98% rename from parts/fileselector/tdevfileselector.desktop rename to parts/fileselector/kdevfileselector.desktop index a1d13627..785db621 100644 --- a/parts/fileselector/tdevfileselector.desktop +++ b/parts/fileselector/kdevfileselector.desktop @@ -33,7 +33,7 @@ Comment[tg]=Воситаи намоиши файлҳо бо тарафдории Comment[tr]=Güçlü, ağdan saydam, dosya gözatma yardımcı programı Comment[zh_CN]=强有力的网络文件浏览工具。 Comment[zh_TW]=強大的網路檔案瀏覽工具。 -Name=TDevFileSelector +Name=KDevFileSelector Name[da]=TDevelop filvælger Name[de]=Datei-Selektor (TDevelop) Name[hi]=के-डेव-फ़ाइल-चयनक @@ -82,7 +82,7 @@ GenericName[zh_CN]=文件选择器 GenericName[zh_TW]=檔案選擇器 Icon=fileopen ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevfileselector +X-TDE-Library=libkdevfileselector X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Mode=AssistantMode diff --git a/parts/fileselector/tdevpart_fileselector.rc b/parts/fileselector/kdevpart_fileselector.rc similarity index 100% rename from parts/fileselector/tdevpart_fileselector.rc rename to parts/fileselector/kdevpart_fileselector.rc diff --git a/parts/fileview/CMakeLists.txt b/parts/fileview/CMakeLists.txt index 49539df2..4f5f87dc 100644 --- a/parts/fileview/CMakeLists.txt +++ b/parts/fileview/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ install( FILES - tdevfileview.desktop tdevfilegroups.desktop + kdevfileview.desktop kdevfilegroups.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevfileview (module) ################## +##### libkdevfileview (module) ################## -tde_add_kpart( libtdevfileview AUTOMOC +tde_add_kpart( libkdevfileview AUTOMOC SOURCES fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp @@ -45,9 +45,9 @@ tde_add_kpart( libtdevfileview AUTOMOC ) -##### libtdevfilegroups (module) ################ +##### libkdevfilegroups (module) ################ -tde_add_kpart( libtdevfilegroups AUTOMOC +tde_add_kpart( libkdevfilegroups AUTOMOC SOURCES filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui diff --git a/parts/fileview/Makefile.am b/parts/fileview/Makefile.am index 76f1460b..3211d736 100644 --- a/parts/fileview/Makefile.am +++ b/parts/fileview/Makefile.am @@ -3,24 +3,24 @@ INCLUDES = -I$(top_srcdir)/lib/compat -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfileview.la libtdevfilegroups.la +kde_module_LTLIBRARIES = libkdevfileview.la libkdevfilegroups.la -libtdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +libkdevfileview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfileview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +libkdevfilegroups_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfilegroups_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp +libkdevfileview_la_SOURCES = fileviewpart.cpp filetreewidget.cpp partwidget.cpp vcscolorsconfigwidgetbase.ui vcscolorsconfigwidget.cpp stdfiletreewidgetimpl.cpp filetreeviewwidgetimpl.cpp vcsfiletreewidgetimpl.cpp fileitemfactory.cpp -libtdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp +libkdevfilegroups_la_SOURCES = filegroupswidget.cpp addfilegroupdlg.cpp filegroupsconfigwidget.cpp filegroupsconfigwidgetbase.ui filegroupspart.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfileview.desktop tdevfilegroups.desktop +service_DATA = kdevfileview.desktop kdevfilegroups.desktop # not used currently -#rcdir = $(kde_datadir)/tdevfileview -#rc_DATA = tdevfileview.rc +#rcdir = $(kde_datadir)/kdevfileview +#rc_DATA = kdevfileview.rc noinst_HEADERS = vcscolorsconfigwidget.h stdfiletreewidgetimpl.h filetreeviewwidgetimpl.h vcsfiletreewidgetimpl.h fileitemfactory.h diff --git a/parts/fileview/filegroupsconfigwidget.cpp b/parts/fileview/filegroupsconfigwidget.cpp index bf8d39a6..4f8fe422 100644 --- a/parts/fileview/filegroupsconfigwidget.cpp +++ b/parts/fileview/filegroupsconfigwidget.cpp @@ -39,7 +39,7 @@ FileGroupsConfigWidget::~FileGroupsConfigWidget() void FileGroupsConfigWidget::readConfig() { TQDomDocument &dom = *m_part->projectDom(); - DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/tdevfileview/groups", + DomUtil::PairList list = DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); TQListViewItem *lastItem = 0; @@ -64,7 +64,7 @@ void FileGroupsConfigWidget::storeConfig() item = item->nextSibling(); } - DomUtil::writePairListEntry(*m_part->projectDom(), "/tdevfileview/groups", + DomUtil::writePairListEntry(*m_part->projectDom(), "/kdevfileview/groups", "group", "name", "pattern", list); } diff --git a/parts/fileview/filegroupspart.cpp b/parts/fileview/filegroupspart.cpp index 7b83b8ef..77fc9646 100644 --- a/parts/fileview/filegroupspart.cpp +++ b/parts/fileview/filegroupspart.cpp @@ -19,25 +19,25 @@ #include #include #include -#include +#include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevplugininfo.h" #include "filegroupswidget.h" #include "filegroupsconfigwidget.h" #define FILEGROUPS_OPTIONS 1 -typedef TDevGenericFactory FileGroupsFactory; -static const TDevPluginInfo data("tdevfilegroups"); -K_EXPORT_COMPONENT_FACTORY( libtdevfilegroups, FileGroupsFactory( data ) ) +typedef KDevGenericFactory FileGroupsFactory; +static const KDevPluginInfo data("kdevfilegroups"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilegroups, FileGroupsFactory( data ) ) FileGroupsPart::FileGroupsPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FileGroupsPart") + : KDevPlugin(&data, parent, name ? name : "FileGroupsPart") { deleteRequested = false; setInstance(FileGroupsFactory::instance()); diff --git a/parts/fileview/filegroupspart.h b/parts/fileview/filegroupspart.h index 88bed704..314f1663 100644 --- a/parts/fileview/filegroupspart.h +++ b/parts/fileview/filegroupspart.h @@ -15,12 +15,12 @@ #include //#include #include -#include "tdevplugin.h" +#include "kdevplugin.h" class FileGroupsWidget; class KDialogBase; -class FileGroupsPart : public TDevPlugin +class FileGroupsPart : public KDevPlugin { Q_OBJECT diff --git a/parts/fileview/filegroupswidget.cpp b/parts/fileview/filegroupswidget.cpp index 3c1c348f..8a3e19b4 100644 --- a/parts/fileview/filegroupswidget.cpp +++ b/parts/fileview/filegroupswidget.cpp @@ -27,10 +27,10 @@ #include #include -#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 "domutil.h" #include "filegroupspart.h" @@ -191,16 +191,16 @@ FileGroupsWidget::FileGroupsWidget(FileGroupsPart *part) (void) translations; // supress compiler warning TQDomDocument &dom = *m_part->projectDom(); - m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonprojectfiles") ); - m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/groups/hidenonlocation") ); + m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonprojectfiles") ); + m_actionToggleDisplayLocation->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/groups/hidenonlocation") ); } FileGroupsWidget::~FileGroupsWidget() { TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() ); - DomUtil::writeBoolEntry( dom, "/tdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonprojectfiles", !m_actionToggleShowNonProjectFiles->isChecked() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/groups/hidenonlocation", !m_actionToggleDisplayLocation->isChecked() ); } @@ -319,7 +319,7 @@ void FileGroupsWidget::refresh() } TQDomDocument &dom = *m_part->projectDom(); DomUtil::PairList list = - DomUtil::readPairListEntry(dom, "/tdevfileview/groups", "group", "name", "pattern"); + DomUtil::readPairListEntry(dom, "/kdevfileview/groups", "group", "name", "pattern"); FileViewFolderItem *lastGroup = 0; diff --git a/parts/fileview/filegroupswidget.h b/parts/fileview/filegroupswidget.h index 62ec5d6f..3294db32 100644 --- a/parts/fileview/filegroupswidget.h +++ b/parts/fileview/filegroupswidget.h @@ -15,7 +15,7 @@ #include class FileGroupsPart; -class TDevProject; +class KDevProject; class FileGroupsWidget : public TDEListView diff --git a/parts/fileview/filetreeviewwidgetimpl.cpp b/parts/fileview/filetreeviewwidgetimpl.cpp index 3764a3f2..af6f9e1f 100644 --- a/parts/fileview/filetreeviewwidgetimpl.cpp +++ b/parts/fileview/filetreeviewwidgetimpl.cpp @@ -16,7 +16,7 @@ #include #include -#include +#include #include "fileviewpart.h" #include "filetreewidget.h" @@ -44,7 +44,7 @@ FileTreeViewWidgetImpl::FileTreeViewWidgetImpl( FileTreeWidget *parent, const ch // Reload good ol' settings TQDomDocument &dom = *m_part->projectDom(); - m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/tdevfileview/tree/hidenonprojectfiles") ); + m_actionToggleShowNonProjectFiles->setChecked( !DomUtil::readBoolEntry(dom, "/kdevfileview/tree/hidenonprojectfiles") ); } /////////////////////////////////////////////////////////////////////////////// @@ -56,7 +56,7 @@ FileTreeViewWidgetImpl::~FileTreeViewWidgetImpl() delete m_branchItemFactory; TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/hidenonprojectfiles", !showNonProjectFiles() ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/filetreewidget.cpp b/parts/fileview/filetreewidget.cpp index 0a1c5346..f89bf71d 100644 --- a/parts/fileview/filetreewidget.cpp +++ b/parts/fileview/filetreewidget.cpp @@ -26,11 +26,11 @@ #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevversioncontrol.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevversioncontrol.h" #include "domutil.h" #include "urlutil.h" @@ -51,7 +51,7 @@ using namespace filetreeview; // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// -FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider ) +FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ) : KFileTreeView( parent, "filetreewidget" ), m_part( part ), m_rootBranch( 0 ) { kdDebug(9017) << "Requested FileTree for: " << projectDirectory() << endl; @@ -87,7 +87,7 @@ FileTreeWidget::FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFil // Hide pattern for files TQDomDocument &dom = *m_part->projectDom(); TQString defaultHidePattern = "*.o,*.lo,CVS"; - TQString hidePattern = DomUtil::readEntry( dom, "/tdevfileview/tree/hidepatterns", defaultHidePattern ); + TQString hidePattern = DomUtil::readEntry( dom, "/kdevfileview/tree/hidepatterns", defaultHidePattern ); m_hidePatterns = TQStringList::split( ",", hidePattern ); } @@ -98,7 +98,7 @@ FileTreeWidget::~FileTreeWidget() kdDebug(9017) << "FileTreeWidget::~FileTreeWidget()" << endl; TQDomDocument &dom = *m_part->projectDom(); - DomUtil::writeEntry( dom, "/tdevfileview/tree/hidepatterns", hidePatterns() ); + DomUtil::writeEntry( dom, "/kdevfileview/tree/hidepatterns", hidePatterns() ); // delete m_impl; } @@ -343,7 +343,7 @@ TQString FileTreeWidget::hidePatterns() const /////////////////////////////////////////////////////////////////////////////// -TDevVersionControl *FileTreeWidget::versionControl() const +KDevVersionControl *FileTreeWidget::versionControl() const { if (part() && part()->versionControl()) return part()->versionControl(); diff --git a/parts/fileview/filetreewidget.h b/parts/fileview/filetreewidget.h index a8d3e2bf..f6abb0c6 100644 --- a/parts/fileview/filetreewidget.h +++ b/parts/fileview/filetreewidget.h @@ -17,11 +17,11 @@ #include #include -#include +#include class FileViewPart; class FileTreeViewWidgetImpl; -class TDevVersionControl; +class KDevVersionControl; /** * This is FileTree widget for listing files belonging to the project. It does feature: @@ -33,8 +33,8 @@ class TDevVersionControl; * Design notes * The class uses two different implementations (referred by m_impl data member): * - @see VCSFileTreeWidgetImpl for VCS support -* VCS support is detencted by the constructor looking for the @see TDevPlugin::versionControl() member: -* if the current VCS plug-in does offer a @see TDevVCSFileInfoProvider object than this will be used for +* VCS support is detencted by the constructor looking for the @see KDevPlugin::versionControl() member: +* if the current VCS plug-in does offer a @see KDevVCSFileInfoProvider object than this will be used for * querying about files' data. If neither VCS plugin nor valid info provider is found then the filetreeview * will fallback to the standard implementation * - @see StdFileTreeWidgetImpl for standard visualization, just like the KFileTreeView @@ -49,7 +49,7 @@ class FileTreeWidget : public KFileTreeView Q_OBJECT public: - FileTreeWidget( FileViewPart *part, TQWidget *parent, TDevVCSFileInfoProvider *infoProvider ); + FileTreeWidget( FileViewPart *part, TQWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~FileTreeWidget(); void openDirectory(const TQString &dirName); @@ -60,7 +60,7 @@ public: FileViewPart *part() const { return m_part; } - //TDevVCSFileInfoProvider *vcsFileInfoProvider() const; + //KDevVCSFileInfoProvider *vcsFileInfoProvider() const; void applyHidePatterns( const TQString &hidePatterns ); TQString hidePatterns() const; @@ -85,7 +85,7 @@ private slots: private: bool matchesHidePattern(const TQString &fileName); - TDevVersionControl *versionControl() const; + KDevVersionControl *versionControl() const; TQStringList m_hidePatterns; /** diff --git a/parts/fileview/fileviewpart.cpp b/parts/fileview/fileviewpart.cpp index 7da44996..414cea52 100644 --- a/parts/fileview/fileviewpart.cpp +++ b/parts/fileview/fileviewpart.cpp @@ -23,19 +23,19 @@ #include #include #include -#include +#include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" #include "partwidget.h" #include "domutil.h" #include "filetreewidget.h" #include "vcscolorsconfigwidget.h" -#include "tdevversioncontrol.h" -#include "tdevplugininfo.h" +#include "kdevversioncontrol.h" +#include "kdevplugininfo.h" #define FILETREE_OPTIONS 1 @@ -49,20 +49,20 @@ VCSColors FileViewPart::vcsColors; // class factory /////////////////////////////////////////////////////////////////////////////// -typedef TDevGenericFactory FileViewFactory; -static const TDevPluginInfo data("tdevfileview"); -K_EXPORT_COMPONENT_FACTORY( libtdevfileview, FileViewFactory( data ) ) +typedef KDevGenericFactory FileViewFactory; +static const KDevPluginInfo data("kdevfileview"); +K_EXPORT_COMPONENT_FACTORY( libkdevfileview, FileViewFactory( data ) ) /////////////////////////////////////////////////////////////////////////////// // class FileTreeWidget /////////////////////////////////////////////////////////////////////////////// FileViewPart::FileViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FileViewPart"), + : KDevPlugin(&data, parent, name ? name : "FileViewPart"), m_widget( 0 ) { setInstance( FileViewFactory::instance() ); - // setXMLFile("tdevfileview.rc"); + // setXMLFile("kdevfileview.rc"); _configProxy = new ConfigWidgetProxy( core() ); _configProxy->createProjectConfigPage( i18n("File Tree"), FILETREE_OPTIONS, info()->icon() ); @@ -153,9 +153,9 @@ void FileViewPart::insertConfigWidget( const KDialogBase* dlg, TQWidget * page, } } -TDevVersionControl *FileViewPart::versionControl() +KDevVersionControl *FileViewPart::versionControl() { - return extension("TDevelop/VersionControl"); + return extension("TDevelop/VersionControl"); } #include "fileviewpart.moc" diff --git a/parts/fileview/fileviewpart.h b/parts/fileview/fileviewpart.h index c1c8c776..68eb6a56 100644 --- a/parts/fileview/fileviewpart.h +++ b/parts/fileview/fileviewpart.h @@ -14,14 +14,14 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include "vcscolorsconfigwidget.h" class PartWidget; class KDialogBase; -class TDevVersionControl; +class KDevVersionControl; -class FileViewPart : public TDevPlugin +class FileViewPart : public KDevPlugin { Q_OBJECT @@ -33,7 +33,7 @@ public: //! Colors to use for VCS visual feed-back static VCSColors vcsColors; - TDevVersionControl *versionControl(); + KDevVersionControl *versionControl(); private slots: void insertConfigWidget( const KDialogBase* dlg, TQWidget * page, unsigned int ); diff --git a/parts/fileview/tdevfilegroups.desktop b/parts/fileview/kdevfilegroups.desktop similarity index 98% rename from parts/fileview/tdevfilegroups.desktop rename to parts/fileview/kdevfilegroups.desktop index 4c04c274..bfa3e699 100644 --- a/parts/fileview/tdevfilegroups.desktop +++ b/parts/fileview/kdevfilegroups.desktop @@ -33,7 +33,7 @@ Comment[tg]=Барои файлҳои дар номҳои қолиб имкон Comment[tr]=Dosya adı desenlerine göre proje dosyalarının gruplanmasını sağlar. Comment[zh_CN]=允许你根据文件名模式规类工程文件。 Comment[zh_TW]=允許專案檔案根據檔名樣式來分群組。 -Name=TDevFileGroups +Name=KDevFileGroups Name[da]=TDevelop filgrupper Name[de]=Dateigruppen-Komponente (TDevelop) Name[hi]=के-डेव-फ़ाइल-ग्रुप्स @@ -80,7 +80,7 @@ GenericName[zh_CN]=文件分组 GenericName[zh_TW]=檔案群組 ServiceTypes=TDevelop/Plugin Icon=attach -X-TDE-Library=libtdevfilegroups +X-TDE-Library=libkdevfilegroups X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectFileGroupsManagement diff --git a/parts/fileview/tdevfileview.desktop b/parts/fileview/kdevfileview.desktop similarity index 99% rename from parts/fileview/tdevfileview.desktop rename to parts/fileview/kdevfileview.desktop index b589b5ef..6a702e1b 100644 --- a/parts/fileview/tdevfileview.desktop +++ b/parts/fileview/kdevfileview.desktop @@ -32,7 +32,7 @@ Comment[tg]=Тариқи навигатсияро ва ҳангоми ҳамко Comment[tr]=Geçerli projenin kaynak dosyalarında gezinme ve onlarla etkileşime geçme yolu sunar. Comment[zh_CN]=提供当前工程源文件的浏览和相互关系。 Comment[zh_TW]=提供目前專案的程式源碼檔的導覽與互動。 -Name=TDevFileView +Name=KDevFileView Name[da]=TDevelop filvisning Name[de]=Dateibaum (TDevelop) Name[hi]=के-डेव-फ़ाइल-व्यू @@ -79,7 +79,7 @@ GenericName[zh_CN]=文件树 GenericName[zh_TW]=檔案樹 ServiceTypes=TDevelop/Plugin Icon=folder -X-TDE-Library=libtdevfileview +X-TDE-Library=libkdevfileview X-TDevelop-Version=5 X-TDevelop-Scope=Project X-TDevelop-Properties=ProjectFileManagement diff --git a/parts/fileview/partwidget.cpp b/parts/fileview/partwidget.cpp index 49cfe7d5..bf68de83 100644 --- a/parts/fileview/partwidget.cpp +++ b/parts/fileview/partwidget.cpp @@ -22,10 +22,10 @@ #include #include -#include "tdevversioncontrol.h" -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" +#include "kdevversioncontrol.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" #include "fileviewpart.h" #include "filetreewidget.h" @@ -40,7 +40,7 @@ PartWidget::PartWidget( FileViewPart *part, TQWidget *parent ) { Q_ASSERT( part && parent ); - TDevVCSFileInfoProvider *infoProvider = 0; + KDevVCSFileInfoProvider *infoProvider = 0; if (part && part->versionControl() && part->versionControl()->fileInfoProvider()) infoProvider = part->versionControl()->fileInfoProvider(); diff --git a/parts/fileview/vcsfiletreewidgetimpl.cpp b/parts/fileview/vcsfiletreewidgetimpl.cpp index e08068db..450a6a58 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.cpp +++ b/parts/fileview/vcsfiletreewidgetimpl.cpp @@ -18,7 +18,7 @@ #include #include -//#include +//#include #include #include @@ -127,13 +127,13 @@ class VCSFileTreeBranchItem : public filetreeview::FileTreeBranchItem { public: VCSFileTreeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix, - TDevVCSFileInfoProvider *vcsInfoProvider ) + KDevVCSFileInfoProvider *vcsInfoProvider ) : FileTreeBranchItem( view, url, name, pix ), m_vcsInfoProvider( vcsInfoProvider ) {} // virtual ~VCSFileTreeBranchItem() {} virtual KFileTreeViewItem* createTreeViewItem( KFileTreeViewItem* parent, KFileItem* fileItem ); private: - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; }; /////////////////////////////////////////////////////////////////////////////// @@ -169,20 +169,20 @@ KFileTreeViewItem* VCSFileTreeBranchItem::createTreeViewItem( KFileTreeViewItem* class VCSBranchItemFactory : public filetreeview::BranchItemFactory { public: - VCSBranchItemFactory( TDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {} + VCSBranchItemFactory( KDevVCSFileInfoProvider *vcsInfoProvider ) : m_vcsInfoProvider( vcsInfoProvider ) {} virtual filetreeview::FileTreeBranchItem *makeBranchItem( KFileTreeView* view, const KURL& url, const TQString& name, const TQPixmap& pix ) { return new VCSFileTreeBranchItem( view, url, name, pix, m_vcsInfoProvider ); } private: - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; }; /////////////////////////////////////////////////////////////////////////////// // class VCSFileTreeWidgetImpl /////////////////////////////////////////////////////////////////////////////// -VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider ) +VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ) : FileTreeViewWidgetImpl( parent, "vcsfiletreewidgetimpl" ), m_actionToggleShowVCSFields( 0 ), m_actionSyncWithRepository( 0 ), m_vcsInfoProvider( infoProvider ), m_isSyncingWithRepository( false ), m_vcsStatusRequestedItem( 0 ) @@ -216,7 +216,7 @@ VCSFileTreeWidgetImpl::VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFil m_actionSyncWithRepository->setWhatsThis( aboutAction ); TQDomDocument &dom = projectDom(); - m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/tdevfileview/tree/showvcsfields") ); + m_actionToggleShowVCSFields->setChecked( DomUtil::readBoolEntry(dom, "/kdevfileview/tree/showvcsfields") ); slotToggleShowVCSFields( showVCSFields() ); // show or hide fields depending on read settings connect( parent, TQT_SIGNAL(expanded(TQListViewItem*)), this, TQT_SLOT(slotDirectoryExpanded(TQListViewItem*))); } @@ -228,7 +228,7 @@ VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl() kdDebug(9017) << "VCSFileTreeWidgetImpl::~VCSFileTreeWidgetImpl()" << endl; TQDomDocument &dom = projectDom(); - DomUtil::writeBoolEntry( dom, "/tdevfileview/tree/showvcsfields", showVCSFields() ); + DomUtil::writeBoolEntry( dom, "/kdevfileview/tree/showvcsfields", showVCSFields() ); } /////////////////////////////////////////////////////////////////////////////// diff --git a/parts/fileview/vcsfiletreewidgetimpl.h b/parts/fileview/vcsfiletreewidgetimpl.h index 928fe544..00a38b32 100644 --- a/parts/fileview/vcsfiletreewidgetimpl.h +++ b/parts/fileview/vcsfiletreewidgetimpl.h @@ -14,7 +14,7 @@ #include "filetreeviewwidgetimpl.h" -class TDevVCSFileInfoProvider; +class KDevVCSFileInfoProvider; class TDEAction; class TDEToggleAction; @@ -27,7 +27,7 @@ class VCSFileTreeWidgetImpl : public FileTreeViewWidgetImpl Q_OBJECT public: - VCSFileTreeWidgetImpl( FileTreeWidget *parent, TDevVCSFileInfoProvider *infoProvider ); + VCSFileTreeWidgetImpl( FileTreeWidget *parent, KDevVCSFileInfoProvider *infoProvider ); virtual ~VCSFileTreeWidgetImpl(); /* @@ -44,7 +44,7 @@ private slots: //! show/hide the header and the additional fields (status and versions) void slotToggleShowVCSFields( bool checked ); //! start a sync operation with the remote repository: this may take a while so we use - //! the async interface provided by the TDevVCSFileInfoProvider interface + //! the async interface provided by the KDevVCSFileInfoProvider interface void slotSyncWithRepository(); //! when the requested info are ready the infoProvider object will be so kind the //! to give them to us in a ready-to-use format: we'll use that info to update all @@ -58,7 +58,7 @@ private: TDEToggleAction *m_actionToggleShowVCSFields; TDEAction *m_actionSyncWithRepository; - TDevVCSFileInfoProvider *m_vcsInfoProvider; + KDevVCSFileInfoProvider *m_vcsInfoProvider; //! We use this guard to avoid enabling the "reload tree" action when performing //! syncing with remote repositories. bool m_isSyncingWithRepository; diff --git a/parts/filter/CMakeLists.txt b/parts/filter/CMakeLists.txt index 7665f6f1..095144d3 100644 --- a/parts/filter/CMakeLists.txt +++ b/parts/filter/CMakeLists.txt @@ -26,16 +26,16 @@ link_directories( ##### other data ################################ -install( FILES tdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfilter ) +install( FILES kdevfilter.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevfilter.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfilter ) -##### libtdevfilter (module) #################### +##### libkdevfilter (module) #################### -tde_add_kpart( libtdevfilter AUTOMOC +tde_add_kpart( libkdevfilter AUTOMOC SOURCES filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp - tdevfilterIface.cpp tdevfilterIface.skel + kdevfilterIface.cpp kdevfilterIface.skel LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/filter/Makefile.am b/parts/filter/Makefile.am index 4a3fe722..f68b0cf6 100644 --- a/parts/filter/Makefile.am +++ b/parts/filter/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfilter.la -libtdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfilter.la +libkdevfilter_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfilter_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp tdevfilterIface.cpp tdevfilterIface.skel +libkdevfilter_la_SOURCES = filterpart.cpp shellfilterdlg.cpp shellinsertdlg.cpp kdevfilterIface.cpp kdevfilterIface.skel METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfilter.desktop +service_DATA = kdevfilter.desktop -rcdir = $(kde_datadir)/tdevfilter -rc_DATA = tdevfilter.rc +rcdir = $(kde_datadir)/kdevfilter +rc_DATA = kdevfilter.rc diff --git a/parts/filter/filterpart.cpp b/parts/filter/filterpart.cpp index 3ee5029a..5ebd265e 100644 --- a/parts/filter/filterpart.cpp +++ b/parts/filter/filterpart.cpp @@ -19,21 +19,21 @@ #include #include -#include "tdevcore.h" -#include "tdevpartcontroller.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevplugininfo.h" #include "shellfilterdlg.h" #include "shellinsertdlg.h" -#include "tdevfilterIface.h" +#include "kdevfilterIface.h" -static const TDevPluginInfo data("tdevfilter"); -K_EXPORT_COMPONENT_FACTORY( libtdevfilter, FilterFactory( data ) ) +static const KDevPluginInfo data("kdevfilter"); +K_EXPORT_COMPONENT_FACTORY( libkdevfilter, FilterFactory( data ) ) FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "FilterPart") + : KDevPlugin(&data, parent, name ? name : "FilterPart") { setInstance(FilterFactory::instance()); - setXMLFile("tdevfilter.rc"); + setXMLFile("kdevfilter.rc"); TDEAction *action; @@ -52,7 +52,7 @@ FilterPart::FilterPart(TQObject *parent, const char *name, const TQStringList &) m_insertDialog = 0; m_filterDialog = 0; - new TDevFilterIface( this ); + new KDevFilterIface( this ); // (void) dcopClient(); } diff --git a/parts/filter/filterpart.h b/parts/filter/filterpart.h index b1eac334..b8322425 100644 --- a/parts/filter/filterpart.h +++ b/parts/filter/filterpart.h @@ -12,14 +12,14 @@ #ifndef _FILTERPART_H_ #define _FILTERPART_H_ -#include -#include "tdevplugin.h" +#include +#include "kdevplugin.h" class ShellInsertDialog; class ShellFilterDialog; -class FilterPart : public TDevPlugin +class FilterPart : public KDevPlugin { Q_OBJECT @@ -37,6 +37,6 @@ private: ShellFilterDialog *m_filterDialog; }; -typedef TDevGenericFactory FilterFactory; +typedef KDevGenericFactory FilterFactory; #endif diff --git a/parts/filter/tdevfilter.desktop b/parts/filter/kdevfilter.desktop similarity index 99% rename from parts/filter/tdevfilter.desktop rename to parts/filter/kdevfilter.desktop index 36854737..1ce8122a 100644 --- a/parts/filter/tdevfilter.desktop +++ b/parts/filter/kdevfilter.desktop @@ -32,7 +32,7 @@ Comment[tg]=Вазифаи корҳо бо матнҳои дар муҳарри Comment[tr]=Komut satırı araçlarını kullanarak düzenleyici metni işlemek için bir yol sunar. Araçlar menüsünde durur. Comment[zh_CN]=使用命令行工具操作编辑器文字。显示在工具菜单中。 Comment[zh_TW]=提供使用命令列工具操作編輯器文字的方法。會出現在工具選單中。 -Name=TDevFilter +Name=KDevFilter Name[da]=TDevelop filter Name[de]=Filter (TDevelop) Name[hi]=के-डेव-फ़िल्टर @@ -76,7 +76,7 @@ GenericName[tr]=Kabuk filtreleme ve Ekleme GenericName[zh_CN]=Shell 过滤和插入 GenericName[zh_TW]=Shell 過濾與插入 ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevfilter +X-TDE-Library=libkdevfilter X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=OptionalCodeEditing diff --git a/parts/filter/tdevfilter.rc b/parts/filter/kdevfilter.rc similarity index 85% rename from parts/filter/tdevfilter.rc rename to parts/filter/kdevfilter.rc index 4f3d82d9..6f7f9053 100644 --- a/parts/filter/tdevfilter.rc +++ b/parts/filter/kdevfilter.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/filter/tdevfilterIface.cpp b/parts/filter/kdevfilterIface.cpp similarity index 52% rename from parts/filter/tdevfilterIface.cpp rename to parts/filter/kdevfilterIface.cpp index e0c15687..3df749a4 100644 --- a/parts/filter/tdevfilterIface.cpp +++ b/parts/filter/kdevfilterIface.cpp @@ -10,26 +10,26 @@ // Copyright: See COPYING file that comes with this distribution // // -#include "tdevfilterIface.h" +#include "kdevfilterIface.h" #include "filterpart.h" -TDevFilterIface::TDevFilterIface( FilterPart* part ) - : TQObject( part ), DCOPObject( "TDevFilter" ), m_part( part ) +KDevFilterIface::KDevFilterIface( FilterPart* part ) + : TQObject( part ), DCOPObject( "KDevFilter" ), m_part( part ) { } -TDevFilterIface::~TDevFilterIface() +KDevFilterIface::~KDevFilterIface() { } -void TDevFilterIface::shellInsert() +void KDevFilterIface::shellInsert() { m_part->slotShellInsert(); } -void TDevFilterIface::shellFilter() +void KDevFilterIface::shellFilter() { m_part->slotShellFilter(); } -#include "tdevfilterIface.moc" +#include "kdevfilterIface.moc" diff --git a/parts/filter/tdevfilterIface.h b/parts/filter/kdevfilterIface.h similarity index 55% rename from parts/filter/tdevfilterIface.h rename to parts/filter/kdevfilterIface.h index 56d2aebf..fae74022 100644 --- a/parts/filter/tdevfilterIface.h +++ b/parts/filter/kdevfilterIface.h @@ -1,20 +1,20 @@ -#ifndef TDEVFILTERIFACE_H -#define TDEVFILTERIFACE_H +#ifndef KDEVFILTERIFACE_H +#define KDEVFILTERIFACE_H #include #include class FilterPart; -class TDevFilterIface : public TQObject, public DCOPObject +class KDevFilterIface : public TQObject, public DCOPObject { Q_OBJECT // K_DCOP public: - TDevFilterIface( FilterPart* part ); - ~TDevFilterIface(); + KDevFilterIface( FilterPart* part ); + ~KDevFilterIface(); k_dcop: void shellInsert(); diff --git a/parts/filter/shellfilterdlg.cpp b/parts/filter/shellfilterdlg.cpp index 7d3d0ff5..a5100d5b 100644 --- a/parts/filter/shellfilterdlg.cpp +++ b/parts/filter/shellfilterdlg.cpp @@ -23,7 +23,7 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include "domutil.h" #include "filterpart.h" diff --git a/parts/filter/shellfilterdlg.h b/parts/filter/shellfilterdlg.h index cf9812ab..87657501 100644 --- a/parts/filter/shellfilterdlg.h +++ b/parts/filter/shellfilterdlg.h @@ -16,7 +16,7 @@ class TQComboBox; class TQPushButton; -class TDevPlugin; +class KDevPlugin; class TDEProcess; diff --git a/parts/filter/shellinsertdlg.cpp b/parts/filter/shellinsertdlg.cpp index f9d24c19..057e8121 100644 --- a/parts/filter/shellinsertdlg.cpp +++ b/parts/filter/shellinsertdlg.cpp @@ -24,7 +24,7 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include "domutil.h" #include "filterpart.h" diff --git a/parts/filter/shellinsertdlg.h b/parts/filter/shellinsertdlg.h index df3085a1..fda59678 100644 --- a/parts/filter/shellinsertdlg.h +++ b/parts/filter/shellinsertdlg.h @@ -16,7 +16,7 @@ class TQComboBox; class TQPushButton; -class TDevPlugin; +class KDevPlugin; class TDEProcess; diff --git a/parts/fullscreen/CMakeLists.txt b/parts/fullscreen/CMakeLists.txt index 548e4f40..84b45df9 100644 --- a/parts/fullscreen/CMakeLists.txt +++ b/parts/fullscreen/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevfullscreen ) +install( FILES kdevfullscreen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_fullscreen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevfullscreen ) -##### libtdevfullscreen (module) ################ +##### libkdevfullscreen (module) ################ -tde_add_kpart( libtdevfullscreen AUTOMOC +tde_add_kpart( libkdevfullscreen AUTOMOC SOURCES fullscreen_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/fullscreen/Makefile.am b/parts/fullscreen/Makefile.am index a05b0bd1..3f039ef6 100644 --- a/parts/fullscreen/Makefile.am +++ b/parts/fullscreen/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevfullscreen.la -libtdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevfullscreen.la +libkdevfullscreen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevfullscreen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevfullscreen_la_SOURCES = fullscreen_part.cpp +libkdevfullscreen_la_SOURCES = fullscreen_part.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevfullscreen.desktop +service_DATA = kdevfullscreen.desktop -rcdir = $(kde_datadir)/tdevfullscreen -rc_DATA = tdevpart_fullscreen.rc +rcdir = $(kde_datadir)/kdevfullscreen +rc_DATA = kdevpart_fullscreen.rc diff --git a/parts/fullscreen/fullscreen_part.cpp b/parts/fullscreen/fullscreen_part.cpp index a73f33f1..22cecb42 100644 --- a/parts/fullscreen/fullscreen_part.cpp +++ b/parts/fullscreen/fullscreen_part.cpp @@ -11,32 +11,32 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include "fullscreen_part.h" -static const TDevPluginInfo data("tdevfullscreen"); +static const KDevPluginInfo data("kdevfullscreen"); -typedef TDevGenericFactory FullScreenFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevfullscreen, FullScreenFactory( data ) ) +typedef KDevGenericFactory FullScreenFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevfullscreen, FullScreenFactory( data ) ) FullScreenPart::FullScreenPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "FullScreenPart" ) + : KDevPlugin(&data, parent, name ? name : "FullScreenPart" ) { setInstance(FullScreenFactory::instance()); // const TDEAboutData &abdata1 = *(info()); // kdDebug() << abdata1.appName() << endl; - const TDevPluginInfo &_info = *info(); + const KDevPluginInfo &_info = *info(); const TDEAboutData *abdata = _info; kdDebug() << abdata->appName() << endl; - setXMLFile("tdevpart_fullscreen.rc"); + setXMLFile("kdevpart_fullscreen.rc"); m_bFullScreen = false; diff --git a/parts/fullscreen/fullscreen_part.h b/parts/fullscreen/fullscreen_part.h index 2964b5d9..fcb566e8 100644 --- a/parts/fullscreen/fullscreen_part.h +++ b/parts/fullscreen/fullscreen_part.h @@ -9,15 +9,15 @@ * * ***************************************************************************/ -#ifndef __TDEVPART_FULLSCREEN_H__ -#define __TDEVPART_FULLSCREEN_H__ +#ifndef __KDEVPART_FULLSCREEN_H__ +#define __KDEVPART_FULLSCREEN_H__ #include -#include +#include class TDEAction; -class FullScreenPart : public TDevPlugin +class FullScreenPart : public KDevPlugin { Q_OBJECT diff --git a/parts/fullscreen/tdevfullscreen.desktop b/parts/fullscreen/kdevfullscreen.desktop similarity index 98% rename from parts/fullscreen/tdevfullscreen.desktop rename to parts/fullscreen/kdevfullscreen.desktop index 4974af20..6f935c85 100644 --- a/parts/fullscreen/tdevfullscreen.desktop +++ b/parts/fullscreen/kdevfullscreen.desktop @@ -81,6 +81,6 @@ GenericName[zh_TW]=全螢幕 Icon=tdevelop ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Core -X-TDE-Library=libtdevfullscreen +X-TDE-Library=libkdevfullscreen X-TDevelop-Version=5 X-TDevelop-Properties=ViewManagement diff --git a/parts/fullscreen/tdevpart_fullscreen.rc b/parts/fullscreen/kdevpart_fullscreen.rc similarity index 100% rename from parts/fullscreen/tdevpart_fullscreen.rc rename to parts/fullscreen/kdevpart_fullscreen.rc diff --git a/parts/grepview/CMakeLists.txt b/parts/grepview/CMakeLists.txt index 96d4042b..5ad23e4f 100644 --- a/parts/grepview/CMakeLists.txt +++ b/parts/grepview/CMakeLists.txt @@ -27,16 +27,16 @@ link_directories( ##### other data ################################ -install( FILES tdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview ) +install( FILES kdevgrepview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevgrepview.rc DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview ) -##### libtdevgrepview (module) ################## +##### libkdevgrepview (module) ################## -tde_add_kpart( libtdevgrepview AUTOMOC +tde_add_kpart( libkdevgrepview AUTOMOC SOURCES grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp LINK - tdevwidgets-shared tdevelop-shared + kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/grepview/Makefile.am b/parts/grepview/Makefile.am index 8ae4725c..dc5f5fed 100644 --- a/parts/grepview/Makefile.am +++ b/parts/grepview/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevgrepview.la -libtdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevgrepview.la +libkdevgrepview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevgrepview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -libtdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp +libkdevgrepview_la_SOURCES = grepviewpart.cpp grepviewwidget.cpp grepdlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevgrepview.desktop +service_DATA = kdevgrepview.desktop -rcdir = $(kde_datadir)/tdevgrepview -rc_DATA = tdevgrepview.rc +rcdir = $(kde_datadir)/kdevgrepview +rc_DATA = kdevgrepview.rc diff --git a/parts/grepview/grepdlg.cpp b/parts/grepview/grepdlg.cpp index 8e8b0eb3..6333805f 100644 --- a/parts/grepview/grepdlg.cpp +++ b/parts/grepview/grepdlg.cpp @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include "grepviewpart.h" diff --git a/parts/grepview/grepviewpart.cpp b/parts/grepview/grepviewpart.cpp index 9d6b08c5..92f4ebb6 100644 --- a/parts/grepview/grepviewpart.cpp +++ b/parts/grepview/grepviewpart.cpp @@ -23,26 +23,26 @@ #include #include -#include "tdevcore.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevplugininfo.h" -#include "tdeveditorutil.h" +#include "kdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevplugininfo.h" +#include "kdeveditorutil.h" #include "grepviewwidget.h" -static const TDevPluginInfo data("tdevgrepview"); +static const KDevPluginInfo data("kdevgrepview"); -K_EXPORT_COMPONENT_FACTORY(libtdevgrepview, GrepViewFactory(data)) +K_EXPORT_COMPONENT_FACTORY(libkdevgrepview, GrepViewFactory(data)) GrepViewPart::GrepViewPart( TQObject *parent, const char *name, const TQStringList & ) - : TDevPlugin( &data, parent, name ? name : "GrepViewPart" ) + : KDevPlugin( &data, parent, name ? name : "GrepViewPart" ) { setInstance(GrepViewFactory::instance()); - setXMLFile("tdevgrepview.rc"); + setXMLFile("kdevgrepview.rc"); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(stopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(stopButtonClicked(KDevPlugin*)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(projectClosed()) ); connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), @@ -83,7 +83,7 @@ GrepViewPart::~GrepViewPart() } -void GrepViewPart::stopButtonClicked(TDevPlugin* which) +void GrepViewPart::stopButtonClicked(KDevPlugin* which) { if ( which != 0 && which != this ) return; @@ -129,10 +129,10 @@ void GrepViewPart::slotGrep() { if ( !m_widget->isRunning() ) { - TQString contextString = TDevEditorUtil::currentSelection( dynamic_cast( partController()->activePart() ) ); + TQString contextString = KDevEditorUtil::currentSelection( dynamic_cast( partController()->activePart() ) ); if ( contextString.isEmpty() ) { - contextString = TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); + contextString = KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ); } m_widget->showDialogWithPattern( contextString ); } diff --git a/parts/grepview/grepviewpart.h b/parts/grepview/grepviewpart.h index 68c4a574..4ebd7638 100644 --- a/parts/grepview/grepviewpart.h +++ b/parts/grepview/grepviewpart.h @@ -13,8 +13,8 @@ #define _GREPVIEWPART_H_ #include -#include -#include "tdevplugin.h" +#include +#include "kdevplugin.h" class KDialogBase; class TQPopupMenu; @@ -22,7 +22,7 @@ class Context; class GrepViewWidget; -class GrepViewPart : public TDevPlugin +class GrepViewPart : public KDevPlugin { Q_OBJECT @@ -32,7 +32,7 @@ public: ~GrepViewPart(); private slots: - void stopButtonClicked(TDevPlugin *which); + void stopButtonClicked(KDevPlugin *which); void projectOpened(); void projectClosed(); void contextMenu(TQPopupMenu *popup, const Context *context); @@ -46,6 +46,6 @@ private: friend class GrepViewWidget; }; -typedef TDevGenericFactory GrepViewFactory; +typedef KDevGenericFactory GrepViewFactory; #endif diff --git a/parts/grepview/grepviewwidget.cpp b/parts/grepview/grepviewwidget.cpp index edcdaa7c..1d709dff 100644 --- a/parts/grepview/grepviewwidget.cpp +++ b/parts/grepview/grepviewwidget.cpp @@ -27,10 +27,10 @@ #include using namespace KTextEditor; -#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 "grepdlg.h" #include "grepviewpart.h" @@ -181,7 +181,7 @@ void GrepViewWidget::showDialog() } } // Determine if we have a list of project files - TDevProject *openProject = m_part->project(); + KDevProject *openProject = m_part->project(); if (openProject) { grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty()); @@ -225,7 +225,7 @@ void GrepViewWidget::showDialogWithPattern(TQString pattern) grepdlg->setPattern( pattern ); // Determine if we have a list of project files - TDevProject *openProject = m_part->project(); + KDevProject *openProject = m_part->project(); if (openProject) { grepdlg->setEnableProjectBox(!openProject->allFiles().isEmpty()); @@ -255,7 +255,7 @@ void GrepViewWidget::searchActivated() if (grepdlg->useProjectFilesFlag()) { - TDevProject *openProject = m_part->project(); + KDevProject *openProject = m_part->project(); if (openProject) { TQString tmpFilePath; @@ -430,7 +430,7 @@ void GrepViewProcessWidget::insertStdoutLine(const TQCString &line) } -void GrepViewWidget::projectChanged(TDevProject *project) +void GrepViewWidget::projectChanged(KDevProject *project) { TQString dir = project? project->projectDirectory() : TQDir::homeDirPath(); grepdlg->setDirectory(dir); diff --git a/parts/grepview/grepviewwidget.h b/parts/grepview/grepviewwidget.h index 0f05c136..3bf803b5 100644 --- a/parts/grepview/grepviewwidget.h +++ b/parts/grepview/grepviewwidget.h @@ -18,7 +18,7 @@ class GrepDialog; class GrepViewPart; -class TDevProject; +class KDevProject; class KTabWidget; class TQHBoxLayout; class TQToolButton; @@ -66,7 +66,7 @@ public: GrepViewWidget(GrepViewPart *part); ~GrepViewWidget(); - void projectChanged(TDevProject *project); + void projectChanged(KDevProject *project); void killJob( int signo = SIGTERM ); bool isRunning() const; diff --git a/parts/grepview/tdevgrepview.desktop b/parts/grepview/kdevgrepview.desktop similarity index 99% rename from parts/grepview/tdevgrepview.desktop rename to parts/grepview/kdevgrepview.desktop index c7b98916..0521c804 100644 --- a/parts/grepview/tdevgrepview.desktop +++ b/parts/grepview/kdevgrepview.desktop @@ -80,7 +80,7 @@ GenericName[zh_CN]=Grep 前端 GenericName[zh_TW]=Grep 前端介面 Icon=find ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevgrepview +X-TDE-Library=libkdevgrepview X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=FileSearch diff --git a/parts/grepview/tdevgrepview.rc b/parts/grepview/kdevgrepview.rc similarity index 100% rename from parts/grepview/tdevgrepview.rc rename to parts/grepview/kdevgrepview.rc diff --git a/parts/konsole/CMakeLists.txt b/parts/konsole/CMakeLists.txt index 37cd0687..e6b51296 100644 --- a/parts/konsole/CMakeLists.txt +++ b/parts/konsole/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevkonsoleview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevkonsoleview (module) ############### +##### libkdevkonsoleview (module) ############### -tde_add_kpart( libtdevkonsoleview AUTOMOC +tde_add_kpart( libkdevkonsoleview AUTOMOC SOURCES konsoleviewpart.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/konsole/Makefile.am b/parts/konsole/Makefile.am index 1cc781d4..085f8e7a 100644 --- a/parts/konsole/Makefile.am +++ b/parts/konsole/Makefile.am @@ -2,15 +2,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevkonsoleview.la -libtdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/util/libtdevutil.la +kde_module_LTLIBRARIES = libkdevkonsoleview.la +libkdevkonsoleview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevkonsoleview_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/util/libkdevutil.la -libtdevkonsoleview_la_SOURCES = konsoleviewpart.cpp +libkdevkonsoleview_la_SOURCES = konsoleviewpart.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevkonsoleview.desktop +service_DATA = kdevkonsoleview.desktop diff --git a/parts/konsole/tdevkonsoleview.desktop b/parts/konsole/kdevkonsoleview.desktop similarity index 99% rename from parts/konsole/tdevkonsoleview.desktop rename to parts/konsole/kdevkonsoleview.desktop index edc9018f..4a9fa14e 100644 --- a/parts/konsole/tdevkonsoleview.desktop +++ b/parts/konsole/kdevkonsoleview.desktop @@ -80,7 +80,7 @@ GenericName[zh_CN]=嵌入的 Konsole GenericName[zh_TW]=嵌入式主控台 Icon=konsole ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevkonsoleview +X-TDE-Library=libkdevkonsoleview X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=Console diff --git a/parts/konsole/konsoleviewpart.cpp b/parts/konsole/konsoleviewpart.cpp index 63f720d9..873ab790 100644 --- a/parts/konsole/konsoleviewpart.cpp +++ b/parts/konsole/konsoleviewpart.cpp @@ -13,27 +13,27 @@ #include -#include +#include #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevmainwindow.h" -#include "tdevplugininfo.h" -#include "tdevshellwidget.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevmainwindow.h" +#include "kdevplugininfo.h" +#include "kdevshellwidget.h" -typedef TDevGenericFactory KonsoleViewFactory; -static const TDevPluginInfo data("tdevkonsoleview"); -K_EXPORT_COMPONENT_FACTORY(libtdevkonsoleview, KonsoleViewFactory(data)) +typedef KDevGenericFactory KonsoleViewFactory; +static const KDevPluginInfo data("kdevkonsoleview"); +K_EXPORT_COMPONENT_FACTORY(libkdevkonsoleview, KonsoleViewFactory(data)) KonsoleViewPart::KonsoleViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "KonsoleViewPart") + : KDevPlugin(&data, parent, name ? name : "KonsoleViewPart") { setInstance( KonsoleViewFactory::instance() ); - m_widget = new TDevShellWidget( 0, "konsole widget" ); + m_widget = new KDevShellWidget( 0, "konsole widget" ); TQWhatsThis::add(m_widget, i18n("Konsole

" "This window contains an embedded konsole window. It will try to follow you when " diff --git a/parts/konsole/konsoleviewpart.h b/parts/konsole/konsoleviewpart.h index 912e00b4..9bcecb38 100644 --- a/parts/konsole/konsoleviewpart.h +++ b/parts/konsole/konsoleviewpart.h @@ -14,12 +14,12 @@ #include -#include "tdevplugin.h" +#include "kdevplugin.h" -class TDevShellWidget; +class KDevShellWidget; -class KonsoleViewPart : public TDevPlugin +class KonsoleViewPart : public KDevPlugin { Q_OBJECT @@ -31,7 +31,7 @@ private slots: void projectOpened(); private: - TQGuardedPtr m_widget; + TQGuardedPtr m_widget; }; #endif diff --git a/parts/konsole/konsoleviewwidget.cpp b/parts/konsole/konsoleviewwidget.cpp index 26ac9e29..7c21cab2 100644 --- a/parts/konsole/konsoleviewwidget.cpp +++ b/parts/konsole/konsoleviewwidget.cpp @@ -20,10 +20,10 @@ #include #include -#include "tdevcore.h" -#include "tdevproject.h" +#include "kdevcore.h" +#include "kdevproject.h" #include "konsoleviewpart.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include "konsoleviewwidget.h" diff --git a/parts/konsole/konsoleviewwidget.h b/parts/konsole/konsoleviewwidget.h index 6a7f6a9f..2bf3160a 100644 --- a/parts/konsole/konsoleviewwidget.h +++ b/parts/konsole/konsoleviewwidget.h @@ -17,7 +17,7 @@ #include -class TDevProject; +class KDevProject; class KonsoleWidgetPrivate; class KonsoleViewPart; namespace KParts { diff --git a/parts/openwith/CMakeLists.txt b/parts/openwith/CMakeLists.txt index d870a3e0..8384bdaa 100644 --- a/parts/openwith/CMakeLists.txt +++ b/parts/openwith/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevopenwith.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevopenwith (module) ################## +##### libkdevopenwith (module) ################## -tde_add_kpart( libtdevopenwith AUTOMOC +tde_add_kpart( libkdevopenwith AUTOMOC SOURCES openwithpart.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/openwith/Makefile.am b/parts/openwith/Makefile.am index 316572ef..57503a0e 100644 --- a/parts/openwith/Makefile.am +++ b/parts/openwith/Makefile.am @@ -2,14 +2,14 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevopenwith.la -libtdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevopenwith.la +libkdevopenwith_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevopenwith_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevopenwith_la_SOURCES = openwithpart.cpp +libkdevopenwith_la_SOURCES = openwithpart.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevopenwith.desktop +service_DATA = kdevopenwith.desktop diff --git a/parts/openwith/tdevopenwith.desktop b/parts/openwith/kdevopenwith.desktop similarity index 99% rename from parts/openwith/tdevopenwith.desktop rename to parts/openwith/kdevopenwith.desktop index fa1be30d..0108daaa 100644 --- a/parts/openwith/tdevopenwith.desktop +++ b/parts/openwith/kdevopenwith.desktop @@ -76,7 +76,7 @@ GenericName[zh_CN]=“打开方式”菜单项 GenericName[zh_TW]="開啟方式"選單 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevopenwith +X-TDE-Library=libkdevopenwith X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=GlobalFileManagement,FileOpenWith diff --git a/parts/openwith/openwithpart.cpp b/parts/openwith/openwithpart.cpp index a223f193..63fcc6d9 100644 --- a/parts/openwith/openwithpart.cpp +++ b/parts/openwith/openwithpart.cpp @@ -3,7 +3,7 @@ #include #include -#include +#include #include #include #include @@ -11,18 +11,18 @@ #include #include -#include "tdevpartcontroller.h" -#include "tdevcore.h" -#include "tdevplugininfo.h" +#include "kdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevplugininfo.h" #include "urlutil.h" -typedef TDevGenericFactory OpenWithFactory; +typedef KDevGenericFactory OpenWithFactory; -static const TDevPluginInfo data("tdevopenwith"); -K_EXPORT_COMPONENT_FACTORY(libtdevopenwith, OpenWithFactory(data)) +static const KDevPluginInfo data("kdevopenwith"); +K_EXPORT_COMPONENT_FACTORY(libkdevopenwith, OpenWithFactory(data)) OpenWithPart::OpenWithPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "OpenWithPart") + : KDevPlugin(&data, parent, name ? name : "OpenWithPart") { setInstance( OpenWithFactory::instance() ); diff --git a/parts/openwith/openwithpart.h b/parts/openwith/openwithpart.h index 0c9a20ac..bd338a3f 100644 --- a/parts/openwith/openwithpart.h +++ b/parts/openwith/openwithpart.h @@ -3,13 +3,13 @@ #include -#include "tdevplugin.h" +#include "kdevplugin.h" class TQPopupMenu; class Context; -class OpenWithPart : public TDevPlugin +class OpenWithPart : public KDevPlugin { Q_OBJECT diff --git a/parts/outputviews/CMakeLists.txt b/parts/outputviews/CMakeLists.txt index 18effab8..48cf38ec 100644 --- a/parts/outputviews/CMakeLists.txt +++ b/parts/outputviews/CMakeLists.txt @@ -30,40 +30,40 @@ link_directories( ##### other data ################################ install( FILES - tdevappoutputview.desktop tdevmakeview.desktop + kdevappoutputview.desktop kdevmakeview.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevmakeview.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevappoutputview ) + kdevmakeview.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevappoutputview ) install( FILES - tdevmakeview.rc - DESTINATION ${DATA_INSTALL_DIR}/tdevmakeview ) + kdevmakeview.rc + DESTINATION ${DATA_INSTALL_DIR}/kdevmakeview ) -##### libtdevmakeview (module) ################## +##### libkdevmakeview (module) ################## -tde_add_kpart( libtdevmakeview AUTOMOC +tde_add_kpart( libkdevmakeview AUTOMOC SOURCES makeviewpart.cpp makewidget.cpp directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp makeitem.cpp makeactionfilter.cpp otherfilter.cpp LINK - tdevdcopextensions-static tdevextensions-static - tdevwidgets-shared tdevelop-shared + kdevdcopextensions-static kdevextensions-static + kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### libtdevappview (module) ################### +##### libkdevappview (module) ################### -tde_add_kpart( libtdevappview AUTOMOC +tde_add_kpart( libkdevappview AUTOMOC SOURCES appoutputviewpart.cpp appoutputwidget.cpp filterdlg.ui LINK - tdevdcopextensions-static tdevextensions-static - tdevwidgets-shared tdevelop-shared + kdevdcopextensions-static kdevextensions-static + kdevwidgets-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/parts/outputviews/Makefile.am b/parts/outputviews/Makefile.am index 6536d0f2..6a890586 100644 --- a/parts/outputviews/Makefile.am +++ b/parts/outputviews/Makefile.am @@ -4,32 +4,32 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/interfaces/extensions/dcop -I$(top_srcdir)/lib/util \ -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevmakeview.la libtdevappview.la +kde_module_LTLIBRARIES = libkdevmakeview.la libkdevappview.la METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevappoutputview.desktop tdevmakeview.desktop +service_DATA = kdevappoutputview.desktop kdevmakeview.desktop -rc1dir = $(kde_datadir)/tdevappoutputview -rc1_DATA = tdevmakeview.rc +rc1dir = $(kde_datadir)/kdevappoutputview +rc1_DATA = kdevmakeview.rc -rc2dir = $(kde_datadir)/tdevmakeview -rc2_DATA = tdevmakeview.rc +rc2dir = $(kde_datadir)/kdevmakeview +rc2_DATA = kdevmakeview.rc noinst_HEADERS = filterdlg.h -libtdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \ - $(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libtdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ +libkdevmakeview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevmakeview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ + $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevmakeview_la_SOURCES = makeviewpart.cpp makewidget.cpp \ directorystatusmessagefilter.cpp outputfilter.cpp compileerrorfilter.cpp commandcontinuationfilter.cpp \ makeitem.cpp makeactionfilter.cpp otherfilter.cpp -libtdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libtdevwidgets.la \ - $(top_builddir)/lib/interfaces/extensions/dcop/libtdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ - $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libtdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \ +libkdevappview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevappview_la_LIBADD = $(top_builddir)/lib/widgets/libkdevwidgets.la \ + $(top_builddir)/lib/interfaces/extensions/dcop/libkdevdcopextensions.la $(top_builddir)/lib/libtdevelop.la \ + $(LIB_TDEHTML) $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevappview_la_SOURCES = appoutputviewpart.cpp appoutputwidget.cpp \ filterdlg.ui diff --git a/parts/outputviews/appoutputviewpart.cpp b/parts/outputviews/appoutputviewpart.cpp index 223d3855..3a0e0e7d 100644 --- a/parts/outputviews/appoutputviewpart.cpp +++ b/parts/outputviews/appoutputviewpart.cpp @@ -18,27 +18,27 @@ #include #include #include -#include -#include +#include +#include #include -#include "tdevproject.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" +#include "kdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" #include "appoutputwidget.h" -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include "settings.h" -static const TDevPluginInfo data("tdevappoutputview"); -typedef TDevGenericFactory< AppOutputViewPart > AppViewFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevappview, AppViewFactory( data ) ) +static const KDevPluginInfo data("kdevappoutputview"); +typedef KDevGenericFactory< AppOutputViewPart > AppViewFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevappview, AppViewFactory( data ) ) AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") + : KDevAppFrontend(&data, parent, name ? name : "AppOutputViewPart") { setInstance(AppViewFactory::instance()); - m_dcop = new TDevAppFrontendIface(this); + m_dcop = new KDevAppFrontendIface(this); m_widget = new AppOutputWidget(this); m_widget->setIcon( SmallIcon("openterm") ); @@ -51,8 +51,8 @@ AppOutputViewPart::AppOutputViewPart(TQObject *parent, const char *name, const T mainWindow()->embedOutputView(m_widget, i18n("Application"), i18n("Output of the executed user program")); hideView(); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(slotProcessExited())); connect(m_widget, TQT_SIGNAL(processExited(TDEProcess*)), TQT_SIGNAL(processExited())); } @@ -66,7 +66,7 @@ AppOutputViewPart::~AppOutputViewPart() delete m_dcop; } -void AppOutputViewPart::slotStopButtonClicked( TDevPlugin* which ) +void AppOutputViewPart::slotStopButtonClicked( KDevPlugin* which ) { if ( which != 0 && which != this ) return; diff --git a/parts/outputviews/appoutputviewpart.h b/parts/outputviews/appoutputviewpart.h index 306108cd..1067af97 100644 --- a/parts/outputviews/appoutputviewpart.h +++ b/parts/outputviews/appoutputviewpart.h @@ -14,13 +14,13 @@ #include -#include "tdevappfrontend.h" -#include "TDevAppFrontendIface.h" +#include "kdevappfrontend.h" +#include "KDevAppFrontendIface.h" class AppOutputWidget; -class AppOutputViewPart : public TDevAppFrontend +class AppOutputViewPart : public KDevAppFrontend { Q_OBJECT @@ -45,12 +45,12 @@ signals: void processExited(); private slots: - void slotStopButtonClicked(TDevPlugin*); + void slotStopButtonClicked(KDevPlugin*); void slotProcessExited(); private: TQGuardedPtr m_widget; - TDevAppFrontendIface *m_dcop; + KDevAppFrontendIface *m_dcop; bool m_viewIsVisible; }; diff --git a/parts/outputviews/appoutputwidget.cpp b/parts/outputviews/appoutputwidget.cpp index 0201ce5c..50060339 100644 --- a/parts/outputviews/appoutputwidget.cpp +++ b/parts/outputviews/appoutputwidget.cpp @@ -33,9 +33,9 @@ #include "appoutputviewpart.h" #include "filterdlg.h" -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" AppOutputWidget::AppOutputWidget(AppOutputViewPart* part) : ProcessWidget(0, "app output widget"), m_part(part) diff --git a/parts/outputviews/tdevappoutputview.desktop b/parts/outputviews/kdevappoutputview.desktop similarity index 96% rename from parts/outputviews/tdevappoutputview.desktop rename to parts/outputviews/kdevappoutputview.desktop index 7791162d..bca43d54 100644 --- a/parts/outputviews/tdevappoutputview.desktop +++ b/parts/outputviews/kdevappoutputview.desktop @@ -34,15 +34,15 @@ Comment[tg]=Тирезаи хориҷ кардани гузориш Comment[tr]=Uygulama Çıktı Görünümü Comment[zh_CN]=应用程序输出查看器 Comment[zh_TW]=應用程式輸出檢視 -Name=TDevAppOutputView +Name=KDevAppOutputView Name[da]=TDevelop Program-uddata fremvisning Name[de]=Anwendungsausgabe (TDevelop) Name[hi]=के-डेव-एप्प-आउटपुट-व्यू Name[nds]=Programmutgaav-Kieker (TDevelop) -Name[pl]=TDevAppWidokWyjścia +Name[pl]=KDevAppWidokWyjścia Name[sk]=KDev pohľad na výstup aplikácie Name[sv]=TDevelop programutmatningsvy -Name[ta]=TDevApp வெளியீட்டுக் காட்சி +Name[ta]=KDevApp வெளியீட்டுக் காட்சி Name[zh_TW]=TDevelop 應用程式輸出檢視 GenericName=Application Output View GenericName[ca]=Visor de l'eixida de les aplicacions @@ -78,7 +78,7 @@ GenericName[zh_CN]=应用程序输出查看器 GenericName[zh_TW]=應用程式輸出檢視 Icon=exec ServiceTypes=TDevelop/AppFrontend -X-TDE-Library=libtdevappview +X-TDE-Library=libkdevappview X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=OutputTool diff --git a/parts/outputviews/tdevmakeview.desktop b/parts/outputviews/kdevmakeview.desktop similarity index 98% rename from parts/outputviews/tdevmakeview.desktop rename to parts/outputviews/kdevmakeview.desktop index 5651f031..bfea5cec 100644 --- a/parts/outputviews/tdevmakeview.desktop +++ b/parts/outputviews/kdevmakeview.desktop @@ -35,7 +35,7 @@ Comment[tg]=Интерфейс ба талфифгар Comment[tr]=Derleyici Önucu Comment[zh_CN]=编译器前端 Comment[zh_TW]=編譯器前端介面 -Name=TDevMakeView +Name=KDevMakeView Name[da]=TDevelop Make-visning Name[de]=Make-Ausgabe (TDevelop) Name[hi]=के-डेव-मेक-व्यू @@ -81,7 +81,7 @@ GenericName[zh_CN]=编译器前端 GenericName[zh_TW]=編譯器前端介面 Icon=konsole ServiceTypes=TDevelop/MakeFrontend -X-TDE-Library=libtdevmakeview +X-TDE-Library=libkdevmakeview X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=OutputTool diff --git a/parts/outputviews/tdevmakeview.rc b/parts/outputviews/kdevmakeview.rc similarity index 84% rename from parts/outputviews/tdevmakeview.rc rename to parts/outputviews/kdevmakeview.rc index 869191cb..fc8c82f6 100644 --- a/parts/outputviews/tdevmakeview.rc +++ b/parts/outputviews/kdevmakeview.rc @@ -1,5 +1,5 @@ - +

diff --git a/parts/outputviews/makeactionfilter.cpp b/parts/outputviews/makeactionfilter.cpp index 157a2c2e..ee38d144 100644 --- a/parts/outputviews/makeactionfilter.cpp +++ b/parts/outputviews/makeactionfilter.cpp @@ -184,11 +184,11 @@ void MakeActionFilter::test() "-I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic -W " "-Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion " "-Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new " - "-fno-common -MT tdevcore.lo -MD -MP -MF \".deps/tdevcore.Tpo\" -c -o tdevcore.lo `test -f " - "'/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp' || echo " - "'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/tdevcore.cpp; then mv " - "\".deps/tdevcore.Tpo\" \".deps/tdevcore.Plo\"; else rm -f \".deps/tdevcore.Tpo\"; exit 1; fi", - "compiling", "g++", "tdevcore.cpp" ) + "-fno-common -MT kdevcore.lo -MD -MP -MF \".deps/kdevcore.Tpo\" -c -o kdevcore.lo `test -f " + "'/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp' || echo " + "'/home/john/src/kde/tdevelop/lib/interfaces/'`/home/john/src/kde/tdevelop/lib/interfaces/kdevcore.cpp; then mv " + "\".deps/kdevcore.Tpo\" \".deps/kdevcore.Plo\"; else rm -f \".deps/kdevcore.Tpo\"; exit 1; fi", + "compiling", "g++", "kdevcore.cpp" ) << TestItem( // automake 1.7, srcdir != builddir "if g++ -DHAVE_CONFIG_H -I. -I/home/john/src/kde/tdevelop/src -I.. -I/home/john/src/kde/tdevelop/lib/interfaces " "-I/home/john/src/kde/tdevelop/lib/sourceinfo -I/home/john/src/kde/tdevelop/lib/util -I/home/john/src/kde/tdevelop/lib " @@ -222,12 +222,12 @@ void MakeActionFilter::test() "/bin/sh ../../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align " "-Wconversion -Wchar-subscripts -fno-builtin -g3 -Wformat-security -Wmissing-format-attribute -fno-exceptions " - "-fno-check-new -fno-common -o libtdevoutputviews.la.closure libtdevoutputviews_la_closure.lo -L/usr/X11R6/lib " + "-fno-check-new -fno-common -o libkdevoutputviews.la.closure libkdevoutputviews_la_closure.lo -L/usr/X11R6/lib " "-L/home/john/src/kde/qt-copy/lib -L/usr/local/kde/lib -avoid-version -module -no-undefined -R /usr/local/kde/lib " "-R /home/john/src/kde/qt-copy/lib -R /usr/X11R6/lib outputviewsfactory.lo makeviewpart.lo makewidget.lo " "appoutputviewpart.lo appoutputwidget.lo directorystatusmessagefilter.lo outputfilter.lo compileerrorfilter.lo " "commandcontinuationfilter.lo makeitem.lo makeactionfilter.lo otherfilter.lo ../../lib/libtdevelop.la", - "linking", "libtool", "libtdevoutputviews.la.closure" ) + "linking", "libtool", "libkdevoutputviews.la.closure" ) << TestItem( //libtool, linking 2 "/bin/sh ../libtool --silent --mode=link --tag=CXX g++ -Wnon-virtual-dtor -Wno-long-long -Wundef -Wall -pedantic " "-W -Wpointer-arith -Wwrite-strings -ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts " @@ -254,12 +254,12 @@ void MakeActionFilter::test() "echo '/home/andris/cvs-developement/head/quanta/quanta/project/'`/home/andris/cvs-developement/head/quanta/quanta/project/project.cpp ", "compiling", "g++", "project.cpp") << TestItem( - "/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/TDevAppFrontendIface.h > TDevAppFrontendIface.kidl " - "|| ( rm -f TDevAppFrontendIface.kidl ; /bin/false )", - "generating", "dcopidl", "TDevAppFrontendIface.kidl" ) + "/usr/local/kde/bin/dcopidl /home/john/src/kde/tdevelop/lib/interfaces/KDevAppFrontendIface.h > KDevAppFrontendIface.kidl " + "|| ( rm -f KDevAppFrontendIface.kidl ; /bin/false )", + "generating", "dcopidl", "KDevAppFrontendIface.kidl" ) << TestItem( - "/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub TDevAppFrontendIface.kidl", - "compiling", "dcopidl2cpp", "TDevAppFrontendIface.kidl" ) + "/usr/local/kde/bin/dcopidl2cpp --c++-suffix cpp --no-signals --no-stub KDevAppFrontendIface.kidl", + "compiling", "dcopidl2cpp", "KDevAppFrontendIface.kidl" ) << TestItem( //install "/usr/bin/install -c -p -m 644 /home/andris/development/quanta/quanta/kommander/editor/kmdr-editor.desktop " "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop", "installing", "", "/opt/trinity/share/applnk/Editors/kmdr-editor.desktop") diff --git a/parts/outputviews/makeviewpart.cpp b/parts/outputviews/makeviewpart.cpp index e8eb6a75..9324bcb0 100644 --- a/parts/outputviews/makeviewpart.cpp +++ b/parts/outputviews/makeviewpart.cpp @@ -17,27 +17,27 @@ #include #include #include -#include -#include +#include +#include -#include "tdevproject.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" +#include "kdevproject.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" #include "makewidget.h" -static const TDevPluginInfo data("tdevmakeview"); -typedef TDevGenericFactory< MakeViewPart > MakeViewFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevmakeview, MakeViewFactory( data ) ) +static const KDevPluginInfo data("kdevmakeview"); +typedef KDevGenericFactory< MakeViewPart > MakeViewFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevmakeview, MakeViewFactory( data ) ) MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringList &) - : TDevMakeFrontend(&data, parent, name) + : KDevMakeFrontend(&data, parent, name) { setInstance(MakeViewFactory::instance()); - setXMLFile("tdevmakeview.rc"); + setXMLFile("kdevmakeview.rc"); - m_dcop = new TDevMakeFrontendIface(this); + m_dcop = new KDevMakeFrontendIface(this); m_widget = new MakeWidget(this); m_widget->setIcon( SmallIcon("exec") ); @@ -61,8 +61,8 @@ MakeViewPart::MakeViewPart(TQObject *parent, const char *name, const TQStringLis action->setToolTip( i18n("Go to the previous error") ); action->setWhatsThis(i18n("Previous error

Switches to the file and line where the previous error was reported from.")); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); } @@ -74,7 +74,7 @@ MakeViewPart::~MakeViewPart() delete m_dcop; } -void MakeViewPart::slotStopButtonClicked(TDevPlugin* which) +void MakeViewPart::slotStopButtonClicked(KDevPlugin* which) { if ( which != 0 && which != this ) return; diff --git a/parts/outputviews/makeviewpart.h b/parts/outputviews/makeviewpart.h index 420eebcb..89f2a8bd 100644 --- a/parts/outputviews/makeviewpart.h +++ b/parts/outputviews/makeviewpart.h @@ -14,13 +14,13 @@ #include -#include "tdevmakefrontend.h" -#include "TDevMakeFrontendIface.h" +#include "kdevmakefrontend.h" +#include "KDevMakeFrontendIface.h" class MakeWidget; -class MakeViewPart : public TDevMakeFrontend +class MakeViewPart : public KDevMakeFrontend { Q_OBJECT @@ -32,7 +32,7 @@ public: virtual void updateSettingsFromConfig(); private slots: - void slotStopButtonClicked(TDevPlugin*); + void slotStopButtonClicked(KDevPlugin*); protected: virtual void queueCommand(const TQString &dir, const TQString &command); @@ -40,7 +40,7 @@ protected: private: TQGuardedPtr m_widget; - TDevMakeFrontendIface *m_dcop; + KDevMakeFrontendIface *m_dcop; friend class MakeWidget; }; diff --git a/parts/outputviews/makewidget.cpp b/parts/outputviews/makewidget.cpp index 0e2e6aef..029efdc6 100644 --- a/parts/outputviews/makewidget.cpp +++ b/parts/outputviews/makewidget.cpp @@ -10,10 +10,10 @@ ***************************************************************************/ #include "makewidget.h" -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" #include "processlinemaker.h" #include "makeviewpart.h" #include "makeitem.h" diff --git a/parts/outputviews/outputviewsfactory.cpp b/parts/outputviews/outputviewsfactory.cpp index d63621d6..55e5bf55 100644 --- a/parts/outputviews/outputviewsfactory.cpp +++ b/parts/outputviews/outputviewsfactory.cpp @@ -11,11 +11,11 @@ #include "outputviewsfactory.h" -static const TDevPluginInfo data("tdevoutputviews", I18N_NOOP("Messages Output"), "1.0"); +static const KDevPluginInfo data("kdevoutputviews", I18N_NOOP("Messages Output"), "1.0"); -K_EXPORT_COMPONENT_FACTORY( libtdevoutputviews, OutputViewsFactory( &data ) ) +K_EXPORT_COMPONENT_FACTORY( libkdevoutputviews, OutputViewsFactory( &data ) ) -const TDevPluginInfo *outputViewsInfo() +const KDevPluginInfo *outputViewsInfo() { return data; } diff --git a/parts/outputviews/outputviewsfactory.h b/parts/outputviews/outputviewsfactory.h index e79e60a2..4bcba666 100644 --- a/parts/outputviews/outputviewsfactory.h +++ b/parts/outputviews/outputviewsfactory.h @@ -12,16 +12,16 @@ #ifndef _OUTPUTVIEWSFACTORY_H_ #define _OUTPUTVIEWSFACTORY_H_ -#include +#include #include "appoutputviewpart.h" #include "makeviewpart.h" -class TDevPluginInfo; +class KDevPluginInfo; typedef K_TYPELIST_2( AppOutputViewPart, MakeViewPart ) OutputViews; -typedef TDevGenericFactory< OutputViews > OutputViewsFactory; +typedef KDevGenericFactory< OutputViews > OutputViewsFactory; -const TDevPluginInfo *outputViewsInfo(); +const KDevPluginInfo *outputViewsInfo(); #endif diff --git a/parts/partexplorer/CMakeLists.txt b/parts/partexplorer/CMakeLists.txt index 8b9b130f..7fe5080f 100644 --- a/parts/partexplorer/CMakeLists.txt +++ b/parts/partexplorer/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/tdevpartexplorer ) +install( FILES kdevpartexplorer.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpartexplorer.rc DESTINATION ${DATA_INSTALL_DIR}/kdevpartexplorer ) -##### libtdevpartexplorer (module) ############## +##### libkdevpartexplorer (module) ############## -tde_add_kpart( libtdevpartexplorer AUTOMOC +tde_add_kpart( libkdevpartexplorer AUTOMOC SOURCES partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp diff --git a/parts/partexplorer/Makefile.am b/parts/partexplorer/Makefile.am index b0d8dd8a..fcb6caff 100644 --- a/parts/partexplorer/Makefile.am +++ b/parts/partexplorer/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) -kde_module_LTLIBRARIES = libtdevpartexplorer.la -libtdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevpartexplorer.la +libkdevpartexplorer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevpartexplorer_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp +libkdevpartexplorer_la_SOURCES = partexplorerformbase.ui partexplorerform.cpp partexplorer_plugin.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevpartexplorer.desktop +service_DATA = kdevpartexplorer.desktop -rcdir = $(kde_datadir)/tdevpartexplorer -rc_DATA = tdevpartexplorer.rc +rcdir = $(kde_datadir)/kdevpartexplorer +rc_DATA = kdevpartexplorer.rc diff --git a/parts/partexplorer/tdevpartexplorer.desktop b/parts/partexplorer/kdevpartexplorer.desktop similarity index 99% rename from parts/partexplorer/tdevpartexplorer.desktop rename to parts/partexplorer/kdevpartexplorer.desktop index 0e1242c4..ff432eeb 100644 --- a/parts/partexplorer/tdevpartexplorer.desktop +++ b/parts/partexplorer/kdevpartexplorer.desktop @@ -32,7 +32,7 @@ Comment[tg]=Воситаи графикӣ барои иҷро намудани Comment[tr]=Kayıtlı servisler için TDETrader-benzeri sorgular yapmayı sağlayan bir grafiksel araç Comment[zh_CN]=调用TDETrader的图形工具－就像查询已经注册的服务。 Comment[zh_TW]=執行類似 TDETrader 查詢註冊服務的圖形化工具 -Name=TDevPartExplorer +Name=KDevPartExplorer Name[da]=TDevelop Part-søger Name[nds]=TDevelop-Komponentkieker Name[sk]=KDev Part prieskumník @@ -70,7 +70,7 @@ GenericName[tr]=Bileşen Gezinti Aracı GenericName[zh_CN]=模块浏览器工具 GenericName[zh_TW]=元件探索工具 ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevpartexplorer +X-TDE-Library=libkdevpartexplorer X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=KDEDevelopment diff --git a/parts/partexplorer/tdevpartexplorer.rc b/parts/partexplorer/kdevpartexplorer.rc similarity index 76% rename from parts/partexplorer/tdevpartexplorer.rc rename to parts/partexplorer/kdevpartexplorer.rc index 1dff4ed6..9632115b 100644 --- a/parts/partexplorer/tdevpartexplorer.rc +++ b/parts/partexplorer/kdevpartexplorer.rc @@ -1,5 +1,5 @@ - +

diff --git a/parts/partexplorer/partexplorer_plugin.cpp b/parts/partexplorer/partexplorer_plugin.cpp index 43ab5717..d5240edb 100644 --- a/parts/partexplorer/partexplorer_plugin.cpp +++ b/parts/partexplorer/partexplorer_plugin.cpp @@ -13,28 +13,28 @@ #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include "partexplorerform.h" -static const TDevPluginInfo data("tdevpartexplorer"); +static const KDevPluginInfo data("kdevpartexplorer"); -typedef TDevGenericFactory PartExplorerPluginFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevpartexplorer, PartExplorerPluginFactory( data ) ) +typedef KDevGenericFactory PartExplorerPluginFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevpartexplorer, PartExplorerPluginFactory( data ) ) PartExplorerPlugin::PartExplorerPlugin( TQObject *parent, const char *name, const TQStringList & ) - : TDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) + : KDevPlugin( &data, parent, name ? name : "PartExplorerPlugin" ) { // we need an instance setInstance( PartExplorerPluginFactory::instance() ); - setXMLFile( "tdevpartexplorer.rc" ); + setXMLFile( "kdevpartexplorer.rc" ); // this should be your custom internal widget m_widget = new PartExplorerForm( mainWindow()->main() ); diff --git a/parts/partexplorer/partexplorer_plugin.h b/parts/partexplorer/partexplorer_plugin.h index 622ff002..eea44750 100644 --- a/parts/partexplorer/partexplorer_plugin.h +++ b/parts/partexplorer/partexplorer_plugin.h @@ -14,14 +14,14 @@ #include -#include "tdevplugin.h" +#include "kdevplugin.h" class TQWidget; class TQPainter; class KURL; class PartExplorerForm; -class PartExplorerPlugin : public TDevPlugin +class PartExplorerPlugin : public KDevPlugin { Q_OBJECT diff --git a/parts/quickopen/CMakeLists.txt b/parts/quickopen/CMakeLists.txt index ad6fa926..cb82433f 100644 --- a/parts/quickopen/CMakeLists.txt +++ b/parts/quickopen/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ -install( FILES tdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/tdevquickopen ) +install( FILES kdevquickopen.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_quickopen.rc DESTINATION ${DATA_INSTALL_DIR}/kdevquickopen ) -##### libtdevquickopen (module) ################# +##### libkdevquickopen (module) ################# -tde_add_kpart( libtdevquickopen AUTOMOC +tde_add_kpart( libkdevquickopen AUTOMOC SOURCES quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui diff --git a/parts/quickopen/Makefile.am b/parts/quickopen/Makefile.am index cce44ae3..ca7ed3dd 100644 --- a/parts/quickopen/Makefile.am +++ b/parts/quickopen/Makefile.am @@ -1,17 +1,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/interfaces/extensions \ -I$(top_srcdir)/lib/interfaces/external -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -kde_module_LTLIBRARIES = libtdevquickopen.la -libtdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) +kde_module_LTLIBRARIES = libkdevquickopen.la +libkdevquickopen_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevquickopen_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -libtdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp +libkdevquickopen_la_SOURCES = quickopen_part.cpp quickopendialog.cpp quickopenclassdialog.cpp quickopenbase.ui quickopenfiledialog.cpp quickopenfunctiondialog.cpp quickopenfunctionchooseformbase.ui quickopenfunctionchooseform.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevquickopen.desktop +service_DATA = kdevquickopen.desktop -rcdir = $(kde_datadir)/tdevquickopen -rc_DATA = tdevpart_quickopen.rc +rcdir = $(kde_datadir)/kdevquickopen +rc_DATA = kdevpart_quickopen.rc noinst_HEADERS = quickopendialog.h quickopenclassdialog.h quickopenfiledialog.h quickopenfunctiondialog.h quickopenfunctionchooseform.h diff --git a/parts/quickopen/tdevpart_quickopen.rc b/parts/quickopen/kdevpart_quickopen.rc similarity index 100% rename from parts/quickopen/tdevpart_quickopen.rc rename to parts/quickopen/kdevpart_quickopen.rc diff --git a/parts/quickopen/tdevquickopen.desktop b/parts/quickopen/kdevquickopen.desktop similarity index 99% rename from parts/quickopen/tdevquickopen.desktop rename to parts/quickopen/kdevquickopen.desktop index ed500ad4..42a8e8ff 100644 --- a/parts/quickopen/tdevquickopen.desktop +++ b/parts/quickopen/kdevquickopen.desktop @@ -75,6 +75,6 @@ GenericName[zh_TW]=快速開啟 Icon=tdevelop ServiceTypes=TDevelop/QuickOpen X-TDevelop-Scope=Project -X-TDE-Library=libtdevquickopen +X-TDE-Library=libkdevquickopen X-TDevelop-Version=5 X-TDevelop-Properties=CodeNavigation diff --git a/parts/quickopen/quickopen_part.cpp b/parts/quickopen/quickopen_part.cpp index 3a8a10c4..4d316e68 100644 --- a/parts/quickopen/quickopen_part.cpp +++ b/parts/quickopen/quickopen_part.cpp @@ -27,25 +27,25 @@ #include #include #include -#include -#include +#include +#include #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" -typedef TDevGenericFactory QuickOpenFactory; -static const TDevPluginInfo data("tdevquickopen"); -K_EXPORT_COMPONENT_FACTORY( libtdevquickopen, QuickOpenFactory( data ) ) +typedef KDevGenericFactory QuickOpenFactory; +static const KDevPluginInfo data("kdevquickopen"); +K_EXPORT_COMPONENT_FACTORY( libkdevquickopen, QuickOpenFactory( data ) ) using namespace KTextEditor; @@ -53,7 +53,7 @@ QuickOpenPart::QuickOpenPart(TQObject *parent, const char *name, const TQStringL : KDevQuickOpen(&data, parent, name ? name : "QuickOpenPart" ) { setInstance(QuickOpenFactory::instance()); - setXMLFile("tdevpart_quickopen.rc"); + setXMLFile("kdevpart_quickopen.rc"); m_actionQuickOpen = new TDEAction( i18n("Quick Open File..."), CTRL + ALT + Key_O, this, TQT_SLOT(slotQuickFileOpen()), @@ -100,14 +100,14 @@ void QuickOpenPart::slotQuickFileOpen( ) void QuickOpenPart::slotQuickOpenClass( ) { QuickOpenClassDialog dlg( this, mainWindow()->main() ); - dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ) ); + dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ) ); dlg.exec(); } void QuickOpenPart::slotQuickOpenFunction() { QuickOpenFunctionDialog dlg( this, mainWindow()->main() ); - dlg.nameEdit->setText( TDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ) ); + dlg.nameEdit->setText( KDevEditorUtil::currentWord( dynamic_cast( partController()->activePart() ) ) ); dlg.exec(); } @@ -119,7 +119,7 @@ void QuickOpenPart::slotSwitchTo() void QuickOpenPart::selectItem( ItemDom item ) { - Extensions::TDevCodeBrowserFrontend* f = extension< Extensions::TDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); + Extensions::KDevCodeBrowserFrontend* f = extension< Extensions::KDevCodeBrowserFrontend > ( "KDevelop/CodeBrowserFrontend" ); if(f != 0) { ItemDom itemDom( &(*item) ); diff --git a/parts/quickopen/quickopen_part.h b/parts/quickopen/quickopen_part.h index aff0d4f6..fa1d85e3 100644 --- a/parts/quickopen/quickopen_part.h +++ b/parts/quickopen/quickopen_part.h @@ -18,11 +18,11 @@ * */ -#ifndef __TDEVPART_QUICKOPEN_H__ -#define __TDEVPART_QUICKOPEN_H__ +#ifndef __KDEVPART_QUICKOPEN_H__ +#define __KDEVPART_QUICKOPEN_H__ #include -#include +#include #include class TDEAction; diff --git a/parts/quickopen/quickopenclassdialog.cpp b/parts/quickopen/quickopenclassdialog.cpp index 7dcfd48b..37987166 100644 --- a/parts/quickopen/quickopenclassdialog.cpp +++ b/parts/quickopen/quickopenclassdialog.cpp @@ -18,9 +18,9 @@ * */ -#include -#include -#include +#include +#include +#include #include #include diff --git a/parts/quickopen/quickopenfiledialog.cpp b/parts/quickopen/quickopenfiledialog.cpp index fc8da49a..18f15974 100644 --- a/parts/quickopen/quickopenfiledialog.cpp +++ b/parts/quickopen/quickopenfiledialog.cpp @@ -18,8 +18,8 @@ * */ -#include -#include +#include +#include #include diff --git a/parts/quickopen/quickopenfunctiondialog.cpp b/parts/quickopen/quickopenfunctiondialog.cpp index 14f7a984..bbcab7e4 100644 --- a/parts/quickopen/quickopenfunctiondialog.cpp +++ b/parts/quickopen/quickopenfunctiondialog.cpp @@ -28,11 +28,11 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include #include diff --git a/parts/regexptest/CMakeLists.txt b/parts/regexptest/CMakeLists.txt index 3bc96414..608f053c 100644 --- a/parts/regexptest/CMakeLists.txt +++ b/parts/regexptest/CMakeLists.txt @@ -25,13 +25,13 @@ link_directories( ##### other data ################################ -install( FILES tdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/tdevregexptest ) +install( FILES kdevregexptest.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevregexptest.rc DESTINATION ${DATA_INSTALL_DIR}/kdevregexptest ) -##### libtdevregexptest (module) ################ +##### libkdevregexptest (module) ################ -tde_add_kpart( libtdevregexptest AUTOMOC +tde_add_kpart( libkdevregexptest AUTOMOC SOURCES regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui LINK tdevelop-shared diff --git a/parts/regexptest/Makefile.am b/parts/regexptest/Makefile.am index 8e87ac79..df99989f 100644 --- a/parts/regexptest/Makefile.am +++ b/parts/regexptest/Makefile.am @@ -2,16 +2,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces $(all_includes) -kde_module_LTLIBRARIES = libtdevregexptest.la -libtdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevregexptest.la +libkdevregexptest_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevregexptest_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui +libkdevregexptest_la_SOURCES = regexptestpart.cpp regexptestdlg.cpp regexptestdlgbase.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevregexptest.desktop +service_DATA = kdevregexptest.desktop -rcdir = $(kde_datadir)/tdevregexptest -rc_DATA = tdevregexptest.rc +rcdir = $(kde_datadir)/kdevregexptest +rc_DATA = kdevregexptest.rc diff --git a/parts/regexptest/tdevregexptest.desktop b/parts/regexptest/kdevregexptest.desktop similarity index 99% rename from parts/regexptest/tdevregexptest.desktop rename to parts/regexptest/kdevregexptest.desktop index e0978750..57f93f73 100644 --- a/parts/regexptest/tdevregexptest.desktop +++ b/parts/regexptest/kdevregexptest.desktop @@ -76,7 +76,7 @@ GenericName[tr]=Düzenli İfade Test Edicisi GenericName[zh_CN]=正则表达式测试 GenericName[zh_TW]=正規表示式測試器 ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevregexptest +X-TDE-Library=libkdevregexptest X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=ScriptDevelopment,CDevelopment,CPPDevelopment diff --git a/parts/regexptest/tdevregexptest.rc b/parts/regexptest/kdevregexptest.rc similarity index 100% rename from parts/regexptest/tdevregexptest.rc rename to parts/regexptest/kdevregexptest.rc diff --git a/parts/regexptest/regexptestdlg.cpp b/parts/regexptest/regexptestdlg.cpp index 200bee12..bd426411 100644 --- a/parts/regexptest/regexptestdlg.cpp +++ b/parts/regexptest/regexptestdlg.cpp @@ -32,11 +32,11 @@ #include #include -#include "tdevplugin.h" -#include "tdevpartcontroller.h" +#include "kdevplugin.h" +#include "kdevpartcontroller.h" -RegexpTestDialog::RegexpTestDialog(TDevPlugin *part) +RegexpTestDialog::RegexpTestDialog(KDevPlugin *part) : RegexpTestDialogBase(0, "regexp test dialog", false), _regexp_dialog(0) { pattern_edit->setFocus(); diff --git a/parts/regexptest/regexptestdlg.h b/parts/regexptest/regexptestdlg.h index 09e656d2..4c7094a6 100644 --- a/parts/regexptest/regexptestdlg.h +++ b/parts/regexptest/regexptestdlg.h @@ -14,7 +14,7 @@ #include "regexptestdlgbase.h" -class TDevPlugin; +class KDevPlugin; class RegexpTestDialog : public RegexpTestDialogBase @@ -23,7 +23,7 @@ class RegexpTestDialog : public RegexpTestDialogBase public: - RegexpTestDialog( TDevPlugin *part ); + RegexpTestDialog( KDevPlugin *part ); ~RegexpTestDialog(); protected: @@ -39,7 +39,7 @@ private: virtual void checkKRegExp(); virtual void insertQuoted(); - TDevPlugin *m_part; + KDevPlugin *m_part; TQDialog * _regexp_dialog; }; diff --git a/parts/regexptest/regexptestpart.cpp b/parts/regexptest/regexptestpart.cpp index 0ca0b083..6c45a492 100644 --- a/parts/regexptest/regexptestpart.cpp +++ b/parts/regexptest/regexptestpart.cpp @@ -12,23 +12,23 @@ #include "regexptestpart.h" #include -#include -#include +#include +#include #include -#include "tdevcore.h" +#include "kdevcore.h" #include "regexptestdlg.h" -static const TDevPluginInfo data("tdevregexptest"); +static const KDevPluginInfo data("kdevregexptest"); -typedef TDevGenericFactory RegexpTestFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevregexptest, RegexpTestFactory( data ) ) +typedef KDevGenericFactory RegexpTestFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevregexptest, RegexpTestFactory( data ) ) RegexpTestPart::RegexpTestPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "RegexpTestPart") + : KDevPlugin(&data, parent, name ? name : "RegexpTestPart") { setInstance(RegexpTestFactory::instance()); - setXMLFile("tdevregexptest.rc"); + setXMLFile("kdevregexptest.rc"); TDEAction *action; diff --git a/parts/regexptest/regexptestpart.h b/parts/regexptest/regexptestpart.h index 3488e910..ec153d90 100644 --- a/parts/regexptest/regexptestpart.h +++ b/parts/regexptest/regexptestpart.h @@ -14,12 +14,12 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" class RegexpTestDialog; -class RegexpTestPart : public TDevPlugin +class RegexpTestPart : public KDevPlugin { Q_OBJECT diff --git a/parts/replace/CMakeLists.txt b/parts/replace/CMakeLists.txt index b32da714..4779e553 100644 --- a/parts/replace/CMakeLists.txt +++ b/parts/replace/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/tdevreplace ) +install( FILES kdevreplace.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_replace.rc DESTINATION ${DATA_INSTALL_DIR}/kdevreplace ) -##### libtdevreplace (module) ################### +##### libkdevreplace (module) ################### -tde_add_kpart( libtdevreplace AUTOMOC +tde_add_kpart( libkdevreplace AUTOMOC SOURCES replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp diff --git a/parts/replace/Makefile.am b/parts/replace/Makefile.am index 36d8e64f..8d75f0e8 100644 --- a/parts/replace/Makefile.am +++ b/parts/replace/Makefile.am @@ -2,15 +2,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevreplace.la -libtdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp +kde_module_LTLIBRARIES = libkdevreplace.la +libkdevreplace_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevreplace_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +libkdevreplace_la_SOURCES = replace_part.cpp replace_widget.cpp replacedlg.ui replaceitem.cpp replaceview.cpp replacedlgimpl.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevreplace.desktop +service_DATA = kdevreplace.desktop -rcdir = $(kde_datadir)/tdevreplace -rc_DATA = tdevpart_replace.rc +rcdir = $(kde_datadir)/kdevreplace +rc_DATA = kdevpart_replace.rc diff --git a/parts/replace/tdevpart_replace.rc b/parts/replace/kdevpart_replace.rc similarity index 100% rename from parts/replace/tdevpart_replace.rc rename to parts/replace/kdevpart_replace.rc diff --git a/parts/replace/tdevreplace.desktop b/parts/replace/kdevreplace.desktop similarity index 99% rename from parts/replace/tdevreplace.desktop rename to parts/replace/kdevreplace.desktop index cd05c65c..d2490c05 100644 --- a/parts/replace/tdevreplace.desktop +++ b/parts/replace/kdevreplace.desktop @@ -75,6 +75,6 @@ GenericName[zh_TW]=取代元件 Icon=tdevelop ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevreplace +X-TDE-Library=libkdevreplace X-TDevelop-Version=5 X-TDevelop-Properties=FileReplace diff --git a/parts/replace/replace_part.cpp b/parts/replace/replace_part.cpp index 40bfb1ea..447548ef 100644 --- a/parts/replace/replace_part.cpp +++ b/parts/replace/replace_part.cpp @@ -15,25 +15,25 @@ #include #include #include -#include -#include +#include +#include #include #include -#include -#include +#include +#include #include "replace_widget.h" -static const TDevPluginInfo data("tdevreplace"); +static const KDevPluginInfo data("kdevreplace"); -typedef TDevGenericFactory ReplaceFactory; -K_EXPORT_COMPONENT_FACTORY(libtdevreplace, ReplaceFactory(data)) +typedef KDevGenericFactory ReplaceFactory; +K_EXPORT_COMPONENT_FACTORY(libkdevreplace, ReplaceFactory(data)) ReplacePart::ReplacePart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin( &data, parent, name ? name : "ReplacePart" ) + : KDevPlugin( &data, parent, name ? name : "ReplacePart" ) { setInstance(ReplaceFactory::instance()); - setXMLFile("tdevpart_replace.rc"); + setXMLFile("kdevpart_replace.rc"); m_widget = new ReplaceWidget(this); m_widget->setIcon( SmallIcon("filefind") ); diff --git a/parts/replace/replace_part.h b/parts/replace/replace_part.h index f0316eb0..fbd0f2f7 100644 --- a/parts/replace/replace_part.h +++ b/parts/replace/replace_part.h @@ -9,12 +9,12 @@ * * ***************************************************************************/ -#ifndef __TDEVPART_REPLACE_H__ -#define __TDEVPART_REPLACE_H__ +#ifndef __KDEVPART_REPLACE_H__ +#define __KDEVPART_REPLACE_H__ #include -#include +#include #include @@ -22,7 +22,7 @@ class ReplaceWidget; class TDEAction; class Context; -class ReplacePart : public TDevPlugin +class ReplacePart : public KDevPlugin { Q_OBJECT diff --git a/parts/replace/replace_widget.cpp b/parts/replace/replace_widget.cpp index 34dd3afd..6b1bcbda 100644 --- a/parts/replace/replace_widget.cpp +++ b/parts/replace/replace_widget.cpp @@ -26,11 +26,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include #include #include @@ -87,7 +87,7 @@ ReplaceWidget::ReplaceWidget(ReplacePart *part) connect( _cancel, TQT_SIGNAL( clicked() ), TQT_SLOT( clear() ) ); connect( _listview, TQT_SIGNAL( editDocument( const TQString &, int ) ), TQT_SLOT( editDocument( const TQString &, int ) ) ); - connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( TDevPlugin * ) ), TQT_SLOT( stopButtonClicked( TDevPlugin * ) ) ); + connect( m_part->core(), TQT_SIGNAL( stopButtonClicked( KDevPlugin * ) ), TQT_SLOT( stopButtonClicked( KDevPlugin * ) ) ); } //BEGIN Slots @@ -184,7 +184,7 @@ void ReplaceWidget::editDocument( TQString const & file, int line ) m_part->partController()->editDocument( KURL( file ), line ); } -void ReplaceWidget::stopButtonClicked( TDevPlugin * which ) +void ReplaceWidget::stopButtonClicked( KDevPlugin * which ) { if ( which != 0 && which != m_part ) return; diff --git a/parts/replace/replace_widget.h b/parts/replace/replace_widget.h index 64ca50e2..c9063928 100644 --- a/parts/replace/replace_widget.h +++ b/parts/replace/replace_widget.h @@ -36,7 +36,7 @@ public: public slots: void showDialog(); - void stopButtonClicked( TDevPlugin * ); + void stopButtonClicked( KDevPlugin * ); protected: virtual void focusInEvent(TQFocusEvent *e); diff --git a/parts/scripting/CMakeLists.txt b/parts/scripting/CMakeLists.txt index 371cf8f6..f906bd02 100644 --- a/parts/scripting/CMakeLists.txt +++ b/parts/scripting/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/tdevscripting ) +install( FILES kdevscripting.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevscripting.rc DESTINATION ${DATA_INSTALL_DIR}/kdevscripting ) -##### libtdevscripting (module) ################# +##### libkdevscripting (module) ################# -tde_add_kpart( libtdevscripting AUTOMOC +tde_add_kpart( libkdevscripting AUTOMOC SOURCES scriptingpart.cpp scriptingglobalconfigbase.ui scriptingglobalconfig.cpp diff --git a/parts/scripting/Makefile.am b/parts/scripting/Makefile.am index 9de6d889..7262dac9 100644 --- a/parts/scripting/Makefile.am +++ b/parts/scripting/Makefile.am @@ -1,20 +1,20 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevscripting.la -libtdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevscripting.la +libkdevscripting_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevscripting_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \ +libkdevscripting_la_SOURCES = scriptingpart.cpp scriptingglobalconfigbase.ui \ scriptingglobalconfig.cpp METASOURCES = AUTO -appsharedir = $(kde_datadir)/tdevscripting +appsharedir = $(kde_datadir)/kdevscripting appshare_DATA = servicedir = $(kde_servicesdir) -service_DATA = tdevscripting.desktop +service_DATA = kdevscripting.desktop -rcdir = $(kde_datadir)/tdevscripting -rc_DATA = tdevscripting.rc +rcdir = $(kde_datadir)/kdevscripting +rc_DATA = kdevscripting.rc noinst_HEADERS = scriptingglobalconfig.h scriptingpart.h diff --git a/parts/scripting/tdevscripting.desktop b/parts/scripting/kdevscripting.desktop similarity index 99% rename from parts/scripting/tdevscripting.desktop rename to parts/scripting/kdevscripting.desktop index afa0cc10..22ef15e8 100644 --- a/parts/scripting/tdevscripting.desktop +++ b/parts/scripting/kdevscripting.desktop @@ -72,6 +72,6 @@ X-TDevelop-Plugin-Copyright=(C) by ian reinhart geiser X-TDevelop-Args= X-TDevelop-Scope=Global -X-TDE-Library=libtdevscripting +X-TDE-Library=libkdevscripting X-TDevelop-Version=5 X-TDevelop-Properties=CodeEditing diff --git a/parts/scripting/tdevscripting.rc b/parts/scripting/kdevscripting.rc similarity index 100% rename from parts/scripting/tdevscripting.rc rename to parts/scripting/kdevscripting.rc diff --git a/parts/scripting/scriptingpart.cpp b/parts/scripting/scriptingpart.cpp index 4ebee2b0..80a33c9e 100644 --- a/parts/scripting/scriptingpart.cpp +++ b/parts/scripting/scriptingpart.cpp @@ -29,29 +29,29 @@ #include #include #include -#include -#include +#include +#include -#include -#include +#include +#include #include #include #include #include "scriptingglobalconfig.h" #include "tdescriptactionmanager.h" -typedef TDevGenericFactory scriptingFactory; -TDevPluginInfo data("tdevscripting"); -K_EXPORT_COMPONENT_FACTORY( libtdevscripting, scriptingFactory( data ) ) +typedef KDevGenericFactory scriptingFactory; +KDevPluginInfo data("kdevscripting"); +K_EXPORT_COMPONENT_FACTORY( libkdevscripting, scriptingFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 scriptingPart::scriptingPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) + : KDevPlugin(&data, parent, name ? name : "scriptingPart"), m_scripts(0L) { setInstance(scriptingFactory::instance()); - setXMLFile("tdevscripting.rc"); + setXMLFile("kdevscripting.rc"); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createGlobalConfigPage(i18n("Scripting"), GLOBALDOC_OPTIONS, info()->icon()); diff --git a/parts/scripting/scriptingpart.h b/parts/scripting/scriptingpart.h index ca6bafd9..832318b9 100644 --- a/parts/scripting/scriptingpart.h +++ b/parts/scripting/scriptingpart.h @@ -18,10 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVSCRIPTING_H -#define TDEVSCRIPTING_H +#ifndef KDEVSCRIPTING_H +#define KDEVSCRIPTING_H -#include +#include #include @@ -34,7 +34,7 @@ class KScriptActionManager; /** Please read the README.dox file for more info about this part */ -class scriptingPart: public TDevPlugin +class scriptingPart: public KDevPlugin { Q_OBJECT diff --git a/parts/snippet/CMakeLists.txt b/parts/snippet/CMakeLists.txt index 43776bf0..704ec3e9 100644 --- a/parts/snippet/CMakeLists.txt +++ b/parts/snippet/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/tdevsnippet ) +install( FILES kdevsnippet.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_snippet.rc DESTINATION ${DATA_INSTALL_DIR}/kdevsnippet ) -##### libtdevsnippet (module) ################### +##### libkdevsnippet (module) ################### -tde_add_kpart( libtdevsnippet AUTOMOC +tde_add_kpart( libkdevsnippet AUTOMOC SOURCES snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp diff --git a/parts/snippet/Makefile.am b/parts/snippet/Makefile.am index d2429963..e2c207a4 100644 --- a/parts/snippet/Makefile.am +++ b/parts/snippet/Makefile.am @@ -1,17 +1,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevsnippet.la -libtdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevsnippet.la +libkdevsnippet_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsnippet_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp +libkdevsnippet_la_SOURCES = snippet_part.cpp snippet_widget.cpp snippetdlg.ui snippetitem.cpp snippetsettingsbase.ui snippetsettings.cpp snippetconfig.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevsnippet.desktop +service_DATA = kdevsnippet.desktop -rc_DATA = tdevpart_snippet.rc -rcdir = $(kde_datadir)/tdevsnippet +rc_DATA = kdevpart_snippet.rc +rcdir = $(kde_datadir)/kdevsnippet noinst_HEADERS = snippetdlg.h snippetitem.h snippetsettingsbase.h snippetsettings.h snippetconfig.h diff --git a/parts/snippet/tdevpart_snippet.rc b/parts/snippet/kdevpart_snippet.rc similarity index 66% rename from parts/snippet/tdevpart_snippet.rc rename to parts/snippet/kdevpart_snippet.rc index f4b9d2db..4f34ec50 100644 --- a/parts/snippet/tdevpart_snippet.rc +++ b/parts/snippet/kdevpart_snippet.rc @@ -1,5 +1,5 @@ - + diff --git a/parts/snippet/tdevsnippet.desktop b/parts/snippet/kdevsnippet.desktop similarity index 99% rename from parts/snippet/tdevsnippet.desktop rename to parts/snippet/kdevsnippet.desktop index b257280c..f9ba9652 100644 --- a/parts/snippet/tdevsnippet.desktop +++ b/parts/snippet/kdevsnippet.desktop @@ -97,6 +97,6 @@ GenericName[zh_TW]=程式碼片段 Icon=editcut ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevsnippet +X-TDE-Library=libkdevsnippet X-TDevelop-Version=5 X-TDevelop-Properties=CodeEditing diff --git a/parts/snippet/snippet_part.cpp b/parts/snippet/snippet_part.cpp index e31ebe7a..82969151 100644 --- a/parts/snippet/snippet_part.cpp +++ b/parts/snippet/snippet_part.cpp @@ -20,11 +20,11 @@ #include #include -#include "tdevcore.h" -#include -#include "tdevmainwindow.h" -#include -#include +#include "kdevcore.h" +#include +#include "kdevmainwindow.h" +#include +#include #include @@ -33,15 +33,15 @@ #include "snippetsettings.h" #include "snippetconfig.h" -static const TDevPluginInfo data("tdevsnippet"); -typedef TDevGenericFactory snippetFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevsnippet, snippetFactory( data ) ) +static const KDevPluginInfo data("kdevsnippet"); +typedef KDevGenericFactory snippetFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevsnippet, snippetFactory( data ) ) SnippetPart::SnippetPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin(&data, parent, name ? name : "SnippetPart" ) + : KDevPlugin(&data, parent, name ? name : "SnippetPart" ) { setInstance(snippetFactory::instance()); - setXMLFile("tdevpart_snippet.rc"); + setXMLFile("kdevpart_snippet.rc"); m_widget = new SnippetWidget(this); m_widget->setCaption(i18n("Code Snippets")); diff --git a/parts/snippet/snippet_part.h b/parts/snippet/snippet_part.h index 98a809cf..8ffd8fce 100644 --- a/parts/snippet/snippet_part.h +++ b/parts/snippet/snippet_part.h @@ -7,12 +7,12 @@ */ -#ifndef __TDEVPART_SNIPPET_H__ -#define __TDEVPART_SNIPPET_H__ +#ifndef __KDEVPART_SNIPPET_H__ +#define __KDEVPART_SNIPPET_H__ #include -#include +#include class SnippetWidget; @@ -20,11 +20,11 @@ class TDEAboutData; class KDialogBase; /* -This is the TDevPlugin for the CodeSnippet feature +This is the KDevPlugin for the CodeSnippet feature For more info read the README.dox file @author Robert Gruber */ -class SnippetPart : public TDevPlugin +class SnippetPart : public KDevPlugin { Q_OBJECT diff --git a/parts/snippet/snippet_widget.cpp b/parts/snippet/snippet_widget.cpp index 6b59f16f..9cd4ae4b 100644 --- a/parts/snippet/snippet_widget.cpp +++ b/parts/snippet/snippet_widget.cpp @@ -36,9 +36,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "snippetdlg.h" #include "snippetitem.h" @@ -418,7 +418,7 @@ void SnippetWidget::initConfigOldVersion(TDEConfig *cfg) void SnippetWidget::initConfig() { if (_cfg == NULL) - _cfg = new TDEConfig("tdevsnippetrc", false, false); + _cfg = new TDEConfig("kdevsnippetrc", false, false); _cfg->setGroup("SnippetPart"); diff --git a/parts/snippet/snippet_widget.h b/parts/snippet/snippet_widget.h index 4d534802..8b6c17a1 100644 --- a/parts/snippet/snippet_widget.h +++ b/parts/snippet/snippet_widget.h @@ -19,7 +19,7 @@ #include #include "snippetconfig.h" -class TDevProject; +class KDevProject; class SnippetPart; class TQPushButton; class TDEListView; diff --git a/parts/texttools/CMakeLists.txt b/parts/texttools/CMakeLists.txt index 4a893dd4..2ed4221c 100644 --- a/parts/texttools/CMakeLists.txt +++ b/parts/texttools/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevtexttools.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevtexttools (module) ################# +##### libkdevtexttools (module) ################# -tde_add_kpart( libtdevtexttools AUTOMOC +tde_add_kpart( libkdevtexttools AUTOMOC SOURCES texttoolspart.cpp texttoolswidget.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/texttools/Makefile.am b/parts/texttools/Makefile.am index 105eec32..725133be 100644 --- a/parts/texttools/Makefile.am +++ b/parts/texttools/Makefile.am @@ -2,17 +2,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/sourceinfo -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevtexttools.la -libtdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevtexttools.la +libkdevtexttools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtexttools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp +libkdevtexttools_la_SOURCES = texttoolspart.cpp texttoolswidget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtexttools.desktop +service_DATA = kdevtexttools.desktop # not used currently -#rcdir = $(kde_datadir)/tdevtexttools -#rc_DATA = tdevtexttools.rc +#rcdir = $(kde_datadir)/kdevtexttools +#rc_DATA = kdevtexttools.rc diff --git a/parts/texttools/tdevtexttools.desktop b/parts/texttools/kdevtexttools.desktop similarity index 99% rename from parts/texttools/tdevtexttools.desktop rename to parts/texttools/kdevtexttools.desktop index c9caf618..fd5fc736 100644 --- a/parts/texttools/tdevtexttools.desktop +++ b/parts/texttools/kdevtexttools.desktop @@ -78,7 +78,7 @@ GenericName[tr]=Metin Yapısı GenericName[zh_CN]=文件结构 GenericName[zh_TW]=文字結構 ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevtexttools +X-TDE-Library=libkdevtexttools X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=CodeNavigation diff --git a/parts/texttools/texttoolspart.cpp b/parts/texttools/texttoolspart.cpp index 857e2bec..4453030a 100644 --- a/parts/texttools/texttoolspart.cpp +++ b/parts/texttools/texttoolspart.cpp @@ -14,25 +14,25 @@ #include #include #include -#include -#include +#include +#include #include -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" #include "texttoolswidget.h" -typedef TDevGenericFactory TextToolsFactory; -static const TDevPluginInfo data("tdevtexttools"); -K_EXPORT_COMPONENT_FACTORY( libtdevtexttools, TextToolsFactory( data ) ) +typedef KDevGenericFactory TextToolsFactory; +static const KDevPluginInfo data("kdevtexttools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtexttools, TextToolsFactory( data ) ) TextToolsPart::TextToolsPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "TextToolsPart") + : KDevPlugin(&data, parent, name ? name : "TextToolsPart") { setInstance(TextToolsFactory::instance()); - // setXMLFile("tdevfileview.rc"); + // setXMLFile("kdevfileview.rc"); m_widget = 0; diff --git a/parts/texttools/texttoolspart.h b/parts/texttools/texttoolspart.h index fa911d98..0d822a65 100644 --- a/parts/texttools/texttoolspart.h +++ b/parts/texttools/texttoolspart.h @@ -14,12 +14,12 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" class TextToolsWidget; -class TextToolsPart : public TDevPlugin +class TextToolsPart : public KDevPlugin { Q_OBJECT diff --git a/parts/texttools/texttoolswidget.cpp b/parts/texttools/texttoolswidget.cpp index ebf0c56b..db2f0acc 100644 --- a/parts/texttools/texttoolswidget.cpp +++ b/parts/texttools/texttoolswidget.cpp @@ -22,8 +22,8 @@ #include #include -#include "tdevmainwindow.h" -#include "tdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevpartcontroller.h" #include "texttoolspart.h" diff --git a/parts/tipofday/CMakeLists.txt b/parts/tipofday/CMakeLists.txt index c3990be1..753f65e1 100644 --- a/parts/tipofday/CMakeLists.txt +++ b/parts/tipofday/CMakeLists.txt @@ -27,14 +27,14 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday ) -install( FILES tdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtipofday ) +install( FILES kdevtipofday.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES tips DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday ) +install( FILES kdevpart_tipofday.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtipofday ) -##### libtdevtipofday (module) ################## +##### libkdevtipofday (module) ################## -tde_add_kpart( libtdevtipofday AUTOMOC +tde_add_kpart( libkdevtipofday AUTOMOC SOURCES tipofday_part.cpp LINK tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/parts/tipofday/Makefile.am b/parts/tipofday/Makefile.am index 22560851..4ec54292 100644 --- a/parts/tipofday/Makefile.am +++ b/parts/tipofday/Makefile.am @@ -1,24 +1,24 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevtipofday.la -libtdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevtipofday.la +libkdevtipofday_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtipofday_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevtipofday_la_SOURCES = tipofday_part.cpp +libkdevtipofday_la_SOURCES = tipofday_part.cpp METASOURCES = AUTO KDE_ICON = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtipofday.desktop +service_DATA = kdevtipofday.desktop tip_DATA = tips -tipdir = $(kde_datadir)/tdevtipofday +tipdir = $(kde_datadir)/kdevtipofday -rc_DATA = tdevpart_tipofday.rc -rcdir = $(kde_datadir)/tdevtipofday +rc_DATA = kdevpart_tipofday.rc +rcdir = $(kde_datadir)/kdevtipofday messages: rc.cpp $(PREPARETIPS) > tips.cc - $(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/tdevtipofday.pot + $(XGETTEXT) *.cpp *.h tips.cc -o $(podir)/kdevtipofday.pot rm -f tips.cc diff --git a/parts/tipofday/tdevpart_tipofday.rc b/parts/tipofday/kdevpart_tipofday.rc similarity index 100% rename from parts/tipofday/tdevpart_tipofday.rc rename to parts/tipofday/kdevpart_tipofday.rc diff --git a/parts/tipofday/tdevtipofday.desktop b/parts/tipofday/kdevtipofday.desktop similarity index 99% rename from parts/tipofday/tdevtipofday.desktop rename to parts/tipofday/kdevtipofday.desktop index 53d6d9c9..7efdbd9f 100644 --- a/parts/tipofday/tdevtipofday.desktop +++ b/parts/tipofday/kdevtipofday.desktop @@ -88,7 +88,7 @@ GenericName[zh_CN]=日积月累 GenericName[zh_TW]=本日小提示 Icon=tdevelop ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevtipofday +X-TDE-Library=libkdevtipofday X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Properties=Documentation diff --git a/parts/tipofday/tipofday_part.cpp b/parts/tipofday/tipofday_part.cpp index f86ebf1f..6cd63deb 100644 --- a/parts/tipofday/tipofday_part.cpp +++ b/parts/tipofday/tipofday_part.cpp @@ -8,28 +8,28 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include "tdevapi.h" -#include "tdevcore.h" +#include "kdevapi.h" +#include "kdevcore.h" -static const TDevPluginInfo data("tdevtipofday"); +static const KDevPluginInfo data("kdevtipofday"); -typedef TDevGenericFactory TipOfDayFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevtipofday, TipOfDayFactory( data ) ) +typedef KDevGenericFactory TipOfDayFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevtipofday, TipOfDayFactory( data ) ) TipOfDayPart::TipOfDayPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin(&data, parent, name ? name : "TipOfDayPart") + : KDevPlugin(&data, parent, name ? name : "TipOfDayPart") { setInstance(TipOfDayFactory::instance()); - setXMLFile("tdevpart_tipofday.rc"); + setXMLFile("kdevpart_tipofday.rc"); TDEAction *action; diff --git a/parts/tipofday/tipofday_part.h b/parts/tipofday/tipofday_part.h index b5aafe50..4b982800 100644 --- a/parts/tipofday/tipofday_part.h +++ b/parts/tipofday/tipofday_part.h @@ -3,14 +3,14 @@ */ -#ifndef __TDEVPART_TIPOFDAY_H__ -#define __TDEVPART_TIPOFDAY_H__ +#ifndef __KDEVPART_TIPOFDAY_H__ +#define __KDEVPART_TIPOFDAY_H__ -#include +#include -class TipOfDayPart : public TDevPlugin +class TipOfDayPart : public KDevPlugin { Q_OBJECT diff --git a/parts/tools/CMakeLists.txt b/parts/tools/CMakeLists.txt index aaa0d462..7bd64c81 100644 --- a/parts/tools/CMakeLists.txt +++ b/parts/tools/CMakeLists.txt @@ -28,13 +28,13 @@ link_directories( ##### other data ################################ -install( FILES tdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/tdevtools ) +install( FILES kdevtools.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_tools.rc DESTINATION ${DATA_INSTALL_DIR}/kdevtools ) -##### libtdevtools (module) ##################### +##### libkdevtools (module) ##################### -tde_add_kpart( libtdevtools AUTOMOC +tde_add_kpart( libkdevtools AUTOMOC SOURCES tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui diff --git a/parts/tools/Makefile.am b/parts/tools/Makefile.am index da4d9d0b..a61da964 100644 --- a/parts/tools/Makefile.am +++ b/parts/tools/Makefile.am @@ -1,16 +1,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevtools.la -libtdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevtools.la +libkdevtools_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevtools_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui +libkdevtools_la_SOURCES = tools_part.cpp toolsconfig.cpp toolsconfigwidgetbase.ui toolsconfigwidget.cpp kapplicationtree.cpp addtooldlg.ui METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevtools.desktop +service_DATA = kdevtools.desktop -rc_DATA = tdevpart_tools.rc -rcdir = $(kde_datadir)/tdevtools +rc_DATA = kdevpart_tools.rc +rcdir = $(kde_datadir)/kdevtools diff --git a/parts/tools/addtooldlg.ui b/parts/tools/addtooldlg.ui index 09fd5424..a1a6157e 100644 --- a/parts/tools/addtooldlg.ui +++ b/parts/tools/addtooldlg.ui @@ -159,7 +159,7 @@ executed.</p> The path and name of the application to execute - + tree @@ -179,7 +179,7 @@ executed.</p> - TDevApplicationTree + KDevApplicationTree
kapplicationtree.h
-1 diff --git a/parts/tools/addtooldlg.ui.h b/parts/tools/addtooldlg.ui.h index cabb91e7..fea69766 100644 --- a/parts/tools/addtooldlg.ui.h +++ b/parts/tools/addtooldlg.ui.h @@ -23,7 +23,7 @@ TQString AddToolDialog::getApp() void AddToolDialog::treeSelectionChanged( TQListViewItem * lvi ) { - TDevAppTreeListItem* item = dynamic_cast ( lvi ); + KDevAppTreeListItem* item = dynamic_cast ( lvi ); if ( !item || item->isDirectory() ) return; execEdit->setURL( item->executable() ); diff --git a/parts/tools/kapplicationtree.cpp b/parts/tools/kapplicationtree.cpp index 18e31265..8c13a4ea 100644 --- a/parts/tools/kapplicationtree.cpp +++ b/parts/tools/kapplicationtree.cpp @@ -1,5 +1,5 @@ /* This file is part of the KDE libraries - Nicked from KDElibs since TDevApplicationTree is not a public class.. + Nicked from KDElibs since KDevApplicationTree is not a public class.. Copyright (C) 1997 Torben Weis Copyright (C) 1999 Dirk A. Mueller @@ -65,7 +65,7 @@ template class TQPtrList; // ---------------------------------------------------------------------- -TDevAppTreeListItem::TDevAppTreeListItem( TDEListView* parent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) : TQListViewItem( parent, name ) { @@ -75,7 +75,7 @@ TDevAppTreeListItem::TDevAppTreeListItem( TDEListView* parent, const TQString & // ---------------------------------------------------------------------- -TDevAppTreeListItem::TDevAppTreeListItem( TQListViewItem* parent, const TQString & name, +KDevAppTreeListItem::KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ) : TQListViewItem( parent, name ) { @@ -85,7 +85,7 @@ TDevAppTreeListItem::TDevAppTreeListItem( TQListViewItem* parent, const TQString // ---------------------------------------------------------------------- -void TDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry) +void KDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry) { setPixmap(0, pixmap); parsed = parse; @@ -101,7 +101,7 @@ void TDevAppTreeListItem::init(const TQPixmap& pixmap, bool parse, bool dir, con // ---------------------------------------------------------------------- // Ensure that dirs are sorted in front of files and case is ignored -TQString TDevAppTreeListItem::key(int column, bool /*ascending*/) const +TQString KDevAppTreeListItem::key(int column, bool /*ascending*/) const { if (directory) return TQString::fromLatin1(" ") + text(column).upper(); @@ -109,29 +109,29 @@ TQString TDevAppTreeListItem::key(int column, bool /*ascending*/) const return text(column).upper(); } -void TDevAppTreeListItem::activate() +void KDevAppTreeListItem::activate() { if ( directory ) setOpen(!isOpen()); } -void TDevAppTreeListItem::setOpen( bool o ) +void KDevAppTreeListItem::setOpen( bool o ) { if( o && !parsed ) { // fill the children before opening - ((TDevApplicationTree *) parent())->addDesktopGroup( path, this ); + ((KDevApplicationTree *) parent())->addDesktopGroup( path, this ); parsed = true; } TQListViewItem::setOpen( o ); } -bool TDevAppTreeListItem::isDirectory() +bool KDevAppTreeListItem::isDirectory() { return directory; } // ---------------------------------------------------------------------- -TDevApplicationTree::TDevApplicationTree( TQWidget *parent, const char* name ) +KDevApplicationTree::KDevApplicationTree( TQWidget *parent, const char* name ) : TDEListView( parent, name ), currentitem(0) { addColumn( i18n("Known Applications") ); @@ -145,7 +145,7 @@ TDevApplicationTree::TDevApplicationTree( TQWidget *parent, const char* name ) // ---------------------------------------------------------------------- -bool TDevApplicationTree::isDirSel() +bool KDevApplicationTree::isDirSel() { if (!currentitem) return false; // if currentitem isn't set return currentitem->isDirectory(); @@ -153,12 +153,12 @@ bool TDevApplicationTree::isDirSel() // ---------------------------------------------------------------------- -void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem *item) +void KDevApplicationTree::addDesktopGroup( TQString relPath, KDevAppTreeListItem *item) { KServiceGroup::Ptr root = KServiceGroup::group(relPath); KServiceGroup::List list = root->entries(); - TDevAppTreeListItem * newItem; + KDevAppTreeListItem * newItem; for( KServiceGroup::List::ConstIterator it = list.begin(); it != list.end(); it++) { @@ -200,10 +200,10 @@ void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem TQPixmap pixmap = SmallIcon( icon ); if (item) - newItem = new TDevAppTreeListItem( item, text, pixmap, false, isDir, + newItem = new KDevAppTreeListItem( item, text, pixmap, false, isDir, relPath, exec, dEntry ); else - newItem = new TDevAppTreeListItem( this, text, pixmap, false, isDir, + newItem = new KDevAppTreeListItem( this, text, pixmap, false, isDir, relPath, exec, dEntry ); if (isDir) newItem->setExpandable( true ); @@ -213,13 +213,13 @@ void TDevApplicationTree::addDesktopGroup( TQString relPath, TDevAppTreeListItem // ---------------------------------------------------------------------- -void TDevApplicationTree::slotItemHighlighted(TQListViewItem* i) +void KDevApplicationTree::slotItemHighlighted(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) return; - TDevAppTreeListItem *item = (TDevAppTreeListItem *) i; + KDevAppTreeListItem *item = (KDevAppTreeListItem *) i; currentitem = item; @@ -230,13 +230,13 @@ void TDevApplicationTree::slotItemHighlighted(TQListViewItem* i) // ---------------------------------------------------------------------- -void TDevApplicationTree::slotSelectionChanged(TQListViewItem* i) +void KDevApplicationTree::slotSelectionChanged(TQListViewItem* i) { // i may be 0 (see documentation) if(!i) return; - TDevAppTreeListItem *item = (TDevAppTreeListItem *) i; + KDevAppTreeListItem *item = (KDevAppTreeListItem *) i; currentitem = item; @@ -246,7 +246,7 @@ void TDevApplicationTree::slotSelectionChanged(TQListViewItem* i) // ---------------------------------------------------------------------- -void TDevApplicationTree::resizeEvent( TQResizeEvent * e) +void KDevApplicationTree::resizeEvent( TQResizeEvent * e) { setColumnWidth(0, width()-TQApplication::style().pixelMetric(TQStyle::PM_ScrollBarExtent)); TDEListView::resizeEvent(e); diff --git a/parts/tools/kapplicationtree.h b/parts/tools/kapplicationtree.h index b45bbeac..0ba2cc9f 100644 --- a/parts/tools/kapplicationtree.h +++ b/parts/tools/kapplicationtree.h @@ -16,8 +16,8 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __TDevApplicationTree_h__ -#define __TDevApplicationTree_h__ +#ifndef __KDevApplicationTree_h__ +#define __KDevApplicationTree_h__ #include #include @@ -36,7 +36,7 @@ class TQStringList; /** * @internal */ -class TDevAppTreeListItem : public TQListViewItem +class KDevAppTreeListItem : public TQListViewItem { bool parsed; bool directory; @@ -50,9 +50,9 @@ protected: void init(const TQPixmap& pixmap, bool parse, bool dir, const TQString& _path, const TQString& _exec, const TQString& _dEntry); public: - TDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( TDEListView* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); - TDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, + KDevAppTreeListItem( TQListViewItem* parent, const TQString & name, const TQPixmap& pixmap, bool parse, bool dir, const TQString& p, const TQString& c, const TQString& dE ); bool isDirectory(); @@ -63,7 +63,7 @@ protected: virtual void activate(); virtual void setOpen( bool o ); - friend class TDevApplicationTree; + friend class KDevApplicationTree; }; /* ------------------------------------------------------------------------- */ @@ -71,23 +71,23 @@ protected: /** * @internal */ -class TDevApplicationTree : public TDEListView +class KDevApplicationTree : public TDEListView { Q_OBJECT public: - TDevApplicationTree( TQWidget *parent, const char* name = 0 ); + KDevApplicationTree( TQWidget *parent, const char* name = 0 ); /** * Add a group of .desktop/.kdelnk entries */ - void addDesktopGroup( TQString relPath, TDevAppTreeListItem *item = 0 ); + void addDesktopGroup( TQString relPath, KDevAppTreeListItem *item = 0 ); bool isDirSel(); protected: void resizeEvent( TQResizeEvent *_ev ); - TDevAppTreeListItem* currentitem; + KDevAppTreeListItem* currentitem; public slots: void slotItemHighlighted(TQListViewItem* i); diff --git a/parts/tools/tdevpart_tools.rc b/parts/tools/kdevpart_tools.rc similarity index 100% rename from parts/tools/tdevpart_tools.rc rename to parts/tools/kdevpart_tools.rc diff --git a/parts/tools/tdevtools.desktop b/parts/tools/kdevtools.desktop similarity index 99% rename from parts/tools/tdevtools.desktop rename to parts/tools/kdevtools.desktop index 3b7e8272..225b4b5f 100644 --- a/parts/tools/tdevtools.desktop +++ b/parts/tools/kdevtools.desktop @@ -76,7 +76,7 @@ GenericName[zh_CN]=工具菜单附加 GenericName[zh_TW]=新增工具選單 Icon=configure ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevtools +X-TDE-Library=libkdevtools X-TDevelop-Version=5 X-TDevelop-Scope=Global X-TDevelop-Properties=AdditionalTools diff --git a/parts/tools/tools_part.cpp b/parts/tools/tools_part.cpp index c6e4a242..8734eadc 100644 --- a/parts/tools/tools_part.cpp +++ b/parts/tools/tools_part.cpp @@ -19,14 +19,14 @@ #include #include -#include "tdevcore.h" -#include "tdevproject.h" -#include "tdevpartcontroller.h" -#include "tdevappfrontend.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevproject.h" +#include "kdevpartcontroller.h" +#include "kdevappfrontend.h" +#include "kdevplugininfo.h" #include "urlutil.h" #include "configwidgetproxy.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include "toolsconfig.h" #include "toolsconfigwidget.h" @@ -34,17 +34,17 @@ #define TOOLSSETTINGS 1 #define EXTRATOOLSSETTINGS 2 -static const TDevPluginInfo data("tdevtools"); -K_EXPORT_COMPONENT_FACTORY( libtdevtools, ToolsFactory( data ) ) +static const KDevPluginInfo data("kdevtools"); +K_EXPORT_COMPONENT_FACTORY( libkdevtools, ToolsFactory( data ) ) TQMap externalToolMenuEntries; ToolsPart::ToolsPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin( &data, parent, name ? name : "ToolsPart") + : KDevPlugin( &data, parent, name ? name : "ToolsPart") { setInstance(ToolsFactory::instance()); - setXMLFile("tdevpart_tools.rc"); + setXMLFile("kdevpart_tools.rc"); m_configProxy = new ConfigWidgetProxy( core() ); m_configProxy->createGlobalConfigPage( i18n("Tools Menu"), TOOLSSETTINGS, info()->icon() ); @@ -128,11 +128,11 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) if (project()) projectDirectory = project()->projectDirectory(); - TQString selection = TDevEditorUtil::currentSelection( doc ); + TQString selection = KDevEditorUtil::currentSelection( doc ); if ( !selection.isEmpty() ) selection = KShellProcess::quote( selection ); - TQString word = TDevEditorUtil::currentWord( doc ); + TQString word = KDevEditorUtil::currentWord( doc ); // This should really be checked before inserting into the popup if (cmdline.contains("%D") && projectDirectory.isNull()) @@ -153,7 +153,7 @@ void ToolsPart::startCommand(TQString cmdline, bool captured, TQString fileName) if (captured) { - if (TDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) + if (KDevAppFrontend *appFrontend = extension("TDevelop/AppFrontend")) appFrontend->startAppCommand(TQString(), cmdline, false); } else diff --git a/parts/tools/tools_part.h b/parts/tools/tools_part.h index 4eeaf0e1..20af2ea8 100644 --- a/parts/tools/tools_part.h +++ b/parts/tools/tools_part.h @@ -3,13 +3,13 @@ */ -#ifndef __TDEVPART_TOOLS_H__ -#define __TDEVPART_TOOLS_H__ +#ifndef __KDEVPART_TOOLS_H__ +#define __KDEVPART_TOOLS_H__ #include -#include -#include +#include +#include class TQPopupMenu; @@ -20,7 +20,7 @@ class ConfigWidgetProxy; class ToolsWidget; -class ToolsPart : public TDevPlugin +class ToolsPart : public KDevPlugin { Q_OBJECT @@ -51,6 +51,6 @@ private: ConfigWidgetProxy * m_configProxy; }; -typedef TDevGenericFactory ToolsFactory; +typedef KDevGenericFactory ToolsFactory; #endif diff --git a/parts/tools/toolsconfig.cpp b/parts/tools/toolsconfig.cpp index 8d689f40..f21713e9 100644 --- a/parts/tools/toolsconfig.cpp +++ b/parts/tools/toolsconfig.cpp @@ -35,7 +35,7 @@ void ToolsConfig::showEvent(TQShowEvent *e) TQHBoxLayout *hbox = new TQHBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); TQVBoxLayout *vbox = new TQVBoxLayout(hbox); - _tree = new TDevApplicationTree(this); + _tree = new KDevApplicationTree(this); _tree->header()->hide(); TQLabel *l = new TQLabel(_tree, i18n("&Applications:"), this); l->show(); @@ -121,7 +121,7 @@ void ToolsConfig::add(const TQString &desktopFile) void ToolsConfig::toList() { - TDevAppTreeListItem *item = dynamic_cast(_tree->selectedItem()); + KDevAppTreeListItem *item = dynamic_cast(_tree->selectedItem()); if (item && !item->desktopEntryPath().isEmpty()) add(item->desktopEntryPath()); checkButtons(); diff --git a/parts/tools/toolsconfig.h b/parts/tools/toolsconfig.h index 23081676..074d5900 100644 --- a/parts/tools/toolsconfig.h +++ b/parts/tools/toolsconfig.h @@ -9,7 +9,7 @@ class TQListBox; class TQPushButton; -class TDevApplicationTree; +class KDevApplicationTree; class Entry { @@ -60,7 +60,7 @@ private slots: private: - TDevApplicationTree *_tree; + KDevApplicationTree *_tree; TQListBox *_list; TQPushButton *_toList, *_toTree; diff --git a/parts/uimode/CMakeLists.txt b/parts/uimode/CMakeLists.txt index 0eaa5ff6..478a4103 100644 --- a/parts/uimode/CMakeLists.txt +++ b/parts/uimode/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevuichooser.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevuichooser (module) ################# +##### libkdevuichooser (module) ################# -tde_add_kpart( libtdevuichooser AUTOMOC +tde_add_kpart( libkdevuichooser AUTOMOC SOURCES uichooser_part.cpp uichooser.ui uichooser_widget.cpp LINK tdevelop-shared diff --git a/parts/uimode/Makefile.am b/parts/uimode/Makefile.am index df7ddba9..00792790 100644 --- a/parts/uimode/Makefile.am +++ b/parts/uimode/Makefile.am @@ -1,13 +1,13 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevuichooser.la -libtdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevuichooser.la +libkdevuichooser_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevuichooser_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp +libkdevuichooser_la_SOURCES = uichooser_part.cpp uichooser.ui uichooser_widget.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevuichooser.desktop +service_DATA = kdevuichooser.desktop diff --git a/parts/uimode/tdevuichooser.desktop b/parts/uimode/kdevuichooser.desktop similarity index 99% rename from parts/uimode/tdevuichooser.desktop rename to parts/uimode/kdevuichooser.desktop index 65faa5be..afb21a50 100644 --- a/parts/uimode/tdevuichooser.desktop +++ b/parts/uimode/kdevuichooser.desktop @@ -80,7 +80,7 @@ GenericName[zh_CN]=用户界面选择 GenericName[zh_TW]=使用者介面選擇器 Icon=view_choose ServiceTypes=TDevelop/Plugin -X-TDE-Library=libtdevuichooser +X-TDE-Library=libkdevuichooser X-TDevelop-Version=5 X-TDevelop-Scope=Core X-TDevelop-Mode=AssistantMode diff --git a/parts/uimode/uichooser_part.cpp b/parts/uimode/uichooser_part.cpp index 5795d829..fdc9fa6a 100644 --- a/parts/uimode/uichooser_part.cpp +++ b/parts/uimode/uichooser_part.cpp @@ -3,23 +3,23 @@ #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include "uichooser_widget.h" #define UICHOOSERSETTINGSPAGE 1 -typedef TDevGenericFactory UIChooserFactory; -static const TDevPluginInfo data("tdevuichooser"); -K_EXPORT_COMPONENT_FACTORY( libtdevuichooser, UIChooserFactory( data ) ) +typedef KDevGenericFactory UIChooserFactory; +static const KDevPluginInfo data("kdevuichooser"); +K_EXPORT_COMPONENT_FACTORY( libkdevuichooser, UIChooserFactory( data ) ) UIChooserPart::UIChooserPart(TQObject *parent, const char *name, const TQStringList &) - : TDevPlugin( &data, parent, name ? name : "UIChooserPart") + : KDevPlugin( &data, parent, name ? name : "UIChooserPart") { setInstance(UIChooserFactory::instance()); diff --git a/parts/uimode/uichooser_part.h b/parts/uimode/uichooser_part.h index e86f9211..ff822e1d 100644 --- a/parts/uimode/uichooser_part.h +++ b/parts/uimode/uichooser_part.h @@ -3,16 +3,16 @@ */ -#ifndef __TDEVPART_UICHOOSER_H__ -#define __TDEVPART_UICHOOSER_H__ +#ifndef __KDEVPART_UICHOOSER_H__ +#define __KDEVPART_UICHOOSER_H__ class KDialogBase; class ConfigWidgetProxy; -#include +#include -class UIChooserPart : public TDevPlugin +class UIChooserPart : public KDevPlugin { Q_OBJECT diff --git a/parts/uimode/uichooser_widget.cpp b/parts/uimode/uichooser_widget.cpp index d70d648d..cb75ec02 100644 --- a/parts/uimode/uichooser_widget.cpp +++ b/parts/uimode/uichooser_widget.cpp @@ -24,7 +24,7 @@ #include #include "uichooser_part.h" -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include "uichooser_widget.h" UIChooserWidget::UIChooserWidget( UIChooserPart * part, TQWidget *parent, const char *name) diff --git a/parts/valgrind/CMakeLists.txt b/parts/valgrind/CMakeLists.txt index 611aa4ec..9c32760f 100644 --- a/parts/valgrind/CMakeLists.txt +++ b/parts/valgrind/CMakeLists.txt @@ -26,13 +26,13 @@ link_directories( ##### other data ################################ -install( FILES tdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/tdevvalgrind ) +install( FILES kdevvalgrind.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevpart_valgrind.rc DESTINATION ${DATA_INSTALL_DIR}/kdevvalgrind ) -##### libtdevvalgrind (module) ################## +##### libkdevvalgrind (module) ################## -tde_add_kpart( libtdevvalgrind AUTOMOC +tde_add_kpart( libkdevvalgrind AUTOMOC SOURCES dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp diff --git a/parts/valgrind/Makefile.am b/parts/valgrind/Makefile.am index 6e9e89c0..e0cd6536 100644 --- a/parts/valgrind/Makefile.am +++ b/parts/valgrind/Makefile.am @@ -1,15 +1,15 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevvalgrind.la -libtdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevvalgrind.la +libkdevvalgrind_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevvalgrind_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp +libkdevvalgrind_la_SOURCES = dialog_widget.ui valgrind_part.cpp valgrind_widget.cpp valgrind_dialog.cpp valgrinditem.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevvalgrind.desktop +service_DATA = kdevvalgrind.desktop -rcdir = $(kde_datadir)/tdevvalgrind -rc_DATA = tdevpart_valgrind.rc +rcdir = $(kde_datadir)/kdevvalgrind +rc_DATA = kdevpart_valgrind.rc diff --git a/parts/valgrind/tdevpart_valgrind.rc b/parts/valgrind/kdevpart_valgrind.rc similarity index 100% rename from parts/valgrind/tdevpart_valgrind.rc rename to parts/valgrind/kdevpart_valgrind.rc diff --git a/parts/valgrind/tdevvalgrind.desktop b/parts/valgrind/kdevvalgrind.desktop similarity index 99% rename from parts/valgrind/tdevvalgrind.desktop rename to parts/valgrind/kdevvalgrind.desktop index 0c4fa769..e2142182 100644 --- a/parts/valgrind/tdevvalgrind.desktop +++ b/parts/valgrind/kdevvalgrind.desktop @@ -69,6 +69,6 @@ GenericName[zh_TW]=Valgrind 前端介面 Icon=tdevelop ServiceTypes=TDevelop/Plugin X-TDevelop-Scope=Global -X-TDE-Library=libtdevvalgrind +X-TDE-Library=libkdevvalgrind X-TDevelop-Version=5 X-TDevelop-Properties=CompiledDevelopment diff --git a/parts/valgrind/valgrind_part.cpp b/parts/valgrind/valgrind_part.cpp index 88d9427c..1b262175 100644 --- a/parts/valgrind/valgrind_part.cpp +++ b/parts/valgrind/valgrind_part.cpp @@ -6,31 +6,31 @@ #include #include -#include +#include #include #include #include #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevplugininfo.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevplugininfo.h" #include "valgrind_widget.h" #include "valgrind_dialog.h" #include "valgrinditem.h" -typedef TDevGenericFactory ValgrindFactory; -static const TDevPluginInfo data("tdevvalgrind"); -K_EXPORT_COMPONENT_FACTORY( libtdevvalgrind, ValgrindFactory( data ) ) +typedef KDevGenericFactory ValgrindFactory; +static const KDevPluginInfo data("kdevvalgrind"); +K_EXPORT_COMPONENT_FACTORY( libkdevvalgrind, ValgrindFactory( data ) ) ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringList& ) - : TDevPlugin( &data, parent, name ? name : "ValgrindPart" ) + : KDevPlugin( &data, parent, name ? name : "ValgrindPart" ) { setInstance( ValgrindFactory::instance() ); - setXMLFile( "tdevpart_valgrind.rc" ); + setXMLFile( "kdevpart_valgrind.rc" ); proc = new KShellProcess(); connect( proc, TQT_SIGNAL(receivedStdout( TDEProcess*, char*, int )), @@ -39,8 +39,8 @@ ValgrindPart::ValgrindPart( TQObject *parent, const char *name, const TQStringLi this, TQT_SLOT(receivedStderr( TDEProcess*, char*, int )) ); connect( proc, TQT_SIGNAL(processExited( TDEProcess* )), this, TQT_SLOT(processExited( TDEProcess* )) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(projectOpened()) ); @@ -196,7 +196,7 @@ void ValgrindPart::slotKillValgrind() proc->kill(); } -void ValgrindPart::slotStopButtonClicked( TDevPlugin* which ) +void ValgrindPart::slotStopButtonClicked( KDevPlugin* which ) { if ( which != 0 && which != this ) return; diff --git a/parts/valgrind/valgrind_part.h b/parts/valgrind/valgrind_part.h index 1982ea33..6a05737b 100644 --- a/parts/valgrind/valgrind_part.h +++ b/parts/valgrind/valgrind_part.h @@ -2,18 +2,18 @@ * Copyright (C) 2002 Harald Fernengel */ -#ifndef __TDEVPART_VALGRIND_H__ -#define __TDEVPART_VALGRIND_H__ +#ifndef __KDEVPART_VALGRIND_H__ +#define __KDEVPART_VALGRIND_H__ #include #include #include -#include +#include class ValgrindWidget; class TDEProcess; -class ValgrindPart : public TDevPlugin +class ValgrindPart : public KDevPlugin { Q_OBJECT @@ -31,7 +31,7 @@ private slots: void slotExecValgrind(); void slotExecCalltree(); void slotKillValgrind(); - void slotStopButtonClicked( TDevPlugin* which ); + void slotStopButtonClicked( KDevPlugin* which ); void receivedStdout( TDEProcess*, char*, int ); void receivedStderr( TDEProcess*, char*, int ); void processExited( TDEProcess* ); diff --git a/parts/valgrind/valgrind_widget.cpp b/parts/valgrind/valgrind_widget.cpp index f32ab9b7..70484704 100644 --- a/parts/valgrind/valgrind_widget.cpp +++ b/parts/valgrind/valgrind_widget.cpp @@ -10,10 +10,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "valgrind_part.h" #include "valgrind_widget.h" diff --git a/parts/vcsmanager/CMakeLists.txt b/parts/vcsmanager/CMakeLists.txt index a672b4ac..de236f81 100644 --- a/parts/vcsmanager/CMakeLists.txt +++ b/parts/vcsmanager/CMakeLists.txt @@ -26,12 +26,12 @@ link_directories( ##### other data ################################ -install( FILES tdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevvcsmanager.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevvcsmanager (module) ################ +##### libkdevvcsmanager (module) ################ -tde_add_kpart( libtdevvcsmanager AUTOMOC +tde_add_kpart( libkdevvcsmanager AUTOMOC SOURCES vcsmanagerpart.cpp vcsmanagerprojectconfigbase.ui vcsmanagerprojectconfig.cpp diff --git a/parts/vcsmanager/Makefile.am b/parts/vcsmanager/Makefile.am index 66897658..5f7534ee 100644 --- a/parts/vcsmanager/Makefile.am +++ b/parts/vcsmanager/Makefile.am @@ -1,19 +1,19 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevvcsmanager.la -libtdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la +kde_module_LTLIBRARIES = libkdevvcsmanager.la +libkdevvcsmanager_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevvcsmanager_la_LIBADD = $(top_builddir)/lib/libtdevelop.la -libtdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \ +libkdevvcsmanager_la_SOURCES = vcsmanagerpart.cpp \ vcsmanagerprojectconfigbase.ui vcsmanagerprojectconfig.cpp METASOURCES = AUTO -appsharedir = $(kde_datadir)/tdevvcsmanager +appsharedir = $(kde_datadir)/kdevvcsmanager appshare_DATA = servicedir = $(kde_servicesdir) -service_DATA = tdevvcsmanager.desktop +service_DATA = kdevvcsmanager.desktop -rcdir = $(kde_datadir)/tdevvcsmanager +rcdir = $(kde_datadir)/kdevvcsmanager diff --git a/parts/vcsmanager/tdevvcsmanager.desktop b/parts/vcsmanager/kdevvcsmanager.desktop similarity index 96% rename from parts/vcsmanager/tdevvcsmanager.desktop rename to parts/vcsmanager/kdevvcsmanager.desktop index 91fe7c98..35cdf2aa 100644 --- a/parts/vcsmanager/tdevvcsmanager.desktop +++ b/parts/vcsmanager/kdevvcsmanager.desktop @@ -1,12 +1,12 @@ [Desktop Entry] Type=Service Exec=blubb -Name=TDevVCSManager +Name=KDevVCSManager Name[da]=TDevelop VCS-håndtering Name[nds]=TDevelop-VKS-Pleger Name[sk]=KDev VCS manažér Name[sv]=TDevelop VCS-hantering -Name[tg]=РоҳбариTDevVCS +Name[tg]=РоҳбариKDevVCS Name[zh_TW]=TDevelop VCS 管理器 GenericName=VCSManager GenericName[da]=VCS-håndtering @@ -60,6 +60,6 @@ X-TDevelop-Plugin-Copyright=(C) by Jens Dagerbo X-TDevelop-Args= X-TDevelop-Scope=Core -X-TDE-Library=libtdevvcsmanager +X-TDE-Library=libkdevvcsmanager X-TDevelop-Version=5 X-TDevelop-Properties=VCS diff --git a/parts/vcsmanager/vcsmanagerpart.cpp b/parts/vcsmanager/vcsmanagerpart.cpp index 5f5ad639..ec176c47 100644 --- a/parts/vcsmanager/vcsmanagerpart.cpp +++ b/parts/vcsmanager/vcsmanagerpart.cpp @@ -29,32 +29,32 @@ #include #include #include -#include -#include +#include +#include #include -#include -#include +#include +#include #include -#include +#include #include "domutil.h" #include "vcsmanagerprojectconfig.h" -typedef TDevGenericFactory VCSManagerFactory; -TDevPluginInfo data("tdevvcsmanager"); -K_EXPORT_COMPONENT_FACTORY( libtdevvcsmanager, VCSManagerFactory( data ) ) +typedef KDevGenericFactory VCSManagerFactory; +KDevPluginInfo data("kdevvcsmanager"); +K_EXPORT_COMPONENT_FACTORY( libkdevvcsmanager, VCSManagerFactory( data ) ) #define GLOBALDOC_OPTIONS 1 #define PROJECTDOC_OPTIONS 2 VCSManagerPart::VCSManagerPart(TQObject *parent, const char *name, const TQStringList &/*args*/) - : TDevPlugin(&data, parent, name ? name : "VCSManagerPart") + : KDevPlugin(&data, parent, name ? name : "VCSManagerPart") { kdDebug() << " ********** VCSManagerPart::VCSManagerPart() ************** " << endl; setInstance(VCSManagerFactory::instance()); -// setXMLFile("tdevvcsmanager.rc"); +// setXMLFile("kdevvcsmanager.rc"); m_configProxy = new ConfigWidgetProxy(core()); m_configProxy->createProjectConfigPage(i18n("Version Control"), PROJECTDOC_OPTIONS, info()->icon()); diff --git a/parts/vcsmanager/vcsmanagerpart.h b/parts/vcsmanager/vcsmanagerpart.h index aa52de94..1fbccbff 100644 --- a/parts/vcsmanager/vcsmanagerpart.h +++ b/parts/vcsmanager/vcsmanagerpart.h @@ -18,10 +18,10 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVVCSMANAGER_H -#define TDEVVCSMANAGER_H +#ifndef KDEVVCSMANAGER_H +#define KDEVVCSMANAGER_H -#include +#include #include @@ -35,7 +35,7 @@ class VCSManagerWidget; /** Please read the README.dox file for more info about this part */ -class VCSManagerPart: public TDevPlugin +class VCSManagerPart: public KDevPlugin { Q_OBJECT diff --git a/pics/hi16-app-tdevassistant.png b/pics/hi16-app-kdevassistant.png similarity index 100% rename from pics/hi16-app-tdevassistant.png rename to pics/hi16-app-kdevassistant.png diff --git a/pics/hi16-app-tdevdesigner.png b/pics/hi16-app-kdevdesigner.png similarity index 100% rename from pics/hi16-app-tdevdesigner.png rename to pics/hi16-app-kdevdesigner.png diff --git a/pics/hi32-app-tdevassistant.png b/pics/hi32-app-kdevassistant.png similarity index 100% rename from pics/hi32-app-tdevassistant.png rename to pics/hi32-app-kdevassistant.png diff --git a/pics/hi32-app-tdevdesigner.png b/pics/hi32-app-kdevdesigner.png similarity index 100% rename from pics/hi32-app-tdevdesigner.png rename to pics/hi32-app-kdevdesigner.png diff --git a/pics/hi48-app-tdevassistant.png b/pics/hi48-app-kdevassistant.png similarity index 100% rename from pics/hi48-app-tdevassistant.png rename to pics/hi48-app-kdevassistant.png diff --git a/pics/hi48-app-tdevdesigner.png b/pics/hi48-app-kdevdesigner.png similarity index 100% rename from pics/hi48-app-tdevdesigner.png rename to pics/hi48-app-kdevdesigner.png diff --git a/pics/mini/CMakeLists.txt b/pics/mini/CMakeLists.txt index 704cbedf..143ea8d3 100644 --- a/pics/mini/CMakeLists.txt +++ b/pics/mini/CMakeLists.txt @@ -19,4 +19,4 @@ install( FILES CVpublic_signal.png CVpublic_slot.png CVpublic_var.png CVstruct.png CVpackage_meth.png CVpackage_var.png CVtypedef.png - DESTINATION ${DATA_INSTALL_DIR}/tdevclassview/pics ) + DESTINATION ${DATA_INSTALL_DIR}/kdevclassview/pics ) diff --git a/pics/mini/Makefile.am b/pics/mini/Makefile.am index 5b921601..94e74ffb 100644 --- a/pics/mini/Makefile.am +++ b/pics/mini/Makefile.am @@ -1,4 +1,4 @@ -minipicsdir = $(kde_datadir)/tdevclassview/pics +minipicsdir = $(kde_datadir)/kdevclassview/pics minipics_DATA = CTchildren.png CTclients.png CTparents.png CTsuppliers.png \ CTvirtuals.png CVclass.png CVglobal_meth.png CVglobal_var.png CVnamespace.png \ CVprivate_meth.png CVprivate_signal.png CVprivate_slot.png CVprivate_var.png \ diff --git a/pics/misc/CMakeLists.txt b/pics/misc/CMakeLists.txt index 6d156aeb..86b1d049 100644 --- a/pics/misc/CMakeLists.txt +++ b/pics/misc/CMakeLists.txt @@ -10,6 +10,6 @@ ################################################# install( FILES - tdevelop-splash.png tdevassistant-splash.png - tdevdesigner-splash.png + tdevelop-splash.png kdevassistant-splash.png + kdevdesigner-splash.png DESTINATION ${DATA_INSTALL_DIR}/tdevelop/pics ) diff --git a/pics/misc/Makefile.am b/pics/misc/Makefile.am index 5f2435c3..d748146d 100644 --- a/pics/misc/Makefile.am +++ b/pics/misc/Makefile.am @@ -1,3 +1,3 @@ picsdir = $(kde_datadir)/tdevelop/pics -pics_DATA = tdevelop-splash.png tdevassistant-splash.png \ - tdevdesigner-splash.png +pics_DATA = tdevelop-splash.png kdevassistant-splash.png \ + kdevdesigner-splash.png diff --git a/pics/misc/tdevassistant-splash.png b/pics/misc/kdevassistant-splash.png similarity index 100% rename from pics/misc/tdevassistant-splash.png rename to pics/misc/kdevassistant-splash.png diff --git a/pics/misc/tdevdesigner-splash.png b/pics/misc/kdevdesigner-splash.png similarity index 100% rename from pics/misc/tdevdesigner-splash.png rename to pics/misc/kdevdesigner-splash.png diff --git a/pics/toolbar/CMakeLists.txt b/pics/toolbar/CMakeLists.txt index 8b3bfbb8..89891ee4 100644 --- a/pics/toolbar/CMakeLists.txt +++ b/pics/toolbar/CMakeLists.txt @@ -15,17 +15,17 @@ tde_install_icons( dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar debugger dbgjumpto - DESTINATION ${DATA_INSTALL_DIR}/tdevdebugger/icons ) + DESTINATION ${DATA_INSTALL_DIR}/kdevdebugger/icons ) tde_install_icons( classnew classwiz - DESTINATION ${DATA_INSTALL_DIR}/tdevcppsupport/icons ) + DESTINATION ${DATA_INSTALL_DIR}/kdevcppsupport/icons ) tde_install_icons( dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart debugger - DESTINATION ${DATA_INSTALL_DIR}/tdevrbdebugger/icons ) + DESTINATION ${DATA_INSTALL_DIR}/kdevrbdebugger/icons ) tde_install_icons( grep - DESTINATION ${DATA_INSTALL_DIR}/tdevgrepview/icons ) + DESTINATION ${DATA_INSTALL_DIR}/kdevgrepview/icons ) diff --git a/pics/toolbar/Makefile.am b/pics/toolbar/Makefile.am index 0713d5b3..d60121e7 100644 --- a/pics/toolbar/Makefile.am +++ b/pics/toolbar/Makefile.am @@ -1,14 +1,14 @@ tdevelopdir = $(kde_datadir)/tdevelop/icons tdevelop_ICON = AUTO -tdevdebuggerdir = $(kde_datadir)/tdevdebugger/icons -tdevdebugger_ICON = dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar debugger dbgjumpto +kdevdebuggerdir = $(kde_datadir)/kdevdebugger/icons +kdevdebugger_ICON = dbgnext dbgwatchvar dbgrun dbgstepout dbgmemview dbgparam dbgrunto dbgstep dbgnextinst dbgrestart dbgstepinst dbgvar debugger dbgjumpto -cppsupportdir = $(kde_datadir)/tdevcppsupport/icons +cppsupportdir = $(kde_datadir)/kdevcppsupport/icons cppsupport_ICON = classnew classwiz -tdevrbdebuggerdir = $(kde_datadir)/tdevrbdebugger/icons -tdevrbdebugger_ICON = dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart debugger +kdevrbdebuggerdir = $(kde_datadir)/kdevrbdebugger/icons +kdevrbdebugger_ICON = dbgnext dbgrun dbgstepout dbgrunto dbgstep dbgrestart debugger -grepdir = $(kde_datadir)/tdevgrepview/icons +grepdir = $(kde_datadir)/kdevgrepview/icons grep_ICON = grep diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index b58b6df5..558caeb4 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -52,8 +52,8 @@ install( FILES ##### other data ################################ install( FILES tdevelopui.rc eventsrc DESTINATION ${DATA_INSTALL_DIR}/tdevelop ) -install( FILES tdeveloprc tdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} ) -install( FILES tdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/tdevassistant ) +install( FILES tdeveloprc kdevassistantrc DESTINATION ${CONFIG_INSTALL_DIR} ) +install( FILES kdevassistantui.rc DESTINATION ${DATA_INSTALL_DIR}/kdevassistant ) install( FILES projectprofiles DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles ) @@ -61,25 +61,25 @@ install( FILES projectprofiles DESTINATION ${DATA_INSTALL_DIR}/tdevelop/profiles tde_add_executable( tdevelop SOURCES - main.cpp tdevideextension.cpp settingswidget.ui - LINK tdevshell-shared + main.cpp kdevideextension.cpp settingswidget.ui + LINK kdevshell-shared DESTINATION ${BIN_INSTALL_DIR} ) -##### tdevassistant (executable) ################ +##### kdevassistant (executable) ################ -tde_add_executable( tdevassistant +tde_add_executable( kdevassistant SOURCES - main_assistant.cpp tdevassistantextension.cpp - LINK tdevshell-shared + main_assistant.cpp kdevassistantextension.cpp + LINK kdevshell-shared DESTINATION ${BIN_INSTALL_DIR} ) -##### tdevshell (shared) ######################## +##### kdevshell (shared) ######################## -tde_add_library( tdevshell SHARED AUTOMOC +tde_add_library( kdevshell SHARED AUTOMOC SOURCES api.cpp core.cpp documentationpart.cpp editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui @@ -92,7 +92,7 @@ tde_add_library( tdevshell SHARED AUTOMOC toplevel.cpp VERSION 0.0.0 LINK - tdevutil-static d-shared kinterfacedesigner-shared - profileengine-shared tdevelop-shared tdevwidgets-shared + kdevutil-static d-shared kinterfacedesigner-shared + profileengine-shared tdevelop-shared kdevwidgets-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/src/Mainpage.dox b/src/Mainpage.dox index 7f2255d2..2f055d1b 100644 --- a/src/Mainpage.dox +++ b/src/Mainpage.dox @@ -3,7 +3,7 @@ This library contains the Shell - a profile-based implementation of TDevelop plugin architecture. -Link with: -ltdevshell +Link with: -lkdevshell Include path: -I\$(kde_includes)/tdevelop/shell @@ -109,7 +109,7 @@ Example: } protected: - TDevAssistantExtension(); + KDevAssistantExtension(); }; @endcode diff --git a/src/Makefile.am b/src/Makefile.am index b0b8a04c..047e89a4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -6,41 +6,41 @@ INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/lib/interfaces \ KDE_OPTIONS=nofinal -lib_LTLIBRARIES = libtdevshell.la -libtdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -libtdevshell_la_LIBADD = \ +lib_LTLIBRARIES = libkdevshell.la +libkdevshell_la_LDFLAGS = $(all_libraries) -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +libkdevshell_la_LIBADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(top_builddir)/lib/interfaces/extras/libtdevextras.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(top_builddir)/lib/interfaces/extras/libkdevextras.la \ $(top_builddir)/src/newui/libd.la $(LIB_TDEHTML) -ltdetexteditor -L../lib/interfaces/external/.libs -lkinterfacedesigner -libtdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ +libkdevshell_la_SOURCES = api.cpp core.cpp documentationpart.cpp \ editorproxy.cpp generalinfowidget.cpp generalinfowidgetbase.ui languageselectwidget.cpp \ mainwindowshare.cpp mimewarningdialog.ui multibuffer.cpp partcontroller.cpp \ plugincontroller.cpp pluginselectdialog.cpp pluginselectdialog.h pluginselectdialogbase.ui \ projectmanager.cpp projectsession.cpp shellextension.cpp simplemainwindow.cpp \ splashscreen.cpp statusbar.cpp toplevel.cpp -bin_PROGRAMS = tdevelop tdevassistant +bin_PROGRAMS = tdevelop kdevassistant -tdevelop_SOURCES = main.cpp tdevideextension.cpp settingswidget.ui +tdevelop_SOURCES = main.cpp kdevideextension.cpp settingswidget.ui tdevelop_METASOURCES = AUTO tdevelop_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -tdevelop_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner +tdevelop_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner rcdir = $(kde_datadir)/tdevelop rc_DATA = tdevelopui.rc eventsrc -# default TDevelop configuration +# default KDevelop configuration tdevelopdatadir = $(kde_confdir) -tdevelopdata_DATA = tdeveloprc tdevassistantrc +tdevelopdata_DATA = tdeveloprc kdevassistantrc SUBDIRS = profiles profileengine newui tdeconf_update -tdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner -tdevassistant_SOURCES = main_assistant.cpp tdevassistantextension.cpp -tdevassistant_LDADD = libtdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -ltdevelop -L../lib/.libs -L../lib/interfaces/external/.libs -lkinterfacedesigner +kdevassistant_SOURCES = main_assistant.cpp kdevassistantextension.cpp +kdevassistant_LDADD = libkdevshell.la -L../lib/interfaces/external/.libs -lkinterfacedesigner -rc_assistantdir = $(kde_datadir)/tdevassistant -rc_assistant_DATA = tdevassistantui.rc +rc_assistantdir = $(kde_datadir)/kdevassistant +rc_assistant_DATA = kdevassistantui.rc shellincludedir = $(includedir)/tdevelop/shell shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \ generalinfowidget.h languageselectwidget.h mainwindowshare.h partcontroller.h \ @@ -48,9 +48,9 @@ shellinclude_HEADERS = api.h core.h documentationpart.h editorproxy.h \ statusbar.h toplevel.h generalinfowidgetbase.h mimewarningdialog.h settingswidget.h \ simplemainwindow.h multibuffer.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces tdevextensions -DOXYGEN_PROJECTNAME = TDevelop Generic Shell -DOXYGEN_DOCDIRPREFIX = tdevshell +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces kdevextensions +DOXYGEN_PROJECTNAME = KDevelop Generic Shell +DOXYGEN_DOCDIRPREFIX = kdevshell include ../Doxyfile.am profilesdatadir = $(kde_datadir)/tdevelop/profiles profilesdata_DATA = projectprofiles diff --git a/src/api.cpp b/src/api.cpp index 4053f871..8e56da3d 100644 --- a/src/api.cpp +++ b/src/api.cpp @@ -9,18 +9,18 @@ API *API::s_instance = 0; -TDevMainWindow *API::mainWindow() const +KDevMainWindow *API::mainWindow() const { return TopLevel::getInstance(); } -TDevPartController *API::partController() const +KDevPartController *API::partController() const { return PartController::getInstance(); } -TDevCore *API::core() const +KDevCore *API::core() const { return Core::getInstance(); } @@ -41,7 +41,7 @@ API *API::getInstance() API::API() - : TDevApi() + : KDevApi() { m_classStore = new CodeModel(); } @@ -53,7 +53,7 @@ API::~API() m_classStore = 0; } -TDevPluginController * API::pluginController() const +KDevPluginController * API::pluginController() const { return PluginController::getInstance(); } diff --git a/src/api.h b/src/api.h index 2957b42a..fb20447a 100644 --- a/src/api.h +++ b/src/api.h @@ -2,7 +2,7 @@ #define _API_H_ -#include "tdevapi.h" +#include "kdevapi.h" class CodeModel; @@ -10,14 +10,14 @@ class CodeModel; /** API implementation. */ -class API : public TDevApi +class API : public KDevApi { public: - virtual TDevMainWindow *mainWindow() const; - virtual TDevPartController *partController() const; - virtual TDevPluginController *pluginController() const; - virtual TDevCore *core() const; + virtual KDevMainWindow *mainWindow() const; + virtual KDevPartController *partController() const; + virtual KDevPluginController *pluginController() const; + virtual KDevCore *core() const; virtual CodeModel *codeModel() const; static API *getInstance(); diff --git a/src/core.cpp b/src/core.cpp index 64c3d0b9..ccdd0ace 100644 --- a/src/core.cpp +++ b/src/core.cpp @@ -59,7 +59,7 @@ void Core::setupShourtcutTips(KXMLGUIClient * client) } Core::Core() - : TDevCore() + : KDevCore() { } @@ -88,7 +88,7 @@ bool Core::queryClose() } -void Core::running(TDevPlugin * which, bool runs) +void Core::running(KDevPlugin * which, bool runs) { emit activeProcessChanged( which, runs ); } diff --git a/src/core.h b/src/core.h index 9973c7e0..c041eac0 100644 --- a/src/core.h +++ b/src/core.h @@ -7,7 +7,7 @@ #include -#include "tdevcore.h" +#include "kdevcore.h" namespace MainWindowUtils{ @@ -17,7 +17,7 @@ TQString beautifyToolTip(const TQString& text); /** Core implementation. */ -class Core : public TDevCore +class Core : public KDevCore { Q_OBJECT @@ -41,7 +41,7 @@ public: ~Core(); - virtual void running(TDevPlugin *which, bool runs); + virtual void running(KDevPlugin *which, bool runs); virtual void fillContextMenu(TQPopupMenu *popup, const Context *context); virtual void openProject(const TQString& projectFileName); @@ -51,13 +51,13 @@ public: void doEmitCoreInitialized() { emit coreInitialized(); } void doEmitProjectConfigWidget(KDialogBase *base) { emit projectConfigWidget(base); } void doEmitConfigWidget(KDialogBase *base) { emit configWidget(base); } - void doEmitStopButtonPressed(TDevPlugin* which = 0) { emit stopButtonClicked( which ); } + void doEmitStopButtonPressed(KDevPlugin* which = 0) { emit stopButtonClicked( which ); } bool queryClose(); signals: - void activeProcessChanged(TDevPlugin* which, bool runs); + void activeProcessChanged(KDevPlugin* which, bool runs); protected: diff --git a/src/documentationpart.cpp b/src/documentationpart.cpp index 43c9db67..b9ad78d0 100644 --- a/src/documentationpart.cpp +++ b/src/documentationpart.cpp @@ -3,7 +3,7 @@ #include "documentationpart.h" HTMLDocumentationPart::HTMLDocumentationPart() - : TDevHTMLPart() + : KDevHTMLPart() { setOptions(CanDuplicate | CanOpenInNewWindow); } diff --git a/src/documentationpart.h b/src/documentationpart.h index 84f17023..dd86ce8a 100644 --- a/src/documentationpart.h +++ b/src/documentationpart.h @@ -1,14 +1,14 @@ #ifndef __DOCUMENTATIONPART_H__ #define __DOCUMENTATIONPART_H__ -#include +#include /** HTML documentation part. -Implements shell-dependent "duplicate" and "open in new window" actions of TDevHTMLPart. +Implements shell-dependent "duplicate" and "open in new window" actions of KDevHTMLPart. */ -class HTMLDocumentationPart : public TDevHTMLPart +class HTMLDocumentationPart : public KDevHTMLPart { Q_OBJECT diff --git a/src/editorproxy.cpp b/src/editorproxy.cpp index fca4bfdf..73ff852b 100644 --- a/src/editorproxy.cpp +++ b/src/editorproxy.cpp @@ -27,7 +27,7 @@ #include "partcontroller.h" #include "core.h" #include "multibuffer.h" -#include "tdeveditorutil.h" +#include "kdeveditorutil.h" #include "editorproxy.h" @@ -178,20 +178,20 @@ void EditorProxy::popupAboutToShow() unsigned int line; unsigned int col; - if ( !TDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return; + if ( !KDevEditorUtil::currentPositionReal( &line, &col, doc ) ) return; TQString wordstr; - TQString selection = TDevEditorUtil::currentSelection( doc ); + TQString selection = KDevEditorUtil::currentSelection( doc ); if ( !selection.isEmpty() && selection.contains('\n') != 0 ) { wordstr = selection; } else { - wordstr = TDevEditorUtil::currentWord( doc ); + wordstr = KDevEditorUtil::currentWord( doc ); } - TQString linestr = TDevEditorUtil::currentLine( doc ); + TQString linestr = KDevEditorUtil::currentLine( doc ); EditorContext context( doc->url(), line, col, linestr, wordstr ); Core::getInstance()->fillContextMenu( popup, &context ); diff --git a/src/eventsrc b/src/eventsrc index 4032da95..baa16c20 100644 --- a/src/eventsrc +++ b/src/eventsrc @@ -1,6 +1,6 @@ [!Global!] IconName=tdevelop -Comment=TDevelop +Comment=KDevelop Comment[hi]=के-डेवलप [ProcessSuccess] diff --git a/src/tdevassistantextension.cpp b/src/kdevassistantextension.cpp similarity index 82% rename from src/tdevassistantextension.cpp rename to src/kdevassistantextension.cpp index f53d2bc3..ddbfb6bf 100644 --- a/src/tdevassistantextension.cpp +++ b/src/kdevassistantextension.cpp @@ -17,24 +17,24 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "tdevassistantextension.h" +#include "kdevassistantextension.h" -TDevAssistantExtension::TDevAssistantExtension() +KDevAssistantExtension::KDevAssistantExtension() : ShellExtension() { } -void TDevAssistantExtension::init() +void KDevAssistantExtension::init() { - s_instance = new TDevAssistantExtension(); + s_instance = new KDevAssistantExtension(); } -TQString TDevAssistantExtension::xmlFile() +TQString KDevAssistantExtension::xmlFile() { - return "tdevassistantui.rc"; + return "kdevassistantui.rc"; } -TQString TDevAssistantExtension::defaultProfile() +TQString KDevAssistantExtension::defaultProfile() { - return "TDevAssistant"; + return "KDevAssistant"; } diff --git a/src/tdevassistantextension.h b/src/kdevassistantextension.h similarity index 92% rename from src/tdevassistantextension.h rename to src/kdevassistantextension.h index a53d9dbd..874cafbd 100644 --- a/src/tdevassistantextension.h +++ b/src/kdevassistantextension.h @@ -17,12 +17,12 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVASSISTANTEXTENSION_H -#define TDEVASSISTANTEXTENSION_H +#ifndef KDEVASSISTANTEXTENSION_H +#define KDEVASSISTANTEXTENSION_H #include "shellextension.h" -class TDevAssistantExtension : public ShellExtension { +class KDevAssistantExtension : public ShellExtension { public: static void init(); @@ -34,7 +34,7 @@ public: virtual TQString defaultProfile(); protected: - TDevAssistantExtension(); + KDevAssistantExtension(); }; diff --git a/src/tdevassistantrc b/src/kdevassistantrc similarity index 100% rename from src/tdevassistantrc rename to src/kdevassistantrc diff --git a/src/tdevassistantui.rc b/src/kdevassistantui.rc similarity index 99% rename from src/tdevassistantui.rc rename to src/kdevassistantui.rc index 39171359..a5b202ce 100644 --- a/src/tdevassistantui.rc +++ b/src/kdevassistantui.rc @@ -1,5 +1,5 @@ - + &File diff --git a/src/tdevideextension.cpp b/src/kdevideextension.cpp similarity index 88% rename from src/tdevideextension.cpp rename to src/kdevideextension.cpp index a6b62e12..7bfbf29f 100644 --- a/src/tdevideextension.cpp +++ b/src/kdevideextension.cpp @@ -17,7 +17,7 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include "tdevideextension.h" +#include "kdevideextension.h" #include #include @@ -34,24 +34,24 @@ #include #include -#include -#include -#include +#include +#include +#include #include "api.h" #include "settingswidget.h" -TDevIDEExtension::TDevIDEExtension() +KDevIDEExtension::KDevIDEExtension() : ShellExtension() { } -void TDevIDEExtension::init() +void KDevIDEExtension::init() { - s_instance = new TDevIDEExtension(); + s_instance = new KDevIDEExtension(); } -void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) +void KDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) { TDEConfig* config = kapp->config(); TQVBox *vbox = dlg->addVBoxPage(i18n("General"), i18n("General"), BarIcon("tdevelop", TDEIcon::SizeMedium) ); @@ -75,8 +75,8 @@ void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) TQString DesignerSetting = config->readEntry( "DesignerSetting", "ExternalDesigner" ); gsw->qtDesignerRadioButton->setChecked( DesignerSetting == "ExternalDesigner" ); - gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalTDevDesigner" ); - gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedTDevDesigner" ); + gsw->seperateAppRadioButton->setChecked( DesignerSetting == "ExternalKDevDesigner" ); + gsw->embeddedDesignerRadioButton->setChecked( DesignerSetting == "EmbeddedKDevDesigner" ); config->setGroup("TerminalEmulator"); gsw->terminalEdit->setText( config->readEntry( "TerminalApplication", TQString::fromLatin1("konsole") ) ); @@ -85,7 +85,7 @@ void TDevIDEExtension::createGlobalSettingsPage(KDialogBase *dlg) gsw->useOtherTerminal->setChecked( !useKDESetting ); } -void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) +void KDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) { TDEConfig* config = kapp->config(); @@ -97,8 +97,8 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) TQString DesignerSetting; if ( gsw->qtDesignerRadioButton->isChecked() ) DesignerSetting = "ExternalDesigner"; - if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalTDevDesigner"; - if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedTDevDesigner"; + if ( gsw->seperateAppRadioButton->isChecked() ) DesignerSetting = "ExternalKDevDesigner"; + if ( gsw->embeddedDesignerRadioButton->isChecked() ) DesignerSetting = "EmbeddedKDevDesigner"; config->writeEntry( "DesignerSetting", DesignerSetting ); config->setGroup("MakeOutputView"); @@ -108,9 +108,9 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) //current item id must be in sync with the enum! config->writeEntry("CompilerOutputLevel",gsw->compileOutputCombo->currentItem()); config->sync(); - if( TDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend")) + if( KDevPlugin *makeExt = API::getInstance()->pluginController()->extension("TDevelop/MakeFrontend")) { - static_cast(makeExt)->updateSettingsFromConfig(); + static_cast(makeExt)->updateSettingsFromConfig(); } config->setGroup("TerminalEmulator"); @@ -118,12 +118,12 @@ void TDevIDEExtension::acceptGlobalSettingsPage(KDialogBase *dlg) config->writeEntry("TerminalApplication", gsw->terminalEdit->text().stripWhiteSpace() ); } -TQString TDevIDEExtension::xmlFile() +TQString KDevIDEExtension::xmlFile() { return "tdevelopui.rc"; } -TQString TDevIDEExtension::defaultProfile() +TQString KDevIDEExtension::defaultProfile() { return "IDE"; } diff --git a/src/tdevideextension.h b/src/kdevideextension.h similarity index 93% rename from src/tdevideextension.h rename to src/kdevideextension.h index 64c1a8ca..1e25da7e 100644 --- a/src/tdevideextension.h +++ b/src/kdevideextension.h @@ -17,14 +17,14 @@ * Free Software Foundation, Inc., * * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#ifndef TDEVIDEEXTENSION_H -#define TDEVIDEEXTENSION_H +#ifndef KDEVIDEEXTENSION_H +#define KDEVIDEEXTENSION_H #include class SettingsWidget; -class TDevIDEExtension : public ShellExtension { +class KDevIDEExtension : public ShellExtension { public: static void init(); @@ -36,7 +36,7 @@ public: virtual TQString defaultProfile(); protected: - TDevIDEExtension(); + KDevIDEExtension(); private: SettingsWidget *gsw; diff --git a/src/tdevpluginprofilerc b/src/kdevpluginprofilerc similarity index 85% rename from src/tdevpluginprofilerc rename to src/kdevpluginprofilerc index b93ba2c1..1c2abb92 100644 --- a/src/tdevpluginprofilerc +++ b/src/kdevpluginprofilerc @@ -12,7 +12,7 @@ C++=Profile_CPP C++/Embedded=Profile_CPP C++/KDE=Profile_CPP C++/wxWidgets= -C++/TDevelop +C++/KDevelop C++/Generic C++/GTK+ C++/QMake= @@ -30,7 +30,7 @@ Haskell= Pascal/Free Pascal= [Profile_BASE] -plugins=TDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen +plugins=KDevFileView,KDevClassView,KDevBookmarks,KDevQuickOpen [Profile_COMPILED] inherits=Profile_BASE @@ -38,7 +38,7 @@ plugins= [Profile_CPP] inherits=Profile_COMPILED -plugins=TDevDebugger +plugins=KDevDebugger [Profile_SCRIPT] inherits=Profile_BASE diff --git a/src/languageselectwidget.cpp b/src/languageselectwidget.cpp index 67723b65..7a8695ff 100644 --- a/src/languageselectwidget.cpp +++ b/src/languageselectwidget.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "domutil.h" #include "languageselectwidget.h" diff --git a/src/main.cpp b/src/main.cpp index 2df35f7e..6f27e415 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,7 +18,7 @@ #include "core.h" #include "projectmanager.h" -#include "tdevideextension.h" +#include "kdevideextension.h" static TDECmdLineOptions options[] = { @@ -86,15 +86,15 @@ int main(int argc, char *argv[]) TDEApplication app; - TDevIDEExtension::init(); + KDevIDEExtension::init(); - TDevSplashScreen *splash = 0; + KDevSplashScreen *splash = 0; TQString splashFile = locate("appdata", "pics/tdevelop-splash.png"); if (!splashFile.isEmpty()) { TQPixmap pm; pm.load(splashFile); - splash = new TDevSplashScreen( pm ); + splash = new KDevSplashScreen( pm ); } app.processEvents(); diff --git a/src/main_assistant.cpp b/src/main_assistant.cpp index 7cd9a98d..ba2c1886 100644 --- a/src/main_assistant.cpp +++ b/src/main_assistant.cpp @@ -18,7 +18,7 @@ #include "core.h" #include "projectmanager.h" -#include "tdevassistantextension.h" +#include "kdevassistantextension.h" static TDECmdLineOptions options[] = { @@ -30,7 +30,7 @@ static TDECmdLineOptions options[] = int main(int argc, char *argv[]) { static const char description[] = I18N_NOOP("The TDevelop Integrated Development Environment:\nassistant and documentation viewer"); - TDEAboutData aboutData("tdevassistant", I18N_NOOP("TDevelop Assistant"), + TDEAboutData aboutData("kdevassistant", I18N_NOOP("TDevelop Assistant"), VERSION, description, TDEAboutData::License_GPL, I18N_NOOP("(c) 1999-2007, The KDevelop developers"), "", "http://www.kdevelop.org"); aboutData.addAuthor("Alexander Dymo", I18N_NOOP("Release coordinator, Overall improvements, Pascal support, C++ support, New File and Documentation parts"), "adymo@kdevelop.org"); @@ -80,15 +80,15 @@ int main(int argc, char *argv[]) TDEApplication app; - TDevAssistantExtension::init(); + KDevAssistantExtension::init(); - TDevSplashScreen *splash = 0; - TQString splashFile = locate("data", "tdevelop/pics/tdevassistant-splash.png"); + KDevSplashScreen *splash = 0; + TQString splashFile = locate("data", "tdevelop/pics/kdevassistant-splash.png"); if (!splashFile.isEmpty()) { TQPixmap pm; pm.load(splashFile); - splash = new TDevSplashScreen( pm ); + splash = new KDevSplashScreen( pm ); } if (splash) splash->show(); @@ -109,7 +109,7 @@ int main(int argc, char *argv[]) if (splash) delete splash; - kapp->dcopClient()->registerAs("tdevassistant"); + kapp->dcopClient()->registerAs("kdevassistant"); return app.exec(); } diff --git a/src/mainwindowshare.cpp b/src/mainwindowshare.cpp index 8e44d7b7..a06dba14 100644 --- a/src/mainwindowshare.cpp +++ b/src/mainwindowshare.cpp @@ -55,11 +55,11 @@ #include "projectmanager.h" #include "core.h" #include "api.h" -#include "tdevmakefrontend.h" +#include "kdevmakefrontend.h" #include "toplevel.h" #include "plugincontroller.h" -#include "tdevplugininfo.h" +#include "kdevplugininfo.h" #include "mainwindowshare.h" @@ -120,8 +120,8 @@ void MainWindowShare::createActions() connect(m_stopProcesses->popupMenu(), TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotStopPopupActivated(int))); - connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(TDevPlugin*, bool)), - this, TQT_SLOT(slotActiveProcessChanged(TDevPlugin*, bool)) ); + connect( Core::getInstance(), TQT_SIGNAL(activeProcessChanged(KDevPlugin*, bool)), + this, TQT_SLOT(slotActiveProcessChanged(KDevPlugin*, bool)) ); action = KStdAction::showMenubar( this, TQT_SLOT(slotShowMenuBar()), @@ -180,7 +180,7 @@ void MainWindowShare::createActions() m_configureEditorAction->setWhatsThis(i18n("Configure editor

Opens editor configuration dialog.")); m_configureEditorAction->setEnabled( false ); - TDevPartController * partController = API::getInstance()->partController(); + KDevPartController * partController = API::getInstance()->partController(); connect( partController, TQT_SIGNAL(activePartChanged(KParts::Part*)), this, TQT_SLOT(slotActivePartChanged(KParts::Part* )) ); } @@ -236,7 +236,7 @@ void MainWindowShare::slotStopButtonPressed() Core::getInstance()->doEmitStopButtonPressed(); } -void MainWindowShare::slotActiveProcessChanged( TDevPlugin* plugin, bool active ) +void MainWindowShare::slotActiveProcessChanged( KDevPlugin* plugin, bool active ) { if ( !plugin ) return; @@ -251,7 +251,7 @@ void MainWindowShare::slotActiveProcessChanged( TDevPlugin* plugin, bool active void MainWindowShare::slotStopPopupActivated( int id ) { - TDevPlugin* plugin = activeProcesses.at( id ); + KDevPlugin* plugin = activeProcesses.at( id ); if ( plugin && plugin->info()->genericName() == m_stopProcesses->popupMenu()->text( id ) ) { Core::getInstance()->doEmitStopButtonPressed( plugin ); return; @@ -273,7 +273,7 @@ void MainWindowShare::slotStopMenuAboutToShow() popup->clear(); int i = 0; - for ( TDevPlugin* plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) { + for ( KDevPlugin* plugin = activeProcesses.first(); plugin; plugin = activeProcesses.next() ) { popup->insertItem( plugin->info()->genericName(), i++ ); } } @@ -325,7 +325,7 @@ void MainWindowShare::slotConfigureEditors() { kdDebug(9000) << " *** MainWindowShare::slotConfigureEditors()" << endl; - TDevPartController * partController = API::getInstance()->partController(); + KDevPartController * partController = API::getInstance()->partController(); KParts::Part * part = partController->activePart(); KTextEditor::ConfigInterface * conf = dynamic_cast( part ); diff --git a/src/mainwindowshare.h b/src/mainwindowshare.h index 7ac08bdb..a9ec620a 100644 --- a/src/mainwindowshare.h +++ b/src/mainwindowshare.h @@ -54,7 +54,7 @@ private slots: void slotConfigureNotifications(); void slotConfigureEditors(); void slotSettings(); - void slotActiveProcessChanged( TDevPlugin*, bool ); + void slotActiveProcessChanged( KDevPlugin*, bool ); void slotActivePartChanged( KParts::Part* part ); void slotStopPopupActivated(int); void slotStopMenuAboutToShow(); @@ -83,7 +83,7 @@ private: TDEToolBarPopupAction* m_stopProcesses; //!< Stops all running processes KParts::MainWindow* m_pMainWnd; - TQPtrList activeProcesses; + TQPtrList activeProcesses; }; #endif // __MAINWINDOWSHARE_H__ diff --git a/src/multibuffer.cpp b/src/multibuffer.cpp index 757eeab7..05a4d26f 100644 --- a/src/multibuffer.cpp +++ b/src/multibuffer.cpp @@ -32,7 +32,7 @@ #include "toplevel.h" #include "editorproxy.h" #include "partcontroller.h" -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include #include @@ -53,7 +53,7 @@ MultiBuffer::MultiBuffer( TQWidget *parent ) m_activeBuffer( 0 ) { EditorProxy::getInstance() ->registerEditor( this ); - if ( TDevLanguageSupport *lang = + if ( KDevLanguageSupport *lang = API::getInstance() ->languageSupport() ) { setOrientation( lang->splitOrientation() ); diff --git a/src/partcontroller.cpp b/src/partcontroller.cpp index 16bffcca..21b78a8c 100644 --- a/src/partcontroller.cpp +++ b/src/partcontroller.cpp @@ -54,14 +54,14 @@ #include "documentationpart.h" #include "ksavealldialog.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "urlutil.h" #include "mimewarningdialog.h" #include "domutil.h" -#include "tdevjobtimer.h" +#include "kdevjobtimer.h" #include "designer.h" -#include "tdevlanguagesupport.h" +#include "kdevlanguagesupport.h" #include "multibuffer.h" #include "partcontroller.h" @@ -90,7 +90,7 @@ struct ModificationData PartController::PartController(TQWidget *parent) - : TDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) + : KDevPartController(parent), _editorFactory(0L), m_currentActivePart(0), m_removingActivePart(false) { connect(this, TQT_SIGNAL(partRemoved(KParts::Part*)), this, TQT_SLOT(slotPartRemoved(KParts::Part* )) ); connect(this, TQT_SIGNAL(partAdded(KParts::Part*)), this, TQT_SLOT(slotPartAdded(KParts::Part* )) ); @@ -348,7 +348,7 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, if ( !addToCurrentBuffer ) { - if ( TDevLanguageSupport *lang = + if ( KDevLanguageSupport *lang = API::getInstance()->languageSupport() ) { // Let the language part override the addToCurrentBuffer flag @@ -406,11 +406,11 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, DesignerSetting = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designerintegration", DesignerSetting ); designerExec = DomUtil::readEntry(*dom, "/kdevcppsupport/qt/designer", designerExec ); } - if ( DesignerSetting == "ExternalTDevDesigner" ) + if ( DesignerSetting == "ExternalKDevDesigner" ) { - designerExec = "tdevdesigner"; + designerExec = "kdevdesigner"; } - else if ( DesignerSetting == "EmbeddedTDevDesigner" ) + else if ( DesignerSetting == "EmbeddedKDevDesigner" ) { if ( KParts::ReadOnlyPart *designerPart = qtDesignerPart() ) { @@ -419,12 +419,12 @@ void PartController::editDocumentInternal( const KURL & inputUrl, int lineNum, designerPart->openURL(url); return; } - else if ( KParts::Factory * TDevDesignerFactory = static_cast( KLibLoader::self()->factory( TQFile::encodeName( "libtdevdesignerpart" ) ) ) ) + else if ( KParts::Factory * KDevDesignerFactory = static_cast( KLibLoader::self()->factory( TQFile::encodeName( "libkdevdesignerpart" ) ) ) ) { - KParts::ReadWritePart * tdevpart = static_cast( TDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart" ) ); - tdevpart->openURL( url ); + KParts::ReadWritePart * kdevpart = static_cast( KDevDesignerFactory->createPart( TopLevel::getInstance()->main(), 0, 0, 0, "KParts::ReadWritePart" ) ); + kdevpart->openURL( url ); addHistoryEntry(); - integratePart( tdevpart, url ); + integratePart( kdevpart, url ); m_openRecentAction->addURL( url ); m_openRecentAction->saveEntries( kapp->config(), "RecentFiles" ); return; @@ -1386,7 +1386,7 @@ void PartController::slotDocumentDirty( Kate::Document * d, bool isModified, uns p->doc = doc; p->isModified = isModified; p->reason = reason; - TDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); + KDevJobTimer::singleShot( 0, this, TQT_SLOT(slotDocumentDirtyStepTwo(void*)), p ); } } diff --git a/src/partcontroller.h b/src/partcontroller.h index 064c6ef6..2e621c38 100644 --- a/src/partcontroller.h +++ b/src/partcontroller.h @@ -1,7 +1,7 @@ #ifndef __PARTCONTROLLER_H__ #define __PARTCONTROLLER_H__ -#include "tdevpartcontroller.h" +#include "kdevpartcontroller.h" #include #include @@ -40,7 +40,7 @@ class KDirWatch; /** Part controler implementation. */ -class PartController : public TDevPartController +class PartController : public KDevPartController { Q_OBJECT @@ -51,7 +51,7 @@ public: static void createInstance(TQWidget *parent); static PartController *getInstance(); - ///// TDevPartController interface + ///// KDevPartController interface void setEncoding(const TQString &encoding); void editDocument(const KURL &inputUrl, int lineNum=-1, int col=-1); diff --git a/src/plugincontroller.cpp b/src/plugincontroller.cpp index 7b6410b7..30aa9171 100644 --- a/src/plugincontroller.cpp +++ b/src/plugincontroller.cpp @@ -19,14 +19,14 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -77,7 +77,7 @@ PluginController *PluginController::getInstance() PluginController::PluginController() - : TDevPluginController() + : KDevPluginController() { /* m_defaultProfile = TQString::fromLatin1( "FullIDE" ); m_defaultProfilePath = kapp->dirs()->localtdedir() + "/" + @@ -149,7 +149,7 @@ void PluginController::loadPlugins( TDETrader::OfferList offers, const TQStringL emit loadingPlugin(i18n("Loading: %1").arg((*it)->genericName())); - TDevPlugin *plugin = loadPlugin( *it ); + KDevPlugin *plugin = loadPlugin( *it ); if ( plugin ) { m_parts.insert( name, plugin ); @@ -160,9 +160,9 @@ void PluginController::loadPlugins( TDETrader::OfferList offers, const TQStringL void PluginController::unloadPlugins() { - for( TQDictIterator it( m_parts ); !it.isEmpty(); ) + for( TQDictIterator it( m_parts ); !it.isEmpty(); ) { - TDevPlugin* part = it.current(); + KDevPlugin* part = it.current(); removePart( part ); m_parts.remove( it.currentKey() ); delete part; @@ -180,7 +180,7 @@ void PluginController::unloadProjectPlugins( ) { TQString name = (*it)->desktopEntryName(); - if ( TDevPlugin * plugin = m_parts[ name ] ) + if ( KDevPlugin * plugin = m_parts[ name ] ) { kdDebug(9000) << " *** Removing: " << name << endl; removeAndForgetPart( name, plugin ); @@ -194,7 +194,7 @@ void PluginController::unloadPlugins( TQStringList const & unloadParts ) TQStringList::ConstIterator it = unloadParts.begin(); while ( it != unloadParts.end() ) { - TDevPlugin* part = m_parts[ *it ]; + KDevPlugin* part = m_parts[ *it ]; if( part ) { kdDebug(9000) << " *** Removing: " << *it << endl; @@ -206,11 +206,11 @@ void PluginController::unloadPlugins( TQStringList const & unloadParts ) } } -TDevPlugin *PluginController::loadPlugin( const KService::Ptr &service ) +KDevPlugin *PluginController::loadPlugin( const KService::Ptr &service ) { int err = 0; - TDevPlugin * pl = KParts::ComponentFactory - ::createInstanceFromService( service, API::getInstance(), 0, + KDevPlugin * pl = KParts::ComponentFactory + ::createInstanceFromService( service, API::getInstance(), 0, argumentsFromService( service ), &err ); if (!pl) { @@ -248,7 +248,7 @@ void PluginController::integratePart(KXMLGUIClient *part) TopLevel::getInstance()->main()->actionCollection(), TQT_SIGNAL( actionStatusText( const TQString & ) ) ); } -void PluginController::integrateAndRememberPart(const TQString &name, TDevPlugin *part) +void PluginController::integrateAndRememberPart(const TQString &name, KDevPlugin *part) { m_parts.insert(name, part); integratePart(part); @@ -260,17 +260,17 @@ void PluginController::removePart(KXMLGUIClient *part) TopLevel::getInstance()->main()->guiFactory()->removeClient(part); } -void PluginController::removeAndForgetPart(const TQString &name, TDevPlugin *part) +void PluginController::removeAndForgetPart(const TQString &name, KDevPlugin *part) { kdDebug() << "removing: " << name << endl; m_parts.remove(name); removePart(part); } -const TQValueList PluginController::loadedPlugins() +const TQValueList PluginController::loadedPlugins() { - TQValueList plugins; - TQDictIterator itt(m_parts); + TQValueList plugins; + TQDictIterator itt(m_parts); while( itt.current() ) { plugins.append( itt.current() ); @@ -279,26 +279,26 @@ const TQValueList PluginController::loadedPlugins() return plugins; } -TDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint ) +KDevPlugin * PluginController::extension( const TQString & serviceType, const TQString & constraint ) { - TDETrader::OfferList offers = TDevPluginController::query(serviceType, constraint); + TDETrader::OfferList offers = KDevPluginController::query(serviceType, constraint); for (TDETrader::OfferList::const_iterator it = offers.constBegin(); it != offers.end(); ++it) { - TDevPlugin *ext = m_parts[(*it)->desktopEntryName()]; + KDevPlugin *ext = m_parts[(*it)->desktopEntryName()]; if (ext) return ext; } return 0; } -TDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint ) +KDevPlugin * PluginController::loadPlugin( const TQString & serviceType, const TQString & constraint ) { - TDETrader::OfferList offers = TDevPluginController::query( serviceType, constraint ); + TDETrader::OfferList offers = KDevPluginController::query( serviceType, constraint ); if ( !offers.size() == 1 ) return 0; TDETrader::OfferList::const_iterator it = offers.constBegin(); TQString name = (*it)->desktopEntryName(); - TDevPlugin * plugin = 0; + KDevPlugin * plugin = 0; if ( plugin = m_parts[ name ] ) { return plugin; @@ -372,12 +372,12 @@ void PluginController::selectPlugins( ) } /* -TDevPlugin * PluginController::getPlugin( const KService::Ptr & service ) +KDevPlugin * PluginController::getPlugin( const KService::Ptr & service ) { - TDevPlugin * plugin = m_parts[ (*it)->name() ]; + KDevPlugin * plugin = m_parts[ (*it)->name() ]; if ( !plugin ) { - TDevPlugin * plugin = loadPlugin( *it ); + KDevPlugin * plugin = loadPlugin( *it ); if ( plugin ) { integratePart( plugin ); diff --git a/src/plugincontroller.h b/src/plugincontroller.h index eb635bb6..d5c3f423 100644 --- a/src/plugincontroller.h +++ b/src/plugincontroller.h @@ -6,13 +6,13 @@ #include -#include +#include #include class KXMLGUIClient; class KService; -class TDevPlugin; +class KDevPlugin; class KDialogBase; class ProjectInfo; @@ -20,7 +20,7 @@ class ProjectInfo; Plugin controller implementation. Loads and unloads plugins. */ -class PluginController : public TDevPluginController +class PluginController : public KDevPluginController { Q_OBJECT @@ -33,7 +33,7 @@ public: static TQStringList argumentsFromService( const KService::Ptr &service ); - virtual TDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ); + virtual KDevPlugin * loadPlugin( const TQString & serviceType, const TQString & constraint ); virtual void unloadPlugin( const TQString & plugin ); TQString currentProfile() const { return m_profile; } @@ -45,18 +45,18 @@ public: void loadGlobalPlugins( const TQStringList & ignorePlugins = TQStringList() ); - // TDevPlugin * getPlugin( const KService::Ptr &service ); + // KDevPlugin * getPlugin( const KService::Ptr &service ); - virtual TDevPlugin *extension(const TQString &serviceType, const TQString &constraint = ""); + virtual KDevPlugin *extension(const TQString &serviceType, const TQString &constraint = ""); void unloadPlugins( TQStringList const & ); void integratePart(KXMLGUIClient *part); - void integrateAndRememberPart(const TQString &name, TDevPlugin *part); + void integrateAndRememberPart(const TQString &name, KDevPlugin *part); void removePart(KXMLGUIClient* part); - void removeAndForgetPart(const TQString &name, TDevPlugin* part); + void removeAndForgetPart(const TQString &name, KDevPlugin* part); - const TQValueList loadedPlugins(); + const TQValueList loadedPlugins(); ProfileEngine &engine() { return m_engine; } @@ -82,10 +82,10 @@ private slots: void unloadPlugins(); private: - static TDevPlugin *loadPlugin( const KService::Ptr &service ); + static KDevPlugin *loadPlugin( const KService::Ptr &service ); - TQDict m_parts; + TQDict m_parts; TQString m_profile; static PluginController *s_instance; diff --git a/src/pluginselectdialog.cpp b/src/pluginselectdialog.cpp index 4f32a37d..2f896b51 100644 --- a/src/pluginselectdialog.cpp +++ b/src/pluginselectdialog.cpp @@ -18,7 +18,7 @@ #include #include -#include "tdevplugin.h" +#include "kdevplugin.h" #include "projectmanager.h" #include "plugincontroller.h" #include "pluginselectdialog.h" @@ -109,9 +109,9 @@ void PluginSelectDialog::itemSelected( TQListViewItem * item ) void PluginSelectDialog::init( ) { - const TQValueList loadedPlugins = PluginController::getInstance()->loadedPlugins(); + const TQValueList loadedPlugins = PluginController::getInstance()->loadedPlugins(); TQStringList loadedPluginDesktopNames; - TQValueList::ConstIterator it = loadedPlugins.begin(); + TQValueList::ConstIterator it = loadedPlugins.begin(); while( it != loadedPlugins.end() ) { loadedPluginDesktopNames << (*it)->instance()->instanceName(); diff --git a/src/profileengine/editor/CMakeLists.txt b/src/profileengine/editor/CMakeLists.txt index 443da696..cfd7c59c 100644 --- a/src/profileengine/editor/CMakeLists.txt +++ b/src/profileengine/editor/CMakeLists.txt @@ -21,9 +21,9 @@ link_directories( ) -##### tdevprofileeditor (executable) ############ +##### kdevprofileeditor (executable) ############ -tde_add_executable( tdevprofileeditor +tde_add_executable( kdevprofileeditor SOURCES main.cpp LINK profileeditor-static profileengine-shared tdeio-shared DESTINATION ${BIN_INSTALL_DIR} diff --git a/src/profileengine/editor/Makefile.am b/src/profileengine/editor/Makefile.am index fae89b48..26f69be6 100644 --- a/src/profileengine/editor/Makefile.am +++ b/src/profileengine/editor/Makefile.am @@ -12,11 +12,11 @@ libprofileeditor_la_SOURCES = profileeditorbase.ui profileeditor.cpp \ noinst_HEADERS = profileeditor.h -bin_PROGRAMS = tdevprofileeditor -tdevprofileeditor_LDFLAGS = $(all_libraries) -tdevprofileeditor_LDADD = \ +bin_PROGRAMS = kdevprofileeditor +kdevprofileeditor_LDFLAGS = $(all_libraries) +kdevprofileeditor_LDADD = \ $(top_builddir)/src/profileengine/lib/libprofileengine.la libprofileeditor.la \ $(LIB_TDEUI) $(LIB_TDEIO) -tdevprofileeditor_SOURCES = main.cpp +kdevprofileeditor_SOURCES = main.cpp diff --git a/src/profileengine/editor/main.cpp b/src/profileengine/editor/main.cpp index 68e942d7..46d128f3 100644 --- a/src/profileengine/editor/main.cpp +++ b/src/profileengine/editor/main.cpp @@ -30,7 +30,7 @@ static TDECmdLineOptions options[] = int main(int argc, char **argv) { - TDEAboutData about("tdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", + TDEAboutData about("kdevprofileeditor", I18N_NOOP("TDevelop Profile Editor"), "1", "", TDEAboutData::License_GPL, I18N_NOOP("(c) 2004, The KDevelop Developers"), 0, 0, ""); about.addAuthor("Alexander Dymo", 0, "adymo@kdevelop.org"); TDECmdLineArgs::init(argc, argv, &about); diff --git a/src/profileengine/lib/Makefile.am b/src/profileengine/lib/Makefile.am index 66b1f159..08b6e7ad 100644 --- a/src/profileengine/lib/Makefile.am +++ b/src/profileengine/lib/Makefile.am @@ -10,7 +10,7 @@ libprofileengine_la_SOURCES = profileengine.cpp profile.cpp profileincludedir = $(includedir)/tdevelop/shell/profileengine profileinclude_HEADERS = profileengine.h profile.h -DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils tdevutil tdevinterfaces -DOXYGEN_PROJECTNAME = TDevelop Shell Profiles Library -DOXYGEN_DOCDIRPREFIX = tdevprofiles +DOXYGEN_REFERENCES = dcop interfaces tdecore tdefx tdeui tdehtml tdemdi tdeio kjs tdeparts tdeutils kdevutil kdevinterfaces +DOXYGEN_PROJECTNAME = KDevelop Shell Profiles Library +DOXYGEN_DOCDIRPREFIX = kdevprofiles include ../../../Doxyfile.am diff --git a/src/profileengine/lib/profileengine.cpp b/src/profileengine/lib/profileengine.cpp index 8678732e..fd4d06fa 100644 --- a/src/profileengine/lib/profileengine.cpp +++ b/src/profileengine/lib/profileengine.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include ProfileEngine::ProfileEngine() { diff --git a/src/profileengine/lib/profileengine.h b/src/profileengine/lib/profileengine.h index d630f576..36d85697 100644 --- a/src/profileengine/lib/profileengine.h +++ b/src/profileengine/lib/profileengine.h @@ -61,27 +61,27 @@ public: /** Profile engine. -- Uses TDevelop profiles to form lists of plugin offers; +- Uses KDevelop profiles to form lists of plugin offers; - Provides means of managing profiles; - Provides means to access the resources provided by a profile. -TDevelop profiles form a tree with a root profile named "TDevelop". +KDevelop profiles form a tree with a root profile named "KDevelop". For example, such profiles tree can look as: @code -TDevelop +KDevelop - IDE - CompiledLanguageIDE - AdaIDE - CandCppIDE - CIDE - CppIDE - - TDECppIDE + - KDECppIDE - FortranIDE ... - DatabaseIDE - ScriptingLanguageIDE .. -- TDevAssistant +- KDevAssistant @endcode To manage a tree of profiles, use @ref ProfileEngine::walkProfiles methods. */ @@ -92,7 +92,7 @@ public: /**Type of the plugin offer. Engine will usually find profiles and return offers of selected type. - @sa TDevPlugin class documentation for more information of plugin types.*/ + @sa KDevPlugin class documentation for more information of plugin types.*/ enum OfferType { Global /** #include -#include "tdevproject.h" -#include "tdevlanguagesupport.h" -#include "tdevplugin.h" -#include "tdevcreatefile.h" -#include "tdevversioncontrol.h" +#include "kdevproject.h" +#include "kdevlanguagesupport.h" +#include "kdevplugin.h" +#include "kdevcreatefile.h" +#include "kdevversioncontrol.h" #include "toplevel.h" @@ -97,7 +97,7 @@ void ProjectManager::createActions( TDEActionCollection* ac ) this, TQT_SLOT(slotOpenProject()), ac, "project_open"); action->setToolTip( i18n("Open project")); - action->setWhatsThis(i18n("Open project

Opens a KDevelop3 or TDevelop2 project.")); + action->setWhatsThis(i18n("Open project

Opens a KDevelop3 or KDevelop2 project.")); m_openRecentProjectAction = new TDERecentFilesAction(i18n("Open &Recent Project"), 0, @@ -137,8 +137,8 @@ void ProjectManager::slotOpenProject() if( url.isEmpty() ) return; - if (url.path().endsWith("tdevprj")) - loadTDevelop2Project( url ); + if (url.path().endsWith("kdevprj")) + loadKDevelop2Project( url ); else loadProject( url ); } @@ -490,8 +490,8 @@ bool ProjectManager::loadProjectPart() return false; } - TDevProject *projectPart = KParts::ComponentFactory - ::createInstanceFromService< TDevProject >( projectService, API::getInstance(), 0, + KDevProject *projectPart = KParts::ComponentFactory + ::createInstanceFromService< KDevProject >( projectService, API::getInstance(), 0, PluginController::argumentsFromService( projectService ) ); if ( !projectPart ) { KMessageBox::sorry(TopLevel::getInstance()->main(), @@ -517,7 +517,7 @@ bool ProjectManager::loadProjectPart() void ProjectManager::unloadProjectPart() { - TDevProject *projectPart = API::getInstance()->project(); + KDevProject *projectPart = API::getInstance()->project(); if( !projectPart ) return; PluginController::getInstance()->removePart( projectPart ); projectPart->closeProject(); @@ -547,8 +547,8 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) } KService::Ptr languageSupportService = *languageSupportOffers.begin(); - TDevLanguageSupport *langSupport = KParts::ComponentFactory - ::createInstanceFromService( languageSupportService, + KDevLanguageSupport *langSupport = KParts::ComponentFactory + ::createInstanceFromService( languageSupportService, API::getInstance(), 0, PluginController::argumentsFromService( languageSupportService ) ); @@ -569,7 +569,7 @@ bool ProjectManager::loadLanguageSupport(const TQString& lang) void ProjectManager::unloadLanguageSupport() { - TDevLanguageSupport *langSupport = API::getInstance()->languageSupport(); + KDevLanguageSupport *langSupport = API::getInstance()->languageSupport(); if( !langSupport ) return; kdDebug(9000) << "Language support for " << langSupport->name() << " unloading..." << endl; PluginController::getInstance()->removePart( langSupport ); @@ -611,14 +611,14 @@ ProjectSession* ProjectManager::projectSession() const return m_pProjectSession; } -bool ProjectManager::loadTDevelop2Project( const KURL & url ) +bool ProjectManager::loadKDevelop2Project( const KURL & url ) { if( !url.isValid() || !url.isLocalFile() ){ KMessageBox::sorry(0, i18n("Invalid URL.")); return false; } - TQString cmd = TDEGlobal::dirs()->findExe( "tdevprj2tdevelop" ); + TQString cmd = TDEGlobal::dirs()->findExe( "kdevprj2tdevelop" ); if (cmd.isEmpty()) { KMessageBox::sorry(0, i18n("You do not have 'kdevprj2tdevelop' installed.")); return false; diff --git a/src/projectmanager.h b/src/projectmanager.h index 3c1b3599..3a92409e 100644 --- a/src/projectmanager.h +++ b/src/projectmanager.h @@ -17,7 +17,7 @@ class KService; class ProjectInfo; class ProjectSession; class TDERecentFilesAction; -class TDevPlugin; +class KDevPlugin; class ProjectInfo @@ -65,7 +65,7 @@ public: public slots: bool loadProject( const KURL& url); - bool loadTDevelop2Project( const KURL& url); + bool loadKDevelop2Project( const KURL& url); bool closeProject( bool exiting = false ); private slots: @@ -102,7 +102,7 @@ private: ProjectSession* m_pProjectSession; - TDevPlugin *m_vcsPlugin; + KDevPlugin *m_vcsPlugin; TQString m_vcsName; TQString m_oldProfileName; diff --git a/src/projectprofiles b/src/projectprofiles index b86f9b25..d2224272 100644 --- a/src/projectprofiles +++ b/src/projectprofiles @@ -8,8 +8,8 @@ Profiles=ShellIDE Profiles=CIDE [C++] -Keywords=Empty,TDE -Profiles=CppIDE,TDECppIDE +Keywords=Empty,KDE +Profiles=CppIDE,KDECppIDE [Fortran77] Profiles=FortranIDE diff --git a/src/projectsession.cpp b/src/projectsession.cpp index 1b8173fc..afdaf0b5 100644 --- a/src/projectsession.cpp +++ b/src/projectsession.cpp @@ -34,7 +34,7 @@ #include "domutil.h" #include "documentationpart.h" #include "toplevel.h" -#include "tdevplugin.h" +#include "kdevplugin.h" #include "projectsession.h" #include "projectsession.moc" @@ -68,7 +68,7 @@ void ProjectSession::initXMLTree() } //--------------------------------------------------------------------------- -bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > plugins ) +bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins ) { bool bFileOpenOK = true; @@ -105,10 +105,10 @@ bool ProjectSession::restoreFromFile( const TQString & sessionFileName, const TQ // now also let the plugins load their session stuff TQDomElement pluginListEl = session.namedItem("pluginList").toElement(); - TQValueList::ConstIterator it = plugins.begin(); + TQValueList::ConstIterator it = plugins.begin(); while( it != plugins.end() ) { - TDevPlugin* pPlugin = (*it); + KDevPlugin* pPlugin = (*it); TQString pluginName = pPlugin->instance()->instanceName(); TQDomElement pluginEl = pluginListEl.namedItem(pluginName).toElement(); if (!pluginEl.isNull()) { @@ -230,7 +230,7 @@ void ProjectSession::recreateViews(KURL& url, TQDomElement docEl, bool activate) } //--------------------------------------------------------------------------- -bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< TDevPlugin * > plugins ) +bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValueList< KDevPlugin * > plugins ) { TQString section, keyword; TQDomElement session = domdoc.documentElement(); @@ -390,10 +390,10 @@ bool ProjectSession::saveToFile( const TQString & sessionFileName, const TQValue } } - TQValueList::ConstIterator itt = plugins.begin(); + TQValueList::ConstIterator itt = plugins.begin(); while( itt != plugins.end() ) { - TDevPlugin* pPlugin = (*itt); + KDevPlugin* pPlugin = (*itt); TQString pluginName = pPlugin->instance()->instanceName(); TQDomElement pluginEl = domdoc.createElement(pluginName); diff --git a/src/projectsession.h b/src/projectsession.h index 64101496..e386bdbc 100644 --- a/src/projectsession.h +++ b/src/projectsession.h @@ -24,7 +24,7 @@ class TQWidget; class KURL; -class TDevPlugin; +class KDevPlugin; /** * This class stores and restores the last situation before the certain project @@ -42,10 +42,10 @@ public: virtual ~ProjectSession(); /** Opens the .kdevses file and saves the project session in XML format to it. */ - bool saveToFile(const TQString& fileName, const TQValueList plugins ); + bool saveToFile(const TQString& fileName, const TQValueList plugins ); /** Opens the .kdevses file and loads the project session from it. */ - bool restoreFromFile(const TQString& fileName, const TQValueList plugins ); + bool restoreFromFile(const TQString& fileName, const TQValueList plugins ); signals: void sig_restoreMainWindowProperties(const TQDomElement* el); diff --git a/src/simplemainwindow.cpp b/src/simplemainwindow.cpp index f82f4882..3c9db000 100644 --- a/src/simplemainwindow.cpp +++ b/src/simplemainwindow.cpp @@ -41,7 +41,7 @@ #include #include #include -#include +#include #include #include "api.h" @@ -81,7 +81,7 @@ void SimpleMainWindow::init() createFramework(); createActions(); - new TDevStatusBar(this); + new KDevStatusBar(this); setAcceptDrops(true); @@ -466,7 +466,7 @@ void SimpleMainWindow::createActions() void SimpleMainWindow::raiseEditor() { kdDebug() << "SimpleMainWindow::raiseEditor" << endl; - TDevPartController *partcontroller = API::getInstance()->partController(); + KDevPartController *partcontroller = API::getInstance()->partController(); if (partcontroller->activePart() && partcontroller->activePart()->widget()) partcontroller->activePart()->widget()->setFocus(); } @@ -983,7 +983,7 @@ void SimpleMainWindow::setCaption(const TQString &caption) modified = ( state == Modified || state == DirtyAndModified ); } - TDevProject *project = API::getInstance()->project(); + KDevProject *project = API::getInstance()->project(); if (project) { TQString projectname = project->projectName(); diff --git a/src/simplemainwindow.h b/src/simplemainwindow.h index 1f80119f..7dbf5695 100644 --- a/src/simplemainwindow.h +++ b/src/simplemainwindow.h @@ -21,9 +21,9 @@ #define SIMPLEMAINWINDOW_H #include -#include -#include -#include +#include +#include +#include class TDEAction; class TQPopupMenu; @@ -34,7 +34,7 @@ namespace KParts { class ReadOnlyPart; } -class SimpleMainWindow: public DMainWindow, public TDevMainWindow { +class SimpleMainWindow: public DMainWindow, public KDevMainWindow { Q_OBJECT public: diff --git a/src/splashscreen.cpp b/src/splashscreen.cpp index 446705b8..205656bd 100644 --- a/src/splashscreen.cpp +++ b/src/splashscreen.cpp @@ -10,7 +10,7 @@ #include #include -TDevSplashScreen::TDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) +KDevSplashScreen::KDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashScreen(pixmap, f) { TQTimer *timer = new TQTimer( this ); TQObject::connect(timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(animate())); @@ -21,19 +21,19 @@ TDevSplashScreen::TDevSplashScreen(const TQPixmap& pixmap, WFlags f) : TQSplashS } -TDevSplashScreen::~TDevSplashScreen() +KDevSplashScreen::~KDevSplashScreen() { } -void TDevSplashScreen::animate() +void KDevSplashScreen::animate() { state = ((state + 1) % (2*progress_bar_size-1)); repaint(); } -void TDevSplashScreen::message( const TQString &str, int flags, const TQColor &color) +void KDevSplashScreen::message( const TQString &str, int flags, const TQColor &color) { TQSplashScreen::message(str,flags,color); animate(); @@ -41,7 +41,7 @@ void TDevSplashScreen::message( const TQString &str, int flags, const TQColor &c } -void TDevSplashScreen::drawContents (TQPainter* painter) +void KDevSplashScreen::drawContents (TQPainter* painter) { int position; TQColor base_color (201,229,165); // Base green color diff --git a/src/splashscreen.h b/src/splashscreen.h index 11a329bc..b8d5563c 100644 --- a/src/splashscreen.h +++ b/src/splashscreen.h @@ -11,14 +11,14 @@ class TQPixmap; /** Splash screen. */ -class TDevSplashScreen : public TQSplashScreen +class KDevSplashScreen : public TQSplashScreen { Q_OBJECT public: - TDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0); - virtual ~TDevSplashScreen(); + KDevSplashScreen(const TQPixmap& pixmap, WFlags f = 0); + virtual ~KDevSplashScreen(); protected: void drawContents (TQPainter * painter); diff --git a/src/statusbar.cpp b/src/statusbar.cpp index e1f8f3b5..b4e11769 100644 --- a/src/statusbar.cpp +++ b/src/statusbar.cpp @@ -27,7 +27,7 @@ #include "statusbar.h" #include "partcontroller.h" -TDevStatusBar::TDevStatusBar(TQWidget *parent, const char *name) +KDevStatusBar::KDevStatusBar(TQWidget *parent, const char *name) : KStatusBar(parent, name), _cursorIface(0), _activePart(0) { TQWidget * w = new TQWidget( this ); @@ -44,10 +44,10 @@ TDevStatusBar::TDevStatusBar(TQWidget *parent, const char *name) } -TDevStatusBar::~TDevStatusBar() +KDevStatusBar::~KDevStatusBar() {} -void TDevStatusBar::activePartChanged(KParts::Part *part) +void KDevStatusBar::activePartChanged(KParts::Part *part) { if ( _activePart && _activePart->widget() ) disconnect( _activePart->widget(), 0, this, 0 ); @@ -80,7 +80,7 @@ void TDevStatusBar::activePartChanged(KParts::Part *part) } } -void TDevStatusBar::cursorPositionChanged() +void KDevStatusBar::cursorPositionChanged() { if (_cursorIface) { @@ -90,18 +90,18 @@ void TDevStatusBar::cursorPositionChanged() } } -void TDevStatusBar::setStatus(const TQString &str) +void KDevStatusBar::setStatus(const TQString &str) { _status->setText(str); } -void TDevStatusBar::setCursorPosition(int line, int col) +void KDevStatusBar::setCursorPosition(int line, int col) { _status->setText(i18n(" Line: %1 Col: %2 ").arg(line+1).arg(col)); } -void TDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) +void KDevStatusBar::addWidget ( TQWidget *widget, int stretch, bool permanent) { KStatusBar::addWidget(widget,stretch,permanent); diff --git a/src/statusbar.h b/src/statusbar.h index 09f1af97..2f5370ef 100644 --- a/src/statusbar.h +++ b/src/statusbar.h @@ -24,14 +24,14 @@ namespace KParts { class Part; } /** Status bar. */ -class TDevStatusBar : public KStatusBar +class KDevStatusBar : public KStatusBar { Q_OBJECT public: - TDevStatusBar( TQWidget *parent=0, const char *name=0 ); - ~TDevStatusBar(); + KDevStatusBar( TQWidget *parent=0, const char *name=0 ); + ~KDevStatusBar(); void addWidget ( TQWidget *widget, int stretch = 0, bool permanent = FALSE ); private slots: diff --git a/src/tdeconf_update/CMakeLists.txt b/src/tdeconf_update/CMakeLists.txt index 8eb5c732..4b605615 100644 --- a/src/tdeconf_update/CMakeLists.txt +++ b/src/tdeconf_update/CMakeLists.txt @@ -20,13 +20,13 @@ link_directories( ##### other data ################################ -install( FILES tdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) +install( FILES kdev-gen-settings.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) -##### tdev-gen-settings-tdeconf_update (executable) +##### kdev-gen-settings-tdeconf_update (executable) -tde_add_executable( tdev-gen-settings-tdeconf_update - SOURCES tdev-gen-settings-tdeconf_update.cpp +tde_add_executable( kdev-gen-settings-tdeconf_update + SOURCES kdev-gen-settings-tdeconf_update.cpp LINK ${TQT_LIBRARIES} DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin ) diff --git a/src/tdeconf_update/Makefile.am b/src/tdeconf_update/Makefile.am index 4cf2dab5..f806baa2 100644 --- a/src/tdeconf_update/Makefile.am +++ b/src/tdeconf_update/Makefile.am @@ -1,18 +1,18 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT $(all_includes) -update_DATA = tdev-gen-settings.upd +update_DATA = kdev-gen-settings.upd updatedir = $(kde_datadir)/tdeconf_update # The Qt app cannot go into kde_datadir, that is not portable. # install to kde_bindir/tdeconf_update_bin instead. # KDE 3.2 will allow tdeconf_update scripts to run directly from there, # but for us that's too late. Use the .sh script as a workaround. -tdeconf_PROGRAMS = tdev-gen-settings-tdeconf_update +tdeconf_PROGRAMS = kdev-gen-settings-tdeconf_update tdeconfdir = $(libdir)/tdeconf_update_bin -tdev_gen_settings_tdeconf_update_SOURCES = tdev-gen-settings-tdeconf_update.cpp -tdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -tdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) +kdev_gen_settings_tdeconf_update_SOURCES = kdev-gen-settings-tdeconf_update.cpp +kdev_gen_settings_tdeconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kdev_gen_settings_tdeconf_update_LDADD = $(LIB_QT) # vim: set noet: diff --git a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp similarity index 98% rename from src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp rename to src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp index ae20ae57..63e4a834 100644 --- a/src/tdeconf_update/tdev-gen-settings-tdeconf_update.cpp +++ b/src/tdeconf_update/kdev-gen-settings-tdeconf_update.cpp @@ -33,7 +33,7 @@ void parseKey( const TQString &group, const TQString &key, { //qcerr << "*** group='" << group << "'" << endl; - if ( group == "General Options" && key == "Embed TDevDesigner") + if ( group == "General Options" && key == "Embed KDevDesigner") { newKeyValue = "Designer App"; if ( value.lower() == "true" ) diff --git a/src/tdeconf_update/tdev-gen-settings.upd b/src/tdeconf_update/kdev-gen-settings.upd similarity index 100% rename from src/tdeconf_update/tdev-gen-settings.upd rename to src/tdeconf_update/kdev-gen-settings.upd diff --git a/src/toplevel.cpp b/src/toplevel.cpp index 63416175..129d869c 100644 --- a/src/toplevel.cpp +++ b/src/toplevel.cpp @@ -8,14 +8,14 @@ #include "simplemainwindow.h" -TDevMainWindow *TopLevel::s_instance = 0; +KDevMainWindow *TopLevel::s_instance = 0; bool TopLevel::mainWindowValid() { return s_instance != 0; } -TDevMainWindow *TopLevel::getInstance() +KDevMainWindow *TopLevel::getInstance() { if (!s_instance) { @@ -28,7 +28,7 @@ TDevMainWindow *TopLevel::getInstance() return s_instance; } -void TopLevel::invalidateInstance(TDevMainWindow *instance) +void TopLevel::invalidateInstance(KDevMainWindow *instance) { if ( s_instance == instance ) s_instance = 0; diff --git a/src/toplevel.h b/src/toplevel.h index 081ddcae..8eb0243a 100644 --- a/src/toplevel.h +++ b/src/toplevel.h @@ -2,10 +2,10 @@ #define __TOPLEVEL_H__ -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" -/**\brief This class handles the single object of type TDevMainWindow. +/**\brief This class handles the single object of type KDevMainWindow. It is completely static (all methods and attributes). */ @@ -14,13 +14,13 @@ class TopLevel { public: - static TDevMainWindow *getInstance(); //!< Get a pointer to the single KDevTopLevel object + static KDevMainWindow *getInstance(); //!< Get a pointer to the single KDevTopLevel object static bool mainWindowValid(); - static void invalidateInstance(TDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed + static void invalidateInstance(KDevMainWindow *instance); //!< Signal that the object has been (or is about to be) destroyed private: - static TDevMainWindow *s_instance; //!< Pointer to the single KDevTopLevel object or 0L + static KDevMainWindow *s_instance; //!< Pointer to the single KDevTopLevel object or 0L }; diff --git a/tde_app_devel.desktop b/tde_app_devel.desktop deleted file mode 100644 index ee7ddfc5..00000000 --- a/tde_app_devel.desktop +++ /dev/null @@ -1,6 +0,0 @@ -[Desktop Entry] -Icon=tdevelop -DocPath=tde_app_devel/index.html -Categories=Qt;TDE;Development;IDE;X-TDE-TDevelopIDE -NoDisplay=true -Name=TDevelop Programming diff --git a/tdevdesigner/plugins/Makefile.am b/tdevdesigner/plugins/Makefile.am deleted file mode 100644 index 5d1b7d39..00000000 --- a/tdevdesigner/plugins/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -INCLUDES = -I$(top_srcdir)/interfaces $(all_includes) -METASOURCES = AUTO -tdevdesignerdir = $(kde_moduledir)/plugins/tdevdesigner -tdevdesigner_LTLIBRARIES = libtdevdesigner_lang.la -libtdevdesigner_lang_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) -libtdevdesigner_lang_la_SOURCES = languageinterfaceimpl.cpp -libtdevdesigner_lang_la_LIBADD = $(LIB_QT) - diff --git a/tdevdesigner/uilib/Makefile.am b/tdevdesigner/uilib/Makefile.am deleted file mode 100644 index d58d4dcb..00000000 --- a/tdevdesigner/uilib/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -KDE_CXXFLAGS=-UQT_NO_ASCII_CAST - -INCLUDES = -I$(top_srcdir)/tdevdesigner/shared $(all_includes) -METASOURCES = AUTO - -noinst_LTLIBRARIES = libtdevqui.la -libtdevqui_la_SOURCES = database.cpp qwidgetfactory.cpp - -libtdevqui_la_LDFLAGS = $(all_libraries) diff --git a/tdevelop_tde_cpp.desktop b/tdevelop_kde_cpp.desktop similarity index 98% rename from tdevelop_tde_cpp.desktop rename to tdevelop_kde_cpp.desktop index 301af04f..c73f2f06 100644 --- a/tdevelop_tde_cpp.desktop +++ b/tdevelop_kde_cpp.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Type=Application -Exec=tdevelop --profile TDECppIDE %u +Exec=tdevelop --profile KDECppIDE %u MimeType=application/x-tdevelop; Icon=tdevelop DocPath=tdevelop/index.html diff --git a/vcs/clearcase/CMakeLists.txt b/vcs/clearcase/CMakeLists.txt index 94ca0536..4dbed390 100644 --- a/vcs/clearcase/CMakeLists.txt +++ b/vcs/clearcase/CMakeLists.txt @@ -27,15 +27,15 @@ link_directories( ##### other data ################################ -install( FILES tdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclearcase.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevclearcase (module) ################# +##### libkdevclearcase (module) ################# -tde_add_kpart( libtdevclearcase AUTOMOC +tde_add_kpart( libkdevclearcase AUTOMOC SOURCES clearcasepart.cpp commentdlg.cpp clearcasefileinfoprovider.cpp clearcasemanipulator.cpp - LINK tdevextensions-static tdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/Makefile.am b/vcs/clearcase/Makefile.am index 36a2e7b6..630a1346 100644 --- a/vcs/clearcase/Makefile.am +++ b/vcs/clearcase/Makefile.am @@ -3,16 +3,16 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevclearcase.la -libtdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevclearcase.la +libkdevclearcase_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevclearcase_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \ +libkdevclearcase_la_SOURCES = clearcasepart.cpp commentdlg.cpp \ clearcasefileinfoprovider.cpp clearcasemanipulator.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevclearcase.desktop +service_DATA = kdevclearcase.desktop SUBDIRS = integrator diff --git a/vcs/clearcase/clearcasefileinfoprovider.cpp b/vcs/clearcase/clearcasefileinfoprovider.cpp index db7cbcc1..1e18f8e1 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.cpp +++ b/vcs/clearcase/clearcasefileinfoprovider.cpp @@ -11,13 +11,13 @@ // #include "clearcasefileinfoprovider.h" #include "clearcasepart.h" -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" #include #include ClearcaseFileinfoProvider::ClearcaseFileinfoProvider(ClearcasePart *parent) - : TDevVCSFileInfoProvider( (TDevVersionControl*) parent, "clearcasefileinfoprovider") + : KDevVCSFileInfoProvider( (KDevVersionControl*) parent, "clearcasefileinfoprovider") { vcsInfo_ = NULL; diff --git a/vcs/clearcase/clearcasefileinfoprovider.h b/vcs/clearcase/clearcasefileinfoprovider.h index 4c29da44..0f6f7d06 100644 --- a/vcs/clearcase/clearcasefileinfoprovider.h +++ b/vcs/clearcase/clearcasefileinfoprovider.h @@ -19,7 +19,7 @@ /** @author KDevelop Authors */ -class ClearcaseFileinfoProvider : public TDevVCSFileInfoProvider +class ClearcaseFileinfoProvider : public KDevVCSFileInfoProvider { Q_OBJECT diff --git a/vcs/clearcase/clearcasemanipulator.h b/vcs/clearcase/clearcasemanipulator.h index 42a5cee0..0cb795e3 100644 --- a/vcs/clearcase/clearcasemanipulator.h +++ b/vcs/clearcase/clearcasemanipulator.h @@ -12,7 +12,7 @@ #ifndef CLEARCASEMANIPULATOR_H #define CLEARCASEMANIPULATOR_H -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" #include diff --git a/vcs/clearcase/clearcasepart.cpp b/vcs/clearcase/clearcasepart.cpp index 338675d5..aeb1eea9 100644 --- a/vcs/clearcase/clearcasepart.cpp +++ b/vcs/clearcase/clearcasepart.cpp @@ -17,33 +17,33 @@ #include #include -#include +#include #include #include #include #include -#include "tdevcore.h" -#include "tdevmakefrontend.h" -#include "tdevdifffrontend.h" -#include "tdevappfrontend.h" +#include "kdevcore.h" +#include "kdevmakefrontend.h" +#include "kdevdifffrontend.h" +#include "kdevappfrontend.h" #include "execcommand.h" #include "domutil.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" -#include "tdevplugininfo.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" +#include "kdevplugininfo.h" #include "clearcasefileinfoprovider.h" #include "clearcasemanipulator.h" -static const TDevPluginInfo data("tdevclearcase"); +static const KDevPluginInfo data("kdevclearcase"); -typedef TDevGenericFactory ClearcaseFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevclearcase, ClearcaseFactory( data ) ) +typedef KDevGenericFactory ClearcaseFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevclearcase, ClearcaseFactory( data ) ) ClearcasePart::ClearcasePart( TQObject *parent, const char *name, const TQStringList & ) - : TDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), + : KDevVersionControl( &data, parent, name ? name : "ClearcasePart" ), default_checkin(""), default_checkout(""), default_uncheckout("-rm"), @@ -144,7 +144,7 @@ void ClearcasePart::slotCheckin() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -176,7 +176,7 @@ void ClearcasePart::slotCheckout() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -199,7 +199,7 @@ void ClearcasePart::slotUncheckout() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -228,7 +228,7 @@ void ClearcasePart::slotCreate() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -255,7 +255,7 @@ void ClearcasePart::slotRemove() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); emit finishedFetching(dir); @@ -279,7 +279,7 @@ void ClearcasePart::slotListHistory() command += " "; command += KShellProcess::quote(name); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -333,7 +333,7 @@ void ClearcasePart::slotDiffFinished( const TQString& diff, const TQString& err return; } - if (TDevDiffFrontend *diffFrontend = extension("TDevelop/DiffFrontend")) + if (KDevDiffFrontend *diffFrontend = extension("TDevelop/DiffFrontend")) diffFrontend->showDiff( diff ); } @@ -354,7 +354,7 @@ void ClearcasePart::slotListCheckouts() command += " && cleartool lsco "; command += DomUtil::readEntry(dom, "/kdevclearcase/lscheckout_options", default_lscheckout); - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } diff --git a/vcs/clearcase/clearcasepart.h b/vcs/clearcase/clearcasepart.h index 52129141..be63e674 100644 --- a/vcs/clearcase/clearcasepart.h +++ b/vcs/clearcase/clearcasepart.h @@ -12,12 +12,12 @@ #ifndef _CLEARCASEPART_H_ #define _CLEARCASEPART_H_ -#include +#include class Context; class TQPopupMenu; -class ClearcasePart : public TDevVersionControl { +class ClearcasePart : public KDevVersionControl { Q_OBJECT @@ -36,7 +36,7 @@ public: virtual void createNewProject(const TQString& dir) {} virtual bool fetchFromRepository() { return true; } - virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; } + virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return fileInfoProvider_; } virtual bool isValidDirectory(const TQString &dirPath) const; private slots: @@ -60,7 +60,7 @@ private: TQString popupfile_; TQString viewname; - TDevVCSFileInfoProvider *fileInfoProvider_; + KDevVCSFileInfoProvider *fileInfoProvider_; }; #endif diff --git a/vcs/clearcase/integrator/CMakeLists.txt b/vcs/clearcase/integrator/CMakeLists.txt index bd527272..ccc3348f 100644 --- a/vcs/clearcase/integrator/CMakeLists.txt +++ b/vcs/clearcase/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevclearcaseintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libclearcaseintegrator (module) ########### @@ -35,6 +35,6 @@ tde_add_kpart( libclearcaseintegrator AUTOMOC SOURCES clearcaseintegrator.cpp ccintegratordlgbase.ui ccintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/clearcase/integrator/Makefile.am b/vcs/clearcase/integrator/Makefile.am index 98e39465..a9d50a98 100644 --- a/vcs/clearcase/integrator/Makefile.am +++ b/vcs/clearcase/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libclearcaseintegrator.la libclearcaseintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libclearcaseintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevclearcaseintegrator.desktop +kde_services_DATA = kdevclearcaseintegrator.desktop noinst_HEADERS = clearcaseintegrator.h ccintegratordlg.h libclearcaseintegrator_la_SOURCES = clearcaseintegrator.cpp \ ccintegratordlgbase.ui ccintegratordlg.cpp diff --git a/vcs/clearcase/integrator/ccintegratordlg.h b/vcs/clearcase/integrator/ccintegratordlg.h index 2eb1e2e3..f427b2b3 100644 --- a/vcs/clearcase/integrator/ccintegratordlg.h +++ b/vcs/clearcase/integrator/ccintegratordlg.h @@ -21,7 +21,7 @@ #define CCINTEGRATORDLG_H #include "ccintegratordlgbase.h" -#include +#include class CCIntegratorDlg: public CCIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/clearcase/integrator/clearcaseintegrator.cpp b/vcs/clearcase/integrator/clearcaseintegrator.cpp index f00783b4..4e8c1a0b 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.cpp +++ b/vcs/clearcase/integrator/clearcaseintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "clearcaseintegrator.h" -#include -#include +#include +#include #include "ccintegratordlg.h" -static const TDevPluginInfo data("tdevclearcaseintegrator"); -typedef TDevGenericFactory ClearcaseIntegratorFactory; +static const KDevPluginInfo data("kdevclearcaseintegrator"); +typedef KDevGenericFactory ClearcaseIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libclearcaseintegrator, ClearcaseIntegratorFactory(data) ) ClearcaseIntegrator::ClearcaseIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/clearcase/integrator/clearcaseintegrator.h b/vcs/clearcase/integrator/clearcaseintegrator.h index 4e431da6..3859c1f9 100644 --- a/vcs/clearcase/integrator/clearcaseintegrator.h +++ b/vcs/clearcase/integrator/clearcaseintegrator.h @@ -20,11 +20,11 @@ #ifndef CLEARCASEINTEGRATOR_H #define CLEARCASEINTEGRATOR_H -#include +#include #include -class ClearcaseIntegrator : public TDevVCSIntegrator +class ClearcaseIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/clearcase/integrator/tdevclearcaseintegrator.desktop b/vcs/clearcase/integrator/kdevclearcaseintegrator.desktop similarity index 100% rename from vcs/clearcase/integrator/tdevclearcaseintegrator.desktop rename to vcs/clearcase/integrator/kdevclearcaseintegrator.desktop diff --git a/vcs/clearcase/tdevclearcase.desktop b/vcs/clearcase/kdevclearcase.desktop similarity index 99% rename from vcs/clearcase/tdevclearcase.desktop rename to vcs/clearcase/kdevclearcase.desktop index 687e5c67..9b3df9df 100644 --- a/vcs/clearcase/tdevclearcase.desktop +++ b/vcs/clearcase/kdevclearcase.desktop @@ -77,6 +77,6 @@ GenericName[tr]=ClearCase Bütünleştirmesi GenericName[zh_CN]=ClearCase集成 GenericName[zh_TW]=ClearCase 整合 ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevclearcase +X-TDE-Library=libkdevclearcase X-TDevelop-Version=5 X-TDevelop-Properties=VCS,ClearcaseVCS diff --git a/vcs/cvsservice/CMakeLists.txt b/vcs/cvsservice/CMakeLists.txt index c8cd2b35..dc50d646 100644 --- a/vcs/cvsservice/CMakeLists.txt +++ b/vcs/cvsservice/CMakeLists.txt @@ -30,14 +30,14 @@ link_directories( ##### other data ################################ tde_install_icons( ) -install( FILES tdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES tdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice/pics ) -install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/tdevcvsservice ) +install( FILES kdevcvsservice.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdev_cvs.png DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice/pics ) +install( FILES buildcvs.sh DESTINATION ${DATA_INSTALL_DIR}/kdevcvsservice ) -##### libtdevcvsservice (module) ################ +##### libkdevcvsservice (module) ################ -tde_add_kpart( libtdevcvsservice AUTOMOC +tde_add_kpart( libkdevcvsservice AUTOMOC SOURCES cvspart.cpp cvspartimpl.cpp cvsformbase.ui cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui @@ -52,7 +52,7 @@ tde_add_kpart( libtdevcvsservice AUTOMOC editorsdialogbase.ui editorsdialog.cpp annotatedialog.cpp annotatepage.cpp annotateview.cpp LINK - tdevextensions-static tdevwidgets-shared tdevelop-shared + kdevextensions-static kdevwidgets-shared tdevelop-shared cvsservice tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/Makefile.am b/vcs/cvsservice/Makefile.am index 3ce9dc40..63560056 100644 --- a/vcs/cvsservice/Makefile.am +++ b/vcs/cvsservice/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util -I$(top_srcdir)/lib/widgets $(all_includes) -I$(kde_includes)/tde -kde_module_LTLIBRARIES = libtdevcvsservice.la -libtdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ - $(top_builddir)/lib/widgets/libtdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevcvsservice.la +libkdevcvsservice_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevcvsservice_la_LIBADD = $(top_builddir)/lib/libtdevelop.la \ + $(top_builddir)/lib/widgets/libkdevwidgets.la $(LIB_TDEHTML) -lcvsservice $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \ +libkdevcvsservice_la_SOURCES = cvspart.cpp cvspartimpl.cpp cvsformbase.ui \ cvsform.cpp commitdialogbase.ui commitdlg.cpp cvsoptionswidgetbase.ui \ cvsoptionswidget.cpp cvsprocesswidget.cpp cvsentry.cpp cvsdir.cpp changelog.cpp \ cvsoptions.cpp checkoutdialogbase.ui checkoutdialog.cpp tagdialog.cpp tagdialogbase.ui \ @@ -29,12 +29,12 @@ METASOURCES = AUTO ICONS = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevcvsservice.desktop +service_DATA = kdevcvsservice.desktop -servicepicsdir = $(kde_datadir)/tdevcvsservice/pics -servicepics_DATA = tdev_cvs.png +servicepicsdir = $(kde_datadir)/kdevcvsservice/pics +servicepics_DATA = kdev_cvs.png -rcdir = $(kde_datadir)/tdevcvsservice +rcdir = $(kde_datadir)/kdevcvsservice rc_DATA = buildcvs.sh SUBDIRS = integrator diff --git a/vcs/cvsservice/README.dox b/vcs/cvsservice/README.dox index bb6dfd60..1ff0b528 100644 --- a/vcs/cvsservice/README.dox +++ b/vcs/cvsservice/README.dox @@ -37,7 +37,7 @@ Implementation of this component is done by: one wants to perform: exception to this are the cvslog* classes which do start cvs jobs independently archiving parallelism with the CvsProcesssWidget. - CVSDir and CVSEntry provide abstraction for accessing to local CVS information - - CVSFileInfoProvider is an implementation of TDevVCSFileInfoProvider interface + - CVSFileInfoProvider is an implementation of KDevVCSFileInfoProvider interface and collects data about files stats: for CVS, both synch (fetch data from local sandbox) and asynch (fetch from repository server) are working with some minor bugs in the parsing of 'cvs status' output for the latter. (Sync means that information are collected diff --git a/vcs/cvsservice/bufferedstringreader.h b/vcs/cvsservice/bufferedstringreader.h index 05ce6ad6..c7548b59 100644 --- a/vcs/cvsservice/bufferedstringreader.h +++ b/vcs/cvsservice/bufferedstringreader.h @@ -16,7 +16,7 @@ class CvsServicePart; class TDEConfig; -class TDevProject; +class KDevProject; /* This class helps when we have to collect a string list from a text * stream, just as many cvs commands do. The problem is that the these commands diff --git a/vcs/cvsservice/cvsentry.h b/vcs/cvsservice/cvsentry.h index d4e51de8..9a2e4d6d 100644 --- a/vcs/cvsservice/cvsentry.h +++ b/vcs/cvsservice/cvsentry.h @@ -15,7 +15,7 @@ #include #include -#include +#include class CVSDir; diff --git a/vcs/cvsservice/cvsfileinfoprovider.cpp b/vcs/cvsservice/cvsfileinfoprovider.cpp index 2e0c960a..cbfc726f 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.cpp +++ b/vcs/cvsservice/cvsfileinfoprovider.cpp @@ -15,7 +15,7 @@ #include #include -#include +#include #include #include @@ -32,7 +32,7 @@ /////////////////////////////////////////////////////////////////////////////// CVSFileInfoProvider::CVSFileInfoProvider( CvsServicePart *parent, CvsService_stub *cvsService ) - : TDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), + : KDevVCSFileInfoProvider( parent, "cvsfileinfoprovider" ), m_requestStatusJob( 0 ), m_cvsService( cvsService ), m_cachedDirEntries( 0 ) { connect( this, TQT_SIGNAL(needStatusUpdate(const CVSDir&)), this, TQT_SLOT(updateStatusFor(const CVSDir&))); diff --git a/vcs/cvsservice/cvsfileinfoprovider.h b/vcs/cvsservice/cvsfileinfoprovider.h index 09b7b9b8..8bc3a6fe 100644 --- a/vcs/cvsservice/cvsfileinfoprovider.h +++ b/vcs/cvsservice/cvsfileinfoprovider.h @@ -14,7 +14,7 @@ #include -#include +#include #include "cvsservicedcopIface.h" #include "cvsdir.h" #include "bufferedstringreader.h" @@ -28,7 +28,7 @@ Provider for CVS file information @author Mario Scalas */ -class CVSFileInfoProvider : public TDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface +class CVSFileInfoProvider : public KDevVCSFileInfoProvider, virtual public CVSServiceDCOPIface { Q_OBJECT diff --git a/vcs/cvsservice/cvsoptions.cpp b/vcs/cvsservice/cvsoptions.cpp index 6511a38f..2cdf5c92 100644 --- a/vcs/cvsservice/cvsoptions.cpp +++ b/vcs/cvsservice/cvsoptions.cpp @@ -17,7 +17,7 @@ #include #include "domutil.h" -#include "tdevproject.h" +#include "kdevproject.h" #include "cvsoptions.h" /////////////////////////////////////////////////////////////////////////////// @@ -80,9 +80,9 @@ CvsOptions* CvsOptions::instance() /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::save( TDevProject *project ) +void CvsOptions::save( KDevProject *project ) { - kdDebug( 9006 ) << " **** CvsOptions::save( TDevProject* ) here" << endl; + kdDebug( 9006 ) << " **** CvsOptions::save( KDevProject* ) here" << endl; Q_ASSERT( project ); TQDomDocument &dom = *project->projectDom(); @@ -105,9 +105,9 @@ void CvsOptions::save( TDevProject *project ) /////////////////////////////////////////////////////////////////////////////// -void CvsOptions::load( TDevProject *project ) +void CvsOptions::load( KDevProject *project ) { - kdDebug( 9006 ) << " **** CvsOptions::load( TDevProject* ) here" << endl; + kdDebug( 9006 ) << " **** CvsOptions::load( KDevProject* ) here" << endl; Q_ASSERT( project ); TQDomDocument &dom = *project->projectDom(); diff --git a/vcs/cvsservice/cvsoptions.h b/vcs/cvsservice/cvsoptions.h index f54e6273..c4daf301 100644 --- a/vcs/cvsservice/cvsoptions.h +++ b/vcs/cvsservice/cvsoptions.h @@ -17,7 +17,7 @@ class CvsServicePart; class TDEConfig; -class TDevProject; +class KDevProject; /* This class represents the command line options for the used cvs commands. * It uses the singleton pattern. @@ -32,9 +32,9 @@ public: virtual ~CvsOptions(); - void save( TDevProject *project ); + void save( KDevProject *project ); /// \FIXME parameter should be const!! - void load( TDevProject *project ); + void load( KDevProject *project ); void setRecursiveWhenCommitRemove( bool b ); bool recursiveWhenCommitRemove() const; diff --git a/vcs/cvsservice/cvspart.cpp b/vcs/cvsservice/cvspart.cpp index 276a4d15..2bda55f1 100644 --- a/vcs/cvsservice/cvspart.cpp +++ b/vcs/cvsservice/cvspart.cpp @@ -37,17 +37,17 @@ #include #include -#include -#include - -#include "tdevcore.h" -#include "tdevmakefrontend.h" -#include "tdevdifffrontend.h" -#include "tdevappfrontend.h" -#include "tdevplugininfo.h" +#include +#include + +#include "kdevcore.h" +#include "kdevmakefrontend.h" +#include "kdevdifffrontend.h" +#include "kdevappfrontend.h" +#include "kdevplugininfo.h" #include "domutil.h" -#include "tdevmainwindow.h" -#include "tdevproject.h" +#include "kdevmainwindow.h" +#include "kdevproject.h" #include "urlutil.h" #include "cvsform.h" @@ -72,16 +72,16 @@ bool g_projectWasJustCreated = false; // Plugin factory /////////////////////////////////////////////////////////////////////////////// -static const TDevPluginInfo data("tdevcvsservice"); -typedef TDevGenericFactory CvsFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevcvsservice, CvsFactory( data ) ) +static const KDevPluginInfo data("kdevcvsservice"); +typedef KDevGenericFactory CvsFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevcvsservice, CvsFactory( data ) ) /////////////////////////////////////////////////////////////////////////////// // class CvsServicePart /////////////////////////////////////////////////////////////////////////////// CvsServicePart::CvsServicePart( TQObject *parent, const char *name, const TQStringList & ) - : TDevVersionControl( &data, parent, + : KDevVersionControl( &data, parent, name ? name : "CvsService" ), actionCommit( 0 ), actionDiff( 0 ), actionLog( 0 ), actionAnnotate(0), actionAdd( 0 ), actionAddBinary( 0 ), actionRemove( 0 ), actionUpdate( 0 ), @@ -126,10 +126,10 @@ void CvsServicePart::init() this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), - this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), + this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); - m_impl->m_widget->setIcon( UserIcon( "tdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); + m_impl->m_widget->setIcon( UserIcon( "kdev_cvs", TDEIcon::DefaultState, CvsFactory::instance()) ); TQWhatsThis::add( m_impl->processWidget(), i18n("CVS

Concurrent Versions System operations window. Shows output of Cervisia CVS Service.") ); m_impl->processWidget()->setCaption(i18n("CvsService Output")); mainWindow()->embedOutputView( m_impl->processWidget(), i18n("CvsService"), i18n("cvs output") ); @@ -243,7 +243,7 @@ bool CvsServicePart::fetchFromRepository() /////////////////////////////////////////////////////////////////////////////// -TDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const +KDevVCSFileInfoProvider *CvsServicePart::fileInfoProvider() const { return m_impl->fileInfoProvider(); } @@ -704,7 +704,7 @@ void CvsServicePart::slotRemoveFromIgnoreList() /////////////////////////////////////////////////////////////////////////////// -void CvsServicePart::slotStopButtonClicked( TDevPlugin* which ) +void CvsServicePart::slotStopButtonClicked( KDevPlugin* which ) { if ( which != 0 && which != this ) return; diff --git a/vcs/cvsservice/cvspart.h b/vcs/cvsservice/cvspart.h index 61015fda..e2df8ce0 100644 --- a/vcs/cvsservice/cvspart.h +++ b/vcs/cvsservice/cvspart.h @@ -17,7 +17,7 @@ #include #include #include -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" class Context; class TQPopupMenu; @@ -34,7 +34,7 @@ class CvsService_stub; class Repository_stub; class CvsServicePartImpl; -class CvsServicePart : public TDevVersionControl +class CvsServicePart : public KDevVersionControl { Q_OBJECT @@ -63,7 +63,7 @@ public: /** * @return the info provider for VCS sandboxes */ - virtual TDevVCSFileInfoProvider *fileInfoProvider() const; + virtual KDevVCSFileInfoProvider *fileInfoProvider() const; /** * @param dirPath absolute path of the directory * @return true if the the directory is a valid CVS sandbox @@ -129,7 +129,7 @@ private slots: void projectConfigWidget( KDialogBase *dlg ); //! Called when the user wishes to stop an operation. - void slotStopButtonClicked( TDevPlugin* ); + void slotStopButtonClicked( KDevPlugin* ); private slots: void init(); diff --git a/vcs/cvsservice/cvspartimpl.cpp b/vcs/cvsservice/cvspartimpl.cpp index 112ea997..01c85df3 100644 --- a/vcs/cvsservice/cvspartimpl.cpp +++ b/vcs/cvsservice/cvspartimpl.cpp @@ -29,12 +29,12 @@ #include // KDevelop SDK stuff #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include // Part's widgets #include "cvsprocesswidget.h" #include "checkoutdialog.h" @@ -309,7 +309,7 @@ CvsProcessWidget *CvsServicePartImpl::processWidget() const /////////////////////////////////////////////////////////////////////////////// -TDevMainWindow *CvsServicePartImpl::mainWindow() const +KDevMainWindow *CvsServicePartImpl::mainWindow() const { return m_part->mainWindow(); } @@ -323,16 +323,16 @@ TQString CvsServicePartImpl::projectDirectory() const /////////////////////////////////////////////////////////////////////////////// -TDevCore *CvsServicePartImpl::core() const +KDevCore *CvsServicePartImpl::core() const { return m_part->core(); } /////////////////////////////////////////////////////////////////////////////// -TDevDiffFrontend *CvsServicePartImpl::diffFrontend() const +KDevDiffFrontend *CvsServicePartImpl::diffFrontend() const { - return m_part->extension("TDevelop/DiffFrontend"); + return m_part->extension("TDevelop/DiffFrontend"); } /////////////////////////////////////////////////////////////////////////////// @@ -774,7 +774,7 @@ void CvsServicePartImpl::createNewProject( const TQString &dirName, kdDebug( 9006 ) << " ** Will run the following command: " << endl << cmdLine << endl; kdDebug( 9006 ) << " ** on directory: " << dirName << endl; - if (TDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = m_part->extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand( dirName, cmdLine ); } @@ -902,7 +902,7 @@ void CvsServicePartImpl::emitFileStateModified( const KURL::List &/*urls*/, VCSF /////////////////////////////////////////////////////////////////////////////// -TDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const +KDevVCSFileInfoProvider *CvsServicePartImpl::fileInfoProvider() const { return m_fileInfoProvider; } diff --git a/vcs/cvsservice/cvspartimpl.h b/vcs/cvsservice/cvspartimpl.h index 32ee04f5..ade7ffe4 100644 --- a/vcs/cvsservice/cvspartimpl.h +++ b/vcs/cvsservice/cvspartimpl.h @@ -17,18 +17,18 @@ #include #include -#include +#include class CvsServicePart; class KDialogBase; class KURL; class CvsProcessWidget; -class TDevMainWindow; -class TDevCore; -class TDevDiffFrontend; +class KDevMainWindow; +class KDevCore; +class KDevDiffFrontend; class TQDir; class JobScheduler; -class TDevVCSFileInfoProvider; +class KDevVCSFileInfoProvider; class CVSFileInfoProvider; /** @@ -183,7 +183,7 @@ public: /** * @return a reference to the custom FileInforProvider object (FORWARDER) */ - TDevVCSFileInfoProvider *fileInfoProvider() const; + KDevVCSFileInfoProvider *fileInfoProvider() const; // Helpers @@ -309,10 +309,10 @@ private: static const TQString changeLogPrependString; // Internal short-cuts - TDevMainWindow *mainWindow() const; - TDevCore *core() const; + KDevMainWindow *mainWindow() const; + KDevCore *core() const; TQString projectDirectory() const; - TDevDiffFrontend *diffFrontend() const; + KDevDiffFrontend *diffFrontend() const; /** Locate and setup DCOP CvsService */ bool requestCvsService(); diff --git a/vcs/cvsservice/cvsprocesswidget.cpp b/vcs/cvsservice/cvsprocesswidget.cpp index e218e00e..bb8fb459 100644 --- a/vcs/cvsservice/cvsprocesswidget.cpp +++ b/vcs/cvsservice/cvsprocesswidget.cpp @@ -18,9 +18,9 @@ #include #include -#include "tdevpartcontroller.h" -#include "tdevmainwindow.h" -#include "tdevcore.h" +#include "kdevpartcontroller.h" +#include "kdevmainwindow.h" +#include "kdevcore.h" #include "cvspart.h" #include "cvsprocesswidget.h" diff --git a/vcs/cvsservice/integrator/CMakeLists.txt b/vcs/cvsservice/integrator/CMakeLists.txt index e615784e..a17393d8 100644 --- a/vcs/cvsservice/integrator/CMakeLists.txt +++ b/vcs/cvsservice/integrator/CMakeLists.txt @@ -25,7 +25,7 @@ link_directories( ##### other data ################################ -install( FILES tdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevcvsserviceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libcvsserviceintegrator (module) ########## @@ -35,6 +35,6 @@ tde_add_kpart( libcvsserviceintegrator AUTOMOC cvsserviceintegrator.cpp integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui LINK - tdevextras-shared tdevelop-shared cvsservice + kdevextras-shared tdevelop-shared cvsservice DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/cvsservice/integrator/Makefile.am b/vcs/cvsservice/integrator/Makefile.am index 36f5dcee..f3eb47fe 100644 --- a/vcs/cvsservice/integrator/Makefile.am +++ b/vcs/cvsservice/integrator/Makefile.am @@ -5,8 +5,8 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libcvsserviceintegrator.la libcvsserviceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libcvsserviceintegrator_la_LIBADD = \ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice + $(top_builddir)/lib/interfaces/extras/libkdevextras.la $(top_builddir)/lib/libtdevelop.la -lcvsservice noinst_HEADERS = cvsserviceintegrator.h integratordlg.h libcvsserviceintegrator_la_SOURCES = cvsserviceintegrator.cpp \ integratordlgbase.ui fetcherdlgbase.ui integratordlg.cpp initdlg.ui -kde_services_DATA = tdevcvsserviceintegrator.desktop +kde_services_DATA = kdevcvsserviceintegrator.desktop diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp index 7f2fbbeb..1bbc3b11 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.cpp +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.cpp @@ -19,18 +19,18 @@ ***************************************************************************/ #include "cvsserviceintegrator.h" -#include -#include +#include +#include #include "integratordlg.h" -static const TDevPluginInfo data("tdevcvsserviceintegrator"); -typedef TDevGenericFactory CVSIntegratorFactory; +static const KDevPluginInfo data("kdevcvsserviceintegrator"); +typedef KDevGenericFactory CVSIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libcvsserviceintegrator, CVSIntegratorFactory(data) ) CVSServiceIntegrator::CVSServiceIntegrator(TQObject* parent, const char* name, const TQStringList args) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/cvsservice/integrator/cvsserviceintegrator.h b/vcs/cvsservice/integrator/cvsserviceintegrator.h index b3a8af9a..ebf4224e 100644 --- a/vcs/cvsservice/integrator/cvsserviceintegrator.h +++ b/vcs/cvsservice/integrator/cvsserviceintegrator.h @@ -20,11 +20,11 @@ #ifndef CVSSERVICEINTEGRATOR_H #define CVSSERVICEINTEGRATOR_H -#include +#include #include -class CVSServiceIntegrator: public TDevVCSIntegrator { +class CVSServiceIntegrator: public KDevVCSIntegrator { Q_OBJECT public: diff --git a/vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop b/vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop similarity index 100% rename from vcs/cvsservice/integrator/tdevcvsserviceintegrator.desktop rename to vcs/cvsservice/integrator/kdevcvsserviceintegrator.desktop diff --git a/vcs/cvsservice/tdev_cvs.png b/vcs/cvsservice/kdev_cvs.png similarity index 100% rename from vcs/cvsservice/tdev_cvs.png rename to vcs/cvsservice/kdev_cvs.png diff --git a/vcs/cvsservice/tdev_cvs.xcf b/vcs/cvsservice/kdev_cvs.xcf similarity index 100% rename from vcs/cvsservice/tdev_cvs.xcf rename to vcs/cvsservice/kdev_cvs.xcf diff --git a/vcs/cvsservice/tdevcvsservice.desktop b/vcs/cvsservice/kdevcvsservice.desktop similarity index 99% rename from vcs/cvsservice/tdevcvsservice.desktop rename to vcs/cvsservice/kdevcvsservice.desktop index 5b8bb530..921e91d1 100644 --- a/vcs/cvsservice/tdevcvsservice.desktop +++ b/vcs/cvsservice/kdevcvsservice.desktop @@ -72,6 +72,6 @@ GenericName[zh_CN]=CVS 集成(Cervisia) GenericName[zh_TW]=CVS 整合（Cervisia） Icon=cervisia ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevcvsservice +X-TDE-Library=libkdevcvsservice X-TDevelop-Version=5 X-TDevelop-Properties=VCS,CVSService diff --git a/vcs/cvsservice/tdevcvsservicepart.rc b/vcs/cvsservice/kdevcvsservicepart.rc similarity index 100% rename from vcs/cvsservice/tdevcvsservicepart.rc rename to vcs/cvsservice/kdevcvsservicepart.rc diff --git a/vcs/perforce/CMakeLists.txt b/vcs/perforce/CMakeLists.txt index f0964379..549eadb8 100644 --- a/vcs/perforce/CMakeLists.txt +++ b/vcs/perforce/CMakeLists.txt @@ -27,13 +27,13 @@ link_directories( ##### other data ################################ -install( FILES tdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevperforce.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -##### libtdevperforce (module) ################## +##### libkdevperforce (module) ################## -tde_add_kpart( libtdevperforce AUTOMOC +tde_add_kpart( libkdevperforce AUTOMOC SOURCES perforcepart.cpp commitdlg.cpp - LINK tdevextensions-static tdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/Makefile.am b/vcs/perforce/Makefile.am index 09fb0e9e..36e19325 100644 --- a/vcs/perforce/Makefile.am +++ b/vcs/perforce/Makefile.am @@ -3,17 +3,17 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces \ -I$(top_srcdir)/lib/interfaces/extensions -I$(top_srcdir)/lib/util $(all_includes) -kde_module_LTLIBRARIES = libtdevperforce.la -libtdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -libtdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la +kde_module_LTLIBRARIES = libkdevperforce.la +libkdevperforce_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevperforce_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la -libtdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp +libkdevperforce_la_SOURCES = perforcepart.cpp commitdlg.cpp METASOURCES = AUTO servicedir = $(kde_servicesdir) -service_DATA = tdevperforce.desktop +service_DATA = kdevperforce.desktop -rcdir = $(kde_datadir)/tdevperforce +rcdir = $(kde_datadir)/kdevperforce SUBDIRS = integrator diff --git a/vcs/perforce/integrator/CMakeLists.txt b/vcs/perforce/integrator/CMakeLists.txt index 95985418..e939e3ba 100644 --- a/vcs/perforce/integrator/CMakeLists.txt +++ b/vcs/perforce/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevperforceintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libperforceintegrator (module) ############ @@ -35,6 +35,6 @@ tde_add_kpart( libperforceintegrator AUTOMOC SOURCES perforceintegrator.cpp pfintegratordlgbase.ui pfintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/perforce/integrator/Makefile.am b/vcs/perforce/integrator/Makefile.am index e400e241..38e80bcd 100644 --- a/vcs/perforce/integrator/Makefile.am +++ b/vcs/perforce/integrator/Makefile.am @@ -5,9 +5,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libperforceintegrator.la libperforceintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libperforceintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevperforceintegrator.desktop +kde_services_DATA = kdevperforceintegrator.desktop noinst_HEADERS = perforceintegrator.h pfintegratordlg.h libperforceintegrator_la_SOURCES = perforceintegrator.cpp \ pfintegratordlgbase.ui pfintegratordlg.cpp diff --git a/vcs/perforce/integrator/tdevperforceintegrator.desktop b/vcs/perforce/integrator/kdevperforceintegrator.desktop similarity index 100% rename from vcs/perforce/integrator/tdevperforceintegrator.desktop rename to vcs/perforce/integrator/kdevperforceintegrator.desktop diff --git a/vcs/perforce/integrator/perforceintegrator.cpp b/vcs/perforce/integrator/perforceintegrator.cpp index 74fdf54f..bc7c0988 100644 --- a/vcs/perforce/integrator/perforceintegrator.cpp +++ b/vcs/perforce/integrator/perforceintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "perforceintegrator.h" -#include -#include +#include +#include #include "pfintegratordlg.h" -static const TDevPluginInfo data("tdevperforceintegrator"); -typedef TDevGenericFactory PerforceIntegratorFactory; +static const KDevPluginInfo data("kdevperforceintegrator"); +typedef KDevGenericFactory PerforceIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libperforceintegrator, PerforceIntegratorFactory(data) ) PerforceIntegrator::PerforceIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/perforce/integrator/perforceintegrator.h b/vcs/perforce/integrator/perforceintegrator.h index c97ff82f..2b82046f 100644 --- a/vcs/perforce/integrator/perforceintegrator.h +++ b/vcs/perforce/integrator/perforceintegrator.h @@ -20,11 +20,11 @@ #ifndef PERFORCEINTEGRATOR_H #define PERFORCEINTEGRATOR_H -#include +#include #include -class PerforceIntegrator : public TDevVCSIntegrator +class PerforceIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/perforce/integrator/pfintegratordlg.h b/vcs/perforce/integrator/pfintegratordlg.h index 5398475b..3e7bf4de 100644 --- a/vcs/perforce/integrator/pfintegratordlg.h +++ b/vcs/perforce/integrator/pfintegratordlg.h @@ -21,7 +21,7 @@ #define PFINTEGRATORDLG_H #include "pfintegratordlgbase.h" -#include +#include class PFIntegratorDlg: public PFIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/perforce/tdevperforce.desktop b/vcs/perforce/kdevperforce.desktop similarity index 99% rename from vcs/perforce/tdevperforce.desktop rename to vcs/perforce/kdevperforce.desktop index 4f73f5e9..d837faeb 100644 --- a/vcs/perforce/tdevperforce.desktop +++ b/vcs/perforce/kdevperforce.desktop @@ -77,6 +77,6 @@ GenericName[tr]=Perforce Bütünleştirmesi GenericName[zh_CN]=Perforce 集成 GenericName[zh_TW]=Perforce 整合 ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevperforce +X-TDE-Library=libkdevperforce X-TDevelop-Version=5 X-TDevelop-Properties=VCS,PerforceVCS diff --git a/vcs/perforce/tdevperforcepart.rc b/vcs/perforce/kdevperforcepart.rc similarity index 100% rename from vcs/perforce/tdevperforcepart.rc rename to vcs/perforce/kdevperforcepart.rc diff --git a/vcs/perforce/perforcepart.cpp b/vcs/perforce/perforcepart.cpp index 72672b1e..f92666b6 100644 --- a/vcs/perforce/perforcepart.cpp +++ b/vcs/perforce/perforcepart.cpp @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include #include #include @@ -25,21 +25,21 @@ #include #include -#include "tdevpartcontroller.h" -#include "tdevcore.h" -#include "tdevmakefrontend.h" -#include "tdevdifffrontend.h" -#include "tdevplugininfo.h" +#include "kdevpartcontroller.h" +#include "kdevcore.h" +#include "kdevmakefrontend.h" +#include "kdevdifffrontend.h" +#include "kdevplugininfo.h" #include "commitdlg.h" #include "execcommand.h" -static const TDevPluginInfo data("tdevperforce"); +static const KDevPluginInfo data("kdevperforce"); -typedef TDevGenericFactory PerforceFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevperforce, PerforceFactory( data ) ) +typedef KDevGenericFactory PerforceFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevperforce, PerforceFactory( data ) ) PerforcePart::PerforcePart( TQObject *parent, const char *name, const TQStringList & ) - : TDevVersionControl( &data, parent, name ? name : "PerforcePart" ) + : KDevVersionControl( &data, parent, name ? name : "PerforcePart" ) { setInstance(PerforceFactory::instance()); setupActions(); @@ -140,7 +140,7 @@ void PerforcePart::execCommand( const TQString& cmd, const TQString& filename ) command += " && p4 " + cmd + " "; command += name; - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -183,7 +183,7 @@ void PerforcePart::commit( const TQString& filename ) TQString command("echo " + message); command += " | p4 submit -i"; - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand("", command); } @@ -208,7 +208,7 @@ void PerforcePart::update( const TQString& filename ) command += " && p4 sync "; command += name; - if (TDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) + if (KDevMakeFrontend *makeFrontend = extension("TDevelop/MakeFrontend")) makeFrontend->queueCommand(dir, command); } @@ -277,7 +277,7 @@ void PerforcePart::slotDiffFinished( const TQString& diff, const TQString& err ) TQString strippedDiff = diff; strippedDiff.replace( rx, "--- \\2\n+++ \\2\n" ); - if (TDevDiffFrontend *diffFrontend = extension("TDevelop/DiffFrontend")) + if (KDevDiffFrontend *diffFrontend = extension("TDevelop/DiffFrontend")) diffFrontend->showDiff( strippedDiff ); } diff --git a/vcs/perforce/perforcepart.h b/vcs/perforce/perforcepart.h index 2af8ff5f..7c034424 100644 --- a/vcs/perforce/perforcepart.h +++ b/vcs/perforce/perforcepart.h @@ -13,14 +13,14 @@ #ifndef _PERFORCEPART_H_ #define _PERFORCEPART_H_ -#include +#include #include class Context; class TQPopupMenu; class TDEAction; -class PerforcePart : public TDevVersionControl +class PerforcePart : public KDevVersionControl { Q_OBJECT @@ -34,7 +34,7 @@ public: virtual void createNewProject(const TQString& /* dir */) {} virtual bool fetchFromRepository() { return true; } - virtual TDevVCSFileInfoProvider *fileInfoProvider() const { return 0; } + virtual KDevVCSFileInfoProvider *fileInfoProvider() const { return 0; } virtual bool isValidDirectory(const TQString& /* dirPath*/) const { return true; } diff --git a/vcs/subversion/CMakeLists.txt b/vcs/subversion/CMakeLists.txt index 63ffad4b..fb51fe3d 100644 --- a/vcs/subversion/CMakeLists.txt +++ b/vcs/subversion/CMakeLists.txt @@ -31,19 +31,19 @@ link_directories( ##### other data ################################ install( FILES - tdevsubversion.desktop tdevsvn+file.protocol - tdevsvn+http.protocol tdevsvn+https.protocol - tdevsvn+ssh.protocol tdevsvn+svn.protocol + kdevsubversion.desktop kdevsvn+file.protocol + kdevsvn+http.protocol kdevsvn+https.protocol + kdevsvn+ssh.protocol kdevsvn+svn.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES - tdevsvnd.desktop + kdevsvnd.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kded ) -##### libtdevsubversion (module) ################ +##### libkdevsubversion (module) ################ -tde_add_kpart( libtdevsubversion AUTOMOC +tde_add_kpart( libkdevsubversion AUTOMOC SOURCES subversion_core.cpp subversion_fileinfo.cpp subversion_fileinfo.skel subversion_part.cpp @@ -54,14 +54,14 @@ tde_add_kpart( libtdevsubversion AUTOMOC svn_logviewoptiondlgbase.ui svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui svn_switchwidget.cpp - LINK tdevextensions-static tdevelop-shared + LINK kdevextensions-static tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) -##### tdeio_tdevsvn (module) ###################### +##### tdeio_kdevsvn (module) ###################### -tde_add_kpart( tdeio_tdevsvn AUTOMOC +tde_add_kpart( tdeio_kdevsvn AUTOMOC SOURCES svn_tdeio.cpp LINK tdeio-shared ${SVN_LIBRARIES} ${APR_LIBRARIES} @@ -69,12 +69,12 @@ tde_add_kpart( tdeio_tdevsvn AUTOMOC ) -##### kded_tdevsvnd (module) #################### +##### kded_kdevsvnd (module) #################### -tde_add_kpart( kded_tdevsvnd AUTOMOC +tde_add_kpart( kded_kdevsvnd AUTOMOC SOURCES - commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp tdevsvnd.skel - tdevsvnd_widgets.cpp svnssltrustpromptbase.ui + commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp kdevsvnd.skel + kdevsvnd_widgets.cpp svnssltrustpromptbase.ui LINK tdeio-shared tdeinit_kded-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/Makefile.am b/vcs/subversion/Makefile.am index 2f650195..a66b80dd 100644 --- a/vcs/subversion/Makefile.am +++ b/vcs/subversion/Makefile.am @@ -2,37 +2,37 @@ INCLUDES = -I$(top_srcdir)/lib/interfaces -I$(top_srcdir)/lib/util -I$(top_srcdi METASOURCES = AUTO -kde_module_LTLIBRARIES = libtdevsubversion.la tdeio_tdevsvn.la kded_tdevsvnd.la +kde_module_LTLIBRARIES = libkdevsubversion.la tdeio_kdevsvn.la kded_kdevsvnd.la -libtdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \ +libkdevsubversion_la_SOURCES = subversion_core.cpp subversion_fileinfo.cpp \ subversion_fileinfo.skel subversion_part.cpp subversion_widget.cpp subversiondiff.ui \ subversionprojectwidget.ui svn_blamewidget.cpp svn_co.ui svn_commitdlgbase.ui svn_copydlgwidget.ui \ svn_copywidget.cpp svn_fileselectdlg_commit.cpp svn_logviewoptiondlgbase.ui \ svn_logviewwidget.cpp svn_mergeoptiondlgbase.ui svn_mergewidget.cpp svn_switchdlgbase.ui \ svn_switchwidget.cpp -libtdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libtdevextensions.la -libtdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) +libkdevsubversion_la_LIBADD = $(top_builddir)/lib/libtdevelop.la $(top_builddir)/lib/interfaces/extensions/libkdevextensions.la +libkdevsubversion_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -tdeio_tdevsvn_la_SOURCES = svn_tdeio.cpp -tdeio_tdevsvn_la_LIBADD = $(LIB_TDEIO) -tdeio_tdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB) +tdeio_kdevsvn_la_SOURCES = svn_tdeio.cpp +tdeio_kdevsvn_la_LIBADD = $(LIB_TDEIO) +tdeio_kdevsvn_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) $(SVN_LIB) -kded_tdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui tdevsvnd.cpp \ - tdevsvnd.skel tdevsvnd_widgets.cpp svnssltrustpromptbase.ui -kded_tdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded -kded_tdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) +kded_kdevsvnd_la_SOURCES = commitdlg.cpp commitdlgbase.ui kdevsvnd.cpp \ + kdevsvnd.skel kdevsvnd_widgets.cpp svnssltrustpromptbase.ui +kded_kdevsvnd_la_LIBADD = $(LIB_TDEIO) -ltdeinit_kded +kded_kdevsvnd_la_LDFLAGS = -module $(all_libraries) $(KDE_PLUGIN) kdeddir = $(kde_servicesdir)/kded -kded_DATA = tdevsvnd.desktop +kded_DATA = kdevsvnd.desktop servicedir = $(kde_servicesdir) -service_DATA = tdevsubversion.desktop +service_DATA = kdevsubversion.desktop protocoldir = $(kde_servicesdir) -protocol_DATA = tdevsvn+file.protocol tdevsvn+http.protocol tdevsvn+https.protocol tdevsvn+ssh.protocol tdevsvn+svn.protocol +protocol_DATA = kdevsvn+file.protocol kdevsvn+http.protocol kdevsvn+https.protocol kdevsvn+ssh.protocol kdevsvn+svn.protocol SUBDIRS = integrator -noinst_HEADERS = commitdlg.h tdevsvnd.h svn_blamewidget.h svn_copywidget.h \ +noinst_HEADERS = commitdlg.h kdevsvnd.h svn_blamewidget.h svn_copywidget.h \ svn_fileselectdlg_commit.h svn_logviewwidget.h svn_mergewidget.h svn_switchwidget.h diff --git a/vcs/subversion/integrator/CMakeLists.txt b/vcs/subversion/integrator/CMakeLists.txt index 3d6c7ad3..2256b8e3 100644 --- a/vcs/subversion/integrator/CMakeLists.txt +++ b/vcs/subversion/integrator/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ -install( FILES tdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +install( FILES kdevsubversionintegrator.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) ##### libsubversionintegrator (module) ########## @@ -35,6 +35,6 @@ tde_add_kpart( libsubversionintegrator AUTOMOC SOURCES subversionintegrator.cpp svnintegratordlgbase.ui svnintegratordlg.cpp - LINK tdevextras-shared tdevelop-shared + LINK kdevextras-shared tdevelop-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/vcs/subversion/integrator/Makefile.am b/vcs/subversion/integrator/Makefile.am index aded8465..231dc3c7 100644 --- a/vcs/subversion/integrator/Makefile.am +++ b/vcs/subversion/integrator/Makefile.am @@ -6,9 +6,9 @@ METASOURCES = AUTO kde_module_LTLIBRARIES = libsubversionintegrator.la libsubversionintegrator_la_LDFLAGS = -avoid-version -no-undefined $(all_libraries) libsubversionintegrator_la_LIBADD =\ - $(top_builddir)/lib/interfaces/extras/libtdevextras.la\ + $(top_builddir)/lib/interfaces/extras/libkdevextras.la\ $(top_builddir)/lib/libtdevelop.la -kde_services_DATA = tdevsubversionintegrator.desktop +kde_services_DATA = kdevsubversionintegrator.desktop noinst_HEADERS = subversionintegrator.h svnintegratordlg.h libsubversionintegrator_la_SOURCES = subversionintegrator.cpp \ svnintegratordlgbase.ui svnintegratordlg.cpp diff --git a/vcs/subversion/integrator/tdevsubversionintegrator.desktop b/vcs/subversion/integrator/kdevsubversionintegrator.desktop similarity index 100% rename from vcs/subversion/integrator/tdevsubversionintegrator.desktop rename to vcs/subversion/integrator/kdevsubversionintegrator.desktop diff --git a/vcs/subversion/integrator/subversionintegrator.cpp b/vcs/subversion/integrator/subversionintegrator.cpp index da8fed8c..32d28d27 100644 --- a/vcs/subversion/integrator/subversionintegrator.cpp +++ b/vcs/subversion/integrator/subversionintegrator.cpp @@ -19,19 +19,19 @@ ***************************************************************************/ #include "subversionintegrator.h" -#include -#include +#include +#include #include "svnintegratordlg.h" -static const TDevPluginInfo data("tdevsubversionintegrator"); -typedef TDevGenericFactory SubversionIntegratorFactory; +static const KDevPluginInfo data("kdevsubversionintegrator"); +typedef KDevGenericFactory SubversionIntegratorFactory; K_EXPORT_COMPONENT_FACTORY( libsubversionintegrator, SubversionIntegratorFactory(data) ) SubversionIntegrator::SubversionIntegrator(TQObject* parent, const char* name, const TQStringList // args ) - :TDevVCSIntegrator(parent, name) + :KDevVCSIntegrator(parent, name) { } diff --git a/vcs/subversion/integrator/subversionintegrator.h b/vcs/subversion/integrator/subversionintegrator.h index 6c7d16ac..01c43516 100644 --- a/vcs/subversion/integrator/subversionintegrator.h +++ b/vcs/subversion/integrator/subversionintegrator.h @@ -20,11 +20,11 @@ #ifndef SUBVERSIONINTEGRATOR_H #define SUBVERSIONINTEGRATOR_H -#include +#include #include -class SubversionIntegrator : public TDevVCSIntegrator +class SubversionIntegrator : public KDevVCSIntegrator { Q_OBJECT diff --git a/vcs/subversion/integrator/svnintegratordlg.cpp b/vcs/subversion/integrator/svnintegratordlg.cpp index 35e4216b..87ccf488 100644 --- a/vcs/subversion/integrator/svnintegratordlg.cpp +++ b/vcs/subversion/integrator/svnintegratordlg.cpp @@ -47,7 +47,7 @@ SvnIntegratorDlg::SvnIntegratorDlg( TQWidget *parent, const char *name ) void SvnIntegratorDlg::accept() { // to let ioslave know which protocol it should start. - KURL protocolUrl = KURL("tdevsvn+svn://blah/"); + KURL protocolUrl = KURL("kdevsvn+svn://blah/"); KURL servURL( repos1->url() ); if ( servURL.isEmpty() ) return; diff --git a/vcs/subversion/integrator/svnintegratordlg.h b/vcs/subversion/integrator/svnintegratordlg.h index bc8e8407..ccf1686f 100644 --- a/vcs/subversion/integrator/svnintegratordlg.h +++ b/vcs/subversion/integrator/svnintegratordlg.h @@ -21,7 +21,7 @@ #define SVNINTEGRATORDLG_H #include "svnintegratordlgbase.h" -#include +#include class SvnIntegratorDlg: public SvnIntegratorDlgBase, public VCSDialog { Q_OBJECT diff --git a/vcs/subversion/tdevpart_subversion.rc b/vcs/subversion/kdevpart_subversion.rc similarity index 100% rename from vcs/subversion/tdevpart_subversion.rc rename to vcs/subversion/kdevpart_subversion.rc diff --git a/vcs/subversion/tdevsubversion.desktop b/vcs/subversion/kdevsubversion.desktop similarity index 97% rename from vcs/subversion/tdevsubversion.desktop rename to vcs/subversion/kdevsubversion.desktop index 7643c755..bf52db8c 100644 --- a/vcs/subversion/tdevsubversion.desktop +++ b/vcs/subversion/kdevsubversion.desktop @@ -29,6 +29,6 @@ GenericName[ta]=துணை பதிப்பு GenericName[tg]=Зер-ривоят Icon=misc ServiceTypes=TDevelop/VersionControl -X-TDE-Library=libtdevsubversion +X-TDE-Library=libkdevsubversion X-TDevelop-Version=5 X-TDevelop-Properties=VCS,SubversionVCS diff --git a/vcs/subversion/tdevsvn+file.protocol b/vcs/subversion/kdevsvn+file.protocol similarity index 100% rename from vcs/subversion/tdevsvn+file.protocol rename to vcs/subversion/kdevsvn+file.protocol diff --git a/vcs/subversion/tdevsvn+http.protocol b/vcs/subversion/kdevsvn+http.protocol similarity index 100% rename from vcs/subversion/tdevsvn+http.protocol rename to vcs/subversion/kdevsvn+http.protocol diff --git a/vcs/subversion/tdevsvn+https.protocol b/vcs/subversion/kdevsvn+https.protocol similarity index 100% rename from vcs/subversion/tdevsvn+https.protocol rename to vcs/subversion/kdevsvn+https.protocol diff --git a/vcs/subversion/tdevsvn+ssh.protocol b/vcs/subversion/kdevsvn+ssh.protocol similarity index 100% rename from vcs/subversion/tdevsvn+ssh.protocol rename to vcs/subversion/kdevsvn+ssh.protocol diff --git a/vcs/subversion/tdevsvn+svn.protocol b/vcs/subversion/kdevsvn+svn.protocol similarity index 100% rename from vcs/subversion/tdevsvn+svn.protocol rename to vcs/subversion/kdevsvn+svn.protocol diff --git a/vcs/subversion/tdevsvnd.cpp b/vcs/subversion/kdevsvnd.cpp similarity index 96% rename from vcs/subversion/tdevsvnd.cpp rename to vcs/subversion/kdevsvnd.cpp index ea42667b..c1faf65e 100644 --- a/vcs/subversion/tdevsvnd.cpp +++ b/vcs/subversion/kdevsvnd.cpp @@ -30,24 +30,24 @@ #include "config.h" -#include "tdevsvnd.h" +#include "kdevsvnd.h" -#include "tdevsvnd_widgets.h" +#include "kdevsvnd_widgets.h" #include "commitdlg.h" extern "C" { KDE_EXPORT KDEDModule *create_kdevsvnd(const TQCString &name) { - return new TDevSvnd(name); + return new KDevSvnd(name); } } -TDevSvnd::TDevSvnd(const TQCString &name) +KDevSvnd::KDevSvnd(const TQCString &name) : KDEDModule(name) { } -TDevSvnd::~TDevSvnd() +KDevSvnd::~KDevSvnd() {} -TQString TDevSvnd::commitDialog(TQString modifiedFiles) { +TQString KDevSvnd::commitDialog(TQString modifiedFiles) { CommitDlg commitDlg; commitDlg.setCaption(i18n("Enter Commit Log Message:")); commitDlg.listMessage->setText( modifiedFiles ); @@ -57,7 +57,7 @@ TQString TDevSvnd::commitDialog(TQString modifiedFiles) { } else return TQString(); } -int TDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) +int KDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString fingerPrint, TQString validfrom, TQString validuntil, TQString issuerName, TQString ascii_cert ) { SvnSSLTrustPrompt dlg; dlg.setupCertInfo( hostname, fingerPrint, validfrom, validuntil, issuerName, ascii_cert ); @@ -69,12 +69,12 @@ int TDevSvnd::sslServerTrustPrompt( TQString errmsg, TQString hostname, TQString return -1; } } -TQString TDevSvnd::sslCertFile() +TQString KDevSvnd::sslCertFile() { TQString fileName = KFileDialog::getOpenFileName(TQString(),TQString(),0, i18n("Open SSL certificate file")); return fileName; } -TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg) +TQCString KDevSvnd::sslPasswdDlg(TQString promptMsg) { TQCString passwd; int ret = KPasswordDialog::getPassword( passwd,promptMsg ); @@ -90,7 +90,7 @@ TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg) } -// void TDevSvnd::registerMe(const TQCString &app) +// void KDevSvnd::registerMe(const TQCString &app) // { // insert(app, "test", new TestObject(app)); // // When 'app' unregisters with DCOP, the TestObject will get deleted. @@ -391,4 +391,4 @@ TQCString TDevSvnd::sslPasswdDlg(TQString promptMsg) // } // #endif -#include "tdevsvnd.moc" +#include "kdevsvnd.moc" diff --git a/vcs/subversion/tdevsvnd.desktop b/vcs/subversion/kdevsvnd.desktop similarity index 100% rename from vcs/subversion/tdevsvnd.desktop rename to vcs/subversion/kdevsvnd.desktop diff --git a/vcs/subversion/tdevsvnd.h b/vcs/subversion/kdevsvnd.h similarity index 95% rename from vcs/subversion/tdevsvnd.h rename to vcs/subversion/kdevsvnd.h index 4bec5ae7..438520e1 100644 --- a/vcs/subversion/tdevsvnd.h +++ b/vcs/subversion/kdevsvnd.h @@ -26,7 +26,7 @@ #include #include -class TDevSvnd : public KDEDModule +class KDevSvnd : public KDEDModule { Q_OBJECT // @@ -36,8 +36,8 @@ K_DCOP //note: InSVN means parent is added. InRepos means itself is added enum { SomeAreFiles = 1, SomeAreFolders = 2, SomeAreInParentsEntries = 4, SomeParentsHaveSvn = 8, SomeHaveSvn = 16, SomeAreExternalToParent = 32, AllAreInParentsEntries = 64, AllParentsHaveSvn = 128, AllHaveSvn = 256, AllAreExternalToParent = 512, AllAreFolders = 1024 }; public: - TDevSvnd(const TQCString &); - ~TDevSvnd(); + KDevSvnd(const TQCString &); + ~KDevSvnd(); k_dcop: // void addAuthInfo(TDEIO::AuthInfo, long); diff --git a/vcs/subversion/tdevsvnd_widgets.cpp b/vcs/subversion/kdevsvnd_widgets.cpp similarity index 97% rename from vcs/subversion/tdevsvnd_widgets.cpp rename to vcs/subversion/kdevsvnd_widgets.cpp index ba688423..0fd2c20b 100644 --- a/vcs/subversion/tdevsvnd_widgets.cpp +++ b/vcs/subversion/kdevsvnd_widgets.cpp @@ -12,7 +12,7 @@ * Library General Public License for more details. */ -#include "tdevsvnd_widgets.h" +#include "kdevsvnd_widgets.h" #include #include #include @@ -67,4 +67,4 @@ void SvnSSLTrustPrompt::setRejected() { m_code = -1; } -#include "tdevsvnd_widgets.moc" +#include "kdevsvnd_widgets.moc" diff --git a/vcs/subversion/tdevsvnd_widgets.h b/vcs/subversion/kdevsvnd_widgets.h similarity index 95% rename from vcs/subversion/tdevsvnd_widgets.h rename to vcs/subversion/kdevsvnd_widgets.h index da7942b2..3967cb35 100644 --- a/vcs/subversion/tdevsvnd_widgets.h +++ b/vcs/subversion/kdevsvnd_widgets.h @@ -12,8 +12,8 @@ * Library General Public License for more details. */ -#ifndef TDEVSVND_WIDGETS_H -#define TDEVSVND_WIDGETS_H +#ifndef KDEVSVND_WIDGETS_H +#define KDEVSVND_WIDGETS_H #include "svnssltrustpromptbase.h" diff --git a/vcs/subversion/subversion_core.cpp b/vcs/subversion/subversion_core.cpp index 108bf298..e9c89ece 100644 --- a/vcs/subversion/subversion_core.cpp +++ b/vcs/subversion/subversion_core.cpp @@ -18,15 +18,15 @@ */ #include -#include -#include +#include +#include #include "subversion_part.h" #include "subversion_core.h" #include "subversion_widget.h" #include "svn_blamewidget.h" #include "svn_logviewwidget.h" #include "subversiondiff.h" -#include +#include #include "svn_co.h" #include #include @@ -82,7 +82,7 @@ subversionCore::~subversionCore() { //FIXME delete m_fileInfoProvider here? } -TDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { +KDevVCSFileInfoProvider *subversionCore::fileInfoProvider() const { return m_fileInfoProvider; } @@ -114,8 +114,8 @@ subversionWidget *subversionCore::processWidget() const { void subversionCore::resolve( const KURL::List& list ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; for ( TQValueListConstIterator it = list.begin(); it != list.end() ; ++it ) { @@ -248,8 +248,8 @@ void subversionCore::diffAsync( const KURL &pathOrUrl1, const KURL &pathOrUrl2, void subversionCore::commit( const KURL::List& list, bool recurse, bool keeplocks ) { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -277,8 +277,8 @@ void subversionCore::svnLog( const KURL::List& list, clientInfo( KURL(m_part->project()->projectDirectory()), false, m_part->m_prjInfoMap ); KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -304,8 +304,8 @@ void subversionCore::blame( const KURL &url, UrlMode mode, int revstart, TQStrin { KURL servURL = m_part->baseURL(); if ( servURL.isEmpty() ) servURL="kdevsvn+svn://blah/"; - if ( ! servURL.protocol().startsWith( "tdevsvn+" ) ) { - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + if ( ! servURL.protocol().startsWith( "kdevsvn+" ) ) { + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" } kdDebug(9036) << "servURL : " << servURL.prettyURL() << endl; TQByteArray parms; @@ -374,7 +374,7 @@ void subversionCore::checkout() { int cmd = 1; int rev = -1; s << cmd << servURL << KURL( wcPath ) << rev << TQString( "HEAD" ); - servURL.setProtocol( "tdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" + servURL.setProtocol( "kdevsvn+" + servURL.protocol() ); //make sure it starts with "svn" SimpleJob * job = TDEIO::special(servURL,parms, true); job->setWindow( m_part->mainWindow()->main() ); connect( job, TQT_SIGNAL( result( TDEIO::Job * ) ), this, TQT_SLOT( slotEndCheckout( TDEIO::Job * ) ) ); diff --git a/vcs/subversion/subversion_core.h b/vcs/subversion/subversion_core.h index 60cd8cfc..f2f3f6da 100644 --- a/vcs/subversion/subversion_core.h +++ b/vcs/subversion/subversion_core.h @@ -29,7 +29,7 @@ #include "subversion_fileinfo.h" #include "subversion_global.h" -class TDevProject; +class KDevProject; class subversionPart; class subversionWidget; class TDEApplication; @@ -76,7 +76,7 @@ public: // Return true on success. Otherwise return false. bool clientInfo( KURL path_or_url, bool recurse, TQMap< KURL, SvnGlobal::SvnInfoHolder> &holderMap ); void createNewProject( const TQString& dirName, const KURL& importURL, bool init ); - TDevVCSFileInfoProvider *fileInfoProvider() const; + KDevVCSFileInfoProvider *fileInfoProvider() const; void initProcessDlg( TDEIO::Job *job, const TQString &src, const TQString &dest ); // k_dcop: diff --git a/vcs/subversion/subversion_fileinfo.cpp b/vcs/subversion/subversion_fileinfo.cpp index c41ff9ef..45d44d1e 100644 --- a/vcs/subversion/subversion_fileinfo.cpp +++ b/vcs/subversion/subversion_fileinfo.cpp @@ -22,10 +22,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include @@ -33,7 +33,7 @@ #include SVNFileInfoProvider::SVNFileInfoProvider(subversionPart *parent, const char *name) - : TDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ), + : KDevVCSFileInfoProvider( parent, "svnfileinfoprovider" ), m_cachedDirEntries( 0 ), m_recursiveDirEntries(0) { Q_UNUSED(name); m_part = parent; diff --git a/vcs/subversion/subversion_fileinfo.h b/vcs/subversion/subversion_fileinfo.h index 1d144270..9b322463 100644 --- a/vcs/subversion/subversion_fileinfo.h +++ b/vcs/subversion/subversion_fileinfo.h @@ -23,7 +23,7 @@ #include -#include +#include #include #include #include @@ -34,7 +34,7 @@ Provider for SVN file information @author Mickael Marchand */ -class SVNFileInfoProvider : public TDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/ +class SVNFileInfoProvider : public KDevVCSFileInfoProvider, public DCOPObject/*, virtual public DCOPClient*/ { Q_OBJECT // diff --git a/vcs/subversion/subversion_part.cpp b/vcs/subversion/subversion_part.cpp index 3df326d9..f3f43cd9 100644 --- a/vcs/subversion/subversion_part.cpp +++ b/vcs/subversion/subversion_part.cpp @@ -21,18 +21,18 @@ #include #include #include -#include +#include #include #include -#include "tdevcore.h" -#include "tdevmainwindow.h" +#include "kdevcore.h" +#include "kdevmainwindow.h" #include "subversion_core.h" #include "subversion_widget.h" #include "subversionprojectwidget.h" #include "subversion_fileinfo.h" #include "subversion_global.h" -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" #include "svn_fileselectdlg_commit.h" #include "svn_logviewwidget.h" #include "svn_switchwidget.h" @@ -43,28 +43,28 @@ #include #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include using namespace SvnGlobal; -static const TDevPluginInfo data("tdevsubversion"); +static const KDevPluginInfo data("kdevsubversion"); -typedef TDevGenericFactory subversionFactory; -K_EXPORT_COMPONENT_FACTORY( libtdevsubversion, subversionFactory( data ) ) +typedef KDevGenericFactory subversionFactory; +K_EXPORT_COMPONENT_FACTORY( libkdevsubversion, subversionFactory( data ) ) //bool g_projectWasJustCreated = false; subversionPart::subversionPart(TQObject *parent, const char *name, const TQStringList& ) - : TDevVersionControl(&data, parent, name ? name : "Subversion" ) { + : KDevVersionControl(&data, parent, name ? name : "Subversion" ) { setInstance(subversionFactory::instance()); m_projWidget = 0; @@ -79,7 +79,7 @@ subversionPart::subversionPart(TQObject *parent, const char *name, const TQStrin // Context menu connect( core(), TQT_SIGNAL(contextMenu(TQPopupMenu *, const Context *)), this, TQT_SLOT(contextMenu(TQPopupMenu *, const Context *)) ); connect( core(), TQT_SIGNAL(projectConfigWidget(KDialogBase*)), this, TQT_SLOT(projectConfigWidget(KDialogBase*)) ); - connect( core(), TQT_SIGNAL(stopButtonClicked(TDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(TDevPlugin*)) ); + connect( core(), TQT_SIGNAL(stopButtonClicked(KDevPlugin*)), this, TQT_SLOT(slotStopButtonClicked(KDevPlugin*)) ); connect( core(), TQT_SIGNAL(projectOpened()), this, TQT_SLOT(slotProjectOpened()) ); connect( core(), TQT_SIGNAL(projectClosed()), this, TQT_SLOT(slotProjectClosed()) ); @@ -177,7 +177,7 @@ bool subversionPart::fetchFromRepository() { return true; } -TDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const { +KDevVCSFileInfoProvider * subversionPart::fileInfoProvider() const { return m_impl->fileInfoProvider(); } diff --git a/vcs/subversion/subversion_part.h b/vcs/subversion/subversion_part.h index 9296152a..1847567d 100644 --- a/vcs/subversion/subversion_part.h +++ b/vcs/subversion/subversion_part.h @@ -16,16 +16,16 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __TDEVPART_SUBVERSION_H__ -#define __TDEVPART_SUBVERSION_H__ +#ifndef __KDEVPART_SUBVERSION_H__ +#define __KDEVPART_SUBVERSION_H__ #include -#include +#include #include #include #include -#include "tdevversioncontrol.h" +#include "kdevversioncontrol.h" class subversionCore; class subversionOptionsWidget; @@ -36,7 +36,7 @@ namespace SvnGlobal class SvnInfoHolder; }; -class subversionPart : public TDevVersionControl +class subversionPart : public KDevVersionControl { Q_OBJECT @@ -49,7 +49,7 @@ public: TQWidget* newProjectWidget( TQWidget* parent ); void createNewProject( const TQString& dirname ); bool fetchFromRepository(); - TDevVCSFileInfoProvider * fileInfoProvider() const; + KDevVCSFileInfoProvider * fileInfoProvider() const; bool urlFocusedDocument( KURL &url ); void restorePartialProjectSession(const TQDomElement* ); void savePartialProjectSession(TQDomElement* ); diff --git a/vcs/subversion/subversion_widget.cpp b/vcs/subversion/subversion_widget.cpp index 9b29e1fa..95b31f6b 100644 --- a/vcs/subversion/subversion_widget.cpp +++ b/vcs/subversion/subversion_widget.cpp @@ -18,7 +18,7 @@ */ #include -#include +#include #include #include diff --git a/vcs/subversion/svn_fileselectdlg_commit.cpp b/vcs/subversion/svn_fileselectdlg_commit.cpp index 9c210a37..e042df84 100644 --- a/vcs/subversion/svn_fileselectdlg_commit.cpp +++ b/vcs/subversion/svn_fileselectdlg_commit.cpp @@ -29,10 +29,10 @@ #include #include #include -#include "tdevmainwindow.h" +#include "kdevmainwindow.h" #include -#include +#include SVNFileSelectDlgCommit::SVNFileSelectDlgCommit( KURL::List &urls, subversionPart *part, TQWidget* parent) :SvnCommitDlgBase( parent, "svnfileselectcommitdlg", true ) diff --git a/vcs/subversion/svn_logviewwidget.cpp b/vcs/subversion/svn_logviewwidget.cpp index e872a586..10e55a9f 100644 --- a/vcs/subversion/svn_logviewwidget.cpp +++ b/vcs/subversion/svn_logviewwidget.cpp @@ -22,7 +22,7 @@ #include "svn_blamewidget.h" #include "subversion_core.h" #include "subversion_global.h" -#include +#include #include #include #include diff --git a/vcs/subversion/svn_tdeio.cpp b/vcs/subversion/svn_tdeio.cpp index 0abac2b8..23f1d2ff 100644 --- a/vcs/subversion/svn_tdeio.cpp +++ b/vcs/subversion/svn_tdeio.cpp @@ -124,7 +124,7 @@ tdeio_svnProtocol::tdeio_svnProtocol(const TQCString &pool_socket, const TQCStri apr_initialize(); // Make sure to properly initialize svn client, besides other things, this sets up // NLS support for environments that don't use UTF-8 - svn_cmdline_init("tdevsvnd",NULL); + svn_cmdline_init("kdevsvnd",NULL); // CleanUP ctx preventing crash in svn_client_update and other memset(&ctx, 0, sizeof(ctx)); pool = svn_pool_create (NULL); @@ -1861,7 +1861,7 @@ svn_error_t *tdeio_svnProtocol::commitLogPrompt( const char **log_msg, const cha kdDebug(9036) << " __TIME__ " << __TIME__ << endl; if ( !p->dcopClient()->call( "kded","kdevsvnd","commitDialog(TQString)", params, replyType, reply ) ) { - kdWarning() << "Communication with KDED:TDevSvnd failed" << endl; + kdWarning() << "Communication with KDED:KDevSvnd failed" << endl; svn_error_t *err = svn_error_create( SVN_ERR_EXTERNAL_PROGRAM, NULL, apr_pstrdup( pool, "Fail to call kded_kdevsvnd via DCOP. If this is your first problem, try to restart KDE" ) ); return err;