From ece35c015c54312eb13f583cc247cdd9a4051b4d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 1 Feb 2013 23:12:56 -0600 Subject: [PATCH] Rename many classes and header files to avoid conflicts with KDE4 --- .../wet/kis_wetness_visualisation_filter.h | 2 +- chalk/colorspaces/wet/wet_plugin.cc | 2 +- chalk/core/kis_filter_registry.cc | 2 +- chalk/core/kis_strategy_move.cc | 2 +- .../tools/defaulttools/kis_tool_brush.cc | 2 +- .../defaulttools/kis_tool_colorpicker.cc | 2 +- .../tools/defaulttools/kis_tool_duplicate.cc | 2 +- .../tools/defaulttools/kis_tool_ellipse.cc | 2 +- .../tools/defaulttools/kis_tool_fill.cc | 2 +- .../tools/defaulttools/kis_tool_gradient.cc | 2 +- .../tools/defaulttools/kis_tool_line.cc | 2 +- .../tools/defaulttools/kis_tool_move.cc | 2 +- .../tools/defaulttools/kis_tool_pan.cc | 2 +- .../tools/defaulttools/kis_tool_rectangle.cc | 2 +- .../tools/defaulttools/kis_tool_text.cc | 4 +- .../tools/defaulttools/kis_tool_zoom.cc | 2 +- .../plugins/tools/selectiontools/Makefile.am | 12 ++-- .../chaltdeselectiontools.desktop | 2 +- .../selectiontools/kis_tool_move_selection.cc | 2 +- .../selectiontools/kis_tool_select_brush.cc | 2 +- .../kis_tool_select_contiguous.cc | 2 +- .../kis_tool_select_elliptical.cc | 2 +- .../selectiontools/kis_tool_select_eraser.cc | 2 +- .../selectiontools/kis_tool_select_outline.cc | 2 +- .../kis_tool_select_polygonal.cc | 2 +- .../kis_tool_select_rectangular.cc | 2 +- .../tools/selectiontools/selection_tools.cc | 2 +- chalk/plugins/tools/tool_crop/Makefile.am | 12 ++-- .../tools/tool_crop/chaltdetoolcrop.desktop | 2 +- .../plugins/tools/tool_crop/kis_tool_crop.cc | 2 +- chalk/plugins/tools/tool_crop/tool_crop.cc | 2 +- chalk/plugins/tools/tool_curves/Makefile.am | 12 ++-- .../tool_curves/chaltdetoolcurves.desktop | 2 +- .../tools/tool_curves/kis_tool_bezier.cc | 2 +- .../tool_curves/kis_tool_bezier_paint.cc | 2 +- .../tool_curves/kis_tool_bezier_select.cc | 2 +- .../tools/tool_curves/kis_tool_curve.cc | 2 +- .../tools/tool_curves/kis_tool_example.cc | 2 +- .../tools/tool_curves/kis_tool_moutline.cc | 2 +- .../plugins/tools/tool_curves/tool_curves.cc | 2 +- chalk/plugins/tools/tool_filter/Makefile.am | 12 ++-- .../tool_filter/chaltdetoolfilter.desktop | 2 +- .../tools/tool_filter/kis_tool_filter.cc | 2 +- .../plugins/tools/tool_filter/tool_filter.cc | 2 +- .../tools/tool_perspectivegrid/Makefile.am | 10 +-- .../chaltdetoolperspectivegrid.desktop | 2 +- .../kis_tool_perspectivegrid.cc | 2 +- .../tool_perspectivegrid.cc | 2 +- .../tool_perspectivetransform/Makefile.am | 12 ++-- .../chaltdetoolperspectivetransform.desktop | 2 +- .../kis_tool_perspectivetransform.cc | 2 +- .../tool_perspectivetransform.cc | 2 +- chalk/plugins/tools/tool_polygon/Makefile.am | 12 ++-- .../tool_polygon/chaltdetoolpolygon.desktop | 2 +- .../tools/tool_polygon/kis_tool_polygon.cc | 2 +- .../tools/tool_polygon/tool_polygon.cc | 2 +- chalk/plugins/tools/tool_polyline/Makefile.am | 12 ++-- .../tool_polyline/chaltdetoolpolyline.desktop | 2 +- .../tools/tool_polyline/kis_tool_polyline.cc | 2 +- .../tools/tool_polyline/tool_polyline.cc | 2 +- .../tools/tool_selectsimilar/Makefile.am | 12 ++-- .../chaltdetoolselectsimilar.desktop | 2 +- .../kis_tool_selectsimilar.cc | 2 +- .../tools/tool_selectsimilar/selectsimilar.cc | 2 +- chalk/plugins/tools/tool_star/Makefile.am | 12 ++-- .../tools/tool_star/chaltdetoolstar.desktop | 2 +- .../plugins/tools/tool_star/kis_tool_star.cc | 2 +- chalk/plugins/tools/tool_star/tool_star.cc | 2 +- .../plugins/tools/tool_transform/Makefile.am | 12 ++-- .../chaltdetooltransform.desktop | 2 +- .../tool_transform/kis_tool_transform.cc | 2 +- .../tools/tool_transform/tool_transform.cc | 2 +- .../viewplugins/colorrange/dlg_colorrange.cc | 2 +- .../modify_selection/modify_selection.cc | 2 +- .../modify_selection/modify_selection.rc | 2 +- .../viewplugins/screenshot/ksnapshot.cpp | 4 +- .../viewplugins/selectopaque/Makefile.am | 12 ++-- .../selectopaque/chaltdeselectopaque.desktop | 2 +- .../viewplugins/selectopaque/selectopaque.cc | 2 +- .../viewplugins/selectopaque/selectopaque.rc | 2 +- chalk/ui/kis_controlframe.cc | 6 +- chalk/ui/kis_controlframe.h | 2 +- chalk/ui/kis_filter_manager.cc | 2 +- chalk/ui/kis_filter_manager.h | 2 +- chalk/ui/kis_gradient_slider_widget.cc | 2 +- chalk/ui/kis_grid_manager.cpp | 2 +- chalk/ui/kis_layerbox.cc | 2 +- chalk/ui/kis_layerlist.cc | 2 +- chalk/ui/kis_paintop_box.cc | 4 +- chalk/ui/kis_palette_view.cc | 2 +- chalk/ui/kis_palette_widget.cc | 2 +- chalk/ui/kis_perspective_grid_manager.cpp | 2 +- chalk/ui/kis_selection_manager.cc | 2 +- chalk/ui/kis_text_brush.cc | 2 +- chalk/ui/kis_tool.cc | 2 +- chalk/ui/kis_tool.h | 2 +- chalk/ui/kis_tool_dummy.cc | 4 +- chalk/ui/kis_tool_factory.h | 2 +- chalk/ui/kis_tool_freehand.cc | 2 +- chalk/ui/kis_tool_registry.cc | 2 +- chalk/ui/kis_view.cc | 6 +- chalk/ui/kobirdeyepanel.cpp | 4 +- chalk/ui/layerlist.cpp | 2 +- chalk/ui/layerlist.h | 2 +- chalk/ui/wdgbirdeye.ui | 4 +- doc/chalk/developers-plugins.docbook | 4 +- example/example_view.cc | 2 +- filters/chalk/pdf/kis_pdf_import_widget.cpp | 2 +- filters/chalk/pdf/pdfimportwidgetbase.ui | 2 +- filters/kspread/kexi/kspread_kexiimport.cc | 2 +- .../kspread/kexi/kspread_kexiimportdialog.cc | 2 +- .../kexi/kspread_kexiimportdialogbase.ui | 2 +- .../latex/export/kspreadlatexexportdiaImpl.cc | 2 +- .../kspread/latex/export/latexexportdia.ui | 4 +- .../kword/latex/export/kwordlatexexportdia.cc | 2 +- filters/kword/latex/export/latexexportdia.ui | 4 +- filters/xsltfilter/export/xsltexportdia.cc | 2 +- filters/xsltfilter/import/xsltimportdia.cc | 2 +- karbon/TODO | 2 +- karbon/commands/vcommand.cc | 2 +- karbon/karbon_tool_factory.h | 2 +- karbon/karbon_tool_registry.cc | 4 +- karbon/karbon_view.cc | 2 +- karbon/tools/vtexttool.cc | 4 +- karbon/vtool.h | 2 +- karbon/widgets/vcolorslider.cc | 2 +- karbon/widgets/vgradienttabwidget.cc | 2 +- karbon/widgets/vselecttoolbar.h | 2 +- kchart/kchartColorConfigPage.cc | 2 +- kchart/kchartDataConfigPage.cc | 2 +- kchart/kchartFontConfigPage.cc | 2 +- kchart/kchartHeaderFooterConfigPage.cc | 2 +- kchart/kchartLegendConfigPage.cc | 2 +- kchart/kchartParameterConfigPage.cc | 2 +- kchart/kchartPieConfigPage.cc | 2 +- kchart/kchartWizardLabelsLegendPage.cc | 2 +- kchart/kchartWizardSetupAxesPage.cc | 2 +- kchart/kchart_view.cc | 2 +- kexi/core/kexiactionproxy.cpp | 6 +- kexi/core/kexiactionproxy.h | 2 +- kexi/core/kexicontexthelp.cpp | 2 +- kexi/core/kexisharedactionhost.h | 2 +- kexi/core/kexisharedactionhost_p.h | 4 +- kexi/core/kexiuseraction.cpp | 2 +- kexi/core/kexiuseraction.h | 2 +- kexi/doc/dev/TODO-Kexi-js | 2 +- kexi/formeditor/commands.cpp | 4 +- kexi/formeditor/container.cpp | 2 +- kexi/formeditor/editlistviewdialog.cpp | 4 +- .../formeditor/factories/stdwidgetfactory.cpp | 8 +-- kexi/formeditor/form.cpp | 2 +- kexi/formeditor/formIO.cpp | 2 +- kexi/formeditor/formmanager.cpp | 12 ++-- kexi/formeditor/libactionwidget.h | 2 +- kexi/formeditor/objecttreeview.h | 2 +- kexi/formeditor/richtextdialog.cpp | 6 +- .../tdevelop_plugin/kfd_kdev_part.cpp | 2 +- kexi/formeditor/test/kfd_mainwindow.cpp | 2 +- kexi/formeditor/test/kfd_part.cpp | 2 +- kexi/formeditor/widgetfactory.cpp | 2 +- kexi/formeditor/widgetlibrary.cpp | 2 +- kexi/kexiutils/debuggui.cpp | 2 +- kexi/main/kexifinddialog.cpp | 2 +- kexi/main/keximainwindowimpl.cpp | 8 +-- kexi/main/kexinewstuff.cpp | 2 +- .../printing/kexisimpleprintingengine.cpp | 2 +- .../printing/kexisimpleprintingpagesetup.cpp | 2 +- .../printing/kexisimpleprintpreviewwindow.cpp | 2 +- .../printing/kexisimpleprintpreviewwindow.h | 2 +- kexi/main/startup/KexiConnSelector.cpp | 8 +-- kexi/main/startup/KexiConnSelector.h | 2 +- kexi/main/startup/KexiNewPrjTypeSelector.ui | 2 +- kexi/main/startup/KexiNewProjectWizard.cpp | 2 +- .../startup/KexiStartupDialogTemplatesPage.h | 2 +- .../startup/KexiStartupFileDialog_win.cpp | 2 +- .../forms/kexiactionselectiondialog.cpp | 66 +++++++++--------- .../forms/kexiactionselectiondialog_p.h | 2 +- kexi/plugins/forms/kexidatasourcepage.cpp | 4 +- kexi/plugins/forms/kexidbfactory.cpp | 2 +- kexi/plugins/forms/kexiformeventhandler.cpp | 4 +- kexi/plugins/forms/kexiformeventhandler.h | 10 +-- kexi/plugins/forms/kexiformpart.cpp | 2 +- kexi/plugins/forms/kexiformscrollview.cpp | 2 +- kexi/plugins/forms/widgets/kexidbdateedit.cpp | 2 +- .../forms/widgets/kexidbdatetimeedit.cpp | 2 +- kexi/plugins/forms/widgets/kexidbimagebox.cpp | 6 +- kexi/plugins/forms/widgets/kexidbtextedit.cpp | 2 +- kexi/plugins/forms/widgets/kexidbtimeedit.cpp | 2 +- kexi/plugins/forms/widgets/kexidbutils.cpp | 2 +- .../importexport/csv/kexicsvimportdialog.cpp | 2 +- kexi/plugins/macros/kexipart/keximacroerror.h | 2 +- .../macros/kexipart/keximacroerrorbase.ui | 2 +- .../queries/kexiparameterlisteditor.ui | 2 +- .../queries/kexiquerydesignersqlhistory.cpp | 2 +- .../kexiscripting/kexiscripteditor.cpp | 4 +- kexi/plugins/tables/kexilookupcolumnpage.cpp | 4 +- .../tables/kexitabledesignercommands.cpp | 4 +- kexi/plugins/tables/kexitabledesignerview.cpp | 4 +- .../tables/kexitabledesignerview_p.cpp | 4 +- kexi/tests/altertable/1.kexi | Bin 49152 -> 49156 bytes kexi/widget/kexibrowser.cpp | 4 +- kexi/widget/kexibrowser.h | 2 +- kexi/widget/kexibrowser_p.h | 2 +- kexi/widget/kexibrowseritem.h | 2 +- kexi/widget/kexidataawareview.cpp | 2 +- kexi/widget/kexidatasourcecombobox.cpp | 2 +- kexi/widget/kexidatatable.cpp | 4 +- kexi/widget/kexifieldlistview.h | 2 +- kexi/widget/kexismalltoolbutton.h | 2 +- kexi/widget/pixmapcollection.cpp | 2 +- kexi/widget/relations/kexirelationview.cpp | 4 +- kexi/widget/relations/kexirelationviewtable.h | 2 +- kexi/widget/tableview/kexiblobtableedit.cpp | 4 +- kexi/widget/tableview/kexidatatableview.cpp | 2 +- kexi/widget/tableview/kexidatetableedit.cpp | 2 +- .../tableview/kexidatetimetableedit.cpp | 2 +- kexi/widget/tableview/kexitableview_p.h | 6 +- kexi/widget/tableview/kexitimetableedit.cpp | 2 +- .../utils/kexicomboboxdropdownbutton.cpp | 2 +- kexi/widget/utils/kexicontextmenuutils.cpp | 4 +- kexi/widget/utils/kexicontextmenuutils.h | 2 +- kexi/widget/utils/kexidatetimeformatter.cpp | 2 +- kexi/widget/utils/kexidropdownbutton.cpp | 2 +- kexi/widget/utils/kexisharedactionclient.cpp | 2 +- kexi/widget/utils/tdelistviewitemtemplate.h | 2 +- kformula/kformula_doc.cc | 2 +- kformula/kformula_view.cc | 2 +- kivio/kiviopart/KIvioDocIface.cc | 2 +- kivio/kiviopart/kivio_doc.cpp | 2 +- kivio/kiviopart/kivio_view.cpp | 4 +- kivio/kiviopart/kivio_zoomaction.h | 2 +- kivio/kiviopart/kivioarrowheadaction.cpp | 6 +- kivio/kiviopart/kivioarrowheadaction.h | 2 +- kivio/kiviopart/kiviostencilsetaction.cpp | 6 +- kivio/kiviopart/kiviostencilsetaction.h | 2 +- kivio/kiviopart/tools/mousetoolaction.cpp | 4 +- kivio/kiviopart/tools/mousetoolaction.h | 2 +- kivio/kiviopart/ui/kivio_birdeye_panel.cpp | 4 +- kivio/kiviopart/ui/kivio_layer_panel.cpp | 4 +- kivio/kiviopart/ui/kivio_layer_panel_base.ui | 4 +- kivio/kiviopart/ui/kivio_protection_panel.cpp | 2 +- .../kiviopart/ui/kivioaddstencilsetpanel.cpp | 2 +- kivio/kiviopart/ui/kiviooptionsdialog.cpp | 2 +- kivio/kiviopart/ui/kiviooptionsdialog.h | 2 +- kivio/kiviopart/ui/kiviostencilsetwidget.ui | 2 +- kivio/kiviopart/ui/kiviotextformatdlg.cpp | 2 +- kivio/kiviopart/ui/objectlistpalette.cpp | 2 +- kivio/plugins/kivioselecttool/tool_select.cpp | 4 +- .../kiviosmlconnector/tool_connector.cpp | 2 +- .../kivio_stenciltexteditorui.ui | 2 +- .../kiviotexttool/stenciltexteditor.cpp | 2 +- kivio/plugins/kiviozoomtool/tool_zoom.cpp | 6 +- koshell/iconsidepane.cpp | 2 +- koshell/iconsidepane.h | 4 +- koshell/koshell_shell.cc | 6 +- kounavail/kounavail.cc | 2 +- kplato/kptaccountspanel.cc | 2 +- kplato/kptaccountspanelbase.ui | 2 +- kplato/kptaccountsview.cc | 2 +- kplato/kptaccountsview.h | 2 +- kplato/kptcalendarlistpanel.ui | 2 +- kplato/kptdoublelistviewbase.h | 2 +- kplato/kptpertcanvas.cc | 2 +- kplato/kptproject.h | 2 +- kplato/kptreportview.cc | 4 +- kplato/kptreportview.h | 2 +- kplato/kptresourcespanel.cc | 2 +- kplato/kptresourceview.cc | 2 +- kplato/kptstandardworktimedialog.cc | 2 +- kplato/kptview.cc | 8 +-- kplato/reports/Makefile.am | 4 +- kplato/reports/tastdelist.desktop | 2 +- kplato/resourcespanelbase.ui | 2 +- kplato/standardworktimedialogbase.ui | 2 +- kpresenter/KPrCanvas.cpp | 2 +- kpresenter/KPrConfig.cpp | 4 +- kpresenter/KPrPresDurationDia.cpp | 2 +- kpresenter/KPrSideBar.h | 2 +- kpresenter/KPrTextObject.cpp | 2 +- kpresenter/KPrView.cpp | 10 +-- kpresenter/KPrWebPresentation.cpp | 2 +- kspread/dialogs/SheetSelectWidget.ui | 4 +- kspread/dialogs/kspread_dlg_database.cc | 2 +- kspread/dialogs/kspread_dlg_styles.cc | 2 +- kspread/dialogs/link.cc | 2 +- kspread/kspread_editors.cc | 2 +- kspread/kspread_view.cc | 4 +- kspread/templates/HomeFamily/Makefile.am | 4 +- .../HomeFamily/VacationChectdelist.desktop | 16 ++--- .../HomeFamily/VacationChectdelist.kst | 2 +- kugar/kudesigner/kudesigner_view.cpp | 2 +- kugar/kudesigner_lib/structurewidget.h | 2 +- kugar/part/kugar_part.cpp | 2 +- kugar/part/kugar_view.cpp | 2 +- kword/KWConfig.cpp | 4 +- kword/KWDocStruct.cpp | 6 +- kword/KWDocStruct.h | 2 +- kword/KWFrameView.cpp | 2 +- kword/KWMailMergeDataBase.cpp | 4 +- kword/KWMailMergeLabelAction.cpp | 2 +- kword/KWMailMergeLabelAction.h | 2 +- kword/KWTextFrameSet.cpp | 2 +- kword/KWView.cpp | 4 +- kword/KWView.h | 2 +- kword/mailmerge/kabc/KWMailMergeKABCConfig.h | 2 +- kword/mailmerge/kabc/addresspicker.ui | 4 +- kword/mailmerge/sql/kwqtsqlpower.ui | 2 +- lib/kformula/kformulaconfigpage.cc | 4 +- lib/kformula/kformuladocument.h | 2 +- lib/kformula/symbolaction.cc | 2 +- lib/kformula/symbolaction.h | 2 +- lib/kofficecore/KoDetailsPane.cpp | 2 +- lib/kofficecore/KoDetailsPane.h | 2 +- lib/kofficecore/KoDocumentIface.cc | 2 +- lib/kofficecore/KoDocumentInfoDlg.cpp | 2 +- lib/kofficecore/KoFilterManager.cpp | 2 +- lib/kofficecore/KoMainWindow.cpp | 2 +- lib/kofficecore/KoOpenPane.cpp | 2 +- lib/kofficecore/KoViewIface.cc | 2 +- lib/kofficecore/Koversiondialog.cpp | 2 +- lib/kofficecore/kkbdaccessextensions.cpp | 4 +- lib/kofficecore/koDetailsPaneBase.ui | 2 +- .../koDocumentInfoUserMetadataWidget.ui | 2 +- lib/kofficecore/koOpenPaneBase.ui | 2 +- lib/kofficeui/KoCommandHistory.cpp | 8 +-- lib/kofficeui/KoContextCelp.h | 2 +- lib/kofficeui/KoGuides.cpp | 2 +- lib/kofficeui/KoInsertLink.cpp | 2 +- lib/kofficeui/KoPartSelectAction.h | 2 +- lib/kofficeui/KoSelectAction.cpp | 6 +- lib/kofficeui/KoSelectAction.h | 2 +- lib/kofficeui/KoTemplateChooseDia.cpp | 2 +- lib/kofficeui/KoTemplateCreateDia.cpp | 2 +- lib/kofficeui/KoToolBox.cpp | 8 +-- lib/kofficeui/KoToolBox.h | 2 +- lib/kofficeui/KoTooluButton.cpp | 2 +- lib/kofficeui/KoTooluButton.h | 2 +- lib/kofficeui/KoZoomAction.h | 2 +- lib/kofficeui/Kolinestyleaction.cpp | 2 +- lib/kofficeui/Kolinewidthaction.cpp | 6 +- lib/kofficeui/Makefile.am | 4 +- lib/kofficeui/kcoloractions.cpp | 4 +- lib/kofficeui/kcoloractions.h | 4 +- lib/kofficeui/tests/coloraction_test.cpp | 2 +- lib/kofficeui/tkcoloractions.cpp | 4 +- lib/kofficeui/tkcoloractions.h | 4 +- lib/kofficeui/ttdeaction.cpp | 8 +-- lib/kofficeui/ttdeaction.h | 2 +- lib/kofficeui/ttdetoolbarbutton.cpp | 4 +- lib/kofficeui/ttdetoolbarbutton.h | 2 +- lib/kopainter/ko_color_wheel.h | 2 +- lib/kopainter/ko_hsv_widget.cc | 2 +- lib/kopalette/kopalette.cc | 2 +- lib/kopalette/kopalettemanager.cc | 6 +- lib/koproperty/editor.h | 2 +- lib/koproperty/editoritem.cpp | 4 +- lib/koproperty/editoritem.h | 2 +- lib/koproperty/editors/fontedit.cpp | 4 +- lib/koproperty/editors/pixmapedit.cpp | 2 +- lib/koproperty/test/test.cpp | 2 +- lib/koproperty/test/test.h | 2 +- lib/koproperty/widget.cpp | 2 +- lib/kotext/KoAutoFormatDia.cpp | 2 +- lib/kotext/KoCustomVariablesDia.h | 2 +- lib/kotext/KoFontDia.h | 2 +- lib/kotext/KoSearchDia.cpp | 2 +- lib/kotext/KoTextView.cpp | 4 +- lib/kotext/KoVariable.h | 2 +- lib/kotext/TDEFontDialog_local.cpp | 2 +- lib/kotext/TDEFontDialog_local.h | 8 +-- lib/kotext/kohyphen/hyphdicts/hyph_sv.dic | 4 +- lib/kross/api/eventaction.cpp | 2 +- lib/kross/api/eventaction.h | 2 +- lib/kross/main/mainmodule.h | 2 +- lib/kross/main/scriptaction.h | 2 +- lib/kross/main/scriptguiclient.cpp | 2 +- lib/kross/main/wdgscriptsmanager.cpp | 4 +- lib/kross/main/wdgscriptsmanagerbase.ui | 6 +- lib/kross/python/cxx/cxx_extensions.cxx | 2 +- lib/kross/test/testaction.h | 4 +- lib/kross/test/testwindow.cpp | 2 +- lib/kross/test/testwindow.h | 2 +- 382 files changed, 603 insertions(+), 603 deletions(-) diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h index 7311cd04b..e3a3cae80 100644 --- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h +++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.h @@ -23,7 +23,7 @@ #include #include -#include +#include class KisView; diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc index 04dd887de..6edc562eb 100644 --- a/chalk/colorspaces/wet/wet_plugin.cc +++ b/chalk/colorspaces/wet/wet_plugin.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc index 2ba41d54e..abccf8bc4 100644 --- a/chalk/core/kis_filter_registry.cc +++ b/chalk/core/kis_filter_registry.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/core/kis_strategy_move.cc b/chalk/core/kis_strategy_move.cc index 596790564..3eef47d6f 100644 --- a/chalk/core/kis_strategy_move.cc +++ b/chalk/core/kis_strategy_move.cc @@ -19,7 +19,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc index b440e3f58..8fa2c6475 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc index 9f6b52aec..310d1660d 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc index 0718f116b..d93687df2 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc index 4cc7d2f63..72a8ed302 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc index 93976d6a4..8709e60d9 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc index 6801cf402..555583954 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc index 5a024bf02..8b5bc2a87 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc index d7a2bbb60..2762e5a0b 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include "kis_canvas_subject.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc index 287ba2f47..f516d8998 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include "kis_canvas_controller.h" diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc index abfd13622..fb36dcbde 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc @@ -23,7 +23,7 @@ #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc index 02626efeb..3897d78a1 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc @@ -28,10 +28,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc index fda422c5b..276ff3dba 100644 --- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc +++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include +#include #include #include diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am index 49d3f5711..5bb879836 100644 --- a/chalk/plugins/tools/selectiontools/Makefile.am +++ b/chalk/plugins/tools/selectiontools/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalkselectiontools.desktop +kde_services_DATA = chaltdeselectiontools.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,13 +9,13 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \ +chaltdeselectiontools_la_SOURCES = kis_tool_move_selection.cc \ kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \ kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \ kis_tool_select_rectangular.cc selection_tools.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalkselectiontools.la +kde_module_LTLIBRARIES = chaltdeselectiontools.la noinst_HEADERS = \ selection_tools.h \ @@ -28,13 +28,13 @@ noinst_HEADERS = \ kis_tool_select_elliptical.h -chalkselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalkselectiontools_la_LIBADD = ../../../libchalkcommon.la \ +chaltdeselectiontools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdeselectiontools_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkselectiontools_la_METASOURCES = AUTO +chaltdeselectiontools_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop b/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop index f005126bb..b18a857a3 100644 --- a/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop +++ b/chalk/plugins/tools/selectiontools/chaltdeselectiontools.desktop @@ -48,5 +48,5 @@ Name[zh_CN]=选择工具 Name[zh_TW]=選取區工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalkselectiontools +X-TDE-Library=chaltdeselectiontools X-Chalk-Version=2 diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc index 139d99b9e..2e939da06 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc @@ -20,7 +20,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc index 478e5904a..a353fb5b7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc index 397e56c75..f8409f4e1 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc index 2be4046c8..38806f0f4 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc index 87dc038aa..5f687ca52 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc index ee869304f..d5f1123f7 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc index 58fc19c6d..b871c825b 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc index f469ce319..fdce6b73a 100644 --- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc +++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc index fb0e61912..2fdedc0c7 100644 --- a/chalk/plugins/tools/selectiontools/selection_tools.cc +++ b/chalk/plugins/tools/selectiontools/selection_tools.cc @@ -48,7 +48,7 @@ #include "kis_tool_move_selection.h" typedef KGenericFactory SelectionToolsFactory; -K_EXPORT_COMPONENT_FACTORY( chalkselectiontools, SelectionToolsFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdeselectiontools, SelectionToolsFactory( "chalk" ) ) SelectionTools::SelectionTools(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am index 9f46072e7..fb7bcca7b 100644 --- a/chalk/plugins/tools/tool_crop/Makefile.am +++ b/chalk/plugins/tools/tool_crop/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolcrop.desktop +kde_services_DATA = chaltdetoolcrop.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolcrop_la_SOURCES = \ +chaltdetoolcrop_la_SOURCES = \ wdg_tool_crop.ui \ tool_crop.cc \ kis_tool_crop.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolcrop.la +kde_module_LTLIBRARIES = chaltdetoolcrop.la noinst_HEADERS = \ tool_crop.h \ kis_tool_crop.h -chalktoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolcrop_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolcrop_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolcrop_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolcrop_la_METASOURCES = AUTO +chaltdetoolcrop_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop b/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop index 325fbf78e..c93b427e6 100644 --- a/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop +++ b/chalk/plugins/tools/tool_crop/chaltdetoolcrop.desktop @@ -43,5 +43,5 @@ Name[zh_CN]=裁剪工具 Name[zh_TW]=剪裁工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolcrop +X-TDE-Library=chaltdetoolcrop X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc index ff5d98a70..4bb504526 100644 --- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc index c624d62f8..9a836ec6a 100644 --- a/chalk/plugins/tools/tool_crop/tool_crop.cc +++ b/chalk/plugins/tools/tool_crop/tool_crop.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolCropFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolcrop, ToolCropFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolcrop, ToolCropFactory( "chalk" ) ) ToolCrop::ToolCrop(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am index d2ddbf07c..704a975df 100644 --- a/chalk/plugins/tools/tool_curves/Makefile.am +++ b/chalk/plugins/tools/tool_curves/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolcurves.desktop +kde_services_DATA = chaltdetoolcurves.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolcurves_la_SOURCES = \ +chaltdetoolcurves_la_SOURCES = \ kis_curve_framework.cc \ kis_tool_curve.cc \ tool_curves.cc \ @@ -21,7 +21,7 @@ chalktoolcurves_la_SOURCES = \ kis_tool_moutline.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolcurves.la +kde_module_LTLIBRARIES = chaltdetoolcurves.la noinst_HEADERS = \ kis_curve_framework.h \ @@ -33,13 +33,13 @@ noinst_HEADERS = \ kis_tool_bezier_select.h \ kis_tool_moutline.h -chalktoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolcurves_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolcurves_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolcurves_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolcurves_la_METASOURCES = AUTO +chaltdetoolcurves_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop b/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop index 76ea7b29e..218abbf4f 100644 --- a/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop +++ b/chalk/plugins/tools/tool_curves/chaltdetoolcurves.desktop @@ -32,5 +32,5 @@ Name[uk]=Криві Name[zh_TW]=曲線工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolcurves +X-TDE-Library=chaltdetoolcurves X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc index e18b096c2..b96fb7373 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc index bfa016ae9..5c47cd20a 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc index 4cc872911..90205d8d7 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc index f70d23af5..e4da1b371 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc index 91ae71b87..dd8a80765 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc index cf770196d..18aa06b0f 100644 --- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc +++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc index d941c2dc0..8e32617e2 100644 --- a/chalk/plugins/tools/tool_curves/tool_curves.cc +++ b/chalk/plugins/tools/tool_curves/tool_curves.cc @@ -42,7 +42,7 @@ typedef KGenericFactory ToolCurvesFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolcurves, ToolCurvesFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolcurves, ToolCurvesFactory( "chalk" ) ) ToolCurves::ToolCurves(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am index f775c4357..f8d699523 100644 --- a/chalk/plugins/tools/tool_filter/Makefile.am +++ b/chalk/plugins/tools/tool_filter/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolfilter.desktop +kde_services_DATA = chaltdetoolfilter.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,26 +9,26 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolfilter_la_SOURCES = \ +chaltdetoolfilter_la_SOURCES = \ kis_filterop.cc \ kis_tool_filter.cc \ tool_filter.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolfilter.la +kde_module_LTLIBRARIES = chaltdetoolfilter.la noinst_HEADERS = \ kis_filterop.h \ kis_tool_filter.h \ tool_filter.h -chalktoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolfilter_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolfilter_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolfilter_la_METASOURCES = AUTO +chaltdetoolfilter_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop b/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop index 991709b9f..f20c3ccae 100644 --- a/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop +++ b/chalk/plugins/tools/tool_filter/chaltdetoolfilter.desktop @@ -88,5 +88,5 @@ Comment[zh_CN]=过滤器工具和绘图集成 Comment[zh_TW]=濾鏡工具與繪圖操作 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolfilter +X-TDE-Library=chaltdetoolfilter X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc index 3364bfce4..84343b829 100644 --- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc index b5d7c4b56..912686c19 100644 --- a/chalk/plugins/tools/tool_filter/tool_filter.cc +++ b/chalk/plugins/tools/tool_filter/tool_filter.cc @@ -41,7 +41,7 @@ typedef KGenericFactory ToolFilterFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolfilter, ToolFilterFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolfilter, ToolFilterFactory( "chalk" ) ) ToolFilter::ToolFilter(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am index 534759916..df7491528 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolperspectivegrid.desktop +kde_services_DATA = chaltdetoolperspectivegrid.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,19 +9,19 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolperspectivegrid_la_SOURCES = \ +chaltdetoolperspectivegrid_la_SOURCES = \ tool_perspectivegrid.cc \ kis_tool_perspectivegrid.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolperspectivegrid.la +kde_module_LTLIBRARIES = chaltdetoolperspectivegrid.la noinst_HEADERS = \ tool_perspectivegrid.h \ kis_tool_perspectivegrid.h -chalktoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolperspectivegrid_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolperspectivegrid_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la diff --git a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop b/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop index 9899e2841..1538be0bf 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop +++ b/chalk/plugins/tools/tool_perspectivegrid/chaltdetoolperspectivegrid.desktop @@ -31,5 +31,5 @@ Name[uk]=Засіб ґратки перспективи Name[zh_TW]=透視格工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolperspectivegrid +X-TDE-Library=chaltdetoolperspectivegrid X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc index 97660392d..38c859c66 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc index 12615387f..f9f4a5aa2 100644 --- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc +++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPerspectiveGridFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivegrid, ToolPerspectiveGridFactory( "chalk" ) ) ToolPerspectiveGrid::ToolPerspectiveGrid(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am index c34b906c3..48c1fe7a9 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am +++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolperspectivetransform.desktop +kde_services_DATA = chaltdetoolperspectivetransform.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolperspectivetransform_la_SOURCES = \ +chaltdetoolperspectivetransform_la_SOURCES = \ tool_perspectivetransform.cc \ kis_tool_perspectivetransform.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolperspectivetransform.la +kde_module_LTLIBRARIES = chaltdetoolperspectivetransform.la noinst_HEADERS = \ tool_perspectivetransform.h \ kis_tool_perspectivetransform.h -chalktoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolperspectivetransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolperspectivetransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolperspectivetransform_la_METASOURCES = AUTO +chaltdetoolperspectivetransform_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop b/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop index 9f1a9b9c4..0717f235e 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop +++ b/chalk/plugins/tools/tool_perspectivetransform/chaltdetoolperspectivetransform.desktop @@ -33,5 +33,5 @@ Name[uk]=Засіб перспективи Name[zh_TW]=透視轉換工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolperspectivetransform +X-TDE-Library=chaltdetoolperspectivetransform X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc index ddd703643..75e688d1e 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc @@ -33,7 +33,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc index 24d716201..be96be71f 100644 --- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc +++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPerspectiveTransformFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolperspectivetransform, ToolPerspectiveTransformFactory( "chalk" ) ) ToolPerspectiveTransform::ToolPerspectiveTransform(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am index ad69e2cc2..c72db7007 100644 --- a/chalk/plugins/tools/tool_polygon/Makefile.am +++ b/chalk/plugins/tools/tool_polygon/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolpolygon.desktop +kde_services_DATA = chaltdetoolpolygon.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolpolygon_la_SOURCES = \ +chaltdetoolpolygon_la_SOURCES = \ tool_polygon.cc \ kis_tool_polygon.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolpolygon.la +kde_module_LTLIBRARIES = chaltdetoolpolygon.la noinst_HEADERS = \ tool_polygon.h \ kis_tool_polygon.h -chalktoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolpolygon_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolpolygon_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolpolygon_la_METASOURCES = AUTO +chaltdetoolpolygon_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop b/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop index 2b10ed9dd..f58ddc8ae 100644 --- a/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop +++ b/chalk/plugins/tools/tool_polygon/chaltdetoolpolygon.desktop @@ -48,5 +48,5 @@ Name[zh_CN]=多边形工具 Name[zh_TW]=多邊形工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolpolygon +X-TDE-Library=chaltdetoolpolygon X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc index 1cf41f9a8..bb13e10e1 100644 --- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc index 5ace60794..c5783cba0 100644 --- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc +++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolPolygonFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolpolygon, ToolPolygonFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolygon, ToolPolygonFactory( "chalk" ) ) ToolPolygon::ToolPolygon(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am index a058dc589..bd7786162 100644 --- a/chalk/plugins/tools/tool_polyline/Makefile.am +++ b/chalk/plugins/tools/tool_polyline/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolpolyline.desktop +kde_services_DATA = chaltdetoolpolyline.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,24 +9,24 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolpolyline_la_SOURCES = \ +chaltdetoolpolyline_la_SOURCES = \ tool_polyline.cc \ kis_tool_polyline.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolpolyline.la +kde_module_LTLIBRARIES = chaltdetoolpolyline.la noinst_HEADERS = \ tool_polyline.h \ kis_tool_polyline.h -chalktoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolpolyline_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolpolyline_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolpolyline_la_METASOURCES = AUTO +chaltdetoolpolyline_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop b/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop index b68aa879c..37846b0ee 100644 --- a/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop +++ b/chalk/plugins/tools/tool_polyline/chaltdetoolpolyline.desktop @@ -45,5 +45,5 @@ Name[zh_CN]=折线工具 Name[zh_TW]=任意線工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolpolyline +X-TDE-Library=chaltdetoolpolyline X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc index 6eb7817da..d16709f2d 100644 --- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc index fe9eb0024..34592d5ca 100644 --- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc +++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc @@ -40,7 +40,7 @@ typedef KGenericFactory ToolPolylineFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolpolyline, ToolPolylineFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolpolyline, ToolPolylineFactory( "chalk" ) ) ToolPolyline::ToolPolyline(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am index 84bb341e1..c7ac5a2ed 100644 --- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am +++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolselectsimilar.desktop +kde_services_DATA = chaltdetoolselectsimilar.desktop INCLUDES = -I$(srcdir)/../../../sdk \ -I$(srcdir)/../../../core \ @@ -9,18 +9,18 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(all_includes) -chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc +chaltdetoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h -kde_module_LTLIBRARIES = chalktoolselectsimilar.la +kde_module_LTLIBRARIES = chaltdetoolselectsimilar.la -chalktoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolselectsimilar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolselectsimilar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolselectsimilar_la_METASOURCES = AUTO +chaltdetoolselectsimilar_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop b/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop index cc83dccc8..32d28701a 100644 --- a/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop +++ b/chalk/plugins/tools/tool_selectsimilar/chaltdetoolselectsimilar.desktop @@ -39,5 +39,5 @@ Name[zh_CN]=选择相似颜色工具 Name[zh_TW]=選取近似色彩工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolselectsimilar +X-TDE-Library=chaltdetoolselectsimilar X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc index 4827af085..acaddb7c5 100644 --- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc index 95c315d80..85cf98bed 100644 --- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc +++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc @@ -39,7 +39,7 @@ #include "kis_tool_selectsimilar.h" typedef KGenericFactory SelectSimilarFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolselectsimilar, SelectSimilarFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolselectsimilar, SelectSimilarFactory( "chalk" ) ) SelectSimilar::SelectSimilar(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am index c8f65857c..c3de3a0d0 100644 --- a/chalk/plugins/tools/tool_star/Makefile.am +++ b/chalk/plugins/tools/tool_star/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktoolstar.desktop +kde_services_DATA = chaltdetoolstar.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktoolstar_la_SOURCES = \ +chaltdetoolstar_la_SOURCES = \ wdg_tool_star.ui \ tool_star.cc \ kis_tool_star.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktoolstar.la +kde_module_LTLIBRARIES = chaltdetoolstar.la noinst_HEADERS = \ tool_star.h \ kis_tool_star.h -chalktoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktoolstar_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetoolstar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetoolstar_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktoolstar_la_METASOURCES = AUTO +chaltdetoolstar_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop b/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop index f2b68b7a8..0f6bc2eb8 100644 --- a/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop +++ b/chalk/plugins/tools/tool_star/chaltdetoolstar.desktop @@ -48,5 +48,5 @@ Name[zh_CN]=星形工具 Name[zh_TW]=星形工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktoolstar +X-TDE-Library=chaltdetoolstar X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc index 8ba6a1722..88bd0cfd7 100644 --- a/chalk/plugins/tools/tool_star/kis_tool_star.cc +++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc index dc40edf9f..040eaf99c 100644 --- a/chalk/plugins/tools/tool_star/tool_star.cc +++ b/chalk/plugins/tools/tool_star/tool_star.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolStarFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) ) ToolStar::ToolStar(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am index 78aab31b8..016988f8a 100644 --- a/chalk/plugins/tools/tool_transform/Makefile.am +++ b/chalk/plugins/tools/tool_transform/Makefile.am @@ -1,4 +1,4 @@ -kde_services_DATA = chalktooltransform.desktop +kde_services_DATA = chaltdetooltransform.desktop # all_includes must remain last! INCLUDES = -I$(srcdir)/../../../sdk \ @@ -9,25 +9,25 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -chalktooltransform_la_SOURCES = \ +chaltdetooltransform_la_SOURCES = \ wdg_tool_transform.ui \ tool_transform.cc \ kis_tool_transform.cc # Install this plugin in the KDE modules directory -kde_module_LTLIBRARIES = chalktooltransform.la +kde_module_LTLIBRARIES = chaltdetooltransform.la noinst_HEADERS = \ tool_transform.h \ kis_tool_transform.h -chalktooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -chalktooltransform_la_LIBADD = ../../../libchalkcommon.la \ +chaltdetooltransform_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdetooltransform_la_LIBADD = ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalktooltransform_la_METASOURCES = AUTO +chaltdetooltransform_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop b/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop index 48fe8042d..74a2eebee 100644 --- a/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop +++ b/chalk/plugins/tools/tool_transform/chaltdetooltransform.desktop @@ -42,5 +42,5 @@ Name[zh_CN]=变形工具 Name[zh_TW]=變形工具 ServiceTypes=Chalk/Tool Type=Service -X-TDE-Library=chalktooltransform +X-TDE-Library=chaltdetooltransform X-Chalk-Version=2 diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc index bfad9c6b5..b4c9c1bdc 100644 --- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc index 328100205..a5aead786 100644 --- a/chalk/plugins/tools/tool_transform/tool_transform.cc +++ b/chalk/plugins/tools/tool_transform/tool_transform.cc @@ -39,7 +39,7 @@ typedef KGenericFactory ToolTransformFactory; -K_EXPORT_COMPONENT_FACTORY( chalktooltransform, ToolTransformFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetooltransform, ToolTransformFactory( "chalk" ) ) ToolTransform::ToolTransform(TQObject *parent, const char *name, const TQStringList &) diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc index b0a9851ed..126352b85 100644 --- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc +++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc index 8b54f7da7..97e2f2acf 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc @@ -67,7 +67,7 @@ ModifySelection::ModifySelection(TQObject *parent, const char *name, const TQStr // Selection manager takes ownership? TDEAction* a = new TDEAction(i18n("Grow Selection..."), 0, 0, this, TQT_SLOT(slotGrowSelection()), actionCollection(), "growselection"); - TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrinkselection"); + TDEAction* b = new TDEAction(i18n("Shrink Selection..."), 0, 0, this, TQT_SLOT(slotShrinkSelection()), actionCollection(), "shrintdeselection"); TDEAction* c = new TDEAction(i18n("Border Selection..."), 0, 0, this, TQT_SLOT(slotBorderSelection()), actionCollection(), "borderselection"); TQ_CHECK_PTR(a); diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc index 999aaaaa6..6870e0452 100644 --- a/chalk/plugins/viewplugins/modify_selection/modify_selection.rc +++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.rc @@ -3,7 +3,7 @@ &Select - + diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp index e3c4d680e..bcb0bf030 100644 --- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp +++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp @@ -28,10 +28,10 @@ #include #include -#include +#include #include #include -#include +#include #include #include diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am index 20333271d..295f6980e 100644 --- a/chalk/plugins/viewplugins/selectopaque/Makefile.am +++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am @@ -5,23 +5,23 @@ INCLUDES = -I$(srcdir)/../../../sdk \ $(KOFFICE_INCLUDES) \ $(all_includes) -kde_module_LTLIBRARIES = chalkselectopaque.la +kde_module_LTLIBRARIES = chaltdeselectopaque.la -chalkselectopaque_la_SOURCES = selectopaque.cc +chaltdeselectopaque_la_SOURCES = selectopaque.cc noinst_HEADERS = selectopaque.h -chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ +chaltdeselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \ ../../../../chalk/chalkcolor/libchalkcolor.la \ ../../../../chalk/core/libchalkimage.la \ ../../../../chalk/ui/libchalkui.la -chalkselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts +chaltdeselectopaque_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) chalkblurfilter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts chalkrcdir = $(kde_datadir)/chalkplugins chalkrc_DATA = selectopaque.rc EXTRA_DIST = $(chalkrc_DATA) -kde_services_DATA = chalkselectopaque.desktop +kde_services_DATA = chaltdeselectopaque.desktop -chalkselectopaque_la_METASOURCES = AUTO +chaltdeselectopaque_la_METASOURCES = AUTO KDE_OPTIONS = nofinal diff --git a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop index 654e809cf..db8e883cf 100644 --- a/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop +++ b/chalk/plugins/viewplugins/selectopaque/chaltdeselectopaque.desktop @@ -22,5 +22,5 @@ Name[uk]=Виділення непрозорих ділянок Name[zh_TW]=選擇不透明 ServiceTypes=Chalk/ViewPlugin Type=Service -X-TDE-Library=chalkselectopaque +X-TDE-Library=chaltdeselectopaque X-Chalk-Version=2 diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc index 57e32dcef..ced4fd9a6 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc @@ -51,7 +51,7 @@ #include "selectopaque.h" typedef KGenericFactory SelectOpaqueFactory; -K_EXPORT_COMPONENT_FACTORY( chalkselectopaque, SelectOpaqueFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdeselectopaque, SelectOpaqueFactory( "chalk" ) ) SelectOpaque::SelectOpaque(TQObject *parent, const char *name, const TQStringList &) : KParts::Plugin(parent, name) diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc index a4809d597..6ff21abf9 100644 --- a/chalk/plugins/viewplugins/selectopaque/selectopaque.rc +++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.rc @@ -1,5 +1,5 @@ - + Select diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc index 2d0dd8564..f4af08a14 100644 --- a/chalk/ui/kis_controlframe.cc +++ b/chalk/ui/kis_controlframe.cc @@ -29,14 +29,14 @@ #include #include -#include -#include +#include +#include #include #include #include #include #include -#include +#include #include "kis_resourceserver.h" #include "kis_controlframe.h" diff --git a/chalk/ui/kis_controlframe.h b/chalk/ui/kis_controlframe.h index d052fc77c..1c07b0669 100644 --- a/chalk/ui/kis_controlframe.h +++ b/chalk/ui/kis_controlframe.h @@ -24,7 +24,7 @@ #include -#include +#include #include diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc index 4428b0f4f..b7b84d881 100644 --- a/chalk/ui/kis_filter_manager.cc +++ b/chalk/ui/kis_filter_manager.cc @@ -26,7 +26,7 @@ #include #include -#include "kaction.h" +#include "tdeaction.h" #include "kis_part_layer.h" #include "kis_id.h" diff --git a/chalk/ui/kis_filter_manager.h b/chalk/ui/kis_filter_manager.h index 602ebd8ad..f39e31b22 100644 --- a/chalk/ui/kis_filter_manager.h +++ b/chalk/ui/kis_filter_manager.h @@ -23,7 +23,7 @@ #include "tqobject.h" #include "tqptrlist.h" #include "tqsignalmapper.h" -#include "kactionclasses.h" +#include "tdeactionclasses.h" #include "kis_image.h" #include "kis_selection.h" diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc index 531b320e8..3325517a3 100644 --- a/chalk/ui/kis_gradient_slider_widget.cc +++ b/chalk/ui/kis_gradient_slider_widget.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "kis_autogradient_resource.h" diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp index 83969e78c..04adc0c22 100644 --- a/chalk/ui/kis_grid_manager.cpp +++ b/chalk/ui/kis_grid_manager.cpp @@ -30,7 +30,7 @@ #include -#include +#include #include #include diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc index 34a5e411b..e5b8dea4f 100644 --- a/chalk/ui/kis_layerbox.cc +++ b/chalk/ui/kis_layerbox.cc @@ -38,7 +38,7 @@ #include #include -#include +#include #include #include #include diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc index 3f1ff0181..4fdd9f1f0 100644 --- a/chalk/ui/kis_layerlist.cc +++ b/chalk/ui/kis_layerlist.cc @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc index 9751e2462..b2fcc2124 100644 --- a/chalk/ui/kis_paintop_box.cc +++ b/chalk/ui/kis_paintop_box.cc @@ -25,12 +25,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc index 398c3b8ae..487195ddf 100644 --- a/chalk/ui/kis_palette_view.cc +++ b/chalk/ui/kis_palette_view.cc @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc index 2719fab2f..ec3558b82 100644 --- a/chalk/ui/kis_palette_widget.cc +++ b/chalk/ui/kis_palette_widget.cc @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp index 174e13950..dae4bd464 100644 --- a/chalk/ui/kis_perspective_grid_manager.cpp +++ b/chalk/ui/kis_perspective_grid_manager.cpp @@ -20,7 +20,7 @@ #include "kis_perspective_grid_manager.h" -#include +#include #include #include diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc index 718dbf029..ca17d1adf 100644 --- a/chalk/ui/kis_selection_manager.cc +++ b/chalk/ui/kis_selection_manager.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cc index db5e8c462..8666f1a19 100644 --- a/chalk/ui/kis_text_brush.cc +++ b/chalk/ui/kis_text_brush.cc @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include "kis_text_brush.h" diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc index 807b8ffcc..53b8fceeb 100644 --- a/chalk/ui/kis_tool.cc +++ b/chalk/ui/kis_tool.cc @@ -18,7 +18,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_tool.h b/chalk/ui/kis_tool.h index 45f3fbd12..c217e3071 100644 --- a/chalk/ui/kis_tool.h +++ b/chalk/ui/kis_tool.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "kis_shared_ptr_vector.h" #include "kis_canvas_observer.h" diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc index 743113915..eb961b33b 100644 --- a/chalk/ui/kis_tool_dummy.cc +++ b/chalk/ui/kis_tool_dummy.cc @@ -18,10 +18,10 @@ #include #include -#include +#include #include -#include +#include #include #include "kis_canvas_controller.h" diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h index 24cf5d727..bc5171a8a 100644 --- a/chalk/ui/kis_tool_factory.h +++ b/chalk/ui/kis_tool_factory.h @@ -23,7 +23,7 @@ #include "kis_id.h" #include "kis_types.h" -#include "kactioncollection.h" +#include "tdeactioncollection.h" class KisToolFactory : public TDEShared { diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc index a44acfbc4..fe6ac1a21 100644 --- a/chalk/ui/kis_tool_freehand.cc +++ b/chalk/ui/kis_tool_freehand.cc @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cc index 32e57e129..036e538fc 100644 --- a/chalk/ui/kis_tool_registry.cc +++ b/chalk/ui/kis_tool_registry.cc @@ -17,7 +17,7 @@ */ #include "kdebug.h" -#include +#include #include #include #include diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc index 357be9d2a..dd406ac75 100644 --- a/chalk/ui/kis_view.cc +++ b/chalk/ui/kis_view.cc @@ -45,7 +45,7 @@ #include #include #include -#include +#include #include #include #include @@ -58,10 +58,10 @@ #include #include #include -#include +#include #include #include -#include +#include #include #include #include diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp index 3db739d41..5b1d4442f 100644 --- a/chalk/ui/kobirdeyepanel.cpp +++ b/chalk/ui/kobirdeyepanel.cpp @@ -29,8 +29,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp index 790765b44..6db5a21ad 100644 --- a/chalk/ui/layerlist.cpp +++ b/chalk/ui/layerlist.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include class LayerItemIterator: public TQListViewItemIterator diff --git a/chalk/ui/layerlist.h b/chalk/ui/layerlist.h index b51a1c682..03284849a 100644 --- a/chalk/ui/layerlist.h +++ b/chalk/ui/layerlist.h @@ -22,7 +22,7 @@ #define LAYERLIST_H #include -#include +#include class TQMouseEvent; class TQString; diff --git a/chalk/ui/wdgbirdeye.ui b/chalk/ui/wdgbirdeye.ui index 0f18a51b8..fcc464a95 100644 --- a/chalk/ui/wdgbirdeye.ui +++ b/chalk/ui/wdgbirdeye.ui @@ -267,7 +267,7 @@ TDEToolBar -
ktoolbar.h
+
tdetoolbar.h
20 100 @@ -298,7 +298,7 @@ BarIcon - ktoolbar.h + tdetoolbar.h knuminput.h diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook index 029af8d7e..8b31aa96a 100644 --- a/doc/chalk/developers-plugins.docbook +++ b/doc/chalk/developers-plugins.docbook @@ -306,7 +306,7 @@ And an implementation file: typedef KGenericFactory<ToolStar> ToolStarFactory; -K_EXPORT_COMPONENT_FACTORY( chalktoolstar, ToolStarFactory( "chalk" ) ) +K_EXPORT_COMPONENT_FACTORY( chaltdetoolstar, ToolStarFactory( "chalk" ) ) ToolStar::ToolStar(QObject *parent, const char *name, const QStringList &) @@ -880,7 +880,7 @@ A good example of a tool is the star tool: kis_tool_star.cc Makefile.am tool_star_cursor.png wdg_tool_star.ui kis_tool_star.h Makefile.in tool_star.h -chalktoolstar.desktop tool_star.cc tool_star.png +chaltdetoolstar.desktop tool_star.cc tool_star.png diff --git a/example/example_view.cc b/example/example_view.cc index eab4fd7f3..57d26b07f 100644 --- a/example/example_view.cc +++ b/example/example_view.cc @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/filters/chalk/pdf/kis_pdf_import_widget.cpp b/filters/chalk/pdf/kis_pdf_import_widget.cpp index c395d9e90..572efbd5a 100644 --- a/filters/chalk/pdf/kis_pdf_import_widget.cpp +++ b/filters/chalk/pdf/kis_pdf_import_widget.cpp @@ -27,7 +27,7 @@ // KDE's headers #include -#include +#include #include KisPDFImportWidget::KisPDFImportWidget(Poppler::Document* pdfDoc, TQWidget * parent, const char * name) diff --git a/filters/chalk/pdf/pdfimportwidgetbase.ui b/filters/chalk/pdf/pdfimportwidgetbase.ui index e624cec8b..7c6c74c8e 100644 --- a/filters/chalk/pdf/pdfimportwidgetbase.ui +++ b/filters/chalk/pdf/pdfimportwidgetbase.ui @@ -316,6 +316,6 @@ kcombobox.h knuminput.h knuminput.h - klistbox.h + tdelistbox.h diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc index ac7259820..0c0255252 100644 --- a/filters/kspread/kexi/kspread_kexiimport.cc +++ b/filters/kspread/kexi/kspread_kexiimport.cc @@ -52,7 +52,7 @@ #include #include #include -#include +#include #include typedef KGenericFactory KSpreadKexiImportFactory; diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc index 0c91952c3..090b4de1b 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialog.cc +++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui index b58a86783..2286506ed 100644 --- a/filters/kspread/kexi/kspread_kexiimportdialogbase.ui +++ b/filters/kspread/kexi/kspread_kexiimportdialogbase.ui @@ -239,6 +239,6 @@ - klistview.h + tdelistview.h diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc index 9c6e04324..07957af9f 100644 --- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc +++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filters/kspread/latex/export/latexexportdia.ui b/filters/kspread/latex/export/latexexportdia.ui index 85477aa23..530ec8cae 100644 --- a/filters/kspread/latex/export/latexexportdia.ui +++ b/filters/kspread/latex/export/latexexportdia.ui @@ -668,7 +668,7 @@ klineedit.h kpushbutton.h kcombobox.h - klistbox.h - klistbox.h + tdelistbox.h + tdelistbox.h diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc index cbde5f5da..eac7cd6ff 100644 --- a/filters/kword/latex/export/kwordlatexexportdia.cc +++ b/filters/kword/latex/export/kwordlatexexportdia.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filters/kword/latex/export/latexexportdia.ui b/filters/kword/latex/export/latexexportdia.ui index 85477aa23..530ec8cae 100644 --- a/filters/kword/latex/export/latexexportdia.ui +++ b/filters/kword/latex/export/latexexportdia.ui @@ -668,7 +668,7 @@ klineedit.h kpushbutton.h kcombobox.h - klistbox.h - klistbox.h + tdelistbox.h + tdelistbox.h diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc index 56f7a2e0c..923b2deed 100644 --- a/filters/xsltfilter/export/xsltexportdia.cc +++ b/filters/xsltfilter/export/xsltexportdia.cc @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc index e232d26e9..67d6aec03 100644 --- a/filters/xsltfilter/import/xsltimportdia.cc +++ b/filters/xsltfilter/import/xsltimportdia.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/karbon/TODO b/karbon/TODO index 1c98b1da5..c09f9a595 100644 --- a/karbon/TODO +++ b/karbon/TODO @@ -24,7 +24,7 @@ BIG TOPICS: - help text - options widget - command - - kaction? + - tdeaction? 2) selection redesign - unify object and or node selection? - achieve tight selection (exact selection-object collision test) diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc index a793115de..578261851 100644 --- a/karbon/commands/vcommand.cc +++ b/karbon/commands/vcommand.cc @@ -19,7 +19,7 @@ */ -#include "kaction.h" +#include "tdeaction.h" #include "klocale.h" #include "vcommand.h" diff --git a/karbon/karbon_tool_factory.h b/karbon/karbon_tool_factory.h index 1589f0650..373396791 100644 --- a/karbon/karbon_tool_factory.h +++ b/karbon/karbon_tool_factory.h @@ -21,7 +21,7 @@ #ifndef KARBON_TOOL_FACTORY_H_ #define KARBON_TOOL_FACTORY_H_ -#include "kactioncollection.h" +#include "tdeactioncollection.h" #include "karbon_view.h" #include #include diff --git a/karbon/karbon_tool_registry.cc b/karbon/karbon_tool_registry.cc index 6c0506aed..bc699d455 100644 --- a/karbon/karbon_tool_registry.cc +++ b/karbon/karbon_tool_registry.cc @@ -19,8 +19,8 @@ */ #include -#include -#include +#include +#include #include "vtool.h" #include "karbon_part.h" diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc index 42d6f51ba..432d243dc 100644 --- a/karbon/karbon_view.cc +++ b/karbon/karbon_view.cc @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc index ca3ba1eaa..50a81e157 100644 --- a/karbon/tools/vtexttool.cc +++ b/karbon/tools/vtexttool.cc @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/karbon/vtool.h b/karbon/vtool.h index 48533ec6b..4b085cba4 100644 --- a/karbon/vtool.h +++ b/karbon/vtool.h @@ -21,7 +21,7 @@ #define __VTOOL_H__ #include -#include +#include #include #include #include diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cc index 25cb58e64..42c4f0588 100644 --- a/karbon/widgets/vcolorslider.cc +++ b/karbon/widgets/vcolorslider.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include "vcolorslider.h" diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc index 22c58b435..8f0c4fc33 100644 --- a/karbon/widgets/vgradienttabwidget.cc +++ b/karbon/widgets/vgradienttabwidget.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include "vgradientwidget.h" diff --git a/karbon/widgets/vselecttoolbar.h b/karbon/widgets/vselecttoolbar.h index 17a389818..5d33c766a 100644 --- a/karbon/widgets/vselecttoolbar.h +++ b/karbon/widgets/vselecttoolbar.h @@ -22,7 +22,7 @@ #ifndef VSELECTTOOLBAR_H #define VSELECTTOOLBAR_H -#include +#include class KoUnitDoubleSpinBox; class KarbonView; diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc index c4b2cbc18..38cd56225 100644 --- a/kchart/kchartColorConfigPage.cc +++ b/kchart/kchartColorConfigPage.cc @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include "kchart_params.h" #include diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc index cbe1f30fa..5105b0f77 100644 --- a/kchart/kchartDataConfigPage.cc +++ b/kchart/kchartDataConfigPage.cc @@ -39,7 +39,7 @@ #include #include -#include +#include // For IRIX namespace std {} diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc index e5fdde2f7..bc0083a97 100644 --- a/kchart/kchartFontConfigPage.cc +++ b/kchart/kchartFontConfigPage.cc @@ -35,7 +35,7 @@ #include #include -#include +#include // For IRIX namespace std {} diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc index 36412a450..30a354091 100644 --- a/kchart/kchartHeaderFooterConfigPage.cc +++ b/kchart/kchartHeaderFooterConfigPage.cc @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "kchart_params.h" diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc index 154ce2a72..b469ab9b0 100644 --- a/kchart/kchartLegendConfigPage.cc +++ b/kchart/kchartLegendConfigPage.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc index 2fc0b0aff..ea9874d5a 100644 --- a/kchart/kchartParameterConfigPage.cc +++ b/kchart/kchartParameterConfigPage.cc @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include "kdchart/KDChartAxisParams.h" diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc index abef14c92..5c945a13b 100644 --- a/kchart/kchartPieConfigPage.cc +++ b/kchart/kchartPieConfigPage.cc @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc index 9ac1a2653..c745a16a1 100644 --- a/kchart/kchartWizardLabelsLegendPage.cc +++ b/kchart/kchartWizardLabelsLegendPage.cc @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc index cf0e4a096..5043313fc 100644 --- a/kchart/kchartWizardSetupAxesPage.cc +++ b/kchart/kchartWizardSetupAxesPage.cc @@ -9,7 +9,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc index 62fd38255..1a40d1a95 100644 --- a/kchart/kchart_view.cc +++ b/kchart/kchart_view.cc @@ -11,7 +11,7 @@ #include #include // For TQByteArray -#include +#include #include #include #include diff --git a/kexi/core/kexiactionproxy.cpp b/kexi/core/kexiactionproxy.cpp index 720044342..fd3e2b2c9 100644 --- a/kexi/core/kexiactionproxy.cpp +++ b/kexi/core/kexiactionproxy.cpp @@ -21,9 +21,9 @@ #include "kexiactionproxy_p.h" #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/kexi/core/kexiactionproxy.h b/kexi/core/kexiactionproxy.h index d9868976e..aa6498e09 100644 --- a/kexi/core/kexiactionproxy.h +++ b/kexi/core/kexiactionproxy.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "kexiproject.h" #include "kexisharedactionhost.h" diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp index e806aaafb..63f72d87e 100644 --- a/kexi/core/kexicontexthelp.cpp +++ b/kexi/core/kexicontexthelp.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/core/kexisharedactionhost.h b/kexi/core/kexisharedactionhost.h index 5b2046d6a..9a7ada11c 100644 --- a/kexi/core/kexisharedactionhost.h +++ b/kexi/core/kexisharedactionhost.h @@ -26,7 +26,7 @@ #include #include -#include +#include class TDEShortcut; class KGuiItem; diff --git a/kexi/core/kexisharedactionhost_p.h b/kexi/core/kexisharedactionhost_p.h index eef28a194..9c93a548b 100644 --- a/kexi/core/kexisharedactionhost_p.h +++ b/kexi/core/kexisharedactionhost_p.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include "kexiactionproxy.h" @@ -34,7 +34,7 @@ class KexiVolatileActionData { public: KexiVolatileActionData() { plugged=false; } -// TDEAction *kaction; +// TDEAction *tdeaction; bool plugged : 1; }; diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp index 5a79929e3..3bc22a7a5 100644 --- a/kexi/core/kexiuseraction.cpp +++ b/kexi/core/kexiuseraction.cpp @@ -1,6 +1,6 @@ #include #include -#include +#include #include diff --git a/kexi/core/kexiuseraction.h b/kexi/core/kexiuseraction.h index 602d57514..c64e08cd7 100644 --- a/kexi/core/kexiuseraction.h +++ b/kexi/core/kexiuseraction.h @@ -1,7 +1,7 @@ #ifndef KEXIUSERACTION_H #define KEXIUSERACTION_H -#include +#include #include "kexiuseractionmethod.h" diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js index d7274acb4..12636f71e 100644 --- a/kexi/doc/dev/TODO-Kexi-js +++ b/kexi/doc/dev/TODO-Kexi-js @@ -815,7 +815,7 @@ Key on the main menu, OR use Property Editor. - In the Property Editor, is not obvious how to change a boolean property. Alt+DownArrow does not work. - It is not possible to change the value of a -property in the property editor that has a picklist of possible values, for example, +property in the property editor that has a pictdelist of possible values, for example, SubType. Alt+DownArrow does not work. - When creating a query, it is not possible to add a table to the query. - Not possible to select a column, table, diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp index fece5065a..29cbfcaa7 100644 --- a/kexi/formeditor/commands.cpp +++ b/kexi/formeditor/commands.cpp @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include "formIO.h" #include "container.h" diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp index 246940c78..3f7d201b9 100644 --- a/kexi/formeditor/container.cpp +++ b/kexi/formeditor/container.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include // for abs() diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp index 0287135ed..eca070320 100644 --- a/kexi/formeditor/editlistviewdialog.cpp +++ b/kexi/formeditor/editlistviewdialog.cpp @@ -19,9 +19,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp index 1669b329c..ebc9606fe 100644 --- a/kexi/formeditor/factories/stdwidgetfactory.cpp +++ b/kexi/formeditor/factories/stdwidgetfactory.cpp @@ -25,9 +25,9 @@ #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -219,7 +219,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wListBox->setPixmap("listbox"); wListBox->setClassName("TDEListBox"); wListBox->addAlternateClassName(TQLISTBOX_OBJECT_NAME_STRING); - wListBox->setIncludeFileName("klistbox.h"); + wListBox->setIncludeFileName("tdelistbox.h"); wListBox->setName(i18n("List Box")); wListBox->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "listBox")); @@ -241,7 +241,7 @@ StdWidgetFactory::StdWidgetFactory(TQObject *parent, const char *, const TQStrin wListView->setPixmap("listview"); wListView->setClassName("TDEListView"); wListView->addAlternateClassName(TQLISTVIEW_OBJECT_NAME_STRING); - wListView->setIncludeFileName("klistview.h"); + wListView->setIncludeFileName("tdelistview.h"); wListView->setName(i18n("List View")); wListView->setNamePrefix( i18n("Widget name. This string will be used to name widgets of this class. It must _not_ contain white spaces and non latin1 characters.", "listView")); diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp index 313444192..1e185d6d9 100644 --- a/kexi/formeditor/form.cpp +++ b/kexi/formeditor/form.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include "container.h" diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp index 993b24515..264b3bad7 100644 --- a/kexi/formeditor/formIO.cpp +++ b/kexi/formeditor/formIO.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "form.h" #include "container.h" diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp index 284ce4054..b38751698 100644 --- a/kexi/formeditor/formmanager.cpp +++ b/kexi/formeditor/formmanager.cpp @@ -33,26 +33,26 @@ #include #include -#include +#include #include -#include +#include #include -#include +#include #include #include #include -#include +#include #include #include #include #include #include #include -#include +#include #include #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,9) && !defined(TQ_WS_WIN) -# include +# include #endif #include "widgetpropertyset.h" diff --git a/kexi/formeditor/libactionwidget.h b/kexi/formeditor/libactionwidget.h index c546ac9d9..e396a6e7c 100644 --- a/kexi/formeditor/libactionwidget.h +++ b/kexi/formeditor/libactionwidget.h @@ -22,7 +22,7 @@ #define LIBACTIONWIDGET_H -#include +#include namespace KFormDesigner { diff --git a/kexi/formeditor/objecttreeview.h b/kexi/formeditor/objecttreeview.h index e1b6932b2..8236f8771 100644 --- a/kexi/formeditor/objecttreeview.h +++ b/kexi/formeditor/objecttreeview.h @@ -20,7 +20,7 @@ #ifndef OBJECTTREEVIEW_H #define OBJECTTREEVIEW_H -#include +#include namespace KFormDesigner { diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp index 1461536d1..291b96dc3 100644 --- a/kexi/formeditor/richtextdialog.cpp +++ b/kexi/formeditor/richtextdialog.cpp @@ -18,10 +18,10 @@ */ #include -#include -#include +#include +#include #include -#include +#include #include #include diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp index c897f2430..83b63cc8a 100644 --- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp +++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp index ab1592e1b..87f78c4ce 100644 --- a/kexi/formeditor/test/kfd_mainwindow.cpp +++ b/kexi/formeditor/test/kfd_mainwindow.cpp @@ -16,7 +16,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp index 38d99e5a0..176db0169 100644 --- a/kexi/formeditor/test/kfd_part.cpp +++ b/kexi/formeditor/test/kfd_part.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp index 9bec64ba4..9537085ed 100644 --- a/kexi/formeditor/widgetfactory.cpp +++ b/kexi/formeditor/widgetfactory.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include "richtextdialog.h" #include "editlistviewdialog.h" diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp index a21c4f3f8..fcb0ffe64 100644 --- a/kexi/formeditor/widgetlibrary.cpp +++ b/kexi/formeditor/widgetlibrary.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include "widgetfactory.h" #include "widgetlibrary.h" diff --git a/kexi/kexiutils/debuggui.cpp b/kexi/kexiutils/debuggui.cpp index 4119af75a..08884ff01 100644 --- a/kexi/kexiutils/debuggui.cpp +++ b/kexi/kexiutils/debuggui.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp index 8ca17429a..255e18829 100644 --- a/kexi/main/kexifinddialog.cpp +++ b/kexi/main/kexifinddialog.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp index 4bfaef61a..2dd9ebe15 100644 --- a/kexi/main/keximainwindowimpl.cpp +++ b/kexi/main/keximainwindowimpl.cpp @@ -38,9 +38,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include @@ -58,7 +58,7 @@ #include #include #include -#include +#include #include #include @@ -102,7 +102,7 @@ //Extreme verbose debug #if defined(TQ_WS_WIN) -# include +# include # include //# define KexiVDebug kdDebug() #endif diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp index 7ca0ceb43..49ebd9fde 100644 --- a/kexi/main/kexinewstuff.cpp +++ b/kexi/main/kexinewstuff.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp index 66fe00280..365609599 100644 --- a/kexi/main/printing/kexisimpleprintingengine.cpp +++ b/kexi/main/printing/kexisimpleprintingengine.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp index de3f64e2f..0388eebe2 100644 --- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp +++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp index e587556b7..0d6634ab9 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.h b/kexi/main/printing/kexisimpleprintpreviewwindow.h index c966553f2..5e42bf551 100644 --- a/kexi/main/printing/kexisimpleprintpreviewwindow.h +++ b/kexi/main/printing/kexisimpleprintpreviewwindow.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include class KexiSimplePrintPreviewScrollView; diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp index 22b09eeff..2558b4e7d 100644 --- a/kexi/main/startup/KexiConnSelector.cpp +++ b/kexi/main/startup/KexiConnSelector.cpp @@ -35,10 +35,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include diff --git a/kexi/main/startup/KexiConnSelector.h b/kexi/main/startup/KexiConnSelector.h index ab4ed10a1..7bd3c8fb6 100644 --- a/kexi/main/startup/KexiConnSelector.h +++ b/kexi/main/startup/KexiConnSelector.h @@ -25,7 +25,7 @@ #include "KexiStartupFileDialog.h" #include -#include +#include #include diff --git a/kexi/main/startup/KexiNewPrjTypeSelector.ui b/kexi/main/startup/KexiNewPrjTypeSelector.ui index 9ea3a0db9..5e4e02839 100644 --- a/kexi/main/startup/KexiNewPrjTypeSelector.ui +++ b/kexi/main/startup/KexiNewPrjTypeSelector.ui @@ -89,6 +89,6 @@ - klistview.h + tdelistview.h diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp index 44fb70265..e7f613e68 100644 --- a/kexi/main/startup/KexiNewProjectWizard.cpp +++ b/kexi/main/startup/KexiNewProjectWizard.cpp @@ -38,7 +38,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/main/startup/KexiStartupDialogTemplatesPage.h b/kexi/main/startup/KexiStartupDialogTemplatesPage.h index 07b8b663f..74591986a 100644 --- a/kexi/main/startup/KexiStartupDialogTemplatesPage.h +++ b/kexi/main/startup/KexiStartupDialogTemplatesPage.h @@ -20,7 +20,7 @@ #ifndef KexiStartupDialogTemplatesPage_h #define KexiStartupDialogTemplatesPage_h -#include +#include #include /*! Helper class for displaying templates set with description. */ diff --git a/kexi/main/startup/KexiStartupFileDialog_win.cpp b/kexi/main/startup/KexiStartupFileDialog_win.cpp index 29567ce02..ff2981f79 100644 --- a/kexi/main/startup/KexiStartupFileDialog_win.cpp +++ b/kexi/main/startup/KexiStartupFileDialog_win.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include diff --git a/kexi/plugins/forms/kexiactionselectiondialog.cpp b/kexi/plugins/forms/kexiactionselectiondialog.cpp index 59cfefa52..4ba3b8592 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog.cpp +++ b/kexi/plugins/forms/kexiactionselectiondialog.cpp @@ -27,8 +27,8 @@ #include #include -#include -#include +#include +#include #include #include #include @@ -41,7 +41,7 @@ #include #include -#include +#include #include #include #include @@ -194,7 +194,7 @@ public: TQListViewItem *item = new ActionSelectorDialogListItem("noaction", this, i18n("No action") ); const TQPixmap noIcon( KexiUtils::emptyIcon(KIcon::Small) ); item->setPixmap(0, noIcon); - item = new ActionSelectorDialogListItem("kaction", this, i18n("Application actions") ); + item = new ActionSelectorDialogListItem("tdeaction", this, i18n("Application actions") ); item->setPixmap(0, SmallIcon("form_action")); KexiPart::PartInfoList *pl = Kexi::partManager().partInfoList(); @@ -331,7 +331,7 @@ class KexiActionSelectionDialog::KexiActionSelectionDialogPrivate { public: KexiActionSelectionDialogPrivate() - : kactionPageWidget(0), kactionListView(0), objectsListView(0) + : tdeactionPageWidget(0), tdeactionListView(0), objectsListView(0) , currentFormActionsPageWidget(0) , currentFormActionsListView(0) , secondAnd3rdColumnMainWidget(0) @@ -376,8 +376,8 @@ public: KexiMainWindow* mainWin; TQString actionWidgetName; ActionCategoriesListView* actionCategoriesListView; //!< for column #1 - TQWidget *kactionPageWidget; - TDEActionsListView* kactionListView; //!< for column #2 + TQWidget *tdeactionPageWidget; + TDEActionsListView* tdeactionListView; //!< for column #2 KexiBrowser* objectsListView; //!< for column #2 TQWidget *currentFormActionsPageWidget; //!< for column #2 CurrentFormActionsListView* currentFormActionsListView; //!< for column #2 @@ -419,9 +419,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ \______________________________________________/ glyr [a]- TQWidgetStack *secondAnd3rdColumnStack, - - for displaying TDEActions, the stack contains d->kactionPageWidget TQWidget + - for displaying TDEActions, the stack contains d->tdeactionPageWidget TQWidget - for displaying objects, the stack contains secondAnd3rdColumnMainWidget TQWidget and TQGridLayout *secondAnd3rdColumnGrLyr - - kactionPageWidget contains only a TQVBoxLayout and label+kactionListView + - tdeactionPageWidget contains only a TQVBoxLayout and label+tdeactionListView */ d->glyr = new TQGridLayout(mainWidget, 2, 2, KDialog::marginHint(), KDialog::spacingHint()); d->glyr->setRowStretch(1, 1); @@ -495,9 +495,9 @@ KexiActionSelectionDialog::KexiActionSelectionDialog(KexiMainWindow* mainWin, TQ KexiPart::Info* partInfo = action.decodeString(actionType, actionArg, ok); if (ok) { d->actionCategoriesListView->selectAction(actionType); - if (actionType=="kaction") { - d->kactionListView->selectAction(actionArg); - d->kactionListView->setFocus(); + if (actionType=="tdeaction") { + d->tdeactionListView->selectAction(actionArg); + d->tdeactionListView->setFocus(); } else if (actionType=="currentForm") { d->currentFormActionsListView->selectAction(actionArg); @@ -574,34 +574,34 @@ void KexiActionSelectionDialog::slotActionToExecuteItemSelected(TQListViewItem*) void KexiActionSelectionDialog::slotActionCategorySelected(TQListViewItem* item) { ActionSelectorDialogListItem *simpleItem = dynamic_cast(item); - // simple case: part-less item, e.g. kaction: + // simple case: part-less item, e.g. tdeaction: if (simpleItem) { d->updateSelectActionToBeExecutedMessage(simpleItem->data); TQString selectActionToBeExecutedMsg( i18n("&Select action to be executed after clicking \"%1\" button:")); // msg for a label - if (simpleItem->data == "kaction") { - if (!d->kactionPageWidget) { + if (simpleItem->data == "tdeaction") { + if (!d->tdeactionPageWidget) { //create lbl+list view with a vlayout - d->kactionPageWidget = new TQWidget(); - d->kactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); - TQVBoxLayout *vlyr = new TQVBoxLayout(d->kactionPageWidget, 0, KDialog::spacingHint()); - d->kactionListView = new TDEActionsListView(d->kactionPageWidget, d->mainWin); - d->kactionListView->init(); - TQLabel *lbl = new TQLabel(d->kactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), - d->kactionPageWidget); + d->tdeactionPageWidget = new TQWidget(); + d->tdeactionPageWidget->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Minimum); + TQVBoxLayout *vlyr = new TQVBoxLayout(d->tdeactionPageWidget, 0, KDialog::spacingHint()); + d->tdeactionListView = new TDEActionsListView(d->tdeactionPageWidget, d->mainWin); + d->tdeactionListView->init(); + TQLabel *lbl = new TQLabel(d->tdeactionListView, selectActionToBeExecutedMsg.arg(d->actionWidgetName), + d->tdeactionPageWidget); lbl->setAlignment(TQt::AlignTop|TQt::AlignLeft|TQt::WordBreak); lbl->setMinimumHeight(lbl->fontMetrics().height()*2); vlyr->addWidget(lbl); - vlyr->addWidget(d->kactionListView); - d->secondAnd3rdColumnStack->addWidget(d->kactionPageWidget); - connect(d->kactionListView, TQT_SIGNAL(executed(TQListViewItem*)), + vlyr->addWidget(d->tdeactionListView); + d->secondAnd3rdColumnStack->addWidget(d->tdeactionPageWidget); + connect(d->tdeactionListView, TQT_SIGNAL(executed(TQListViewItem*)), this, TQT_SLOT(slotTDEActionItemExecuted(TQListViewItem*))); - connect( d->kactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), + connect( d->tdeactionListView, TQT_SIGNAL(selectionChanged(TQListViewItem*)), this, TQT_SLOT(slotTDEActionItemSelected(TQListViewItem*))); } d->setActionToExecuteSectionVisible(false); - d->raiseWidget(d->kactionPageWidget); - slotTDEActionItemSelected(d->kactionListView->selectedItem()); //to refresh column #3 + d->raiseWidget(d->tdeactionPageWidget); + slotTDEActionItemSelected(d->tdeactionListView->selectedItem()); //to refresh column #3 } else if (simpleItem->data == "currentForm") { if (!d->currentFormActionsPageWidget) { @@ -669,12 +669,12 @@ KexiFormEventAction::ActionData KexiActionSelectionDialog::currentAction() const KexiFormEventAction::ActionData data; ActionSelectorDialogListItem *simpleItem = dynamic_cast( d->actionCategoriesListView->selectedItem()); - // simple case: part-less item, e.g. kaction: + // simple case: part-less item, e.g. tdeaction: if (simpleItem) { - if (simpleItem->data == "kaction") { - if (d->kactionListView->selectedItem()) { - data.string = TQString("kaction:") - + dynamic_cast( d->kactionListView->selectedItem() )->data; + if (simpleItem->data == "tdeaction") { + if (d->tdeactionListView->selectedItem()) { + data.string = TQString("tdeaction:") + + dynamic_cast( d->tdeactionListView->selectedItem() )->data; return data; } } diff --git a/kexi/plugins/forms/kexiactionselectiondialog_p.h b/kexi/plugins/forms/kexiactionselectiondialog_p.h index f0527132b..670ede5a0 100644 --- a/kexi/plugins/forms/kexiactionselectiondialog_p.h +++ b/kexi/plugins/forms/kexiactionselectiondialog_p.h @@ -20,7 +20,7 @@ #ifndef KEXIACTIONSELECTIONDIALOG_P_H #define KEXIACTIONSELECTIONDIALOG_P_H -#include +#include //! @internal class ActionsListViewBase : public TDEListView diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp index b89031a75..c98ca67aa 100644 --- a/kexi/plugins/forms/kexidatasourcepage.cpp +++ b/kexi/plugins/forms/kexidatasourcepage.cpp @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp index 8bb55bce9..9f63c09ca 100644 --- a/kexi/plugins/forms/kexidbfactory.cpp +++ b/kexi/plugins/forms/kexidbfactory.cpp @@ -28,7 +28,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp index 365f5cb4c..4d1f0ec76 100644 --- a/kexi/plugins/forms/kexiformeventhandler.cpp +++ b/kexi/plugins/forms/kexiformeventhandler.cpp @@ -55,7 +55,7 @@ KexiPart::Info* KexiFormEventAction::ActionData::decodeString( if (_actionType.isEmpty() || _actionArg.isEmpty()) return 0; KexiPart::Info *info = 0; - if (_actionType!="kaction" && _actionType!="currentForm") { + if (_actionType!="tdeaction" && _actionType!="currentForm") { info = Kexi::partManager().infoForMimeType( TQString("kexi/%1").arg(_actionType) ); if (!info) return 0; @@ -170,7 +170,7 @@ void KexiFormEventHandler::setMainWidgetForEventHandling(KexiMainWindow *mainWin KexiPart::Info* partInfo = data.decodeString(actionType, actionArg, ok); if (!ok) continue; - if (actionType=="kaction" || actionType=="currentForm") { + if (actionType=="tdeaction" || actionType=="currentForm") { TDEAction *action = mainWin->actionCollection()->action( actionArg.latin1() ); if (!action) continue; diff --git a/kexi/plugins/forms/kexiformeventhandler.h b/kexi/plugins/forms/kexiformeventhandler.h index 69b9a20cf..d7063b19b 100644 --- a/kexi/plugins/forms/kexiformeventhandler.h +++ b/kexi/plugins/forms/kexiformeventhandler.h @@ -21,7 +21,7 @@ #define KEXIFORMEVENTHANDLER_H #include -#include +#include class KexiMainWindow; namespace KexiPart { @@ -65,19 +65,19 @@ class KEXIFORMUTILS_EXPORT KexiFormEventAction : public TDEAction /*! Decodes action string into action type/action argument parts. Action string has to be in a form of "actiontype:actionarg" - - Action type is passed to \a actionType on success. Action type can be "kaction" + - Action type is passed to \a actionType on success. Action type can be "tdeaction" or any of the part names (see KexiPart::Info::objectName()), e.g. "table", "query", etc. - - Action argument can be an action name in case of "kaction" type or object name + - Action argument can be an action name in case of "tdeaction" type or object name in case of action of type "table", "query", etc. \a ok is set to true on success and to false on failure. On failure no other values are passed. - \return part info if action type is "table", "query", etc., or 0 for "kaction" type. */ + \return part info if action type is "table", "query", etc., or 0 for "tdeaction" type. */ KexiPart::Info* decodeString(TQString& actionType, TQString& actionArg, bool& ok) const; //! \return true if the action is empty bool isEmpty() const; - TQString string; //!< action string with prefix, like "kaction:edit_copy" or "table:" + TQString string; //!< action string with prefix, like "tdeaction:edit_copy" or "table:" TQString option; //!< option used when name is "table/query/etc.:\" is set; //!< can be set to "open", "design", "editText", etc. diff --git a/kexi/plugins/forms/kexiformpart.cpp b/kexi/plugins/forms/kexiformpart.cpp index b96e4814f..d0db5f941 100644 --- a/kexi/plugins/forms/kexiformpart.cpp +++ b/kexi/plugins/forms/kexiformpart.cpp @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/plugins/forms/kexiformscrollview.cpp b/kexi/plugins/forms/kexiformscrollview.cpp index b73cf8ea6..4e0677f89 100644 --- a/kexi/plugins/forms/kexiformscrollview.cpp +++ b/kexi/plugins/forms/kexiformscrollview.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include KexiFormScrollView::KexiFormScrollView(TQWidget *parent, bool preview) diff --git a/kexi/plugins/forms/widgets/kexidbdateedit.cpp b/kexi/plugins/forms/widgets/kexidbdateedit.cpp index cf8c1d70e..2b72fc53e 100644 --- a/kexi/plugins/forms/widgets/kexidbdateedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdateedit.cpp @@ -21,7 +21,7 @@ #include "kexidbdateedit.h" #include #include -#include +#include #include #include diff --git a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp index 763bdf02d..65edd28af 100644 --- a/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbdatetimeedit.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp index eaf910447..ed441d4fd 100644 --- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp +++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include #include #include #include @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include @@ -53,7 +53,7 @@ #ifdef TQ_WS_WIN #include -#include +#include #endif #include "kexidbutils.h" diff --git a/kexi/plugins/forms/widgets/kexidbtextedit.cpp b/kexi/plugins/forms/widgets/kexidbtextedit.cpp index de928e377..8967258ba 100644 --- a/kexi/plugins/forms/widgets/kexidbtextedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtextedit.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp index b136fa0d8..5473a9cba 100644 --- a/kexi/plugins/forms/widgets/kexidbtimeedit.cpp +++ b/kexi/plugins/forms/widgets/kexidbtimeedit.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/plugins/forms/widgets/kexidbutils.cpp b/kexi/plugins/forms/widgets/kexidbutils.cpp index 863b5d807..0f6f993ac 100644 --- a/kexi/plugins/forms/widgets/kexidbutils.cpp +++ b/kexi/plugins/forms/widgets/kexidbutils.cpp @@ -19,7 +19,7 @@ #include "kexidbutils.h" -#include +#include #include #include diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp index 20fba8fef..3c96cd09d 100644 --- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp +++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp @@ -72,7 +72,7 @@ #include "kexicsvwidgets.h" #ifdef TQ_WS_WIN -#include +#include #include #endif diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h index b3bfcad83..6a9d2964b 100644 --- a/kexi/plugins/macros/kexipart/keximacroerror.h +++ b/kexi/plugins/macros/kexipart/keximacroerror.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui index 707b2cb30..f03c6aca3 100644 --- a/kexi/plugins/macros/kexipart/keximacroerrorbase.ui +++ b/kexi/plugins/macros/kexipart/keximacroerrorbase.ui @@ -208,6 +208,6 @@ - klistview.h + tdelistview.h diff --git a/kexi/plugins/queries/kexiparameterlisteditor.ui b/kexi/plugins/queries/kexiparameterlisteditor.ui index 7741073fa..d00771207 100644 --- a/kexi/plugins/queries/kexiparameterlisteditor.ui +++ b/kexi/plugins/queries/kexiparameterlisteditor.ui @@ -81,7 +81,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp index da27f8909..85ee5ce67 100644 --- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp +++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp index 110000aa0..8e4db059a 100644 --- a/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp +++ b/kexi/plugins/scripting/kexiscripting/kexiscripteditor.cpp @@ -28,8 +28,8 @@ //#include //#include //#include -//#include -#include +//#include +#include #include diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp index 4bd08e5b1..1ed65ddc2 100644 --- a/kexi/plugins/tables/kexilookupcolumnpage.cpp +++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp @@ -26,9 +26,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp index c5368b26f..4f6c9ff9b 100644 --- a/kexi/plugins/tables/kexitabledesignercommands.cpp +++ b/kexi/plugins/tables/kexitabledesignercommands.cpp @@ -25,9 +25,9 @@ #include #include -#include +#include #include -#include +#include #include diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp index 62ab4cbf0..7fa1c3b3c 100644 --- a/kexi/plugins/tables/kexitabledesignerview.cpp +++ b/kexi/plugins/tables/kexitabledesignerview.cpp @@ -29,8 +29,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp index a9254ba4e..761107c24 100644 --- a/kexi/plugins/tables/kexitabledesignerview_p.cpp +++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kexi/tests/altertable/1.kexi b/kexi/tests/altertable/1.kexi index ee61c8b1f2c99fb318fabd7297e0c0bc72fcb418..d3fccc0d36ee3db424ff454ab455bc99ca2b002d 100644 GIT binary patch delta 27 fcmZo@U~Xw(-f+5 #include #include -#include -#include +#include +#include #include #include #include diff --git a/kexi/widget/kexibrowser.h b/kexi/widget/kexibrowser.h index d4c8033f1..3da16500d 100644 --- a/kexi/widget/kexibrowser.h +++ b/kexi/widget/kexibrowser.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSER_H #define KEXIBROWSER_H -#include +#include #include #include diff --git a/kexi/widget/kexibrowser_p.h b/kexi/widget/kexibrowser_p.h index bd9eb8f53..880e72377 100644 --- a/kexi/widget/kexibrowser_p.h +++ b/kexi/widget/kexibrowser_p.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSER_P_H #define KEXIBROWSER_P_H -#include +#include /*! @internal */ class KexiBrowserListView : public TDEListView diff --git a/kexi/widget/kexibrowseritem.h b/kexi/widget/kexibrowseritem.h index 4dfa1232e..e4a35baaf 100644 --- a/kexi/widget/kexibrowseritem.h +++ b/kexi/widget/kexibrowseritem.h @@ -21,7 +21,7 @@ #ifndef KEXIBROWSERITEM_H #define KEXIBROWSERITEM_H -#include +#include #include #include diff --git a/kexi/widget/kexidataawareview.cpp b/kexi/widget/kexidataawareview.cpp index 6dc75abb2..034b3f70f 100644 --- a/kexi/widget/kexidataawareview.cpp +++ b/kexi/widget/kexidataawareview.cpp @@ -25,7 +25,7 @@ #include -#include +#include KexiDataAwareView::KexiDataAwareView(KexiMainWindow *mainWin, TQWidget *parent, const char *name) : KexiViewBase(mainWin, parent, name) diff --git a/kexi/widget/kexidatasourcecombobox.cpp b/kexi/widget/kexidatasourcecombobox.cpp index 725a560b3..effafb388 100644 --- a/kexi/widget/kexidatasourcecombobox.cpp +++ b/kexi/widget/kexidatasourcecombobox.cpp @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp index 0be99a4a9..797fa4406 100644 --- a/kexi/widget/kexidatatable.cpp +++ b/kexi/widget/kexidatatable.cpp @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #include diff --git a/kexi/widget/kexifieldlistview.h b/kexi/widget/kexifieldlistview.h index e936cc896..056ffc9b0 100644 --- a/kexi/widget/kexifieldlistview.h +++ b/kexi/widget/kexifieldlistview.h @@ -22,7 +22,7 @@ #include #include -#include +#include class TDEListViewItem; diff --git a/kexi/widget/kexismalltoolbutton.h b/kexi/widget/kexismalltoolbutton.h index 13aad9e88..d948f5869 100644 --- a/kexi/widget/kexismalltoolbutton.h +++ b/kexi/widget/kexismalltoolbutton.h @@ -21,7 +21,7 @@ #define KEXISMALLTOOLBUTTON_H #include -#include +#include class TQIconSet; diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp index d7e2dae11..ef94b5d23 100644 --- a/kexi/widget/pixmapcollection.cpp +++ b/kexi/widget/pixmapcollection.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp index d901d3738..5340691f3 100644 --- a/kexi/widget/relations/kexirelationview.cpp +++ b/kexi/widget/relations/kexirelationview.cpp @@ -31,8 +31,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/kexi/widget/relations/kexirelationviewtable.h b/kexi/widget/relations/kexirelationviewtable.h index 5e3ff332f..25faf8968 100644 --- a/kexi/widget/relations/kexirelationviewtable.h +++ b/kexi/widget/relations/kexirelationviewtable.h @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp index 43ff7331a..91523cb77 100644 --- a/kexi/widget/tableview/kexiblobtableedit.cpp +++ b/kexi/widget/tableview/kexiblobtableedit.cpp @@ -52,8 +52,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp index e4a6288e0..8bfc1c480 100644 --- a/kexi/widget/tableview/kexidatatableview.cpp +++ b/kexi/widget/tableview/kexidatatableview.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp index 49bb8a0d3..6e538fd17 100644 --- a/kexi/widget/tableview/kexidatetableedit.cpp +++ b/kexi/widget/tableview/kexidatetableedit.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp index 35c599cc3..aff64f582 100644 --- a/kexi/widget/tableview/kexidatetimetableedit.cpp +++ b/kexi/widget/tableview/kexidatetimetableedit.cpp @@ -42,7 +42,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/widget/tableview/kexitableview_p.h b/kexi/widget/tableview/kexitableview_p.h index b0679dfa4..1ba7f7911 100644 --- a/kexi/widget/tableview/kexitableview_p.h +++ b/kexi/widget/tableview/kexitableview_p.h @@ -38,10 +38,10 @@ #include #include -#include +#include #include -#include -#include +#include +#include class KexiTableItem; class KexiTableRM; diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp index 8110716b5..b6dc69d43 100644 --- a/kexi/widget/tableview/kexitimetableedit.cpp +++ b/kexi/widget/tableview/kexitimetableedit.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include #include #include diff --git a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp index 4931eb195..858ea9146 100644 --- a/kexi/widget/utils/kexicomboboxdropdownbutton.cpp +++ b/kexi/widget/utils/kexicomboboxdropdownbutton.cpp @@ -19,7 +19,7 @@ #include "kexicomboboxdropdownbutton.h" -#include +#include #include #include diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp index eb735a49c..caae10b6e 100644 --- a/kexi/widget/utils/kexicontextmenuutils.cpp +++ b/kexi/widget/utils/kexicontextmenuutils.cpp @@ -19,7 +19,7 @@ #include "kexicontextmenuutils.h" -#include +#include #include #include #include @@ -32,7 +32,7 @@ #ifdef TQ_WS_WIN #include -#include +#include #endif //! @internal diff --git a/kexi/widget/utils/kexicontextmenuutils.h b/kexi/widget/utils/kexicontextmenuutils.h index 826b1ebb0..03e0881cb 100644 --- a/kexi/widget/utils/kexicontextmenuutils.h +++ b/kexi/widget/utils/kexicontextmenuutils.h @@ -21,7 +21,7 @@ #define KexiContextMenuUtils_H #include -#include +#include #include class TDEActionCollection; diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp index 6582b3213..21bb24ded 100644 --- a/kexi/widget/utils/kexidatetimeformatter.cpp +++ b/kexi/widget/utils/kexidatetimeformatter.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include KexiDateFormatter::KexiDateFormatter() diff --git a/kexi/widget/utils/kexidropdownbutton.cpp b/kexi/widget/utils/kexidropdownbutton.cpp index fa9b24976..c3a14dcab 100644 --- a/kexi/widget/utils/kexidropdownbutton.cpp +++ b/kexi/widget/utils/kexidropdownbutton.cpp @@ -19,7 +19,7 @@ #include "kexidropdownbutton.h" -#include +#include #include #include diff --git a/kexi/widget/utils/kexisharedactionclient.cpp b/kexi/widget/utils/kexisharedactionclient.cpp index ec7d06302..6e38f95b9 100644 --- a/kexi/widget/utils/kexisharedactionclient.cpp +++ b/kexi/widget/utils/kexisharedactionclient.cpp @@ -19,7 +19,7 @@ #include "kexisharedactionclient.h" -#include +#include KexiSharedActionClient::KexiSharedActionClient() : m_sharedActions(1009, false) diff --git a/kexi/widget/utils/tdelistviewitemtemplate.h b/kexi/widget/utils/tdelistviewitemtemplate.h index 9a4a3be4f..21430b247 100644 --- a/kexi/widget/utils/tdelistviewitemtemplate.h +++ b/kexi/widget/utils/tdelistviewitemtemplate.h @@ -20,7 +20,7 @@ #ifndef KLISTVIEWITEMTEMPLATE_H #define KLISTVIEWITEMTEMPLATE_H -#include +#include //! TQListViewItem class with ability for storing additional data member template diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc index c5d1326c4..ac8c8bcd7 100644 --- a/kformula/kformula_doc.cc +++ b/kformula/kformula_doc.cc @@ -37,7 +37,7 @@ #include #include -#include +#include #include #include #include diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc index 4433ddd76..aebcd1c42 100644 --- a/kformula/kformula_view.cc +++ b/kformula/kformula_view.cc @@ -25,7 +25,7 @@ class KPrinter; #include #include -#include +#include #include #include #include diff --git a/kivio/kiviopart/KIvioDocIface.cc b/kivio/kiviopart/KIvioDocIface.cc index 97a2c3c09..b93df9ccd 100644 --- a/kivio/kiviopart/KIvioDocIface.cc +++ b/kivio/kiviopart/KIvioDocIface.cc @@ -23,7 +23,7 @@ #include "kivio_map.h" #include #include -#include +#include #include "kivio_grid_data.h" #include "kivio_config.h" diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp index 2a5cec25b..351085a59 100644 --- a/kivio/kiviopart/kivio_doc.cpp +++ b/kivio/kiviopart/kivio_doc.cpp @@ -68,7 +68,7 @@ #include -#include +#include #include #include #include diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp index f6f302e39..d19b46504 100644 --- a/kivio/kiviopart/kivio_view.cpp +++ b/kivio/kiviopart/kivio_view.cpp @@ -46,12 +46,12 @@ #include #include -#include +#include #include #include #include #include -#include +#include #include #include #include diff --git a/kivio/kiviopart/kivio_zoomaction.h b/kivio/kiviopart/kivio_zoomaction.h index 2cb6eac39..6571aff19 100644 --- a/kivio/kiviopart/kivio_zoomaction.h +++ b/kivio/kiviopart/kivio_zoomaction.h @@ -19,7 +19,7 @@ #ifndef KIVIO_ZOOMACTION_H #define KIVIO_ZOOMACTION_H -#include "tkaction.h" +#include "ttdeaction.h" namespace Kivio { diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp index 42239517a..eb053c94c 100644 --- a/kivio/kiviopart/kivioarrowheadaction.cpp +++ b/kivio/kiviopart/kivioarrowheadaction.cpp @@ -28,12 +28,12 @@ #include #include -#include -#include +#include +#include #include #include #include -#include +#include #include #include diff --git a/kivio/kiviopart/kivioarrowheadaction.h b/kivio/kiviopart/kivioarrowheadaction.h index c27956c26..b13b93bc6 100644 --- a/kivio/kiviopart/kivioarrowheadaction.h +++ b/kivio/kiviopart/kivioarrowheadaction.h @@ -22,7 +22,7 @@ #define KIVIOARROWHEADACTION_H -#include +#include class TDEPopupMenu; diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp index 340d88b8f..35a332cea 100644 --- a/kivio/kiviopart/kiviostencilsetaction.cpp +++ b/kivio/kiviopart/kiviostencilsetaction.cpp @@ -20,12 +20,12 @@ #include "kiviostencilsetaction.h" -#include +#include #include #include #include -#include -#include +#include +#include #include #include diff --git a/kivio/kiviopart/kiviostencilsetaction.h b/kivio/kiviopart/kiviostencilsetaction.h index 9544359b0..64f64accd 100644 --- a/kivio/kiviopart/kiviostencilsetaction.h +++ b/kivio/kiviopart/kiviostencilsetaction.h @@ -22,7 +22,7 @@ #define KIVIOSTENCILSETACTION_H -#include +#include #include #include diff --git a/kivio/kiviopart/tools/mousetoolaction.cpp b/kivio/kiviopart/tools/mousetoolaction.cpp index b49baacec..38a8af695 100644 --- a/kivio/kiviopart/tools/mousetoolaction.cpp +++ b/kivio/kiviopart/tools/mousetoolaction.cpp @@ -18,8 +18,8 @@ */ #include "mousetoolaction.h" -#include -#include +#include +#include #include namespace Kivio { diff --git a/kivio/kiviopart/tools/mousetoolaction.h b/kivio/kiviopart/tools/mousetoolaction.h index f4ba5389f..09102fae7 100644 --- a/kivio/kiviopart/tools/mousetoolaction.h +++ b/kivio/kiviopart/tools/mousetoolaction.h @@ -19,7 +19,7 @@ #ifndef KIVIOMOUSETOOLACTION_H #define KIVIOMOUSETOOLACTION_H -#include +#include #include namespace Kivio { diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp index acc736ec7..78d77d0d6 100644 --- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp +++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp @@ -9,8 +9,8 @@ #include "kivio_common.h" #include "kivio_factory.h" -#include -#include +#include +#include #include #include #include diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp index 2667dffdb..ff0eb9ede 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel.cpp +++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp @@ -29,9 +29,9 @@ #include #include -#include +#include #include -#include +#include #include #include diff --git a/kivio/kiviopart/ui/kivio_layer_panel_base.ui b/kivio/kiviopart/ui/kivio_layer_panel_base.ui index 4f6bad32f..8777bf6e5 100644 --- a/kivio/kiviopart/ui/kivio_layer_panel_base.ui +++ b/kivio/kiviopart/ui/kivio_layer_panel_base.ui @@ -47,7 +47,7 @@ TDEToolBar -
ktoolbar.h
+
tdetoolbar.h
-1 -1 @@ -94,6 +94,6 @@ - ktoolbar.h + tdetoolbar.h diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp index 6de8c0baf..7eb9a75ce 100644 --- a/kivio/kiviopart/ui/kivio_protection_panel.cpp +++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp index 8372b1a38..0e87398ae 100644 --- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp +++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp @@ -29,7 +29,7 @@ #include #include -#include +#include #include "kivio_stencil_spawner_set.h" #include "kivio_stencil_spawner.h" diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp index b72d886b9..c9b5d39b0 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp +++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include #include diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.h b/kivio/kiviopart/ui/kiviooptionsdialog.h index 69a43be85..56ac04904 100644 --- a/kivio/kiviopart/ui/kiviooptionsdialog.h +++ b/kivio/kiviopart/ui/kiviooptionsdialog.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include class KivioView; class TQComboBox; diff --git a/kivio/kiviopart/ui/kiviostencilsetwidget.ui b/kivio/kiviopart/ui/kiviostencilsetwidget.ui index 4b84ae309..13204c7e6 100644 --- a/kivio/kiviopart/ui/kiviostencilsetwidget.ui +++ b/kivio/kiviopart/ui/kiviostencilsetwidget.ui @@ -160,6 +160,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - klistview.h + tdelistview.h diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp index 92424aaad..76f76c7d0 100644 --- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp +++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp index 018576176..6c54077ed 100644 --- a/kivio/kiviopart/ui/objectlistpalette.cpp +++ b/kivio/kiviopart/ui/objectlistpalette.cpp @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp index 5dd3153ec..b8a529f7c 100644 --- a/kivio/plugins/kivioselecttool/tool_select.cpp +++ b/kivio/plugins/kivioselecttool/tool_select.cpp @@ -35,8 +35,8 @@ #include "kivio_layer.h" #include "kivio_stencil.h" -#include -#include +#include +#include #include #include #include diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp index d2f3c4df8..4cb43bcca 100644 --- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp +++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include "kivio_view.h" diff --git a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui index 768732aa9..85814b45a 100644 --- a/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui +++ b/kivio/plugins/kiviotexttool/kivio_stenciltexteditorui.ui @@ -248,7 +248,7 @@ You should have received a copy of the GNU General Public License along with thi kcombobox.h klineedit.h - kfontcombo.h + tdefontcombo.h klineedit.h kcolorbutton.h ktextedit.h diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp index 062e329e8..0204132f6 100644 --- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp +++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp index 22e9f63ca..9cf9b4437 100644 --- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp +++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp @@ -23,11 +23,11 @@ #include "kivio_canvas.h" #include "kivio_factory.h" -#include +#include #include #include -#include -#include +#include +#include #include #include #include diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp index 87fb52514..003762c28 100644 --- a/koshell/iconsidepane.cpp +++ b/koshell/iconsidepane.cpp @@ -39,7 +39,7 @@ #include #include #include -#include +#include #include #include "iconsidepane.h" diff --git a/koshell/iconsidepane.h b/koshell/iconsidepane.h index 5510ffa9e..3b72d0a94 100644 --- a/koshell/iconsidepane.h +++ b/koshell/iconsidepane.h @@ -22,8 +22,8 @@ #ifndef KOFFICE_ICONSIDEPANEBASE_H #define KOFFICE_ICONSIDEPANEBASE_H -#include -#include +#include +#include #include #include diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc index 763026e36..991a2a09f 100644 --- a/koshell/koshell_shell.cc +++ b/koshell/koshell_shell.cc @@ -40,12 +40,12 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include +#include #include #include diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc index e4bd7a955..a7e298d64 100644 --- a/kounavail/kounavail.cc +++ b/kounavail/kounavail.cc @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc index 6aaa4a612..00925a6e8 100644 --- a/kplato/kptaccountspanel.cc +++ b/kplato/kptaccountspanel.cc @@ -29,7 +29,7 @@ #include #include -#include +#include #include #include diff --git a/kplato/kptaccountspanelbase.ui b/kplato/kptaccountspanelbase.ui index 61d83ac5f..a8f05d68a 100644 --- a/kplato/kptaccountspanelbase.ui +++ b/kplato/kptaccountspanelbase.ui @@ -125,6 +125,6 @@ - klistview.h + tdelistview.h diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc index 89eb9c67d..d466e1cc4 100644 --- a/kplato/kptaccountsview.cc +++ b/kplato/kptaccountsview.cc @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include diff --git a/kplato/kptaccountsview.h b/kplato/kptaccountsview.h index c8f99aaee..2d2bf6b4a 100644 --- a/kplato/kptaccountsview.h +++ b/kplato/kptaccountsview.h @@ -22,7 +22,7 @@ #include -#include +#include #include "kptaccount.h" #include "kptcontext.h" diff --git a/kplato/kptcalendarlistpanel.ui b/kplato/kptcalendarlistpanel.ui index 089807506..5c98c6b94 100644 --- a/kplato/kptcalendarlistpanel.ui +++ b/kplato/kptcalendarlistpanel.ui @@ -124,6 +124,6 @@ - klistview.h + tdelistview.h diff --git a/kplato/kptdoublelistviewbase.h b/kplato/kptdoublelistviewbase.h index 9347742a2..63d728146 100644 --- a/kplato/kptdoublelistviewbase.h +++ b/kplato/kptdoublelistviewbase.h @@ -25,7 +25,7 @@ #include #include -#include +#include class TQListViewItem; diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc index 04274dce2..da47b4929 100644 --- a/kplato/kptpertcanvas.cc +++ b/kplato/kptpertcanvas.cc @@ -43,7 +43,7 @@ #include #include #include -#include +#include namespace KPlato { diff --git a/kplato/kptproject.h b/kplato/kptproject.h index d0dd1eb94..8ffbdb7d2 100644 --- a/kplato/kptproject.h +++ b/kplato/kptproject.h @@ -33,7 +33,7 @@ #include #include -#include +#include #include namespace KPlato diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc index cb6a84d3c..c93be14d5 100644 --- a/kplato/kptreportview.cc +++ b/kplato/kptreportview.cc @@ -29,9 +29,9 @@ #include #include -#include +#include #include -#include +#include #include #include #include diff --git a/kplato/kptreportview.h b/kplato/kptreportview.h index e62c2b36f..08f54fb86 100644 --- a/kplato/kptreportview.h +++ b/kplato/kptreportview.h @@ -28,7 +28,7 @@ #include #include -#include +#include class TDEAction; class KPrinter; diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc index 6059590b7..eaadc808f 100644 --- a/kplato/kptresourcespanel.cc +++ b/kplato/kptresourcespanel.cc @@ -24,7 +24,7 @@ #include "kptcommand.h" #include -#include +#include #include #include #include diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc index addfac343..b0e433ebd 100644 --- a/kplato/kptresourceview.cc +++ b/kplato/kptresourceview.cc @@ -36,7 +36,7 @@ #include #include -#include +#include #include #include #include diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc index ff691bffa..1b5495b7c 100644 --- a/kplato/kptstandardworktimedialog.cc +++ b/kplato/kptstandardworktimedialog.cc @@ -42,7 +42,7 @@ #include #include #include -#include +#include namespace KPlato { diff --git a/kplato/kptview.cc b/kplato/kptview.cc index 7ebd1b2d8..63a9a987b 100644 --- a/kplato/kptview.cc +++ b/kplato/kptview.cc @@ -45,13 +45,13 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/kplato/reports/Makefile.am b/kplato/reports/Makefile.am index 4768252ac..28130aef3 100644 --- a/kplato/reports/Makefile.am +++ b/kplato/reports/Makefile.am @@ -1,7 +1,7 @@ kplatoreportdir = $(kde_datadir)/kplato/reports -kplatoreport_DATA = resourcelist.desktop tasklist.desktop +kplatoreport_DATA = resourcelist.desktop tastdelist.desktop kplatoreportsourcedir = $(kde_datadir)/kplato/reports/.source -kplatoreportsource_DATA = resourcelist.ktf tasklist.ktf +kplatoreportsource_DATA = resourcelist.ktf tastdelist.ktf EXTRA_DIST = $(kplatoreport_DATA) diff --git a/kplato/reports/tastdelist.desktop b/kplato/reports/tastdelist.desktop index aaa2b7f34..0b23d166c 100644 --- a/kplato/reports/tastdelist.desktop +++ b/kplato/reports/tastdelist.desktop @@ -42,5 +42,5 @@ Name[uz@cyrillic]=Вазифалар рўйхати Name[zh_CN]=任务列表 Name[zh_TW]=工作清單 Type=Link -URL= .source/tasklist.ktf +URL= .source/tastdelist.ktf X-TDE-Hidden=false diff --git a/kplato/resourcespanelbase.ui b/kplato/resourcespanelbase.ui index af913ca22..8f897eb53 100644 --- a/kplato/resourcespanelbase.ui +++ b/kplato/resourcespanelbase.ui @@ -190,6 +190,6 @@ - klistview.h + tdelistview.h diff --git a/kplato/standardworktimedialogbase.ui b/kplato/standardworktimedialogbase.ui index 6843dfd87..46efac2c9 100644 --- a/kplato/standardworktimedialogbase.ui +++ b/kplato/standardworktimedialogbase.ui @@ -284,7 +284,7 @@ when there is no calendar defined for a resource. knuminput.h - klistview.h + tdelistview.h kcombobox.h diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp index 358c852bc..0089caf83 100644 --- a/kpresenter/KPrCanvas.cpp +++ b/kpresenter/KPrCanvas.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp index 4009382cb..5274c357f 100644 --- a/kpresenter/KPrConfig.cpp +++ b/kpresenter/KPrConfig.cpp @@ -64,13 +64,13 @@ #include #include "KPrCommand.h" #include -#include +#include #include #include #include #include #include -#include +#include #include #include diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp index 2591e4c57..aae5659ef 100644 --- a/kpresenter/KPrPresDurationDia.cpp +++ b/kpresenter/KPrPresDurationDia.cpp @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include #include diff --git a/kpresenter/KPrSideBar.h b/kpresenter/KPrSideBar.h index 542e8c391..a1190bdbc 100644 --- a/kpresenter/KPrSideBar.h +++ b/kpresenter/KPrSideBar.h @@ -27,7 +27,7 @@ #include #include -#include +#include class TQListViewItem; class KPrDocument; diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp index d0782541d..35961bab9 100644 --- a/kpresenter/KPrTextObject.cpp +++ b/kpresenter/KPrTextObject.cpp @@ -61,7 +61,7 @@ #include #include -#include +#include #include #include #include diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp index ee68f7a57..f96b095de 100644 --- a/kpresenter/KPrView.cpp +++ b/kpresenter/KPrView.cpp @@ -19,7 +19,7 @@ */ #include -#include +#include #include #include #include @@ -79,7 +79,7 @@ #include #include #include -#include +#include #include #include #include @@ -96,7 +96,7 @@ #include #include #include -#include +#include #include #include #include @@ -144,9 +144,9 @@ #include #include "KPrDuplicateObjDia.h" -#include +#include #include -#include +#include #include "KPrImportStyleDia.h" #include #include diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp index 9dd7e2f84..f4bf8fedf 100644 --- a/kpresenter/KPrWebPresentation.cpp +++ b/kpresenter/KPrWebPresentation.cpp @@ -67,7 +67,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kspread/dialogs/SheetSelectWidget.ui b/kspread/dialogs/SheetSelectWidget.ui index 9e6dfc844..c4f4db58e 100644 --- a/kspread/dialogs/SheetSelectWidget.ui +++ b/kspread/dialogs/SheetSelectWidget.ui @@ -260,11 +260,11 @@ It is even possible to print a sheet more than once. Just insert the desired she kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h kpushbutton.h kpushbutton.h - klistview.h + tdelistview.h diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc index 946ee3c5c..5f9550741 100644 --- a/kspread/dialogs/kspread_dlg_database.cc +++ b/kspread/dialogs/kspread_dlg_database.cc @@ -28,7 +28,7 @@ #include "kspread_view.h" #include -#include +#include #include #include #include diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc index 2821f5e25..fdb8d6fe6 100644 --- a/kspread/dialogs/kspread_dlg_styles.cc +++ b/kspread/dialogs/kspread_dlg_styles.cc @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include "kspread_canvas.h" diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc index 9523cf83a..eb1dfe872 100644 --- a/kspread/dialogs/link.cc +++ b/kspread/dialogs/link.cc @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include using namespace KSpread; diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cc index 6fefd2725..4af76159e 100644 --- a/kspread/kspread_editors.cc +++ b/kspread/kspread_editors.cc @@ -29,7 +29,7 @@ #include "formula.h" #include "functions.h" -#include +#include #include #include diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc index ede602818..64d6aa5bf 100644 --- a/kspread/kspread_view.cc +++ b/kspread/kspread_view.cc @@ -54,7 +54,7 @@ #include #include #include -#include +#include #include #include #include @@ -69,7 +69,7 @@ #include #include #include -#include +#include #include // KOffice includes diff --git a/kspread/templates/HomeFamily/Makefile.am b/kspread/templates/HomeFamily/Makefile.am index 78372a09e..5916798ab 100644 --- a/kspread/templates/HomeFamily/Makefile.am +++ b/kspread/templates/HomeFamily/Makefile.am @@ -1,7 +1,7 @@ -template_DATA = .directory BMI.desktop MenuPlan.desktop VacationChecklist.desktop CreditCardTracker.desktop +template_DATA = .directory BMI.desktop MenuPlan.desktop VacationChectdelist.desktop CreditCardTracker.desktop templatedir = $(kde_datadir)/kspread/templates/HomeFamily -templatesrc_DATA = BMI.kst MenuPlan.kst VacationChecklist.kst CreditCardTracker.kst +templatesrc_DATA = BMI.kst MenuPlan.kst VacationChectdelist.kst CreditCardTracker.kst templatesrcdir = $(kde_datadir)/kspread/templates/HomeFamily/.source kspreadicondir = $(kde_datadir)/kspread/icons diff --git a/kspread/templates/HomeFamily/VacationChectdelist.desktop b/kspread/templates/HomeFamily/VacationChectdelist.desktop index 2655c7e38..ba1192ff0 100644 --- a/kspread/templates/HomeFamily/VacationChectdelist.desktop +++ b/kspread/templates/HomeFamily/VacationChectdelist.desktop @@ -1,21 +1,21 @@ [Desktop Entry] Type=Link -URL=.source/VacationChecklist.kst -Name=Vacation Checklist +URL=.source/VacationChectdelist.kst +Name=Vacation Chectdelist Name[bg]=Ваканция Name[ca]=Llista de comprovació de vacances Name[cs]=Dovolená Name[cy]=Rhestr Wirio Gwyliau -Name[da]=Ferie-tjekliste -Name[de]=Urlaubs-Checkliste +Name[da]=Ferie-tjetdeliste +Name[de]=Urlaubs-Chectdeliste Name[el]=Λίστα ελέγχου διακοπών -Name[eo]=Marklisto por Feriado +Name[eo]=Martdelisto por Feriado Name[es]=Lista de comprobación de vacaciones Name[et]=Puhkuseplaan Name[eu]=Oporretako zerrenda Name[fa]=فهرست بررسی تعطیلی Name[fi]=Loman tarkistuslista -Name[fr]=Checklist des vacances +Name[fr]=Chectdelist des vacances Name[fy]=Fakânsje kontrôlelist Name[gl]=Lista para Viaxes Name[he]=בדיקת חופשות @@ -26,11 +26,11 @@ Name[it]=Lista per le vacanze Name[ja]=休暇チェックリスト Name[km]=បញ្ជី​វិស្សមកាល Name[ms]=Senarai Semak Percutian -Name[nb]=Sjekkliste for ferie +Name[nb]=Sjektdeliste for ferie Name[nds]=Oorlööf-Pröövlist Name[ne]=बिदा जाँचसूची Name[nl]=Vakantie-controlelijst -Name[nn]=Sjekkliste for ferie +Name[nn]=Sjektdeliste for ferie Name[pl]=Wakacyjny spis kontrolny Name[pt]=Lista para Férias Name[pt_BR]=Lista de Verificação de Férias diff --git a/kspread/templates/HomeFamily/VacationChectdelist.kst b/kspread/templates/HomeFamily/VacationChectdelist.kst index 141ff1e4b..281ef3e09 100644 --- a/kspread/templates/HomeFamily/VacationChectdelist.kst +++ b/kspread/templates/HomeFamily/VacationChectdelist.kst @@ -176,7 +176,7 @@ - Vacation Checklist + Vacation Chectdelist diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp index a4a35e389..0b2509d6c 100644 --- a/kugar/kudesigner/kudesigner_view.cpp +++ b/kugar/kudesigner/kudesigner_view.cpp @@ -35,7 +35,7 @@ #include #include -#include +#include #include #include #include diff --git a/kugar/kudesigner_lib/structurewidget.h b/kugar/kudesigner_lib/structurewidget.h index d81fc8332..0d527d315 100644 --- a/kugar/kudesigner_lib/structurewidget.h +++ b/kugar/kudesigner_lib/structurewidget.h @@ -21,7 +21,7 @@ #ifndef KUDESIGNERSTRUCTUREWIDGET_H #define KUDESIGNERSTRUCTUREWIDGET_H -#include +#include #include class KudesignerDoc; diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp index 134ab039b..d61e405f7 100644 --- a/kugar/part/kugar_part.cpp +++ b/kugar/part/kugar_part.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp index e5c2f5558..c90486e9c 100644 --- a/kugar/part/kugar_view.cpp +++ b/kugar/part/kugar_view.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp index 1e11eb070..3a9cd15e4 100644 --- a/kword/KWConfig.cpp +++ b/kword/KWConfig.cpp @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include #include @@ -61,7 +61,7 @@ using namespace KSpell2; #include #include -#include +#include #include #include #include diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp index 4a888d398..9e032e811 100644 --- a/kword/KWDocStruct.cpp +++ b/kword/KWDocStruct.cpp @@ -37,12 +37,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include diff --git a/kword/KWDocStruct.h b/kword/KWDocStruct.h index 83acd9c12..a8de6fd37 100644 --- a/kword/KWDocStruct.h +++ b/kword/KWDocStruct.h @@ -20,7 +20,7 @@ #ifndef docstruct_h #define docstruct_h -#include +#include #include class KWDocument; diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp index cdaa15b28..e3f6e98ca 100644 --- a/kword/KWFrameView.cpp +++ b/kword/KWFrameView.cpp @@ -31,7 +31,7 @@ #include "KoZoomHandler.h" #include -#include +#include #include #include diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp index db95cf5e4..8ef08e912 100644 --- a/kword/KWMailMergeDataBase.cpp +++ b/kword/KWMailMergeDataBase.cpp @@ -28,11 +28,11 @@ #include #include #include -#include +#include #include #include #include -#include +#include #include #include diff --git a/kword/KWMailMergeLabelAction.cpp b/kword/KWMailMergeLabelAction.cpp index 2ae12b617..972d9a431 100644 --- a/kword/KWMailMergeLabelAction.cpp +++ b/kword/KWMailMergeLabelAction.cpp @@ -25,7 +25,7 @@ #include "KWMailMergeLabelAction.moc" #include #include -#include +#include class MailMergeDraggableLabel : public TQToolButton { diff --git a/kword/KWMailMergeLabelAction.h b/kword/KWMailMergeLabelAction.h index 558f69ad0..cd104c076 100644 --- a/kword/KWMailMergeLabelAction.h +++ b/kword/KWMailMergeLabelAction.h @@ -24,7 +24,7 @@ #ifndef _MAILMERGE_ACTIONS_ #define _MAILMERGE_ACTIONS_ -#include +#include #include class KWMailMergeLabelAction : public TDEAction diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp index a9f3e6ace..4df7bc1f6 100644 --- a/kword/KWTextFrameSet.cpp +++ b/kword/KWTextFrameSet.cpp @@ -55,7 +55,7 @@ #include #include -#include +#include #include #include diff --git a/kword/KWView.cpp b/kword/KWView.cpp index f32912e07..227f75a5e 100644 --- a/kword/KWView.cpp +++ b/kword/KWView.cpp @@ -101,7 +101,7 @@ #include #include -#include +#include #include #include #include @@ -112,7 +112,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/kword/KWView.h b/kword/KWView.h index 957ee5d4b..216cc6ea5 100644 --- a/kword/KWView.h +++ b/kword/KWView.h @@ -34,7 +34,7 @@ #include #include #include -#include +#include #include #include diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h index a7fec8505..1024ecd0e 100644 --- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h +++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h @@ -22,7 +22,7 @@ #define _KWMAILMERGE_KABC_CONFIG_H_ #include -#include +#include #include #include "KWMailMergeKABC.h" diff --git a/kword/mailmerge/kabc/addresspicker.ui b/kword/mailmerge/kabc/addresspicker.ui index 38430e4b8..44dc8c8f1 100644 --- a/kword/mailmerge/kabc/addresspicker.ui +++ b/kword/mailmerge/kabc/addresspicker.ui @@ -291,7 +291,7 @@ kpushbutton.h kpushbutton.h - klistview.h - klistview.h + tdelistview.h + tdelistview.h diff --git a/kword/mailmerge/sql/kwqtsqlpower.ui b/kword/mailmerge/sql/kwqtsqlpower.ui index 198e8f2fa..f37b60794 100644 --- a/kword/mailmerge/sql/kwqtsqlpower.ui +++ b/kword/mailmerge/sql/kwqtsqlpower.ui @@ -226,7 +226,7 @@ klineedit.h - klistbox.h + tdelistbox.h kpushbutton.h diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc index 687345e2b..da930dba9 100644 --- a/lib/kformula/kformulaconfigpage.cc +++ b/lib/kformula/kformulaconfigpage.cc @@ -37,8 +37,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/lib/kformula/kformuladocument.h b/lib/kformula/kformuladocument.h index 8a3dd77de..7a8f0369d 100644 --- a/lib/kformula/kformuladocument.h +++ b/lib/kformula/kformuladocument.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc index 58074a2bb..8591eb04a 100644 --- a/lib/kformula/symbolaction.cc +++ b/lib/kformula/symbolaction.cc @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include "symbolaction.h" diff --git a/lib/kformula/symbolaction.h b/lib/kformula/symbolaction.h index a7c91292c..8021ed507 100644 --- a/lib/kformula/symbolaction.h +++ b/lib/kformula/symbolaction.h @@ -20,7 +20,7 @@ #ifndef _SYMBOLACTION_H_ #define _SYMBOLACTION_H_ -#include +#include #include #include #include diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp index 31cfde386..bd0c5285a 100644 --- a/lib/kofficecore/KoDetailsPane.cpp +++ b/lib/kofficecore/KoDetailsPane.cpp @@ -32,7 +32,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kofficecore/KoDetailsPane.h b/lib/kofficecore/KoDetailsPane.h index 596c3c12a..1ae87ce99 100644 --- a/lib/kofficecore/KoDetailsPane.h +++ b/lib/kofficecore/KoDetailsPane.h @@ -19,7 +19,7 @@ #ifndef KODETAILSPANE_H #define KODETAILSPANE_H -#include +#include #include "koDetailsPaneBase.h" diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cc index cfa21a935..e4275d758 100644 --- a/lib/kofficecore/KoDocumentIface.cc +++ b/lib/kofficecore/KoDocumentIface.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp index 361cc5cdf..93236c2bb 100644 --- a/lib/kofficecore/KoDocumentInfoDlg.cpp +++ b/lib/kofficecore/KoDocumentInfoDlg.cpp @@ -50,7 +50,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp index c2ecb369f..2a894a0ef 100644 --- a/lib/kofficecore/KoFilterManager.cpp +++ b/lib/kofficecore/KoFilterManager.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp index f013ca368..5a8c0d262 100644 --- a/lib/kofficecore/KoMainWindow.cpp +++ b/lib/kofficecore/KoMainWindow.cpp @@ -46,7 +46,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp index 4a2872c6d..6459171a5 100644 --- a/lib/kofficecore/KoOpenPane.cpp +++ b/lib/kofficecore/KoOpenPane.cpp @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "KoFilterManager.h" #include "KoTemplates.h" diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cc index df6eaa318..b52b9f0a8 100644 --- a/lib/kofficecore/KoViewIface.cc +++ b/lib/kofficecore/KoViewIface.cc @@ -25,7 +25,7 @@ #include #include #include -#include +#include //static TQCString KoViewIface::newIfaceName() diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp index eec3c41ec..57cd09e2a 100644 --- a/lib/kofficecore/Koversiondialog.cpp +++ b/lib/kofficecore/Koversiondialog.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp index 407ebe4a8..212d02605 100644 --- a/lib/kofficecore/kkbdaccessextensions.cpp +++ b/lib/kofficecore/kkbdaccessextensions.cpp @@ -32,8 +32,8 @@ #include #include #include -#include -#include +#include +#include #include // KKbdAccessExtensions includes diff --git a/lib/kofficecore/koDetailsPaneBase.ui b/lib/kofficecore/koDetailsPaneBase.ui index a34d3116f..79658b580 100644 --- a/lib/kofficecore/koDetailsPaneBase.ui +++ b/lib/kofficecore/koDetailsPaneBase.ui @@ -231,7 +231,7 @@ - klistview.h + tdelistview.h ktextbrowser.h kpushbutton.h diff --git a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui index 35cd7b2a6..44dbc658d 100644 --- a/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui +++ b/lib/kofficecore/koDocumentInfoUserMetadataWidget.ui @@ -219,7 +219,7 @@ - klistview.h + tdelistview.h kpushbutton.h kpushbutton.h knuminput.h diff --git a/lib/kofficecore/koOpenPaneBase.ui b/lib/kofficecore/koOpenPaneBase.ui index dcc563b1f..b1ec19845 100644 --- a/lib/kofficecore/koOpenPaneBase.ui +++ b/lib/kofficecore/koOpenPaneBase.ui @@ -138,7 +138,7 @@ - klistview.h + tdelistview.h kpushbutton.h diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp index c0c81596e..0bcf454b7 100644 --- a/lib/kofficeui/KoCommandHistory.cpp +++ b/lib/kofficeui/KoCommandHistory.cpp @@ -22,13 +22,13 @@ #include #include -#include +#include #include #include #include -#include -#include -#include +#include +#include +#include #include #include "KoCommandHistory.h" diff --git a/lib/kofficeui/KoContextCelp.h b/lib/kofficeui/KoContextCelp.h index 2776d4096..51ea6539d 100644 --- a/lib/kofficeui/KoContextCelp.h +++ b/lib/kofficeui/KoContextCelp.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include class TQPixmap; class TQLabel; diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp index 61200fbea..84f31ee3e 100644 --- a/lib/kofficeui/KoGuides.cpp +++ b/lib/kofficeui/KoGuides.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp index e3fd77cce..1f1d2f4cc 100644 --- a/lib/kofficeui/KoInsertLink.cpp +++ b/lib/kofficeui/KoInsertLink.cpp @@ -32,7 +32,7 @@ #include #include "KoInsertLink.h" #include -#include +#include using namespace KOfficePrivate; diff --git a/lib/kofficeui/KoPartSelectAction.h b/lib/kofficeui/KoPartSelectAction.h index 7f38617de..e402dd771 100644 --- a/lib/kofficeui/KoPartSelectAction.h +++ b/lib/kofficeui/KoPartSelectAction.h @@ -19,7 +19,7 @@ #ifndef koPartSelectAction_h #define koPartSelectAction_h -#include +#include #include /** diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp index eb308452e..a5b057bc6 100644 --- a/lib/kofficeui/KoSelectAction.cpp +++ b/lib/kofficeui/KoSelectAction.cpp @@ -24,11 +24,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/lib/kofficeui/KoSelectAction.h b/lib/kofficeui/KoSelectAction.h index 7c0f5a259..4531e0123 100644 --- a/lib/kofficeui/KoSelectAction.h +++ b/lib/kofficeui/KoSelectAction.h @@ -19,7 +19,7 @@ #ifndef KOSELECTACTION_H #define KOSELECTACTION_H -#include +#include #include class TDEPopupMenu; class TQPoint; diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp index 1bd11b36f..e10fc78cf 100644 --- a/lib/kofficeui/KoTemplateChooseDia.cpp +++ b/lib/kofficeui/KoTemplateChooseDia.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp index 1d0fec2a9..9b1f213c2 100644 --- a/lib/kofficeui/KoTemplateCreateDia.cpp +++ b/lib/kofficeui/KoTemplateCreateDia.cpp @@ -34,7 +34,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp index 12c8b06e6..31c0dabf1 100644 --- a/lib/kofficeui/KoToolBox.cpp +++ b/lib/kofficeui/KoToolBox.cpp @@ -30,12 +30,12 @@ #include #include #include -#include +#include #include #include -#include -#include -#include +#include +#include +#include #include #include "KoToolBox.h" diff --git a/lib/kofficeui/KoToolBox.h b/lib/kofficeui/KoToolBox.h index 93a82b346..ef7e5a774 100644 --- a/lib/kofficeui/KoToolBox.h +++ b/lib/kofficeui/KoToolBox.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include class TQWidget; class TDEAction; diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp index ba08e1a10..f44adfb96 100644 --- a/lib/kofficeui/KoTooluButton.cpp +++ b/lib/kofficeui/KoTooluButton.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kofficeui/KoTooluButton.h b/lib/kofficeui/KoTooluButton.h index 31a3d3324..b29751239 100644 --- a/lib/kofficeui/KoTooluButton.h +++ b/lib/kofficeui/KoTooluButton.h @@ -20,7 +20,7 @@ #ifndef _kotoolbutton_h_ #define _kotoolbutton_h_ -#include +#include #include #include diff --git a/lib/kofficeui/KoZoomAction.h b/lib/kofficeui/KoZoomAction.h index 12e381032..ec3b9fc1d 100644 --- a/lib/kofficeui/KoZoomAction.h +++ b/lib/kofficeui/KoZoomAction.h @@ -19,7 +19,7 @@ #ifndef kozoomaction_h #define kozoomaction_h -#include +#include #include /** * Class KoZoomAction implements an action to provide zoom values. diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp index c24050452..41fcf7948 100644 --- a/lib/kofficeui/Kolinestyleaction.cpp +++ b/lib/kofficeui/Kolinestyleaction.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp index 84e770cc6..1d1525cda 100644 --- a/lib/kofficeui/Kolinewidthaction.cpp +++ b/lib/kofficeui/Kolinewidthaction.cpp @@ -27,11 +27,11 @@ #include #include -#include +#include #include #include -#include -#include +#include +#include #include #include diff --git a/lib/kofficeui/Makefile.am b/lib/kofficeui/Makefile.am index d274e9ac9..cef66f55c 100644 --- a/lib/kofficeui/Makefile.am +++ b/lib/kofficeui/Makefile.am @@ -16,7 +16,7 @@ libkofficeui_la_SOURCES = \ KoKoolBar.cpp KoTemplateCreateDia.cpp KoContextCelp.cpp\ kcoloractions.cpp \ KoPictureFilePreview.cpp KoUnitWidgets.cpp \ - tkaction.cpp tkcoloractions.cpp tkcombobox.cpp tktoolbarbutton.cpp \ + ttdeaction.cpp tkcoloractions.cpp tkcombobox.cpp ttdetoolbarbutton.cpp \ KoCharSelectDia.cpp KoInsertLink.cpp KoEditPath.cpp KoCommandHistory.cpp \ KoSelectAction.cpp Kolinewidthaction.cpp Kolinestyleaction.cpp \ KoTooluButton.cpp \ @@ -35,7 +35,7 @@ include_HEADERS = \ KoKoolBar.h KoTemplateCreateDia.h KoContextCelp.h \ kcoloractions.h \ KoPictureFilePreview.h KoUnitWidgets.h \ - tkaction.h tkcoloractions.h tktoolbarbutton.h tkcombobox.h \ + ttdeaction.h tkcoloractions.h ttdetoolbarbutton.h tkcombobox.h \ KoCharSelectDia.h KoInsertLink.h KoTooluButton.h KoEditPath.h \ KoCommandHistory.h KoImageResource.h \ KoSelectAction.h Kolinewidthaction.h Kolinestyleaction.h \ diff --git a/lib/kofficeui/kcoloractions.cpp b/lib/kofficeui/kcoloractions.cpp index 96e480013..2f9a41e2a 100644 --- a/lib/kofficeui/kcoloractions.cpp +++ b/lib/kofficeui/kcoloractions.cpp @@ -24,8 +24,8 @@ #include #include -#include -#include +#include +#include #include KColorAction::KColorAction( const TQString& text, int accel, diff --git a/lib/kofficeui/kcoloractions.h b/lib/kofficeui/kcoloractions.h index db832d8b3..8842f480b 100644 --- a/lib/kofficeui/kcoloractions.h +++ b/lib/kofficeui/kcoloractions.h @@ -20,7 +20,7 @@ #ifndef kcoloractions_h #define kcoloractions_h -#include +#include /** * An action whose pixmap is automatically generated from a color. @@ -94,7 +94,7 @@ signals: void colorSelected( const TQColor& color ); private: - TQString whatsThisWithIcon() const; // duplicated, as it's private in kaction + TQString whatsThisWithIcon() const; // duplicated, as it's private in tdeaction Type m_type; TQColor m_color; diff --git a/lib/kofficeui/tests/coloraction_test.cpp b/lib/kofficeui/tests/coloraction_test.cpp index d04a31c46..d0b81f622 100644 --- a/lib/kofficeui/tests/coloraction_test.cpp +++ b/lib/kofficeui/tests/coloraction_test.cpp @@ -24,7 +24,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp index 3e7d64801..eb1906135 100644 --- a/lib/kofficeui/tkcoloractions.cpp +++ b/lib/kofficeui/tkcoloractions.cpp @@ -20,11 +20,11 @@ #include "tkcoloractions.h" -#include "tktoolbarbutton.h" +#include "ttdetoolbarbutton.h" #include #include -#include +#include #include #include #include diff --git a/lib/kofficeui/tkcoloractions.h b/lib/kofficeui/tkcoloractions.h index 2b5dcd826..eb77fa7a6 100644 --- a/lib/kofficeui/tkcoloractions.h +++ b/lib/kofficeui/tkcoloractions.h @@ -21,9 +21,9 @@ #ifndef TKCOLORACTION_H #define TKCOLORACTION_H -#include "tkaction.h" +#include "ttdeaction.h" #include -#include +#include #include class TQGridLayout; diff --git a/lib/kofficeui/ttdeaction.cpp b/lib/kofficeui/ttdeaction.cpp index 56c626f8c..bfdc6c11b 100644 --- a/lib/kofficeui/ttdeaction.cpp +++ b/lib/kofficeui/ttdeaction.cpp @@ -17,14 +17,14 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include "tkaction.h" -#include "tktoolbarbutton.h" +#include "ttdeaction.h" +#include "ttdetoolbarbutton.h" #include "tkcombobox.h" #include #include -#include +#include #include #define SET_FOR_ALL_CONTAINER(WIDGET_TYPE,METHOD_NAME,VALUE) \ @@ -297,4 +297,4 @@ void TTDESelectAction::setEditText(const TQString& text) } #undef SET_FOR_ALL_CONTAINER -#include "tkaction.moc" +#include "ttdeaction.moc" diff --git a/lib/kofficeui/ttdeaction.h b/lib/kofficeui/ttdeaction.h index 736bb1416..015bcce98 100644 --- a/lib/kofficeui/ttdeaction.h +++ b/lib/kofficeui/ttdeaction.h @@ -20,7 +20,7 @@ #ifndef TKACTION_H #define TKACTION_H -#include +#include #include #include namespace TK { diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp index c4c8e27bf..51d825003 100644 --- a/lib/kofficeui/ttdetoolbarbutton.cpp +++ b/lib/kofficeui/ttdetoolbarbutton.cpp @@ -17,7 +17,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, * Boston, MA 02110-1301, USA. */ -#include +#include #include #include @@ -529,4 +529,4 @@ void TTDEToolBarButton::setIconMode( TK::IconMode m ) repaint(); } -#include +#include diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h index 14d3b2855..9f5d95409 100644 --- a/lib/kofficeui/ttdetoolbarbutton.h +++ b/lib/kofficeui/ttdetoolbarbutton.h @@ -20,7 +20,7 @@ #ifndef TKTOOLBARBUTTON_H #define TKTOOLBARBUTTON_H -#include +#include #include #include diff --git a/lib/kopainter/ko_color_wheel.h b/lib/kopainter/ko_color_wheel.h index 6e20da026..d57a98dab 100644 --- a/lib/kopainter/ko_color_wheel.h +++ b/lib/kopainter/ko_color_wheel.h @@ -21,7 +21,7 @@ #include -#include +#include #include class TQPainter; diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc index 9868dec8f..942215d56 100644 --- a/lib/kopainter/ko_hsv_widget.cc +++ b/lib/kopainter/ko_hsv_widget.cc @@ -20,7 +20,7 @@ #include "ko_hsv_widget.h" #include "ko_color_wheel.h" -#include +#include #include #include #include diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc index e93cae7c5..2202a86f4 100644 --- a/lib/kopalette/kopalette.cc +++ b/lib/kopalette/kopalette.cc @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc index de35054a1..688e1450f 100644 --- a/lib/kopalette/kopalettemanager.cc +++ b/lib/kopalette/kopalettemanager.cc @@ -25,9 +25,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include #include #include diff --git a/lib/koproperty/editor.h b/lib/koproperty/editor.h index 0fbcf45f5..204bb615c 100644 --- a/lib/koproperty/editor.h +++ b/lib/koproperty/editor.h @@ -25,7 +25,7 @@ #include #include "koproperty_global.h" -#include +#include class TQSize; diff --git a/lib/koproperty/editoritem.cpp b/lib/koproperty/editoritem.cpp index a22bab55d..9ff690359 100644 --- a/lib/koproperty/editoritem.cpp +++ b/lib/koproperty/editoritem.cpp @@ -36,7 +36,7 @@ #include #include #include -#include +#include #include #define BRANCHBOX_SIZE 9 @@ -89,7 +89,7 @@ static void paintListViewExpander(TQPainter* p, TQWidget* w, int height, const T } //! @internal -//! Based on TDEPopupTitle, see kpopupmenu.cpp +//! Based on TDEPopupTitle, see tdepopupmenu.cpp class GroupWidgetBase : public TQWidget { public: diff --git a/lib/koproperty/editoritem.h b/lib/koproperty/editoritem.h index a1300e5a0..d3515073b 100644 --- a/lib/koproperty/editoritem.h +++ b/lib/koproperty/editoritem.h @@ -23,7 +23,7 @@ #define KPROPERTY_PROPERTYEDITORITEM_H #include "koproperty_global.h" -#include +#include #define KPROPEDITOR_ITEM_MARGIN 2 #define KPROPEDITOR_ITEM_BORDER_COLOR TQColor(200,200,200) //! \todo custom color? diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp index 84c7c3d27..2de0468b2 100644 --- a/lib/koproperty/editors/fontedit.cpp +++ b/lib/koproperty/editors/fontedit.cpp @@ -32,8 +32,8 @@ #include #include -#include -#include +#include +#include #include //! @internal diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp index f803d4c3b..a01248f2c 100644 --- a/lib/koproperty/editors/pixmapedit.cpp +++ b/lib/koproperty/editors/pixmapedit.cpp @@ -40,7 +40,7 @@ #ifdef TQ_WS_WIN #include -#include +#include #endif #ifndef PURE_QT diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp index 77ceb415d..06277aa48 100644 --- a/lib/koproperty/test/test.cpp +++ b/lib/koproperty/test/test.cpp @@ -17,7 +17,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include #include diff --git a/lib/koproperty/test/test.h b/lib/koproperty/test/test.h index 51ee85f53..2866031aa 100644 --- a/lib/koproperty/test/test.h +++ b/lib/koproperty/test/test.h @@ -24,7 +24,7 @@ #include #endif -#include +#include #include diff --git a/lib/koproperty/widget.cpp b/lib/koproperty/widget.cpp index 3d6153ae4..2028e75cd 100644 --- a/lib/koproperty/widget.cpp +++ b/lib/koproperty/widget.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include using namespace KoProperty; diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp index 4f503d17a..60b74bb00 100644 --- a/lib/kotext/KoAutoFormatDia.cpp +++ b/lib/kotext/KoAutoFormatDia.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kotext/KoCustomVariablesDia.h b/lib/kotext/KoCustomVariablesDia.h index 25b826ab4..2d796725d 100644 --- a/lib/kotext/KoCustomVariablesDia.h +++ b/lib/kotext/KoCustomVariablesDia.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include class TQComboBox; class TQVBox; diff --git a/lib/kotext/KoFontDia.h b/lib/kotext/KoFontDia.h index a3e35b1d3..a0779a84d 100644 --- a/lib/kotext/KoFontDia.h +++ b/lib/kotext/KoFontDia.h @@ -20,7 +20,7 @@ #ifndef __kofontdia_h__ #define __kofontdia_h__ -#include +#include #include #include #include diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp index 7bbca0417..52aba2370 100644 --- a/lib/kotext/KoSearchDia.cpp +++ b/lib/kotext/KoSearchDia.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include #include #include diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp index 55c54e9d7..a261d59f4 100644 --- a/lib/kotext/KoTextView.cpp +++ b/lib/kotext/KoTextView.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include @@ -357,7 +357,7 @@ void KoTextView::handleKeyPressEvent( TQKeyEvent * e, TQWidget *widget, const TQ } // We should use TDEAccel instead, to make this configurable ! // Well, those are all alternate keys, for keys already configurable (KDE-wide) - // and a kaccel makes it hard to + // and a tdeaccel makes it hard to else { if ( e->state() & ControlButton ) { diff --git a/lib/kotext/KoVariable.h b/lib/kotext/KoVariable.h index 8a066456f..6113b6d67 100644 --- a/lib/kotext/KoVariable.h +++ b/lib/kotext/KoVariable.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include "KoRichText.h" #include #include diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp index 7103821b6..cf41b3b42 100644 --- a/lib/kotext/TDEFontDialog_local.cpp +++ b/lib/kotext/TDEFontDialog_local.cpp @@ -48,7 +48,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/kotext/TDEFontDialog_local.h b/lib/kotext/TDEFontDialog_local.h index 4c2388746..a9001e716 100644 --- a/lib/kotext/TDEFontDialog_local.h +++ b/lib/kotext/TDEFontDialog_local.h @@ -1,5 +1,5 @@ /* - $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ + $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ Requires the TQt widget libraries, available at no cost at http://www.troll.no @@ -52,7 +52,7 @@ class KIntNumInput; * TDEFontDialog_local. * * @author Preston Brown , Bernd Wuebben - * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ + * @version $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ class KOTEXT_EXPORT TDEFontChooser_local : public TQWidget { @@ -343,10 +343,10 @@ private: * ... * \endcode * - * \image html kfontdialog.png "KDE Font Dialog" + * \image html tdefontdialog.png "KDE Font Dialog" * * @author Preston Brown , Bernd Wuebben - * @version $Id: kfontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ + * @version $Id: tdefontdialog.h,v 1.71 2004/10/10 10:27:49 bhards Exp $ */ class KOTEXT_EXPORT TDEFontDialog_local : public KDialogBase { Q_OBJECT diff --git a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic index 6ec0f9443..d09d64135 100755 --- a/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic +++ b/lib/kotext/kohyphen/hyphdicts/hyph_sv.dic @@ -1765,7 +1765,7 @@ k2lej k2lim 3klip k2lis -5klist3r +5tdelist3r k5lock. 5klocka 3klos @@ -4374,7 +4374,7 @@ yg4g^^e5 ygs4p y1i y1ki -y5klist +y5tdelist yk5lon yk3n y1ko diff --git a/lib/kross/api/eventaction.cpp b/lib/kross/api/eventaction.cpp index 7578eb30f..89a115f6b 100644 --- a/lib/kross/api/eventaction.cpp +++ b/lib/kross/api/eventaction.cpp @@ -21,7 +21,7 @@ #include "variant.h" //#include -//#include +//#include using namespace Kross::Api; diff --git a/lib/kross/api/eventaction.h b/lib/kross/api/eventaction.h index 602a697fe..1561957d4 100644 --- a/lib/kross/api/eventaction.h +++ b/lib/kross/api/eventaction.h @@ -22,7 +22,7 @@ #include //#include -#include +#include #include #include "event.h" diff --git a/lib/kross/main/mainmodule.h b/lib/kross/main/mainmodule.h index 06a4836dc..6465a070e 100644 --- a/lib/kross/main/mainmodule.h +++ b/lib/kross/main/mainmodule.h @@ -34,7 +34,7 @@ #include #include -#include +#include namespace Kross { namespace Api { diff --git a/lib/kross/main/scriptaction.h b/lib/kross/main/scriptaction.h index 4d60d4dcb..ce6544bc6 100644 --- a/lib/kross/main/scriptaction.h +++ b/lib/kross/main/scriptaction.h @@ -21,7 +21,7 @@ #define KROSS_API_SCRIPTACTION_H #include -#include +#include #include "scriptcontainer.h" diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp index 9dd304ae5..ae449a420 100644 --- a/lib/kross/main/scriptguiclient.cpp +++ b/lib/kross/main/scriptguiclient.cpp @@ -23,7 +23,7 @@ #include "wdgscriptsmanager.h" #include -#include +#include #include #include #include diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp index de653fbd5..4cbae0814 100644 --- a/lib/kross/main/wdgscriptsmanager.cpp +++ b/lib/kross/main/wdgscriptsmanager.cpp @@ -28,12 +28,12 @@ #include #include #include -#include +#include #include #include #include #include -#include +#include #if KDE_IS_VERSION(3, 4, 0) // The KNewStuffSecure we use internaly for the GetHotNewStuff-functionality diff --git a/lib/kross/main/wdgscriptsmanagerbase.ui b/lib/kross/main/wdgscriptsmanagerbase.ui index 116b1ca30..1c9e7247e 100644 --- a/lib/kross/main/wdgscriptsmanagerbase.ui +++ b/lib/kross/main/wdgscriptsmanagerbase.ui @@ -213,7 +213,7 @@ TDEToolBar -
ktoolbar.h
+
tdetoolbar.h
20 100 @@ -235,8 +235,8 @@ - klistview.h - ktoolbar.h + tdelistview.h + tdetoolbar.h kpushbutton.h kpushbutton.h kpushbutton.h diff --git a/lib/kross/python/cxx/cxx_extensions.cxx b/lib/kross/python/cxx/cxx_extensions.cxx index f9c942adf..eb9bd4508 100644 --- a/lib/kross/python/cxx/cxx_extensions.cxx +++ b/lib/kross/python/cxx/cxx_extensions.cxx @@ -316,7 +316,7 @@ PythonType::PythonType( size_t basic_size, int itemsize, const char *default_nam #if PY_MAJOR_VERSION > 2 || (PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION >= 1) // first defined in 2.1 table->tp_richcompare = 0L; - table->tp_weaklistoffset = 0L; + table->tp_weatdelistoffset = 0L; #else table->tp_xxx7 = 0L; table->tp_xxx8 = 0L; diff --git a/lib/kross/test/testaction.h b/lib/kross/test/testaction.h index 32e6cdcd7..8e2d355ef 100644 --- a/lib/kross/test/testaction.h +++ b/lib/kross/test/testaction.h @@ -26,8 +26,8 @@ #include #include -#include -#include +#include +#include class TestAction : public TQWidget { diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp index f83d7aceb..4175bc9ee 100644 --- a/lib/kross/test/testwindow.cpp +++ b/lib/kross/test/testwindow.cpp @@ -30,7 +30,7 @@ #include #include -#include +#include #include #include diff --git a/lib/kross/test/testwindow.h b/lib/kross/test/testwindow.h index c3da5cc55..45f14de0e 100644 --- a/lib/kross/test/testwindow.h +++ b/lib/kross/test/testwindow.h @@ -28,7 +28,7 @@ //#include #include -#include +#include class TQComboBox; class KTextEdit;