summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc2
-rw-r--r--chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc2
-rw-r--r--chalk/chalkcolor/colorspaces/kis_lab_colorspace.h2
-rw-r--r--chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc2
-rw-r--r--chalk/chalkcolor/kis_basic_histogram_producers.cc2
-rw-r--r--chalk/chalkcolor/kis_basic_histogram_producers.h2
-rw-r--r--chalk/chalkcolor/kis_colorspace_factory_registry.cc4
-rw-r--r--chalk/chalkcolor/kis_composite_op.cc2
-rw-r--r--chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc2
-rw-r--r--chalk/colorspaces/cmyk_u8/cmyk_plugin.cc6
-rw-r--r--chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc2
-rw-r--r--chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc4
-rw-r--r--chalk/colorspaces/gray_u8/gray_plugin.cc6
-rw-r--r--chalk/colorspaces/gray_u8/kis_gray_colorspace.cc4
-rw-r--r--chalk/colorspaces/gray_u8/kis_gray_colorspace.h2
-rw-r--r--chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc2
-rw-r--r--chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h2
-rw-r--r--chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc2
-rw-r--r--chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h2
-rw-r--r--chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc2
-rw-r--r--chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h2
-rw-r--r--chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc4
-rw-r--r--chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h2
-rw-r--r--chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc2
-rw-r--r--chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h2
-rw-r--r--chalk/colorspaces/rgb_u8/rgb_plugin.cc6
-rw-r--r--chalk/colorspaces/wet/kis_texture_filter.h2
-rw-r--r--chalk/colorspaces/wet/kis_wet_colorspace.cc2
-rw-r--r--chalk/colorspaces/wet/kis_wet_palette_widget.cc2
-rw-r--r--chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc2
-rw-r--r--chalk/colorspaces/wet/wet_plugin.cc6
-rw-r--r--chalk/colorspaces/wet/wetphysicsfilter.cc2
-rw-r--r--chalk/colorspaces/wet/wetphysicsfilter.h2
-rw-r--r--chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc6
-rw-r--r--chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc2
-rw-r--r--chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc6
-rw-r--r--chalk/colorspaces/wetsticky/wet_sticky_plugin.cc6
-rw-r--r--chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h2
-rw-r--r--chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h2
-rw-r--r--chalk/core/kis_brush.cc2
-rw-r--r--chalk/core/kis_convolution_painter.cc2
-rw-r--r--chalk/core/kis_crop_visitor.h2
-rw-r--r--chalk/core/kis_fill_painter.cc2
-rw-r--r--chalk/core/kis_filter.h2
-rw-r--r--chalk/core/kis_filter_registry.cc2
-rw-r--r--chalk/core/kis_filter_strategy.cc2
-rw-r--r--chalk/core/kis_filter_strategy.h2
-rw-r--r--chalk/core/kis_gradient.cc2
-rw-r--r--chalk/core/kis_gradient_painter.cc2
-rw-r--r--chalk/core/kis_group_layer.cc2
-rw-r--r--chalk/core/kis_image.cc2
-rw-r--r--chalk/core/kis_imagepipe_brush.cc2
-rw-r--r--chalk/core/kis_meta_registry.cc2
-rw-r--r--chalk/core/kis_paint_device.cc2
-rw-r--r--chalk/core/kis_painter.cc2
-rw-r--r--chalk/core/kis_paintop.h2
-rw-r--r--chalk/core/kis_paintop_registry.cc4
-rw-r--r--chalk/core/kis_palette.cc2
-rw-r--r--chalk/core/kis_pattern.cc2
-rw-r--r--chalk/core/kis_rotate_visitor.cc2
-rw-r--r--chalk/core/kis_scale_visitor.cc2
-rw-r--r--chalk/core/kis_scale_visitor.h2
-rw-r--r--chalk/core/kis_selection.cc2
-rw-r--r--chalk/core/kis_strategy_move.cc2
-rw-r--r--chalk/core/kis_thread_pool.cc2
-rw-r--r--chalk/core/kis_transform_visitor.h2
-rw-r--r--chalk/core/kis_transform_worker.cc2
-rw-r--r--chalk/core/tiles/kis_tilemanager.cc2
-rw-r--r--chalk/core/tiles/kis_tilemanager.h2
-rw-r--r--chalk/plugins/filters/bumpmap/bumpmap.cc6
-rw-r--r--chalk/plugins/filters/cimg/kis_cimg_filter.cc6
-rw-r--r--chalk/plugins/filters/colorsfilters/colorsfilters.cc6
-rw-r--r--chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc2
-rw-r--r--chalk/plugins/filters/convolutionfilters/convolutionfilters.cc2
-rw-r--r--chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc2
-rw-r--r--chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc2
-rw-r--r--chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc6
-rw-r--r--chalk/plugins/filters/embossfilter/kis_emboss_filter.cc6
-rw-r--r--chalk/plugins/filters/example/example.cc8
-rw-r--r--chalk/plugins/filters/imageenhancement/imageenhancement.cpp6
-rw-r--r--chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc6
-rw-r--r--chalk/plugins/filters/levelfilter/kis_level_filter.cc2
-rw-r--r--chalk/plugins/filters/levelfilter/levelfilter.cc6
-rw-r--r--chalk/plugins/filters/noisefilter/noisefilter.cc6
-rw-r--r--chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc6
-rw-r--r--chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc6
-rw-r--r--chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc6
-rw-r--r--chalk/plugins/filters/randompickfilter/randompickfilter.cc6
-rw-r--r--chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc6
-rw-r--r--chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc6
-rw-r--r--chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc6
-rw-r--r--chalk/plugins/filters/threadtest/threadtest.cc8
-rw-r--r--chalk/plugins/filters/wavefilter/wavefilter.cc6
-rw-r--r--chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc4
-rw-r--r--chalk/plugins/paintops/defaultpaintops/kis_penop.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/default_tools.cc6
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_brush.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc4
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_fill.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_gradient.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_line.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_move.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_pan.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_text.cc2
-rw-r--r--chalk/plugins/tools/defaulttools/kis_tool_zoom.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc2
-rw-r--r--chalk/plugins/tools/selectiontools/selection_tools.cc6
-rw-r--r--chalk/plugins/tools/tool_crop/kis_tool_crop.cc2
-rw-r--r--chalk/plugins/tools/tool_crop/tool_crop.cc4
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_curve.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_example.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/kis_tool_moutline.cc2
-rw-r--r--chalk/plugins/tools/tool_curves/tool_curves.cc4
-rw-r--r--chalk/plugins/tools/tool_filter/kis_tool_filter.cc2
-rw-r--r--chalk/plugins/tools/tool_filter/tool_filter.cc4
-rw-r--r--chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc2
-rw-r--r--chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc4
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc2
-rw-r--r--chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc4
-rw-r--r--chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc2
-rw-r--r--chalk/plugins/tools/tool_polygon/tool_polygon.cc4
-rw-r--r--chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc2
-rw-r--r--chalk/plugins/tools/tool_polyline/tool_polyline.cc4
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc2
-rw-r--r--chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc6
-rw-r--r--chalk/plugins/tools/tool_star/kis_tool_star.cc2
-rw-r--r--chalk/plugins/tools/tool_star/tool_star.cc4
-rw-r--r--chalk/plugins/tools/tool_transform/kis_tool_transform.cc2
-rw-r--r--chalk/plugins/tools/tool_transform/tool_transform.cc4
-rw-r--r--chalk/plugins/viewplugins/colorrange/colorrange.cc6
-rw-r--r--chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc2
-rw-r--r--chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc6
-rw-r--r--chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc2
-rw-r--r--chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc2
-rw-r--r--chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc6
-rw-r--r--chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc6
-rw-r--r--chalk/plugins/viewplugins/histogram/dlg_histogram.cc2
-rw-r--r--chalk/plugins/viewplugins/histogram/histogram.cc6
-rw-r--r--chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc6
-rw-r--r--chalk/plugins/viewplugins/history_docker/historydocker.cc6
-rw-r--r--chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc2
-rw-r--r--chalk/plugins/viewplugins/imagesize/dlg_layersize.cc2
-rw-r--r--chalk/plugins/viewplugins/imagesize/imagesize.cc6
-rw-r--r--chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc2
-rw-r--r--chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc2
-rw-r--r--chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc2
-rw-r--r--chalk/plugins/viewplugins/modify_selection/modify_selection.cc6
-rw-r--r--chalk/plugins/viewplugins/performancetest/dlg_perftest.cc2
-rw-r--r--chalk/plugins/viewplugins/performancetest/perftest.cc6
-rw-r--r--chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc2
-rw-r--r--chalk/plugins/viewplugins/rotateimage/rotateimage.cc6
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.cpp10
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshot.h2
-rw-r--r--chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui2
-rw-r--r--chalk/plugins/viewplugins/screenshot/main.cpp2
-rw-r--r--chalk/plugins/viewplugins/screenshot/regiongrabber.cpp2
-rw-r--r--chalk/plugins/viewplugins/screenshot/screenshot.cpp8
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp2
-rw-r--r--chalk/plugins/viewplugins/scripting/scripting.cc6
-rw-r--r--chalk/plugins/viewplugins/selectopaque/selectopaque.cc6
-rw-r--r--chalk/plugins/viewplugins/separate_channels/dlg_separate.cc2
-rw-r--r--chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc6
-rw-r--r--chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc6
-rw-r--r--chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc2
-rw-r--r--chalk/plugins/viewplugins/shearimage/shearimage.cc6
-rw-r--r--chalk/plugins/viewplugins/substrate/dlg_substrate.cc2
-rw-r--r--chalk/plugins/viewplugins/substrate/substrate.cc6
-rw-r--r--chalk/plugins/viewplugins/variations/dlg_variations.cc2
-rw-r--r--chalk/plugins/viewplugins/variations/variations.cc6
-rw-r--r--chalk/sdk/kis_global.h2
-rw-r--r--chalk/ui/kcurve.cc2
-rw-r--r--chalk/ui/kis_aboutdata.h2
-rw-r--r--chalk/ui/kis_birdeye_box.cc2
-rw-r--r--chalk/ui/kis_brush_chooser.cc2
-rw-r--r--chalk/ui/kis_clipboard.cc2
-rw-r--r--chalk/ui/kis_cmb_composite.cc2
-rw-r--r--chalk/ui/kis_cmb_idlist.cc2
-rw-r--r--chalk/ui/kis_color_cup.cc2
-rw-r--r--chalk/ui/kis_config.cc4
-rw-r--r--chalk/ui/kis_controlframe.cc4
-rw-r--r--chalk/ui/kis_custom_brush.cc4
-rw-r--r--chalk/ui/kis_custom_palette.cc8
-rw-r--r--chalk/ui/kis_custom_pattern.cc4
-rw-r--r--chalk/ui/kis_dlg_adj_layer_props.cc4
-rw-r--r--chalk/ui/kis_dlg_adjustment_layer.cc4
-rw-r--r--chalk/ui/kis_dlg_apply_profile.cc2
-rw-r--r--chalk/ui/kis_dlg_image_properties.cc2
-rw-r--r--chalk/ui/kis_dlg_layer_properties.cc2
-rw-r--r--chalk/ui/kis_dlg_new_layer.cc2
-rw-r--r--chalk/ui/kis_dlg_preferences.cc2
-rw-r--r--chalk/ui/kis_doc.cc6
-rw-r--r--chalk/ui/kis_factory.cc4
-rw-r--r--chalk/ui/kis_filter_manager.cc2
-rw-r--r--chalk/ui/kis_filters_listview.cc2
-rw-r--r--chalk/ui/kis_gradient_chooser.cc2
-rw-r--r--chalk/ui/kis_gradient_slider_widget.cc2
-rw-r--r--chalk/ui/kis_grid_manager.cpp2
-rw-r--r--chalk/ui/kis_int_spinbox.cc4
-rw-r--r--chalk/ui/kis_itemchooser.cc2
-rw-r--r--chalk/ui/kis_label_progress.cc2
-rw-r--r--chalk/ui/kis_layerbox.cc6
-rw-r--r--chalk/ui/kis_layerlist.cc4
-rw-r--r--chalk/ui/kis_multi_bool_filter_widget.cc2
-rw-r--r--chalk/ui/kis_multi_double_filter_widget.cc2
-rw-r--r--chalk/ui/kis_multi_integer_filter_widget.cc2
-rw-r--r--chalk/ui/kis_paintop_box.cc8
-rw-r--r--chalk/ui/kis_palette_view.cc8
-rw-r--r--chalk/ui/kis_palette_widget.cc8
-rw-r--r--chalk/ui/kis_part_layer.cc2
-rw-r--r--chalk/ui/kis_pattern_chooser.cc2
-rw-r--r--chalk/ui/kis_perspective_grid_manager.cpp4
-rw-r--r--chalk/ui/kis_resourceserver.cc2
-rw-r--r--chalk/ui/kis_selection_manager.cc2
-rw-r--r--chalk/ui/kis_tool.cc2
-rw-r--r--chalk/ui/kis_tool_dummy.cc2
-rw-r--r--chalk/ui/kis_tool_factory.h2
-rw-r--r--chalk/ui/kis_tool_freehand.cc2
-rw-r--r--chalk/ui/kis_tool_paint.cc2
-rw-r--r--chalk/ui/kis_tool_shape.cc2
-rw-r--r--chalk/ui/kis_view.cc6
-rw-r--r--chalk/ui/kobirdeyepanel.cpp4
-rw-r--r--chalk/ui/layerlist.cpp6
-rw-r--r--configure.in2
-rw-r--r--example/example_aboutdata.h2
-rw-r--r--example/example_factory.cc2
-rw-r--r--example/example_view.cc2
-rw-r--r--example/main.cc2
-rw-r--r--filters/chalk/gmagick/kis_image_magick_converter.cc2
-rw-r--r--filters/chalk/jpeg/kis_jpeg_converter.cc4
-rw-r--r--filters/chalk/magick/kis_image_magick_converter.cc2
-rw-r--r--filters/chalk/openexr/kis_openexr_export.cpp2
-rw-r--r--filters/chalk/png/kis_png_converter.cc4
-rw-r--r--filters/chalk/raw/kis_raw_import.cpp6
-rw-r--r--filters/chalk/tiff/kis_dlg_options_tiff.cpp2
-rw-r--r--filters/chalk/tiff/kis_tiff_writer_visitor.cpp4
-rw-r--r--filters/generic_wrapper/generic_filter.cc6
-rw-r--r--filters/karbon/ai/ai88handler.cc2
-rw-r--r--filters/karbon/eps/epsexportdlg.cc2
-rw-r--r--filters/karbon/msod/msodimport.cc2
-rw-r--r--filters/kchart/bmp/bmpexport.cpp2
-rw-r--r--filters/kchart/jpeg/jpegexport.cpp2
-rw-r--r--filters/kchart/libimageexport/imageexport.cpp2
-rw-r--r--filters/kchart/mng/mngexport.cpp2
-rw-r--r--filters/kchart/png/pngexport.cpp2
-rw-r--r--filters/kchart/svg/svgexport.cc2
-rw-r--r--filters/kchart/xbm/xbmexport.cpp2
-rw-r--r--filters/kchart/xpm/xpmexport.cpp2
-rw-r--r--filters/kformula/latex/latexexport.cc2
-rw-r--r--filters/kformula/mathml/mathmlexport.cc2
-rw-r--r--filters/kformula/mathml/mathmlimport.cc6
-rw-r--r--filters/kformula/png/pngexport.cc2
-rw-r--r--filters/kformula/png/pngexportdia.cc4
-rw-r--r--filters/kformula/svg/svgexport.cc2
-rw-r--r--filters/kivio/imageexport/kivio_imageexport.cpp4
-rw-r--r--filters/kivio/imageexport/kivio_imageexportdialog.cpp2
-rw-r--r--filters/kpresenter/bmp/bmpexport.cpp2
-rw-r--r--filters/kpresenter/jpeg/jpegexport.cpp2
-rw-r--r--filters/kpresenter/kword/kprkword.cc2
-rw-r--r--filters/kpresenter/libimageexport/imageexport.cpp2
-rw-r--r--filters/kpresenter/mng/mngexport.cpp2
-rw-r--r--filters/kpresenter/png/pngexport.cpp2
-rw-r--r--filters/kpresenter/svg/svgexport.cc2
-rw-r--r--filters/kpresenter/xbm/xbmexport.cpp2
-rw-r--r--filters/kpresenter/xpm/xpmexport.cpp2
-rw-r--r--filters/kspread/csv/csvdialog.cpp4
-rw-r--r--filters/kspread/csv/csvexport.cc2
-rw-r--r--filters/kspread/csv/csvexportdialog.cpp4
-rw-r--r--filters/kspread/csv/csvimport.cc2
-rw-r--r--filters/kspread/dbase/dbaseimport.cc2
-rw-r--r--filters/kspread/gnumeric/gnumericexport.cc2
-rw-r--r--filters/kspread/gnumeric/gnumericimport.cc2
-rw-r--r--filters/kspread/html/exportdialog.cc4
-rw-r--r--filters/kspread/kexi/kspread_kexiimport.cc4
-rw-r--r--filters/kspread/kexi/kspread_kexiimportdialog.cc4
-rw-r--r--filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc6
-rw-r--r--filters/kspread/latex/export/latexexport.cc4
-rw-r--r--filters/kspread/opencalc/opencalcexport.cc4
-rw-r--r--filters/kspread/opencalc/opencalcimport.cc2
-rw-r--r--filters/kspread/qpro/qproimport.cc2
-rw-r--r--filters/kword/abiword/ImportField.cc2
-rw-r--r--filters/kword/abiword/ImportStyle.cc2
-rw-r--r--filters/kword/abiword/abiwordimport.cc2
-rw-r--r--filters/kword/ascii/ExportDialog.cc6
-rw-r--r--filters/kword/ascii/ImportDialog.cc6
-rw-r--r--filters/kword/ascii/asciiimport.cc2
-rw-r--r--filters/kword/html/export/ExportBasic.cc2
-rw-r--r--filters/kword/html/export/ExportCss.cc2
-rw-r--r--filters/kword/html/export/ExportDialog.cc6
-rw-r--r--filters/kword/html/export/ExportDocStruct.cc2
-rw-r--r--filters/kword/html/export/ExportFilter.cc2
-rw-r--r--filters/kword/kword1.3/import/kword13document.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13import.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13oasisgenerator.cpp2
-rw-r--r--filters/kword/kword1.3/import/kword13picture.cpp2
-rw-r--r--filters/kword/latex/export/document.cc2
-rw-r--r--filters/kword/latex/export/kwordlatexexportdia.cc6
-rw-r--r--filters/kword/latex/export/latexexport.cc4
-rw-r--r--filters/kword/latex/export/texlauncher.cc4
-rw-r--r--filters/kword/latex/import/generator/kwordgenerator.cc2
-rw-r--r--filters/kword/latex/import/lateximport.cc4
-rw-r--r--filters/kword/latex/import/lateximportdia.cc2
-rw-r--r--filters/kword/latex/import/lateximportdia.h2
-rw-r--r--filters/kword/libexport/KWEFKWordLeader.cc4
-rw-r--r--filters/kword/msword/conversion.cpp2
-rw-r--r--filters/kword/msword/document.cpp2
-rw-r--r--filters/kword/msword/texthandler.cpp2
-rw-r--r--filters/kword/mswrite/ImportDialog.cc4
-rw-r--r--filters/kword/oowriter/ExportFilter.cc2
-rw-r--r--filters/kword/oowriter/conversion.cc2
-rw-r--r--filters/kword/oowriter/oowriterimport.cc2
-rw-r--r--filters/kword/pdf/FilterPage.cpp2
-rw-r--r--filters/kword/pdf/data.cpp4
-rw-r--r--filters/kword/pdf/dialog.cpp2
-rw-r--r--filters/kword/pdf/fstring.cpp2
-rw-r--r--filters/kword/pdf/misc.cpp2
-rw-r--r--filters/kword/pdf/pdfdocument.cpp2
-rw-r--r--filters/kword/rtf/export/ExportFilter.cc4
-rw-r--r--filters/kword/rtf/import/rtfimport.cpp2
-rw-r--r--filters/libdialogfilter/exportsizedia.cpp4
-rw-r--r--filters/olefilters/olefilter.cc2
-rw-r--r--filters/xsltfilter/export/xsltexportdia.cc6
-rw-r--r--filters/xsltfilter/import/xsltimport.cc4
-rw-r--r--filters/xsltfilter/import/xsltimportdia.cc6
-rw-r--r--karbon/commands/valigncmd.cc2
-rw-r--r--karbon/commands/vbooleancmd.cc2
-rw-r--r--karbon/commands/vcleanupcmd.cc2
-rw-r--r--karbon/commands/vclosepathcmd.cc2
-rw-r--r--karbon/commands/vcommand.cc2
-rw-r--r--karbon/commands/vdeletecmd.cc2
-rw-r--r--karbon/commands/vdeletenodescmd.cc2
-rw-r--r--karbon/commands/vdistributecmd.cc2
-rw-r--r--karbon/commands/vfillcmd.cc2
-rw-r--r--karbon/commands/vflattencmd.cc2
-rw-r--r--karbon/commands/vgroupcmd.cc2
-rw-r--r--karbon/commands/vinsertcmd.cc2
-rw-r--r--karbon/commands/vstrokecmd.cc2
-rw-r--r--karbon/commands/vtextcmd.cc2
-rw-r--r--karbon/commands/vtransformcmd.cc2
-rw-r--r--karbon/commands/vungroupcmd.cc2
-rw-r--r--karbon/commands/vzordercmd.cc2
-rw-r--r--karbon/core/vglobal.h2
-rw-r--r--karbon/core/vlayer.cc2
-rw-r--r--karbon/dialogs/vcolordlg.cc2
-rw-r--r--karbon/dialogs/vcolortab.cc2
-rw-r--r--karbon/dialogs/vconfiguredlg.cc2
-rw-r--r--karbon/dialogs/vstrokedlg.cc2
-rw-r--r--karbon/dockers/vcolordocker.cc2
-rw-r--r--karbon/dockers/vdocumentdocker.cc4
-rw-r--r--karbon/dockers/vstrokedocker.cc2
-rw-r--r--karbon/dockers/vstyledocker.cc2
-rw-r--r--karbon/dockers/vtransformdocker.cc2
-rw-r--r--karbon/karbon_aboutdata.h2
-rw-r--r--karbon/karbon_factory.cc4
-rw-r--r--karbon/karbon_part.cc4
-rw-r--r--karbon/karbon_resourceserver.cc4
-rw-r--r--karbon/karbon_view.cc4
-rw-r--r--karbon/main.cc2
-rw-r--r--karbon/plugins/flattenpath/flattenpathplugin.cc2
-rw-r--r--karbon/plugins/imagetool/vimagetool.cc2
-rw-r--r--karbon/plugins/shadoweffect/shadoweffectplugin.cc2
-rw-r--r--karbon/plugins/zoomtool/vzoomtool.cc2
-rw-r--r--karbon/render/vkopainter.cc2
-rw-r--r--karbon/shapes/vellipse.cc2
-rw-r--r--karbon/shapes/vpolygon.cc2
-rw-r--r--karbon/shapes/vpolyline.cc2
-rw-r--r--karbon/shapes/vrectangle.cc2
-rw-r--r--karbon/shapes/vsinus.cc2
-rw-r--r--karbon/shapes/vspiral.cc2
-rw-r--r--karbon/shapes/vstar.cc2
-rw-r--r--karbon/tools/vellipsetool.cc2
-rw-r--r--karbon/tools/vgradienttool.cc2
-rw-r--r--karbon/tools/vpatterntool.cc2
-rw-r--r--karbon/tools/vpenciltool.cc2
-rw-r--r--karbon/tools/vpenciltool.h2
-rw-r--r--karbon/tools/vpolygontool.cc2
-rw-r--r--karbon/tools/vpolylinetool.cc2
-rw-r--r--karbon/tools/vrectangletool.cc2
-rw-r--r--karbon/tools/vrectangletool.h2
-rw-r--r--karbon/tools/vrotatetool.cc2
-rw-r--r--karbon/tools/vroundrecttool.h2
-rw-r--r--karbon/tools/vselectnodestool.cc2
-rw-r--r--karbon/tools/vselecttool.h2
-rw-r--r--karbon/tools/vsheartool.cc2
-rw-r--r--karbon/tools/vsinustool.cc2
-rw-r--r--karbon/tools/vspiraltool.cc2
-rw-r--r--karbon/tools/vspiraltool.h2
-rw-r--r--karbon/tools/vstartool.cc2
-rw-r--r--karbon/tools/vstartool.h2
-rw-r--r--karbon/tools/vtexttool.cc2
-rw-r--r--karbon/visitors/vselectiondesc.cc2
-rw-r--r--karbon/vtool.h2
-rw-r--r--karbon/widgets/vcanvas.cc2
-rw-r--r--karbon/widgets/vgradienttabwidget.cc2
-rw-r--r--karbon/widgets/vgradientwidget.cc2
-rw-r--r--karbon/widgets/vselecttoolbar.cc2
-rw-r--r--karbon/widgets/vsmallpreview.cc2
-rw-r--r--karbon/widgets/vtranslate.cc2
-rw-r--r--karbon/widgets/vtypebuttonbox.cc2
-rw-r--r--kchart/csvimportdialog.cc4
-rw-r--r--kchart/kchartBackgroundPixmapConfigPage.cc6
-rw-r--r--kchart/kchartColorConfigPage.cc2
-rw-r--r--kchart/kchartComboConfigPage.cc2
-rw-r--r--kchart/kchartConfigDialog.cc2
-rw-r--r--kchart/kchartDataConfigPage.cc2
-rw-r--r--kchart/kchartDataEditor.cc4
-rw-r--r--kchart/kchartFontConfigPage.cc2
-rw-r--r--kchart/kchartHeaderFooterConfigPage.cc2
-rw-r--r--kchart/kchartLegendConfigPage.cc2
-rw-r--r--kchart/kchartLine3dConfigPage.cc2
-rw-r--r--kchart/kchartPageLayout.cc2
-rw-r--r--kchart/kchartParameter3dConfigPage.cc2
-rw-r--r--kchart/kchartParameterConfigPage.cc2
-rw-r--r--kchart/kchartParameterPieConfigPage.cc2
-rw-r--r--kchart/kchartParameterPolarConfigPage.cc2
-rw-r--r--kchart/kchartPieConfigPage.cc2
-rw-r--r--kchart/kchartPrinterDlg.cc2
-rw-r--r--kchart/kchartSubTypeChartPage.cc2
-rw-r--r--kchart/kchartWizard.cc2
-rw-r--r--kchart/kchartWizard.h2
-rw-r--r--kchart/kchartWizardLabelsLegendPage.cc2
-rw-r--r--kchart/kchartWizardSelectChartSubTypePage.cc4
-rw-r--r--kchart/kchartWizardSelectChartTypePage.cc4
-rw-r--r--kchart/kchartWizardSelectDataFormatPage.cc4
-rw-r--r--kchart/kchartWizardSetupAxesPage.cc2
-rw-r--r--kchart/kchart_aboutdata.h2
-rw-r--r--kchart/kchart_factory.cc2
-rw-r--r--kchart/kchart_params.cc2
-rw-r--r--kchart/kchart_part.cc2
-rw-r--r--kchart/kchart_view.cc8
-rw-r--r--kchart/main.cc2
-rw-r--r--kdgantt/KDGanttViewSubwidgets.cpp4
-rw-r--r--kexi/3rdparty/kolibs/KoPageLayoutSize.cpp4
-rw-r--r--kexi/3rdparty/kolibs/koGlobal.cc6
-rw-r--r--kexi/3rdparty/kolibs/koPageLayout.cpp4
-rw-r--r--kexi/3rdparty/kolibs/koPageLayoutDia.cc4
-rw-r--r--kexi/3rdparty/kolibs/koUnit.cc4
-rw-r--r--kexi/3rdparty/kolibs/koUnitWidgets.cc4
-rw-r--r--kexi/core/kexi.cpp2
-rw-r--r--kexi/core/kexi.h4
-rw-r--r--kexi/core/kexiaboutdata.cpp2
-rw-r--r--kexi/core/kexicmdlineargs.h2
-rw-r--r--kexi/core/kexicontexthelp.cpp2
-rw-r--r--kexi/core/kexiguimsghandler.cpp2
-rw-r--r--kexi/core/kexiinternalpart.cpp2
-rw-r--r--kexi/core/kexipart.cpp2
-rw-r--r--kexi/core/kexiproject.cpp2
-rw-r--r--kexi/core/kexiprojectconnectiondata.cpp6
-rw-r--r--kexi/core/kexiprojectdata.cpp6
-rw-r--r--kexi/core/kexitemplateloader.cpp4
-rw-r--r--kexi/core/kexiuseraction.cpp2
-rw-r--r--kexi/core/kexiuseractionmethod.cpp2
-rw-r--r--kexi/formeditor/commands.cpp4
-rw-r--r--kexi/formeditor/connectiondialog.cpp4
-rw-r--r--kexi/formeditor/container.cpp2
-rw-r--r--kexi/formeditor/editlistviewdialog.cpp2
-rw-r--r--kexi/formeditor/factories/containerfactory.cpp2
-rw-r--r--kexi/formeditor/factories/stdwidgetfactory.cpp2
-rw-r--r--kexi/formeditor/form.cpp4
-rw-r--r--kexi/formeditor/formIO.cpp2
-rw-r--r--kexi/formeditor/formmanager.cpp8
-rw-r--r--kexi/formeditor/objecttreeview.cpp2
-rw-r--r--kexi/formeditor/resizehandle.cpp2
-rw-r--r--kexi/formeditor/richtextdialog.cpp2
-rw-r--r--kexi/formeditor/tabstopdialog.cpp2
-rw-r--r--kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp4
-rw-r--r--kexi/formeditor/test/kfd_mainwindow.cpp4
-rw-r--r--kexi/formeditor/test/kfd_part.cpp4
-rw-r--r--kexi/formeditor/test/main.cpp2
-rw-r--r--kexi/formeditor/widgetfactory.cpp2
-rw-r--r--kexi/formeditor/widgetlibrary.cpp2
-rw-r--r--kexi/formeditor/widgetpropertyset.cpp4
-rw-r--r--kexi/kexidb/connection.cpp2
-rw-r--r--kexi/kexidb/connectiondata.cpp2
-rw-r--r--kexi/kexidb/cursor.cpp2
-rw-r--r--kexi/kexidb/dbproperties.cpp2
-rw-r--r--kexi/kexidb/driver.cpp2
-rw-r--r--kexi/kexidb/drivermanager.cpp2
-rw-r--r--kexi/kexidb/drivers/mySQL/mysqlcursor.cpp2
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxconnection.cpp2
-rw-r--r--kexi/kexidb/drivers/pqxx/pqxxcursor.cpp2
-rw-r--r--kexi/kexidb/drivers/sqlite/sqlitecursor.cpp2
-rw-r--r--kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp6
-rw-r--r--kexi/kexidb/expression.cpp2
-rw-r--r--kexi/kexidb/field.cpp2
-rw-r--r--kexi/kexidb/object.cpp2
-rw-r--r--kexi/kexidb/object.h2
-rw-r--r--kexi/kexidb/parser/parser_p.cpp2
-rw-r--r--kexi/kexidb/parser/sqlparser.cpp2
-rw-r--r--kexi/kexidb/parser/sqlparser.y2
-rw-r--r--kexi/kexidb/parser/sqlscanner.cpp2
-rw-r--r--kexi/kexidb/parser/sqlscanner.l2
-rw-r--r--kexi/kexidb/queryschema.cpp2
-rw-r--r--kexi/kexidb/utils.cpp6
-rw-r--r--kexi/kexiutils/validator.h2
-rw-r--r--kexi/main/kexifinddialog.cpp2
-rw-r--r--kexi/main/keximainwindowimpl.cpp6
-rw-r--r--kexi/main/keximainwindowimpl.h2
-rw-r--r--kexi/main/kexinamewidget.cpp4
-rw-r--r--kexi/main/kexinewstuff.cpp2
-rw-r--r--kexi/main/kexistatusbar.cpp4
-rw-r--r--kexi/main/printing/kexisimpleprintingengine.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintingpagesetup.cpp2
-rw-r--r--kexi/main/printing/kexisimpleprintpreviewwindow.cpp2
-rw-r--r--kexi/main/startup/KexiConnSelector.cpp2
-rw-r--r--kexi/main/startup/KexiNewProjectWizard.cpp4
-rw-r--r--kexi/main/startup/KexiProjectSelector.cpp2
-rw-r--r--kexi/main/startup/KexiStartup.cpp4
-rw-r--r--kexi/main/startup/KexiStartupDialog.cpp6
-rw-r--r--kexi/main/startup/KexiStartupFileDialog.cpp4
-rw-r--r--kexi/main/startup/KexiStartup_p.cpp2
-rw-r--r--kexi/migration/importoptionsdlg.cpp4
-rw-r--r--kexi/migration/importwizard.cpp2
-rw-r--r--kexi/migration/migratemanager.cpp2
-rw-r--r--kexi/plugins/forms/kexidataprovider.cpp2
-rw-r--r--kexi/plugins/forms/kexidatasourcepage.cpp2
-rw-r--r--kexi/plugins/forms/kexidbfactory.cpp2
-rw-r--r--kexi/plugins/forms/kexiformeventhandler.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbautofield.cpp2
-rw-r--r--kexi/plugins/forms/widgets/kexidbimagebox.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexport.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvexportwizard.cpp2
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportdialog.cpp6
-rw-r--r--kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp4
-rw-r--r--kexi/plugins/importexport/csv/kexicsvwidgets.cpp2
-rw-r--r--kexi/plugins/macros/kexiactions/datatableaction.cpp2
-rw-r--r--kexi/plugins/macros/kexiactions/executeaction.cpp2
-rw-r--r--kexi/plugins/macros/kexiactions/messageaction.cpp4
-rw-r--r--kexi/plugins/macros/kexiactions/navigateaction.cpp2
-rw-r--r--kexi/plugins/macros/kexiactions/objectnamevariable.h2
-rw-r--r--kexi/plugins/macros/kexiactions/objectvariable.h2
-rw-r--r--kexi/plugins/macros/kexiactions/openaction.cpp2
-rw-r--r--kexi/plugins/macros/kexipart/keximacroerror.h4
-rw-r--r--kexi/plugins/macros/kexipart/keximacroproperty.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotest.cpp2
-rw-r--r--kexi/plugins/macros/tests/komacrotestgui.cpp2
-rw-r--r--kexi/plugins/macros/tests/testaction.cpp2
-rw-r--r--kexi/plugins/queries/kexiaddparamdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignerguieditor.cpp4
-rw-r--r--kexi/plugins/queries/kexiquerydesignersql.cpp2
-rw-r--r--kexi/plugins/queries/kexiquerydesignersqlhistory.cpp4
-rw-r--r--kexi/plugins/relations/kexirelationmaindlg.cpp2
-rw-r--r--kexi/plugins/reports/kexireportfactory.cpp2
-rw-r--r--kexi/plugins/tables/kexilookupcolumnpage.cpp2
-rw-r--r--kexi/plugins/tables/kexitabledesignercommands.cpp4
-rw-r--r--kexi/plugins/tables/kexitabledesignerview.cpp4
-rw-r--r--kexi/plugins/tables/kexitabledesignerview_p.cpp4
-rw-r--r--kexi/plugins/tables/kexitablepart.cpp2
-rw-r--r--kexi/tests/gui/finddialog/kexifinddialog.cpp2
-rw-r--r--kexi/tests/gui/finddialog/main.cpp2
-rw-r--r--kexi/tests/tableview/main.cpp2
-rw-r--r--kexi/widget/kexibrowser.cpp4
-rw-r--r--kexi/widget/kexicharencodingcombobox.cpp4
-rw-r--r--kexi/widget/kexidatatable.cpp2
-rw-r--r--kexi/widget/kexidswelcome.cpp4
-rw-r--r--kexi/widget/kexieditor.cpp2
-rw-r--r--kexi/widget/kexifieldcombobox.cpp4
-rw-r--r--kexi/widget/kexifieldlistview.cpp4
-rw-r--r--kexi/widget/kexipropertyeditorview.cpp2
-rw-r--r--kexi/widget/kexiqueryparameters.cpp2
-rw-r--r--kexi/widget/kexiscrollview.cpp2
-rw-r--r--kexi/widget/kexismalltoolbutton.cpp2
-rw-r--r--kexi/widget/pixmapcollection.cpp4
-rw-r--r--kexi/widget/relations/kexirelationview.cpp6
-rw-r--r--kexi/widget/relations/kexirelationviewtable.cpp2
-rw-r--r--kexi/widget/relations/kexirelationwidget.cpp2
-rw-r--r--kexi/widget/tableview/kexiblobtableedit.cpp6
-rw-r--r--kexi/widget/tableview/kexibooltableedit.cpp6
-rw-r--r--kexi/widget/tableview/kexidataawareobjectiface.cpp2
-rw-r--r--kexi/widget/tableview/kexidatatableview.cpp4
-rw-r--r--kexi/widget/tableview/kexidatetableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexidatetimetableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexiinputtableedit.cpp6
-rw-r--r--kexi/widget/tableview/kexitableedit.cpp4
-rw-r--r--kexi/widget/tableview/kexitableview.cpp6
-rw-r--r--kexi/widget/tableview/kexitableview_p.cpp2
-rw-r--r--kexi/widget/tableview/kexitableviewdata.cpp2
-rw-r--r--kexi/widget/tableview/kexitextformatter.cpp2
-rw-r--r--kexi/widget/tableview/kexitimetableedit.cpp4
-rw-r--r--kexi/widget/utils/kexicontextmenuutils.cpp4
-rw-r--r--kexi/widget/utils/kexidatetimeformatter.cpp4
-rw-r--r--kexi/widget/utils/kexidisplayutils.cpp2
-rw-r--r--kexi/widget/utils/kexirecordnavigator.cpp2
-rw-r--r--kformula/formulastring.cc4
-rw-r--r--kformula/fsparser.cc2
-rw-r--r--kformula/kfconfig.cc2
-rw-r--r--kformula/kformula_aboutdata.h2
-rw-r--r--kformula/kformula_doc.cc4
-rw-r--r--kformula/kformula_factory.cc4
-rw-r--r--kformula/kformula_view.cc4
-rw-r--r--kformula/main.cc2
-rw-r--r--kivio/kiviopart/config/kivio.kcfg4
-rw-r--r--kivio/kiviopart/kivio_aboutdata.h2
-rw-r--r--kivio/kiviopart/kivio_canvas.cpp4
-rw-r--r--kivio/kiviopart/kivio_dlg_pageshow.cpp2
-rw-r--r--kivio/kiviopart/kivio_doc.cpp8
-rw-r--r--kivio/kiviopart/kivio_factory.cpp2
-rw-r--r--kivio/kiviopart/kivio_icon_view.cpp4
-rw-r--r--kivio/kiviopart/kivio_page.cpp6
-rw-r--r--kivio/kiviopart/kivio_stencil_geometry_panel.cpp2
-rw-r--r--kivio/kiviopart/kivio_view.cpp8
-rw-r--r--kivio/kiviopart/kivio_zoomaction.cpp2
-rw-r--r--kivio/kiviopart/kivioarrowheadaction.cpp2
-rw-r--r--kivio/kiviopart/kivioglobal.cpp4
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_layer.cpp2
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_stencil.h2
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp4
-rw-r--r--kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp4
-rw-r--r--kivio/kiviopart/kiviostencilsetaction.cpp2
-rw-r--r--kivio/kiviopart/kiviostencilsetinstaller.cpp4
-rw-r--r--kivio/kiviopart/main.cpp2
-rw-r--r--kivio/kiviopart/stencilbardockmanager.cpp2
-rw-r--r--kivio/kiviopart/ui/addstencilsetdialog.cpp2
-rw-r--r--kivio/kiviopart/ui/export_page_dialog.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_birdeye_panel.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_layer_panel.cpp2
-rw-r--r--kivio/kiviopart/ui/kivio_protection_panel.cpp2
-rw-r--r--kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp2
-rw-r--r--kivio/kiviopart/ui/kivioaligndialog.cpp2
-rw-r--r--kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp2
-rw-r--r--kivio/kiviopart/ui/kiviooptionsdialog.cpp4
-rw-r--r--kivio/kiviopart/ui/kiviostencilformatdlg.cpp2
-rw-r--r--kivio/kiviopart/ui/kiviotextformatdlg.cpp2
-rw-r--r--kivio/kiviopart/ui/layerlisttooltip.cpp2
-rw-r--r--kivio/kiviopart/ui/objectlistpalette.cpp2
-rw-r--r--kivio/plugins/kivioconnectortool/tool_connector.cpp2
-rw-r--r--kivio/plugins/kivioselecttool/tool_select.cpp2
-rw-r--r--kivio/plugins/kiviosmlconnector/tool_connector.cpp2
-rw-r--r--kivio/plugins/kiviotargettool/kiviotargettool.cpp2
-rw-r--r--kivio/plugins/kiviotexttool/stenciltexteditor.cpp2
-rw-r--r--kivio/plugins/kiviotexttool/tool_text.cpp2
-rw-r--r--kivio/plugins/kiviozoomtool/tool_zoom.cpp2
-rw-r--r--koshell/iconsidepane.cpp2
-rw-r--r--koshell/koshell_main.cc2
-rw-r--r--koshell/koshell_shell.cc6
-rw-r--r--kounavail/kounavail.cc4
-rw-r--r--kplato/kptaboutdata.h2
-rw-r--r--kplato/kptaccount.cc2
-rw-r--r--kplato/kptaccountsdialog.cc2
-rw-r--r--kplato/kptaccountspanel.cc2
-rw-r--r--kplato/kptaccountsview.cc4
-rw-r--r--kplato/kptaccountsviewconfigdialog.cc2
-rw-r--r--kplato/kptcalendar.cc2
-rw-r--r--kplato/kptcalendaredit.cc6
-rw-r--r--kplato/kptcalendareditbase.cc2
-rw-r--r--kplato/kptcalendarlistdialog.cc6
-rw-r--r--kplato/kptcalendarlistdialogbase.cc2
-rw-r--r--kplato/kptcalendarpanel.cc4
-rw-r--r--kplato/kptcanvasitem.cc2
-rw-r--r--kplato/kptcommand.cc2
-rw-r--r--kplato/kptconfigbehaviorpanel.cc4
-rw-r--r--kplato/kptconfigdialog.cc2
-rw-r--r--kplato/kptdatetable.cc2
-rw-r--r--kplato/kptdatetable.h4
-rw-r--r--kplato/kptdoublelistviewbase.cc4
-rw-r--r--kplato/kptduration.cc4
-rw-r--r--kplato/kptdurationwidget.ui.h4
-rw-r--r--kplato/kptfactory.cc2
-rw-r--r--kplato/kptganttview.cc6
-rw-r--r--kplato/kptintervaledit.cc2
-rw-r--r--kplato/kptmainprojectdialog.cc2
-rw-r--r--kplato/kptmainprojectpanel.cc8
-rw-r--r--kplato/kptmilestoneprogressdialog.cc2
-rw-r--r--kplato/kptmilestoneprogresspanel.cc4
-rw-r--r--kplato/kptnode.cc2
-rw-r--r--kplato/kptpart.cc4
-rw-r--r--kplato/kptpertcanvas.cc6
-rw-r--r--kplato/kptproject.h2
-rw-r--r--kplato/kptprojectdialog.cc6
-rw-r--r--kplato/kptrelationdialog.cc4
-rw-r--r--kplato/kptreportview.cc6
-rw-r--r--kplato/kptrequestresourcespanel.cc4
-rw-r--r--kplato/kptresource.cc4
-rw-r--r--kplato/kptresourceappointmentsview.cc4
-rw-r--r--kplato/kptresourcedialog.cc10
-rw-r--r--kplato/kptresourcesdialog.cc2
-rw-r--r--kplato/kptresourcespanel.cc8
-rw-r--r--kplato/kptresourceview.cc4
-rw-r--r--kplato/kptschedule.cc2
-rw-r--r--kplato/kptstandardworktimedialog.cc4
-rw-r--r--kplato/kptsummarytaskdialog.cc2
-rw-r--r--kplato/kptsummarytaskgeneralpanel.cc8
-rw-r--r--kplato/kpttaskappointmentsview.cc4
-rw-r--r--kplato/kpttaskcostpanel.cc4
-rw-r--r--kplato/kpttaskdefaultpanel.cc8
-rw-r--r--kplato/kpttaskdialog.cc2
-rw-r--r--kplato/kpttaskgeneralpanel.cc8
-rw-r--r--kplato/kpttaskprogressdialog.cc2
-rw-r--r--kplato/kpttaskprogresspanel.cc4
-rw-r--r--kplato/kptview.cc4
-rw-r--r--kplato/kptwbsdefinition.cc2
-rw-r--r--kplato/kptwbsdefinitiondialog.cc2
-rw-r--r--kplato/kptwbsdefinitionpanel.cc2
-rw-r--r--kpresenter/KPrAboutData.h2
-rw-r--r--kpresenter/KPrBackDia.cpp2
-rw-r--r--kpresenter/KPrBackground.cpp2
-rw-r--r--kpresenter/KPrBgSpellCheck.cpp2
-rw-r--r--kpresenter/KPrBrushProperty.cpp2
-rw-r--r--kpresenter/KPrCanvas.cpp10
-rw-r--r--kpresenter/KPrConfig.cpp4
-rw-r--r--kpresenter/KPrCustomSlideShowDia.cpp4
-rw-r--r--kpresenter/KPrDocument.cpp10
-rw-r--r--kpresenter/KPrDuplicateObjDia.cpp2
-rw-r--r--kpresenter/KPrEffectDia.cpp4
-rw-r--r--kpresenter/KPrGeneralProperty.cpp2
-rw-r--r--kpresenter/KPrGotoPage.cpp2
-rw-r--r--kpresenter/KPrImageEffectDia.cpp2
-rw-r--r--kpresenter/KPrImportStyleDia.cpp4
-rw-r--r--kpresenter/KPrMSPresentationSetup.cpp10
-rw-r--r--kpresenter/KPrMarginWidget.cpp2
-rw-r--r--kpresenter/KPrMoveHelpLineDia.cpp2
-rw-r--r--kpresenter/KPrNoteBar.cpp4
-rw-r--r--kpresenter/KPrObject.h2
-rw-r--r--kpresenter/KPrPage.cpp2
-rw-r--r--kpresenter/KPrPenStyleWidget.cpp2
-rw-r--r--kpresenter/KPrPgConfDia.cpp4
-rw-r--r--kpresenter/KPrPieProperty.cpp2
-rw-r--r--kpresenter/KPrPolygonProperty.cpp2
-rw-r--r--kpresenter/KPrPresDurationDia.cpp2
-rw-r--r--kpresenter/KPrPrinterDlg.cpp2
-rw-r--r--kpresenter/KPrPropertyEditor.cpp2
-rw-r--r--kpresenter/KPrRotationDialogImpl.cpp2
-rw-r--r--kpresenter/KPrShadowDialogImpl.cpp2
-rw-r--r--kpresenter/KPrSideBar.cpp4
-rw-r--r--kpresenter/KPrSlideTransitionDia.cpp2
-rw-r--r--kpresenter/KPrTextObject.cpp4
-rw-r--r--kpresenter/KPrTextProperty.cpp2
-rw-r--r--kpresenter/KPrTransEffectDia.cpp2
-rw-r--r--kpresenter/KPrVariableCollection.cpp2
-rw-r--r--kpresenter/KPrView.cpp10
-rw-r--r--kpresenter/KPrWebPresentation.cpp10
-rw-r--r--kpresenter/autoformEdit/AFChoose.cpp2
-rw-r--r--kpresenter/main.cpp2
-rw-r--r--kspread/dialogs/kspread_dlg_angle.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_area.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_comment.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_conditional.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_cons.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_csv.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_database.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_find.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_format.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_goalseek.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_insert.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_layout.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_list.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_paperlayout.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_pasteinsert.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_preference.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_reference.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_series.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_show.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_showColRow.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_sort.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_special.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_styles.cc2
-rw-r--r--kspread/dialogs/kspread_dlg_subtotal.cc4
-rw-r--r--kspread/dialogs/kspread_dlg_validity.cc2
-rw-r--r--kspread/dialogs/link.cc4
-rw-r--r--kspread/dialogs/sheet_properties.cc2
-rw-r--r--kspread/formula.cc2
-rw-r--r--kspread/functions.cc2
-rw-r--r--kspread/kspread_aboutdata.h2
-rw-r--r--kspread/kspread_canvas.cc2
-rw-r--r--kspread/kspread_cell.cc2
-rw-r--r--kspread/kspread_doc.cc4
-rw-r--r--kspread/kspread_format.cc2
-rw-r--r--kspread/kspread_functions_datetime.cc2
-rw-r--r--kspread/kspread_functions_engineering.cc4
-rw-r--r--kspread/kspread_functions_financial.cc2
-rw-r--r--kspread/kspread_functions_information.cc2
-rw-r--r--kspread/kspread_functions_math.cc2
-rw-r--r--kspread/kspread_functions_text.cc2
-rw-r--r--kspread/kspread_generalProperty.cpp2
-rw-r--r--kspread/kspread_locale.h2
-rw-r--r--kspread/kspread_map.cc2
-rw-r--r--kspread/kspread_numformat.cc2
-rw-r--r--kspread/kspread_object.h2
-rw-r--r--kspread/kspread_propertyEditor.cpp2
-rw-r--r--kspread/kspread_sheet.cc2
-rw-r--r--kspread/kspread_sheetprint.cc2
-rw-r--r--kspread/kspread_style.cc2
-rw-r--r--kspread/kspread_style_manager.cc2
-rw-r--r--kspread/kspread_view.cc4
-rw-r--r--kspread/manipulator.cc4
-rw-r--r--kspread/manipulator.h2
-rw-r--r--kspread/manipulator_data.cc2
-rw-r--r--kspread/plugins/calculator/configdlg.cpp2
-rw-r--r--kspread/plugins/calculator/kcalc.cpp6
-rw-r--r--kspread/plugins/calculator/kcalc_core.cpp4
-rw-r--r--kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc4
-rw-r--r--kspread/tests/formula_tester.cc2
-rw-r--r--kspread/valueformatter.cc2
-rw-r--r--kugar/kudesigner/kudesigner_aboutdata.h2
-rw-r--r--kugar/kudesigner/kudesigner_doc.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_factory.cpp2
-rw-r--r--kugar/kudesigner/kudesigner_view.cpp2
-rw-r--r--kugar/kudesigner/main.cpp2
-rw-r--r--kugar/kudesigner_lib/band.cpp2
-rw-r--r--kugar/kudesigner_lib/calcfield.cpp2
-rw-r--r--kugar/kudesigner_lib/command.cpp2
-rw-r--r--kugar/kudesigner_lib/commdefs.cpp2
-rw-r--r--kugar/kudesigner_lib/detail.cpp2
-rw-r--r--kugar/kudesigner_lib/detailbase.cpp2
-rw-r--r--kugar/kudesigner_lib/detailfooter.cpp2
-rw-r--r--kugar/kudesigner_lib/detailheader.cpp2
-rw-r--r--kugar/kudesigner_lib/field.cpp2
-rw-r--r--kugar/kudesigner_lib/kugartemplate.cpp2
-rw-r--r--kugar/kudesigner_lib/label.cpp4
-rw-r--r--kugar/kudesigner_lib/line.cpp2
-rw-r--r--kugar/kudesigner_lib/pagefooter.cpp2
-rw-r--r--kugar/kudesigner_lib/pageheader.cpp2
-rw-r--r--kugar/kudesigner_lib/reportfooter.cpp2
-rw-r--r--kugar/kudesigner_lib/reportheader.cpp2
-rw-r--r--kugar/kudesigner_lib/reportitem.cpp4
-rw-r--r--kugar/kudesigner_lib/section.cpp2
-rw-r--r--kugar/kudesigner_lib/specialfield.cpp2
-rw-r--r--kugar/lib/mlabelobject.cpp2
-rw-r--r--kugar/lib/mreportviewer.cpp4
-rw-r--r--kugar/part/kugar_about.h2
-rw-r--r--kugar/part/kugar_factory.cpp4
-rw-r--r--kugar/part/kugar_part.cpp6
-rw-r--r--kugar/part/kugar_view.cpp6
-rw-r--r--kword/KWAboutData.h2
-rw-r--r--kword/KWBgSpellCheck.cpp2
-rw-r--r--kword/KWCanvas.cpp6
-rw-r--r--kword/KWCommand.cpp2
-rw-r--r--kword/KWConfig.cpp8
-rw-r--r--kword/KWConfigFootNoteDia.cpp2
-rw-r--r--kword/KWCreateBookmarkDia.cpp4
-rw-r--r--kword/KWDeleteDia.cpp2
-rw-r--r--kword/KWDocStruct.cpp6
-rw-r--r--kword/KWDocument.cpp6
-rw-r--r--kword/KWEditPersonnalExpression.cpp2
-rw-r--r--kword/KWFootNoteDia.cpp2
-rw-r--r--kword/KWFormulaFrameSet.cpp6
-rw-r--r--kword/KWFrameDia.cpp4
-rw-r--r--kword/KWFrameStyle.cpp2
-rw-r--r--kword/KWFrameStyleManager.cpp2
-rw-r--r--kword/KWFrameView.cpp2
-rw-r--r--kword/KWImportStyleDia.cpp4
-rw-r--r--kword/KWInsertDia.cpp2
-rw-r--r--kword/KWInsertPageDia.cpp2
-rw-r--r--kword/KWInsertPicDia.cpp2
-rw-r--r--kword/KWInsertTOCCommand.cpp2
-rw-r--r--kword/KWMailMergeDataBase.cpp4
-rw-r--r--kword/KWOasisLoader.cpp2
-rw-r--r--kword/KWPartFrameSet.cpp2
-rw-r--r--kword/KWPictureFrameSet.cpp2
-rw-r--r--kword/KWResizeTableDia.cpp2
-rw-r--r--kword/KWSortDia.cpp2
-rw-r--r--kword/KWSplitCellDia.cpp2
-rw-r--r--kword/KWStatisticsDialog.cpp2
-rw-r--r--kword/KWTableDia.cpp2
-rw-r--r--kword/KWTableFrameSet.cpp4
-rw-r--r--kword/KWTableStyle.cpp2
-rw-r--r--kword/KWTableStyleManager.cpp2
-rw-r--r--kword/KWTableTemplate.cpp2
-rw-r--r--kword/KWTableTemplateSelector.cpp2
-rw-r--r--kword/KWTextDocument.cpp4
-rw-r--r--kword/KWTextFrameSet.cpp4
-rw-r--r--kword/KWTextParag.cpp4
-rw-r--r--kword/KWVariable.cpp2
-rw-r--r--kword/KWView.cpp4
-rw-r--r--kword/mailmerge/KWClassicSerialDataSource.cpp2
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.cpp8
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABC.h2
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp10
-rw-r--r--kword/mailmerge/kabc/KWMailMergeKABCConfig.h2
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread.cpp4
-rw-r--r--kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlEasyFilter.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp2
-rw-r--r--kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp2
-rw-r--r--lib/kformula/MatrixDialog.cc2
-rw-r--r--lib/kformula/bracketelement.cc2
-rw-r--r--lib/kformula/fontstyle.cc4
-rw-r--r--lib/kformula/fractionelement.cc2
-rw-r--r--lib/kformula/identifierelement.cc2
-rw-r--r--lib/kformula/indexelement.cc2
-rw-r--r--lib/kformula/kformulacommand.cc2
-rw-r--r--lib/kformula/kformulaconfigpage.cc4
-rw-r--r--lib/kformula/kformulacontainer.cc2
-rw-r--r--lib/kformula/kformuladocument.cc4
-rw-r--r--lib/kformula/kformulamathmlread.cc4
-rw-r--r--lib/kformula/kformulawidget.cc2
-rw-r--r--lib/kformula/matrixelement.cc2
-rw-r--r--lib/kformula/numberelement.cc2
-rw-r--r--lib/kformula/operatorelement.cc2
-rw-r--r--lib/kformula/rootelement.cc2
-rw-r--r--lib/kformula/sequenceelement.cc2
-rw-r--r--lib/kformula/symbolaction.cc2
-rw-r--r--lib/kformula/symboltable.cc4
-rw-r--r--lib/kformula/tokenelement.cc2
-rw-r--r--lib/kofficecore/KoApplication.cpp4
-rw-r--r--lib/kofficecore/KoApplicationIface.cc4
-rw-r--r--lib/kofficecore/KoDetailsPane.cpp2
-rw-r--r--lib/kofficecore/KoDocument.cpp4
-rw-r--r--lib/kofficecore/KoDocumentChild.cpp4
-rw-r--r--lib/kofficecore/KoDocumentInfo.cpp4
-rw-r--r--lib/kofficecore/KoDocumentInfoDlg.cpp12
-rw-r--r--lib/kofficecore/KoFileDialog.cpp4
-rw-r--r--lib/kofficecore/KoFilter.cpp2
-rw-r--r--lib/kofficecore/KoFilterChain.cpp2
-rw-r--r--lib/kofficecore/KoFilterManager.cpp4
-rw-r--r--lib/kofficecore/KoGlobal.cpp6
-rw-r--r--lib/kofficecore/KoMainWindow.cpp8
-rw-r--r--lib/kofficecore/KoOasisStore.cpp4
-rw-r--r--lib/kofficecore/KoOasisStyles.cpp4
-rw-r--r--lib/kofficecore/KoOpenPane.cpp2
-rw-r--r--lib/kofficecore/KoPageLayout.cpp4
-rw-r--r--lib/kofficecore/KoPictureBase.cpp2
-rw-r--r--lib/kofficecore/KoPictureEps.cpp4
-rw-r--r--lib/kofficecore/KoSpeaker.cpp4
-rw-r--r--lib/kofficecore/KoTemplates.cpp2
-rw-r--r--lib/kofficecore/KoUnit.cpp4
-rw-r--r--lib/kofficecore/KoView.cpp4
-rw-r--r--lib/kofficecore/Koversiondialog.cpp4
-rw-r--r--lib/kofficecore/kkbdaccessextensions.cpp4
-rw-r--r--lib/kofficecore/tests/kopointtest.cpp2
-rw-r--r--lib/kofficecore/tests/korecttest.cpp2
-rw-r--r--lib/kofficeui/KoCharSelectDia.cpp2
-rw-r--r--lib/kofficeui/KoCommandHistory.cpp2
-rw-r--r--lib/kofficeui/KoContextCelp.cpp2
-rw-r--r--lib/kofficeui/KoEditPath.cpp2
-rw-r--r--lib/kofficeui/KoGuideLineDia.cpp2
-rw-r--r--lib/kofficeui/KoGuides.cpp2
-rw-r--r--lib/kofficeui/KoInsertLink.cpp2
-rw-r--r--lib/kofficeui/KoPageLayoutDia.cpp4
-rw-r--r--lib/kofficeui/KoPageLayoutSize.cpp4
-rw-r--r--lib/kofficeui/KoPartSelectDia.cpp2
-rw-r--r--lib/kofficeui/KoPictureFilePreview.cpp2
-rw-r--r--lib/kofficeui/KoRuler.cpp4
-rw-r--r--lib/kofficeui/KoSelectAction.cpp2
-rw-r--r--lib/kofficeui/KoTabChooser.cpp2
-rw-r--r--lib/kofficeui/KoTemplateChooseDia.cpp6
-rw-r--r--lib/kofficeui/KoTemplateCreateDia.cpp6
-rw-r--r--lib/kofficeui/KoToolBox.cpp2
-rw-r--r--lib/kofficeui/KoTooluButton.cpp4
-rw-r--r--lib/kofficeui/KoUnitWidgets.cpp4
-rw-r--r--lib/kofficeui/KoZoomAction.cpp2
-rw-r--r--lib/kofficeui/KoZoomMode.cpp2
-rw-r--r--lib/kofficeui/Kolinestyleaction.cpp2
-rw-r--r--lib/kofficeui/Kolinewidthaction.cpp2
-rw-r--r--lib/kofficeui/tkcoloractions.cpp2
-rw-r--r--lib/kofficeui/ttdetoolbarbutton.cpp2
-rw-r--r--lib/kofficeui/ttdetoolbarbutton.h2
-rw-r--r--lib/kopainter/koColorChooser.cc2
-rw-r--r--lib/kopainter/koIconChooser.cc2
-rw-r--r--lib/kopainter/ko_cmyk_widget.cc4
-rw-r--r--lib/kopainter/ko_hsv_widget.cc2
-rw-r--r--lib/kopainter/ko_rgb_widget.cc2
-rw-r--r--lib/kopalette/kopalette.cc6
-rw-r--r--lib/kopalette/kopalettemanager.cc4
-rw-r--r--lib/koproperty/customproperty.cpp2
-rw-r--r--lib/koproperty/editor.cpp2
-rw-r--r--lib/koproperty/editors/booledit.cpp2
-rw-r--r--lib/koproperty/editors/cursoredit.cpp2
-rw-r--r--lib/koproperty/editors/dateedit.cpp4
-rw-r--r--lib/koproperty/editors/datetimeedit.cpp4
-rw-r--r--lib/koproperty/editors/fontedit.cpp2
-rw-r--r--lib/koproperty/editors/pixmapedit.cpp2
-rw-r--r--lib/koproperty/editors/pointedit.cpp2
-rw-r--r--lib/koproperty/editors/rectedit.cpp2
-rw-r--r--lib/koproperty/editors/sizeedit.cpp2
-rw-r--r--lib/koproperty/editors/sizepolicyedit.cpp2
-rw-r--r--lib/koproperty/editors/spinbox.cpp4
-rw-r--r--lib/koproperty/editors/stringlistedit.cpp2
-rw-r--r--lib/koproperty/editors/symbolcombo.cpp2
-rw-r--r--lib/koproperty/editors/timeedit.cpp4
-rw-r--r--lib/koproperty/set.cpp2
-rw-r--r--lib/koproperty/test/main.cpp2
-rw-r--r--lib/koproperty/test/test.cpp2
-rw-r--r--lib/kotext/DateFormatWidget.cpp4
-rw-r--r--lib/kotext/KoAutoFormat.cpp12
-rw-r--r--lib/kotext/KoAutoFormatDia.cpp4
-rw-r--r--lib/kotext/KoBgSpellCheck.cpp2
-rw-r--r--lib/kotext/KoChangeCaseDia.cpp2
-rw-r--r--lib/kotext/KoCommentDia.cpp4
-rw-r--r--lib/kotext/KoCompletionDia.cpp4
-rw-r--r--lib/kotext/KoCreateStyleDia.cpp4
-rw-r--r--lib/kotext/KoCustomVariablesDia.cpp2
-rw-r--r--lib/kotext/KoDecorationTab.cpp2
-rw-r--r--lib/kotext/KoFontDia.cpp2
-rw-r--r--lib/kotext/KoFontDiaPreview.cpp2
-rw-r--r--lib/kotext/KoImportStyleDia.cpp2
-rw-r--r--lib/kotext/KoParagDia.cpp2
-rw-r--r--lib/kotext/KoParagLayout.cpp4
-rw-r--r--lib/kotext/KoParagStyle.cpp2
-rw-r--r--lib/kotext/KoRichText.cpp4
-rw-r--r--lib/kotext/KoSearchDia.cpp2
-rw-r--r--lib/kotext/KoSpell.cpp4
-rw-r--r--lib/kotext/KoStyleCollection.cpp2
-rw-r--r--lib/kotext/KoStyleManager.cpp2
-rw-r--r--lib/kotext/KoTextCommand.cpp2
-rw-r--r--lib/kotext/KoTextFormat.cpp4
-rw-r--r--lib/kotext/KoTextObject.cpp2
-rw-r--r--lib/kotext/KoTextParag.cpp6
-rw-r--r--lib/kotext/KoTextView.cpp4
-rw-r--r--lib/kotext/KoUserStyle.cpp2
-rw-r--r--lib/kotext/KoVariable.cpp4
-rw-r--r--lib/kotext/TDEFontDialog_local.cpp6
-rw-r--r--lib/kotext/TimeFormatWidget.cpp4
-rw-r--r--lib/kotext/kohyphen/kohyphen.cpp2
-rw-r--r--lib/kotext/kolayouttabbase.ui2
-rw-r--r--lib/kotext/tests/KoUserStyleTester.cpp2
-rw-r--r--lib/kotext/tests/kotextformattertest.cpp4
-rw-r--r--lib/kross/api/variant.cpp2
-rw-r--r--lib/kross/main/manager.cpp2
-rw-r--r--lib/kross/main/scriptcontainer.cpp2
-rw-r--r--lib/kross/main/scriptguiclient.cpp4
-rw-r--r--lib/kross/main/wdgscriptsmanager.cpp4
-rw-r--r--lib/kross/python/pythoninterpreter.cpp2
-rw-r--r--lib/kross/test/testwindow.cpp2
-rw-r--r--lib/store/KoStore.cpp4
-rw-r--r--lib/store/KoXmlWriter.cpp2
-rw-r--r--plugins/scan/scan.cpp6
-rw-r--r--tools/converter/koconverter.cpp4
-rw-r--r--tools/kthesaurus/main.cc4
-rw-r--r--tools/spell/main.cc4
-rw-r--r--tools/tdefile-plugins/abiword/tdefile_abiword.cpp2
-rw-r--r--tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp2
-rw-r--r--tools/tdefile-plugins/koffice/tdefile_koffice.cpp2
-rw-r--r--tools/tdefile-plugins/ooo/tdefile_ooo.cpp4
-rw-r--r--tools/thesaurus/main.h4
1043 files changed, 1556 insertions, 1556 deletions
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
index c76160c5..f7c1fbce 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
@@ -22,7 +22,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
index e6b7f151..c5c7ac5a 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
@@ -27,7 +27,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_lab_colorspace.h"
#include "kis_color_conversions.h"
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
index 77266dca..88fb86f0 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.h
@@ -21,7 +21,7 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_global.h"
#include "kis_integer_maths.h"
diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
index d81c1fe6..835ebfa1 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
@@ -25,7 +25,7 @@
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_abstract_colorspace.h"
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cc
index a67652f7..a37a1fb3 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.cc
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.cc
@@ -17,7 +17,7 @@
*/
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "config.h"
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.h b/chalk/chalkcolor/kis_basic_histogram_producers.h
index 83222765..d175fb25 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.h
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.h
@@ -20,7 +20,7 @@
#define _KIS_BASIC_HISTOGRAM_PRODUCERS_
#include <tqvaluevector.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "config.h"
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
index 8c579e32..d9b2591c 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cc
@@ -22,8 +22,8 @@
#include <kservice.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "kis_debug_areas.h"
#include "kis_colorspace.h"
#include "kis_profile.h"
diff --git a/chalk/chalkcolor/kis_composite_op.cc b/chalk/chalkcolor/kis_composite_op.cc
index ddce271b..4cffd766 100644
--- a/chalk/chalkcolor/kis_composite_op.cc
+++ b/chalk/chalkcolor/kis_composite_op.cc
@@ -16,7 +16,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_composite_op.h"
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
index 4799a92a..96a6f132 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
@@ -26,7 +26,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_debug_areas.h>
#include "kis_cmyk_u16_colorspace.h"
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
index 700d954c..7b09ecca 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
index 359c22c5..09c517df 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
@@ -23,7 +23,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_cmyk_colorspace.h"
#include "kis_u8_base_colorspace.h"
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
index 34cf991a..b24c48b3 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
@@ -25,8 +25,8 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "kis_gray_u16_colorspace.h"
#include "kis_u16_base_colorspace.h"
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cc
index d6533c79..7d03d5f6 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cc
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cc
@@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
index a913dc49..7968e311 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
@@ -26,9 +26,9 @@
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kis_abstract_colorspace.h"
#include "kis_u8_base_colorspace.h"
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
index 3f572479..138778be 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.h
@@ -19,7 +19,7 @@
#define KIS_STRATEGY_COLORSPACE_GRAYSCALE_H_
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
index ab4642ff..67ad17d0 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
@@ -28,7 +28,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_lms_f32_colorspace.h"
#include "kis_color_conversions.h"
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
index 1c766621..8e698232 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.h
@@ -23,7 +23,7 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
index 9e7f138e..fd065637 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_rgb_f16half_colorspace.h"
#include "kis_f32_base_colorspace.h"
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
index a8fde30d..4297498c 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.h
@@ -21,7 +21,7 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
index 86494de7..d4eb9eac 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
@@ -27,7 +27,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_rgb_f32_colorspace.h"
#include "kis_color_conversions.h"
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
index 050c2ae5..c6551a4c 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
@@ -22,7 +22,7 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
index c3307aef..75aa6649 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
@@ -27,8 +27,8 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include "kis_rgb_u16_colorspace.h"
#include "kis_u16_base_colorspace.h"
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
index fde72fea..77bc8c02 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.h
@@ -19,7 +19,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_RGB_U16_H_
#define KIS_STRATEGY_COLORSPACE_RGB_U16_H_
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
index f1522798..0aaea6da 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
@@ -26,7 +26,7 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_rgb_colorspace.h"
#include "kis_u8_base_colorspace.h"
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
index 8fdfb355..820b58b5 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.h
@@ -18,7 +18,7 @@
#ifndef KIS_STRATEGY_COLORSPACE_RGB_H_
#define KIS_STRATEGY_COLORSPACE_RGB_H_
-#include "klocale.h"
+#include "tdelocale.h"
#include "kis_global.h"
#include "kis_u8_base_colorspace.h"
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cc
index f987e33f..26310125 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cc
@@ -22,12 +22,12 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kis_debug_areas.h>
diff --git a/chalk/colorspaces/wet/kis_texture_filter.h b/chalk/colorspaces/wet/kis_texture_filter.h
index 75f12e88..8dbaef59 100644
--- a/chalk/colorspaces/wet/kis_texture_filter.h
+++ b/chalk/colorspaces/wet/kis_texture_filter.h
@@ -22,7 +22,7 @@
#define _TEXTURE_FILTER_H
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_paint_device_action.h>
/// Initializes a wet paint device with a texture
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cc
index 685e5559..b867e01e 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cc
@@ -24,7 +24,7 @@
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kis_debug_areas.h>
#include "kis_abstract_colorspace.h"
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
index 7c115325..43cfd559 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cc
@@ -32,7 +32,7 @@
#include <tqstyle.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <koFrameButton.h>
diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc
index 50ba12a5..f17f4e1c 100644
--- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc
+++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc
@@ -20,7 +20,7 @@
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_meta_registry.h"
#include <kis_view.h>
#include <kis_image.h>
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cc
index 6edc562e..b919a289 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cc
@@ -29,12 +29,12 @@
#include <tqwidget.h>
#include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cc
index e72d63bf..3a439443 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.cc
+++ b/chalk/colorspaces/wet/wetphysicsfilter.cc
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kis_iterators_pixel.h>
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.h b/chalk/colorspaces/wet/wetphysicsfilter.h
index eaae1a77..ef542f8e 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.h
+++ b/chalk/colorspaces/wet/wetphysicsfilter.h
@@ -21,7 +21,7 @@
#ifndef WET_PHYSICS_FILTER_H
#define WET_PHYSICS_FILTER_H
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_filter.h>
#include <kis_types.h>
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
index b3e1ffa6..1f141bb4 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
@@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
index ad13eb91..3e47114a 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
@@ -24,7 +24,7 @@
#include <tqimage.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_color_conversions.h"
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
index 89a2f59e..c53f6ea0 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
@@ -24,12 +24,12 @@
#include <tqrect.h>
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
index fd477dc7..76dee20e 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
@@ -17,12 +17,12 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
index d641f09e..261783ca 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.h
@@ -22,7 +22,7 @@
#include <kis_u16_base_colorspace.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define LUMA_RED 0.2989
#define LUMA_GREEN 0.587
diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
index 7f22343d..230e5a74 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.h
@@ -22,7 +22,7 @@
#include <kis_u8_base_colorspace.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define LUMA_RED 0.2989
#define LUMA_GREEN 0.587
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cc
index 71676e3a..49ee8e58 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cc
@@ -39,7 +39,7 @@
#include <tqvaluevector.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_meta_registry.h>
#include "kis_paint_device.h"
diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cc
index ea0351df..f5ee5573 100644
--- a/chalk/core/kis_convolution_painter.cc
+++ b/chalk/core/kis_convolution_painter.cc
@@ -36,7 +36,7 @@
#include <tqstring.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
diff --git a/chalk/core/kis_crop_visitor.h b/chalk/core/kis_crop_visitor.h
index 0988a920..9538a59f 100644
--- a/chalk/core/kis_crop_visitor.h
+++ b/chalk/core/kis_crop_visitor.h
@@ -20,7 +20,7 @@
#include "tqrect.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kis_layer_visitor.h"
#include "kis_types.h"
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cc
index 5fa31953..6b88759a 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cc
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_debug_areas.h"
diff --git a/chalk/core/kis_filter.h b/chalk/core/kis_filter.h
index 534b4c69..599581bd 100644
--- a/chalk/core/kis_filter.h
+++ b/chalk/core/kis_filter.h
@@ -23,7 +23,7 @@
#include <tqstring.h>
#include <ksharedptr.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_types.h"
#include "kis_filter_registry.h"
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cc
index abccf8bc..f67e3ecc 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cc
@@ -21,7 +21,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
#include <ktrader.h>
diff --git a/chalk/core/kis_filter_strategy.cc b/chalk/core/kis_filter_strategy.cc
index 573d3840..650a9681 100644
--- a/chalk/core/kis_filter_strategy.cc
+++ b/chalk/core/kis_filter_strategy.cc
@@ -17,7 +17,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_debug_areas.h"
#include "kis_filter_strategy.h"
#include <math.h>
diff --git a/chalk/core/kis_filter_strategy.h b/chalk/core/kis_filter_strategy.h
index 55ef3d06..faabd739 100644
--- a/chalk/core/kis_filter_strategy.h
+++ b/chalk/core/kis_filter_strategy.h
@@ -20,7 +20,7 @@
#ifndef KIS_FILTER_STRATEGY_H_
#define KIS_FILTER_STRATEGY_H_
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_types.h"
#include "kis_generic_registry.h"
diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cc
index 43c182d7..41541e80 100644
--- a/chalk/core/kis_gradient.cc
+++ b/chalk/core/kis_gradient.cc
@@ -33,7 +33,7 @@
#include <kogradientmanager.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_gradient.h"
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cc
index 968bb67e..7c2b00b1 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cc
@@ -36,7 +36,7 @@
#include <tqstring.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_debug_areas.h"
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cc
index 0e2f90d2..290d19f5 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cc
@@ -17,7 +17,7 @@
*/
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqimage.h>
#include <tqdatetime.h>
diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cc
index c6af64b6..1180bf4c 100644
--- a/chalk/core/kis_image.cc
+++ b/chalk/core/kis_image.cc
@@ -32,7 +32,7 @@
#include <kcommand.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_image_iface.h"
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cc
index 1a66318e..5c60b517 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cc
@@ -40,7 +40,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "kis_global.h"
diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cc
index 99dc77a9..4bde87b2 100644
--- a/chalk/core/kis_meta_registry.cc
+++ b/chalk/core/kis_meta_registry.cc
@@ -18,7 +18,7 @@
#include <tqstringlist.h>
#include <tqdir.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <config.h>
#include LCMS_HEADER
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cc
index 654caedd..da25caec 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cc
@@ -25,7 +25,7 @@
#include <tqtimer.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoStore.h>
diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cc
index fc3e1d88..f3f5c928 100644
--- a/chalk/core/kis_painter.cc
+++ b/chalk/core/kis_painter.cc
@@ -42,7 +42,7 @@
#include <kdebug.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_debug_areas.h"
diff --git a/chalk/core/kis_paintop.h b/chalk/core/kis_paintop.h
index 7fad40ba..14a2e4c6 100644
--- a/chalk/core/kis_paintop.h
+++ b/chalk/core/kis_paintop.h
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <ksharedptr.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_global.h"
#include "kis_types.h"
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cc
index 7d31b79f..d549c3ad 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cc
@@ -20,8 +20,8 @@
#include <kdebug.h>
#include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeparts/plugin.h>
#include <kservice.h>
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cc
index 161a4ff8..aa62b07a 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cc
@@ -36,7 +36,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_debug_areas.h"
#include "kis_palette.h"
diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cc
index f757b060..654449b8 100644
--- a/chalk/core/kis_pattern.cc
+++ b/chalk/core/kis_pattern.cc
@@ -35,7 +35,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_color.h"
#include "kis_layer.h"
diff --git a/chalk/core/kis_rotate_visitor.cc b/chalk/core/kis_rotate_visitor.cc
index 2a8bfd45..abb47a05 100644
--- a/chalk/core/kis_rotate_visitor.cc
+++ b/chalk/core/kis_rotate_visitor.cc
@@ -21,7 +21,7 @@
#include <tqrect.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_paint_device.h"
#include "kis_rotate_visitor.h"
diff --git a/chalk/core/kis_scale_visitor.cc b/chalk/core/kis_scale_visitor.cc
index fb4c9f42..a06d674d 100644
--- a/chalk/core/kis_scale_visitor.cc
+++ b/chalk/core/kis_scale_visitor.cc
@@ -18,7 +18,7 @@
#include <tqdatetime.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_paint_device.h"
#include "kis_scale_visitor.h"
diff --git a/chalk/core/kis_scale_visitor.h b/chalk/core/kis_scale_visitor.h
index afe358ad..75d58fa1 100644
--- a/chalk/core/kis_scale_visitor.h
+++ b/chalk/core/kis_scale_visitor.h
@@ -19,7 +19,7 @@
#ifndef KIS_SCALE_VISITOR_H_
#define KIS_SCALE_VISITOR_H_
-#include "klocale.h"
+#include "tdelocale.h"
#include "kis_progress_subject.h"
#include "kis_progress_display_interface.h"
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cc
index 69b90fe3..ea8f2be2 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cc
@@ -19,7 +19,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
#include "kis_layer.h"
diff --git a/chalk/core/kis_strategy_move.cc b/chalk/core/kis_strategy_move.cc
index 3eef47d6..d5102c8b 100644
--- a/chalk/core/kis_strategy_move.cc
+++ b/chalk/core/kis_strategy_move.cc
@@ -21,7 +21,7 @@
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_canvas_controller.h"
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cc
index dad56a3a..12807192 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cc
@@ -17,7 +17,7 @@
*/
#include "kis_thread_pool.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <kdebug.h>
diff --git a/chalk/core/kis_transform_visitor.h b/chalk/core/kis_transform_visitor.h
index 5df21316..55b68f19 100644
--- a/chalk/core/kis_transform_visitor.h
+++ b/chalk/core/kis_transform_visitor.h
@@ -20,7 +20,7 @@
#include "tqrect.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kis_layer_visitor.h"
#include "kis_types.h"
diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cc
index 77ea25f5..0d4a98b4 100644
--- a/chalk/core/kis_transform_worker.cc
+++ b/chalk/core/kis_transform_worker.cc
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_debug_areas.h"
#include "kis_paint_device.h"
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cc
index d8064615..aa8a207c 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cc
@@ -30,7 +30,7 @@
#include <tqfile.h>
#include <kstaticdeleter.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include "kis_tileddatamanager.h"
diff --git a/chalk/core/tiles/kis_tilemanager.h b/chalk/core/tiles/kis_tilemanager.h
index 5d388136..d0ae4f6b 100644
--- a/chalk/core/tiles/kis_tilemanager.h
+++ b/chalk/core/tiles/kis_tilemanager.h
@@ -25,7 +25,7 @@
#include <tqvaluelist.h>
#include <tqmutex.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
class KisTile;
class KisTiledDataManager;
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cc
index 32d0e636..9d771222 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cc
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cc
@@ -41,12 +41,12 @@
#include <tqlineedit.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kcombobox.h>
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
index a2d9e1bd..c8be0a6f 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cc
@@ -27,12 +27,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cc
index ae84bcaa..754bbc2c 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cc
@@ -27,12 +27,12 @@
#include <tqpoint.h>
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
index 64bfb205..cbca7a08 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
@@ -21,7 +21,7 @@
#include <math.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqpixmap.h>
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
index b3c73a92..4ce104f7 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
@@ -20,7 +20,7 @@
#include <stdlib.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc
index 39a395b4..08601d60 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "tqdom.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kdebug.h"
#include "kis_painter.h"
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
index 2aa09219..fcffb3de 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
@@ -21,7 +21,7 @@
#include <tqlayout.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_filter.h"
#include "kis_image.h"
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
index 68f560c4..1eb2984e 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
@@ -28,12 +28,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
index 8619d896..0d6974e0 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
@@ -28,12 +28,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cc
index e1e33ade..a9ade724 100644
--- a/chalk/plugins/filters/example/example.cc
+++ b/chalk/plugins/filters/example/example.cc
@@ -21,12 +21,12 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
@@ -37,7 +37,7 @@
#include <kis_global.h>
#include <kis_types.h>
-// #include <kmessagebox.h>
+// #include <tdemessagebox.h>
#include "example.h"
diff --git a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
index 78398157..cb7153c1 100644
--- a/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
+++ b/chalk/plugins/filters/imageenhancement/imageenhancement.cpp
@@ -22,12 +22,12 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
index 4fefb597..6b26ab11 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
@@ -32,11 +32,11 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kis_image.h>
#include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
index 43b8f9e6..84dbc035 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cc
@@ -20,7 +20,7 @@
#include <math.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqpixmap.h>
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cc
index cabda0b5..89114378 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cc
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cc
@@ -27,12 +27,12 @@
#include <tqpoint.h>
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cc
index 0f634eb8..d8609ba2 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cc
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cc
@@ -29,11 +29,11 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kis_image.h>
#include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
index 2909e8a1..de869a42 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
@@ -28,12 +28,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
index 33886f2c..a6b77df7 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
@@ -27,12 +27,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
index 72c0675b..acb8c2e1 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
@@ -28,12 +28,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cc
index 54af3e7b..74368802 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cc
@@ -29,11 +29,11 @@
#include <kiconloader.h>
#include <kinstance.h>
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kis_image.h>
#include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
index a823f812..698961a8 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
@@ -28,12 +28,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
index f1f9f5df..a0cf20f1 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
@@ -28,12 +28,12 @@
#include <tqspinbox.h>
#include <tqvaluevector.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
index db842ca2..623fc690 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
@@ -27,12 +27,12 @@
#include <tqpoint.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cc
index 1274c55f..8477c09c 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cc
+++ b/chalk/plugins/filters/threadtest/threadtest.cc
@@ -23,12 +23,12 @@
#include <tqrect.h>
#include <tqthread.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
@@ -40,7 +40,7 @@
#include <kis_global.h>
#include <kis_types.h>
-// #include <kmessagebox.h>
+// #include <tdemessagebox.h>
#include "threadtest.h"
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cc
index ad7f732a..9f9777bf 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cc
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cc
@@ -30,11 +30,11 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kis_image.h>
#include <kis_iterators_pixel.h>
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
index 3b48e439..25f12b87 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
@@ -17,11 +17,11 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
index 40e2b2e6..4a8da9a1 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
@@ -28,7 +28,7 @@
#include "kis_brush.h"
#include "kis_global.h"
#include "kis_paint_device.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "kis_layer.h"
#include "kis_painter.h"
#include "kis_types.h"
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cc
index 0a9298da..17e0feff 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cc
+++ b/chalk/plugins/tools/defaulttools/default_tools.cc
@@ -22,12 +22,12 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
index 8fa2c647..86413587 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
@@ -30,7 +30,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_config.h"
#include "kis_brush.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
index 310d1660..40a09a91 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
@@ -26,9 +26,9 @@
#include <tqspinbox.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kis_layer.h"
#include "kis_cursor.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
index d93687df..7bb4c54f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_cursor.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
index 72a8ed30..919454b2 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_painter.h"
#include "kis_canvas_subject.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
index 8709e60d..df8e4f7c 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
@@ -22,7 +22,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
index 55558395..a46fee80 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "kis_button_press_event.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
index 8b5bc2a8..4e118ccc 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cc
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_cursor.h"
#include "kis_painter.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
index 2762e5a0..be506578 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cc
@@ -22,7 +22,7 @@
#include <stdlib.h>
#include <tqpoint.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
#include "kis_canvas_subject.h"
#include "kis_cursor.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
index f516d899..c95b1000 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
@@ -17,7 +17,7 @@
*/
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_canvas_controller.h"
#include "kis_canvas_subject.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
index fb36dcbd..852d2c0e 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_button_press_event.h"
#include "kis_button_release_event.h"
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
index 3897d78a..1a2687f1 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cc
@@ -30,7 +30,7 @@
#include <tdeaction.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <ksqueezedtextlabel.h>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
index dca2b7c9..fe449ee4 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
@@ -18,7 +18,7 @@
*/
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "kis_image.h"
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
index 2e939da0..a1f0902f 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
@@ -22,7 +22,7 @@
#include <tqpoint.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcolor.h>
#include "kis_canvas_subject.h"
#include "kis_cursor.h"
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
index a353fb5b..acc90362 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_button_press_event.h"
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
index f8409f4e..1a4932b7 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
index 38806f0f..def162ef 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_autobrush_resource.h"
#include "kis_canvas_controller.h"
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
index 5f687ca5..af7f8d84 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_brush.h"
#include "kis_layer.h"
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
index d5f1123f..7f526736 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_layer.h>
#include <kis_selection_options.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
index b871c825..8d89eea2 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_layer.h>
#include <kis_selection_options.h>
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
index fdce6b73..09d33866 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_canvas_controller.h"
#include "kis_canvas_subject.h"
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cc
index fb0e6191..8407a076 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cc
@@ -22,12 +22,12 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
index 4bb50452..11a47590 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cc
index c624d62f..97f6e0e8 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
index b96fb737..e4c1d05d 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
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 5c47cd20..06f34f8c 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "kis_cmb_composite.h"
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 90205d8d..72418920 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
@@ -29,7 +29,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "kis_cmb_composite.h"
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
index e4da1b37..7449e581 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_global.h"
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
index dd8a8076..75e3da2b 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cc
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
index 18aa06b0..178ff278 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
@@ -30,7 +30,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cc
index d941c2dc..b21f5aae 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cc
@@ -23,10 +23,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
index 84343b82..07133d3b 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_filter_config_widget.h"
#include "kis_tool_filter.h"
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cc
index b5d7c4b5..bda2357e 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
index 38c859c6..2dbe56d3 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
@@ -28,7 +28,7 @@
#include <tdeaction.h>
#include <kdebug.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_button_press_event.h>
#include <kis_button_release_event.h>
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
index 12615387..f2800a59 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
index 75e688d1..ae334e62 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
@@ -35,7 +35,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kis_global.h>
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
index 24d71620..0c4023cc 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
index bb13e10e..a7371e49 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
index 5ace6079..626a773d 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
index d16709f2..c99513f4 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
@@ -26,7 +26,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
index fe9eb002..a5bfa27f 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
index e63fb48f..65b05957 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kis_cursor.h>
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
index 95c315d8..af807017 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
@@ -24,12 +24,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cc
index 88bd0cfd..cd4bb0b2 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cc
@@ -27,7 +27,7 @@
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cc
index dc40edf9..9ac1b62f 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
index b4c9c1bd..de20ce7f 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
@@ -31,7 +31,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kis_global.h>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cc
index 32810020..82941e92 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cc
@@ -22,10 +22,10 @@
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cc
index c610b3a2..be0648ba 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
index 126352b8..453bbec2 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
@@ -29,7 +29,7 @@
#include <tqradiobutton.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeaction.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
index ba0eff91..d956ee46 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
@@ -27,12 +27,12 @@
#include <tqapplication.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
index 54ede8b9..8159ad73 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
@@ -24,7 +24,7 @@
#include <tqcombobox.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
index cdc06ace..59019489 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
@@ -31,7 +31,7 @@
#include <kcolorbutton.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "dlg_dropshadow.h"
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
index 30339d6e..97c2c17e 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
@@ -27,12 +27,12 @@
#include <tqcolor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
index 62a2f5a1..97a0b8a7 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
index 12e1fe65..448a58cf 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
@@ -27,7 +27,7 @@
#include <tqlabel.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_types.h"
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cc
index 95a50a45..8252a98d 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/histogram.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
index 9c679507..25a7b9cf 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
@@ -19,12 +19,12 @@
*/
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cc
index 12877006..85e4df40 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cc
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cc
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
index 0d9b3218..8a9a8c09 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
@@ -32,7 +32,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
index 620ee85d..1d30db6a 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
@@ -33,7 +33,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cc
index ccd81002..c795924e 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cc
@@ -27,12 +27,12 @@
#include <tqrect.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kstdaction.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
index ea51ccf1..7cd1c335 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
@@ -32,7 +32,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
index 684a1e9a..38c445b0 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
@@ -32,7 +32,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
index ebd33026..f0129e74 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
@@ -32,7 +32,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
index 97e2f2ac..decf186e 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kstdaction.h>
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
index b94bdedf..b2a72306 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
@@ -31,7 +31,7 @@ using namespace std;
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cc
index dfb0614c..f728043c 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cc
@@ -30,13 +30,13 @@
#include <tqtextedit.h>
#include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
index f381b3f9..84c11ffb 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
@@ -31,7 +31,7 @@ using namespace std;
#include <tqcheckbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
index 16a70764..5f2474a7 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
index edb089d4..b07b4d3e 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.cpp
@@ -11,16 +11,16 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kimageio.h>
#include <tdefiledialog.h>
#include <kimagefilepreview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kprinter.h>
#include <tdeio/netaccess.h>
#include <ksavefile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqbitmap.h>
#include <tqdragobject.h>
@@ -33,7 +33,7 @@
#include <khelpmenu.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
#include <tqcursor.h>
#include <tqregexp.h>
@@ -56,7 +56,7 @@
#include <X11/extensions/shape.h>
#endif
-#include <kglobal.h>
+#include <tdeglobal.h>
KSnapshot::KSnapshot(TQWidget *parent, const char *name)
: super(parent, name, false, TQString(), Ok|Cancel)
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshot.h b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
index ffa101d1..96a5ec8c 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshot.h
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshot.h
@@ -28,7 +28,7 @@
#include <tqtimer.h>
#include <dcopclient.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdialogbase.h>
#include <kurl.h>
diff --git a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
index 65ae3c99..c243efa8 100644
--- a/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
+++ b/chalk/plugins/viewplugins/screenshot/ksnapshotwidget.ui
@@ -301,7 +301,7 @@ If &lt;i&gt;no delay&lt;/i&gt; is set, the program will wait for a mouse click b
<includes>
<include location="global" impldecl="in implementation">kdialog.h</include>
<include location="global" impldecl="in implementation">kiconloader.h</include>
- <include location="global" impldecl="in implementation">kglobalsettings.h</include>
+ <include location="global" impldecl="in implementation">tdeglobalsettings.h</include>
<include location="local" impldecl="in implementation">ksnapshotwidget.ui.h</include>
</includes>
<Q_SIGNALS>
diff --git a/chalk/plugins/viewplugins/screenshot/main.cpp b/chalk/plugins/viewplugins/screenshot/main.cpp
index 48ca9395..26b6634b 100644
--- a/chalk/plugins/viewplugins/screenshot/main.cpp
+++ b/chalk/plugins/viewplugins/screenshot/main.cpp
@@ -1,7 +1,7 @@
#include <tdeapplication.h>
#include "ksnapshot.h"
#include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
#include <kiconloader.h>
diff --git a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
index 06a4d544..0fdf4a66 100644
--- a/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
+++ b/chalk/plugins/viewplugins/screenshot/regiongrabber.cpp
@@ -26,7 +26,7 @@
#include <tqtimer.h>
#include <tqtooltip.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
SizeTip::SizeTip( TQWidget *parent, const char *name )
: TQLabel( parent, name, WStyle_Customize | WX11BypassWM |
diff --git a/chalk/plugins/viewplugins/screenshot/screenshot.cpp b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
index 505f8de8..e1d18605 100644
--- a/chalk/plugins/viewplugins/screenshot/screenshot.cpp
+++ b/chalk/plugins/viewplugins/screenshot/screenshot.cpp
@@ -20,17 +20,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <KoView.h>
#include <KoDocument.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ksnapshot.h"
#include <kimageio.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
index 1486d415..be0b9307 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_image.cpp
@@ -18,7 +18,7 @@
#include "krs_image.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_colorspace_factory_registry.h>
#include <kis_image.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
index 9b5f5b6b..777a8aac 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_iterator.h
@@ -24,7 +24,7 @@
//#include <api/proxy.h>
//#include <api/variant.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_paint_layer.h>
#include <kis_paint_device.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
index a3ce4dd6..fb6548b2 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_paint_layer.cpp
@@ -18,7 +18,7 @@
#include "krs_paint_layer.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_colorspace_factory_registry.h>
#include <kis_doc.h>
diff --git a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
index c8ef92c5..21ab7646 100644
--- a/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
+++ b/chalk/plugins/viewplugins/scripting/chalkcore/krs_wavelet.cpp
@@ -20,7 +20,7 @@
#include "krs_wavelet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kis_math_toolbox.h>
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cc
index c7e1db5f..207bc0ce 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cc
@@ -29,10 +29,10 @@
#include <kgenericfactory.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#define KROSS_MAIN_EXPORT KDE_EXPORT
#include <main/manager.h>
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
index 57e32dce..61d85634 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
@@ -26,12 +26,12 @@
#include <tqcursor.h>
#include <tqapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
index d1807384..6d2a59c3 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
@@ -25,7 +25,7 @@
#include <tqcombobox.h>
#include <tqbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
index b01d3e31..ba8c6b84 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
@@ -25,12 +25,12 @@
#include <stdlib.h>
#include <vector>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
#include <knuminput.h>
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
index 26650d73..db356a16 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
@@ -18,12 +18,12 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
index a2cc7773..e7a63180 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
@@ -31,7 +31,7 @@ using namespace std;
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kdebug.h>
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cc
index 43fdb18d..8e20b58d 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
index 781fe879..a0dbc5aa 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "dlg_substrate.h"
#include "wdgsubstrate.h"
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cc
index d46a080a..ce13710b 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/substrate.cc
@@ -22,12 +22,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cc
index b329151c..afa6a3d7 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.cc
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.cc
@@ -18,7 +18,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "dlg_variations.h"
#include "wdg_variations.h"
diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cc
index a3a084d7..5e2d65ba 100644
--- a/chalk/plugins/viewplugins/variations/variations.cc
+++ b/chalk/plugins/viewplugins/variations/variations.cc
@@ -26,12 +26,12 @@
#include <tqslider.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/chalk/sdk/kis_global.h b/chalk/sdk/kis_global.h
index 19acb216..93cfffdd 100644
--- a/chalk/sdk/kis_global.h
+++ b/chalk/sdk/kis_global.h
@@ -23,7 +23,7 @@
#include LCMS_HEADER
#include <limits.h>
#include <tqglobal.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#define KRITA_VERSION VERSION
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cc
index 1d7932cb..b6bd5162 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cc
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <kcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
// Local includes.
diff --git a/chalk/ui/kis_aboutdata.h b/chalk/ui/kis_aboutdata.h
index 059f3d3c..60d10645 100644
--- a/chalk/ui/kis_aboutdata.h
+++ b/chalk/ui/kis_aboutdata.h
@@ -21,7 +21,7 @@
#define KIS_ABOUT_DATA_H_
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
#include <config.h>
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cc
index 2ef11147..2b816f9c 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cc
@@ -24,7 +24,7 @@
#include "tqimage.h"
#include "config.h"
#include LCMS_HEADER
-#include "klocale.h"
+#include "tdelocale.h"
#include "tqtooltip.h"
#include "kis_view.h"
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cc
index 0e06a781..db9aba98 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cc
@@ -18,7 +18,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koIconChooser.h>
#include "kis_double_widget.h"
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cc
index 4dc0ed1b..bb80e75e 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cc
@@ -22,7 +22,7 @@
#include <tqmessagebox.h>
#include <tqbuffer.h>
#include <tdemultipledrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kdebug.h"
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cc
index 51681351..66e3a6b3 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cc
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_cmb_composite.h"
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cc
index 2d7e80d9..92dc608f 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cc
@@ -20,7 +20,7 @@
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_id.h"
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cc
index fe2b93fd..ae0ddfac 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cc
@@ -35,7 +35,7 @@
#include <tqframe.h>
#include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <koFrameButton.h>
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cc
index 375b16ee..64939c4a 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cc
@@ -17,9 +17,9 @@
*/
#include <limits.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <config.h>
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cc
index f4af08a1..6c57a7e6 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cc
@@ -31,10 +31,10 @@
#include <tdetoolbar.h>
#include <tdemainwindow.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstandarddirs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koFrameButton.h>
#include <tdeactioncollection.h>
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cc
index d235259f..1802e6cf 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cc
@@ -23,9 +23,9 @@
#include <tqpushbutton.h>
#include <tqcombobox.h>
#include <tqcheckbox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "kis_view.h"
#include "kis_image.h"
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cc
index 8bd36142..631b9abe 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cc
@@ -24,13 +24,13 @@
#include <tqregexp.h>
#include <tqvalidator.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kcolordialog.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kis_view.h"
#include "kis_palette.h"
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cc
index 8c2f22e2..edf92be1 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cc
@@ -22,9 +22,9 @@
#include <tqimage.h>
#include <tqpushbutton.h>
#include <tqcombobox.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "kis_view.h"
#include "kis_image.h"
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cc
index 159d966f..f7d75310 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cc
@@ -16,14 +16,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_filter_config_widget.h"
#include "kis_transaction.h"
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cc
index 9819228e..997887f0 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cc
@@ -16,14 +16,14 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqgroupbox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_filter_config_widget.h"
#include "kis_transaction.h"
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cc
index 2d5e8a90..fcdfbd09 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cc
@@ -17,7 +17,7 @@
*/
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
#include "kis_factory.h"
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cc
index ac8e14a3..00acde27 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cc
@@ -26,7 +26,7 @@
#include <tqtextedit.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorcombo.h>
#include <KoUnitWidgets.h>
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cc
index 500d29a1..832102c6 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cc
@@ -22,7 +22,7 @@
#include <tqslider.h>
#include <tqstring.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <knuminput.h>
#include "kis_global.h"
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cc
index 4eb5a409..91f53a75 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cc
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kpushbutton.h>
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cc
index 7d1f5faa..5fbe96d5 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cc
@@ -46,7 +46,7 @@
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cc
index dafb63dd..60dbbfdd 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cc
@@ -36,11 +36,11 @@
#include <kdebug.h>
#include <kimageio.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kmimetype.h>
#include <knotifyclient.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
// KOffice
#include <KoFilterManager.h>
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cc
index 9048935b..154213b4 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cc
@@ -25,8 +25,8 @@
#include <kdebug.h>
#include <kinstance.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cc
index b7b84d88..848f99b7 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cc
@@ -22,7 +22,7 @@
#include <tqframe.h>
#include <tqcursor.h>
#include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kguiitem.h>
#include <kis_cursor.h>
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cc
index c6343f39..e3674fc8 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cc
@@ -26,7 +26,7 @@
#include "tqpainter.h"
#include "tqpixmap.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "kis_types.h"
#include "kis_paint_device.h"
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cc
index 098efb55..5022a28b 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cc
@@ -15,7 +15,7 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cc
index 3325517a..255d3847 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cc
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_autogradient_resource.h"
diff --git a/chalk/ui/kis_grid_manager.cpp b/chalk/ui/kis_grid_manager.cpp
index 04adc0c2..1852438d 100644
--- a/chalk/ui/kis_grid_manager.cpp
+++ b/chalk/ui/kis_grid_manager.cpp
@@ -32,7 +32,7 @@
#include <tdeaction.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_config.h"
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cc
index 92573c9f..cb1b6938 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cc
@@ -40,8 +40,8 @@
#include <tqvalidator.h>
#include <knuminput.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <karrowbutton.h>
diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cc
index 36513c32..d33c3873 100644
--- a/chalk/ui/kis_itemchooser.cc
+++ b/chalk/ui/kis_itemchooser.cc
@@ -17,7 +17,7 @@
*/
#include <tqvbox.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <koIconChooser.h>
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index 492548ef..bd195018 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprogress.h>
#include <kiconloader.h>
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cc
index 7e14dcf0..ba5fe219 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cc
@@ -37,13 +37,13 @@
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kiconloader.h>
#include <kicontheme.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPartSelectAction.h>
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cc
index 756ab60e..7bb0b332 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cc
@@ -18,9 +18,9 @@
*/
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <KoPartSelectAction.h>
#include <tqimage.h>
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cc
index 806998bf..e0269504 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cc
@@ -22,7 +22,7 @@
#include <tqlayout.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
KisBoolWidgetParam::KisBoolWidgetParam( bool ninitvalue, TQString nlabel, TQString nname) :
initvalue(ninitvalue),
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cc
index 486bc770..9491f221 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cc
@@ -24,7 +24,7 @@
#include <knuminput.h>
#include <kis_filter_config_widget.h>
-#include <klocale.h>
+#include <tdelocale.h>
KisDelayedActionDoubleInput::KisDelayedActionDoubleInput(TQWidget * parent, const char * name)
: KDoubleNumInput(parent, name)
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cc
index 130a03d1..aef29d2c 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cc
@@ -23,7 +23,7 @@
#include <tqtimer.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
KisDelayedActionIntegerInput::KisDelayedActionIntegerInput(TQWidget * parent, const char * name)
: KIntNumInput(parent, name)
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cc
index b2fcc212..6036ef74 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cc
@@ -24,12 +24,12 @@
#include <tqlayout.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeactioncollection.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cc
index 1a0de3db..2e17f651 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cc
@@ -39,12 +39,12 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kpalette.h>
#include <kimageeffect.h>
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cc
index 5585a9a9..e04b0494 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cc
@@ -36,12 +36,12 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kpalette.h>
#include <kimageeffect.h>
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cc
index 5846a67b..4c05360e 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cc
@@ -21,7 +21,7 @@
#include "tqimage.h"
#include "tqpainter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "KoDocument.h"
#include "KoDocumentChild.h"
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cc
index b05f62a0..741cba65 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cc
@@ -17,7 +17,7 @@
*/
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koIconChooser.h>
#include "kis_colorspace.h"
diff --git a/chalk/ui/kis_perspective_grid_manager.cpp b/chalk/ui/kis_perspective_grid_manager.cpp
index dae4bd46..d128f220 100644
--- a/chalk/ui/kis_perspective_grid_manager.cpp
+++ b/chalk/ui/kis_perspective_grid_manager.cpp
@@ -21,8 +21,8 @@
#include "kis_perspective_grid_manager.h"
#include <tdeaction.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kis_image.h"
#include "kis_grid_drawer.h"
diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cc
index 64cd1171..3076bc00 100644
--- a/chalk/ui/kis_resourceserver.cc
+++ b/chalk/ui/kis_resourceserver.cc
@@ -25,7 +25,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kinstance.h>
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cc
index ca17d1ad..7d001586 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cc
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <KoDocument.h>
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cc
index 53b8fcee..02674741 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cc
@@ -21,7 +21,7 @@
#include <tdeaction.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "kis_tool.h"
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cc
index eb961b33..759136f4 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_canvas_controller.h"
#include "kis_canvas_subject.h"
diff --git a/chalk/ui/kis_tool_factory.h b/chalk/ui/kis_tool_factory.h
index bc5171a8..afa6b9bc 100644
--- a/chalk/ui/kis_tool_factory.h
+++ b/chalk/ui/kis_tool_factory.h
@@ -19,7 +19,7 @@
#ifndef KIS_TOOL_FACTORY_H_
#define KIS_TOOL_FACTORY_H_
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_id.h"
#include "kis_types.h"
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cc
index fe6ac1a2..787afee4 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.cc
@@ -27,7 +27,7 @@
#include <kdebug.h>
#include <tdeaction.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_canvas_subject.h"
#include "kis_undo_adapter.h"
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cc
index 995a3fe4..143bd675 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cc
@@ -25,7 +25,7 @@
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kiconloader.h>
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cc
index fa9d0c94..68ce4c69 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_tool_shape.h"
#include "wdgshapeoptions.h"
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cc
index dd406ac7..79575357 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cc
@@ -43,14 +43,14 @@
// KDE
#include <kis_meta_registry.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <dcopobject.h>
#include <tdeaction.h>
#include <kcolordialog.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kprinter.h>
#include <kpushbutton.h>
diff --git a/chalk/ui/kobirdeyepanel.cpp b/chalk/ui/kobirdeyepanel.cpp
index 5b1d4442..f7a9842d 100644
--- a/chalk/ui/kobirdeyepanel.cpp
+++ b/chalk/ui/kobirdeyepanel.cpp
@@ -28,11 +28,11 @@
#include <tqcursor.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeaction.h>
#include <tdetoolbar.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoDocument.h>
diff --git a/chalk/ui/layerlist.cpp b/chalk/ui/layerlist.cpp
index 6b3ea463..bb82396a 100644
--- a/chalk/ui/layerlist.cpp
+++ b/chalk/ui/layerlist.cpp
@@ -32,11 +32,11 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kstringhandler.h>
diff --git a/configure.in b/configure.in
index 3a6899bd..92ca35da 100644
--- a/configure.in
+++ b/configure.in
@@ -2169,7 +2169,7 @@ AC_CONFIG_FILES([ kword/dtd/Makefile ])
AC_CONFIG_FILES([ kword/expression/Makefile ])
AC_CONFIG_FILES([ kword/horizontalline/Makefile ])
AC_CONFIG_FILES([ kword/mailmerge/Makefile ])
-AC_CONFIG_FILES([ kword/mailmerge/kabc/Makefile ])
+AC_CONFIG_FILES([ kword/mailmerge/tdeabc/Makefile ])
AC_CONFIG_FILES([ kword/mailmerge/kspread/Makefile ])
AC_CONFIG_FILES([ kword/mailmerge/sql/Makefile ])
AC_CONFIG_FILES([ kword/pics/Makefile ])
diff --git a/example/example_aboutdata.h b/example/example_aboutdata.h
index a1f69b7f..6c53d670 100644
--- a/example/example_aboutdata.h
+++ b/example/example_aboutdata.h
@@ -21,7 +21,7 @@
#define EXAMPLE_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char* description=I18N_NOOP("Example KOffice Program");
static const char* version="0.1";
diff --git a/example/example_factory.cc b/example/example_factory.cc
index 307b7e93..9564e5fa 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cc
@@ -22,7 +22,7 @@
#include <example_aboutdata.h>
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
K_EXPORT_COMPONENT_FACTORY( libexamplepart, ExampleFactory )
diff --git a/example/example_view.cc b/example/example_view.cc
index 57d26b07..e681bdb3 100644
--- a/example/example_view.cc
+++ b/example/example_view.cc
@@ -25,7 +25,7 @@
#include <tqiconset.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
ExampleView::ExampleView( ExamplePart* part, TQWidget* parent, const char* name )
diff --git a/example/main.cc b/example/main.cc
index dd4b0129..ecffb373 100644
--- a/example/main.cc
+++ b/example/main.cc
@@ -21,7 +21,7 @@
#include <KoDocument.h>
#include <KoMainWindow.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "example_aboutdata.h"
#include <koffice_export.h>
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cc
index e8d4d0d6..ce8071c6 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cc
@@ -31,7 +31,7 @@
#include <tdeversion.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cc
index efdb061a..fd0630ec 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cc
@@ -28,8 +28,8 @@ extern "C" {
#include <tqfile.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <KoDocumentInfo.h>
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cc
index 5b4b56a0..9a44ed97 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cc
@@ -30,7 +30,7 @@
#include <tdeversion.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
diff --git a/filters/chalk/openexr/kis_openexr_export.cpp b/filters/chalk/openexr/kis_openexr_export.cpp
index 33d9ec60..70e30a4a 100644
--- a/filters/chalk/openexr/kis_openexr_export.cpp
+++ b/filters/chalk/openexr/kis_openexr_export.cpp
@@ -19,7 +19,7 @@
#include <tqfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <half.h>
#include <ImfRgbaFile.h>
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cc
index 795eb92e..3956b640 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cc
@@ -25,8 +25,8 @@
#include <tqfile.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <KoDocumentInfo.h>
diff --git a/filters/chalk/raw/kis_raw_import.cpp b/filters/chalk/raw/kis_raw_import.cpp
index 1af33fd7..873fdf2b 100644
--- a/filters/chalk/raw/kis_raw_import.cpp
+++ b/filters/chalk/raw/kis_raw_import.cpp
@@ -40,14 +40,14 @@
#include <tqprogressdialog.h>
#include <tqtimer.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <knuminput.h>
#include <kgenericfactory.h>
#include <kdialogbase.h>
#include <kdialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kprocess.h>
#include <KoDocument.h>
diff --git a/filters/chalk/tiff/kis_dlg_options_tiff.cpp b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
index becda194..70e67938 100644
--- a/filters/chalk/tiff/kis_dlg_options_tiff.cpp
+++ b/filters/chalk/tiff/kis_dlg_options_tiff.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kis_wdg_options_tiff.h"
diff --git a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
index da399a53..94f55824 100644
--- a/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
+++ b/filters/chalk/tiff/kis_tiff_writer_visitor.cpp
@@ -19,8 +19,8 @@
#include "kis_tiff_writer_visitor.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kis_annotation.h>
#include <kis_colorspace.h>
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cc
index e5664696..112c29d1 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cc
@@ -25,11 +25,11 @@
#include <kdebug.h>
#include <KoFilterChain.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <kservice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "generic_filter.h"
diff --git a/filters/karbon/ai/ai88handler.cc b/filters/karbon/ai/ai88handler.cc
index 7b5019be..87a937ae 100644
--- a/filters/karbon/ai/ai88handler.cc
+++ b/filters/karbon/ai/ai88handler.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "ai88handler.h"
AI88Handler::AI88Handler(AIParserBase *delegate){
diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cc
index 220dbeba..4bf4aec7 100644
--- a/filters/karbon/eps/epsexportdlg.cc
+++ b/filters/karbon/eps/epsexportdlg.cc
@@ -23,7 +23,7 @@
#include <tqvbox.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "epsexportdlg.h"
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cc
index e25889c0..bd272271 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cc
@@ -21,7 +21,7 @@ DESCRIPTION
*/
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <kgenericfactory.h>
#include <KoFilterChain.h>
diff --git a/filters/kchart/bmp/bmpexport.cpp b/filters/kchart/bmp/bmpexport.cpp
index 5f00bb5e..e0c69c30 100644
--- a/filters/kchart/bmp/bmpexport.cpp
+++ b/filters/kchart/bmp/bmpexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/jpeg/jpegexport.cpp b/filters/kchart/jpeg/jpegexport.cpp
index 7d2bcec0..46bc5900 100644
--- a/filters/kchart/jpeg/jpegexport.cpp
+++ b/filters/kchart/jpeg/jpegexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/libimageexport/imageexport.cpp b/filters/kchart/libimageexport/imageexport.cpp
index faff17ff..f2143c49 100644
--- a/filters/kchart/libimageexport/imageexport.cpp
+++ b/filters/kchart/libimageexport/imageexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/mng/mngexport.cpp b/filters/kchart/mng/mngexport.cpp
index e23e870c..f7dfbe7c 100644
--- a/filters/kchart/mng/mngexport.cpp
+++ b/filters/kchart/mng/mngexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/png/pngexport.cpp b/filters/kchart/png/pngexport.cpp
index 456ca887..380cc463 100644
--- a/filters/kchart/png/pngexport.cpp
+++ b/filters/kchart/png/pngexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cc
index 1507f536..062ccd9b 100644
--- a/filters/kchart/svg/svgexport.cc
+++ b/filters/kchart/svg/svgexport.cc
@@ -20,7 +20,7 @@
#include <tqpicture.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/xbm/xbmexport.cpp b/filters/kchart/xbm/xbmexport.cpp
index a0acd648..29a11743 100644
--- a/filters/kchart/xbm/xbmexport.cpp
+++ b/filters/kchart/xbm/xbmexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kchart/xpm/xpmexport.cpp b/filters/kchart/xpm/xpmexport.cpp
index da5832d0..bde51290 100644
--- a/filters/kchart/xpm/xpmexport.cpp
+++ b/filters/kchart/xpm/xpmexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cc
index 589c1168..d47e36bd 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cc
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStoreDevice.h>
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cc
index 5f4735a1..37951d2d 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cc
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStoreDevice.h>
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cc
index 42143fa5..b8fa07ed 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cc
@@ -20,9 +20,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <tqtextcodec.h>
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cc
index ec605aff..47b0d316 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cc
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cc
index 490787a8..938fed78 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cc
@@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kformulacontainer.h>
#include <kformuladocument.h>
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cc
index e63aca88..35896ac1 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cc
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kivio/imageexport/kivio_imageexport.cpp b/filters/kivio/imageexport/kivio_imageexport.cpp
index 93e37f6e..0c977398 100644
--- a/filters/kivio/imageexport/kivio_imageexport.cpp
+++ b/filters/kivio/imageexport/kivio_imageexport.cpp
@@ -27,8 +27,8 @@
#include <tqsize.h>
#include <tqstringlist.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kdebug.h>
diff --git a/filters/kivio/imageexport/kivio_imageexportdialog.cpp b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
index 957bda63..1ed8fc0d 100644
--- a/filters/kivio/imageexport/kivio_imageexportdialog.cpp
+++ b/filters/kivio/imageexport/kivio_imageexportdialog.cpp
@@ -23,7 +23,7 @@
#include <tqcheckbox.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "kivio_imageexportwidget.h"
diff --git a/filters/kpresenter/bmp/bmpexport.cpp b/filters/kpresenter/bmp/bmpexport.cpp
index f7351a10..40edc100 100644
--- a/filters/kpresenter/bmp/bmpexport.cpp
+++ b/filters/kpresenter/bmp/bmpexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/jpeg/jpegexport.cpp b/filters/kpresenter/jpeg/jpegexport.cpp
index 52711188..720d8244 100644
--- a/filters/kpresenter/jpeg/jpegexport.cpp
+++ b/filters/kpresenter/jpeg/jpegexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cc
index 8dd96c5f..fc0f50cd 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cc
@@ -24,7 +24,7 @@
#include <KoFilterChain.h>
#include <KoGlobal.h>
#include <kprkword.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqsortedlist.h>
#include <tqcolor.h>
diff --git a/filters/kpresenter/libimageexport/imageexport.cpp b/filters/kpresenter/libimageexport/imageexport.cpp
index c4ceb243..e203ca99 100644
--- a/filters/kpresenter/libimageexport/imageexport.cpp
+++ b/filters/kpresenter/libimageexport/imageexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/mng/mngexport.cpp b/filters/kpresenter/mng/mngexport.cpp
index 67ff47d5..d5de30d3 100644
--- a/filters/kpresenter/mng/mngexport.cpp
+++ b/filters/kpresenter/mng/mngexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/png/pngexport.cpp b/filters/kpresenter/png/pngexport.cpp
index 8bb6b054..cbece8f1 100644
--- a/filters/kpresenter/png/pngexport.cpp
+++ b/filters/kpresenter/png/pngexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cc
index 9eae5cd8..5b6ed892 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cc
@@ -21,7 +21,7 @@
#include <tqpicture.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/xbm/xbmexport.cpp b/filters/kpresenter/xbm/xbmexport.cpp
index 16a0818a..782dac96 100644
--- a/filters/kpresenter/xbm/xbmexport.cpp
+++ b/filters/kpresenter/xbm/xbmexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kpresenter/xpm/xpmexport.cpp b/filters/kpresenter/xpm/xpmexport.cpp
index 87097f5f..013f9459 100644
--- a/filters/kpresenter/xpm/xpmexport.cpp
+++ b/filters/kpresenter/xpm/xpmexport.cpp
@@ -20,7 +20,7 @@
#include <tqpixmap.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoStore.h>
diff --git a/filters/kspread/csv/csvdialog.cpp b/filters/kspread/csv/csvdialog.cpp
index d4173bd3..1e721d16 100644
--- a/filters/kspread/csv/csvdialog.cpp
+++ b/filters/kspread/csv/csvdialog.cpp
@@ -36,9 +36,9 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcharsets.h>
CSVDialog::CSVDialog(TQWidget* parent, TQByteArray& fileArray, const TQString /*seperator*/)
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cc
index c7a3b6c0..ceeb8b5e 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cc
@@ -24,7 +24,7 @@
#include <tqtextcodec.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kgenericfactory.h>
#include <KoFilterChain.h>
#include <KoFilterManager.h>
diff --git a/filters/kspread/csv/csvexportdialog.cpp b/filters/kspread/csv/csvexportdialog.cpp
index c136fd91..ebf1523e 100644
--- a/filters/kspread/csv/csvexportdialog.cpp
+++ b/filters/kspread/csv/csvexportdialog.cpp
@@ -40,10 +40,10 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcharsets.h>
using namespace KSpread;
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cc
index f5c4262a..72cadfa2 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cc
@@ -24,7 +24,7 @@
#include <tqregexp.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cc
index 6121baaf..001b35a2 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cc
@@ -37,7 +37,7 @@
#include <KoGlobal.h>
#include <KoUnit.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
typedef KGenericFactory<DBaseImport, KoFilter> DBaseImportFactory;
K_EXPORT_COMPONENT_FACTORY( libdbaseimport, DBaseImportFactory( "kofficefilters" ) )
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cc
index 05a57be6..28f5453e 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cc
@@ -24,7 +24,7 @@
#include <gnumericexport.h>
#include <kdebug.h>
#include <kfilterdev.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kgenericfactory.h>
#include <KoFilterChain.h>
#include <tqapplication.h>
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cc
index 665a6161..856a8491 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cc
@@ -27,7 +27,7 @@
#include <tqstringlist.h>
#include <gnumericimport.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kfilterdev.h>
#include <kdebug.h>
#include <kgenericfactory.h>
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cc
index cff62773..8df7e0ce 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cc
@@ -25,8 +25,8 @@
#include <tqtextcodec.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <exportdialog.h>
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cc
index 0c025525..6100dabe 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cc
@@ -50,8 +50,8 @@
//KDE Includes
#include <kgenericfactory.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdelistview.h>
#include <tqcolor.h>
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cc
index 090b4de1..0e15acbe 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cc
@@ -30,14 +30,14 @@
//KDE Includes
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kpushbutton.h>
#include <tdelistview.h>
#include <kcombobox.h>
#include <tqradiobutton.h>
#include <tqtextedit.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
//Kexi Includes
#include <kexidb/global.h>
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
index 6a53ee95..b088afe1 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
@@ -27,12 +27,12 @@
#include <tqcheckbox.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurlrequester.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cc
index c303a59e..d9ebd794 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cc
@@ -22,8 +22,8 @@
#include <kdebug.h>
#include <KoFilterChain.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqtextcodec.h>
#include "kspreadlatexexportdiaImpl.h"
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cc
index f092d6b1..2db60420 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cc
@@ -31,10 +31,10 @@
#include <tqvaluelist.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmdcodec.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoDocumentInfo.h>
#include <KoFilterChain.h>
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cc
index 08ccaca7..6dc3216e 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cc
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <KoDocumentInfo.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kmdcodec.h>
#include <KoFilterChain.h>
#include <KoGlobal.h>
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index ec4793d0..e282a769 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -19,7 +19,7 @@
*/
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kgenericfactory.h>
#include <KoFilterChain.h>
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cc
index 5e875ecd..e9474364 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cc
@@ -20,7 +20,7 @@
#include <tqstring.h>
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "ImportField.h"
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cc
index ac432855..1a023c8e 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cc
@@ -19,7 +19,7 @@
#include <tqfontinfo.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <KoGlobal.h>
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cc
index aec3373f..bd6ea1e3 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cc
@@ -34,7 +34,7 @@
#include <kmdcodec.h>
#include <kfilterdev.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoPageLayout.h>
#include <KoStore.h>
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cc
index eb408d17..577fb72b 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cc
@@ -23,12 +23,12 @@
#include <tqbuttongroup.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ExportDialogUI.h>
#include <ExportDialog.h>
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cc
index 45eaf0bf..09c81a09 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cc
@@ -22,13 +22,13 @@
#include <tqradiobutton.h>
#include <tqbuttongroup.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ImportDialogUI.h>
#include <ImportDialog.h>
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cc
index c3d17203..b7c4c0f5 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cc
@@ -35,7 +35,7 @@
#include <tqfontinfo.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kgenericfactory.h>
#include <KoGlobal.h>
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cc
index 8199f173..d222d7df 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cc
@@ -22,7 +22,7 @@
#include <tqtextcodec.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KWEFBaseWorker.h>
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cc
index faacff64..2388477c 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cc
@@ -22,7 +22,7 @@
#include <tqtextcodec.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KWEFUtil.h>
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cc
index e52f85c5..5fc3fdc5 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cc
@@ -20,13 +20,13 @@
#include <tqtextcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqradiobutton.h>
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cc
index 969ccd40..eccdead1 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cc
@@ -22,7 +22,7 @@
#include <tqtextcodec.h>
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KWEFBaseWorker.h>
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cc
index 05892740..96f0b6c5 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cc
@@ -25,7 +25,7 @@
#include <tqdir.h>
#include <tqpicture.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KWEFUtil.h>
diff --git a/filters/kword/kword1.3/import/kword13document.cpp b/filters/kword/kword1.3/import/kword13document.cpp
index db75a02f..747d88a4 100644
--- a/filters/kword/kword1.3/import/kword13document.cpp
+++ b/filters/kword/kword1.3/import/kword13document.cpp
@@ -21,7 +21,7 @@
#include <tqiodevice.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include "kword13utils.h"
#include "kword13layout.h"
diff --git a/filters/kword/kword1.3/import/kword13import.cpp b/filters/kword/kword1.3/import/kword13import.cpp
index 47eed1e7..9e10ad9c 100644
--- a/filters/kword/kword1.3/import/kword13import.cpp
+++ b/filters/kword/kword1.3/import/kword13import.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
#include <kimageio.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoFilterChain.h>
#include <KoStoreDevice.h>
diff --git a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
index 7f246cad..cc28136a 100644
--- a/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
+++ b/filters/kword/kword1.3/import/kword13oasisgenerator.cpp
@@ -25,7 +25,7 @@
#include <tqimage.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <kofficeversion.h>
diff --git a/filters/kword/kword1.3/import/kword13picture.cpp b/filters/kword/kword1.3/import/kword13picture.cpp
index c94d1e34..1fa6af72 100644
--- a/filters/kword/kword1.3/import/kword13picture.cpp
+++ b/filters/kword/kword1.3/import/kword13picture.cpp
@@ -21,7 +21,7 @@
#include <tqfile.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
diff --git a/filters/kword/latex/export/document.cc b/filters/kword/latex/export/document.cc
index 410e7b7f..13d40415 100644
--- a/filters/kword/latex/export/document.cc
+++ b/filters/kword/latex/export/document.cc
@@ -22,7 +22,7 @@
#include <stdlib.h> /* for atoi function */
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoStore.h>
#include <tqdir.h>
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cc
index a0da3ee4..3498bcdb 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cc
@@ -27,12 +27,12 @@
#include <tqcheckbox.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurlrequester.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cc
index 083f2375..fed29704 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cc
@@ -23,8 +23,8 @@
#include <kdebug.h>
#include <KoFilterChain.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqtextcodec.h>
#include "kwordlatexexportdia.h"
diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cc
index b67a7385..17c00b7d 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cc
@@ -2,8 +2,8 @@
#include "xml2latexparser.h"
//#include "texgraphexport.h"
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <KoFilter.h>
#include <KoStore.h>
#include<tqtextstream.h>
diff --git a/filters/kword/latex/import/generator/kwordgenerator.cc b/filters/kword/latex/import/generator/kwordgenerator.cc
index 0b0e7aa3..945c3869 100644
--- a/filters/kword/latex/import/generator/kwordgenerator.cc
+++ b/filters/kword/latex/import/generator/kwordgenerator.cc
@@ -18,7 +18,7 @@
*/
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqdom.h>
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cc
index 00f069cf..5bea13cc 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cc
@@ -22,8 +22,8 @@
#include <kdebug.h>
#include <KoFilterChain.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqtextcodec.h>
#include "lateximportdia.h"
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cc
index 6a8d201b..c69b7e90 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cc
@@ -36,7 +36,7 @@
#include <lateximportdia.h>
#include <lateximportdia.moc>
#include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqptrlist.h>
#include "latexparser.h"
diff --git a/filters/kword/latex/import/lateximportdia.h b/filters/kword/latex/import/lateximportdia.h
index 360bfd8c..1d8a3e57 100644
--- a/filters/kword/latex/import/lateximportdia.h
+++ b/filters/kword/latex/import/lateximportdia.h
@@ -41,7 +41,7 @@
#include <tqradiobutton.h>
#include <tqvbuttongroup.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopobject.h>
#include <kdialogbase.h>
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cc
index a3fca243..b0a7913d 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cc
@@ -37,8 +37,8 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <KoGlobal.h>
#include <KoStore.h>
diff --git a/filters/kword/msword/conversion.cpp b/filters/kword/msword/conversion.cpp
index 595c026c..01b4813d 100644
--- a/filters/kword/msword/conversion.cpp
+++ b/filters/kword/msword/conversion.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <tqregexp.h>
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
TQColor Conversion::color(int number, int defaultcolor, bool defaultWhite)
{
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index ab70c79a..043c1bc2 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -35,7 +35,7 @@
#include <wv2/parserfactory.h>
#include <wv2/paragraphproperties.h>
#include <wv2/associatedstrings.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoStore.h>
#include <KoFilterChain.h>
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 242a6d39..775f8bce 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -32,7 +32,7 @@
#include <tqfont.h>
#include <tqfontinfo.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
wvWare::U8 KWordReplacementHandler::hardLineBreak()
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cc
index 004b5cc3..cb983491 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cc
@@ -20,9 +20,9 @@
#include <tqtextcodec.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharsets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cc
index 73acf741..216ace49 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cc
@@ -37,7 +37,7 @@
#include <tqdom.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kzip.h>
#include <KoPageLayout.h>
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cc
index 22d9fed5..259d97b5 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cc
@@ -1,6 +1,6 @@
#include "conversion.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
TQString Conversion::importAlignment( const TQString& align )
{
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cc
index 6bd88ec9..5e54ce06 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cc
@@ -37,7 +37,7 @@
#include <KoDocument.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoFilterChain.h>
#include <KoUnit.h>
#include <KoPageLayout.h>
diff --git a/filters/kword/pdf/FilterPage.cpp b/filters/kword/pdf/FilterPage.cpp
index 14d3d384..0bd5a5a1 100644
--- a/filters/kword/pdf/FilterPage.cpp
+++ b/filters/kword/pdf/FilterPage.cpp
@@ -21,7 +21,7 @@
#include <math.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "data.h"
diff --git a/filters/kword/pdf/data.cpp b/filters/kword/pdf/data.cpp
index 3236aa39..25a09f85 100644
--- a/filters/kword/pdf/data.cpp
+++ b/filters/kword/pdf/data.cpp
@@ -19,9 +19,9 @@
#include "data.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace PDFImport;
diff --git a/filters/kword/pdf/dialog.cpp b/filters/kword/pdf/dialog.cpp
index 013d4cb3..1513208d 100644
--- a/filters/kword/pdf/dialog.cpp
+++ b/filters/kword/pdf/dialog.cpp
@@ -32,7 +32,7 @@
#include <tqwhatsthis.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/filters/kword/pdf/fstring.cpp b/filters/kword/pdf/fstring.cpp
index c8ecabcb..c681ff01 100644
--- a/filters/kword/pdf/fstring.cpp
+++ b/filters/kword/pdf/fstring.cpp
@@ -19,7 +19,7 @@
#include "fstring.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "data.h"
diff --git a/filters/kword/pdf/misc.cpp b/filters/kword/pdf/misc.cpp
index 3cd0e1bf..b2b2f141 100644
--- a/filters/kword/pdf/misc.cpp
+++ b/filters/kword/pdf/misc.cpp
@@ -22,7 +22,7 @@
#include <math.h>
#include <tqfontmetrics.h>
#include <tqfontdatabase.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "Link.h"
diff --git a/filters/kword/pdf/pdfdocument.cpp b/filters/kword/pdf/pdfdocument.cpp
index 80ec92d0..b50e590f 100644
--- a/filters/kword/pdf/pdfdocument.cpp
+++ b/filters/kword/pdf/pdfdocument.cpp
@@ -22,7 +22,7 @@
#include <math.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "GlobalParams.h"
#include "PDFDoc.h"
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cc
index 14dce1e2..eba2b645 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cc
@@ -32,8 +32,8 @@
#include <tqcolor.h>
#include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <KWEFUtil.h>
diff --git a/filters/kword/rtf/import/rtfimport.cpp b/filters/kword/rtf/import/rtfimport.cpp
index eb8c467d..4b8d7e1b 100644
--- a/filters/kword/rtf/import/rtfimport.cpp
+++ b/filters/kword/rtf/import/rtfimport.cpp
@@ -28,7 +28,7 @@
#include <tqvaluelist.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoPicture.h>
#include <KoFilterManager.h>
diff --git a/filters/libdialogfilter/exportsizedia.cpp b/filters/libdialogfilter/exportsizedia.cpp
index 3cd6a01d..a4a15217 100644
--- a/filters/libdialogfilter/exportsizedia.cpp
+++ b/filters/libdialogfilter/exportsizedia.cpp
@@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include "exportsizedia.h"
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cc
index 99879f28..ae0395a9 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cc
@@ -26,7 +26,7 @@ DESCRIPTION
#include <olefilter.h>
#include <tqfile.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kgenericfactory.h>
#include <kmimetype.h>
#include <KoFilterChain.h>
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cc
index be32e432..bf141f90 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cc
@@ -25,13 +25,13 @@
#include <tqcombobox.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <tdeversion.h>
#include <kstandarddirs.h>
#include <tderecentdocument.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdefiledialog.h>
#include <kdebug.h>
#include <KoFilterManager.h>
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cc
index ee3fdf70..24dfb547 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cc
@@ -22,8 +22,8 @@
#include <kdebug.h>
#include <KoFilterChain.h>
#include <kgenericfactory.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqtextcodec.h>
#include "xsltimportdia.h"
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cc
index a29638e6..9052e4ec 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cc
@@ -28,12 +28,12 @@
#include <tqdir.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tderecentdocument.h>
#include <KoFilterManager.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <xsltproc.h>
diff --git a/karbon/commands/valigncmd.cc b/karbon/commands/valigncmd.cc
index 47665eb5..d79c8485 100644
--- a/karbon/commands/valigncmd.cc
+++ b/karbon/commands/valigncmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "valigncmd.h"
#include "vtransformcmd.h"
diff --git a/karbon/commands/vbooleancmd.cc b/karbon/commands/vbooleancmd.cc
index e04676f7..dbfccffe 100644
--- a/karbon/commands/vbooleancmd.cc
+++ b/karbon/commands/vbooleancmd.cc
@@ -22,7 +22,7 @@
#include <tqptrlist.h>
#include <tqvaluelist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vbooleancmd.h"
#include "vpath.h"
diff --git a/karbon/commands/vcleanupcmd.cc b/karbon/commands/vcleanupcmd.cc
index 6df53601..2c9d4962 100644
--- a/karbon/commands/vcleanupcmd.cc
+++ b/karbon/commands/vcleanupcmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcleanupcmd.h"
#include "vlayer.h"
diff --git a/karbon/commands/vclosepathcmd.cc b/karbon/commands/vclosepathcmd.cc
index 3afe6195..652ed2df 100644
--- a/karbon/commands/vclosepathcmd.cc
+++ b/karbon/commands/vclosepathcmd.cc
@@ -18,7 +18,7 @@
*/
#include "vclosepathcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <core/vpath.h>
diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cc
index 57826185..fe5e9ada 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cc
@@ -20,7 +20,7 @@
#include "tdeaction.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include "vcommand.h"
#include "karbon_part.h"
diff --git a/karbon/commands/vdeletecmd.cc b/karbon/commands/vdeletecmd.cc
index d94723c0..997a7cc9 100644
--- a/karbon/commands/vdeletecmd.cc
+++ b/karbon/commands/vdeletecmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdeletecmd.h"
#include "vselection.h"
diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cc
index d1f7c979..e83c160a 100644
--- a/karbon/commands/vdeletenodescmd.cc
+++ b/karbon/commands/vdeletenodescmd.cc
@@ -19,7 +19,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdeletenodescmd.h"
#include "vselection.h"
diff --git a/karbon/commands/vdistributecmd.cc b/karbon/commands/vdistributecmd.cc
index d8e410b0..7a23072f 100644
--- a/karbon/commands/vdistributecmd.cc
+++ b/karbon/commands/vdistributecmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdistributecmd.h"
#include "vtransformcmd.h"
diff --git a/karbon/commands/vfillcmd.cc b/karbon/commands/vfillcmd.cc
index 18f17b85..75d5284c 100644
--- a/karbon/commands/vfillcmd.cc
+++ b/karbon/commands/vfillcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vfill.h"
#include "vfillcmd.h"
diff --git a/karbon/commands/vflattencmd.cc b/karbon/commands/vflattencmd.cc
index 0cab021a..21d5b50c 100644
--- a/karbon/commands/vflattencmd.cc
+++ b/karbon/commands/vflattencmd.cc
@@ -18,7 +18,7 @@
*/
#include "vflattencmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <core/vpath.h>
#include <core/vsegment.h>
diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cc
index bcad4d93..70bd2933 100644
--- a/karbon/commands/vgroupcmd.cc
+++ b/karbon/commands/vgroupcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vgroup.h"
#include "vgroupcmd.h"
diff --git a/karbon/commands/vinsertcmd.cc b/karbon/commands/vinsertcmd.cc
index 2db54907..fb544a0c 100644
--- a/karbon/commands/vinsertcmd.cc
+++ b/karbon/commands/vinsertcmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vdocument.h"
#include "vlayer.h"
diff --git a/karbon/commands/vstrokecmd.cc b/karbon/commands/vstrokecmd.cc
index 2ea43668..7b99f2d7 100644
--- a/karbon/commands/vstrokecmd.cc
+++ b/karbon/commands/vstrokecmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vselection.h"
#include "vstroke.h"
diff --git a/karbon/commands/vtextcmd.cc b/karbon/commands/vtextcmd.cc
index 32e7b031..fd7424ba 100644
--- a/karbon/commands/vtextcmd.cc
+++ b/karbon/commands/vtextcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "karbon_view.h"
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cc
index dc1038ab..ebcb443e 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cc
@@ -18,7 +18,7 @@
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcomposite.h"
#include "vpath.h"
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cc
index 314a873e..947c4afe 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vgroup.h"
#include "vungroupcmd.h"
diff --git a/karbon/commands/vzordercmd.cc b/karbon/commands/vzordercmd.cc
index 2839120f..2a25edf9 100644
--- a/karbon/commands/vzordercmd.cc
+++ b/karbon/commands/vzordercmd.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vzordercmd.h"
#include "vselection.h"
diff --git a/karbon/core/vglobal.h b/karbon/core/vglobal.h
index c20d48b0..5c0d4706 100644
--- a/karbon/core/vglobal.h
+++ b/karbon/core/vglobal.h
@@ -21,7 +21,7 @@
#ifndef __VGLOBAL_H__
#define __VGLOBAL_H__
-#include <kglobal.h>
+#include <tdeglobal.h>
// define some often used mathematical constants et al:
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cc
index 47fe919d..55602598 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cc
@@ -19,7 +19,7 @@
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include "vcomposite.h"
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cc
index 90548045..ae8e399a 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "vcolor.h"
#include "vcolordlg.h"
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cc
index 56fecc0b..0b2c3bab 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cc
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "vcolor.h"
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cc
index 3e353484..bc4e5eb1 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cc
@@ -31,7 +31,7 @@
#include <kiconloader.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <KoUnitWidgets.h>
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cc
index 2428de11..27009bf2 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cc
@@ -26,7 +26,7 @@
#include <tqvbuttongroup.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cc
index c6453575..328f4f3f 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cc
@@ -27,7 +27,7 @@
#include <tqevent.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include "karbon_part.h"
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cc
index 6272cc2b..dc676a85 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cc
@@ -29,8 +29,8 @@
#include <tqlabel.h>
#include <tqcursor.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <KoMainWindow.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cc
index f30b3042..13fe44c1 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cc
@@ -26,7 +26,7 @@
#include <tqtooltip.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cc
index 5bf60993..9f3d12e6 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cc
@@ -25,7 +25,7 @@
#include <tqhbuttongroup.h>
#include <tqtoolbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <KoMainWindow.h>
#include <KoFilterManager.h>
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cc
index 7e93577b..69c9a87c 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cc
@@ -24,7 +24,7 @@
#include <tqwmatrix.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoMainWindow.h>
#include <KoRect.h>
#include <KoUnitWidgets.h>
diff --git a/karbon/karbon_aboutdata.h b/karbon/karbon_aboutdata.h
index aee04a23..8b9d9840 100644
--- a/karbon/karbon_aboutdata.h
+++ b/karbon/karbon_aboutdata.h
@@ -2,7 +2,7 @@
#define KARBON_ABOUTDATA_H
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
static const char* description=I18N_NOOP( "A Vector Graphics Drawing Application." );
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cc
index 32d5e2de..6dd94ed3 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cc
@@ -19,10 +19,10 @@
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cc
index 896b0450..a34a4da1 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cc
@@ -25,8 +25,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
#include <KoTemplateChooseDia.h>
#include <KoStoreDevice.h>
#include <KoOasisStyles.h>
diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cc
index 92c94fdf..2b31e4d7 100644
--- a/karbon/karbon_resourceserver.cc
+++ b/karbon/karbon_resourceserver.cc
@@ -24,9 +24,9 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <kogradientmanager.h>
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cc
index 432d243d..115bbf6f 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cc
@@ -29,9 +29,9 @@
#include <tdeaction.h>
#include <kcolordrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kprinter.h>
diff --git a/karbon/main.cc b/karbon/main.cc
index a02c04de..434134fe 100644
--- a/karbon/main.cc
+++ b/karbon/main.cc
@@ -22,7 +22,7 @@
#include <dcopclient.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoApplication.h>
#include "karbon_aboutdata.h"
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cc
index 78c2a66e..6c4a33d8 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cc
@@ -18,7 +18,7 @@
*/
#include "flattenpathplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cc
index 090561a8..749e07a1 100644
--- a/karbon/plugins/imagetool/vimagetool.cc
+++ b/karbon/plugins/imagetool/vimagetool.cc
@@ -19,7 +19,7 @@
*/
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kdebug.h>
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
index a837e51e..019b4024 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cc
@@ -18,7 +18,7 @@
*/
#include "shadoweffectplugin.h"
-#include "klocale.h"
+#include "tdelocale.h"
#include <karbon_view.h>
#include <karbon_part.h>
#include <kgenericfactory.h>
diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cc
index beb19a68..1cecb94a 100644
--- a/karbon/plugins/zoomtool/vzoomtool.cc
+++ b/karbon/plugins/zoomtool/vzoomtool.cc
@@ -21,7 +21,7 @@
#include <tqcursor.h>
#include <tqevent.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vzoomtool.h"
#include <karbon_part.h>
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cc
index 503b2e57..3f81f3c3 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cc
@@ -54,7 +54,7 @@
#include <gdk-pixbuf-xlibrgb.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <math.h>
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cc
index ef5bb070..1a9462b8 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cc
@@ -20,7 +20,7 @@
#include "vellipse.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cc
index 1735471f..fdf0f745 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cc
@@ -23,7 +23,7 @@
#include "vglobal.h"
#include "vpolygon.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cc
index cef5bda2..519422ed 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cc
@@ -22,7 +22,7 @@
#include <tqdom.h>
#include "vglobal.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <vdocument.h>
#include "vtransformcmd.h"
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cc
index bbeef50f..3190c93c 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cc
@@ -19,7 +19,7 @@
#include "vrectangle.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <KoStore.h>
#include <KoXmlWriter.h>
diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cc
index 362ed800..f27cee4b 100644
--- a/karbon/shapes/vsinus.cc
+++ b/karbon/shapes/vsinus.cc
@@ -23,7 +23,7 @@
#include "vglobal.h"
#include "vsinus.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <tqdom.h>
#include <vdocument.h>
diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cc
index 0df88485..ff2f691e 100644
--- a/karbon/shapes/vspiral.cc
+++ b/karbon/shapes/vspiral.cc
@@ -26,7 +26,7 @@
#include "vglobal.h"
#include "vspiral.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <vdocument.h>
diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cc
index 260c1664..a43413c9 100644
--- a/karbon/shapes/vstar.cc
+++ b/karbon/shapes/vstar.cc
@@ -26,7 +26,7 @@
#include "vglobal.h"
#include "vstar.h"
#include "vtransformcmd.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnit.h>
#include <vdocument.h>
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cc
index b8855c50..170a51dd 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cc
@@ -21,7 +21,7 @@
#include <tqgroupbox.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KoUnitWidgets.h"
#include <KoUnit.h>
#include <kcombobox.h>
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cc
index 68d7972e..e7d2db3c 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cc
@@ -20,7 +20,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <karbon_part.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cc
index 963f1a61..8c42d5e0 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cc
@@ -30,7 +30,7 @@
#include <kiconloader.h>
#include <koIconChooser.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <karbon_factory.h>
#include <karbon_resourceserver.h>
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cc
index a15dbf2d..1239923e 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cc
@@ -28,7 +28,7 @@
#include <tqvbox.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
//#include <KoUnitWidgets.h>
diff --git a/karbon/tools/vpenciltool.h b/karbon/tools/vpenciltool.h
index 3667f294..8def1526 100644
--- a/karbon/tools/vpenciltool.h
+++ b/karbon/tools/vpenciltool.h
@@ -25,7 +25,7 @@
#include <tqptrlist.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "KoPoint.h"
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cc
index 18895cea..de475691 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cc
@@ -22,7 +22,7 @@
#include <tqgroupbox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cc
index e1689419..38ac9d25 100644
--- a/karbon/tools/vpolylinetool.cc
+++ b/karbon/tools/vpolylinetool.cc
@@ -22,7 +22,7 @@
#include <tqevent.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <karbon_part.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cc
index 5b0fcffe..4572cc23 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vrectangletool.h b/karbon/tools/vrectangletool.h
index 7da59745..1915b10a 100644
--- a/karbon/tools/vrectangletool.h
+++ b/karbon/tools/vrectangletool.h
@@ -21,7 +21,7 @@
#define __VRECTANGLETOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cc
index f8d341dc..4230cac7 100644
--- a/karbon/tools/vrotatetool.cc
+++ b/karbon/tools/vrotatetool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include <karbon_part.h>
diff --git a/karbon/tools/vroundrecttool.h b/karbon/tools/vroundrecttool.h
index 27e4ca3d..35ee9be1 100644
--- a/karbon/tools/vroundrecttool.h
+++ b/karbon/tools/vroundrecttool.h
@@ -20,7 +20,7 @@
#ifndef __VROUNDRECTTOOL_H__
#define __VROUNDRECTTOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include <knuminput.h>
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cc
index 7123b71a..2a3c38bb 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <KoRect.h>
diff --git a/karbon/tools/vselecttool.h b/karbon/tools/vselecttool.h
index e7791172..464dc6af 100644
--- a/karbon/tools/vselecttool.h
+++ b/karbon/tools/vselecttool.h
@@ -21,7 +21,7 @@
#define __VSELECTTOOL_H__
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vtool.h"
diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cc
index d7fd40b9..4bc80810 100644
--- a/karbon/tools/vsheartool.cc
+++ b/karbon/tools/vsheartool.cc
@@ -22,7 +22,7 @@
#include <tqcursor.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoRect.h>
#include <karbon_part.h>
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cc
index d46c4180..12dbe128 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <karbon_view.h>
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cc
index e0b99c9e..c414be41 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <knuminput.h>
diff --git a/karbon/tools/vspiraltool.h b/karbon/tools/vspiraltool.h
index 05694267..48842e9f 100644
--- a/karbon/tools/vspiraltool.h
+++ b/karbon/tools/vspiraltool.h
@@ -21,7 +21,7 @@
#define __VSPIRALTOOL_H__
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cc
index e152ad31..9a92cd37 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cc
@@ -20,7 +20,7 @@
#include <tqlabel.h>
#include <tqgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcombobox.h>
diff --git a/karbon/tools/vstartool.h b/karbon/tools/vstartool.h
index 1d35ad43..5c8936dc 100644
--- a/karbon/tools/vstartool.h
+++ b/karbon/tools/vstartool.h
@@ -20,7 +20,7 @@
#ifndef __VSTARTOOL_H__
#define __VSTARTOOL_H__
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "vshapetool.h"
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cc
index 13e037a1..e7fa848d 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cc
@@ -35,7 +35,7 @@
#include <tdefontdialog.h>
#include <kiconloader.h>
#include <knuminput.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <karbon_view.h>
#include <karbon_part.h>
diff --git a/karbon/visitors/vselectiondesc.cc b/karbon/visitors/vselectiondesc.cc
index 0036f31c..8518b7b6 100644
--- a/karbon/visitors/vselectiondesc.cc
+++ b/karbon/visitors/vselectiondesc.cc
@@ -24,7 +24,7 @@
#include "vimage.h"
#include "vcomposite.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
void
VSelectionDescription::visitVSelection( VSelection& selection )
diff --git a/karbon/vtool.h b/karbon/vtool.h
index 4b085cba..87d7b1b3 100644
--- a/karbon/vtool.h
+++ b/karbon/vtool.h
@@ -22,7 +22,7 @@
#include <tqobject.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <koffice_export.h>
class TDERadioAction;
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cc
index 9fa5dcd6..d4cd6497 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cc
@@ -34,7 +34,7 @@
#include "vtool.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordrag.h>
int
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cc
index d24e6956..5c57efab 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cc
@@ -27,7 +27,7 @@
#include <knuminput.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistbox.h>
#include <kiconloader.h>
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cc
index d4ea8e75..64cbf373 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cc
@@ -24,7 +24,7 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
#include <kiconloader.h>
diff --git a/karbon/widgets/vselecttoolbar.cc b/karbon/widgets/vselecttoolbar.cc
index ff2d3585..ef731e92 100644
--- a/karbon/widgets/vselecttoolbar.cc
+++ b/karbon/widgets/vselecttoolbar.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "KoUnitWidgets.h"
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cc
index afd48d71..28a8dd27 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cc
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include "vcolor.h"
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cc
index d6b288ba..35a25a71 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cc
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cc
index 84b3ed14..9a98a125 100644
--- a/karbon/widgets/vtypebuttonbox.cc
+++ b/karbon/widgets/vtypebuttonbox.cc
@@ -207,7 +207,7 @@ static const char* const buttonpattern[]={
#include <tqtoolbutton.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "karbon_part.h"
#include "vfillcmd.h"
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cc
index 5f404eb3..cf13c1b5 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cc
@@ -35,9 +35,9 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcharsets.h>
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cc
index 798e27d5..d7716d31 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cc
@@ -20,11 +20,11 @@
#include "kchartBackgroundPixmapConfigPage.h"
#include "kchartBackgroundPixmapConfigPage.moc"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdefilemetainfo.h>
#include <kstringhandler.h>
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cc
index faaa81d2..921b42c4 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cc
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cc
index 85313c0e..dcf99e4a 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartComboConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cc
index e92d20f9..f0f57d62 100644
--- a/kchart/kchartConfigDialog.cc
+++ b/kchart/kchartConfigDialog.cc
@@ -38,7 +38,7 @@
#include "kchartParameterPolarConfigPage.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqradiobutton.h>
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cc
index d31e4799..f9cc7e25 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cc
@@ -22,7 +22,7 @@
#include "kchartDataConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cc
index 2bd0230d..8f08dd78 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cc
@@ -10,9 +10,9 @@
#include <tqpushbutton.h>
#include <kinputdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include "kdchart/KDChartAxisParams.h"
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cc
index 2b23b22f..27f91581 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cc
@@ -23,7 +23,7 @@
#include "kchartFontConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cc
index 8730063f..8e11184e 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cc
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqlineedit.h>
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cc
index e0baf943..dc18d717 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartLegendConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <tdefontdialog.h>
#include <kiconloader.h>
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cc
index 6308fe43..f3750f73 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartLine3dConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cc
index 9292f1f9..e2587b9f 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cc
@@ -23,7 +23,7 @@
#include <knumvalidator.h>
#include <tqlineedit.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqgroupbox.h>
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cc
index a74878d2..1b37b8cc 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cc
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cc
index 2025be3b..da6c8017 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cc
@@ -22,7 +22,7 @@
#include "kchartParameterConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tqcheckbox.h>
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cc
index 99bfb6ff..d640333e 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cc
@@ -22,7 +22,7 @@
#include "kchartParameterPieConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cc
index 32775fc0..b6e1fe59 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cc
@@ -22,7 +22,7 @@
#include "kchartParameterPolarConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cc
index cf96654a..31ec42a6 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cc
@@ -21,7 +21,7 @@
#include "kchartPieConfigPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlabel.h>
#include <tdefontdialog.h>
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cc
index a7d0e88f..a02592de 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cc
@@ -26,7 +26,7 @@
// KDE includes
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
// local includes
#include "kchartPrinterDlg.h"
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cc
index e171da84..9ccad59e 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cc
@@ -23,7 +23,7 @@
#include "kchartSubTypeChartPage.moc"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <tqvbuttongroup.h>
diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cc
index a2166f2e..01e5bf45 100644
--- a/kchart/kchartWizard.cc
+++ b/kchart/kchartWizard.cc
@@ -12,7 +12,7 @@
#include <tqwidget.h>
#include <tqpushbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kchart/kchartWizard.h b/kchart/kchartWizard.h
index e3725bc1..1e14840b 100644
--- a/kchart/kchartWizard.h
+++ b/kchart/kchartWizard.h
@@ -1,7 +1,7 @@
#ifndef kchartWIZARD_H
#define kchartWIZARD_H
-#include <klocale.h>
+#include <tdelocale.h>
#include "kwizard.h"
#include "kchart_part.h"
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cc
index c745a16a..3899a276 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cc
@@ -6,7 +6,7 @@
#include <tqlineedit.h>
#include <tqradiobutton.h>
#include <tqlabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cc
index 2aa08afe..2c86549a 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cc
@@ -15,8 +15,8 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "kchart_params.h"
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cc
index b0365ddd..8ea02100 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cc
@@ -10,8 +10,8 @@
#include <tqpushbutton.h>
#include <tqlabel.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
namespace KChart
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cc
index e7ab0ba8..d40e95fe 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cc
@@ -18,8 +18,8 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "kchart_params.h"
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cc
index 5043313f..5514e82b 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cc
@@ -8,7 +8,7 @@
#include <tqcheckbox.h>
#include <tqgroupbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <knumvalidator.h>
#include <math.h>
diff --git a/kchart/kchart_aboutdata.h b/kchart/kchart_aboutdata.h
index abf8b2f7..5e53ed37 100644
--- a/kchart/kchart_aboutdata.h
+++ b/kchart/kchart_aboutdata.h
@@ -21,7 +21,7 @@
#define KCHART_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
namespace KChart
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cc
index f45e6aed..05362738 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cc
@@ -8,7 +8,7 @@
#include "kchart_factory.h"
#include "kchart_aboutdata.h"
#include "kchart_part.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cc
index 55a158d7..2cd8da51 100644
--- a/kchart/kchart_params.cc
+++ b/kchart/kchart_params.cc
@@ -26,7 +26,7 @@ using std::cerr;
#include <dcopobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoXmlNS.h>
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cc
index 67b0ab57..fb6a6414 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cc
@@ -26,7 +26,7 @@ using std::cerr;
#include <KoOasisLoadingContext.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqdom.h>
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cc
index 1a40d1a9..ba2d1321 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cc
@@ -12,17 +12,17 @@
#include <tqcstring.h> // For TQByteArray
#include <tdeaction.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kprinter.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <dcopobject.h>
#include <kxmlguifactory.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoTemplateCreateDia.h>
diff --git a/kchart/main.cc b/kchart/main.cc
index a82f44dd..97d046d1 100644
--- a/kchart/main.cc
+++ b/kchart/main.cc
@@ -19,7 +19,7 @@
#include <KoApplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kchart_aboutdata.h"
using namespace KChart;
diff --git a/kdgantt/KDGanttViewSubwidgets.cpp b/kdgantt/KDGanttViewSubwidgets.cpp
index c25d4e12..d7b88e2c 100644
--- a/kdgantt/KDGanttViewSubwidgets.cpp
+++ b/kdgantt/KDGanttViewSubwidgets.cpp
@@ -53,8 +53,8 @@
#include <tqptrlist.h>
#include <tqpen.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kdebug.h>
diff --git a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
index 26960701..90adff17 100644
--- a/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
+++ b/kexi/3rdparty/kolibs/KoPageLayoutSize.cpp
@@ -22,9 +22,9 @@
#include <KoUnit.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cc
index 24aa75ed..a375327f 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cc
@@ -23,9 +23,9 @@
#include <kdebug.h>
#include <tqfont.h>
#include <tqfontinfo.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/kexi/3rdparty/kolibs/koPageLayout.cpp b/kexi/3rdparty/kolibs/koPageLayout.cpp
index b4640a30..6aa0ea66 100644
--- a/kexi/3rdparty/kolibs/koPageLayout.cpp
+++ b/kexi/3rdparty/kolibs/koPageLayout.cpp
@@ -20,10 +20,10 @@
*/
#include "KoPageLayout.h"
#include <KoUnit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#ifndef SIMPLE_KOLIBS
# include <kodom.h>
# include <koxmlns.h>
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
index 99d5e01d..2f0db91a 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cc
@@ -29,9 +29,9 @@
#include <KoUnit.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cc
index 38c8b111..a2eb289a 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cc
@@ -24,8 +24,8 @@
# include <KoXmlWriter.h>
#endif
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqregexp.h>
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cc
index 3f6fb09e..097dfc25 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cc
@@ -20,8 +20,8 @@
#include "koUnitWidgets.moc"
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
diff --git a/kexi/core/kexi.cpp b/kexi/core/kexi.cpp
index 5ce1bc84..cf17da06 100644
--- a/kexi/core/kexi.cpp
+++ b/kexi/core/kexi.cpp
@@ -39,7 +39,7 @@
#include <ksharedptr.h>
#include <kmimetype.h>
#include <kstaticdeleter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
using namespace Kexi;
diff --git a/kexi/core/kexi.h b/kexi/core/kexi.h
index 921db42b..f90ec767 100644
--- a/kexi/core/kexi.h
+++ b/kexi/core/kexi.h
@@ -31,8 +31,8 @@
#include <kexidb/drivermanager.h>
#include <kexidb/driver.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
namespace Kexi
{
diff --git a/kexi/core/kexiaboutdata.cpp b/kexi/core/kexiaboutdata.cpp
index e41cf0ff..f3573887 100644
--- a/kexi/core/kexiaboutdata.cpp
+++ b/kexi/core/kexiaboutdata.cpp
@@ -23,7 +23,7 @@
#include <kexi_version.h>
#include <tdeversion.h>
#include <kofficeversion.h> //only for KOFFICE_VERSION_STRING
-#include <klocale.h>
+#include <tdelocale.h>
static const char *description =
I18N_NOOP("Database creation for everyone")
diff --git a/kexi/core/kexicmdlineargs.h b/kexi/core/kexicmdlineargs.h
index 5c31f63f..62cbbe7f 100644
--- a/kexi/core/kexicmdlineargs.h
+++ b/kexi/core/kexicmdlineargs.h
@@ -23,7 +23,7 @@
#define KEXICMDLINEARGS_H
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static TDECmdLineOptions options[] =
{
diff --git a/kexi/core/kexicontexthelp.cpp b/kexi/core/kexicontexthelp.cpp
index ac2ed101..627bd761 100644
--- a/kexi/core/kexicontexthelp.cpp
+++ b/kexi/core/kexicontexthelp.cpp
@@ -21,7 +21,7 @@
#include <KoContextCelp.h>
#include <kxmlguiclient.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tqlayout.h>
#include <kdebug.h>
diff --git a/kexi/core/kexiguimsghandler.cpp b/kexi/core/kexiguimsghandler.cpp
index 5b2b2791..eb5bdc24 100644
--- a/kexi/core/kexiguimsghandler.cpp
+++ b/kexi/core/kexiguimsghandler.cpp
@@ -23,7 +23,7 @@
#include <kexidb/utils.h>
#include <kexiutils/utils.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdialogbase.h>
KexiGUIMessageHandler::KexiGUIMessageHandler(TQWidget *parent)
diff --git a/kexi/core/kexiinternalpart.cpp b/kexi/core/kexiinternalpart.cpp
index 0cfce53b..8635fa49 100644
--- a/kexi/core/kexiinternalpart.cpp
+++ b/kexi/core/kexiinternalpart.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ktrader.h>
#include <tdeparts/componentfactory.h>
#include <kexidb/msghandler.h>
diff --git a/kexi/core/kexipart.cpp b/kexi/core/kexipart.cpp
index e1ed78fe..e907110a 100644
--- a/kexi/core/kexipart.cpp
+++ b/kexi/core/kexipart.cpp
@@ -38,7 +38,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace KexiPart {
//! @internal
diff --git a/kexi/core/kexiproject.cpp b/kexi/core/kexiproject.cpp
index 1dbe4eef..e5b1c2a4 100644
--- a/kexi/core/kexiproject.cpp
+++ b/kexi/core/kexiproject.cpp
@@ -24,7 +24,7 @@
#include <kmimetype.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kexiutils/identifier.h>
diff --git a/kexi/core/kexiprojectconnectiondata.cpp b/kexi/core/kexiprojectconnectiondata.cpp
index 17ce3d89..52567288 100644
--- a/kexi/core/kexiprojectconnectiondata.cpp
+++ b/kexi/core/kexiprojectconnectiondata.cpp
@@ -25,13 +25,13 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kexidb/connectiondata.h>
#include <kexidb/drivermanager.h>
diff --git a/kexi/core/kexiprojectdata.cpp b/kexi/core/kexiprojectdata.cpp
index dd877873..53daea99 100644
--- a/kexi/core/kexiprojectdata.cpp
+++ b/kexi/core/kexiprojectdata.cpp
@@ -26,13 +26,13 @@
#include <tqfile.h>
#include <tqregexp.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kexidb/drivermanager.h>
#include "kexiprojectdata.h"
diff --git a/kexi/core/kexitemplateloader.cpp b/kexi/core/kexitemplateloader.cpp
index 7ced2d6f..c68bd124 100644
--- a/kexi/core/kexitemplateloader.cpp
+++ b/kexi/core/kexitemplateloader.cpp
@@ -20,8 +20,8 @@
#include "kexitemplateloader.h"
#include <kstandarddirs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kexi/core/kexiuseraction.cpp b/kexi/core/kexiuseraction.cpp
index 3bc22a7a..ad97123e 100644
--- a/kexi/core/kexiuseraction.cpp
+++ b/kexi/core/kexiuseraction.cpp
@@ -1,4 +1,4 @@
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeshortcut.h>
diff --git a/kexi/core/kexiuseractionmethod.cpp b/kexi/core/kexiuseractionmethod.cpp
index 41b35782..bef945e3 100644
--- a/kexi/core/kexiuseractionmethod.cpp
+++ b/kexi/core/kexiuseractionmethod.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include "kexiuseraction.h"
#include "kexiuseractionmethod.h"
diff --git a/kexi/formeditor/commands.cpp b/kexi/formeditor/commands.cpp
index 29cbfcaa..338cb08c 100644
--- a/kexi/formeditor/commands.cpp
+++ b/kexi/formeditor/commands.cpp
@@ -25,9 +25,9 @@
#include <tqmetaobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaccelmanager.h>
#include "formIO.h"
diff --git a/kexi/formeditor/connectiondialog.cpp b/kexi/formeditor/connectiondialog.cpp
index 0e59a08f..8376beb7 100644
--- a/kexi/formeditor/connectiondialog.cpp
+++ b/kexi/formeditor/connectiondialog.cpp
@@ -27,9 +27,9 @@
#include <kpushbutton.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kexitableview.h"
#include "kexitableviewdata.h"
diff --git a/kexi/formeditor/container.cpp b/kexi/formeditor/container.cpp
index 3f7d201b..a785893f 100644
--- a/kexi/formeditor/container.cpp
+++ b/kexi/formeditor/container.cpp
@@ -27,7 +27,7 @@
#include <tqcursor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <cstdlib> // for abs()
diff --git a/kexi/formeditor/editlistviewdialog.cpp b/kexi/formeditor/editlistviewdialog.cpp
index eca07032..44bc8096 100644
--- a/kexi/formeditor/editlistviewdialog.cpp
+++ b/kexi/formeditor/editlistviewdialog.cpp
@@ -24,7 +24,7 @@
#include <tdelistbox.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koproperty/editor.h>
#include <koproperty/set.h>
diff --git a/kexi/formeditor/factories/containerfactory.cpp b/kexi/formeditor/factories/containerfactory.cpp
index 81360927..18ce167c 100644
--- a/kexi/formeditor/factories/containerfactory.cpp
+++ b/kexi/formeditor/factories/containerfactory.cpp
@@ -42,7 +42,7 @@
#include <kgenericfactory.h>
#include <ktextedit.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
diff --git a/kexi/formeditor/factories/stdwidgetfactory.cpp b/kexi/formeditor/factories/stdwidgetfactory.cpp
index ebc9606f..c5a4a5cb 100644
--- a/kexi/formeditor/factories/stdwidgetfactory.cpp
+++ b/kexi/formeditor/factories/stdwidgetfactory.cpp
@@ -31,7 +31,7 @@
#include <kprogress.h>
#include <kiconloader.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
diff --git a/kexi/formeditor/form.cpp b/kexi/formeditor/form.cpp
index 1e185d6d..b52c2087 100644
--- a/kexi/formeditor/form.cpp
+++ b/kexi/formeditor/form.cpp
@@ -25,10 +25,10 @@
#include <tqptrdict.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "container.h"
#include "objecttree.h"
diff --git a/kexi/formeditor/formIO.cpp b/kexi/formeditor/formIO.cpp
index 264b3bad..3d6fc8ca 100644
--- a/kexi/formeditor/formIO.cpp
+++ b/kexi/formeditor/formIO.cpp
@@ -34,7 +34,7 @@
#include <tqpainter.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tdeaccelmanager.h>
diff --git a/kexi/formeditor/formmanager.cpp b/kexi/formeditor/formmanager.cpp
index 9ab98f4a..25f13b97 100644
--- a/kexi/formeditor/formmanager.cpp
+++ b/kexi/formeditor/formmanager.cpp
@@ -31,20 +31,20 @@
#include <tqvaluevector.h>
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <kstdaction.h>
#include <tdeaction.h>
#include <kxmlguiclient.h>
#include <tdemainwindow.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdestyle.h>
#include <tdeactionclasses.h>
#include <tdeapplication.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kdialogbase.h>
#include <ktextedit.h>
#include <ktabwidget.h>
diff --git a/kexi/formeditor/objecttreeview.cpp b/kexi/formeditor/objecttreeview.cpp
index e668aa48..22434c87 100644
--- a/kexi/formeditor/objecttreeview.cpp
+++ b/kexi/formeditor/objecttreeview.cpp
@@ -22,7 +22,7 @@
#include <tqpainter.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "objecttree.h"
#include "form.h"
diff --git a/kexi/formeditor/resizehandle.cpp b/kexi/formeditor/resizehandle.cpp
index bdd0e3b0..1c3ad69d 100644
--- a/kexi/formeditor/resizehandle.cpp
+++ b/kexi/formeditor/resizehandle.cpp
@@ -18,7 +18,7 @@
*/
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
#include <tqcursor.h>
diff --git a/kexi/formeditor/richtextdialog.cpp b/kexi/formeditor/richtextdialog.cpp
index 291b96dc..9fde7052 100644
--- a/kexi/formeditor/richtextdialog.cpp
+++ b/kexi/formeditor/richtextdialog.cpp
@@ -23,7 +23,7 @@
#include <kcolorcombo.h>
#include <tdetoolbarradiogroup.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "richtextdialog.h"
diff --git a/kexi/formeditor/tabstopdialog.cpp b/kexi/formeditor/tabstopdialog.cpp
index f28c8e2a..bbc34098 100644
--- a/kexi/formeditor/tabstopdialog.cpp
+++ b/kexi/formeditor/tabstopdialog.cpp
@@ -23,7 +23,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include "form.h"
diff --git a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
index 4445e9ec..15bb1a2f 100644
--- a/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
+++ b/kexi/formeditor/tdevelop_plugin/kfd_kdev_part.cpp
@@ -28,7 +28,7 @@
#include <tdeversion.h>
#include <tdeaction.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kstdaction.h>
@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "form.h"
#include "formIO.h"
diff --git a/kexi/formeditor/test/kfd_mainwindow.cpp b/kexi/formeditor/test/kfd_mainwindow.cpp
index d1a3edfd..455fd311 100644
--- a/kexi/formeditor/test/kfd_mainwindow.cpp
+++ b/kexi/formeditor/test/kfd_mainwindow.cpp
@@ -21,8 +21,8 @@
#include <kurl.h>
#include <kdebug.h>
#include <klibloader.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include "kfd_mainwindow.h"
diff --git a/kexi/formeditor/test/kfd_part.cpp b/kexi/formeditor/test/kfd_part.cpp
index 649c2fe9..401bfd20 100644
--- a/kexi/formeditor/test/kfd_part.cpp
+++ b/kexi/formeditor/test/kfd_part.cpp
@@ -28,7 +28,7 @@
#include <tdeversion.h>
#include <tdeaction.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
#include <kstdaction.h>
@@ -36,7 +36,7 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <klibloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "form.h"
#include "formIO.h"
diff --git a/kexi/formeditor/test/main.cpp b/kexi/formeditor/test/main.cpp
index 3f0727b7..53aa5720 100644
--- a/kexi/formeditor/test/main.cpp
+++ b/kexi/formeditor/test/main.cpp
@@ -22,7 +22,7 @@
#include <kiconloader.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char *description =
I18N_NOOP("KFormDesigner");
diff --git a/kexi/formeditor/widgetfactory.cpp b/kexi/formeditor/widgetfactory.cpp
index 9537085e..b90193bc 100644
--- a/kexi/formeditor/widgetfactory.cpp
+++ b/kexi/formeditor/widgetfactory.cpp
@@ -27,7 +27,7 @@
#include <tqmetaobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
//#ifdef KEXI_KTEXTEDIT
#include <ktextedit.h>
//#else
diff --git a/kexi/formeditor/widgetlibrary.cpp b/kexi/formeditor/widgetlibrary.cpp
index fcb0ffe6..23991774 100644
--- a/kexi/formeditor/widgetlibrary.cpp
+++ b/kexi/formeditor/widgetlibrary.cpp
@@ -23,7 +23,7 @@
#include <tqstrlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klibloader.h>
#include <tdeparts/componentfactory.h>
#include <ktrader.h>
diff --git a/kexi/formeditor/widgetpropertyset.cpp b/kexi/formeditor/widgetpropertyset.cpp
index 73c79c30..74b1a4f6 100644
--- a/kexi/formeditor/widgetpropertyset.cpp
+++ b/kexi/formeditor/widgetpropertyset.cpp
@@ -28,9 +28,9 @@
#include <tqapplication.h>
#include <tqeventloop.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "objecttree.h"
#include "form.h"
diff --git a/kexi/kexidb/connection.cpp b/kexi/kexidb/connection.cpp
index 9037b041..dd2eb76b 100644
--- a/kexi/kexidb/connection.cpp
+++ b/kexi/kexidb/connection.cpp
@@ -44,7 +44,7 @@
#include <tqguardedptr.h>
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#define KEXIDB_EXTENDED_TABLE_SCHEMA_VERSION 1
diff --git a/kexi/kexidb/connectiondata.cpp b/kexi/kexidb/connectiondata.cpp
index 4f45b0f4..14c23dfe 100644
--- a/kexi/kexidb/connectiondata.cpp
+++ b/kexi/kexidb/connectiondata.cpp
@@ -24,7 +24,7 @@
#include <tqfileinfo.h>
#include <tqdir.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiDB;
diff --git a/kexi/kexidb/cursor.cpp b/kexi/kexidb/cursor.cpp
index b5f095e2..41bf4735 100644
--- a/kexi/kexidb/cursor.cpp
+++ b/kexi/kexidb/cursor.cpp
@@ -26,7 +26,7 @@
#include <kexiutils/utils.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <assert.h>
#include <stdlib.h>
diff --git a/kexi/kexidb/dbproperties.cpp b/kexi/kexidb/dbproperties.cpp
index 490a7390..ba9b1be0 100644
--- a/kexi/kexidb/dbproperties.cpp
+++ b/kexi/kexidb/dbproperties.cpp
@@ -18,7 +18,7 @@
*/
#include "dbproperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiDB;
diff --git a/kexi/kexidb/driver.cpp b/kexi/kexidb/driver.cpp
index 8e08b83f..953243e4 100644
--- a/kexi/kexidb/driver.cpp
+++ b/kexi/kexidb/driver.cpp
@@ -29,7 +29,7 @@
#include <tqfileinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <assert.h>
diff --git a/kexi/kexidb/drivermanager.cpp b/kexi/kexidb/drivermanager.cpp
index 498c4610..0ce563a9 100644
--- a/kexi/kexidb/drivermanager.cpp
+++ b/kexi/kexidb/drivermanager.cpp
@@ -30,7 +30,7 @@
#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservice.h>
#include <assert.h>
diff --git a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
index abfdb44f..590e7cec 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlcursor.cpp
@@ -23,7 +23,7 @@
#include "mysqlconnection_p.h"
#include <kexidb/error.h>
#include <kexidb/utils.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <limits.h>
diff --git a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
index d6262bef..76684483 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxconnection.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kexidb/error.h>
#include <kexidb/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <string>
#include "pqxxpreparedstatement.h"
#include "pqxxconnection_p.h"
diff --git a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
index b7219e71..746a383a 100644
--- a/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
+++ b/kexi/kexidb/drivers/pqxx/pqxxcursor.cpp
@@ -24,7 +24,7 @@
#include <kexidb/error.h>
#include <kexidb/global.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <cstdlib>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
index fe6a78ea..c8282963 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitecursor.cpp
@@ -31,7 +31,7 @@
#include <stdlib.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqptrvector.h>
#include <tqdatetime.h>
diff --git a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
index 71ba2321..afc86143 100644
--- a/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
+++ b/kexi/kexidb/drivers/sqlite/sqlitevacuum.cpp
@@ -23,9 +23,9 @@
#include <kstandarddirs.h>
#include <kprogress.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <ktempfile.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
+#include <tdemessagebox.h>
#include <tdeio/global.h>
#include <tqfileinfo.h>
diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index fabdf603..f4e5ccfe 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -28,7 +28,7 @@
#include <ctype.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
diff --git a/kexi/kexidb/field.cpp b/kexi/kexidb/field.cpp
index 79b38aca..41cce80b 100644
--- a/kexi/kexidb/field.cpp
+++ b/kexi/kexidb/field.cpp
@@ -27,7 +27,7 @@
// we use here i18n() but this depends on kde libs: TODO: add #ifdefs
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
diff --git a/kexi/kexidb/object.cpp b/kexi/kexidb/object.cpp
index 2e32274d..bc3249fc 100644
--- a/kexi/kexidb/object.cpp
+++ b/kexi/kexidb/object.cpp
@@ -21,7 +21,7 @@
#include <kexidb/error.h>
#include <kexidb/msghandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KexiDB;
diff --git a/kexi/kexidb/object.h b/kexi/kexidb/object.h
index 232535d1..6fb183ba 100644
--- a/kexi/kexidb/object.h
+++ b/kexi/kexidb/object.h
@@ -21,7 +21,7 @@
#define KEXIDB_OBJECT_H
#include <kexidb/error.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdguiitem.h>
#include <tqstring.h>
diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 1d2e5295..df4f3323 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -21,7 +21,7 @@
#include "sqlparser.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqregexp.h>
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index 097deb3b..b7ddccd8 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -800,7 +800,7 @@
#include <tqobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqptrlist.h>
#include <tqcstring.h>
#include <tqvariant.h>
diff --git a/kexi/kexidb/parser/sqlparser.y b/kexi/kexidb/parser/sqlparser.y
index c2d8e887..a3397806 100644
--- a/kexi/kexidb/parser/sqlparser.y
+++ b/kexi/kexidb/parser/sqlparser.y
@@ -466,7 +466,7 @@
#include <tqobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqptrlist.h>
#include <tqcstring.h>
#include <tqvariant.h>
diff --git a/kexi/kexidb/parser/sqlscanner.cpp b/kexi/kexidb/parser/sqlscanner.cpp
index 75ee2535..3cd6bdf3 100644
--- a/kexi/kexidb/parser/sqlscanner.cpp
+++ b/kexi/kexidb/parser/sqlscanner.cpp
@@ -507,7 +507,7 @@ char *yytext;
#include "sqltypes.h"
#include <iostream>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define YY_NO_UNPUT
#define ECOUNT current += yyleng; ctoken = yytext
diff --git a/kexi/kexidb/parser/sqlscanner.l b/kexi/kexidb/parser/sqlscanner.l
index 5f74a0ca..b16a615d 100644
--- a/kexi/kexidb/parser/sqlscanner.l
+++ b/kexi/kexidb/parser/sqlscanner.l
@@ -26,7 +26,7 @@
#include "sqltypes.h"
#include <iostream>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#define YY_NO_UNPUT
#define ECOUNT current += yyleng; ctoken = yytext
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index 31727bd5..1ee0d52d 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -34,7 +34,7 @@
#include <tqbitarray.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiDB;
diff --git a/kexi/kexidb/utils.cpp b/kexi/kexidb/utils.cpp
index d6652f6d..edb472a0 100644
--- a/kexi/kexidb/utils.cpp
+++ b/kexi/kexidb/utils.cpp
@@ -29,10 +29,10 @@
#include <tqbuffer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include "utils_p.h"
diff --git a/kexi/kexiutils/validator.h b/kexi/kexiutils/validator.h
index 684a30fc..88d76b06 100644
--- a/kexi/kexiutils/validator.h
+++ b/kexi/kexiutils/validator.h
@@ -26,7 +26,7 @@
#include <tqvariant.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KexiUtils {
diff --git a/kexi/main/kexifinddialog.cpp b/kexi/main/kexifinddialog.cpp
index 255e1882..3365268a 100644
--- a/kexi/main/kexifinddialog.cpp
+++ b/kexi/main/kexifinddialog.cpp
@@ -23,7 +23,7 @@
#include <kstdaction.h>
#include <kpushbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kdialog.h>
#include <tdeaction.h>
diff --git a/kexi/main/keximainwindowimpl.cpp b/kexi/main/keximainwindowimpl.cpp
index dd629780..d6b2cc16 100644
--- a/kexi/main/keximainwindowimpl.cpp
+++ b/kexi/main/keximainwindowimpl.cpp
@@ -39,15 +39,15 @@
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdestdaccel.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <kkeydialog.h>
#include <kedittoolbar.h>
#include <tdeversion.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeparts/componentfactory.h>
#include <ktip.h>
#include <kstandarddirs.h>
diff --git a/kexi/main/keximainwindowimpl.h b/kexi/main/keximainwindowimpl.h
index 8df772ce..e2493320 100644
--- a/kexi/main/keximainwindowimpl.h
+++ b/kexi/main/keximainwindowimpl.h
@@ -21,7 +21,7 @@
#ifndef KEXIMAINWINDOWIMPL_H
#define KEXIMAINWINDOWIMPL_H
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "core/keximainwindow.h"
#include "core/kexiguimsghandler.h"
diff --git a/kexi/main/kexinamewidget.cpp b/kexi/main/kexinamewidget.cpp
index 8f5ee38a..7176aa6d 100644
--- a/kexi/main/kexinamewidget.cpp
+++ b/kexi/main/kexinamewidget.cpp
@@ -23,8 +23,8 @@
#include <tqlayout.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kexiutils/validator.h>
#include <kexiutils/identifier.h>
diff --git a/kexi/main/kexinewstuff.cpp b/kexi/main/kexinewstuff.cpp
index 1d81f9f8..725c1047 100644
--- a/kexi/main/kexinewstuff.cpp
+++ b/kexi/main/kexinewstuff.cpp
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <tdeapplication.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#include "kexinewstuff.h"
diff --git a/kexi/main/kexistatusbar.cpp b/kexi/main/kexistatusbar.cpp
index 85468e1d..6aaa6ace 100644
--- a/kexi/main/kexistatusbar.cpp
+++ b/kexi/main/kexistatusbar.cpp
@@ -29,8 +29,8 @@
#include <tqfontmetrics.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <tdeparts/part.h>
#if KexitStatusBar_KTEXTEDITOR_USED
diff --git a/kexi/main/printing/kexisimpleprintingengine.cpp b/kexi/main/printing/kexisimpleprintingengine.cpp
index 05c5f3ab..8aed1c0a 100644
--- a/kexi/main/printing/kexisimpleprintingengine.cpp
+++ b/kexi/main/printing/kexisimpleprintingengine.cpp
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <kurllabel.h>
#include <kdebug.h>
diff --git a/kexi/main/printing/kexisimpleprintingpagesetup.cpp b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
index 4b15b16d..35f8aa31 100644
--- a/kexi/main/printing/kexisimpleprintingpagesetup.cpp
+++ b/kexi/main/printing/kexisimpleprintingpagesetup.cpp
@@ -27,7 +27,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefontdialog.h>
#include <kurllabel.h>
#include <kdebug.h>
diff --git a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
index acd0d709..c19108be 100644
--- a/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
+++ b/kexi/main/printing/kexisimpleprintpreviewwindow.cpp
@@ -29,7 +29,7 @@
#include <kdialogbase.h>
#include <tdetoolbarbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <kpushbutton.h>
diff --git a/kexi/main/startup/KexiConnSelector.cpp b/kexi/main/startup/KexiConnSelector.cpp
index f09f911f..1c46a046 100644
--- a/kexi/main/startup/KexiConnSelector.cpp
+++ b/kexi/main/startup/KexiConnSelector.cpp
@@ -31,7 +31,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <kurlcombobox.h>
diff --git a/kexi/main/startup/KexiNewProjectWizard.cpp b/kexi/main/startup/KexiNewProjectWizard.cpp
index 2ce05870..e479d1bb 100644
--- a/kexi/main/startup/KexiNewProjectWizard.cpp
+++ b/kexi/main/startup/KexiNewProjectWizard.cpp
@@ -35,12 +35,12 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeconfig.h>
#include <tdelistview.h>
#include <kurlcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <tqobjectlist.h>
diff --git a/kexi/main/startup/KexiProjectSelector.cpp b/kexi/main/startup/KexiProjectSelector.cpp
index cdc770d9..76299637 100644
--- a/kexi/main/startup/KexiProjectSelector.cpp
+++ b/kexi/main/startup/KexiProjectSelector.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kmimetype.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/kexi/main/startup/KexiStartup.cpp b/kexi/main/startup/KexiStartup.cpp
index 9bbe7a13..6e2ecc80 100644
--- a/kexi/main/startup/KexiStartup.cpp
+++ b/kexi/main/startup/KexiStartup.cpp
@@ -40,9 +40,9 @@
#include <kexidbshortcutfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdecmdlineargs.h>
#include <tdeversion.h>
#include <kprogress.h>
diff --git a/kexi/main/startup/KexiStartupDialog.cpp b/kexi/main/startup/KexiStartupDialog.cpp
index 4288ef78..f0b9a0e9 100644
--- a/kexi/main/startup/KexiStartupDialog.cpp
+++ b/kexi/main/startup/KexiStartupDialog.cpp
@@ -36,17 +36,17 @@
#include <tqtooltip.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#include <kinstance.h>
#include <kdebug.h>
#include <kpushbutton.h>
#include <kjanuswidget.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ktextedit.h>
#include <tdefileiconview.h>
#include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <kmimetype.h>
#include <ktextbrowser.h>
diff --git a/kexi/main/startup/KexiStartupFileDialog.cpp b/kexi/main/startup/KexiStartupFileDialog.cpp
index 1bccbf1e..defa2e06 100644
--- a/kexi/main/startup/KexiStartupFileDialog.cpp
+++ b/kexi/main/startup/KexiStartupFileDialog.cpp
@@ -28,8 +28,8 @@
#include <tqpushbutton.h>
#include <tqapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kmimetype.h>
#include <tdefile.h>
diff --git a/kexi/main/startup/KexiStartup_p.cpp b/kexi/main/startup/KexiStartup_p.cpp
index 136ea3c6..f9b535c8 100644
--- a/kexi/main/startup/KexiStartup_p.cpp
+++ b/kexi/main/startup/KexiStartup_p.cpp
@@ -23,7 +23,7 @@
#include <kprogress.h>
#include <kprocess.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfileinfo.h>
#include <tqdir.h>
diff --git a/kexi/migration/importoptionsdlg.cpp b/kexi/migration/importoptionsdlg.cpp
index 474dc98a..9f8bbce3 100644
--- a/kexi/migration/importoptionsdlg.cpp
+++ b/kexi/migration/importoptionsdlg.cpp
@@ -29,8 +29,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcombobox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
#include <kiconloader.h>
diff --git a/kexi/migration/importwizard.cpp b/kexi/migration/importwizard.cpp
index a62f90aa..12b207a9 100644
--- a/kexi/migration/importwizard.cpp
+++ b/kexi/migration/importwizard.cpp
@@ -30,7 +30,7 @@
#include <tqcheckbox.h>
#include <kcombobox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/kexi/migration/migratemanager.cpp b/kexi/migration/migratemanager.cpp
index 07245ba9..1bc8945f 100644
--- a/kexi/migration/migratemanager.cpp
+++ b/kexi/migration/migratemanager.cpp
@@ -27,7 +27,7 @@
#include <tdeparts/componentfactory.h>
#include <ktrader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kservice.h>
#include <assert.h>
diff --git a/kexi/plugins/forms/kexidataprovider.cpp b/kexi/plugins/forms/kexidataprovider.cpp
index 35e51dc1..637c9434 100644
--- a/kexi/plugins/forms/kexidataprovider.cpp
+++ b/kexi/plugins/forms/kexidataprovider.cpp
@@ -23,7 +23,7 @@
#include <tqobjectlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <widget/tableview/kexitableitem.h>
#include <widget/tableview/kexitableviewdata.h>
diff --git a/kexi/plugins/forms/kexidatasourcepage.cpp b/kexi/plugins/forms/kexidatasourcepage.cpp
index 6910bda9..54ecbb1d 100644
--- a/kexi/plugins/forms/kexidatasourcepage.cpp
+++ b/kexi/plugins/forms/kexidatasourcepage.cpp
@@ -25,7 +25,7 @@
#include <tqheader.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdetoolbarbutton.h>
#include <kdebug.h>
#include <tdepopupmenu.h>
diff --git a/kexi/plugins/forms/kexidbfactory.cpp b/kexi/plugins/forms/kexidbfactory.cpp
index 9f63c09c..1154e110 100644
--- a/kexi/plugins/forms/kexidbfactory.cpp
+++ b/kexi/plugins/forms/kexidbfactory.cpp
@@ -25,7 +25,7 @@
#include <tqstyle.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tdeactioncollection.h>
diff --git a/kexi/plugins/forms/kexiformeventhandler.cpp b/kexi/plugins/forms/kexiformeventhandler.cpp
index 4d1f0ec7..aae99906 100644
--- a/kexi/plugins/forms/kexiformeventhandler.cpp
+++ b/kexi/plugins/forms/kexiformeventhandler.cpp
@@ -23,7 +23,7 @@
#include <tqobjectlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tableview/kexitableitem.h>
#include <tableview/kexitableviewdata.h>
diff --git a/kexi/plugins/forms/widgets/kexidbautofield.cpp b/kexi/plugins/forms/widgets/kexidbautofield.cpp
index 9437faca..f4056728 100644
--- a/kexi/plugins/forms/widgets/kexidbautofield.cpp
+++ b/kexi/plugins/forms/widgets/kexidbautofield.cpp
@@ -28,7 +28,7 @@
#include <tqapplication.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kexidbcheckbox.h"
#include "kexidbimagebox.h"
diff --git a/kexi/plugins/forms/widgets/kexidbimagebox.cpp b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
index ed441d4f..fb963600 100644
--- a/kexi/plugins/forms/widgets/kexidbimagebox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbimagebox.cpp
@@ -32,7 +32,7 @@
#include <kdebug.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kimageio.h>
@@ -40,7 +40,7 @@
#include <kstaticdeleter.h>
#include <kimageeffect.h>
#include <tdestdaccel.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kguiitem.h>
#include <widget/utils/kexidropdownbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvexport.cpp b/kexi/plugins/importexport/csv/kexicsvexport.cpp
index 2e49660d..7b369c60 100644
--- a/kexi/plugins/importexport/csv/kexicsvexport.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexport.cpp
@@ -34,7 +34,7 @@
#include <tqgroupbox.h>
#include <tqclipboard.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kactivelabel.h>
#include <kpushbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
index 070ea234..104e43b3 100644
--- a/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvexportwizard.cpp
@@ -34,7 +34,7 @@
#include <tqgroupbox.h>
#include <tqclipboard.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kactivelabel.h>
#include <kpushbutton.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index 2bbe979c..941a7bd0 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -46,9 +46,9 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include <kiconloader.h>
#include <kcharsets.h>
#include <knuminput.h>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
index 642c2b3a..dce13f38 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportoptionsdlg.cpp
@@ -28,8 +28,8 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
#include <kcombobox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
KexiCSVImportOptions::KexiCSVImportOptions()
diff --git a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
index c0608072..b1ee4366 100644
--- a/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvwidgets.cpp
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineedit.h>
#include <kdialogbase.h>
#include <kactivelabel.h>
diff --git a/kexi/plugins/macros/kexiactions/datatableaction.cpp b/kexi/plugins/macros/kexiactions/datatableaction.cpp
index 4e211a53..6fa700c4 100644
--- a/kexi/plugins/macros/kexiactions/datatableaction.cpp
+++ b/kexi/plugins/macros/kexiactions/datatableaction.cpp
@@ -27,7 +27,7 @@
#include <core/keximainwindow.h>
#include <core/kexiinternalpart.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/executeaction.cpp b/kexi/plugins/macros/kexiactions/executeaction.cpp
index 7383b9a8..f34ca89c 100644
--- a/kexi/plugins/macros/kexiactions/executeaction.cpp
+++ b/kexi/plugins/macros/kexiactions/executeaction.cpp
@@ -27,7 +27,7 @@
#include <core/kexipart.h>
#include <core/keximainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/messageaction.cpp b/kexi/plugins/macros/kexiactions/messageaction.cpp
index f421abb5..bb588dee 100644
--- a/kexi/plugins/macros/kexiactions/messageaction.cpp
+++ b/kexi/plugins/macros/kexiactions/messageaction.cpp
@@ -22,8 +22,8 @@
#include <core/keximainwindow.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/navigateaction.cpp b/kexi/plugins/macros/kexiactions/navigateaction.cpp
index 336039ae..5f10bd1a 100644
--- a/kexi/plugins/macros/kexiactions/navigateaction.cpp
+++ b/kexi/plugins/macros/kexiactions/navigateaction.cpp
@@ -31,7 +31,7 @@
#include <widget/kexidataawareview.h>
#include <widget/tableview/kexidataawareobjectiface.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexiactions/objectnamevariable.h b/kexi/plugins/macros/kexiactions/objectnamevariable.h
index 03545f69..da94c8c5 100644
--- a/kexi/plugins/macros/kexiactions/objectnamevariable.h
+++ b/kexi/plugins/macros/kexiactions/objectnamevariable.h
@@ -30,7 +30,7 @@
#include <core/kexipartmanager.h>
#include <core/kexipartinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KexiMacro {
diff --git a/kexi/plugins/macros/kexiactions/objectvariable.h b/kexi/plugins/macros/kexiactions/objectvariable.h
index 65def3aa..0fb2dd4d 100644
--- a/kexi/plugins/macros/kexiactions/objectvariable.h
+++ b/kexi/plugins/macros/kexiactions/objectvariable.h
@@ -31,7 +31,7 @@
#include <core/kexipartmanager.h>
#include <core/kexipartinfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KexiMacro {
diff --git a/kexi/plugins/macros/kexiactions/openaction.cpp b/kexi/plugins/macros/kexiactions/openaction.cpp
index f5206ff5..0a41b644 100644
--- a/kexi/plugins/macros/kexiactions/openaction.cpp
+++ b/kexi/plugins/macros/kexiactions/openaction.cpp
@@ -27,7 +27,7 @@
#include <core/kexipart.h>
#include <core/keximainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KexiMacro;
diff --git a/kexi/plugins/macros/kexipart/keximacroerror.h b/kexi/plugins/macros/kexipart/keximacroerror.h
index 6a9d2964..a953f0d9 100644
--- a/kexi/plugins/macros/kexipart/keximacroerror.h
+++ b/kexi/plugins/macros/kexipart/keximacroerror.h
@@ -27,9 +27,9 @@
#include <tqpushbutton.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include "../lib/context.h"
diff --git a/kexi/plugins/macros/kexipart/keximacroproperty.cpp b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
index 07c8f8e1..c87cb5b4 100644
--- a/kexi/plugins/macros/kexipart/keximacroproperty.cpp
+++ b/kexi/plugins/macros/kexipart/keximacroproperty.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
#include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kexi/plugins/macros/tests/komacrotest.cpp b/kexi/plugins/macros/tests/komacrotest.cpp
index c1754ef3..f05f8290 100644
--- a/kexi/plugins/macros/tests/komacrotest.cpp
+++ b/kexi/plugins/macros/tests/komacrotest.cpp
@@ -19,7 +19,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeunittest/runner.h>
static const char description[] =
diff --git a/kexi/plugins/macros/tests/komacrotestgui.cpp b/kexi/plugins/macros/tests/komacrotestgui.cpp
index f0bc50c1..ea4bbb9c 100644
--- a/kexi/plugins/macros/tests/komacrotestgui.cpp
+++ b/kexi/plugins/macros/tests/komacrotestgui.cpp
@@ -19,7 +19,7 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "tdeunittest/runnergui.h"
diff --git a/kexi/plugins/macros/tests/testaction.cpp b/kexi/plugins/macros/tests/testaction.cpp
index 4e7bb67b..3e4d2816 100644
--- a/kexi/plugins/macros/tests/testaction.cpp
+++ b/kexi/plugins/macros/tests/testaction.cpp
@@ -25,7 +25,7 @@
#include "../lib/macroitem.h"
#include "../lib/variable.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KoMacroTest;
diff --git a/kexi/plugins/queries/kexiaddparamdialog.cpp b/kexi/plugins/queries/kexiaddparamdialog.cpp
index 9b7f5db9..0b117d84 100644
--- a/kexi/plugins/queries/kexiaddparamdialog.cpp
+++ b/kexi/plugins/queries/kexiaddparamdialog.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <klineedit.h>
#include <tqvbox.h>
diff --git a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
index 555a84cf..82bd2fe2 100644
--- a/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
+++ b/kexi/plugins/queries/kexidynamicqueryparameterdialog.cpp
@@ -22,7 +22,7 @@
#include "kexidynamicqueryparameterdialog.moc"
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlineedit.h>
#include <tqobjectlist.h>
diff --git a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
index 9a6f3205..45ea8e1d 100644
--- a/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
+++ b/kexi/plugins/queries/kexiquerydesignerguieditor.cpp
@@ -26,8 +26,8 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kexidb/field.h>
#include <kexidb/queryschema.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersql.cpp b/kexi/plugins/queries/kexiquerydesignersql.cpp
index 0f39cb59..39e36bbb 100644
--- a/kexi/plugins/queries/kexiquerydesignersql.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersql.cpp
@@ -26,7 +26,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconloader.h>
#include <kexiutils/utils.h>
diff --git a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
index 3328e42f..c528540a 100644
--- a/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
+++ b/kexi/plugins/queries/kexiquerydesignersqlhistory.cpp
@@ -23,10 +23,10 @@
#include <tqregexp.h>
#include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdeapplication.h>
#include "kexiquerydesignersqlhistory.h"
diff --git a/kexi/plugins/relations/kexirelationmaindlg.cpp b/kexi/plugins/relations/kexirelationmaindlg.cpp
index affc1214..4c77b6dd 100644
--- a/kexi/plugins/relations/kexirelationmaindlg.cpp
+++ b/kexi/plugins/relations/kexirelationmaindlg.cpp
@@ -19,7 +19,7 @@
#include "kexirelationmaindlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
diff --git a/kexi/plugins/reports/kexireportfactory.cpp b/kexi/plugins/reports/kexireportfactory.cpp
index cf54b254..35036222 100644
--- a/kexi/plugins/reports/kexireportfactory.cpp
+++ b/kexi/plugins/reports/kexireportfactory.cpp
@@ -20,7 +20,7 @@
#include <tqvaluevector.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <klineedit.h>
diff --git a/kexi/plugins/tables/kexilookupcolumnpage.cpp b/kexi/plugins/tables/kexilookupcolumnpage.cpp
index 143a0392..f718efd0 100644
--- a/kexi/plugins/tables/kexilookupcolumnpage.cpp
+++ b/kexi/plugins/tables/kexilookupcolumnpage.cpp
@@ -25,7 +25,7 @@
#include <tqheader.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdetoolbarbutton.h>
#include <kdebug.h>
#include <tdepopupmenu.h>
diff --git a/kexi/plugins/tables/kexitabledesignercommands.cpp b/kexi/plugins/tables/kexitabledesignercommands.cpp
index 4f6c9ff9..843a9a13 100644
--- a/kexi/plugins/tables/kexitabledesignercommands.cpp
+++ b/kexi/plugins/tables/kexitabledesignercommands.cpp
@@ -24,9 +24,9 @@
#include <tqmetaobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeaccelmanager.h>
#include <koproperty/property.h>
diff --git a/kexi/plugins/tables/kexitabledesignerview.cpp b/kexi/plugins/tables/kexitabledesignerview.cpp
index 514be26a..df715cbe 100644
--- a/kexi/plugins/tables/kexitabledesignerview.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview.cpp
@@ -28,10 +28,10 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kiconeffect.h>
#include <koproperty/set.h>
diff --git a/kexi/plugins/tables/kexitabledesignerview_p.cpp b/kexi/plugins/tables/kexitabledesignerview_p.cpp
index 761107c2..7e5521e3 100644
--- a/kexi/plugins/tables/kexitabledesignerview_p.cpp
+++ b/kexi/plugins/tables/kexitabledesignerview_p.cpp
@@ -26,10 +26,10 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <koproperty/set.h>
diff --git a/kexi/plugins/tables/kexitablepart.cpp b/kexi/plugins/tables/kexitablepart.cpp
index 07541f4d..5b8538a7 100644
--- a/kexi/plugins/tables/kexitablepart.cpp
+++ b/kexi/plugins/tables/kexitablepart.cpp
@@ -23,7 +23,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ktabwidget.h>
#include <kiconloader.h>
diff --git a/kexi/tests/gui/finddialog/kexifinddialog.cpp b/kexi/tests/gui/finddialog/kexifinddialog.cpp
index 72266fb2..5215a28f 100644
--- a/kexi/tests/gui/finddialog/kexifinddialog.cpp
+++ b/kexi/tests/gui/finddialog/kexifinddialog.cpp
@@ -22,7 +22,7 @@
#include <kstdguiitem.h>
#include <kpushbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcheckbox.h>
#include <tqlabel.h>
diff --git a/kexi/tests/gui/finddialog/main.cpp b/kexi/tests/gui/finddialog/main.cpp
index 8c86cfb5..936b3c77 100644
--- a/kexi/tests/gui/finddialog/main.cpp
+++ b/kexi/tests/gui/finddialog/main.cpp
@@ -18,7 +18,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
diff --git a/kexi/tests/tableview/main.cpp b/kexi/tests/tableview/main.cpp
index 799294f6..4f929f8c 100644
--- a/kexi/tests/tableview/main.cpp
+++ b/kexi/tests/tableview/main.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tableview/kexitableview.h>
diff --git a/kexi/widget/kexibrowser.cpp b/kexi/widget/kexibrowser.cpp
index 4aa82bec..2c86d4f7 100644
--- a/kexi/widget/kexibrowser.cpp
+++ b/kexi/widget/kexibrowser.cpp
@@ -32,10 +32,10 @@
#include <tdeapplication.h>
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <kimageeffect.h>
#include <tdeconfig.h>
diff --git a/kexi/widget/kexicharencodingcombobox.cpp b/kexi/widget/kexicharencodingcombobox.cpp
index ad368e69..76f19ba6 100644
--- a/kexi/widget/kexicharencodingcombobox.cpp
+++ b/kexi/widget/kexicharencodingcombobox.cpp
@@ -22,8 +22,8 @@
#include <tqtextcodec.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kcharsets.h>
KexiCharacterEncodingComboBox::KexiCharacterEncodingComboBox(
diff --git a/kexi/widget/kexidatatable.cpp b/kexi/widget/kexidatatable.cpp
index 797fa440..18319585 100644
--- a/kexi/widget/kexidatatable.cpp
+++ b/kexi/widget/kexidatatable.cpp
@@ -24,7 +24,7 @@
#include <tqlabel.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
diff --git a/kexi/widget/kexidswelcome.cpp b/kexi/widget/kexidswelcome.cpp
index e1184553..6f722f0e 100644
--- a/kexi/widget/kexidswelcome.cpp
+++ b/kexi/widget/kexidswelcome.cpp
@@ -21,9 +21,9 @@
#include <tqcheckbox.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstdguiitem.h>
#include <tdeversion.h>
diff --git a/kexi/widget/kexieditor.cpp b/kexi/widget/kexieditor.cpp
index 05115b69..5df84c96 100644
--- a/kexi/widget/kexieditor.cpp
+++ b/kexi/widget/kexieditor.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqframe.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
//uncomment this to enable KTextEdit-based editor
diff --git a/kexi/widget/kexifieldcombobox.cpp b/kexi/widget/kexifieldcombobox.cpp
index 1c1f929b..ceb2aa41 100644
--- a/kexi/widget/kexifieldcombobox.cpp
+++ b/kexi/widget/kexifieldcombobox.cpp
@@ -34,8 +34,8 @@
#include <kiconloader.h>
#include <tdeversion.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kexidb/tableschema.h>
#include <kexidb/queryschema.h>
diff --git a/kexi/widget/kexifieldlistview.cpp b/kexi/widget/kexifieldlistview.cpp
index f688fa64..348e9ee0 100644
--- a/kexi/widget/kexifieldlistview.cpp
+++ b/kexi/widget/kexifieldlistview.cpp
@@ -33,8 +33,8 @@
#include <kiconloader.h>
#include <tdeversion.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kexidb/tableschema.h>
#include <kexidb/queryschema.h>
diff --git a/kexi/widget/kexipropertyeditorview.cpp b/kexi/widget/kexipropertyeditorview.cpp
index bf5c6491..1612871b 100644
--- a/kexi/widget/kexipropertyeditorview.cpp
+++ b/kexi/widget/kexipropertyeditorview.cpp
@@ -24,7 +24,7 @@
#include <koproperty/editor.h>
#include <koproperty/property.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tqlayout.h>
diff --git a/kexi/widget/kexiqueryparameters.cpp b/kexi/widget/kexiqueryparameters.cpp
index 04257ec2..171df484 100644
--- a/kexi/widget/kexiqueryparameters.cpp
+++ b/kexi/widget/kexiqueryparameters.cpp
@@ -20,7 +20,7 @@
#include "kexiqueryparameters.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <knumvalidator.h>
diff --git a/kexi/widget/kexiscrollview.cpp b/kexi/widget/kexiscrollview.cpp
index ba4c8f9e..59fddb06 100644
--- a/kexi/widget/kexiscrollview.cpp
+++ b/kexi/widget/kexiscrollview.cpp
@@ -26,7 +26,7 @@
#include <kdebug.h>
#include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <utils/kexirecordnavigator.h>
#include <core/kexi.h>
diff --git a/kexi/widget/kexismalltoolbutton.cpp b/kexi/widget/kexismalltoolbutton.cpp
index 27f89395..bb3b0ec8 100644
--- a/kexi/widget/kexismalltoolbutton.cpp
+++ b/kexi/widget/kexismalltoolbutton.cpp
@@ -24,7 +24,7 @@
#include <tqstyle.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <core/kexi.h>
diff --git a/kexi/widget/pixmapcollection.cpp b/kexi/widget/pixmapcollection.cpp
index 1917e8f3..8c4d9551 100644
--- a/kexi/widget/pixmapcollection.cpp
+++ b/kexi/widget/pixmapcollection.cpp
@@ -34,8 +34,8 @@
#include <kpixmapio.h>
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "pixmapcollection.h"
diff --git a/kexi/widget/relations/kexirelationview.cpp b/kexi/widget/relations/kexirelationview.cpp
index 5340691f..7dcec415 100644
--- a/kexi/widget/relations/kexirelationview.cpp
+++ b/kexi/widget/relations/kexirelationview.cpp
@@ -30,11 +30,11 @@
#include <tqlineedit.h>
#include <tqpopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <tdepopupmenu.h>
-#include <kglobalsettings.h>
-#include <kmessagebox.h>
+#include <tdeglobalsettings.h>
+#include <tdemessagebox.h>
#include <kexidb/tableschema.h>
#include <kexidb/indexschema.h>
diff --git a/kexi/widget/relations/kexirelationviewtable.cpp b/kexi/widget/relations/kexirelationviewtable.cpp
index b9420f67..4bab34e4 100644
--- a/kexi/widget/relations/kexirelationviewtable.cpp
+++ b/kexi/widget/relations/kexirelationviewtable.cpp
@@ -34,7 +34,7 @@
#include <kiconloader.h>
#include <tdeversion.h>
#include <tdeconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kexidb/tableschema.h>
#include <kexidb/utils.h>
diff --git a/kexi/widget/relations/kexirelationwidget.cpp b/kexi/widget/relations/kexirelationwidget.cpp
index 47075bbb..eef477a5 100644
--- a/kexi/widget/relations/kexirelationwidget.cpp
+++ b/kexi/widget/relations/kexirelationwidget.cpp
@@ -27,7 +27,7 @@
#include <tqtimer.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kpushbutton.h>
diff --git a/kexi/widget/tableview/kexiblobtableedit.cpp b/kexi/widget/tableview/kexiblobtableedit.cpp
index 4982fffa..df2816fe 100644
--- a/kexi/widget/tableview/kexiblobtableedit.cpp
+++ b/kexi/widget/tableview/kexiblobtableedit.cpp
@@ -38,7 +38,7 @@
#include <tqbuffer.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <kmimemagic.h>
#include <kuserprofile.h>
@@ -47,10 +47,10 @@
#include <kopenwith.h>
#include <kurl.h>
#include <karrowbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <tdeio/job.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tdepopupmenu.h>
#include <tdestdaccel.h>
diff --git a/kexi/widget/tableview/kexibooltableedit.cpp b/kexi/widget/tableview/kexibooltableedit.cpp
index c4067dfd..2bc14f4a 100644
--- a/kexi/widget/tableview/kexibooltableedit.cpp
+++ b/kexi/widget/tableview/kexibooltableedit.cpp
@@ -25,10 +25,10 @@
#include <tqapplication.h>
#include <tqclipboard.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
KexiBoolTableEdit::KexiBoolTableEdit(KexiTableViewColumn &column, TQWidget *parent)
diff --git a/kexi/widget/tableview/kexidataawareobjectiface.cpp b/kexi/widget/tableview/kexidataawareobjectiface.cpp
index ce0b7695..68690ef9 100644
--- a/kexi/widget/tableview/kexidataawareobjectiface.cpp
+++ b/kexi/widget/tableview/kexidataawareobjectiface.cpp
@@ -29,7 +29,7 @@
#include <tqlabel.h>
#include <tqtooltip.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kexi.h>
#include <kexiutils/validator.h>
diff --git a/kexi/widget/tableview/kexidatatableview.cpp b/kexi/widget/tableview/kexidatatableview.cpp
index 8bfc1c48..800c76e7 100644
--- a/kexi/widget/tableview/kexidatatableview.cpp
+++ b/kexi/widget/tableview/kexidatatableview.cpp
@@ -22,8 +22,8 @@
#include <tqtimer.h>
#include <tqapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeaction.h>
diff --git a/kexi/widget/tableview/kexidatetableedit.cpp b/kexi/widget/tableview/kexidatetableedit.cpp
index 6e538fd1..36a44566 100644
--- a/kexi/widget/tableview/kexidatetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetableedit.cpp
@@ -37,8 +37,8 @@
#include <tqclipboard.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdatepicker.h>
#include <kdatetbl.h>
#include <klineedit.h>
diff --git a/kexi/widget/tableview/kexidatetimetableedit.cpp b/kexi/widget/tableview/kexidatetimetableedit.cpp
index aff64f58..b52aa2e6 100644
--- a/kexi/widget/tableview/kexidatetimetableedit.cpp
+++ b/kexi/widget/tableview/kexidatetimetableedit.cpp
@@ -37,8 +37,8 @@
#include <tqclipboard.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdatepicker.h>
#include <kdatetbl.h>
#include <klineedit.h>
diff --git a/kexi/widget/tableview/kexiinputtableedit.cpp b/kexi/widget/tableview/kexiinputtableedit.cpp
index 69c5c4ef..b6853037 100644
--- a/kexi/widget/tableview/kexiinputtableedit.cpp
+++ b/kexi/widget/tableview/kexiinputtableedit.cpp
@@ -29,10 +29,10 @@
#include <tqclipboard.h>
#include <tqtooltip.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdecompletionbox.h>
#include <knumvalidator.h>
#include <kexiutils/longlongvalidator.h>
diff --git a/kexi/widget/tableview/kexitableedit.cpp b/kexi/widget/tableview/kexitableedit.cpp
index b082bd95..3305fff1 100644
--- a/kexi/widget/tableview/kexitableedit.cpp
+++ b/kexi/widget/tableview/kexitableedit.cpp
@@ -26,8 +26,8 @@
#include <tqpalette.h>
#include <tqpainter.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
KexiTableEdit::KexiTableEdit(KexiTableViewColumn &column, TQWidget* parent)
diff --git a/kexi/widget/tableview/kexitableview.cpp b/kexi/widget/tableview/kexitableview.cpp
index 9a36dfad..f054f084 100644
--- a/kexi/widget/tableview/kexitableview.cpp
+++ b/kexi/widget/tableview/kexitableview.cpp
@@ -37,12 +37,12 @@
#include <tqlabel.h>
#include <tqwhatsthis.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#ifndef KEXI_NO_PRINT
# include <kprinter.h>
diff --git a/kexi/widget/tableview/kexitableview_p.cpp b/kexi/widget/tableview/kexitableview_p.cpp
index 983378cb..5ac72064 100644
--- a/kexi/widget/tableview/kexitableview_p.cpp
+++ b/kexi/widget/tableview/kexitableview_p.cpp
@@ -29,7 +29,7 @@
#include <tqlabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
KexiTableViewPrivate::KexiTableViewPrivate(KexiTableView* t)
diff --git a/kexi/widget/tableview/kexitableviewdata.cpp b/kexi/widget/tableview/kexitableviewdata.cpp
index a4e45daf..c28ad570 100644
--- a/kexi/widget/tableview/kexitableviewdata.cpp
+++ b/kexi/widget/tableview/kexitableviewdata.cpp
@@ -34,7 +34,7 @@
#include <kexi.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqapplication.h>
diff --git a/kexi/widget/tableview/kexitextformatter.cpp b/kexi/widget/tableview/kexitextformatter.cpp
index 9829f347..5ff28920 100644
--- a/kexi/widget/tableview/kexitextformatter.cpp
+++ b/kexi/widget/tableview/kexitextformatter.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kexitextformatter.h"
#include <widget/utils/kexidatetimeformatter.h>
diff --git a/kexi/widget/tableview/kexitimetableedit.cpp b/kexi/widget/tableview/kexitimetableedit.cpp
index b6dc69d4..e6bec4b6 100644
--- a/kexi/widget/tableview/kexitimetableedit.cpp
+++ b/kexi/widget/tableview/kexitimetableedit.cpp
@@ -35,8 +35,8 @@
#include <tqclipboard.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdatepicker.h>
#include <kdatetbl.h>
#include <klineedit.h>
diff --git a/kexi/widget/utils/kexicontextmenuutils.cpp b/kexi/widget/utils/kexicontextmenuutils.cpp
index caae10b6..6e5b5c9e 100644
--- a/kexi/widget/utils/kexicontextmenuutils.cpp
+++ b/kexi/widget/utils/kexicontextmenuutils.cpp
@@ -20,12 +20,12 @@
#include "kexicontextmenuutils.h"
#include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdefiledialog.h>
#include <kimageio.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqfiledialog.h>
#include <tqapplication.h>
diff --git a/kexi/widget/utils/kexidatetimeformatter.cpp b/kexi/widget/utils/kexidatetimeformatter.cpp
index 21bb24de..37142564 100644
--- a/kexi/widget/utils/kexidatetimeformatter.cpp
+++ b/kexi/widget/utils/kexidatetimeformatter.cpp
@@ -20,8 +20,8 @@
#include "kexidatetimeformatter.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdatepicker.h>
#include <kdatetbl.h>
#include <klineedit.h>
diff --git a/kexi/widget/utils/kexidisplayutils.cpp b/kexi/widget/utils/kexidisplayutils.cpp
index 11b1d742..8d626187 100644
--- a/kexi/widget/utils/kexidisplayutils.cpp
+++ b/kexi/widget/utils/kexidisplayutils.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
// a color for displaying default values or autonumbers
diff --git a/kexi/widget/utils/kexirecordnavigator.cpp b/kexi/widget/utils/kexirecordnavigator.cpp
index 9dd8cccc..18d1b09c 100644
--- a/kexi/widget/utils/kexirecordnavigator.cpp
+++ b/kexi/widget/utils/kexirecordnavigator.cpp
@@ -25,7 +25,7 @@
#include <tqtooltip.h>
#include <tqscrollview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <klineedit.h>
#include <kguiitem.h>
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cc
index 5730975f..f86b113a 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cc
@@ -26,8 +26,8 @@
#include <tqwhatsthis.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/kformula/fsparser.cc b/kformula/fsparser.cc
index 863cc9eb..b6bdd787 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cc
@@ -20,7 +20,7 @@
#include <tqptrlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kformuladefs.h>
#include <kformuladocument.h>
diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cc
index d6ee6d79..82e3ae65 100644
--- a/kformula/kfconfig.cc
+++ b/kformula/kfconfig.cc
@@ -21,7 +21,7 @@
#include <kdebug.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kfconfig.h"
#include "kformula_factory.h"
diff --git a/kformula/kformula_aboutdata.h b/kformula/kformula_aboutdata.h
index 70941c48..20d5d5e2 100644
--- a/kformula/kformula_aboutdata.h
+++ b/kformula/kformula_aboutdata.h
@@ -23,7 +23,7 @@
#define KFORMULA_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <config.h>
static const char* description=I18N_NOOP("KOffice Formula Editor");
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cc
index fa2a9bd4..5eeb59f4 100644
--- a/kformula/kformula_doc.cc
+++ b/kformula/kformula_doc.cc
@@ -42,13 +42,13 @@
#include <kdebug.h>
#include <KoGlobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
#include <kurl.h>
#include <KoXmlWriter.h>
#include <KoStoreDevice.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoMainWindow.h>
#include <kformulacontainer.h>
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cc
index a23b7b64..1aebcfbd 100644
--- a/kformula/kformula_factory.cc
+++ b/kformula/kformula_factory.cc
@@ -6,9 +6,9 @@
#include <kiconloader.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cc
index aebcd1c4..2d93ce5d 100644
--- a/kformula/kformula_view.cc
+++ b/kformula/kformula_view.cc
@@ -28,10 +28,10 @@ class KPrinter;
#include <tdeaction.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdaction.h>
#include <ktip.h>
-//#include <kglobal.h>
+//#include <tdeglobal.h>
#include <kformulacontainer.h>
#include <kformuladocument.h>
diff --git a/kformula/main.cc b/kformula/main.cc
index 5d137add..a2337241 100644
--- a/kformula/main.cc
+++ b/kformula/main.cc
@@ -20,7 +20,7 @@
#include <KoApplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "kformula_aboutdata.h"
diff --git a/kivio/kiviopart/config/kivio.kcfg b/kivio/kiviopart/config/kivio.kcfg
index ac23c8e3..deadfad4 100644
--- a/kivio/kiviopart/config/kivio.kcfg
+++ b/kivio/kiviopart/config/kivio.kcfg
@@ -6,8 +6,8 @@
<include>KoPageLayout.h</include>
<include>kivioglobal.h</include>
<include>KoGlobal.h</include>
- <include>kglobal.h</include>
- <include>klocale.h</include>
+ <include>tdeglobal.h</include>
+ <include>tdelocale.h</include>
<include>tqfont.h</include>
<include>tqcolor.h</include>
<kcfgfile name="kiviorc"/>
diff --git a/kivio/kiviopart/kivio_aboutdata.h b/kivio/kiviopart/kivio_aboutdata.h
index e80fa73c..6348f757 100644
--- a/kivio/kiviopart/kivio_aboutdata.h
+++ b/kivio/kiviopart/kivio_aboutdata.h
@@ -22,7 +22,7 @@
#define KIVIO_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
static const char* description = I18N_NOOP("KOffice Flowchart And Diagram Tool");
diff --git a/kivio/kiviopart/kivio_canvas.cpp b/kivio/kiviopart/kivio_canvas.cpp
index 181d34ae..b8c010e9 100644
--- a/kivio/kiviopart/kivio_canvas.cpp
+++ b/kivio/kiviopart/kivio_canvas.cpp
@@ -34,8 +34,8 @@
#include "kivio_pluginmanager.h"
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcursor.h>
#include <KoGlobal.h>
#include <KoZoomHandler.h>
diff --git a/kivio/kiviopart/kivio_dlg_pageshow.cpp b/kivio/kiviopart/kivio_dlg_pageshow.cpp
index 6e761d06..f8cae8bd 100644
--- a/kivio/kiviopart/kivio_dlg_pageshow.cpp
+++ b/kivio/kiviopart/kivio_dlg_pageshow.cpp
@@ -24,7 +24,7 @@
#include "kivio_doc.h"
#include "kivio_map.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstringlist.h>
#include <tqlayout.h>
#include <kbuttonbox.h>
diff --git a/kivio/kiviopart/kivio_doc.cpp b/kivio/kiviopart/kivio_doc.cpp
index 16b2f8aa..c7196c1d 100644
--- a/kivio/kiviopart/kivio_doc.cpp
+++ b/kivio/kiviopart/kivio_doc.cpp
@@ -44,8 +44,8 @@
#include "stencilbarbutton.h"
#include <unistd.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kdebug.h>
#include <kurl.h>
@@ -69,7 +69,7 @@
#include <kstandarddirs.h>
#include <tdepopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kiconloader.h>
#include <khelpmenu.h>
#include <tdeconfig.h>
@@ -80,7 +80,7 @@
#include <kcommand.h>
#include <KoZoomHandler.h>
#include <KoApplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <KoCommandHistory.h>
#include <KoXmlWriter.h>
#include <KoGenStyles.h>
diff --git a/kivio/kiviopart/kivio_factory.cpp b/kivio/kiviopart/kivio_factory.cpp
index 3d4624bf..9ad0b44b 100644
--- a/kivio/kiviopart/kivio_factory.cpp
+++ b/kivio/kiviopart/kivio_factory.cpp
@@ -20,7 +20,7 @@
#include "kivio_doc.h"
#include "kivio_aboutdata.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <kstandarddirs.h>
#include <kiconloader.h>
diff --git a/kivio/kiviopart/kivio_icon_view.cpp b/kivio/kiviopart/kivio_icon_view.cpp
index 179b6a49..41cabd59 100644
--- a/kivio/kiviopart/kivio_icon_view.cpp
+++ b/kivio/kiviopart/kivio_icon_view.cpp
@@ -29,9 +29,9 @@
#include <tqbrush.h>
#include <tqcursor.h>
#include <tqpalette.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
KivioStencilSpawner* KivioIconView::m_pCurDrag = 0L;
TQPtrList<KivioIconView> KivioIconView::objList;
diff --git a/kivio/kiviopart/kivio_page.cpp b/kivio/kiviopart/kivio_page.cpp
index 8e82a521..6bf6a3aa 100644
--- a/kivio/kiviopart/kivio_page.cpp
+++ b/kivio/kiviopart/kivio_page.cpp
@@ -40,9 +40,9 @@
#include <tqvaluelist.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <KoUnit.h>
#include <KoPoint.h>
#include <KoRect.h>
diff --git a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
index f7ea9121..82064c49 100644
--- a/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
+++ b/kivio/kiviopart/kivio_stencil_geometry_panel.cpp
@@ -5,7 +5,7 @@
#include <tqpixmap.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <KoPageLayout.h>
diff --git a/kivio/kiviopart/kivio_view.cpp b/kivio/kiviopart/kivio_view.cpp
index 223fcd56..2d986414 100644
--- a/kivio/kiviopart/kivio_view.cpp
+++ b/kivio/kiviopart/kivio_view.cpp
@@ -49,14 +49,14 @@
#include <tdeaction.h>
#include <kcolorbutton.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
-#include <kglobal.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kstatusbar.h>
#include <kinputdialog.h>
#include <knotifyclient.h>
diff --git a/kivio/kiviopart/kivio_zoomaction.cpp b/kivio/kiviopart/kivio_zoomaction.cpp
index 4b2757fa..f3ce193c 100644
--- a/kivio/kiviopart/kivio_zoomaction.cpp
+++ b/kivio/kiviopart/kivio_zoomaction.cpp
@@ -20,7 +20,7 @@
#include "tkcombobox.h"
#include <tqregexp.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Kivio;
diff --git a/kivio/kiviopart/kivioarrowheadaction.cpp b/kivio/kiviopart/kivioarrowheadaction.cpp
index 870d3190..31c2c5b3 100644
--- a/kivio/kiviopart/kivioarrowheadaction.cpp
+++ b/kivio/kiviopart/kivioarrowheadaction.cpp
@@ -30,7 +30,7 @@
#include <tdepopupmenu.h>
#include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
#include <tdetoolbarbutton.h>
diff --git a/kivio/kiviopart/kivioglobal.cpp b/kivio/kiviopart/kivioglobal.cpp
index 669af992..75db6ebd 100644
--- a/kivio/kiviopart/kivioglobal.cpp
+++ b/kivio/kiviopart/kivioglobal.cpp
@@ -24,8 +24,8 @@
#include <tqprinter.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <KoGenStyles.h>
#include <KoZoomHandler.h>
diff --git a/kivio/kiviopart/kiviosdk/kivio_layer.cpp b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
index 13ed44f5..6ff4d45e 100644
--- a/kivio/kiviopart/kiviosdk/kivio_layer.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_layer.cpp
@@ -33,7 +33,7 @@
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoZoomHandler.h>
#include <KoPoint.h>
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil.h b/kivio/kiviopart/kiviosdk/kivio_stencil.h
index 9fcfc81b..632ea2a1 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil.h
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil.h
@@ -26,7 +26,7 @@
#include <tqptrlist.h>
#include <tqbitarray.h>
#include <KoPoint.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <KoRect.h>
#include <koffice_export.h>
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
index 1c25f22f..978eac31 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_info.cpp
@@ -19,8 +19,8 @@
#include "kivio_stencil_spawner_info.h"
#include <tqdom.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
KivioStencilSpawnerInfo::KivioStencilSpawnerInfo()
{
diff --git a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
index e71b4cb1..67e49905 100644
--- a/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
+++ b/kivio/kiviopart/kiviosdk/kivio_stencil_spawner_set.cpp
@@ -28,8 +28,8 @@
#include <tqfile.h>
#include <tqstring.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
KivioStencilSpawnerSet::KivioStencilSpawnerSet(const TQString& name)
: m_pSpawners(NULL),
diff --git a/kivio/kiviopart/kiviostencilsetaction.cpp b/kivio/kiviopart/kiviostencilsetaction.cpp
index 37b342e6..d8d08d89 100644
--- a/kivio/kiviopart/kiviostencilsetaction.cpp
+++ b/kivio/kiviopart/kiviostencilsetaction.cpp
@@ -27,7 +27,7 @@
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqdir.h>
diff --git a/kivio/kiviopart/kiviostencilsetinstaller.cpp b/kivio/kiviopart/kiviostencilsetinstaller.cpp
index a72dfbca..da9730a4 100644
--- a/kivio/kiviopart/kiviostencilsetinstaller.cpp
+++ b/kivio/kiviopart/kiviostencilsetinstaller.cpp
@@ -28,9 +28,9 @@
#include <tqcheckbox.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <kurl.h>
#include <kstandarddirs.h>
diff --git a/kivio/kiviopart/main.cpp b/kivio/kiviopart/main.cpp
index 708bd28b..55987022 100644
--- a/kivio/kiviopart/main.cpp
+++ b/kivio/kiviopart/main.cpp
@@ -19,7 +19,7 @@
#include <koffice_export.h>
#include <KoApplication.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
diff --git a/kivio/kiviopart/stencilbardockmanager.cpp b/kivio/kiviopart/stencilbardockmanager.cpp
index 20f811ed..4cce5b20 100644
--- a/kivio/kiviopart/stencilbardockmanager.cpp
+++ b/kivio/kiviopart/stencilbardockmanager.cpp
@@ -31,7 +31,7 @@
#include <tqframe.h>
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
StencilBarDockManager::StencilBarDockManager( KivioView* parent, const char* name )
diff --git a/kivio/kiviopart/ui/addstencilsetdialog.cpp b/kivio/kiviopart/ui/addstencilsetdialog.cpp
index b37c001f..047cce09 100644
--- a/kivio/kiviopart/ui/addstencilsetdialog.cpp
+++ b/kivio/kiviopart/ui/addstencilsetdialog.cpp
@@ -18,7 +18,7 @@
*/
#include "addstencilsetdialog.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivioaddstencilsetpanel.h"
diff --git a/kivio/kiviopart/ui/export_page_dialog.cpp b/kivio/kiviopart/ui/export_page_dialog.cpp
index 61e8a56e..b898541d 100644
--- a/kivio/kiviopart/ui/export_page_dialog.cpp
+++ b/kivio/kiviopart/ui/export_page_dialog.cpp
@@ -4,7 +4,7 @@
#include <tqradiobutton.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "export_page_dialog_base.h"
#include "kivio_config.h"
diff --git a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
index 747618c1..bb97e0c0 100644
--- a/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_birdeye_panel.cpp
@@ -11,7 +11,7 @@
#include <tdetoolbar.h>
#include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGlobal.h>
#include <KoZoomHandler.h>
#include <tdeversion.h>
diff --git a/kivio/kiviopart/ui/kivio_layer_panel.cpp b/kivio/kiviopart/ui/kivio_layer_panel.cpp
index ff0eb9ed..2a6fcf1e 100644
--- a/kivio/kiviopart/ui/kivio_layer_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_layer_panel.cpp
@@ -30,7 +30,7 @@
#include <tqlayout.h>
#include <tdetoolbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
#include <kiconloader.h>
#include <kinputdialog.h>
diff --git a/kivio/kiviopart/ui/kivio_protection_panel.cpp b/kivio/kiviopart/ui/kivio_protection_panel.cpp
index 7eb9a75c..2240a4a2 100644
--- a/kivio/kiviopart/ui/kivio_protection_panel.cpp
+++ b/kivio/kiviopart/ui/kivio_protection_panel.cpp
@@ -30,7 +30,7 @@
#include <tqcheckbox.h>
#include <tdeaction.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
KivioProtectionPanel::KivioProtectionPanel( KivioView *view, TQWidget *parent, const char *name )
: KivioProtectionPanelBase(parent, name), m_pView(view)
diff --git a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
index 0e87398a..a2bf2bc4 100644
--- a/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
+++ b/kivio/kiviopart/ui/kivioaddstencilsetpanel.cpp
@@ -28,7 +28,7 @@
#include <tqsplitter.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdelistview.h>
#include "kivio_stencil_spawner_set.h"
diff --git a/kivio/kiviopart/ui/kivioaligndialog.cpp b/kivio/kiviopart/ui/kivioaligndialog.cpp
index b208813a..115fd206 100644
--- a/kivio/kiviopart/ui/kivioaligndialog.cpp
+++ b/kivio/kiviopart/ui/kivioaligndialog.cpp
@@ -23,7 +23,7 @@
#include <tqradiobutton.h>
#include <tqcheckbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_page.h"
#include "aligndialog.h"
diff --git a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
index 9237333e..30590ce2 100644
--- a/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
+++ b/kivio/kiviopart/ui/kivioarrowheadformatdlg.cpp
@@ -28,7 +28,7 @@
#include <tqframe.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <KoUnitWidgets.h>
diff --git a/kivio/kiviopart/ui/kiviooptionsdialog.cpp b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
index 7c1bffd6..4f93a517 100644
--- a/kivio/kiviopart/ui/kiviooptionsdialog.cpp
+++ b/kivio/kiviopart/ui/kiviooptionsdialog.cpp
@@ -27,7 +27,7 @@
#include "kivio_settings.h"
#include "kivio_config.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoApplication.h>
#include <kiconloader.h>
#include <kpushbutton.h>
@@ -35,7 +35,7 @@
#include <kurlrequester.h>
#include <kcolorbutton.h>
#include <KoUnitWidgets.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdefontdialog.h>
diff --git a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
index 3361ad23..26a62671 100644
--- a/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviostencilformatdlg.cpp
@@ -26,7 +26,7 @@
#include <tqpainter.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
diff --git a/kivio/kiviopart/ui/kiviotextformatdlg.cpp b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
index 76f76c7d..3bf67805 100644
--- a/kivio/kiviopart/ui/kiviotextformatdlg.cpp
+++ b/kivio/kiviopart/ui/kiviotextformatdlg.cpp
@@ -26,7 +26,7 @@
#include <tdefontdialog.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_view.h"
#include "kivio_doc.h"
diff --git a/kivio/kiviopart/ui/layerlisttooltip.cpp b/kivio/kiviopart/ui/layerlisttooltip.cpp
index 4a2d1fb5..410fbdc0 100644
--- a/kivio/kiviopart/ui/layerlisttooltip.cpp
+++ b/kivio/kiviopart/ui/layerlisttooltip.cpp
@@ -20,7 +20,7 @@
#include <tqheader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_layer_panel.h"
#include "kivio_layer.h"
diff --git a/kivio/kiviopart/ui/objectlistpalette.cpp b/kivio/kiviopart/ui/objectlistpalette.cpp
index 6c54077e..95b1adfe 100644
--- a/kivio/kiviopart/ui/objectlistpalette.cpp
+++ b/kivio/kiviopart/ui/objectlistpalette.cpp
@@ -24,7 +24,7 @@
#include <tdelistview.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_view.h"
#include "kivio_stencil.h"
diff --git a/kivio/plugins/kivioconnectortool/tool_connector.cpp b/kivio/plugins/kivioconnectortool/tool_connector.cpp
index 26b8feb8..f8b5d015 100644
--- a/kivio/plugins/kivioconnectortool/tool_connector.cpp
+++ b/kivio/plugins/kivioconnectortool/tool_connector.cpp
@@ -25,7 +25,7 @@
#include <kstandarddirs.h>
#include <KoPoint.h>
#include <KoZoomHandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGuides.h>
#include "kivio_view.h"
diff --git a/kivio/plugins/kivioselecttool/tool_select.cpp b/kivio/plugins/kivioselecttool/tool_select.cpp
index b8a529f7..34e53196 100644
--- a/kivio/plugins/kivioselecttool/tool_select.cpp
+++ b/kivio/plugins/kivioselecttool/tool_select.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <KoZoomHandler.h>
#include <KoPoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGuides.h>
#include "kivio_command.h"
diff --git a/kivio/plugins/kiviosmlconnector/tool_connector.cpp b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
index 4cb43bcc..966cb4c5 100644
--- a/kivio/plugins/kiviosmlconnector/tool_connector.cpp
+++ b/kivio/plugins/kiviosmlconnector/tool_connector.cpp
@@ -25,7 +25,7 @@
#include <KoPoint.h>
#include <KoZoomHandler.h>
#include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_view.h"
#include "kivio_canvas.h"
diff --git a/kivio/plugins/kiviotargettool/kiviotargettool.cpp b/kivio/plugins/kiviotargettool/kiviotargettool.cpp
index c25fb36b..be6f60d8 100644
--- a/kivio/plugins/kiviotargettool/kiviotargettool.cpp
+++ b/kivio/plugins/kiviotargettool/kiviotargettool.cpp
@@ -20,7 +20,7 @@
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kivio_stencil.h"
#include "kivio_view.h"
diff --git a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
index 0204132f..1f2c7969 100644
--- a/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
+++ b/kivio/plugins/kiviotexttool/stenciltexteditor.cpp
@@ -28,7 +28,7 @@
#include <tdefontcombo.h>
#include <kcolorbutton.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <karrowbutton.h>
#include "kivio_stenciltexteditorui.h"
diff --git a/kivio/plugins/kiviotexttool/tool_text.cpp b/kivio/plugins/kiviotexttool/tool_text.cpp
index 5b1ee4fc..bfc54a73 100644
--- a/kivio/plugins/kiviotexttool/tool_text.cpp
+++ b/kivio/plugins/kiviotexttool/tool_text.cpp
@@ -24,7 +24,7 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <KoPoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoZoomHandler.h>
#include <kinputdialog.h>
diff --git a/kivio/plugins/kiviozoomtool/tool_zoom.cpp b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
index 9cf9b443..e20b57e8 100644
--- a/kivio/plugins/kiviozoomtool/tool_zoom.cpp
+++ b/kivio/plugins/kiviozoomtool/tool_zoom.cpp
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdetoolbar.h>
#include <KoMainWindow.h>
diff --git a/koshell/iconsidepane.cpp b/koshell/iconsidepane.cpp
index dc43a8d9..fc370370 100644
--- a/koshell/iconsidepane.cpp
+++ b/koshell/iconsidepane.cpp
@@ -38,7 +38,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <kpushbutton.h>
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cc
index f405d81a..e816cd9e 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cc
@@ -22,7 +22,7 @@
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kuniqueapplication.h>
#include <twin.h>
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cc
index 46453c1c..fc5ac0cf 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cc
@@ -32,9 +32,9 @@
#include "koshellsettings.h"
#include <tdeapplication.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kkeydialog.h>
@@ -42,7 +42,7 @@
#include <klibloader.h>
#include <tdepopupmenu.h>
#include <kservice.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tderecentdocument.h>
#include <tdeparts/partmanager.h>
#include <tdeaction.h>
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cc
index a776cd3e..47bfd503 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cc
@@ -24,10 +24,10 @@
#include <tdeaction.h>
#include <kinstance.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaboutdata.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqapplication.h>
KoUnavailPart::KoUnavailPart( TQWidget *parentWidget, const char *widgetName, TQObject* parent, const char* name )
diff --git a/kplato/kptaboutdata.h b/kplato/kptaboutdata.h
index a8b7baf1..ccb6fb21 100644
--- a/kplato/kptaboutdata.h
+++ b/kplato/kptaboutdata.h
@@ -22,7 +22,7 @@
#define KPLATO_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KPlato
{
diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cc
index 4c457193..f6016ff4 100644
--- a/kplato/kptaccount.cc
+++ b/kplato/kptaccount.cc
@@ -20,7 +20,7 @@
#include <tqdom.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kplato/kptaccountsdialog.cc b/kplato/kptaccountsdialog.cc
index 9247aad7..7ecc7bf1 100644
--- a/kplato/kptaccountsdialog.cc
+++ b/kplato/kptaccountsdialog.cc
@@ -21,7 +21,7 @@
#include "kptaccountspanel.h"
-#include <klocale.h>
+#include <tdelocale.h>
namespace KPlato
{
diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cc
index 00925a6e..3a6015d8 100644
--- a/kplato/kptaccountspanel.cc
+++ b/kplato/kptaccountspanel.cc
@@ -30,7 +30,7 @@
#include <tqstringlist.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cc
index d466e1cc..3352a87d 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cc
@@ -43,9 +43,9 @@
#include <tqpaintdevicemetrics.h>
#include <kcalendarsystem.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kdebug.h>
diff --git a/kplato/kptaccountsviewconfigdialog.cc b/kplato/kptaccountsviewconfigdialog.cc
index 0d1a1015..18e63fb6 100644
--- a/kplato/kptaccountsviewconfigdialog.cc
+++ b/kplato/kptaccountsviewconfigdialog.cc
@@ -26,7 +26,7 @@
#include <tqstring.h>
#include <kdatewidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cc
index 56ba7380..46195041 100644
--- a/kplato/kptcalendar.cc
+++ b/kplato/kptcalendar.cc
@@ -25,7 +25,7 @@
#include <tqdom.h>
#include <tqptrlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cc
index ab2df8bd..a29eb8c0 100644
--- a/kplato/kptcalendaredit.cc
+++ b/kplato/kptcalendaredit.cc
@@ -37,10 +37,10 @@
#include <tqtabwidget.h>
#include <tqtextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <tqmap.h>
diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cc
index 052928d3..6349c273 100644
--- a/kplato/kptcalendareditbase.cc
+++ b/kplato/kptcalendareditbase.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kptcalendareditbase.h"
diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cc
index 010e82bf..496cc786 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cc
@@ -34,10 +34,10 @@
#include <tqtabwidget.h>
#include <tqtextbrowser.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kdebug.h>
diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cc
index 764c7e98..bc59788f 100644
--- a/kplato/kptcalendarlistdialogbase.cc
+++ b/kplato/kptcalendarlistdialogbase.cc
@@ -34,7 +34,7 @@
#include <tqlabel.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cc
index 73c94c8b..8717f187 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cc
@@ -26,9 +26,9 @@
#include "kptcalendar.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
#include <kiconloader.h>
#include <tqframe.h>
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cc
index 837fb48a..152fd837 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cc
@@ -23,7 +23,7 @@
#include "kptpertcanvas.h"
#include "kptganttview.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
#include <tqpointarray.h>
#include <tqptrlist.h>
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cc
index 992bfb5c..11c92000 100644
--- a/kplato/kptcommand.cc
+++ b/kplato/kptcommand.cc
@@ -28,7 +28,7 @@
#include "kptresource.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqintdict.h>
#include <tqmap.h>
diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cc
index fe8d8e5d..f721ae23 100644
--- a/kplato/kptconfigbehaviorpanel.cc
+++ b/kplato/kptconfigbehaviorpanel.cc
@@ -22,12 +22,12 @@
#include "kptdatetime.h"
#include "kptfactory.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <kcombobox.h>
#include <kdatetimewidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cc
index 2062fda3..384c4abd 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cc
@@ -28,7 +28,7 @@
#include "kptcalendar.h"
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tqvbox.h>
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cc
index 36add001..ea8e16af 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cc
@@ -34,7 +34,7 @@
#include <assert.h>
#include <tqlayout.h>
#include <tqvaluelist.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
diff --git a/kplato/kptdatetable.h b/kplato/kptdatetable.h
index b988e833..25b78f52 100644
--- a/kplato/kptdatetable.h
+++ b/kplato/kptdatetable.h
@@ -24,8 +24,8 @@
#include "kptmap.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqgridview.h>
#include <tqmemarray.h>
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cc
index 8a354d61..d6bc73d4 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cc
@@ -34,8 +34,8 @@
#include <tqpoint.h>
#include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <tqrect.h>
diff --git a/kplato/kptduration.cc b/kplato/kptduration.cc
index ec817195..87e0e54a 100644
--- a/kplato/kptduration.cc
+++ b/kplato/kptduration.cc
@@ -21,8 +21,8 @@
#include "kptduration.h"
#include "kptdatetime.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqregexp.h>
diff --git a/kplato/kptdurationwidget.ui.h b/kplato/kptdurationwidget.ui.h
index 837114d8..087b539e 100644
--- a/kplato/kptdurationwidget.ui.h
+++ b/kplato/kptdurationwidget.ui.h
@@ -27,8 +27,8 @@
*/
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <cmath>
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cc
index 6922ed2d..7d66a740 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cc
@@ -22,7 +22,7 @@
#include "kptaboutdata.h"
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cc
index ffed6ad2..b84bbbc4 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cc
@@ -60,10 +60,10 @@
#include <tqpainter.h>
#include <tqpaintdevicemetrics.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kprinter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
namespace KPlato
{
diff --git a/kplato/kptintervaledit.cc b/kplato/kptintervaledit.cc
index a76a1546..a37ec064 100644
--- a/kplato/kptintervaledit.cc
+++ b/kplato/kptintervaledit.cc
@@ -31,7 +31,7 @@
#include <tqpair.h>
#include <tqdatetime.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cc
index ee8ed8fc..3d9065e2 100644
--- a/kplato/kptmainprojectdialog.cc
+++ b/kplato/kptmainprojectdialog.cc
@@ -19,7 +19,7 @@
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cc
index 29f2195e..24bf0891 100644
--- a/kplato/kptmainprojectpanel.cc
+++ b/kplato/kptmainprojectpanel.cc
@@ -30,11 +30,11 @@
#include <klineedit.h>
#include <ktextedit.h>
#include <kdatewidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcommand.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kdebug.h>
diff --git a/kplato/kptmilestoneprogressdialog.cc b/kplato/kptmilestoneprogressdialog.cc
index e453d473..f9bf729e 100644
--- a/kplato/kptmilestoneprogressdialog.cc
+++ b/kplato/kptmilestoneprogressdialog.cc
@@ -21,7 +21,7 @@
#include "kptmilestoneprogresspanel.h"
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cc
index 67b88443..977878f1 100644
--- a/kplato/kptmilestoneprogresspanel.cc
+++ b/kplato/kptmilestoneprogresspanel.cc
@@ -22,8 +22,8 @@
#include <tqcheckbox.h>
#include <kdatetimewidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cc
index c95a1c9b..b5614609 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cc
@@ -28,7 +28,7 @@
#include <tqptrlist.h>
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cc
index 7b0dbd55..3f767e67 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cc
@@ -35,8 +35,8 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <kcommand.h>
#include <KoTemplateChooseDia.h>
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cc
index ad8966dd..9d12945c 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cc
@@ -36,11 +36,11 @@
#include <tqptrlist.h>
#include <KoStore.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <assert.h>
#include <tdemultipledrag.h>
#include <tdelistview.h>
diff --git a/kplato/kptproject.h b/kplato/kptproject.h
index 8ffbdb7d..918d54bb 100644
--- a/kplato/kptproject.h
+++ b/kplato/kptproject.h
@@ -34,7 +34,7 @@
#include <tqdict.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
namespace KPlato
{
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cc
index c59a12e9..01a7e3f5 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cc
@@ -28,10 +28,10 @@
#include <tqtextbrowser.h>
#include <kdatepicker.h>
-#include <klocale.h>
+#include <tdelocale.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kdebug.h>
diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cc
index c79adb6f..4de50c11 100644
--- a/kplato/kptrelationdialog.cc
+++ b/kplato/kptrelationdialog.cc
@@ -31,8 +31,8 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cc
index c93be14d..dbbae9a1 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cc
@@ -34,10 +34,10 @@
#include <tdetoolbar.h>
#include <kstandarddirs.h>
#include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdesktopfile.h>
#include <tdefiledialog.h>
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cc
index bca9a208..790a6177 100644
--- a/kplato/kptrequestresourcespanel.cc
+++ b/kplato/kptrequestresourcespanel.cc
@@ -24,8 +24,8 @@
#include "kptcalendar.h"
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kptcommand.h>
#include <tqlistbox.h>
diff --git a/kplato/kptresource.cc b/kplato/kptresource.cc
index 00fe8aaa..763c0c86 100644
--- a/kplato/kptresource.cc
+++ b/kplato/kptresource.cc
@@ -28,8 +28,8 @@
#include "kptschedule.h"
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
namespace KPlato
{
diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cc
index 5f6ac29b..a251eddb 100644
--- a/kplato/kptresourceappointmentsview.cc
+++ b/kplato/kptresourceappointmentsview.cc
@@ -27,8 +27,8 @@
#include <tqapplication.h>
#include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqdatetime.h>
#include <tqheader.h>
diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cc
index 85af224c..d48d892f 100644
--- a/kplato/kptresourcedialog.cc
+++ b/kplato/kptresourcedialog.cc
@@ -36,14 +36,14 @@
#include <tqptrlist.h>
#include <tqstringlist.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kcommand.h>
#include <kdatetimewidget.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptresourcesdialog.cc b/kplato/kptresourcesdialog.cc
index 032fcd0f..37ce4529 100644
--- a/kplato/kptresourcesdialog.cc
+++ b/kplato/kptresourcesdialog.cc
@@ -19,7 +19,7 @@
#include <tqvbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cc
index eaadc808..86275cd7 100644
--- a/kplato/kptresourcespanel.cc
+++ b/kplato/kptresourcespanel.cc
@@ -25,10 +25,10 @@
#include <kdebug.h>
#include <tdelistview.h>
-#include <kmessagebox.h>
-#include <klocale.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <tqgroupbox.h>
#include <tqheader.h>
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cc
index b0e433eb..c20b9fd2 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cc
@@ -37,8 +37,8 @@
#include <tqstyle.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kprinter.h>
#include <kdebug.h>
diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cc
index 6c478042..7581312e 100644
--- a/kplato/kptschedule.cc
+++ b/kplato/kptschedule.cc
@@ -28,7 +28,7 @@
#include <tqstring.h>
#include <tqstringlist.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
namespace KPlato
diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cc
index 1b5495b7..31fcae49 100644
--- a/kplato/kptstandardworktimedialog.cc
+++ b/kplato/kptstandardworktimedialog.cc
@@ -39,8 +39,8 @@
#include <kdebug.h>
#include <kcombobox.h>
#include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tdelistview.h>
diff --git a/kplato/kptsummarytaskdialog.cc b/kplato/kptsummarytaskdialog.cc
index 26a62cdf..adf152a1 100644
--- a/kplato/kptsummarytaskdialog.cc
+++ b/kplato/kptsummarytaskdialog.cc
@@ -21,7 +21,7 @@
#include "kptsummarytaskdialog.h"
#include "kptsummarytaskgeneralpanel.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tqvbox.h>
diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cc
index 73ba4f95..3db784d0 100644
--- a/kplato/kptsummarytaskgeneralpanel.cc
+++ b/kplato/kptsummarytaskgeneralpanel.cc
@@ -24,15 +24,15 @@
#include "kptconfig.h"
#include "kptpart.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <kcombobox.h>
#include <kdatetimewidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cc
index c38cc3ce..669bf065 100644
--- a/kplato/kpttaskappointmentsview.cc
+++ b/kplato/kpttaskappointmentsview.cc
@@ -24,8 +24,8 @@
#include <tqapplication.h>
#include <kcalendarsystem.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqheader.h>
diff --git a/kplato/kpttaskcostpanel.cc b/kplato/kpttaskcostpanel.cc
index a2447f6b..d33e2c7c 100644
--- a/kplato/kpttaskcostpanel.cc
+++ b/kplato/kpttaskcostpanel.cc
@@ -23,10 +23,10 @@
#include "kptcommand.h"
#include "kptpart.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cc
index bcaac757..8c1585a4 100644
--- a/kplato/kpttaskdefaultpanel.cc
+++ b/kplato/kpttaskdefaultpanel.cc
@@ -27,15 +27,15 @@
#include "kptconfig.h"
#include "kptpart.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <kcombobox.h>
#include <kdatetimewidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kdatewidget.h>
#include <tqlayout.h>
diff --git a/kplato/kpttaskdialog.cc b/kplato/kpttaskdialog.cc
index 1db88030..65aa917f 100644
--- a/kplato/kpttaskdialog.cc
+++ b/kplato/kpttaskdialog.cc
@@ -23,7 +23,7 @@
#include "kpttaskgeneralpanel.h"
#include "kptrequestresourcespanel.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <tqvbox.h>
diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cc
index f8970675..7d064fcc 100644
--- a/kplato/kpttaskgeneralpanel.cc
+++ b/kplato/kpttaskgeneralpanel.cc
@@ -28,15 +28,15 @@
#include "kptconfig.h"
#include "kptpart.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <klineedit.h>
#include <ktextedit.h>
#include <kcombobox.h>
#include <kdatetimewidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
-#include <kabc/addressee.h>
-#include <kabc/addresseedialog.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/addresseedialog.h>
#include <kdatewidget.h>
#include <tqlayout.h>
diff --git a/kplato/kpttaskprogressdialog.cc b/kplato/kpttaskprogressdialog.cc
index db34f3ee..180d3a53 100644
--- a/kplato/kpttaskprogressdialog.cc
+++ b/kplato/kpttaskprogressdialog.cc
@@ -21,7 +21,7 @@
#include "kpttaskprogresspanel.h"
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cc
index bed7a3c2..00de2b22 100644
--- a/kplato/kpttaskprogresspanel.cc
+++ b/kplato/kpttaskprogresspanel.cc
@@ -27,8 +27,8 @@
#include <ktextedit.h>
#include <kdatetimewidget.h>
#include <knuminput.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptview.cc b/kplato/kptview.cc
index 63a9a987..c9f93553 100644
--- a/kplato/kptview.cc
+++ b/kplato/kptview.cc
@@ -19,7 +19,7 @@
*/
#include <kprinter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <KoMainWindow.h>
@@ -47,7 +47,7 @@
#include <kiconloader.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdelistview.h>
#include <tdestdaccel.h>
diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cc
index e25f9fe6..fcf2d41f 100644
--- a/kplato/kptwbsdefinition.cc
+++ b/kplato/kptwbsdefinition.cc
@@ -20,7 +20,7 @@
#include "kptwbsdefinition.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqstring.h>
diff --git a/kplato/kptwbsdefinitiondialog.cc b/kplato/kptwbsdefinitiondialog.cc
index 6dae8389..181cbd43 100644
--- a/kplato/kptwbsdefinitiondialog.cc
+++ b/kplato/kptwbsdefinitiondialog.cc
@@ -21,7 +21,7 @@
#include "kptwbsdefinitionpanel.h"
#include "kptwbsdefinition.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcommand.h>
#include <kdebug.h>
diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cc
index 083c9216..3843a98c 100644
--- a/kplato/kptwbsdefinitionpanel.cc
+++ b/kplato/kptwbsdefinitionpanel.cc
@@ -22,7 +22,7 @@
#include "kptcommand.h"
#include "kptpart.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqcombobox.h>
diff --git a/kpresenter/KPrAboutData.h b/kpresenter/KPrAboutData.h
index 53e8365e..f85a74c6 100644
--- a/kpresenter/KPrAboutData.h
+++ b/kpresenter/KPrAboutData.h
@@ -21,7 +21,7 @@
#define KPRESENTER_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
static const char* description=I18N_NOOP("KOffice Presentation Tool");
diff --git a/kpresenter/KPrBackDia.cpp b/kpresenter/KPrBackDia.cpp
index a6985239..dd4078e6 100644
--- a/kpresenter/KPrBackDia.cpp
+++ b/kpresenter/KPrBackDia.cpp
@@ -35,7 +35,7 @@
#include <tqdatetime.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kimageio.h>
#include <kbuttonbox.h>
diff --git a/kpresenter/KPrBackground.cpp b/kpresenter/KPrBackground.cpp
index 4b09382a..177553d1 100644
--- a/kpresenter/KPrBackground.cpp
+++ b/kpresenter/KPrBackground.cpp
@@ -38,7 +38,7 @@
#include <stdlib.h>
using namespace std;
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
#include <KoGenStyles.h>
diff --git a/kpresenter/KPrBgSpellCheck.cpp b/kpresenter/KPrBgSpellCheck.cpp
index 0493c64d..11358ba5 100644
--- a/kpresenter/KPrBgSpellCheck.cpp
+++ b/kpresenter/KPrBgSpellCheck.cpp
@@ -32,7 +32,7 @@ using namespace KSpell2;
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPrBgSpellCheck::KPrBgSpellCheck(KPrDocument *_doc)
: KoBgSpellCheck(Broker::openBroker( TDESharedConfig::openConfig( "kpresenterrc" ) ), _doc )
diff --git a/kpresenter/KPrBrushProperty.cpp b/kpresenter/KPrBrushProperty.cpp
index 7734835a..7b7312d0 100644
--- a/kpresenter/KPrBrushProperty.cpp
+++ b/kpresenter/KPrBrushProperty.cpp
@@ -29,7 +29,7 @@
#include <tqwhatsthis.h>
#include <tqwidgetstack.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <kcombobox.h>
diff --git a/kpresenter/KPrCanvas.cpp b/kpresenter/KPrCanvas.cpp
index f98ddb0f..0c119b80 100644
--- a/kpresenter/KPrCanvas.cpp
+++ b/kpresenter/KPrCanvas.cpp
@@ -40,15 +40,15 @@
#include <tdeapplication.h>
#include <kmimemagic.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kprinter.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <ktempfile.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kcursor.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <tdeconfig.h>
#include <kurl.h>
diff --git a/kpresenter/KPrConfig.cpp b/kpresenter/KPrConfig.cpp
index 23b121a2..fde8efbf 100644
--- a/kpresenter/KPrConfig.cpp
+++ b/kpresenter/KPrConfig.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeconfig.h>
#include <kdialogbase.h>
#include <kiconloader.h>
@@ -67,7 +67,7 @@
#include <tdefontdialog.h>
#include <klineedit.h>
#include <KoRect.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kurlrequesterdlg.h>
#include <tdelistview.h>
diff --git a/kpresenter/KPrCustomSlideShowDia.cpp b/kpresenter/KPrCustomSlideShowDia.cpp
index 61eebe23..175dfc93 100644
--- a/kpresenter/KPrCustomSlideShowDia.cpp
+++ b/kpresenter/KPrCustomSlideShowDia.cpp
@@ -26,8 +26,8 @@
#include <tqapplication.h>
#include <tqlayout.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include "KPrPage.h"
#include "KPrDocument.h"
diff --git a/kpresenter/KPrDocument.cpp b/kpresenter/KPrDocument.cpp
index 098c7eb0..c914b094 100644
--- a/kpresenter/KPrDocument.cpp
+++ b/kpresenter/KPrDocument.cpp
@@ -57,12 +57,12 @@
#include <KoGlobal.h>
#include <tdeapplication.h>
#include <kurldrag.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <tdeio/netaccess.h>
@@ -99,7 +99,7 @@
#include "KPrBackground.h"
#include "KPrNoteBar.h"
#include "KPrBgSpellCheck.h"
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <KoCommandHistory.h>
#include "KoApplication.h"
#include <KoOasisStyles.h>
diff --git a/kpresenter/KPrDuplicateObjDia.cpp b/kpresenter/KPrDuplicateObjDia.cpp
index 0b0c7646..fe2283b2 100644
--- a/kpresenter/KPrDuplicateObjDia.cpp
+++ b/kpresenter/KPrDuplicateObjDia.cpp
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kpresenter/KPrEffectDia.cpp b/kpresenter/KPrEffectDia.cpp
index b65b724b..955d249b 100644
--- a/kpresenter/KPrEffectDia.cpp
+++ b/kpresenter/KPrEffectDia.cpp
@@ -39,8 +39,8 @@
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kbuttonbox.h>
#include <knuminput.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrGeneralProperty.cpp b/kpresenter/KPrGeneralProperty.cpp
index 75671e28..a0e9965a 100644
--- a/kpresenter/KPrGeneralProperty.cpp
+++ b/kpresenter/KPrGeneralProperty.cpp
@@ -26,7 +26,7 @@
#include <tqlineedit.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <KoGeneralPropertyUi.h>
diff --git a/kpresenter/KPrGotoPage.cpp b/kpresenter/KPrGotoPage.cpp
index c170f159..0caacc28 100644
--- a/kpresenter/KPrGotoPage.cpp
+++ b/kpresenter/KPrGotoPage.cpp
@@ -25,7 +25,7 @@
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include "KPrDocument.h"
diff --git a/kpresenter/KPrImageEffectDia.cpp b/kpresenter/KPrImageEffectDia.cpp
index 078a3918..9f6985e7 100644
--- a/kpresenter/KPrImageEffectDia.cpp
+++ b/kpresenter/KPrImageEffectDia.cpp
@@ -26,7 +26,7 @@
#include <tqimage.h>
#include <kimageeffect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
diff --git a/kpresenter/KPrImportStyleDia.cpp b/kpresenter/KPrImportStyleDia.cpp
index 1cd4d9ff..fec85967 100644
--- a/kpresenter/KPrImportStyleDia.cpp
+++ b/kpresenter/KPrImportStyleDia.cpp
@@ -18,14 +18,14 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrDocument.h"
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "KPrImportStyleDia.h"
#include <KoStore.h>
#include <tqfile.h>
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index f362f03d..3f968768 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -31,7 +31,7 @@
#include "KPrPage.h"
#include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqdir.h>
#include <tqframe.h>
@@ -48,11 +48,11 @@
#include <tdeapplication.h>
#include <kbuttonbox.h>
#include <kcolorbutton.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprogress.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index 532fbb6e..e4fe30e2 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -26,7 +26,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "marginui.h"
diff --git a/kpresenter/KPrMoveHelpLineDia.cpp b/kpresenter/KPrMoveHelpLineDia.cpp
index ba07c8b6..35d8bcd0 100644
--- a/kpresenter/KPrMoveHelpLineDia.cpp
+++ b/kpresenter/KPrMoveHelpLineDia.cpp
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlabel.h>
diff --git a/kpresenter/KPrNoteBar.cpp b/kpresenter/KPrNoteBar.cpp
index 80b93552..9548d259 100644
--- a/kpresenter/KPrNoteBar.cpp
+++ b/kpresenter/KPrNoteBar.cpp
@@ -25,11 +25,11 @@
#include <tqsimplerichtext.h>
#include <tqlabel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kprinter.h>
#include <kdebug.h>
#include <ktextedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrNoteBar.h"
#include "KPrView.h"
diff --git a/kpresenter/KPrObject.h b/kpresenter/KPrObject.h
index 7b39be50..99d45009 100644
--- a/kpresenter/KPrObject.h
+++ b/kpresenter/KPrObject.h
@@ -29,7 +29,7 @@
#include "KPrGradient.h"
#include "KoPointArray.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoPoint.h>
#include <KoSize.h>
#include <KoRect.h>
diff --git a/kpresenter/KPrPage.cpp b/kpresenter/KPrPage.cpp
index 81c5a412..fc57515d 100644
--- a/kpresenter/KPrPage.cpp
+++ b/kpresenter/KPrPage.cpp
@@ -60,7 +60,7 @@
#include <KoVariable.h>
#include <KoGenStyles.h>
#include <KoXmlWriter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqbuffer.h>
#include <tqregexp.h>
#include <tqfile.h>
diff --git a/kpresenter/KPrPenStyleWidget.cpp b/kpresenter/KPrPenStyleWidget.cpp
index 753b184a..37f4cab7 100644
--- a/kpresenter/KPrPenStyleWidget.cpp
+++ b/kpresenter/KPrPenStyleWidget.cpp
@@ -29,7 +29,7 @@
#include <kcolorbutton.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
diff --git a/kpresenter/KPrPgConfDia.cpp b/kpresenter/KPrPgConfDia.cpp
index fa51abf4..1a7b3079 100644
--- a/kpresenter/KPrPgConfDia.cpp
+++ b/kpresenter/KPrPgConfDia.cpp
@@ -42,8 +42,8 @@
#include <tqwhatsthis.h>
#include <kcolorbutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqslider.h>
diff --git a/kpresenter/KPrPieProperty.cpp b/kpresenter/KPrPieProperty.cpp
index 7c7e788a..dbb30557 100644
--- a/kpresenter/KPrPieProperty.cpp
+++ b/kpresenter/KPrPieProperty.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "global.h"
diff --git a/kpresenter/KPrPolygonProperty.cpp b/kpresenter/KPrPolygonProperty.cpp
index 4d8cf155..40cc785a 100644
--- a/kpresenter/KPrPolygonProperty.cpp
+++ b/kpresenter/KPrPolygonProperty.cpp
@@ -23,7 +23,7 @@
#include <tqlayout.h>
#include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "polygonpropertyui.h"
diff --git a/kpresenter/KPrPresDurationDia.cpp b/kpresenter/KPrPresDurationDia.cpp
index aae5659e..67936266 100644
--- a/kpresenter/KPrPresDurationDia.cpp
+++ b/kpresenter/KPrPresDurationDia.cpp
@@ -28,7 +28,7 @@
#include <tqlayout.h>
#include <tdelistview.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
KPrPresDurationDia::KPrPresDurationDia( TQWidget *parent, const char *name,
KPrDocument *_doc, TQStringList _durationListString,
diff --git a/kpresenter/KPrPrinterDlg.cpp b/kpresenter/KPrPrinterDlg.cpp
index cf496a15..284b2eed 100644
--- a/kpresenter/KPrPrinterDlg.cpp
+++ b/kpresenter/KPrPrinterDlg.cpp
@@ -26,7 +26,7 @@
// KDE includes
#include <kdebug.h>
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtooltip.h>
// local includes
diff --git a/kpresenter/KPrPropertyEditor.cpp b/kpresenter/KPrPropertyEditor.cpp
index 80681763..841b6841 100644
--- a/kpresenter/KPrPropertyEditor.cpp
+++ b/kpresenter/KPrPropertyEditor.cpp
@@ -33,7 +33,7 @@
#include "KPrTextProperty.h"
#include "KPrObjectProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
KPrPropertyEditor::KPrPropertyEditor( TQWidget *parent, const char *name, KPrPage *page, KPrDocument *doc )
diff --git a/kpresenter/KPrRotationDialogImpl.cpp b/kpresenter/KPrRotationDialogImpl.cpp
index 3e28c748..e6521ed7 100644
--- a/kpresenter/KPrRotationDialogImpl.cpp
+++ b/kpresenter/KPrRotationDialogImpl.cpp
@@ -26,7 +26,7 @@
#include <kiconloader.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include "KPrRotationDialogImpl.h"
diff --git a/kpresenter/KPrShadowDialogImpl.cpp b/kpresenter/KPrShadowDialogImpl.cpp
index e46e80fd..d2730665 100644
--- a/kpresenter/KPrShadowDialogImpl.cpp
+++ b/kpresenter/KPrShadowDialogImpl.cpp
@@ -5,7 +5,7 @@
#include <tqbuttongroup.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "KPrShadowDialogImpl.h"
#include "KPrTextPreview.h"
diff --git a/kpresenter/KPrSideBar.cpp b/kpresenter/KPrSideBar.cpp
index 00ee8139..96783d8d 100644
--- a/kpresenter/KPrSideBar.cpp
+++ b/kpresenter/KPrSideBar.cpp
@@ -30,8 +30,8 @@
#include <tqtooltip.h>
#include <kwordwrap.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kinputdialog.h>
#include <knotifyclient.h>
#include <kiconview.h>
diff --git a/kpresenter/KPrSlideTransitionDia.cpp b/kpresenter/KPrSlideTransitionDia.cpp
index 88d1c9ac..8dd46db5 100644
--- a/kpresenter/KPrSlideTransitionDia.cpp
+++ b/kpresenter/KPrSlideTransitionDia.cpp
@@ -22,7 +22,7 @@
#include "KPrSlideTransitionDia.h"
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kstandarddirs.h>
#include <kurlrequester.h>
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 35961bab..2d02f6cc 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -42,8 +42,8 @@
#include "KPrTextObjectIface.h"
#include <KoOasisContext.h>
#include <KoStyleStack.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tdemultipledrag.h>
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index a0610cec..c69c39a1 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -25,7 +25,7 @@
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "KPrMarginWidget.h"
diff --git a/kpresenter/KPrTransEffectDia.cpp b/kpresenter/KPrTransEffectDia.cpp
index b4f9d144..aeee98bc 100644
--- a/kpresenter/KPrTransEffectDia.cpp
+++ b/kpresenter/KPrTransEffectDia.cpp
@@ -47,7 +47,7 @@
#include <kdebug.h>
#include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kiconloader.h>
#include <kurl.h>
diff --git a/kpresenter/KPrVariableCollection.cpp b/kpresenter/KPrVariableCollection.cpp
index d7312e75..50be1efa 100644
--- a/kpresenter/KPrVariableCollection.cpp
+++ b/kpresenter/KPrVariableCollection.cpp
@@ -22,7 +22,7 @@
#include <KoVariable.h>
#include "KPrDocument.h"
#include "KPrCommand.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoXmlNS.h>
#include <KoDom.h>
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index 6f2e2358..583b7af7 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -20,7 +20,7 @@
#include <kprinter.h>
#include <tdeaccel.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqpainter.h>
#include <tqscrollbar.h>
#include <tqpopupmenu.h>
@@ -65,7 +65,7 @@
#include <dcopclient.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstdaction.h>
#include <tdeapplication.h>
#include <tdeio/netaccess.h>
@@ -76,15 +76,15 @@
#include "KPrMSPresentationSetup.h"
#include "KPrTextObject.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include <tdeconfig.h>
#include <tdefontdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kimageio.h>
#include <tdeparts/event.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kcolorbutton.h>
#include <kprocess.h>
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 6f93acba..90053b31 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -30,7 +30,7 @@
#include <kstandarddirs.h>
#include <unistd.h>
#include <sys/types.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqfile.h>
#include <tqtextstream.h>
@@ -54,16 +54,16 @@
#include <tqcheckbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolorbutton.h>
#include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kbuttonbox.h>
#include <ksimpleconfig.h>
#include <tdeapplication.h>
#include <kprogress.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <kcharsets.h>
#include <kurlrequester.h>
#include <klineedit.h>
diff --git a/kpresenter/autoformEdit/AFChoose.cpp b/kpresenter/autoformEdit/AFChoose.cpp
index 9c4e2e5e..3e8543c9 100644
--- a/kpresenter/autoformEdit/AFChoose.cpp
+++ b/kpresenter/autoformEdit/AFChoose.cpp
@@ -26,7 +26,7 @@
#include <tqdir.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kpresenter/main.cpp b/kpresenter/main.cpp
index 4113d341..b3ab9ec8 100644
--- a/kpresenter/main.cpp
+++ b/kpresenter/main.cpp
@@ -23,7 +23,7 @@
#include <dcopclient.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const TDECmdLineOptions options[]=
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cc
index e326dd53..763e47a5 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cc
@@ -26,7 +26,7 @@
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kspread_cell.h>
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cc
index e4e130e8..108511ad 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cc
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqlineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_doc.h"
#include "kspread_locale.h"
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cc
index 9ed3c551..2494959c 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cc
@@ -25,7 +25,7 @@
#include <tqpushbutton.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include "kspread_canvas.h"
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cc
index 9e9d47de..a75bd5bd 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cc
@@ -36,8 +36,8 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <KoGlobal.h>
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cc
index f24e691a..139113c7 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cc
@@ -36,7 +36,7 @@
#include <kdebug.h>
#include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_dlg_cons.h"
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cc
index 653587fc..c068810b 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cc
@@ -36,8 +36,8 @@
#include <kdebug.h>
#include <kdialogbase.h>
#include <tdefiledialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kspread_cell.h>
#include <kspread_doc.h>
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cc
index 5f955074..34e680cd 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cc
@@ -29,8 +29,8 @@
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <kpushbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cc
index dceca6b1..aa1c7f71 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cc
@@ -21,7 +21,7 @@
#include "kspread_dlg_find.h"
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqlabel.h>
#include <tqcombobox.h>
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cc
index 6163710b..501d8bf3 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cc
@@ -30,7 +30,7 @@
#include <tqpushbutton.h>
#include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cc
index 49ec2461..b45525ad 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cc
@@ -37,8 +37,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstdguiitem.h>
#include <kpushbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cc
index 6e217f24..454a43ba 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cc
@@ -31,8 +31,8 @@
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspread_doc.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cc
index ce97542d..ad876b3b 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cc
@@ -48,7 +48,7 @@
#include <kdebug.h>
#include <kdialog.h>
#include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <KoUnitWidgets.h>
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cc
index 88496387..254470e1 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cc
@@ -29,7 +29,7 @@
#include <kbuttonbox.h>
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "kspread_autofill.h"
#include "kspread_factory.h"
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cc
index fcbbba78..3305963e 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cc
@@ -42,8 +42,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
using namespace KSpread;
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cc
index cc49afad..93d67b06 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cc
@@ -21,7 +21,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <tqbuttongroup.h>
#include <kdebug.h>
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cc
index 0a15da25..b47d55f8 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cc
@@ -36,7 +36,7 @@
#include <kstatusbar.h>
#include <knuminput.h>
#include <tdespell.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeversion.h>
#include <kcolorbutton.h>
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cc
index c5ae14c7..9e747dfb 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cc
@@ -43,7 +43,7 @@
#include <tqlayout.h>
#include <kbuttonbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tdeversion.h>
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cc
index 0158dd2a..9c003498 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cc
@@ -31,12 +31,12 @@
#include "kspread_view.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqbuttongroup.h>
#include <tqgroupbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <tqradiobutton.h>
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cc
index c73f71ec..11f55e6d 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cc
@@ -23,7 +23,7 @@
*/
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlistbox.h>
#include <tqlabel.h>
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cc
index 0a32a44d..32c4c631 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cc
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_doc.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cc
index 7292b25b..52cda9b6 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cc
@@ -43,8 +43,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspread_dlg_sort.h"
#include "kspread_doc.h"
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cc
index 510e0ad8..2fbeb7eb 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cc
@@ -24,7 +24,7 @@
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_canvas.h"
#include "kspread_doc.h"
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cc
index fdb8d6fe..bf8f4de2 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cc
@@ -25,7 +25,7 @@
#include <kcombobox.h>
#include <kdebug.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_canvas.h"
#include "kspread_cell.h"
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cc
index f88f3a7f..054cc1f7 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cc
@@ -25,8 +25,8 @@
#include <tqmemarray.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "kspreadsubtotal.h"
#include "kspread_sheet.h"
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cc
index 2d0b5656..ea462527 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cc
@@ -32,7 +32,7 @@
#include <tqbuttongroup.h>
#include <knumvalidator.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqcombobox.h>
#include <tqlineedit.h>
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cc
index dfa7c385..5d2217cb 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cc
@@ -33,8 +33,8 @@
#include <kdialogbase.h>
#include <kiconloader.h>
#include <klineedit.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tderecentdocument.h>
#include <kurlrequester.h>
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cc
index 7cdd6449..c4b79a9d 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cc
@@ -22,7 +22,7 @@
#include <kcombobox.h>
#include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_sheet.h"
#include "sheet_properties_base.h"
diff --git a/kspread/formula.cc b/kspread/formula.cc
index b357151b..3522f06b 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cc
@@ -39,7 +39,7 @@
#include <tqvaluevector.h>
#include <tqvaluestack.h>
-#include <klocale.h>
+#include <tdelocale.h>
/*
To understand how this formula engine works, please refer to the documentation
diff --git a/kspread/functions.cc b/kspread/functions.cc
index de55f7e5..f6bc16e2 100644
--- a/kspread/functions.cc
+++ b/kspread/functions.cc
@@ -28,7 +28,7 @@
#include <tqvaluevector.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/kspread/kspread_aboutdata.h b/kspread/kspread_aboutdata.h
index 85b9797e..618fc132 100644
--- a/kspread/kspread_aboutdata.h
+++ b/kspread/kspread_aboutdata.h
@@ -21,7 +21,7 @@
#define KSPREAD_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
namespace KSpread
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cc
index 780dd5af..7ce1f63c 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cc
@@ -58,7 +58,7 @@
#include <kcursor.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <krun.h>
#include <kmimetype.h>
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cc
index d8799d9f..991f6433 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cc
@@ -79,7 +79,7 @@
#include <KoXmlWriter.h>
#include <KoOasisStyles.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cc
index 3afcfaf1..7643b31d 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cc
@@ -41,9 +41,9 @@
#include <kstandarddirs.h>
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <ksconfig.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoApplication.h>
#include <KoCommandHistory.h>
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index 2c0cf45a..430e2386 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -25,7 +25,7 @@
#include <dcopobject.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoXmlNS.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cc
index 0136d298..d322b6a4 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cc
@@ -27,7 +27,7 @@
#include "valueconverter.h"
#include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cc
index ddcda561..bca81ec8 100644
--- a/kspread/kspread_functions_engineering.cc
+++ b/kspread/kspread_functions_engineering.cc
@@ -29,8 +29,8 @@
#include <tqmap.h>
// these are needed for complex functions, while we handle them in the old way
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <math.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_financial.cc b/kspread/kspread_functions_financial.cc
index a9479efc..daccb640 100644
--- a/kspread/kspread_functions_financial.cc
+++ b/kspread/kspread_functions_financial.cc
@@ -28,7 +28,7 @@
#include "valuecalc.h"
#include "valueconverter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcalendarsystem.h>
using namespace KSpread;
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cc
index 2a5775aa..30d64263 100644
--- a/kspread/kspread_functions_information.cc
+++ b/kspread/kspread_functions_information.cc
@@ -27,7 +27,7 @@
#include <tqdir.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "functions.h"
#include "valuecalc.h"
diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc
index b34996f6..06b6da2b 100644
--- a/kspread/kspread_functions_math.cc
+++ b/kspread/kspread_functions_math.cc
@@ -22,7 +22,7 @@
// built-in math functions
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "functions.h"
#include "valuecalc.h"
diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cc
index 432bfc28..5a8dccf6 100644
--- a/kspread/kspread_functions_text.cc
+++ b/kspread/kspread_functions_text.cc
@@ -25,7 +25,7 @@
#include <tqregexp.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <math.h>
#include "functions.h"
diff --git a/kspread/kspread_generalProperty.cpp b/kspread/kspread_generalProperty.cpp
index d15c79c8..f233576a 100644
--- a/kspread/kspread_generalProperty.cpp
+++ b/kspread/kspread_generalProperty.cpp
@@ -26,7 +26,7 @@
#include <tqlineedit.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGeneralPropertyUi.h>
#include <KoUnitWidgets.h>
diff --git a/kspread/kspread_locale.h b/kspread/kspread_locale.h
index 12081731..705d7b51 100644
--- a/kspread/kspread_locale.h
+++ b/kspread/kspread_locale.h
@@ -1,7 +1,7 @@
#ifndef KSPREAD_LOCALE_H
#define KSPREAD_LOCALE_H
-#include <klocale.h>
+#include <tdelocale.h>
class TQDomElement;
class TQDomDocument;
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cc
index d39f6c1f..d54c340a 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cc
@@ -23,7 +23,7 @@
#include <tqfile.h>
#include <kmdcodec.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <KoDom.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cc
index 769aa61a..e0962b96 100644
--- a/kspread/kspread_numformat.cc
+++ b/kspread/kspread_numformat.cc
@@ -34,7 +34,7 @@ Tomas
#include <tqstring.h>
#include <kcalendarsystem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_util.h"
#include "kspread_value.h"
diff --git a/kspread/kspread_object.h b/kspread/kspread_object.h
index b66d67ac..2aaab400 100644
--- a/kspread/kspread_object.h
+++ b/kspread/kspread_object.h
@@ -22,7 +22,7 @@
#include "kspread_sheet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoBrush.h>
#include <KoChild.h>
#include <KoDom.h>
diff --git a/kspread/kspread_propertyEditor.cpp b/kspread/kspread_propertyEditor.cpp
index 3b84a3db..1f2aa1e6 100644
--- a/kspread/kspread_propertyEditor.cpp
+++ b/kspread/kspread_propertyEditor.cpp
@@ -33,7 +33,7 @@
// #include "KPrTextProperty.h"
// #include "KPrObjectProperties.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstdguiitem.h>
using namespace KSpread;
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cc
index 8d6cf77b..a8965b9e 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cc
@@ -42,7 +42,7 @@
#include <kmdcodec.h>
#include <kfind.h>
#include <kfinddialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kreplace.h>
#include <kreplacedialog.h>
#include <kprinter.h>
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cc
index a70445eb..3cc26bf3 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cc
@@ -30,7 +30,7 @@
#include "commands.h"
#include <KoDocumentInfo.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
#include <kdebug.h>
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cc
index f8ac8158..bd58ac88 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cc
@@ -21,7 +21,7 @@
#include <tqbuffer.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoGlobal.h>
#include <KoGenStyles.h>
diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cc
index 47ca18cc..8bfb8acf 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cc
@@ -21,7 +21,7 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoOasisStyles.h>
#include <KoXmlNS.h>
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cc
index b43dac6c..253a9267 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cc
@@ -56,7 +56,7 @@
#include <kfinddialog.h>
#include <tdefontdialog.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include <kpassdlg.h>
#include <kprocio.h>
@@ -67,7 +67,7 @@
#include <kstatusbar.h>
#include <kstdaction.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tdeparts/partmanager.h>
#include <tdelistview.h>
#include <kpushbutton.h>
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cc
index f1a5838b..b095191c 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cc
@@ -22,8 +22,8 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kstaticdeleter.h>
#include "kspread_canvas.h"
diff --git a/kspread/manipulator.h b/kspread/manipulator.h
index 622362bc..d7c03959 100644
--- a/kspread/manipulator.h
+++ b/kspread/manipulator.h
@@ -26,7 +26,7 @@
#include <tqvaluelist.h>
#include <kcommand.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koffice_export.h>
diff --git a/kspread/manipulator_data.cc b/kspread/manipulator_data.cc
index 5b829de3..af231722 100644
--- a/kspread/manipulator_data.cc
+++ b/kspread/manipulator_data.cc
@@ -20,7 +20,7 @@
#include "manipulator_data.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include "kspread_cell.h"
#include "kspread_sheet.h"
diff --git a/kspread/plugins/calculator/configdlg.cpp b/kspread/plugins/calculator/configdlg.cpp
index 28ab2646..56af25b4 100644
--- a/kspread/plugins/calculator/configdlg.cpp
+++ b/kspread/plugins/calculator/configdlg.cpp
@@ -27,7 +27,7 @@
#include "configdlg.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialog.h>
#include <tqlayout.h>
diff --git a/kspread/plugins/calculator/kcalc.cpp b/kspread/plugins/calculator/kcalc.cpp
index b6c71ca1..d7c0ce76 100644
--- a/kspread/plugins/calculator/kcalc.cpp
+++ b/kspread/plugins/calculator/kcalc.cpp
@@ -24,17 +24,17 @@
#include "configdlg.h"
#include "version.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <tqlayout.h>
#include <tqobjectlist.h>
#include <tqpushbutton.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqstyle.h>
#include <kdialog.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "kcalc.h"
extern last_input_type last_input;
diff --git a/kspread/plugins/calculator/kcalc_core.cpp b/kspread/plugins/calculator/kcalc_core.cpp
index bdba8469..881a05eb 100644
--- a/kspread/plugins/calculator/kcalc_core.cpp
+++ b/kspread/plugins/calculator/kcalc_core.cpp
@@ -36,8 +36,8 @@
#include <limits.h>
#include <math.h>
#include <signal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knotifyclient.h>
#include "kcalc.h"
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
index dc4c169e..ba6f2335 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
@@ -35,9 +35,9 @@
#include <kcalendarsystemfactory.h>
#include <tdeaboutdata.h>
#include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqpoint.h>
#include <tqrect.h>
diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cc
index 97993c82..2c7381e1 100644
--- a/kspread/tests/formula_tester.cc
+++ b/kspread/tests/formula_tester.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "tester.h"
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cc
index 1eda41da..94b6b57c 100644
--- a/kspread/valueformatter.cc
+++ b/kspread/valueformatter.cc
@@ -27,7 +27,7 @@
#include <kcalendarsystem.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <float.h>
#include <math.h>
diff --git a/kugar/kudesigner/kudesigner_aboutdata.h b/kugar/kudesigner/kudesigner_aboutdata.h
index 6a52781c..8692a5a1 100644
--- a/kugar/kudesigner/kudesigner_aboutdata.h
+++ b/kugar/kudesigner/kudesigner_aboutdata.h
@@ -21,7 +21,7 @@
#define KUDESIGNER_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
static const char* description = I18N_NOOP( "GUI report template designer for Kugar report engine" );
diff --git a/kugar/kudesigner/kudesigner_doc.cpp b/kugar/kudesigner/kudesigner_doc.cpp
index 8e85bae6..bd4d1bef 100644
--- a/kugar/kudesigner/kudesigner_doc.cpp
+++ b/kugar/kudesigner/kudesigner_doc.cpp
@@ -23,7 +23,7 @@
#include <KoTemplateChooseDia.h>
#include <tdeparts/componentfactory.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kcommand.h>
diff --git a/kugar/kudesigner/kudesigner_factory.cpp b/kugar/kudesigner/kudesigner_factory.cpp
index e9fec1f8..518eceb5 100644
--- a/kugar/kudesigner/kudesigner_factory.cpp
+++ b/kugar/kudesigner/kudesigner_factory.cpp
@@ -22,7 +22,7 @@
#include <kudesigner_aboutdata.h>
#include <kinstance.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kugar/kudesigner/kudesigner_view.cpp b/kugar/kudesigner/kudesigner_view.cpp
index 0b2509d6..1f3eeafa 100644
--- a/kugar/kudesigner/kudesigner_view.cpp
+++ b/kugar/kudesigner/kudesigner_view.cpp
@@ -37,7 +37,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <KoMainWindow.h>
diff --git a/kugar/kudesigner/main.cpp b/kugar/kudesigner/main.cpp
index b78a88da..d1b0d888 100644
--- a/kugar/kudesigner/main.cpp
+++ b/kugar/kudesigner/main.cpp
@@ -21,7 +21,7 @@
#include <KoDocument.h>
#include <KoMainWindow.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopclient.h>
#include "kudesigner_aboutdata.h"
diff --git a/kugar/kudesigner_lib/band.cpp b/kugar/kudesigner_lib/band.cpp
index 21d0f752..5732ff3a 100644
--- a/kugar/kudesigner_lib/band.cpp
+++ b/kugar/kudesigner_lib/band.cpp
@@ -22,7 +22,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
#include <tqrect.h>
#include <tqpainter.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include "propertyserializer.h"
#include "kugartemplate.h"
diff --git a/kugar/kudesigner_lib/calcfield.cpp b/kugar/kudesigner_lib/calcfield.cpp
index 16941b7b..b47597fc 100644
--- a/kugar/kudesigner_lib/calcfield.cpp
+++ b/kugar/kudesigner_lib/calcfield.cpp
@@ -18,7 +18,7 @@
*/
#include "calcfield.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqmap.h>
diff --git a/kugar/kudesigner_lib/command.cpp b/kugar/kudesigner_lib/command.cpp
index e65f9f71..f9d2d26f 100644
--- a/kugar/kudesigner_lib/command.cpp
+++ b/kugar/kudesigner_lib/command.cpp
@@ -18,7 +18,7 @@
*/
#include "command.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
//#include "kudesigner_doc.h"
diff --git a/kugar/kudesigner_lib/commdefs.cpp b/kugar/kudesigner_lib/commdefs.cpp
index 298c3ecc..2be6e6d0 100644
--- a/kugar/kudesigner_lib/commdefs.cpp
+++ b/kugar/kudesigner_lib/commdefs.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqsettings.h>
diff --git a/kugar/kudesigner_lib/detail.cpp b/kugar/kudesigner_lib/detail.cpp
index a9f2faa5..bb8ad3ef 100644
--- a/kugar/kudesigner_lib/detail.cpp
+++ b/kugar/kudesigner_lib/detail.cpp
@@ -18,7 +18,7 @@
*/
#include "detail.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/detailbase.cpp b/kugar/kudesigner_lib/detailbase.cpp
index e338baa1..0b157b67 100644
--- a/kugar/kudesigner_lib/detailbase.cpp
+++ b/kugar/kudesigner_lib/detailbase.cpp
@@ -18,7 +18,7 @@
*/
#include "detailbase.h"
-#include "klocale.h"
+#include "tdelocale.h"
namespace Kudesigner
{
diff --git a/kugar/kudesigner_lib/detailfooter.cpp b/kugar/kudesigner_lib/detailfooter.cpp
index b1715920..4544072c 100644
--- a/kugar/kudesigner_lib/detailfooter.cpp
+++ b/kugar/kudesigner_lib/detailfooter.cpp
@@ -18,7 +18,7 @@
*/
#include "detailfooter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/detailheader.cpp b/kugar/kudesigner_lib/detailheader.cpp
index d43ce942..5e9ad3b8 100644
--- a/kugar/kudesigner_lib/detailheader.cpp
+++ b/kugar/kudesigner_lib/detailheader.cpp
@@ -18,7 +18,7 @@
*/
#include "detailheader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/field.cpp b/kugar/kudesigner_lib/field.cpp
index c9a5b480..cdbd6253 100644
--- a/kugar/kudesigner_lib/field.cpp
+++ b/kugar/kudesigner_lib/field.cpp
@@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
*/
#include "field.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineeditdlg.h>
#include <kdebug.h>
diff --git a/kugar/kudesigner_lib/kugartemplate.cpp b/kugar/kudesigner_lib/kugartemplate.cpp
index 1945b714..41b7b0f1 100644
--- a/kugar/kudesigner_lib/kugartemplate.cpp
+++ b/kugar/kudesigner_lib/kugartemplate.cpp
@@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
*/
#include "kugartemplate.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqcanvas.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/label.cpp b/kugar/kudesigner_lib/label.cpp
index 27226774..ec39b317 100644
--- a/kugar/kudesigner_lib/label.cpp
+++ b/kugar/kudesigner_lib/label.cpp
@@ -18,14 +18,14 @@
*/
#include "label.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineeditdlg.h>
#include <tqmap.h>
#include <tqpainter.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koproperty/property.h>
diff --git a/kugar/kudesigner_lib/line.cpp b/kugar/kudesigner_lib/line.cpp
index fb5a56d5..2c7b48e6 100644
--- a/kugar/kudesigner_lib/line.cpp
+++ b/kugar/kudesigner_lib/line.cpp
@@ -18,7 +18,7 @@
*/
#include "line.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/pagefooter.cpp b/kugar/kudesigner_lib/pagefooter.cpp
index b4e30fed..8e0b4547 100644
--- a/kugar/kudesigner_lib/pagefooter.cpp
+++ b/kugar/kudesigner_lib/pagefooter.cpp
@@ -18,7 +18,7 @@
*/
#include "pagefooter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/pageheader.cpp b/kugar/kudesigner_lib/pageheader.cpp
index b2b76167..33b133d6 100644
--- a/kugar/kudesigner_lib/pageheader.cpp
+++ b/kugar/kudesigner_lib/pageheader.cpp
@@ -18,7 +18,7 @@
*/
#include "pageheader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/reportfooter.cpp b/kugar/kudesigner_lib/reportfooter.cpp
index abed8a21..f6cccd5a 100644
--- a/kugar/kudesigner_lib/reportfooter.cpp
+++ b/kugar/kudesigner_lib/reportfooter.cpp
@@ -18,7 +18,7 @@
*/
#include "reportfooter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/reportheader.cpp b/kugar/kudesigner_lib/reportheader.cpp
index aef6351b..a64c9488 100644
--- a/kugar/kudesigner_lib/reportheader.cpp
+++ b/kugar/kudesigner_lib/reportheader.cpp
@@ -18,7 +18,7 @@
*/
#include "reportheader.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/reportitem.cpp b/kugar/kudesigner_lib/reportitem.cpp
index 60171583..22234c05 100644
--- a/kugar/kudesigner_lib/reportitem.cpp
+++ b/kugar/kudesigner_lib/reportitem.cpp
@@ -18,8 +18,8 @@
*/
#include "reportitem.h"
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tqrect.h>
#include <tqpainter.h>
diff --git a/kugar/kudesigner_lib/section.cpp b/kugar/kudesigner_lib/section.cpp
index 7a721133..630c8a66 100644
--- a/kugar/kudesigner_lib/section.cpp
+++ b/kugar/kudesigner_lib/section.cpp
@@ -18,7 +18,7 @@ the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
*/
#include "section.h"
-#include "klocale.h"
+#include "tdelocale.h"
namespace Kudesigner
{
diff --git a/kugar/kudesigner_lib/specialfield.cpp b/kugar/kudesigner_lib/specialfield.cpp
index d18c0e17..7842e4ab 100644
--- a/kugar/kudesigner_lib/specialfield.cpp
+++ b/kugar/kudesigner_lib/specialfield.cpp
@@ -18,7 +18,7 @@
*/
#include "specialfield.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <koproperty/property.h>
diff --git a/kugar/lib/mlabelobject.cpp b/kugar/lib/mlabelobject.cpp
index fecbd560..bde41bcc 100644
--- a/kugar/lib/mlabelobject.cpp
+++ b/kugar/lib/mlabelobject.cpp
@@ -8,7 +8,7 @@
email : cloudtemple@mksat.net
***************************************************************************/
-//#include <kglobalsettings.h>
+//#include <tdeglobalsettings.h>
#include <tqfont.h>
#include "mlabelobject.h"
diff --git a/kugar/lib/mreportviewer.cpp b/kugar/lib/mreportviewer.cpp
index 4c34a772..3619d155 100644
--- a/kugar/lib/mreportviewer.cpp
+++ b/kugar/lib/mreportviewer.cpp
@@ -9,9 +9,9 @@
***************************************************************************/
#include <tqapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kprinter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "mreportviewer.h"
diff --git a/kugar/part/kugar_about.h b/kugar/part/kugar_about.h
index 2a47f768..965cd282 100644
--- a/kugar/part/kugar_about.h
+++ b/kugar/part/kugar_about.h
@@ -24,7 +24,7 @@
#endif
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
TDEAboutData *newKugarAboutData()
{
diff --git a/kugar/part/kugar_factory.cpp b/kugar/part/kugar_factory.cpp
index f32c1b95..9cd323c0 100644
--- a/kugar/part/kugar_factory.cpp
+++ b/kugar/part/kugar_factory.cpp
@@ -3,11 +3,11 @@
// This file contains the implementation of the Kugar KPart.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#if defined(HAVE_CONFIG_H)
diff --git a/kugar/part/kugar_part.cpp b/kugar/part/kugar_part.cpp
index 14e8e059..c00ba14d 100644
--- a/kugar/part/kugar_part.cpp
+++ b/kugar/part/kugar_part.cpp
@@ -4,16 +4,16 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqwidget.h>
#include <tdefiledialog.h>
diff --git a/kugar/part/kugar_view.cpp b/kugar/part/kugar_view.cpp
index 55403d41..d1040574 100644
--- a/kugar/part/kugar_view.cpp
+++ b/kugar/part/kugar_view.cpp
@@ -4,16 +4,16 @@
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kinstance.h>
#include <tdeaboutdata.h>
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
#include <tqfile.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
#include <tqlayout.h>
diff --git a/kword/KWAboutData.h b/kword/KWAboutData.h
index d9b3b6f6..909fc6ef 100644
--- a/kword/KWAboutData.h
+++ b/kword/KWAboutData.h
@@ -21,7 +21,7 @@
#define KWORD_ABOUTDATA
#include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kofficeversion.h>
static const char* KWORD_DESCRIPTION=I18N_NOOP("KOffice Word Processor");
diff --git a/kword/KWBgSpellCheck.cpp b/kword/KWBgSpellCheck.cpp
index a1bd1f5c..59380048 100644
--- a/kword/KWBgSpellCheck.cpp
+++ b/kword/KWBgSpellCheck.cpp
@@ -32,7 +32,7 @@ using namespace KSpell2;
#include <kdebug.h>
#include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
KWBgSpellCheck::KWBgSpellCheck(KWDocument *_doc)
diff --git a/kword/KWCanvas.cpp b/kword/KWCanvas.cpp
index 27f1320f..11e23e27 100644
--- a/kword/KWCanvas.cpp
+++ b/kword/KWCanvas.cpp
@@ -50,11 +50,11 @@
#include <KoStoreDrag.h>
#include <KoPictureCollection.h>
-#include <ktempfile.h>
-#include <klocale.h>
+#include <tdetempfile.h>
+#include <tdelocale.h>
#include <kcursor.h>
#include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdemultipledrag.h>
#include <kurl.h>
#include <kurldrag.h>
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index d2adb65c..fec98ab7 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -44,7 +44,7 @@
#include <KoStore.h>
#include <KoOasisStore.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqxml.h>
diff --git a/kword/KWConfig.cpp b/kword/KWConfig.cpp
index 6853f2c7..6d1a28b2 100644
--- a/kword/KWConfig.cpp
+++ b/kword/KWConfig.cpp
@@ -20,7 +20,7 @@
#include <tdeconfig.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <knuminput.h>
#include <knumvalidator.h>
@@ -60,11 +60,11 @@
using namespace KSpell2;
#include <float.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdelistview.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
#include <kurlrequesterdlg.h>
#include <tdefiledialog.h>
#include <tqtabwidget.h>
diff --git a/kword/KWConfigFootNoteDia.cpp b/kword/KWConfigFootNoteDia.cpp
index ee235c9b..236c7357 100644
--- a/kword/KWConfigFootNoteDia.cpp
+++ b/kword/KWConfigFootNoteDia.cpp
@@ -27,7 +27,7 @@
#include <KoParagDia.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <tqradiobutton.h>
diff --git a/kword/KWCreateBookmarkDia.cpp b/kword/KWCreateBookmarkDia.cpp
index 131192e9..7f17f55f 100644
--- a/kword/KWCreateBookmarkDia.cpp
+++ b/kword/KWCreateBookmarkDia.cpp
@@ -17,14 +17,14 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "KWDocument.h"
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "KWCommand.h"
#include "KWCreateBookmarkDia.h"
#include "KWCreateBookmarkDiaBase.h"
diff --git a/kword/KWDeleteDia.cpp b/kword/KWDeleteDia.cpp
index 2577e0f5..40f391d1 100644
--- a/kword/KWDeleteDia.cpp
+++ b/kword/KWDeleteDia.cpp
@@ -22,7 +22,7 @@
#include "KWDeleteDia.h"
#include "KWView.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/kword/KWDocStruct.cpp b/kword/KWDocStruct.cpp
index e39947dc..f6595c00 100644
--- a/kword/KWDocStruct.cpp
+++ b/kword/KWDocStruct.cpp
@@ -34,12 +34,12 @@
#include <KoSpeaker.h>
// KDE includes.
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
#include <tdelistviewsearchline.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
#include <kpixmap.h>
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
diff --git a/kword/KWDocument.cpp b/kword/KWDocument.cpp
index ece87a9a..2c446210 100644
--- a/kword/KWDocument.cpp
+++ b/kword/KWDocument.cpp
@@ -74,11 +74,11 @@
#include <kcursor.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <klibloader.h>
#include <tdemultipledrag.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdespell.h>
#include <kstandarddirs.h>
diff --git a/kword/KWEditPersonnalExpression.cpp b/kword/KWEditPersonnalExpression.cpp
index 4a870af7..dd612b75 100644
--- a/kword/KWEditPersonnalExpression.cpp
+++ b/kword/KWEditPersonnalExpression.cpp
@@ -20,7 +20,7 @@
#include "KWEditPersonnalExpression.h"
#include "KWView.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <klineeditdlg.h>
#include <kdebug.h>
#include <kstandarddirs.h>
diff --git a/kword/KWFootNoteDia.cpp b/kword/KWFootNoteDia.cpp
index 24060cf2..4d9ec80b 100644
--- a/kword/KWFootNoteDia.cpp
+++ b/kword/KWFootNoteDia.cpp
@@ -24,7 +24,7 @@
#include <tqvbox.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqlineedit.h>
#include "KWConfigFootNoteDia.h"
diff --git a/kword/KWFormulaFrameSet.cpp b/kword/KWFormulaFrameSet.cpp
index f54942a4..a6a31f7c 100644
--- a/kword/KWFormulaFrameSet.cpp
+++ b/kword/KWFormulaFrameSet.cpp
@@ -35,10 +35,10 @@
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <dcopobject.h>
#include "KWordFormulaFrameSetIface.h"
#include "KWordFormulaFrameSetEditIface.h"
diff --git a/kword/KWFrameDia.cpp b/kword/KWFrameDia.cpp
index 6c7fa4b2..66ef91b2 100644
--- a/kword/KWFrameDia.cpp
+++ b/kword/KWFrameDia.cpp
@@ -32,9 +32,9 @@
#include <KoParagDia_p.h> // for KoBorderPreview
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <knumvalidator.h>
#include <kcolorbutton.h>
#include <kdebug.h>
diff --git a/kword/KWFrameStyle.cpp b/kword/KWFrameStyle.cpp
index 65ae6fbb..a0cc5f81 100644
--- a/kword/KWFrameStyle.cpp
+++ b/kword/KWFrameStyle.cpp
@@ -28,7 +28,7 @@
#include <KoXmlNS.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
KWFrameStyleCollection::KWFrameStyleCollection()
diff --git a/kword/KWFrameStyleManager.cpp b/kword/KWFrameStyleManager.cpp
index b9ccbe16..3a5fec87 100644
--- a/kword/KWFrameStyleManager.cpp
+++ b/kword/KWFrameStyleManager.cpp
@@ -27,7 +27,7 @@
#include <KoParagDia.h>
#include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <tqtabwidget.h>
diff --git a/kword/KWFrameView.cpp b/kword/KWFrameView.cpp
index e3f6e98c..4a76e481 100644
--- a/kword/KWFrameView.cpp
+++ b/kword/KWFrameView.cpp
@@ -30,7 +30,7 @@
#include "KoZoomHandler.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeactionclasses.h>
#include <tqapplication.h>
diff --git a/kword/KWImportStyleDia.cpp b/kword/KWImportStyleDia.cpp
index cb1f40b5..b31f9789 100644
--- a/kword/KWImportStyleDia.cpp
+++ b/kword/KWImportStyleDia.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "KWDocument.h"
#include <tqvbox.h>
@@ -25,7 +25,7 @@
#include <tqlineedit.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "KWImportStyleDia.h"
#include <KoStore.h>
#include <tqfile.h>
diff --git a/kword/KWInsertDia.cpp b/kword/KWInsertDia.cpp
index 09764608..6bcd52db 100644
--- a/kword/KWInsertDia.cpp
+++ b/kword/KWInsertDia.cpp
@@ -22,7 +22,7 @@
#include "KWTableFrameSet.h"
#include "KWView.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqspinbox.h>
diff --git a/kword/KWInsertPageDia.cpp b/kword/KWInsertPageDia.cpp
index 42ca6b22..1a818cb3 100644
--- a/kword/KWInsertPageDia.cpp
+++ b/kword/KWInsertPageDia.cpp
@@ -20,7 +20,7 @@
#include "KWInsertPageDia.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqradiobutton.h>
#include <tqgroupbox.h>
#include <tqlayout.h>
diff --git a/kword/KWInsertPicDia.cpp b/kword/KWInsertPicDia.cpp
index 9aad5b5b..55b8219e 100644
--- a/kword/KWInsertPicDia.cpp
+++ b/kword/KWInsertPicDia.cpp
@@ -26,7 +26,7 @@
#include <tqscrollview.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kimageio.h>
#include <tdeio/netaccess.h>
diff --git a/kword/KWInsertTOCCommand.cpp b/kword/KWInsertTOCCommand.cpp
index 85b18a0a..b9bd0ed7 100644
--- a/kword/KWInsertTOCCommand.cpp
+++ b/kword/KWInsertTOCCommand.cpp
@@ -25,7 +25,7 @@
#include "KWTextDocument.h"
#include "KWTextParag.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
KWInsertTOCCommand::KWInsertTOCCommand( KWTextFrameSet * fs, KoTextParag *parag )
diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index 8ef08e91..b43e81c5 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -25,11 +25,11 @@
#include <KoCustomVariablesDia.h>
#include "defs.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kstdaction.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kseparator.h>
#include <kservice.h>
#include <tdemainwindow.h>
diff --git a/kword/KWOasisLoader.cpp b/kword/KWOasisLoader.cpp
index daaa8502..10867463 100644
--- a/kword/KWOasisLoader.cpp
+++ b/kword/KWOasisLoader.cpp
@@ -38,7 +38,7 @@
#include <KoXmlNS.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvaluelist.h>
#include <tqdom.h>
diff --git a/kword/KWPartFrameSet.cpp b/kword/KWPartFrameSet.cpp
index 4ae07187..d347871a 100644
--- a/kword/KWPartFrameSet.cpp
+++ b/kword/KWPartFrameSet.cpp
@@ -30,7 +30,7 @@
#include <KoXmlWriter.h>
#include <KoXmlNS.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <assert.h>
diff --git a/kword/KWPictureFrameSet.cpp b/kword/KWPictureFrameSet.cpp
index 2cc8443b..62f8ce2c 100644
--- a/kword/KWPictureFrameSet.cpp
+++ b/kword/KWPictureFrameSet.cpp
@@ -27,7 +27,7 @@
#include <KoDom.h>
#include <KoXmlNS.h>
#include <KoXmlWriter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
//#define DEBUG_DRAW
diff --git a/kword/KWResizeTableDia.cpp b/kword/KWResizeTableDia.cpp
index 08c2ada2..c4f5ce01 100644
--- a/kword/KWResizeTableDia.cpp
+++ b/kword/KWResizeTableDia.cpp
@@ -24,7 +24,7 @@
#include "KWCommand.h"
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlabel.h>
#include <tqvbox.h>
diff --git a/kword/KWSortDia.cpp b/kword/KWSortDia.cpp
index fe1f2c7f..9fab03f9 100644
--- a/kword/KWSortDia.cpp
+++ b/kword/KWSortDia.cpp
@@ -21,7 +21,7 @@
#include "KWSortDia.h"
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqradiobutton.h>
#include <tqgroupbox.h>
#include <tqbuttongroup.h>
diff --git a/kword/KWSplitCellDia.cpp b/kword/KWSplitCellDia.cpp
index 5e988ea3..fd141c29 100644
--- a/kword/KWSplitCellDia.cpp
+++ b/kword/KWSplitCellDia.cpp
@@ -25,7 +25,7 @@
#include <tqlabel.h>
#include <tqspinbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
KWSplitCellDia::KWSplitCellDia( TQWidget* parent, const char* name, unsigned int columns, unsigned int rows)
: KDialogBase( Plain, i18n("Split Cell"), Ok | Cancel, Ok, parent, name, true)
diff --git a/kword/KWStatisticsDialog.cpp b/kword/KWStatisticsDialog.cpp
index 9b1f462a..82b15bf1 100644
--- a/kword/KWStatisticsDialog.cpp
+++ b/kword/KWStatisticsDialog.cpp
@@ -19,7 +19,7 @@
#include "KWStatisticsDialog.h"
#include "KWDocument.h"
#include "KWFrameSet.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqtabwidget.h>
#include <tqvbox.h>
#include <tqlabel.h>
diff --git a/kword/KWTableDia.cpp b/kword/KWTableDia.cpp
index 013a2be6..6c68c32e 100644
--- a/kword/KWTableDia.cpp
+++ b/kword/KWTableDia.cpp
@@ -38,7 +38,7 @@
#include <tqbuttongroup.h>
#include <tqcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
diff --git a/kword/KWTableFrameSet.cpp b/kword/KWTableFrameSet.cpp
index 902d5a78..f86596ff 100644
--- a/kword/KWTableFrameSet.cpp
+++ b/kword/KWTableFrameSet.cpp
@@ -46,9 +46,9 @@ DESCRIPTION
#include <KoTextObject.h> // for customItemChar !
#include <KoTextParag.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <dcopobject.h>
#include <tqapplication.h>
#include <tqpopupmenu.h>
diff --git a/kword/KWTableStyle.cpp b/kword/KWTableStyle.cpp
index 20016d49..e6bd2116 100644
--- a/kword/KWTableStyle.cpp
+++ b/kword/KWTableStyle.cpp
@@ -27,7 +27,7 @@
#include <KoXmlNS.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
KWTableStyleCollection::KWTableStyleCollection()
diff --git a/kword/KWTableStyleManager.cpp b/kword/KWTableStyleManager.cpp
index 4a9ad5ef..aff5a008 100644
--- a/kword/KWTableStyleManager.cpp
+++ b/kword/KWTableStyleManager.cpp
@@ -30,7 +30,7 @@
#include "KWFrameStyleManager.h"
#include "KWStyleManager.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/kword/KWTableTemplate.cpp b/kword/KWTableTemplate.cpp
index 7f4b4682..a54ae259 100644
--- a/kword/KWTableTemplate.cpp
+++ b/kword/KWTableTemplate.cpp
@@ -24,7 +24,7 @@
#include "KoParagStyle.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
diff --git a/kword/KWTableTemplateSelector.cpp b/kword/KWTableTemplateSelector.cpp
index d161ccf7..476fb9b9 100644
--- a/kword/KWTableTemplateSelector.cpp
+++ b/kword/KWTableTemplateSelector.cpp
@@ -27,7 +27,7 @@
#include <KoRect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tdeio/netaccess.h>
#include <kstandarddirs.h>
diff --git a/kword/KWTextDocument.cpp b/kword/KWTextDocument.cpp
index 29252045..33e1607c 100644
--- a/kword/KWTextDocument.cpp
+++ b/kword/KWTextDocument.cpp
@@ -33,8 +33,8 @@
#include <KoDom.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
KWTextDocument::KWTextDocument( KWTextFrameSet * textfs, KoTextFormatCollection *fc, KoTextFormatter *formatter )
: KoTextDocument( textfs->kWordDocument(), fc, formatter, false ), m_textfs( textfs )
diff --git a/kword/KWTextFrameSet.cpp b/kword/KWTextFrameSet.cpp
index 4df7bc1f..756cf576 100644
--- a/kword/KWTextFrameSet.cpp
+++ b/kword/KWTextFrameSet.cpp
@@ -54,9 +54,9 @@
#include <KoOasisContext.h>
#include <KoStore.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqclipboard.h>
diff --git a/kword/KWTextParag.cpp b/kword/KWTextParag.cpp
index e870c710..aae68085 100644
--- a/kword/KWTextParag.cpp
+++ b/kword/KWTextParag.cpp
@@ -31,8 +31,8 @@
#include <KoXmlNS.h>
#include <KoOasisStyles.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <assert.h>
diff --git a/kword/KWVariable.cpp b/kword/KWVariable.cpp
index 80666965..285bac45 100644
--- a/kword/KWVariable.cpp
+++ b/kword/KWVariable.cpp
@@ -32,7 +32,7 @@
#include <KoXmlNS.h>
#include <KoDom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
KWVariableSettings::KWVariableSettings() : KoVariableSettings()
diff --git a/kword/KWView.cpp b/kword/KWView.cpp
index 4e3822a8..eb0022ce 100644
--- a/kword/KWView.cpp
+++ b/kword/KWView.cpp
@@ -108,13 +108,13 @@
#include <kimageio.h>
#include <kinputdialog.h>
#include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeparts/event.h>
#include <kstandarddirs.h>
#include <kstatusbar.h>
#include <tdestdaccel.h>
#include <kstdaction.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kurldrag.h>
#include <tdeversion.h>
#include <kiconloader.h>
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index ef76bea0..c8bd6f3b 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -29,7 +29,7 @@
#include <tqpushbutton.h>
#include <tqlineedit.h>
#include <tqvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtoolbutton.h>
#include <tqtooltip.h>
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.cpp b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
index 96512f8b..8453a5ec 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.cpp
@@ -25,10 +25,10 @@
*/
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kabc/distributionlist.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
#include "KWMailMergeKABC.h"
#include "KWMailMergeKABCConfig.h"
diff --git a/kword/mailmerge/kabc/KWMailMergeKABC.h b/kword/mailmerge/kabc/KWMailMergeKABC.h
index 32a078a6..b5f0dfc3 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABC.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABC.h
@@ -26,7 +26,7 @@
#include <tqdom.h>
#include <tqguardedptr.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
#include "KWMailMergeDataSource.h"
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
index c9c221dc..a75a8417 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.cpp
@@ -25,14 +25,14 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kinputdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <krun.h>
-#include <kabc/stdaddressbook.h>
-#include <kabc/distributionlist.h>
+#include <tdeabc/stdaddressbook.h>
+#include <tdeabc/distributionlist.h>
#include "addresspicker.h"
#include "KWMailMergeKABC.h"
diff --git a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
index 1024ecd0..056cefc2 100644
--- a/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
+++ b/kword/mailmerge/kabc/KWMailMergeKABCConfig.h
@@ -23,7 +23,7 @@
#include <kdialogbase.h>
#include <tdelistview.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
#include "KWMailMergeKABC.h"
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
index 63a02876..527d1e68 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread.cpp
@@ -19,8 +19,8 @@
*/
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kspread_map.h>
diff --git a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
index aa97d0b2..441c3207 100644
--- a/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
+++ b/kword/mailmerge/kspread/kwmailmerge_kspread_config.cpp
@@ -24,7 +24,7 @@
#include <kcombobox.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurlrequester.h>
#include <kspread_map.h>
diff --git a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
index c45d7527..08def7cd 100644
--- a/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
+++ b/kword/mailmerge/sql/KWQtSqlEasyFilter.cpp
@@ -2,7 +2,7 @@
#include "KWQtSqlEasyFilter.moc"
#include <tqtable.h>
#include <tqscrollview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqcheckbox.h>
diff --git a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
index 2f0c1a73..538e36a6 100644
--- a/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
+++ b/kword/mailmerge/sql/KWQtSqlMailMergeOpen.cpp
@@ -29,7 +29,7 @@
#include <kiconloader.h>
#include <tqsqldatabase.h>
#include <tqguardedptr.h>
-#include <klocale.h>
+#include <tdelocale.h>
/******************************************************************
*
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
index c9b24ac3..29264c4e 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.h
@@ -21,7 +21,7 @@
#define _SERIALLETTER_QtSql_POWER_PLUGIN_H_
#include <tqdom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdialogbase.h>
#include <tqsqldatabase.h>
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
index 2b3f711d..65534802 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSource.cpp
@@ -21,7 +21,7 @@
#include "KWQtSqlSerialDataSource.moc"
#include "KWQtSqlEasyFilter.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqsqlcursor.h>
#include <tqdatatable.h>
diff --git a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
index 41e971be..22cde06d 100644
--- a/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
+++ b/kword/mailmerge/sql/KWQtSqlSerialDataSourceBase.cpp
@@ -32,7 +32,7 @@
#include <tqsqlcursor.h>
#include <tqdatatable.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cc
index c8169f24..feac37ce 100644
--- a/lib/kformula/MatrixDialog.cc
+++ b/lib/kformula/MatrixDialog.cc
@@ -23,7 +23,7 @@
#include <tqlabel.h>
#include <tqcheckbox.h>
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
KFORMULA_NAMESPACE_BEGIN
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cc
index a3714e60..45aa5469 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cc
@@ -24,7 +24,7 @@
#include <tqpointarray.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "bracketelement.h"
#include "elementvisitor.h"
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cc
index 8136965c..32479b0f 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cc
@@ -24,11 +24,11 @@
#include <tqapplication.h>
#include <kstaticdeleter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include "fontstyle.h"
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cc
index 77d93076..9f1125e1 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cc
@@ -21,7 +21,7 @@
#include <tqpainter.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "elementvisitor.h"
#include "formulaelement.h"
diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cc
index 41cd2600..63275e1c 100644
--- a/lib/kformula/identifierelement.cc
+++ b/lib/kformula/identifierelement.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "kformuladefs.h"
#include "textelement.h"
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cc
index a540a7e1..6f2f6d1d 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cc
@@ -21,7 +21,7 @@
#include <tqpainter.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "elementvisitor.h"
#include "indexelement.h"
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cc
index 65bfa6c3..4aa31161 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cc
@@ -18,7 +18,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h> //This is for undo descriptions
+#include <tdelocale.h> //This is for undo descriptions
#include <tqvaluelist.h>
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cc
index da930dba..ce95c40c 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cc
@@ -39,8 +39,8 @@
#include <kdialog.h>
#include <tdefontdialog.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <knuminput.h>
#include <kpushbutton.h>
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cc
index 4d4aa96c..a6123154 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cc
@@ -28,7 +28,7 @@
#include <tqtextstream.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include "KoGlobal.h"
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cc
index 251893d1..5a84a47d 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cc
@@ -22,9 +22,9 @@
#include <tqstringlist.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cc
index fd3e43d2..ff941d6f 100644
--- a/lib/kformula/kformulamathmlread.cc
+++ b/lib/kformula/kformulamathmlread.cc
@@ -22,8 +22,8 @@
#include <tqstring.h>
#include <tqfontmetrics.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
//#include <KoUnit.h>
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cc
index 39aff864..68f941d9 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cc
@@ -24,7 +24,7 @@
#include <tdeapplication.h>
#include <kdebug.h>
-//#include <klocale.h>
+//#include <tdelocale.h>
//#include <kstdaction.h>
#include "basicelement.h"
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cc
index 7371113f..6b878380 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cc
@@ -23,7 +23,7 @@
#include <tqptrlist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "MatrixDialog.h"
#include "elementvisitor.h"
diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cc
index 41ddc179..7705e3ab 100644
--- a/lib/kformula/numberelement.cc
+++ b/lib/kformula/numberelement.cc
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include "numberelement.h"
#include "kformuladefs.h"
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cc
index 27dbbdd6..882eed01 100644
--- a/lib/kformula/operatorelement.cc
+++ b/lib/kformula/operatorelement.cc
@@ -21,7 +21,7 @@
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "elementtype.h"
#include "sequenceelement.h"
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cc
index 82a5870c..5e511cbe 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cc
@@ -22,7 +22,7 @@
#include <tqpen.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "elementvisitor.h"
#include "formulacursor.h"
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cc
index f01636e7..187bcd65 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cc
@@ -27,7 +27,7 @@
#include <kcommand.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
//#include <boost/spirit.hpp>
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cc
index aee6f670..8fe3d8f8 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cc
@@ -22,7 +22,7 @@
#include <tdeapplication.h>
#include <kcombobox.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdetoolbar.h>
#include <kdebug.h>
diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cc
index a9ca0641..aca50b3a 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cc
@@ -28,8 +28,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include "symboltable.h"
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cc
index 6addc385..9970ac45 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cc
@@ -21,7 +21,7 @@
#include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include "entities.h"
#include "elementtype.h"
diff --git a/lib/kofficecore/KoApplication.cpp b/lib/kofficecore/KoApplication.cpp
index efa73850..a2107452 100644
--- a/lib/kofficecore/KoApplication.cpp
+++ b/lib/kofficecore/KoApplication.cpp
@@ -26,11 +26,11 @@
#include <KoQueryTrader.h>
#include <KoDocument.h>
#include <KoMainWindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <kdebug.h>
#include <kdesktopfile.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <stdlib.h>
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cc
index 188a76d1..e8995ad6 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cc
@@ -20,8 +20,8 @@
#include <dcopclient.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include "KoApplication.h"
#include "KoApplicationIface.h"
diff --git a/lib/kofficecore/KoDetailsPane.cpp b/lib/kofficecore/KoDetailsPane.cpp
index 9762f292..5611e873 100644
--- a/lib/kofficecore/KoDetailsPane.cpp
+++ b/lib/kofficecore/KoDetailsPane.cpp
@@ -31,7 +31,7 @@
#include <tqsplitter.h>
#include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kpushbutton.h>
#include <tdeconfig.h>
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 292e16e9..e1422800 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -42,8 +42,8 @@
#include <kiconloader.h>
#include <tdeio/job.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kmimetype.h>
#include <tdeparts/partmanager.h>
#include <kprinter.h>
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 882ccadf..00d6038b 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -31,8 +31,8 @@
#include <tdeparts/partmanager.h>
#include <kmimetype.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqapplication.h>
diff --git a/lib/kofficecore/KoDocumentInfo.cpp b/lib/kofficecore/KoDocumentInfo.cpp
index 7bdc34e3..d50c256d 100644
--- a/lib/kofficecore/KoDocumentInfo.cpp
+++ b/lib/kofficecore/KoDocumentInfo.cpp
@@ -29,8 +29,8 @@
#include <tdeconfig.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqobjectlist.h>
#include <tqdatetime.h>
diff --git a/lib/kofficecore/KoDocumentInfoDlg.cpp b/lib/kofficecore/KoDocumentInfoDlg.cpp
index 61bbe0d4..44a79b14 100644
--- a/lib/kofficecore/KoDocumentInfoDlg.cpp
+++ b/lib/kofficecore/KoDocumentInfoDlg.cpp
@@ -40,14 +40,14 @@
#include <tqvbox.h>
#include <tqdatetime.h>
-#include <kabc/addressee.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressee.h>
+#include <tdeabc/stdaddressbook.h>
#include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <ktar.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <tqlayout.h>
#include <tdelistview.h>
@@ -58,7 +58,7 @@
#include <ktextedit.h>
#include <kiconloader.h>
#include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KoDocumentInfoDlg::KoDocumentInfoDlgPrivate
{
diff --git a/lib/kofficecore/KoFileDialog.cpp b/lib/kofficecore/KoFileDialog.cpp
index 1b1c98a8..84c5bde8 100644
--- a/lib/kofficecore/KoFileDialog.cpp
+++ b/lib/kofficecore/KoFileDialog.cpp
@@ -21,8 +21,8 @@
#include "KoFileDialog.h"
#include "KoDocument.h"
#include <tdefilefiltercombo.h>
-#include <klocale.h>
-#include <kdiroperator.h>
+#include <tdelocale.h>
+#include <tdediroperator.h>
#include <kdebug.h>
KoFileDialog::KoFileDialog(const TQString& startDir, const TQString& filter,
diff --git a/lib/kofficecore/KoFilter.cpp b/lib/kofficecore/KoFilter.cpp
index 1e5beb47..68953b40 100644
--- a/lib/kofficecore/KoFilter.cpp
+++ b/lib/kofficecore/KoFilter.cpp
@@ -23,7 +23,7 @@
#include <kurl.h>
#include <kmimetype.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <KoFilterManager.h>
diff --git a/lib/kofficecore/KoFilterChain.cpp b/lib/kofficecore/KoFilterChain.cpp
index 2000a549..91123fd3 100644
--- a/lib/kofficecore/KoFilterChain.cpp
+++ b/lib/kofficecore/KoFilterChain.cpp
@@ -17,7 +17,7 @@
*/
#include <tqmetaobject.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kmimetype.h>
#include <KoFilterChain.h>
#include <KoQueryTrader.h>
diff --git a/lib/kofficecore/KoFilterManager.cpp b/lib/kofficecore/KoFilterManager.cpp
index 2a894a0e..06c7cf10 100644
--- a/lib/kofficecore/KoFilterManager.cpp
+++ b/lib/kofficecore/KoFilterManager.cpp
@@ -29,8 +29,8 @@
#include <tqptrlist.h>
#include <tqapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <KoDocument.h>
#include <klibloader.h>
#include <tdelistbox.h>
diff --git a/lib/kofficecore/KoGlobal.cpp b/lib/kofficecore/KoGlobal.cpp
index 78c39540..94e7e7d9 100644
--- a/lib/kofficecore/KoGlobal.cpp
+++ b/lib/kofficecore/KoGlobal.cpp
@@ -23,9 +23,9 @@
#include <kdebug.h>
#include <tqfont.h>
#include <tqfontinfo.h>
-#include <kglobalsettings.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/lib/kofficecore/KoMainWindow.cpp b/lib/kofficecore/KoMainWindow.cpp
index 97905af4..18916b57 100644
--- a/lib/kofficecore/KoMainWindow.cpp
+++ b/lib/kofficecore/KoMainWindow.cpp
@@ -37,7 +37,7 @@
#include <tdeversion.h>
#include <kstdaction.h>
#include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <kkeydialog.h>
@@ -45,14 +45,14 @@
#include <kprogress.h>
#include <kpushbutton.h>
#include <kdebug.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tderecentdocument.h>
#include <tdeparts/partmanager.h>
#include <tdeparts/plugin.h>
#include <tdeparts/event.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstatusbar.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ksharedptr.h>
#include <tqobjectlist.h>
diff --git a/lib/kofficecore/KoOasisStore.cpp b/lib/kofficecore/KoOasisStore.cpp
index fa1642e7..62b6b0b1 100644
--- a/lib/kofficecore/KoOasisStore.cpp
+++ b/lib/kofficecore/KoOasisStore.cpp
@@ -25,9 +25,9 @@
#include <KoStoreDevice.h>
#include <KoXmlWriter.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfile.h>
#include <tqxml.h>
diff --git a/lib/kofficecore/KoOasisStyles.cpp b/lib/kofficecore/KoOasisStyles.cpp
index 0f173658..9560a559 100644
--- a/lib/kofficecore/KoOasisStyles.cpp
+++ b/lib/kofficecore/KoOasisStyles.cpp
@@ -24,8 +24,8 @@
#include "KoXmlNS.h"
#include "KoGenStyles.h"
#include <tqbuffer.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqbrush.h>
#include <KoStyleStack.h>
diff --git a/lib/kofficecore/KoOpenPane.cpp b/lib/kofficecore/KoOpenPane.cpp
index 16608406..ed3086ab 100644
--- a/lib/kofficecore/KoOpenPane.cpp
+++ b/lib/kofficecore/KoOpenPane.cpp
@@ -29,7 +29,7 @@
#include <tqpainter.h>
#include <tqpen.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#include <kinstance.h>
#include <kpushbutton.h>
diff --git a/lib/kofficecore/KoPageLayout.cpp b/lib/kofficecore/KoPageLayout.cpp
index 62d81b32..f21167cf 100644
--- a/lib/kofficecore/KoPageLayout.cpp
+++ b/lib/kofficecore/KoPageLayout.cpp
@@ -20,10 +20,10 @@
*/
#include "KoPageLayout.h"
#include <KoUnit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kprinter.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <KoDom.h>
#include <KoXmlNS.h>
#include <tqdom.h>
diff --git a/lib/kofficecore/KoPictureBase.cpp b/lib/kofficecore/KoPictureBase.cpp
index ff30802e..101c946c 100644
--- a/lib/kofficecore/KoPictureBase.cpp
+++ b/lib/kofficecore/KoPictureBase.cpp
@@ -24,7 +24,7 @@
#include <kdebug.h>
#include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kmdcodec.h>
#include <tqpainter.h>
diff --git a/lib/kofficecore/KoPictureEps.cpp b/lib/kofficecore/KoPictureEps.cpp
index b6a05c8a..5f0718e1 100644
--- a/lib/kofficecore/KoPictureEps.cpp
+++ b/lib/kofficecore/KoPictureEps.cpp
@@ -32,13 +32,13 @@
#include <tqapplication.h>
#include <tqdragobject.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeversion.h>
#if ! KDE_IS_VERSION( 3,1,90 )
#include <kdebugclasses.h>
#endif
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kprocess.h>
#include "KoPictureKey.h"
diff --git a/lib/kofficecore/KoSpeaker.cpp b/lib/kofficecore/KoSpeaker.cpp
index 0ed86896..6bd950da 100644
--- a/lib/kofficecore/KoSpeaker.cpp
+++ b/lib/kofficecore/KoSpeaker.cpp
@@ -44,8 +44,8 @@
// KDE includes.
#include <tdeapplication.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <dcopclient.h>
#include <tdeconfig.h>
#include <ktrader.h>
diff --git a/lib/kofficecore/KoTemplates.cpp b/lib/kofficecore/KoTemplates.cpp
index dd8410e3..2d0ba529 100644
--- a/lib/kofficecore/KoTemplates.cpp
+++ b/lib/kofficecore/KoTemplates.cpp
@@ -32,7 +32,7 @@
#include <kstandarddirs.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdlib.h>
diff --git a/lib/kofficecore/KoUnit.cpp b/lib/kofficecore/KoUnit.cpp
index 9068fc94..51d1cb2f 100644
--- a/lib/kofficecore/KoUnit.cpp
+++ b/lib/kofficecore/KoUnit.cpp
@@ -22,8 +22,8 @@
#include "KoUnit.h"
#include <KoXmlWriter.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tqregexp.h>
diff --git a/lib/kofficecore/KoView.cpp b/lib/kofficecore/KoView.cpp
index 2964bcaf..1c8b88a4 100644
--- a/lib/kofficecore/KoView.cpp
+++ b/lib/kofficecore/KoView.cpp
@@ -24,8 +24,8 @@
#include <KoViewIface.h>
#include <KoDocumentChild.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kdebug.h>
#include <tdeparts/partmanager.h>
#include <tdeparts/event.h>
diff --git a/lib/kofficecore/Koversiondialog.cpp b/lib/kofficecore/Koversiondialog.cpp
index 57cd09e2..8759ef66 100644
--- a/lib/kofficecore/Koversiondialog.cpp
+++ b/lib/kofficecore/Koversiondialog.cpp
@@ -28,8 +28,8 @@
#include <kiconloader.h>
#include <kbuttonbox.h>
#include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <tdelistview.h>
#include <kdebug.h>
diff --git a/lib/kofficecore/kkbdaccessextensions.cpp b/lib/kofficecore/kkbdaccessextensions.cpp
index b5baad99..0e216098 100644
--- a/lib/kofficecore/kkbdaccessextensions.cpp
+++ b/lib/kofficecore/kkbdaccessextensions.cpp
@@ -29,8 +29,8 @@
#include <tqtooltip.h>
// KDE includes
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeapplication.h>
#include <tdemainwindow.h>
#include <tdeaction.h>
diff --git a/lib/kofficecore/tests/kopointtest.cpp b/lib/kofficecore/tests/kopointtest.cpp
index bf2ff843..c956466a 100644
--- a/lib/kofficecore/tests/kopointtest.cpp
+++ b/lib/kofficecore/tests/kopointtest.cpp
@@ -1,6 +1,6 @@
#include <KoPoint.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <stdlib.h>
#include <math.h>
diff --git a/lib/kofficecore/tests/korecttest.cpp b/lib/kofficecore/tests/korecttest.cpp
index 8a2455bf..f9008b67 100644
--- a/lib/kofficecore/tests/korecttest.cpp
+++ b/lib/kofficecore/tests/korecttest.cpp
@@ -3,7 +3,7 @@
#include <tdeapplication.h>
#include <stdlib.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
bool check(TQString txt, bool res, bool expected)
{
diff --git a/lib/kofficeui/KoCharSelectDia.cpp b/lib/kofficeui/KoCharSelectDia.cpp
index 4095ae09..5a4a288d 100644
--- a/lib/kofficeui/KoCharSelectDia.cpp
+++ b/lib/kofficeui/KoCharSelectDia.cpp
@@ -22,7 +22,7 @@
#include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcharselect.h>
#include <kdebug.h>
/******************************************************************/
diff --git a/lib/kofficeui/KoCommandHistory.cpp b/lib/kofficeui/KoCommandHistory.cpp
index 0bcf454b..53eaba86 100644
--- a/lib/kofficeui/KoCommandHistory.cpp
+++ b/lib/kofficeui/KoCommandHistory.cpp
@@ -25,7 +25,7 @@
#include <tdeaction.h>
#include <kcommand.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <tdeshortcutlist.h>
#include <tdestdaccel.h>
diff --git a/lib/kofficeui/KoContextCelp.cpp b/lib/kofficeui/KoContextCelp.cpp
index f85e1937..d9d22278 100644
--- a/lib/kofficeui/KoContextCelp.cpp
+++ b/lib/kofficeui/KoContextCelp.cpp
@@ -27,7 +27,7 @@
#include <tqsimplerichtext.h>
#include <kpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <kcursor.h>
diff --git a/lib/kofficeui/KoEditPath.cpp b/lib/kofficeui/KoEditPath.cpp
index 1a2b2668..bb937a7f 100644
--- a/lib/kofficeui/KoEditPath.cpp
+++ b/lib/kofficeui/KoEditPath.cpp
@@ -18,7 +18,7 @@
*/
#include <tdeversion.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqpushbutton.h>
#include <tqlistbox.h>
diff --git a/lib/kofficeui/KoGuideLineDia.cpp b/lib/kofficeui/KoGuideLineDia.cpp
index 00664410..bbc2e9cf 100644
--- a/lib/kofficeui/KoGuideLineDia.cpp
+++ b/lib/kofficeui/KoGuideLineDia.cpp
@@ -28,7 +28,7 @@
#include <tqlayout.h>
#include <tqradiobutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
diff --git a/lib/kofficeui/KoGuides.cpp b/lib/kofficeui/KoGuides.cpp
index 84f31ee3..a4e4ad12 100644
--- a/lib/kofficeui/KoGuides.cpp
+++ b/lib/kofficeui/KoGuides.cpp
@@ -25,7 +25,7 @@
#include <tqpainter.h>
#include <tqpixmap.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdepopupmenu.h>
#include <KoDocument.h>
diff --git a/lib/kofficeui/KoInsertLink.cpp b/lib/kofficeui/KoInsertLink.cpp
index eda24051..bb58686c 100644
--- a/lib/kofficeui/KoInsertLink.cpp
+++ b/lib/kofficeui/KoInsertLink.cpp
@@ -18,7 +18,7 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlayout.h>
#include <tqvbox.h>
diff --git a/lib/kofficeui/KoPageLayoutDia.cpp b/lib/kofficeui/KoPageLayoutDia.cpp
index 3150ab51..69a6326e 100644
--- a/lib/kofficeui/KoPageLayoutDia.cpp
+++ b/lib/kofficeui/KoPageLayoutDia.cpp
@@ -29,9 +29,9 @@
#include <KoUnit.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tqlabel.h>
#include <tqlayout.h>
diff --git a/lib/kofficeui/KoPageLayoutSize.cpp b/lib/kofficeui/KoPageLayoutSize.cpp
index 73629862..c4e19fa8 100644
--- a/lib/kofficeui/KoPageLayoutSize.cpp
+++ b/lib/kofficeui/KoPageLayoutSize.cpp
@@ -22,9 +22,9 @@
#include <KoUnit.h>
#include <KoUnitWidgets.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqlabel.h>
diff --git a/lib/kofficeui/KoPartSelectDia.cpp b/lib/kofficeui/KoPartSelectDia.cpp
index 144b8a08..897aba8d 100644
--- a/lib/kofficeui/KoPartSelectDia.cpp
+++ b/lib/kofficeui/KoPartSelectDia.cpp
@@ -20,7 +20,7 @@
#include <KoPartSelectDia.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqlistview.h>
/****************************************************
diff --git a/lib/kofficeui/KoPictureFilePreview.cpp b/lib/kofficeui/KoPictureFilePreview.cpp
index 7baed8f9..392309f3 100644
--- a/lib/kofficeui/KoPictureFilePreview.cpp
+++ b/lib/kofficeui/KoPictureFilePreview.cpp
@@ -21,7 +21,7 @@
#include "KoPictureFilePreview.h"
#include "KoPictureFilePreview.moc"
#include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <tqbitmap.h>
#include <tqlayout.h>
diff --git a/lib/kofficeui/KoRuler.cpp b/lib/kofficeui/KoRuler.cpp
index 74c617c5..fade3f71 100644
--- a/lib/kofficeui/KoRuler.cpp
+++ b/lib/kofficeui/KoRuler.cpp
@@ -22,8 +22,8 @@
/******************************************************************/
#include "KoRuler.h"
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <kiconloader.h>
#include <tqcursor.h>
diff --git a/lib/kofficeui/KoSelectAction.cpp b/lib/kofficeui/KoSelectAction.cpp
index 5960c2e6..95238764 100644
--- a/lib/kofficeui/KoSelectAction.cpp
+++ b/lib/kofficeui/KoSelectAction.cpp
@@ -30,7 +30,7 @@
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KoSelectAction::KoSelectActionPrivate
{
diff --git a/lib/kofficeui/KoTabChooser.cpp b/lib/kofficeui/KoTabChooser.cpp
index c38d0e62..325b9c00 100644
--- a/lib/kofficeui/KoTabChooser.cpp
+++ b/lib/kofficeui/KoTabChooser.cpp
@@ -26,7 +26,7 @@
#include <tqpopupmenu.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KoTabChooserPrivate {
diff --git a/lib/kofficeui/KoTemplateChooseDia.cpp b/lib/kofficeui/KoTemplateChooseDia.cpp
index 047a701a..044df16a 100644
--- a/lib/kofficeui/KoTemplateChooseDia.cpp
+++ b/lib/kofficeui/KoTemplateChooseDia.cpp
@@ -26,7 +26,7 @@
#include "KoTemplateChooseDia.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#include <tdefiledialog.h>
#include <kinstance.h>
@@ -38,11 +38,11 @@
#include <kdebug.h>
#include <kpushbutton.h>
#include <kjanuswidget.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <ktextedit.h>
#include <tdefileiconview.h>
#include <tdefileitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeapplication.h>
#include <tdeaboutdata.h>
diff --git a/lib/kofficeui/KoTemplateCreateDia.cpp b/lib/kofficeui/KoTemplateCreateDia.cpp
index e3d6f9f7..0033ca2d 100644
--- a/lib/kofficeui/KoTemplateCreateDia.cpp
+++ b/lib/kofficeui/KoTemplateCreateDia.cpp
@@ -32,14 +32,14 @@
#include <tqcheckbox.h>
#include <tqtooltip.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <klineedit.h>
#include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoTemplates.h>
#include <kicondialog.h>
#include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kimageio.h>
#include <kstandarddirs.h>
#include <kdebug.h>
diff --git a/lib/kofficeui/KoToolBox.cpp b/lib/kofficeui/KoToolBox.cpp
index 31c0dabf..222b206d 100644
--- a/lib/kofficeui/KoToolBox.cpp
+++ b/lib/kofficeui/KoToolBox.cpp
@@ -29,7 +29,7 @@
#include <kdebug.h>
#include <tdeparts/event.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdetoolbar.h>
#include <kiconloader.h>
#include <kseparator.h>
diff --git a/lib/kofficeui/KoTooluButton.cpp b/lib/kofficeui/KoTooluButton.cpp
index f44adfb9..1cd5e1c6 100644
--- a/lib/kofficeui/KoTooluButton.cpp
+++ b/lib/kofficeui/KoTooluButton.cpp
@@ -25,11 +25,11 @@
#include <tqstyle.h>
#include <tqpopupmenu.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tdetoolbar.h>
#include <KoTooluButton.h>
#include <kcolordrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcolordialog.h>
#include <kdebug.h>
diff --git a/lib/kofficeui/KoUnitWidgets.cpp b/lib/kofficeui/KoUnitWidgets.cpp
index 0b9f26e7..4c4a5c45 100644
--- a/lib/kofficeui/KoUnitWidgets.cpp
+++ b/lib/kofficeui/KoUnitWidgets.cpp
@@ -21,8 +21,8 @@
#include "KoUnitWidgets.h"
#include "KoUnitWidgets.moc"
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqpushbutton.h>
#include <tqlayout.h>
diff --git a/lib/kofficeui/KoZoomAction.cpp b/lib/kofficeui/KoZoomAction.cpp
index 09f7d3e4..78a4fc20 100644
--- a/lib/kofficeui/KoZoomAction.cpp
+++ b/lib/kofficeui/KoZoomAction.cpp
@@ -23,7 +23,7 @@
#include <tqregexp.h>
#include <tqvaluelist.h>
-#include <klocale.h>
+#include <tdelocale.h>
KoZoomAction::KoZoomAction( const TQString& text, const TQIconSet& pix,
const TDEShortcut& cut, TQObject* parent, const char* name ):
diff --git a/lib/kofficeui/KoZoomMode.cpp b/lib/kofficeui/KoZoomMode.cpp
index ae49a303..8c54d34e 100644
--- a/lib/kofficeui/KoZoomMode.cpp
+++ b/lib/kofficeui/KoZoomMode.cpp
@@ -18,7 +18,7 @@
*/
#include "KoZoomMode.h"
-#include <klocale.h>
+#include <tdelocale.h>
const char* KoZoomMode::modes[] =
{
diff --git a/lib/kofficeui/Kolinestyleaction.cpp b/lib/kofficeui/Kolinestyleaction.cpp
index 41fcf794..08176d1b 100644
--- a/lib/kofficeui/Kolinestyleaction.cpp
+++ b/lib/kofficeui/Kolinestyleaction.cpp
@@ -25,7 +25,7 @@
#include <tdepopupmenu.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
class KoLineStyleAction::KoLineStyleActionPrivate
{
diff --git a/lib/kofficeui/Kolinewidthaction.cpp b/lib/kofficeui/Kolinewidthaction.cpp
index 50566d5a..b9ff452a 100644
--- a/lib/kofficeui/Kolinewidthaction.cpp
+++ b/lib/kofficeui/Kolinewidthaction.cpp
@@ -33,7 +33,7 @@
#include <tdetoolbar.h>
#include <tdetoolbarbutton.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <KoUnitWidgets.h>
#include <KoGlobal.h>
diff --git a/lib/kofficeui/tkcoloractions.cpp b/lib/kofficeui/tkcoloractions.cpp
index 89574bcf..d2476d62 100644
--- a/lib/kofficeui/tkcoloractions.cpp
+++ b/lib/kofficeui/tkcoloractions.cpp
@@ -28,7 +28,7 @@
#include <tqpainter.h>
#include <tqtooltip.h>
#include <tqwhatsthis.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqapplication.h>
diff --git a/lib/kofficeui/ttdetoolbarbutton.cpp b/lib/kofficeui/ttdetoolbarbutton.cpp
index 9befb976..6fed1f48 100644
--- a/lib/kofficeui/ttdetoolbarbutton.cpp
+++ b/lib/kofficeui/ttdetoolbarbutton.cpp
@@ -31,7 +31,7 @@
#include <tdeapplication.h>
#include <kiconeffect.h>
#include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
// Delay in ms before delayed popup pops up
#define POPUP_DELAY 500
diff --git a/lib/kofficeui/ttdetoolbarbutton.h b/lib/kofficeui/ttdetoolbarbutton.h
index 9f5d9540..706a8c03 100644
--- a/lib/kofficeui/ttdetoolbarbutton.h
+++ b/lib/kofficeui/ttdetoolbarbutton.h
@@ -24,7 +24,7 @@
#include <tqpixmap.h>
#include <tqtoolbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
class TDEToolBar;
class TDEInstance;
diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cc
index e2406a79..02439a8c 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cc
@@ -25,7 +25,7 @@
#include <tqspinbox.h>
#include <tqtabwidget.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kcolordialog.h>
#include <ktabctl.h>
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cc
index 9fd7f877..e8647ffb 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cc
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <koIconChooser.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqpainter.h>
#include <tqcursor.h>
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cc
index e1230d80..af2136f9 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cc
@@ -30,8 +30,8 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <koFrameButton.h>
#include <koColorSlider.h>
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cc
index 942215d5..8d77bedc 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cc
@@ -32,7 +32,7 @@
#include <kdualcolorbutton.h>
#include <koColor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
KoHSVWidget::KoHSVWidget(TQWidget *parent, const char *name) : super(parent, name)
{
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cc
index 7e8b69f9..7680d50a 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cc
@@ -29,7 +29,7 @@
#include <tqcolor.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <koFrameButton.h>
#include <koColorSlider.h>
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cc
index 2202a86f..cd392205 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cc
@@ -29,9 +29,9 @@
#include <tqlayout.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
#include <tdeaccelmanager.h>
#include <tdeconfig.h>
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cc
index 2bb6a039..26f30992 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cc
@@ -29,8 +29,8 @@
#include <tdeaction.h>
#include <tdeactionclasses.h>
#include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <KoView.h>
#include <KoMainWindow.h>
diff --git a/lib/koproperty/customproperty.cpp b/lib/koproperty/customproperty.cpp
index c5a33ef6..b51cc317 100644
--- a/lib/koproperty/customproperty.cpp
+++ b/lib/koproperty/customproperty.cpp
@@ -25,7 +25,7 @@
#include <tqsizepolicy.h>
#include <tqpoint.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
using namespace KoProperty;
diff --git a/lib/koproperty/editor.cpp b/lib/koproperty/editor.cpp
index 22f81fe7..6ba0e295 100644
--- a/lib/koproperty/editor.cpp
+++ b/lib/koproperty/editor.cpp
@@ -40,7 +40,7 @@
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeversion.h>
#include <tdeapplication.h>
diff --git a/lib/koproperty/editors/booledit.cpp b/lib/koproperty/editors/booledit.cpp
index 839d6d52..e34ee5d5 100644
--- a/lib/koproperty/editors/booledit.cpp
+++ b/lib/koproperty/editors/booledit.cpp
@@ -23,7 +23,7 @@
#include "../property.h"
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcombobox.h>
#include <kdebug.h>
diff --git a/lib/koproperty/editors/cursoredit.cpp b/lib/koproperty/editors/cursoredit.cpp
index 5ff0bb34..042256a0 100644
--- a/lib/koproperty/editors/cursoredit.cpp
+++ b/lib/koproperty/editors/cursoredit.cpp
@@ -24,7 +24,7 @@
#include <tqvariant.h>
#include <tqcursor.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "property.h"
diff --git a/lib/koproperty/editors/dateedit.cpp b/lib/koproperty/editors/dateedit.cpp
index d26dbb30..4b61d80f 100644
--- a/lib/koproperty/editors/dateedit.cpp
+++ b/lib/koproperty/editors/dateedit.cpp
@@ -27,8 +27,8 @@
#include <tqvariant.h>
#include <tqpainter.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
using namespace KoProperty;
diff --git a/lib/koproperty/editors/datetimeedit.cpp b/lib/koproperty/editors/datetimeedit.cpp
index 1ed2c9c6..74636c89 100644
--- a/lib/koproperty/editors/datetimeedit.cpp
+++ b/lib/koproperty/editors/datetimeedit.cpp
@@ -27,8 +27,8 @@
#include <tqpainter.h>
#include <tqvariant.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
using namespace KoProperty;
diff --git a/lib/koproperty/editors/fontedit.cpp b/lib/koproperty/editors/fontedit.cpp
index 2de0468b..80a3d528 100644
--- a/lib/koproperty/editors/fontedit.cpp
+++ b/lib/koproperty/editors/fontedit.cpp
@@ -34,7 +34,7 @@
#include <tdeversion.h>
#include <tdefontrequester.h>
#include <tdeaccelmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
//! @internal
//! reimplemented to better button and label's positioning
diff --git a/lib/koproperty/editors/pixmapedit.cpp b/lib/koproperty/editors/pixmapedit.cpp
index a01248f2..cf7645bf 100644
--- a/lib/koproperty/editors/pixmapedit.cpp
+++ b/lib/koproperty/editors/pixmapedit.cpp
@@ -45,7 +45,7 @@
#ifndef PURE_QT
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdefiledialog.h>
#endif
diff --git a/lib/koproperty/editors/pointedit.cpp b/lib/koproperty/editors/pointedit.cpp
index 7badc4de..c355c28b 100644
--- a/lib/koproperty/editors/pointedit.cpp
+++ b/lib/koproperty/editors/pointedit.cpp
@@ -27,7 +27,7 @@
#include <tqtooltip.h>
#include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
//"[ %1, %2 ]"
#define POINTEDIT_MASK "%1,%2"
diff --git a/lib/koproperty/editors/rectedit.cpp b/lib/koproperty/editors/rectedit.cpp
index 2422eec8..f9a77314 100644
--- a/lib/koproperty/editors/rectedit.cpp
+++ b/lib/koproperty/editors/rectedit.cpp
@@ -26,7 +26,7 @@
#include <tqtooltip.h>
#include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
// "[ %1, %2, %3, %4 ]"
#define RECTEDIT_MASK "%1,%2 %3x%4"
diff --git a/lib/koproperty/editors/sizeedit.cpp b/lib/koproperty/editors/sizeedit.cpp
index 3e0213d9..e5a37f6d 100644
--- a/lib/koproperty/editors/sizeedit.cpp
+++ b/lib/koproperty/editors/sizeedit.cpp
@@ -27,7 +27,7 @@
#include <tqtooltip.h>
#include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
//"[ %1, %2 ]"
#define SIZEEDIT_MASK "%1x%2"
diff --git a/lib/koproperty/editors/sizepolicyedit.cpp b/lib/koproperty/editors/sizepolicyedit.cpp
index ba65a92f..c027d1dd 100644
--- a/lib/koproperty/editors/sizepolicyedit.cpp
+++ b/lib/koproperty/editors/sizepolicyedit.cpp
@@ -28,7 +28,7 @@
#include <tqmap.h>
#include <tqtooltip.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace KoProperty;
diff --git a/lib/koproperty/editors/spinbox.cpp b/lib/koproperty/editors/spinbox.cpp
index 97a3177d..4743f570 100644
--- a/lib/koproperty/editors/spinbox.cpp
+++ b/lib/koproperty/editors/spinbox.cpp
@@ -28,8 +28,8 @@
#include <tqpainter.h>
#include <tqlineedit.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
using namespace KoProperty;
diff --git a/lib/koproperty/editors/stringlistedit.cpp b/lib/koproperty/editors/stringlistedit.cpp
index 54f986c5..dee5b335 100644
--- a/lib/koproperty/editors/stringlistedit.cpp
+++ b/lib/koproperty/editors/stringlistedit.cpp
@@ -30,7 +30,7 @@
#include <keditlistbox.h>
#include <kdialogbase.h>
#include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include "property.h"
diff --git a/lib/koproperty/editors/symbolcombo.cpp b/lib/koproperty/editors/symbolcombo.cpp
index faaefdb9..98882e58 100644
--- a/lib/koproperty/editors/symbolcombo.cpp
+++ b/lib/koproperty/editors/symbolcombo.cpp
@@ -25,7 +25,7 @@
#include <tqvariant.h>
#include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdialogbase.h>
#include "symbolcombo.h"
diff --git a/lib/koproperty/editors/timeedit.cpp b/lib/koproperty/editors/timeedit.cpp
index 767ba83d..94692a47 100644
--- a/lib/koproperty/editors/timeedit.cpp
+++ b/lib/koproperty/editors/timeedit.cpp
@@ -28,8 +28,8 @@
#include <tqvariant.h>
#include <tqdatetime.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
using namespace KoProperty;
diff --git a/lib/koproperty/set.cpp b/lib/koproperty/set.cpp
index 5845365f..16fdacc8 100644
--- a/lib/koproperty/set.cpp
+++ b/lib/koproperty/set.cpp
@@ -28,7 +28,7 @@
//#include <tqvaluelist.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
typedef TQMap<TQCString, TQValueList<TQCString> > StringListMap;
typedef TQMapIterator<TQCString, TQStringList> StringListMapIterator;
diff --git a/lib/koproperty/test/main.cpp b/lib/koproperty/test/main.cpp
index 4c21bff2..e6303948 100644
--- a/lib/koproperty/test/main.cpp
+++ b/lib/koproperty/test/main.cpp
@@ -21,7 +21,7 @@
#include <tdeapplication.h>
#include <tdeaboutdata.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
+#include <tdelocale.h>
static const char description[] = "A test application for the KoProperty library";
diff --git a/lib/koproperty/test/test.cpp b/lib/koproperty/test/test.cpp
index 236936e2..59fee246 100644
--- a/lib/koproperty/test/test.cpp
+++ b/lib/koproperty/test/test.cpp
@@ -18,7 +18,7 @@
*/
#include <tdemainwindow.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdecmdlineargs.h>
#include <kiconloader.h>
diff --git a/lib/kotext/DateFormatWidget.cpp b/lib/kotext/DateFormatWidget.cpp
index 49749f91..f72bbbd3 100644
--- a/lib/kotext/DateFormatWidget.cpp
+++ b/lib/kotext/DateFormatWidget.cpp
@@ -7,8 +7,8 @@
#include <tqlabel.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqlineedit.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/lib/kotext/KoAutoFormat.cpp b/lib/kotext/KoAutoFormat.cpp
index b6268a76..b3d0c7aa 100644
--- a/lib/kotext/KoAutoFormat.cpp
+++ b/lib/kotext/KoAutoFormat.cpp
@@ -30,11 +30,11 @@
#include <tdeversion.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kinstance.h>
#include <tdeconfig.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kcommand.h>
//#include <KoTextFormat.h>
#include <kcompletion.h>
@@ -169,7 +169,7 @@ KoAutoFormat::KoAutoFormat( KoDocument *_doc, KoVariableCollection *_varCollecti
TDELocale klocale(m_doc->instance()->instanceName());
for (int i = 1; i <=7; i++)
{
- m_cacheNameOfDays.append(klocale.calendar()->weekDayName( i ).lower());
+ m_cacheNameOfDays.append(tdelocale.calendar()->weekDayName( i ).lower());
}
}
@@ -392,7 +392,7 @@ void KoAutoFormat::readAutoCorrectConfig()
{
Q_ASSERT( m_entries.isEmpty() ); // readConfig is only called once...
TDELocale klocale(m_doc->instance()->instanceName());
- TQString kdelang = klocale.languageList().front();
+ TQString kdelang = tdelocale.languageList().front();
kdelang.remove( TQRegExp( "@.*" ) );
kdDebug(32500) << "KoAutoFormat: m_autoFormatLanguage=" << m_autoFormatLanguage << " kdelang=" << kdelang << endl;
TQString fname;
@@ -620,7 +620,7 @@ void KoAutoFormat::saveConfig()
TDEConfigGroupSaver cgs( config, "AutoFormat" );
config->writeEntry( "ConvertUpperCase", m_convertUpperCase );
- config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? klocale.languageList().front() : m_autoFormatLanguage);
+ config->writeEntry( "formatLanguage", m_autoFormatLanguage=="all_languages" ? tdelocale.languageList().front() : m_autoFormatLanguage);
config->writeEntry( "ConvertUpperUpper", m_convertUpperUpper );
config->writeEntry( "includeTwoLetterException", m_includeTwoUpperLetterException );
@@ -733,7 +733,7 @@ void KoAutoFormat::saveConfig()
begin.appendChild(simpleQuote);
TQFile f;
if ( m_autoFormatLanguage.isEmpty())
- f.setName(locateLocal("data", "koffice/autocorrect/"+klocale.languageList().front() + ".xml",m_doc->instance()));
+ f.setName(locateLocal("data", "koffice/autocorrect/"+tdelocale.languageList().front() + ".xml",m_doc->instance()));
else
f.setName(locateLocal("data", "koffice/autocorrect/"+m_autoFormatLanguage + ".xml",m_doc->instance()));
if(!f.open(IO_WriteOnly)) {
diff --git a/lib/kotext/KoAutoFormatDia.cpp b/lib/kotext/KoAutoFormatDia.cpp
index 60b74bb0..c4823687 100644
--- a/lib/kotext/KoAutoFormatDia.cpp
+++ b/lib/kotext/KoAutoFormatDia.cpp
@@ -23,8 +23,8 @@
#include "KoCharSelectDia.h"
#include <KoSearchDia.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdelistview.h>
#include <kstandarddirs.h>
diff --git a/lib/kotext/KoBgSpellCheck.cpp b/lib/kotext/KoBgSpellCheck.cpp
index 3df928a1..6546c51c 100644
--- a/lib/kotext/KoBgSpellCheck.cpp
+++ b/lib/kotext/KoBgSpellCheck.cpp
@@ -38,7 +38,7 @@
#include <tdespell2/filter.h>
using namespace KSpell2;
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeversion.h>
#include <tqtimer.h>
diff --git a/lib/kotext/KoChangeCaseDia.cpp b/lib/kotext/KoChangeCaseDia.cpp
index cde58f0a..a7cff7c2 100644
--- a/lib/kotext/KoChangeCaseDia.cpp
+++ b/lib/kotext/KoChangeCaseDia.cpp
@@ -17,7 +17,7 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqwhatsthis.h>
diff --git a/lib/kotext/KoCommentDia.cpp b/lib/kotext/KoCommentDia.cpp
index e313d5b2..727c6e5b 100644
--- a/lib/kotext/KoCommentDia.cpp
+++ b/lib/kotext/KoCommentDia.cpp
@@ -17,13 +17,13 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqmultilineedit.h>
#include "KoCommentDia.h"
#include <tqlayout.h>
#include <tqpushbutton.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <tqdatetime.h>
#include <tqlabel.h>
#include <kdebug.h>
diff --git a/lib/kotext/KoCompletionDia.cpp b/lib/kotext/KoCompletionDia.cpp
index 031a8122..c500cca4 100644
--- a/lib/kotext/KoCompletionDia.cpp
+++ b/lib/kotext/KoCompletionDia.cpp
@@ -19,8 +19,8 @@
#include "KoCompletionDia.h"
#include "KoAutoFormat.h"
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kinputdialog.h>
#include <kcompletion.h>
#include <tdeconfig.h>
diff --git a/lib/kotext/KoCreateStyleDia.cpp b/lib/kotext/KoCreateStyleDia.cpp
index fb7d9b9d..93c3dafd 100644
--- a/lib/kotext/KoCreateStyleDia.cpp
+++ b/lib/kotext/KoCreateStyleDia.cpp
@@ -17,13 +17,13 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlabel.h>
#include <tqlineedit.h>
#include "KoCreateStyleDia.h"
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
KoCreateStyleDia::KoCreateStyleDia( const TQStringList & _list, TQWidget *parent, const char *name )
: KDialogBase( parent, name , true, "", Ok|Cancel, Ok, true )
diff --git a/lib/kotext/KoCustomVariablesDia.cpp b/lib/kotext/KoCustomVariablesDia.cpp
index dd32a80e..a331596a 100644
--- a/lib/kotext/KoCustomVariablesDia.cpp
+++ b/lib/kotext/KoCustomVariablesDia.cpp
@@ -20,7 +20,7 @@
#include "KoCustomVariablesDia.h"
#include "KoCustomVariablesDia.moc"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kbuttonbox.h>
#include <tqcombobox.h>
diff --git a/lib/kotext/KoDecorationTab.cpp b/lib/kotext/KoDecorationTab.cpp
index 73e0789e..93b24a53 100644
--- a/lib/kotext/KoDecorationTab.cpp
+++ b/lib/kotext/KoDecorationTab.cpp
@@ -23,7 +23,7 @@
#include <kcolorbutton.h>
#include <kpushbutton.h>
#include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqbuttongroup.h>
diff --git a/lib/kotext/KoFontDia.cpp b/lib/kotext/KoFontDia.cpp
index 1d82214c..fbde5028 100644
--- a/lib/kotext/KoFontDia.cpp
+++ b/lib/kotext/KoFontDia.cpp
@@ -25,7 +25,7 @@
#include "KoRichText.h"
#include <kcolordialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqgroupbox.h>
diff --git a/lib/kotext/KoFontDiaPreview.cpp b/lib/kotext/KoFontDiaPreview.cpp
index f61306b0..adf7594d 100644
--- a/lib/kotext/KoFontDiaPreview.cpp
+++ b/lib/kotext/KoFontDiaPreview.cpp
@@ -21,7 +21,7 @@
#include "KoGlobal.h"
#include "KoTextFormat.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqfontmetrics.h>
#include <tqrect.h>
diff --git a/lib/kotext/KoImportStyleDia.cpp b/lib/kotext/KoImportStyleDia.cpp
index 6d9d57d6..1e048939 100644
--- a/lib/kotext/KoImportStyleDia.cpp
+++ b/lib/kotext/KoImportStyleDia.cpp
@@ -17,7 +17,7 @@
Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqvbox.h>
#include <tqlayout.h>
#include <tqlineedit.h>
diff --git a/lib/kotext/KoParagDia.cpp b/lib/kotext/KoParagDia.cpp
index 200b1f32..b62a148f 100644
--- a/lib/kotext/KoParagDia.cpp
+++ b/lib/kotext/KoParagDia.cpp
@@ -33,7 +33,7 @@
#include <kcolorbutton.h>
#include <kdebug.h>
#include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knumvalidator.h>
#include <KoGlobal.h>
#include <tqgroupbox.h>
diff --git a/lib/kotext/KoParagLayout.cpp b/lib/kotext/KoParagLayout.cpp
index 7fd214be..1978d88c 100644
--- a/lib/kotext/KoParagLayout.cpp
+++ b/lib/kotext/KoParagLayout.cpp
@@ -27,8 +27,8 @@
#include <KoDom.h>
#include <KoGenStyles.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqdom.h>
#include <tqbuffer.h>
diff --git a/lib/kotext/KoParagStyle.cpp b/lib/kotext/KoParagStyle.cpp
index fcae882c..2af7cecb 100644
--- a/lib/kotext/KoParagStyle.cpp
+++ b/lib/kotext/KoParagStyle.cpp
@@ -25,7 +25,7 @@
#include <KoXmlNS.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index d9d6c1df..9121c59f 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -45,8 +45,8 @@
#include "KoTextDocument.h"
#include <kdebug.h>
#include <tdeversion.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <tqtextengine_p.h>
//#define DEBUG_COLLECTION
diff --git a/lib/kotext/KoSearchDia.cpp b/lib/kotext/KoSearchDia.cpp
index 52aba237..55a4c56b 100644
--- a/lib/kotext/KoSearchDia.cpp
+++ b/lib/kotext/KoSearchDia.cpp
@@ -30,7 +30,7 @@
#include <kcommand.h>
#include <kdebug.h>
#include <tdefontcombo.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kseparator.h>
#include <tqbuttongroup.h>
diff --git a/lib/kotext/KoSpell.cpp b/lib/kotext/KoSpell.cpp
index 2a9e5476..8e96a44f 100644
--- a/lib/kotext/KoSpell.cpp
+++ b/lib/kotext/KoSpell.cpp
@@ -29,8 +29,8 @@
#include <tdespell2/broker.h>
#include <tdespell2/filter.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqtimer.h>
diff --git a/lib/kotext/KoStyleCollection.cpp b/lib/kotext/KoStyleCollection.cpp
index fa0818d8..a29dbd84 100644
--- a/lib/kotext/KoStyleCollection.cpp
+++ b/lib/kotext/KoStyleCollection.cpp
@@ -27,7 +27,7 @@
#include <KoXmlNS.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqdom.h>
diff --git a/lib/kotext/KoStyleManager.cpp b/lib/kotext/KoStyleManager.cpp
index 0738f0e3..0a77bb42 100644
--- a/lib/kotext/KoStyleManager.cpp
+++ b/lib/kotext/KoStyleManager.cpp
@@ -24,7 +24,7 @@
#include <KoFontDia.h>
#include <KoGlobal.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kdebug.h>
diff --git a/lib/kotext/KoTextCommand.cpp b/lib/kotext/KoTextCommand.cpp
index 875c1e71..c624514c 100644
--- a/lib/kotext/KoTextCommand.cpp
+++ b/lib/kotext/KoTextCommand.cpp
@@ -22,7 +22,7 @@
#include "KoTextParag.h"
#include "KoVariable.h"
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
// This is automatically called by KCommandHistory's redo action when redo is activated
void KoTextCommand::execute()
diff --git a/lib/kotext/KoTextFormat.cpp b/lib/kotext/KoTextFormat.cpp
index 0f3d48d2..4648898d 100644
--- a/lib/kotext/KoTextFormat.cpp
+++ b/lib/kotext/KoTextFormat.cpp
@@ -25,9 +25,9 @@
#include <KoGenStyles.h>
#include <KoXmlNS.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqapplication.h>
#include <tqregexp.h>
diff --git a/lib/kotext/KoTextObject.cpp b/lib/kotext/KoTextObject.cpp
index 0b8d9ab5..cae6e9e4 100644
--- a/lib/kotext/KoTextObject.cpp
+++ b/lib/kotext/KoTextObject.cpp
@@ -31,7 +31,7 @@
#include <KoXmlNS.h>
#include <KoDom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tdeapplication.h>
diff --git a/lib/kotext/KoTextParag.cpp b/lib/kotext/KoTextParag.cpp
index c9f0a831..c4042779 100644
--- a/lib/kotext/KoTextParag.cpp
+++ b/lib/kotext/KoTextParag.cpp
@@ -29,10 +29,10 @@
#include <KoGenStyles.h>
#include <KoDom.h>
#include <KoXmlNS.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <assert.h>
//#define DEBUG_PAINT
diff --git a/lib/kotext/KoTextView.cpp b/lib/kotext/KoTextView.cpp
index a261d59f..f6cdf4c4 100644
--- a/lib/kotext/KoTextView.cpp
+++ b/lib/kotext/KoTextView.cpp
@@ -26,14 +26,14 @@
#include "KoBgSpellCheck.h"
#include "KoVariable.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <tdestdaccel.h>
#include <kdebug.h>
#include <kinstance.h>
#include <kdatatool.h>
#include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kcommand.h>
#include <kbookmarkmanager.h>
#include <kbookmark.h>
diff --git a/lib/kotext/KoUserStyle.cpp b/lib/kotext/KoUserStyle.cpp
index 33de3421..4584735f 100644
--- a/lib/kotext/KoUserStyle.cpp
+++ b/lib/kotext/KoUserStyle.cpp
@@ -17,7 +17,7 @@
*/
#include "KoUserStyle.h"
-#include <klocale.h>
+#include <tdelocale.h>
KoUserStyle::KoUserStyle( const TQString & name )
: m_name( name ), m_displayName( i18n( "Style name", name.utf8() ) )
diff --git a/lib/kotext/KoVariable.cpp b/lib/kotext/KoVariable.cpp
index 089b09d1..fb1b6c1c 100644
--- a/lib/kotext/KoVariable.cpp
+++ b/lib/kotext/KoVariable.cpp
@@ -36,9 +36,9 @@
#include <KoXmlNS.h>
#include <KoDom.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kdialogbase.h>
#include <tdeconfig.h>
#include <tdeversion.h>
diff --git a/lib/kotext/TDEFontDialog_local.cpp b/lib/kotext/TDEFontDialog_local.cpp
index fdf7c568..a5db6523 100644
--- a/lib/kotext/TDEFontDialog_local.cpp
+++ b/lib/kotext/TDEFontDialog_local.cpp
@@ -45,11 +45,11 @@
#include <kcharsets.h>
#include <tdeconfig.h>
#include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
#include <tqlineedit.h>
#include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
#include <kdebug.h>
#include <knuminput.h>
diff --git a/lib/kotext/TimeFormatWidget.cpp b/lib/kotext/TimeFormatWidget.cpp
index 06603969..5bbd3d1f 100644
--- a/lib/kotext/TimeFormatWidget.cpp
+++ b/lib/kotext/TimeFormatWidget.cpp
@@ -7,8 +7,8 @@
#include <tqlabel.h>
#include <tqbuttongroup.h>
#include <tqradiobutton.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <tqlineedit.h>
#include <knuminput.h>
diff --git a/lib/kotext/kohyphen/kohyphen.cpp b/lib/kotext/kohyphen/kohyphen.cpp
index bbb3ebb9..ddc09dc2 100644
--- a/lib/kotext/kohyphen/kohyphen.cpp
+++ b/lib/kotext/kohyphen/kohyphen.cpp
@@ -24,7 +24,7 @@
#include <tqtextcodec.h>
#include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdeapplication.h>
#include <kstandarddirs.h>
#include <kstaticdeleter.h>
diff --git a/lib/kotext/kolayouttabbase.ui b/lib/kotext/kolayouttabbase.ui
index 646bc795..cddc4798 100644
--- a/lib/kotext/kolayouttabbase.ui
+++ b/lib/kotext/kolayouttabbase.ui
@@ -286,7 +286,7 @@
</connections>
<includes>
<include location="global" impldecl="in declaration">knuminput.h</include>
- <include location="global" impldecl="in declaration">klocale.h</include>
+ <include location="global" impldecl="in declaration">tdelocale.h</include>
</includes>
<layoutdefaults spacing="6" margin="11"/>
<includehints>
diff --git a/lib/kotext/tests/KoUserStyleTester.cpp b/lib/kotext/tests/KoUserStyleTester.cpp
index 72e5081c..6a0360aa 100644
--- a/lib/kotext/tests/KoUserStyleTester.cpp
+++ b/lib/kotext/tests/KoUserStyleTester.cpp
@@ -24,7 +24,7 @@
#include <KoUserStyleCollection.h>
#include <KoUserStyle.h>
#include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include "KoUserStyleTester.h"
#include "KoUserStyleTester.moc"
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index a0286646..74014c2d 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -2,8 +2,8 @@
#include <tdeapplication.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "KoTextFormatter.h"
#include "KoTextFormat.h"
diff --git a/lib/kross/api/variant.cpp b/lib/kross/api/variant.cpp
index 54e8ed7e..a8823a41 100644
--- a/lib/kross/api/variant.cpp
+++ b/lib/kross/api/variant.cpp
@@ -20,7 +20,7 @@
#include "variant.h"
#include "list.h"
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Kross::Api;
diff --git a/lib/kross/main/manager.cpp b/lib/kross/main/manager.cpp
index 21ee1eca..4ee5490d 100644
--- a/lib/kross/main/manager.cpp
+++ b/lib/kross/main/manager.cpp
@@ -33,7 +33,7 @@
#include <tqregexp.h>
#include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstaticdeleter.h>
extern "C"
diff --git a/lib/kross/main/scriptcontainer.cpp b/lib/kross/main/scriptcontainer.cpp
index 7f7f980e..809d3b83 100644
--- a/lib/kross/main/scriptcontainer.cpp
+++ b/lib/kross/main/scriptcontainer.cpp
@@ -27,7 +27,7 @@
#include <tqfile.h>
-#include <klocale.h>
+#include <tdelocale.h>
using namespace Kross::Api;
diff --git a/lib/kross/main/scriptguiclient.cpp b/lib/kross/main/scriptguiclient.cpp
index 7b8fe2af..e96c4a90 100644
--- a/lib/kross/main/scriptguiclient.cpp
+++ b/lib/kross/main/scriptguiclient.cpp
@@ -26,9 +26,9 @@
#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <kmimetype.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kurl.h>
#include <ktar.h>
#include <kstandarddirs.h>
diff --git a/lib/kross/main/wdgscriptsmanager.cpp b/lib/kross/main/wdgscriptsmanager.cpp
index ea870f95..8347c767 100644
--- a/lib/kross/main/wdgscriptsmanager.cpp
+++ b/lib/kross/main/wdgscriptsmanager.cpp
@@ -29,8 +29,8 @@
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kpushbutton.h>
#include <kstandarddirs.h>
#include <tdetoolbar.h>
diff --git a/lib/kross/python/pythoninterpreter.cpp b/lib/kross/python/pythoninterpreter.cpp
index 3b956fe0..4128a301 100644
--- a/lib/kross/python/pythoninterpreter.cpp
+++ b/lib/kross/python/pythoninterpreter.cpp
@@ -24,7 +24,7 @@
//#include "pythonextension.h"
#include "../api/variant.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#if defined(TQ_WS_WIN)
diff --git a/lib/kross/test/testwindow.cpp b/lib/kross/test/testwindow.cpp
index 4175bc9e..4d9c90e3 100644
--- a/lib/kross/test/testwindow.cpp
+++ b/lib/kross/test/testwindow.cpp
@@ -31,7 +31,7 @@
#include <ktextedit.h>
#include <kpushbutton.h>
#include <tdepopupmenu.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstandarddirs.h>
TestWindow::TestWindow(const TQString& interpretername, const TQString& scriptcode)
diff --git a/lib/store/KoStore.cpp b/lib/store/KoStore.cpp
index 64b01a44..c45f3946 100644
--- a/lib/store/KoStore.cpp
+++ b/lib/store/KoStore.cpp
@@ -35,8 +35,8 @@
#include <kurl.h>
#include <kdebug.h>
#include <tdeversion.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <tdeio/netaccess.h>
//#define DefaultFormat KoStore::Tar
diff --git a/lib/store/KoXmlWriter.cpp b/lib/store/KoXmlWriter.cpp
index 6c3459f4..05b242e1 100644
--- a/lib/store/KoXmlWriter.cpp
+++ b/lib/store/KoXmlWriter.cpp
@@ -19,7 +19,7 @@
#include "KoXmlWriter.h"
-#include <kglobal.h> // kMin
+#include <tdeglobal.h> // kMin
#include <kdebug.h>
#include <tqiodevice.h>
#include <float.h>
diff --git a/plugins/scan/scan.cpp b/plugins/scan/scan.cpp
index b8fd6c60..3401f3e4 100644
--- a/plugins/scan/scan.cpp
+++ b/plugins/scan/scan.cpp
@@ -17,12 +17,12 @@
* Boston, MA 02110-1301, USA.
*/
-#include <klocale.h>
+#include <tdelocale.h>
#include <kiconloader.h>
#include <kinstance.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <kdebug.h>
#include <kscan.h>
#include <KoView.h>
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 82779c44..9bad2fb5 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -23,8 +23,8 @@
#include <tdeaboutdata.h>
#include <kimageio.h>
#include <tdecmdlineargs.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <kmimetype.h>
#include <tdeapplication.h>
#include <kdebug.h>
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cc
index b802985d..f94373f8 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cc
@@ -23,8 +23,8 @@
#include <tdecmdlineargs.h>
#include <kdatatool.h>
#include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <koffice_export.h>
static TDECmdLineOptions options[] =
{
diff --git a/tools/spell/main.cc b/tools/spell/main.cc
index 5686b06a..f8baf9eb 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cc
@@ -19,8 +19,8 @@
*/
#include "main.h"
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <kinstance.h>
#include <tdeconfig.h>
diff --git a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp
index 59a645f7..eb76cdb4 100644
--- a/tools/tdefile-plugins/abiword/tdefile_abiword.cpp
+++ b/tools/tdefile-plugins/abiword/tdefile_abiword.cpp
@@ -20,7 +20,7 @@
#include <config.h>
#include "tdefile_abiword.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kfilterdev.h>
diff --git a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp
index 29686663..4406a87b 100644
--- a/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp
+++ b/tools/tdefile-plugins/gnumeric/tdefile_gnumeric.cpp
@@ -20,7 +20,7 @@
#include <config.h>
#include "tdefile_gnumeric.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <kfilterdev.h>
diff --git a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp
index e4c89778..fb2028cf 100644
--- a/tools/tdefile-plugins/koffice/tdefile_koffice.cpp
+++ b/tools/tdefile-plugins/koffice/tdefile_koffice.cpp
@@ -20,7 +20,7 @@
#include <config.h>
#include "tdefile_koffice.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
diff --git a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp
index 358bc876..f73aa6d6 100644
--- a/tools/tdefile-plugins/ooo/tdefile_ooo.cpp
+++ b/tools/tdefile-plugins/ooo/tdefile_ooo.cpp
@@ -39,12 +39,12 @@
#include <config.h>
#include "tdefile_ooo.h"
-#include <klocale.h>
+#include <tdelocale.h>
#include <kgenericfactory.h>
#include <KoStore.h>
#include <KoStoreDevice.h>
#include <kzip.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
#include <tqptrstack.h>
#include <tqdom.h>
diff --git a/tools/thesaurus/main.h b/tools/thesaurus/main.h
index 00fb732e..aa2e1919 100644
--- a/tools/thesaurus/main.h
+++ b/tools/thesaurus/main.h
@@ -50,8 +50,8 @@
#include <kgenericfactory.h>
#include <klibloader.h>
#include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kprocess.h>
#include <kpushbutton.h>
#include <krun.h>