Renaming of files in preparation for code style tools.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

198 files changed, 169 insertions, 169 deletions

diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am
index d4de75452..53f86c330 100644
--- a/chalk/plugins/filters/blur/Makefile.am
+++ b/chalk/plugins/filters/blur/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.cc
+chalkblurfilter_la_SOURCES = wdgblur.ui blur.cpp kis_blur_filter.cpp kis_wdg_blur.cpp
 
 kde_module_LTLIBRARIES = chalkblurfilter.la
 noinst_HEADERS = blur.h kis_blur_filter.h
diff --git a/chalk/plugins/filters/blur/blur.cc b/chalk/plugins/filters/blur/blur.cpp
index 69bac7b1d..69bac7b1d 100644
--- a/chalk/plugins/filters/blur/blur.cc
+++ b/chalk/plugins/filters/blur/blur.cpp
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cpp
index 8d3604974..8d3604974 100644
--- a/chalk/plugins/filters/blur/kis_blur_filter.cc
+++ b/chalk/plugins/filters/blur/kis_blur_filter.cpp
diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
index d4213bb58..d4213bb58 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cc
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am
index 2b208b33e..9f003aa3e 100644
--- a/chalk/plugins/filters/bumpmap/Makefile.am
+++ b/chalk/plugins/filters/bumpmap/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../../lib/kofficecore \
 	$(all_includes)
 
-chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
+chalkbumpmap_la_SOURCES = bumpmap.cpp wdgbumpmap.ui
 
 kde_module_LTLIBRARIES = chalkbumpmap.la
 noinst_HEADERS = bumpmap.h
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index 9d7712228..9d7712228 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cc
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am
index 4a180a28d..d82def816 100644
--- a/chalk/plugins/filters/cimg/Makefile.am
+++ b/chalk/plugins/filters/cimg/Makefile.am
@@ -12,9 +12,9 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalkcimg_la_SOURCES = \
 	wdg_cimg.ui\
-	kis_cimg_filter.cc\
-	kis_cimg_plugin.cc\
-	kis_cimgconfig_widget.cc
+	kis_cimg_filter.cpp\
+	kis_cimg_plugin.cpp\
+	kis_cimgconfig_widget.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalkcimg.la
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
index c8be0a6f6..c8be0a6f6 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc b/chalk/plugins/filters/cimg/kis_cimg_plugin.cpp
index 9ed82fe26..9ed82fe26 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.cpp
diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
index ba9e61e06..ba9e61e06 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am
index 293806496..8f54c2ed7 100644
--- a/chalk/plugins/filters/colors/Makefile.am
+++ b/chalk/plugins/filters/colors/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \
         $(KOFFICE_INCLUDES) \
         $(all_includes)
 
-chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_color_to_alpha.cc wdgcolortoalphabase.ui kis_wdg_color_to_alpha.cc
+chalkextensioncolorsfilters_la_SOURCES = colors.cpp kis_minmax_filters.cpp kis_color_to_alpha.cpp wdgcolortoalphabase.ui kis_wdg_color_to_alpha.cpp
 
 kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la
 noinst_HEADERS = colors.h
diff --git a/chalk/plugins/filters/colors/colors.cc b/chalk/plugins/filters/colors/colors.cpp
index d3cadc68a..d3cadc68a 100644
--- a/chalk/plugins/filters/colors/colors.cc
+++ b/chalk/plugins/filters/colors/colors.cpp
diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_color_to_alpha.cpp
index 26f428448..26f428448 100644
--- a/chalk/plugins/filters/colors/kis_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_color_to_alpha.cpp
diff --git a/chalk/plugins/filters/colors/kis_minmax_filters.cc b/chalk/plugins/filters/colors/kis_minmax_filters.cpp
index eac48ad3c..eac48ad3c 100644
--- a/chalk/plugins/filters/colors/kis_minmax_filters.cc
+++ b/chalk/plugins/filters/colors/kis_minmax_filters.cpp
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
index 31b726bf0..31b726bf0 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am
index 8e0be13e1..e7459d7d1 100644
--- a/chalk/plugins/filters/colorsfilters/Makefile.am
+++ b/chalk/plugins/filters/colorsfilters/Makefile.am
@@ -7,11 +7,11 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkcolorsfilters_la_SOURCES = colorsfilters.cc \
-	kis_perchannel_filter.cc \
+chalkcolorsfilters_la_SOURCES = colorsfilters.cpp \
+	kis_perchannel_filter.cpp \
 	wdg_perchannel.ui \
 	wdg_brightness_contrast.ui \
-	kis_brightness_contrast_filter.cc
+	kis_brightness_contrast_filter.cpp
 
 noinst_HEADERS = colorsfilters.h \
 	kis_perchannel_filter.h \
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 754bbc2c0..754bbc2c0 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
index cbca7a08c..cbca7a08c 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
index d479b27d6..d479b27d6 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am
index 6e4242f26..cd4582e94 100644
--- a/chalk/plugins/filters/convolutionfilters/Makefile.am
+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am
@@ -12,10 +12,10 @@ INCLUDES  = \
 kde_module_LTLIBRARIES = chalkconvolutionfilters.la
 
 chalkconvolutionfilters_la_SOURCES = kis_custom_convolution_filter_configuration_base_widget.ui \
-	kis_custom_convolution_filter_configuration_widget.cc \
-	kis_custom_convolution_filter.cc \
-	convolutionfilters.cc \
-	kis_convolution_filter.cc
+	kis_custom_convolution_filter_configuration_widget.cpp \
+	kis_custom_convolution_filter.cpp \
+	convolutionfilters.cpp \
+	kis_convolution_filter.cpp
 
 noinst_HEADERS = convolutionfilters.h \
 	kis_custom_convolution_filter_configuration_widget.h \
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
index 8f1085654..8f1085654 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cpp
index 08601d600..08601d600 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cpp
index dc73f197b..dc73f197b 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cpp
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.cpp
index fcffb3def..fcffb3def 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
diff --git a/chalk/plugins/filters/cubismfilter/Makefile.am b/chalk/plugins/filters/cubismfilter/Makefile.am
index e281360ed..a26a8e806 100644
--- a/chalk/plugins/filters/cubismfilter/Makefile.am
+++ b/chalk/plugins/filters/cubismfilter/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkcubismfilter.la
 
-chalkcubismfilter_la_SOURCES = kis_cubism_filter_plugin.cc \
-	kis_cubism_filter.cc \
-        kis_polygon.cc
+chalkcubismfilter_la_SOURCES = kis_cubism_filter_plugin.cpp \
+	kis_cubism_filter.cpp \
+        kis_polygon.cpp
 
 noinst_HEADERS = kis_cubism_filter_plugin.h \
 	kis_cubism_filter.h \
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
index 1eb2984ef..1eb2984ef 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cpp
index 7215a2e3b..7215a2e3b 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cpp
diff --git a/chalk/plugins/filters/cubismfilter/kis_polygon.cc b/chalk/plugins/filters/cubismfilter/kis_polygon.cpp
index cd2d979f2..cd2d979f2 100644
--- a/chalk/plugins/filters/cubismfilter/kis_polygon.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_polygon.cpp
diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am
index 8bb9cdeb1..69b5cb613 100644
--- a/chalk/plugins/filters/embossfilter/Makefile.am
+++ b/chalk/plugins/filters/embossfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkembossfilter.la
 
-chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
-	kis_emboss_filter.cc
+chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cpp \
+	kis_emboss_filter.cpp
 
 noinst_HEADERS = kis_emboss_filter_plugin.h \
         kis_emboss_filter.h
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
index 0d6974e0c..0d6974e0c 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
index bd11b115b..bd11b115b 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am
index fcb56751d..c39558f79 100644
--- a/chalk/plugins/filters/example/Makefile.am
+++ b/chalk/plugins/filters/example/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkexample_la_SOURCES = example.cc
+chalkexample_la_SOURCES = example.cpp
 
 kde_module_LTLIBRARIES = chalkexample.la
 noinst_HEADERS = example.h
diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cpp
index a9ade7249..a9ade7249 100644
--- a/chalk/plugins/filters/example/example.cc
+++ b/chalk/plugins/filters/example/example.cpp
diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am
index e923ce229..e9a171840 100644
--- a/chalk/plugins/filters/fastcolortransfer/Makefile.am
+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc \
+chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cpp \
 	kis_wdg_fastcolortransfer.cpp
 
 kde_module_LTLIBRARIES = chalkfastcolortransfer.la
diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
index c43e56900..c43e56900 100644
--- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
+++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
index a0e2e5b48..e36e7d001 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
+chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cpp \
 	wdglenscorrectionoptions.ui kis_wdg_lens_correction.cpp
 
 kde_module_LTLIBRARIES = chalklenscorrectionfilter.la
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6b26ab11a..6b26ab11a 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am
index 7dc49964c..897779e1b 100644
--- a/chalk/plugins/filters/levelfilter/Makefile.am
+++ b/chalk/plugins/filters/levelfilter/Makefile.am
@@ -7,10 +7,10 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalklevelfilter_la_SOURCES = levelfilter.cc \
+chalklevelfilter_la_SOURCES = levelfilter.cpp \
 	wdg_level.ui \
-	kis_level_filter.cc \
-	kgradientslider.cc
+	kis_level_filter.cpp \
+	kgradientslider.cpp
 
 noinst_HEADERS = levelfilter.h \
 	kis_level_filter.h \
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cpp
index b36e5ce97..b36e5ce97 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.cc
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.cpp
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
index 84dbc035c..84dbc035c 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cpp
index 891143783..891143783 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cc
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cpp
diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am
index 8c06406f7..119039f0b 100644
--- a/chalk/plugins/filters/noisefilter/Makefile.am
+++ b/chalk/plugins/filters/noisefilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
+chalknoisefilter_la_SOURCES = noisefilter.cpp wdgnoiseoptions.ui \
 	kis_wdg_noise.cpp
 
 kde_module_LTLIBRARIES = chalknoisefilter.la
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index d8609ba2b..d8609ba2b 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cc
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cpp
diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am
index 032fc2f3d..6332d7baa 100644
--- a/chalk/plugins/filters/oilpaintfilter/Makefile.am
+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkoilpaintfilter.la
 
-chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
-	kis_oilpaint_filter.cc
+chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cpp \
+	kis_oilpaint_filter.cpp
 
 noinst_HEADERS = kis_oilpaint_filter_plugin.h \
 	kis_oilpaint_filter.h
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
index de869a424..de869a424 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
index d9c9f3e6f..d9c9f3e6f 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am
index 750941e1f..20f7bc4ae 100644
--- a/chalk/plugins/filters/pixelizefilter/Makefile.am
+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkpixelizefilter.la
 
-chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
-	kis_pixelize_filter.cc
+chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cpp \
+	kis_pixelize_filter.cpp
 
 noinst_HEADERS = kis_pixelize_filter_plugin.h \
 	kis_pixelize_filter.h
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
index a6b77df76..a6b77df76 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
index d93cad4e1..d93cad4e1 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am
index 10f44c436..e6a1d4683 100644
--- a/chalk/plugins/filters/raindropsfilter/Makefile.am
+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkraindropsfilter.la
 
-chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
-	kis_raindrops_filter.cc
+chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cpp \
+	kis_raindrops_filter.cpp
 
 noinst_HEADERS = kis_raindrops_filter_plugin.h \
 	kis_raindrops_filter.h
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
index acb8c2e17..acb8c2e17 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
index f62196cb9..f62196cb9 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am
index 65e910ff9..3be553f2a 100644
--- a/chalk/plugins/filters/randompickfilter/Makefile.am
+++ b/chalk/plugins/filters/randompickfilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
+chalkrandompickfilter_la_SOURCES = randompickfilter.cpp wdgrandompickoptions.ui \
 	kis_wdg_random_pick.cpp
 
 kde_module_LTLIBRARIES = chalkrandompickfilter.la
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 74368802a..74368802a 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am
index 05f2e0554..59655c047 100644
--- a/chalk/plugins/filters/roundcorners/Makefile.am
+++ b/chalk/plugins/filters/roundcorners/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkroundcornersfilter.la
 
-chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
-	kis_round_corners_filter.cc
+chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cpp \
+	kis_round_corners_filter.cpp
 
 noinst_HEADERS = kis_round_corners_filter_plugin.h \
 	kis_round_corners_filter.h
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
index 698961a82..698961a82 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
index 14610c8e5..14610c8e5 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am
index 5705eae94..da7181494 100644
--- a/chalk/plugins/filters/smalltilesfilter/Makefile.am
+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalksmalltilesfilter.la
 
-chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
-	kis_small_tiles_filter.cc
+chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cpp \
+	kis_small_tiles_filter.cpp
 
 noinst_HEADERS = kis_small_tiles_filter_plugin.h \
 	kis_small_tiles_filter.h
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
index a0cf20f17..a0cf20f17 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
index 6a7fe9ea8..6a7fe9ea8 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am
index 38893ad43..4a8e4151d 100644
--- a/chalk/plugins/filters/sobelfilter/Makefile.am
+++ b/chalk/plugins/filters/sobelfilter/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalksobelfilter.la
 
-chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
-	kis_sobel_filter.cc
+chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cpp \
+	kis_sobel_filter.cpp
 
 noinst_HEADERS = kis_sobel_filter_plugin.h \
 	kis_sobel_filter.h
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
index 623fc690b..623fc690b 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
index 3b21c5477..3b21c5477 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
diff --git a/chalk/plugins/filters/threadtest/Makefile.am b/chalk/plugins/filters/threadtest/Makefile.am
index 7846c3c0e..e1a7c2675 100644
--- a/chalk/plugins/filters/threadtest/Makefile.am
+++ b/chalk/plugins/filters/threadtest/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../../lib/kofficecore \
 	$(all_includes)
 
-chalkthreadtest_la_SOURCES = threadtest.cc
+chalkthreadtest_la_SOURCES = threadtest.cpp
 
 kde_module_LTLIBRARIES = chalkthreadtest.la
 noinst_HEADERS = threadtest.h
diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cpp
index 8477c09c7..8477c09c7 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cc
+++ b/chalk/plugins/filters/threadtest/threadtest.cpp
diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am
index e955e3bcb..a831dbbdb 100644
--- a/chalk/plugins/filters/unsharp/Makefile.am
+++ b/chalk/plugins/filters/unsharp/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
         $(KOFFICE_INCLUDES) \
         $(all_includes)
 
-chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_unsharp_filter.cc 
+chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cpp unsharp.cpp kis_unsharp_filter.cpp 
 
 kde_module_LTLIBRARIES = chalkunsharpfilter.la
 
diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cpp
index 845262b17..845262b17 100644
--- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
+++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cpp
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
index 627d105cf..627d105cf 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
diff --git a/chalk/plugins/filters/unsharp/unsharp.cc b/chalk/plugins/filters/unsharp/unsharp.cpp
index 3d90d49ed..3d90d49ed 100644
--- a/chalk/plugins/filters/unsharp/unsharp.cc
+++ b/chalk/plugins/filters/unsharp/unsharp.cpp
diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am
index 3425e7698..a6b300518 100644
--- a/chalk/plugins/filters/wavefilter/Makefile.am
+++ b/chalk/plugins/filters/wavefilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
+chalkwavefilter_la_SOURCES = wavefilter.cpp wdgwaveoptions.ui \
 	kis_wdg_wave.cpp
 
 kde_module_LTLIBRARIES = chalkwavefilter.la
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 9f9777bf6..9f9777bf6 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cc
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am
index 31acf6e0e..84e2a4088 100644
--- a/chalk/plugins/paintops/defaultpaintops/Makefile.am
+++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am
@@ -18,14 +18,14 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 
 
 chalkdefaultpaintops_la_SOURCES = \
-	defaultpaintops_plugin.cc \
-	kis_airbrushop.cc \
-	kis_brushop.cc \
-	kis_duplicateop.cc \
-	kis_eraseop.cc \
-	kis_penop.cc \
+	defaultpaintops_plugin.cpp \
+	kis_airbrushop.cpp \
+	kis_brushop.cpp \
+	kis_duplicateop.cpp \
+	kis_eraseop.cpp \
+	kis_penop.cpp \
 	kis_dlgbrushcurvecontrol.ui \
-	kis_smudgeop.cc
+	kis_smudgeop.cpp
 
 noinst_HEADERS = defaultpaintops_plugin.h 	kis_airbrushop.h 	kis_brushop.h \
 		kis_duplicateop.h 	kis_eraseop.h 	kis_penop.h kis_smudgeop.h
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
index 25f12b87b..6e1d3f754 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * defaultpaintops_plugin.cc -- Part of Chalk
+ * defaultpaintops_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cpp
index 2a8750f33..2a8750f33 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
index 285b4d6fc..285b4d6fc 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cc b/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cpp
index 708d792c9..708d792c9 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cpp
index 556a77751..556a77751 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cpp
index 55e3b7b84..55e3b7b84 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cpp
index 4a8da9a16..4a8da9a16 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
index f15077b37..f15077b37 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am
index c4d790cb5..ad9e96a5b 100644
--- a/chalk/plugins/tools/defaulttools/Makefile.am
+++ b/chalk/plugins/tools/defaulttools/Makefile.am
@@ -10,19 +10,19 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalkdefaulttools_la_SOURCES = \
-	default_tools.cc \
-	kis_tool_colorpicker.cc \
-	kis_tool_move.cc \
-	kis_tool_zoom.cc \
-	kis_tool_brush.cc \
-	kis_tool_line.cc \
-	kis_tool_duplicate.cc \
-    kis_tool_fill.cc \
-    kis_tool_rectangle.cc \
-    kis_tool_ellipse.cc \
-	kis_tool_pan.cc \
-	kis_tool_text.cc \
-	kis_tool_gradient.cc \
+	default_tools.cpp \
+	kis_tool_colorpicker.cpp \
+	kis_tool_move.cpp \
+	kis_tool_zoom.cpp \
+	kis_tool_brush.cpp \
+	kis_tool_line.cpp \
+	kis_tool_duplicate.cpp \
+    kis_tool_fill.cpp \
+    kis_tool_rectangle.cpp \
+    kis_tool_ellipse.cpp \
+	kis_tool_pan.cpp \
+	kis_tool_text.cpp \
+	kis_tool_gradient.cpp \
 	wdgcolorpicker.ui
 
 # Install this plugin in the KDE modules directory
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cpp
index 17e0feff0..6f1bedbbf 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cc
+++ b/chalk/plugins/tools/defaulttools/default_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * default_tools.cc -- Part of Chalk
+ * default_tools.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
index 7c83a36b0..96e262022 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_brush.cc - part of Chalk
+ *  kis_tool_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2003-2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
index 40a09a91f..40a09a91f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
index 7bb4c54fd..0f917e7f7 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_duplicate.cc - part of Chalk
+ *  kis_tool_duplicate.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
index 919454b26..0488dcb05 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_ellipse.cc - part of Krayon
+ *  kis_tool_ellipse.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
index df8e4f7c5..ceb78f06b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_fill.cc - part of Krayon
+ *  kis_tool_fill.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
index a46fee808..b8f72a3bb 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_gradient.cc - part of Chalk
+ *  kis_tool_gradient.cpp - part of Chalk
  *
  *  Copyright (c) 2000 John Califf
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
index 4e118cccb..87cb93907 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_line.cc - part of Krayon
+ *  kis_tool_line.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
index be5065784..be5065784 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
index c95b10000..c95b10000 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
index 852d2c0e0..69e306ecf 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_rectangle.cc - part of Chalk
+ *  kis_tool_rectangle.cpp - part of Chalk
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
index 1a2687f13..1a2687f13 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index fe449ee4f..fe449ee4f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index febfd514c..0f1b8474d 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -9,10 +9,10 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \
-	kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \
-	kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \
-	kis_tool_select_rectangular.cc selection_tools.cc
+chalkselectiontools_la_SOURCES = kis_tool_move_selection.cpp \
+	kis_tool_select_brush.cpp kis_tool_select_contiguous.cpp kis_tool_select_elliptical.cpp \
+	kis_tool_select_eraser.cpp kis_tool_select_outline.cpp kis_tool_select_polygonal.cpp \
+	kis_tool_select_rectangular.cpp selection_tools.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalkselectiontools.la
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
index a1f0902f4..a1f0902f4 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
index acc903620..ba80434f3 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_brush.cc - part of Chalk
+ *  kis_tool_select_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
index 1a4932b75..1a4932b75 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
index def162ef4..f85da3327 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_elliptical.cc -- part of Chalk
+ *  kis_tool_select_elliptical.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
index af7f8d84a..9cfef0a80 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_brush.cc - part of Chalk
+ *  kis_tool_select_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
index 7f5267366..7f5267366 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
index 8d89eea2f..8d89eea2f 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
index 09d338663..5a6772bac 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
@@ -1,6 +1,6 @@
 
 /*
- *  kis_tool_select_rectangular.cc -- part of Chalk
+ *  kis_tool_select_rectangular.cpp -- part of Chalk
  *
  *  Copyright (c) 1999 Michael Koch <koch@kde.org>
  *                2001 John Califf <jcaliff@compuzone.net>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index 8407a076e..f34a3b34c 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * selection_tools.cc -- Part of Chalk
+ * selection_tools.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index fe320b849..5bf3c1f6d 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktoolcrop_la_SOURCES = \
 	wdg_tool_crop.ui \
-	tool_crop.cc \
-	kis_tool_crop.cc 
+	tool_crop.cpp \
+	kis_tool_crop.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolcrop.la
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
index 11a47590c..58454b4f5 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_crop.cc -- part of Chalk
+ *  kis_tool_crop.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 97f6e0e85..30df11ec3 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_crop.cc -- Part of Chalk
+ * tool_crop.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index 92366e55c..75a515f29 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -10,15 +10,15 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolcurves_la_SOURCES = \
-	kis_curve_framework.cc \
-	kis_tool_curve.cc \
-		tool_curves.cc \
+	kis_curve_framework.cpp \
+	kis_tool_curve.cpp \
+		tool_curves.cpp \
 	wdg_tool_example.ui \
-	kis_tool_example.cc \
-	kis_tool_bezier.cc \
-	kis_tool_bezier_paint.cc \
-	kis_tool_bezier_select.cc \
-	kis_tool_moutline.cc
+	kis_tool_example.cpp \
+	kis_tool_bezier.cpp \
+	kis_tool_bezier_paint.cpp \
+	kis_tool_bezier_select.cpp \
+	kis_tool_moutline.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolcurves.la
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cpp
index 8a9b4c886..8a9b4c886 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cpp
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cpp
index e4c1d05d0..9195dfbd7 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_bezier.cc -- part of Chalk
+ *  kis_tool_bezier.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
index 06f34f8cc..a8d1514be 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
index 724189208..657358609 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
index 7449e5817..ea1f9a773 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
index 75e3da2be..a21bb8089 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_example.cc -- part of Chalk
+ *  kis_tool_example.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
index 178ff278f..ebf82634f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_moutline.cc -- part of Chalk
+ *  kis_tool_moutline.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index b21f5aae3..28f65604a 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cpp
@@ -1,5 +1,5 @@
 /*
- *  tool_bezier.cc -- part of Chalk
+ *  tool_bezier.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index d99a39249..b12ab69b5 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolfilter_la_SOURCES = \
-	kis_filterop.cc \
-	kis_tool_filter.cc \
-	tool_filter.cc
+	kis_filterop.cpp \
+	kis_tool_filter.cpp \
+	tool_filter.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolfilter.la
diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cpp
index d3378730f..d3378730f 100644
--- a/chalk/plugins/tools/tool_filter/kis_filterop.cc
+++ b/chalk/plugins/tools/tool_filter/kis_filterop.cpp
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
index 07133d3bb..14e2d6168 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_filter.cc - part of Chalk
+ *  kis_tool_filter.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index bda2357e3..484a7d9f3 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_filter.cc -- Part of Chalk
+ * tool_filter.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index 8544c078a..c15df2687 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolperspectivegrid_la_SOURCES = \
-	tool_perspectivegrid.cc \
-	kis_tool_perspectivegrid.cc 
+	tool_perspectivegrid.cpp \
+	kis_tool_perspectivegrid.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolperspectivegrid.la
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
index 2dbe56d3d..7d5df0f2b 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_perspectivegrid.cc - part of Chalk
+ *  kis_tool_perspectivegrid.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index f2800a594..2f326965b 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_perspectivegrid.cc -- Part of Chalk
+ * tool_perspectivegrid.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index 08c8d7079..275f6413d 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolperspectivetransform_la_SOURCES = \
-	tool_perspectivetransform.cc \
-	kis_tool_perspectivetransform.cc 
+	tool_perspectivetransform.cpp \
+	kis_tool_perspectivetransform.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolperspectivetransform.la
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
index ae334e627..e73f5da3c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_transform.cc -- part of Chalk
+ *  kis_tool_transform.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 0c4023cce..73705264b 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_perspectivetransform.cc -- Part of Chalk
+ * tool_perspectivetransform.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index 555f59a0e..4ad417da0 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolpolygon_la_SOURCES = \
-        tool_polygon.cc \
-	kis_tool_polygon.cc 
+        tool_polygon.cpp \
+	kis_tool_polygon.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolpolygon.la
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
index a7371e49f..601fc6907 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_polygon.cc -- part of Chalk
+ *  kis_tool_polygon.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index 626a773d3..f903551fb 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_polygon.cc -- Part of Chalk
+ * tool_polygon.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index 1812b13bc..87fa1ce27 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolpolyline_la_SOURCES = \
-        tool_polyline.cc \
-	kis_tool_polyline.cc 
+        tool_polyline.cpp \
+	kis_tool_polyline.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolpolyline.la
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
index c99513f47..ab89cf3f4 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_polyline.cc -- part of Chalk
+ *  kis_tool_polyline.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index a5bfa27f2..d6abff71a 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_polyline.cc -- Part of Chalk
+ * tool_polyline.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 5c1897f40..224f67ba4 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 
-chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
+chalktoolselectsimilar_la_SOURCES = selectsimilar.cpp kis_tool_selectsimilar.cpp
 noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
 kde_module_LTLIBRARIES = chalktoolselectsimilar.la
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index 65b05957a..65b05957a 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index af8070171..af8070171 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index ed88d27ed..1f4627dd6 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktoolstar_la_SOURCES = \
 	wdg_tool_star.ui \
-        tool_star.cc \
-	kis_tool_star.cc 
+        tool_star.cpp \
+	kis_tool_star.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolstar.la
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
index cd4bb0b2e..3a260545b 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_star.cc -- part of Chalk
+ *  kis_tool_star.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cpp
index 9ac1b62f8..7309e8a1a 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_star.cc -- Part of Chalk
+ * tool_star.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index 12a32774c..a5adea177 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktooltransform_la_SOURCES = \
 	wdg_tool_transform.ui \
-	tool_transform.cc \
-	kis_tool_transform.cc 
+	tool_transform.cpp \
+	kis_tool_transform.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktooltransform.la
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
index de20ce7f6..88a675663 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_transform.cc -- part of Chalk
+ *  kis_tool_transform.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Casper Boemann <cbr@boemann.dk>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 82941e92c..0f0dde27d 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_transform.cc -- Part of Chalk
+ * tool_transform.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am
index 1c8547e29..c072f78cb 100644
--- a/chalk/plugins/viewplugins/colorrange/Makefile.am
+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkcolorrange.la
 
-chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui
+chalkcolorrange_la_SOURCES = colorrange.cpp dlg_colorrange.cpp wdg_colorrange.ui
 noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h
 
 chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index be0648bab..be0648bab 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
index 453bbec27..82748f4c8 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_colorrange.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_colorrange.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
index 7439813c2..06b2ab88f 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
+++ b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkcolorspaceconversion.la
 
-chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cc dlg_colorspaceconversion.cc
+chalkcolorspaceconversion_la_SOURCES = wdgconvertcolorspace.ui colorspaceconversion.cpp dlg_colorspaceconversion.cpp
 noinst_HEADERS = wdgconvertcolorspace.h dlg_colorspaceconversion.h colorspaceconversion.h
 
 chalkcolorspaceconversion_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index d956ee460..377f0569d 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -1,5 +1,5 @@
 /*
- * colorspaceconversion.cc -- Part of Chalk
+ * colorspaceconversion.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
index 8159ad73f..259c6f470 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_colorspaceconversion.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_colorspaceconversion.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am
index fb6c48ce4..3c9728e00 100644
--- a/chalk/plugins/viewplugins/dropshadow/Makefile.am
+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am
@@ -14,8 +14,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkdropshadow.la
 
 chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \
-	kis_dropshadow.cc dlg_dropshadow.cc  \
-	kis_dropshadow_plugin.cc
+	kis_dropshadow.cpp dlg_dropshadow.cpp  \
+	kis_dropshadow_plugin.cpp
 
 noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \
 		kis_dropshadow.h dlg_dropshadow.h
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
index 59019489c..c82bbbad6 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_dropshadow.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_dropshadow.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2005 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17ed..97c2c17ed 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 97a0b8a7a..97a0b8a7a 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
index 6c3ca3e87..bd80954f6 100644
--- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am
+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkfiltersgallery_la_SOURCES = filters_gallery.cc \
-		kis_dlg_filtersgallery.cc kis_wdg_filtersgallery.ui
+chalkfiltersgallery_la_SOURCES = filters_gallery.cpp \
+		kis_dlg_filtersgallery.cpp kis_wdg_filtersgallery.ui
 
 kde_module_LTLIBRARIES = chalkfiltersgallery.la
 noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
index 337b55c02..337b55c02 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
index e0bec7ec6..e0bec7ec6 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am
index f5f8db376..9afb9726c 100644
--- a/chalk/plugins/viewplugins/histogram/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkhistogram.la
 
-chalkhistogram_la_SOURCES = histogram.cc dlg_histogram.cc wdghistogram.ui kis_histogram_widget.cc
+chalkhistogram_la_SOURCES = histogram.cpp dlg_histogram.cpp wdghistogram.ui kis_histogram_widget.cpp
 noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget.h
 
 kde_services_DATA = chalkhistogram.desktop
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cpp
index 448a58cfc..77ad06686 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_histogram.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_histogram.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cpp
index 8252a98db..8252a98db 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
index c49838706..c49838706 100644
--- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
+++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
index 6d2b905db..299920871 100644
--- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkhistogramdocker_la_SOURCES = histogramdocker.cc  kis_imagerasteredcache.cc kis_cachedhistogram.cc kis_accumulating_producer.cc
+chalkhistogramdocker_la_SOURCES = histogramdocker.cpp  kis_imagerasteredcache.cpp kis_cachedhistogram.cpp kis_accumulating_producer.cpp
 
 kde_module_LTLIBRARIES = chalkhistogramdocker.la
 noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 25a7b9cff..25a7b9cff 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc b/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cpp
index 217a36d91..217a36d91 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cc b/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cpp
index 1ad197f9d..1ad197f9d 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
index 19599cd9c..19599cd9c 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
diff --git a/chalk/plugins/viewplugins/history_docker/Makefile.am b/chalk/plugins/viewplugins/history_docker/Makefile.am
index 53511b3d9..c77357f23 100644
--- a/chalk/plugins/viewplugins/history_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/history_docker/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkhistorydocker_la_SOURCES = historydocker.cc 
+chalkhistorydocker_la_SOURCES = historydocker.cpp 
 
 kde_module_LTLIBRARIES = chalkhistorydocker.la
 noinst_HEADERS = historydocker.h 
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 85e4df406..85e4df406 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cc
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am
index 00d58340c..5fe1756ab 100644
--- a/chalk/plugins/viewplugins/imagesize/Makefile.am
+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkimagesize_la_SOURCES = wdg_imagesize.ui wdg_layersize.ui imagesize.cc dlg_imagesize.cc dlg_layersize.cc wdg_resolution.ui
+chalkimagesize_la_SOURCES = wdg_imagesize.ui wdg_layersize.ui imagesize.cpp dlg_imagesize.cpp dlg_layersize.cpp wdg_resolution.ui
 
 noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
index 8a9a8c098..c455af8cc 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_imagesize.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_imagesize.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
index 1d30db6a0..779798056 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_layersize.cc - part of Chalk
+ *  dlg_layersize.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Sven Langkamp <longamp@reallygood.de>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index c795924e1..af9c2570f 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -1,5 +1,5 @@
 /*
- * imagesize.cc -- Part of Chalk
+ * imagesize.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am
index ea0f48429..a1eb18cb3 100644
--- a/chalk/plugins/viewplugins/modify_selection/Makefile.am
+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalkmodifyselection_la_SOURCES = wdg_grow_selection.ui wdg_shrink_selection.ui wdg_border_selection.ui \
-dlg_grow_selection.cc dlg_shrink_selection.cc dlg_border_selection.cc modify_selection.cc
+dlg_grow_selection.cpp dlg_shrink_selection.cpp dlg_border_selection.cpp modify_selection.cpp
 
 noinst_HEADERS = wdg_grow_selection.h wdg_shrink_selection.h wdg_border_selection.h dlg_grow_selection.h \
 dlg_shrink_selection.h dlg_border_selection.h modify_selection.h
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
index 7cd1c335d..8e2bc4de8 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_border_selection.cc - part of Chalk
+ *  dlg_border_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
index 38c445b01..ae590eba9 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_grow_selection.cc - part of Chalk
+ *  dlg_grow_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
index f0129e742..ce4ce9d3b 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_shrink_selection.cc - part of Chalk
+ *  dlg_shrink_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 92d50ef7a..823899958 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -1,5 +1,5 @@
 /*
- * modify_selection.cc -- Part of Chalk
+ * modify_selection.cpp -- Part of Chalk
  *
  * Copyright (c) 2006 Michael Thaler (michael.thaler@physik.tu-muenchen.de)
  *
diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am
index 47906073b..eebf1f4d6 100644
--- a/chalk/plugins/viewplugins/performancetest/Makefile.am
+++ b/chalk/plugins/viewplugins/performancetest/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkperftest.la
 
-chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cc dlg_perftest.cc
+chalkperftest_la_SOURCES = wdg_perftest.ui perftest.cpp dlg_perftest.cpp
 noinst_HEADERS = wdg_perftest.h dlg_perftest.h perftest.h
 
 chalkperftest_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
index b2a723069..326d97272 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_perftest.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_perftest.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index f728043cd..fa5445516 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -1,5 +1,5 @@
 /*
- * perftest.cc -- Part of Chalk
+ * perftest.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am
index 757682e4d..bccf04096 100644
--- a/chalk/plugins/viewplugins/rotateimage/Makefile.am
+++ b/chalk/plugins/viewplugins/rotateimage/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkrotateimage.la
 
-chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cc dlg_rotateimage.cc
+chalkrotateimage_la_SOURCES = wdg_rotateimage.ui rotateimage.cpp dlg_rotateimage.cpp
 noinst_HEADERS = wdg_rotateimage.h dlg_rotateimage.h rotateimage.h
 
 chalkrotateimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
index 84c11ffb5..e7c3a8ce9 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_rotateimage.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_rotateimage.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 8a0985cc3..f58f78168 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -1,5 +1,5 @@
 /*
- * rotateimage.cc -- Part of Chalk
+ * rotateimage.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler
  *
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index 1f0c431d4..2b4270197 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkscripting_la_SOURCES = scripting.cc
+chalkscripting_la_SOURCES = scripting.cpp
 
 kde_module_LTLIBRARIES = chalkscripting.la
 noinst_HEADERS = scripting.h
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cpp
index 207bc0ce3..207bc0ce3 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 7814c7afd..dab67d5ec 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkselectopaque.la
 
-chalkselectopaque_la_SOURCES = selectopaque.cc 
+chalkselectopaque_la_SOURCES = selectopaque.cpp 
 noinst_HEADERS = selectopaque.h
 
 chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index 61d856344..61d856344 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am
index d6a2fa77e..03117232e 100644
--- a/chalk/plugins/viewplugins/separate_channels/Makefile.am
+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am
@@ -12,8 +12,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkseparatechannels.la
 
 chalkseparatechannels_la_SOURCES = wdg_separations.ui \
-	kis_channel_separator.cc dlg_separate.cc  \
-	kis_separate_channels_plugin.cc
+	kis_channel_separator.cpp dlg_separate.cpp  \
+	kis_separate_channels_plugin.cpp
 
 noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \
 		kis_channel_separator.h dlg_separate.h
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
index 6d2a59c32..d650a045a 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_separate.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_separate.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84a..ba8c6b84a 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
index db356a164..db356a164 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am
index 7134779c3..b96067895 100644
--- a/chalk/plugins/viewplugins/shearimage/Makefile.am
+++ b/chalk/plugins/viewplugins/shearimage/Makefile.am
@@ -15,7 +15,7 @@ kde_module_LTLIBRARIES = chalkshearimage.la
 
 kde_services_DATA = chalkshearimage.desktop
 
-chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cc dlg_shearimage.cc
+chalkshearimage_la_SOURCES = wdg_shearimage.ui shearimage.cpp dlg_shearimage.cpp
 noinst_HEADERS = wdg_shearimage.h dlg_shearimage.h shearimage.h
 
 chalkshearimage_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
index e7a63180b..d295493d0 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_shearimage.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_shearimage.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index 8e20b58d6..2596e62ee 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -1,5 +1,5 @@
 /*
- * shearimage.cc -- Part of Chalk
+ * shearimage.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler
  *
diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am
index 8c0e6ef6e..c868d28b0 100644
--- a/chalk/plugins/viewplugins/substrate/Makefile.am
+++ b/chalk/plugins/viewplugins/substrate/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalksubstrate.la
 
-chalksubstrate_la_SOURCES = substrate.cc dlg_substrate.cc wdgsubstrate.ui kis_repeating_substrate.cc
+chalksubstrate_la_SOURCES = substrate.cpp dlg_substrate.cpp wdgsubstrate.ui kis_repeating_substrate.cpp
 noinst_HEADERS = wdgsubstrate.h dlg_substrate.h kis_repeating_substrate.h substrate.h
 
 chalksubstrate_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
index a0dbc5aa2..78847f056 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_substrate.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_substrate.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cc b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cpp
index e69de29bb..e69de29bb 100644
--- a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cpp
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cpp
index ce13710be..ce13710be 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am
index 21d4e63f6..cd75fc9cf 100644
--- a/chalk/plugins/viewplugins/variations/Makefile.am
+++ b/chalk/plugins/viewplugins/variations/Makefile.am
@@ -14,7 +14,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkvariations.la
 
-chalkvariations_la_SOURCES = variations.cc dlg_variations.cc wdg_variations.ui 
+chalkvariations_la_SOURCES = variations.cpp dlg_variations.cpp wdg_variations.ui 
 noinst_HEADERS = wdg_variations.h
 
 chalkvariations_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_TQT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/variations/dlg_variations.cc b/chalk/plugins/viewplugins/variations/dlg_variations.cpp
index afa6a3d74..4decbbd41 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.cc
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_variations.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_variations.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cpp
index 5e2d65ba8..5e2d65ba8 100644
--- a/chalk/plugins/viewplugins/variations/variations.cc
+++ b/chalk/plugins/viewplugins/variations/variations.cpp