422 files changed, 293 insertions, 293 deletions

diff --git a/chalk/Makefile.am b/chalk/Makefile.am
index 1c2e60ef..b0b06bbd 100644
--- a/chalk/Makefile.am
+++ b/chalk/Makefile.am
@@ -2,13 +2,13 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) $(all_includes)
 
 ## The common lib, shared between the part, the plugins, and the filters
 lib_LTLIBRARIES = libchalkcommon.la
-libchalkcommon_la_SOURCES = dummy.cc
+libchalkcommon_la_SOURCES = dummy.cpp
 libchalkcommon_la_LDFLAGS = $(all_libraries) $(LIB_QT) -version-info 1:0 -no-undefined
 libchalkcommon_la_LIBADD = sdk/libchalksdk.la core/libchalkimage.la ui/libchalkui.la chalkcolor/libchalkcolor.la $(LCMS_LIBS) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOPALETTE) $(LIB_XINPUTEXT)
 
 ## The part
 kde_module_LTLIBRARIES = libchalkpart.la
-libchalkpart_la_SOURCES = chalk_part_init.cc
+libchalkpart_la_SOURCES = chalk_part_init.cpp
 libchalkpart_la_LDFLAGS = $(all_libraries) $(LIB_QT) -module $(KDE_PLUGIN)
 libchalkpart_la_LIBADD = $(KOFFICE_LIBS) libchalkcommon.la ../chalk/ui/libchalkui.la
 
@@ -17,7 +17,7 @@ METASOURCES = AUTO
 ## The tdeinit loadable module and executable
 tdeinit_LTLIBRARIES = chalk.la
 bin_PROGRAMS =
-chalk_la_SOURCES = main.cc
+chalk_la_SOURCES = main.cpp
 chalk_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
 chalk_la_LIBADD = $(LIB_KOFFICECORE)
 
@@ -30,14 +30,14 @@ rc_DATA = chalk.rc chalk_readonly.rc
 SUBDIRS = sdk chalkcolor core ui . dtd colorspaces plugins data pics 
 # Needed to compile libchalkcommon.la, which has no source files to itself
 # but everything in static libs.
-dummy.cc:
-	echo > dummy.cc
+dummy.cpp:
+	echo > dummy.cpp
 
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name \*.ui` >> rc.cpp
 	$(EXTRACTRC) `find . -name \*.rc` >> rc.cpp
 	perl extracti18n.pl > i18ndata
-	$(XGETTEXT) i18ndata rc.cpp `find . -name \*.cc -o -name \*.h -o -name \*.cpp` ui/kis_aboutdata.h -o $(podir)/chalk.pot
+	$(XGETTEXT) i18ndata rc.cpp `find . -name \*.cpp -o -name \*.h -o -name \*.cpp` ui/kis_aboutdata.h -o $(podir)/chalk.pot
 	rm -f i18ndata
 
 DOXYGEN_EXCLUDE = CImg.h colorspaces plugins chalkcolor/colorspaces core/tiles
diff --git a/chalk/chalk_part_init.cc b/chalk/chalk_part_init.cpp
index b5691974..1915112e 100644
--- a/chalk/chalk_part_init.cc
+++ b/chalk/chalk_part_init.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_part_init.cc - part of Krayon
+ *  kis_part_init.cpp - part of Krayon
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *
diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am
index e8667a2b..64a7937a 100644
--- a/chalk/chalkcolor/Makefile.am
+++ b/chalk/chalkcolor/Makefile.am
@@ -11,14 +11,14 @@ CXXFLAGS += $(OPENEXR_CXXFLAGS)
 lib_LTLIBRARIES = libchalkcolor.la
 
 if have_openexr
-OPENEXR_SOURCES=kis_f16half_base_colorspace.cc
+OPENEXR_SOURCES=kis_f16half_base_colorspace.cpp
 endif
 
-libchalkcolor_la_SOURCES = kis_color.cc kis_colorspace.cc \
-	kis_colorspace_iface.cc kis_colorspace_iface.skel kis_composite_op.cc kis_profile.cc \
-	kis_histogram_producer.cc kis_basic_histogram_producers.cc kis_abstract_colorspace.cc \
-	kis_colorspace_factory_registry.cc kis_color_conversions.cc kis_u8_base_colorspace.cc \
-	kis_u16_base_colorspace.cc kis_f32_base_colorspace.cc $(OPENEXR_SOURCES)
+libchalkcolor_la_SOURCES = kis_color.cpp kis_colorspace.cpp \
+	kis_colorspace_iface.cpp kis_colorspace_iface.skel kis_composite_op.cpp kis_profile.cpp \
+	kis_histogram_producer.cpp kis_basic_histogram_producers.cpp kis_abstract_colorspace.cpp \
+	kis_colorspace_factory_registry.cpp kis_color_conversions.cpp kis_u8_base_colorspace.cpp \
+	kis_u16_base_colorspace.cpp kis_f32_base_colorspace.cpp $(OPENEXR_SOURCES)
 
 libchalkcolor_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
 libchalkcolor_la_LIBADD  = colorspaces/libchalkcolorspaces.la $(LCMS_LIBS) $(LIB_TDEPARTS) $(LIB_TDECORE) $(LIB_QT) $(OPENEXR_LIBS)
diff --git a/chalk/chalkcolor/colorspaces/Makefile.am b/chalk/chalkcolor/colorspaces/Makefile.am
index 90f75d29..18bd587b 100644
--- a/chalk/chalkcolor/colorspaces/Makefile.am
+++ b/chalk/chalkcolor/colorspaces/Makefile.am
@@ -6,8 +6,8 @@ INCLUDES  = -I$(srcdir)/.. \
 noinst_LTLIBRARIES = libchalkcolorspaces.la
 
 libchalkcolorspaces_la_SOURCES = \
-	kis_alpha_colorspace.cc \
-	kis_lab_colorspace.cc 
+	kis_alpha_colorspace.cpp \
+	kis_lab_colorspace.cpp 
 
 noinst_HEADERS = \
     kis_alpha_colorspace.h  \
diff --git a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cpp
index f7c1fbce..f7c1fbce 100644
--- a/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_alpha_colorspace.cpp
diff --git a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cpp
index c5c7ac5a..c5c7ac5a 100644
--- a/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_lab_colorspace.cpp
diff --git a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cpp
index 835ebfa1..835ebfa1 100644
--- a/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cc
+++ b/chalk/chalkcolor/colorspaces/kis_xyz_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_abstract_colorspace.cc b/chalk/chalkcolor/kis_abstract_colorspace.cpp
index 7f515534..7f515534 100644
--- a/chalk/chalkcolor/kis_abstract_colorspace.cc
+++ b/chalk/chalkcolor/kis_abstract_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_basic_histogram_producers.cc b/chalk/chalkcolor/kis_basic_histogram_producers.cpp
index a37a1fb3..a37a1fb3 100644
--- a/chalk/chalkcolor/kis_basic_histogram_producers.cc
+++ b/chalk/chalkcolor/kis_basic_histogram_producers.cpp
diff --git a/chalk/chalkcolor/kis_color.cc b/chalk/chalkcolor/kis_color.cpp
index 7d6acb89..7d6acb89 100644
--- a/chalk/chalkcolor/kis_color.cc
+++ b/chalk/chalkcolor/kis_color.cpp
diff --git a/chalk/chalkcolor/kis_color_conversions.cc b/chalk/chalkcolor/kis_color_conversions.cpp
index e517c9f7..e517c9f7 100644
--- a/chalk/chalkcolor/kis_color_conversions.cc
+++ b/chalk/chalkcolor/kis_color_conversions.cpp
diff --git a/chalk/chalkcolor/kis_colorspace.cc b/chalk/chalkcolor/kis_colorspace.cpp
index c13a2e08..c13a2e08 100644
--- a/chalk/chalkcolor/kis_colorspace.cc
+++ b/chalk/chalkcolor/kis_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_colorspace_factory_registry.cc b/chalk/chalkcolor/kis_colorspace_factory_registry.cpp
index d9b2591c..d9b2591c 100644
--- a/chalk/chalkcolor/kis_colorspace_factory_registry.cc
+++ b/chalk/chalkcolor/kis_colorspace_factory_registry.cpp
diff --git a/chalk/chalkcolor/kis_colorspace_iface.cc b/chalk/chalkcolor/kis_colorspace_iface.cpp
index bde82ff3..bde82ff3 100644
--- a/chalk/chalkcolor/kis_colorspace_iface.cc
+++ b/chalk/chalkcolor/kis_colorspace_iface.cpp
diff --git a/chalk/chalkcolor/kis_composite_op.cc b/chalk/chalkcolor/kis_composite_op.cpp
index 4cffd766..4cffd766 100644
--- a/chalk/chalkcolor/kis_composite_op.cc
+++ b/chalk/chalkcolor/kis_composite_op.cpp
diff --git a/chalk/chalkcolor/kis_f16half_base_colorspace.cc b/chalk/chalkcolor/kis_f16half_base_colorspace.cpp
index d4886c5f..d4886c5f 100644
--- a/chalk/chalkcolor/kis_f16half_base_colorspace.cc
+++ b/chalk/chalkcolor/kis_f16half_base_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_f32_base_colorspace.cc b/chalk/chalkcolor/kis_f32_base_colorspace.cpp
index 27a6a312..27a6a312 100644
--- a/chalk/chalkcolor/kis_f32_base_colorspace.cc
+++ b/chalk/chalkcolor/kis_f32_base_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_histogram_producer.cc b/chalk/chalkcolor/kis_histogram_producer.cpp
index bbea95ba..bbea95ba 100644
--- a/chalk/chalkcolor/kis_histogram_producer.cc
+++ b/chalk/chalkcolor/kis_histogram_producer.cpp
diff --git a/chalk/chalkcolor/kis_profile.cc b/chalk/chalkcolor/kis_profile.cpp
index 61b2ad32..df98a750 100644
--- a/chalk/chalkcolor/kis_profile.cc
+++ b/chalk/chalkcolor/kis_profile.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_profile.cc - part of Krayon
+ *  kis_profile.cpp - part of Krayon
  *
  *  Copyright (c) 2000 Matthias Elter <[email protected]>
  *                2001 John Califf
diff --git a/chalk/chalkcolor/kis_u16_base_colorspace.cc b/chalk/chalkcolor/kis_u16_base_colorspace.cpp
index a735e35c..a735e35c 100644
--- a/chalk/chalkcolor/kis_u16_base_colorspace.cc
+++ b/chalk/chalkcolor/kis_u16_base_colorspace.cpp
diff --git a/chalk/chalkcolor/kis_u8_base_colorspace.cc b/chalk/chalkcolor/kis_u8_base_colorspace.cpp
index 338d95d6..338d95d6 100644
--- a/chalk/chalkcolor/kis_u8_base_colorspace.cc
+++ b/chalk/chalkcolor/kis_u8_base_colorspace.cpp
diff --git a/chalk/colorspaces/cmyk_u16/Makefile.am b/chalk/colorspaces/cmyk_u16/Makefile.am
index 457f3c51..28d013ac 100644
--- a/chalk/colorspaces/cmyk_u16/Makefile.am
+++ b/chalk/colorspaces/cmyk_u16/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 	$(all_includes)
 
 lib_LTLIBRARIES = libchalk_cmyk_u16.la
-libchalk_cmyk_u16_la_SOURCES = kis_cmyk_u16_colorspace.cc
+libchalk_cmyk_u16_la_SOURCES = kis_cmyk_u16_colorspace.cpp
 libchalk_cmyk_u16_la_LDFLAGS = $(all_libraries)
 libchalk_cmyk_u16_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -15,7 +15,7 @@ libchalk_cmyk_u16_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_cmyk_u16_plugin.la
 
 # Srcs for the plugin
-chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cc
+chalk_cmyk_u16_plugin_la_SOURCES = cmyk_u16_plugin.cpp
 noinst_HEADERS = cmyk_u16_plugin.h kis_cmyk_u16_colorspace.h
 
 chalk_cmyk_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
index 4b3afa29..4195ff22 100644
--- a/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cc
+++ b/chalk/colorspaces/cmyk_u16/cmyk_u16_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* cmyk_u16_plugin.cc -- Part of Chalk
+* cmyk_u16_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cpp
index 96a6f132..96a6f132 100644
--- a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cpp
diff --git a/chalk/colorspaces/cmyk_u8/Makefile.am b/chalk/colorspaces/cmyk_u8/Makefile.am
index ba455504..a1301795 100644
--- a/chalk/colorspaces/cmyk_u8/Makefile.am
+++ b/chalk/colorspaces/cmyk_u8/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES  = -I$(srcdir)/../../sdk \
 
 kde_module_LTLIBRARIES = chalkcmykplugin.la
 
-chalkcmykplugin_la_SOURCES = cmyk_plugin.cc kis_cmyk_colorspace.cc
+chalkcmykplugin_la_SOURCES = cmyk_plugin.cpp kis_cmyk_colorspace.cpp
 noinst_HEADERS = cmyk_plugin.h kis_cmyk_colorspace.h 
 
 chalkcmykplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
index 7b09ecca..588e286c 100644
--- a/chalk/colorspaces/cmyk_u8/cmyk_plugin.cc
+++ b/chalk/colorspaces/cmyk_u8/cmyk_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * cmyk_plugin.cc -- Part of Chalk
+ * cmyk_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cpp
index 09c517df..09c517df 100644
--- a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc
+++ b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cpp
diff --git a/chalk/colorspaces/gray_u16/Makefile.am b/chalk/colorspaces/gray_u16/Makefile.am
index a168e5ba..f8a0c33e 100644
--- a/chalk/colorspaces/gray_u16/Makefile.am
+++ b/chalk/colorspaces/gray_u16/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 	$(all_includes)
 
 lib_LTLIBRARIES = libchalk_gray_u16.la
-libchalk_gray_u16_la_SOURCES = kis_gray_u16_colorspace.cc
+libchalk_gray_u16_la_SOURCES = kis_gray_u16_colorspace.cpp
 libchalk_gray_u16_la_LDFLAGS = $(all_libraries)
 libchalk_gray_u16_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -16,7 +16,7 @@ libchalk_gray_u16_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_gray_u16_plugin.la
 
 # Srcs for the plugin
-chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cc
+chalk_gray_u16_plugin_la_SOURCES = gray_u16_plugin.cpp
 noinst_HEADERS = gray_u16_plugin.h kis_gray_u16_colorspace.h
 
 chalk_gray_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
index 5e9e17f9..7c1896f9 100644
--- a/chalk/colorspaces/gray_u16/gray_u16_plugin.cc
+++ b/chalk/colorspaces/gray_u16/gray_u16_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* gray_u16_plugin.cc -- Part of Chalk
+* gray_u16_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cpp
index 43bdf40f..43bdf40f 100644
--- a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc
+++ b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cpp
diff --git a/chalk/colorspaces/gray_u8/Makefile.am b/chalk/colorspaces/gray_u8/Makefile.am
index 9f435266..4cdaf81b 100644
--- a/chalk/colorspaces/gray_u8/Makefile.am
+++ b/chalk/colorspaces/gray_u8/Makefile.am
@@ -9,13 +9,13 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 
 
 lib_LTLIBRARIES = libchalkgrayscale.la
-libchalkgrayscale_la_SOURCES = kis_gray_colorspace.cc
+libchalkgrayscale_la_SOURCES = kis_gray_colorspace.cpp
 libchalkgrayscale_la_LDFLAGS = $(all_libraries)
 libchalkgrayscale_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
 kde_module_LTLIBRARIES = chalkgrayplugin.la
 
-chalkgrayplugin_la_SOURCES = gray_plugin.cc
+chalkgrayplugin_la_SOURCES = gray_plugin.cpp
 noinst_HEADERS = gray_plugin.h kis_gray_colorspace.h
 
 chalkgrayplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/gray_u8/gray_plugin.cc b/chalk/colorspaces/gray_u8/gray_plugin.cpp
index 7d03d5f6..7f177eea 100644
--- a/chalk/colorspaces/gray_u8/gray_plugin.cc
+++ b/chalk/colorspaces/gray_u8/gray_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * gray_plugin.cc -- Part of Chalk
+ * gray_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cpp
index 989cc2c5..989cc2c5 100644
--- a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc
+++ b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cpp
diff --git a/chalk/colorspaces/lms_f32/Makefile.am b/chalk/colorspaces/lms_f32/Makefile.am
index 9e5d02cf..c93c7447 100644
--- a/chalk/colorspaces/lms_f32/Makefile.am
+++ b/chalk/colorspaces/lms_f32/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = \
 
 
 lib_LTLIBRARIES = libchalk_lms_f32.la
-libchalk_lms_f32_la_SOURCES = kis_lms_f32_colorspace.cc
+libchalk_lms_f32_la_SOURCES = kis_lms_f32_colorspace.cpp
 libchalk_lms_f32_la_LDFLAGS = $(all_libraries)
 libchalk_lms_f32_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -18,7 +18,7 @@ libchalk_lms_f32_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_lms_f32_plugin.la
 
 # Srcs for the plugin
-chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cc
+chalk_lms_f32_plugin_la_SOURCES = lms_f32_plugin.cpp
 noinst_HEADERS = lms_f32_plugin.h kis_lms_f32_colorspace.h
 
 chalk_lms_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cpp
index 67ad17d0..67ad17d0 100644
--- a/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cc
+++ b/chalk/colorspaces/lms_f32/kis_lms_f32_colorspace.cpp
diff --git a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
index f7e581ac..2c83ccd6 100644
--- a/chalk/colorspaces/lms_f32/lms_f32_plugin.cc
+++ b/chalk/colorspaces/lms_f32/lms_f32_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* lms_f32_plugin.cc -- Part of Chalk
+* lms_f32_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am
index 8f88e632..1aaccf15 100644
--- a/chalk/colorspaces/rgb_f16half/Makefile.am
+++ b/chalk/colorspaces/rgb_f16half/Makefile.am
@@ -13,7 +13,7 @@ CXXFLAGS += $(OPENEXR_CXXFLAGS)
 
 
 lib_LTLIBRARIES = libchalk_rgb_f16half.la
-libchalk_rgb_f16half_la_SOURCES = kis_rgb_f16half_colorspace.cc
+libchalk_rgb_f16half_la_SOURCES = kis_rgb_f16half_colorspace.cpp
 libchalk_rgb_f16half_la_LDFLAGS = $(all_libraries)
 libchalk_rgb_f16half_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -21,7 +21,7 @@ libchalk_rgb_f16half_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_rgb_f16half_plugin.la
 
 # Srcs for the plugin
-chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cc
+chalk_rgb_f16half_plugin_la_SOURCES = rgb_f16half_plugin.cpp
 noinst_HEADERS = rgb_f16half_plugin.h kis_rgb_f16half_colorspace.h
 
 chalk_rgb_f16half_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cpp
index fd065637..fd065637 100644
--- a/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cc
+++ b/chalk/colorspaces/rgb_f16half/kis_rgb_f16half_colorspace.cpp
diff --git a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
index 911da6a0..32505bc8 100644
--- a/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cc
+++ b/chalk/colorspaces/rgb_f16half/rgb_f16half_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* rgb_f32_plugin.cc -- Part of Chalk
+* rgb_f32_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/rgb_f16half/tests/Makefile.am b/chalk/colorspaces/rgb_f16half/tests/Makefile.am
index cdb3f06c..ae1cfc82 100644
--- a/chalk/colorspaces/rgb_f16half/tests/Makefile.am
+++ b/chalk/colorspaces/rgb_f16half/tests/Makefile.am
@@ -10,7 +10,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
 check_LTLIBRARIES = tdeunittest_kis_rgb_f16half_colorspace_tester.la
 
-tdeunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cc
+tdeunittest_kis_rgb_f16half_colorspace_tester_la_SOURCES = kis_rgb_f16half_colorspace_tester.cpp
 tdeunittest_kis_rgb_f16half_colorspace_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f16half.la
 tdeunittest_kis_rgb_f16half_colorspace_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
diff --git a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cpp
index bb2094ef..bb2094ef 100644
--- a/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cc
+++ b/chalk/colorspaces/rgb_f16half/tests/kis_rgb_f16half_colorspace_tester.cpp
diff --git a/chalk/colorspaces/rgb_f32/Makefile.am b/chalk/colorspaces/rgb_f32/Makefile.am
index 1632d78e..7b909d1a 100644
--- a/chalk/colorspaces/rgb_f32/Makefile.am
+++ b/chalk/colorspaces/rgb_f32/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = \
 
 
 lib_LTLIBRARIES = libchalk_rgb_f32.la
-libchalk_rgb_f32_la_SOURCES = kis_rgb_f32_colorspace.cc
+libchalk_rgb_f32_la_SOURCES = kis_rgb_f32_colorspace.cpp
 libchalk_rgb_f32_la_LDFLAGS = $(all_libraries)
 libchalk_rgb_f32_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -18,7 +18,7 @@ libchalk_rgb_f32_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_rgb_f32_plugin.la
 
 # Srcs for the plugin
-chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cc
+chalk_rgb_f32_plugin_la_SOURCES = rgb_f32_plugin.cpp
 noinst_HEADERS = rgb_f32_plugin.h kis_rgb_f32_colorspace.h
 
 chalk_rgb_f32_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cpp
index d4eb9eac..d4eb9eac 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cc
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.cpp
diff --git a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
index c6551a4c..785009e0 100644
--- a/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
+++ b/chalk/colorspaces/rgb_f32/kis_rgb_f32_colorspace.h
@@ -132,7 +132,7 @@ private:
     };
     struct F32OpacityTest {
         inline bool operator()(const float& opacity) const {
-            return opacity > F32_OPACITY_TRANSPARENT + 1e-6; // #define EPSILON in the .cc
+            return opacity > F32_OPACITY_TRANSPARENT + 1e-6; // #define EPSILON in the .cpp
         }
     };
 };
diff --git a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
index 7c114971..adc540ac 100644
--- a/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cc
+++ b/chalk/colorspaces/rgb_f32/rgb_f32_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* rgb_f32_plugin.cc -- Part of Chalk
+* rgb_f32_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/rgb_f32/tests/Makefile.am b/chalk/colorspaces/rgb_f32/tests/Makefile.am
index 9ad10271..073c5da7 100644
--- a/chalk/colorspaces/rgb_f32/tests/Makefile.am
+++ b/chalk/colorspaces/rgb_f32/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
 check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_f32_tester.la
 
-tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cc
+tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_SOURCES = kis_strategy_colorspace_rgb_f32_tester.cpp
 tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_f32.la
 tdeunittest_kis_strategy_colorspace_rgb_f32_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
diff --git a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cpp
index 4a446a83..4a446a83 100644
--- a/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cc
+++ b/chalk/colorspaces/rgb_f32/tests/kis_strategy_colorspace_rgb_f32_tester.cpp
diff --git a/chalk/colorspaces/rgb_u16/Makefile.am b/chalk/colorspaces/rgb_u16/Makefile.am
index a0987b14..ce2f08bb 100644
--- a/chalk/colorspaces/rgb_u16/Makefile.am
+++ b/chalk/colorspaces/rgb_u16/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 	$(all_includes)
 
 lib_LTLIBRARIES = libchalk_rgb_u16.la
-libchalk_rgb_u16_la_SOURCES = kis_rgb_u16_colorspace.cc
+libchalk_rgb_u16_la_SOURCES = kis_rgb_u16_colorspace.cpp
 libchalk_rgb_u16_la_LDFLAGS = $(all_libraries)
 libchalk_rgb_u16_la_LIBADD = ../../chalkcolor/libchalkcolor.la
 
@@ -16,7 +16,7 @@ libchalk_rgb_u16_la_LIBADD = ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_rgb_u16_plugin.la
 
 # Srcs for the plugin
-chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cc
+chalk_rgb_u16_plugin_la_SOURCES = rgb_u16_plugin.cpp
 noinst_HEADERS = rgb_u16_plugin.h kis_rgb_u16_colorspace.h
 
 chalk_rgb_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cpp
index 40198c91..40198c91 100644
--- a/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cc
+++ b/chalk/colorspaces/rgb_u16/kis_rgb_u16_colorspace.cpp
diff --git a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
index bc362a83..da6e6e42 100644
--- a/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cc
+++ b/chalk/colorspaces/rgb_u16/rgb_u16_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* rgb_u16_plugin.cc -- Part of Chalk
+* rgb_u16_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 * Copyright (c) 2005 Adrian Page <[email protected]>
diff --git a/chalk/colorspaces/rgb_u16/tests/Makefile.am b/chalk/colorspaces/rgb_u16/tests/Makefile.am
index 76c4d175..5bed7dfa 100644
--- a/chalk/colorspaces/rgb_u16/tests/Makefile.am
+++ b/chalk/colorspaces/rgb_u16/tests/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS = -I$(srcdir)/.. \
 # $(KDE_CHECK_PLUGIN) assures a shared library is created.
 check_LTLIBRARIES = tdeunittest_kis_strategy_colorspace_rgb_u16_tester.la
 
-tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cc
+tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_SOURCES = kis_strategy_colorspace_rgb_u16_tester.cpp
 tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LIBADD = -ltdeunittest ../libchalk_rgb_u16.la
 tdeunittest_kis_strategy_colorspace_rgb_u16_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
diff --git a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cpp
index dedc28a9..dedc28a9 100644
--- a/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cc
+++ b/chalk/colorspaces/rgb_u16/tests/kis_strategy_colorspace_rgb_u16_tester.cpp
diff --git a/chalk/colorspaces/rgb_u8/Makefile.am b/chalk/colorspaces/rgb_u8/Makefile.am
index 3705ea70..68a010b3 100644
--- a/chalk/colorspaces/rgb_u8/Makefile.am
+++ b/chalk/colorspaces/rgb_u8/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 	$(all_includes)
 
 lib_LTLIBRARIES = libchalkrgb.la
-libchalkrgb_la_SOURCES = kis_rgb_colorspace.cc
+libchalkrgb_la_SOURCES = kis_rgb_colorspace.cpp
 libchalkrgb_la_LDFLAGS = $(all_libraries) $(LIB_QT)
 libchalkrgb_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 
@@ -16,7 +16,7 @@ libchalkrgb_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalkrgbplugin.la
 
 # Srcs for the plugin
-chalkrgbplugin_la_SOURCES = rgb_plugin.cc
+chalkrgbplugin_la_SOURCES = rgb_plugin.cpp
 noinst_HEADERS = rgb_plugin.h kis_rgb_colorspace.h
 
 chalkrgbplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
diff --git a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cpp
index 0aaea6da..0aaea6da 100644
--- a/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cc
+++ b/chalk/colorspaces/rgb_u8/kis_rgb_colorspace.cpp
diff --git a/chalk/colorspaces/rgb_u8/rgb_plugin.cc b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
index 26310125..33f18b17 100644
--- a/chalk/colorspaces/rgb_u8/rgb_plugin.cc
+++ b/chalk/colorspaces/rgb_u8/rgb_plugin.cpp
@@ -1,5 +1,5 @@
 /*
-* rgb_plugin.cc -- Part of Chalk
+* rgb_plugin.cpp -- Part of Chalk
 *
 * Copyright (c) 2004 Boudewijn Rempt ([email protected])
 *
diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am
index 74c6e7db..fb1eaf2b 100644
--- a/chalk/colorspaces/wet/Makefile.am
+++ b/chalk/colorspaces/wet/Makefile.am
@@ -17,8 +17,8 @@ INCLUDES  = -I$(srcdir)/../../sdk \
 
 kde_module_LTLIBRARIES = chalkwetplugin.la
 
-chalkwetplugin_la_SOURCES = kis_wet_colorspace.cc wet_plugin.cc kis_wetop.cc kis_wet_palette_widget.cc kis_wetness_visualisation_filter.cc kis_texture_painter.cc kis_texture_filter.cc wetphysicsfilter.cc wdgpressure.ui
-noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cc kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h
+chalkwetplugin_la_SOURCES = kis_wet_colorspace.cpp wet_plugin.cpp kis_wetop.cpp kis_wet_palette_widget.cpp kis_wetness_visualisation_filter.cpp kis_texture_painter.cpp kis_texture_filter.cpp wetphysicsfilter.cpp wdgpressure.ui
+noinst_HEADERS = kis_wet_colorspace.h wet_plugin.h wetphysicsfilter.h kis_wetop.cpp kis_wet_palette_widget.h kis_texture_painter.h kis_wetness_visualisation_filter.h kis_texture_filter.h wetphysicsfilter.h
 
 chalkwetplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
 chalkwetplugin_la_LIBADD =  ../../libchalkcommon.la $(LIB_KOPAINTER) $(LIB_KOFFICECORE) \
diff --git a/chalk/colorspaces/wet/kis_texture_filter.cc b/chalk/colorspaces/wet/kis_texture_filter.cpp
index 6f58cd14..f70272db 100644
--- a/chalk/colorspaces/wet/kis_texture_filter.cc
+++ b/chalk/colorspaces/wet/kis_texture_filter.cpp
@@ -1,5 +1,5 @@
 /*
- * kis_texture_filter.cc -- Part of Chalk
+ * kis_texture_filter.cpp -- Part of Chalk
  *
  * Copyright (c) 2005 Bart Coppens <[email protected]>
  *
diff --git a/chalk/colorspaces/wet/kis_texture_painter.cc b/chalk/colorspaces/wet/kis_texture_painter.cpp
index 9300e808..9300e808 100644
--- a/chalk/colorspaces/wet/kis_texture_painter.cc
+++ b/chalk/colorspaces/wet/kis_texture_painter.cpp
diff --git a/chalk/colorspaces/wet/kis_wet_colorspace.cc b/chalk/colorspaces/wet/kis_wet_colorspace.cpp
index b867e01e..b867e01e 100644
--- a/chalk/colorspaces/wet/kis_wet_colorspace.cc
+++ b/chalk/colorspaces/wet/kis_wet_colorspace.cpp
diff --git a/chalk/colorspaces/wet/kis_wet_palette_widget.cc b/chalk/colorspaces/wet/kis_wet_palette_widget.cpp
index 43cfd559..43cfd559 100644
--- a/chalk/colorspaces/wet/kis_wet_palette_widget.cc
+++ b/chalk/colorspaces/wet/kis_wet_palette_widget.cpp
diff --git a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp
index f17f4e1c..63442446 100644
--- a/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cc
+++ b/chalk/colorspaces/wet/kis_wetness_visualisation_filter.cpp
@@ -1,5 +1,5 @@
 /*
- * kis_wetness_visualisation_filter.cc -- Part of Chalk
+ * kis_wetness_visualisation_filter.cpp -- Part of Chalk
  *
  * Copyright (c) 2005 Bart Coppens <[email protected]>
  *
diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cpp
index 15625e5d..15625e5d 100644
--- a/chalk/colorspaces/wet/kis_wetop.cc
+++ b/chalk/colorspaces/wet/kis_wetop.cpp
diff --git a/chalk/colorspaces/wet/wet_plugin.cc b/chalk/colorspaces/wet/wet_plugin.cpp
index b919a289..259fe5d1 100644
--- a/chalk/colorspaces/wet/wet_plugin.cc
+++ b/chalk/colorspaces/wet/wet_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * wet_plugin.cc -- Part of Chalk
+ * wet_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cpp
index 3a439443..3a439443 100644
--- a/chalk/colorspaces/wet/wetphysicsfilter.cc
+++ b/chalk/colorspaces/wet/wetphysicsfilter.cpp
diff --git a/chalk/colorspaces/wetsticky/Makefile.am b/chalk/colorspaces/wetsticky/Makefile.am
index 4ade368a..5d4e0289 100644
--- a/chalk/colorspaces/wetsticky/Makefile.am
+++ b/chalk/colorspaces/wetsticky/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES  =  -I$(srcdir)/../../sdk \
 
 kde_module_LTLIBRARIES = chalkwsplugin.la
 
-chalkwsplugin_la_SOURCES = wet_sticky_plugin.cc kis_wet_sticky_colorspace.cc kis_ws_engine_filter.cc
+chalkwsplugin_la_SOURCES = wet_sticky_plugin.cpp kis_wet_sticky_colorspace.cpp kis_ws_engine_filter.cpp
 noinst_HEADERS = wet_sticky_plugin.h kis_wet_sticky_colorspace.h kis_ws_engine_filter.h
 
 chalkwsplugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
diff --git a/chalk/colorspaces/wetsticky/brushop/Makefile.am b/chalk/colorspaces/wetsticky/brushop/Makefile.am
index 8df4d61e..eae064f8 100644
--- a/chalk/colorspaces/wetsticky/brushop/Makefile.am
+++ b/chalk/colorspaces/wetsticky/brushop/Makefile.am
@@ -13,8 +13,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 
 chalkwsbrushpaintop_la_SOURCES = \
-	wsbrushpaintop_plugin.cc \
-	kis_wsbrushop.cc
+	wsbrushpaintop_plugin.cpp \
+	kis_wsbrushop.cpp
 
 noinst_HEADERS= \
 	wsbrushpaintop_plugin.h \
diff --git a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cpp
index ed828bf5..ed828bf5 100644
--- a/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cc
+++ b/chalk/colorspaces/wetsticky/brushop/kis_wsbrushop.cpp
diff --git a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
index 1f141bb4..97c892b2 100644
--- a/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cc
+++ b/chalk/colorspaces/wetsticky/brushop/wsbrushpaintop_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * wsbrushpaintop_plugin.cc -- Part of Chalk
+ * wsbrushpaintop_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2005 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cpp
index 3e47114a..3e47114a 100644
--- a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc
+++ b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cpp
diff --git a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
index c53f6ea0..c53f6ea0 100644
--- a/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cc
+++ b/chalk/colorspaces/wetsticky/kis_ws_engine_filter.cpp
diff --git a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
index 76dee20e..e56e4cc8 100644
--- a/chalk/colorspaces/wetsticky/wet_sticky_plugin.cc
+++ b/chalk/colorspaces/wetsticky/wet_sticky_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * wet_sticky_plugin.cc -- Part of Chalk
+ * wet_sticky_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2005 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/colorspaces/ycbcr_u16/Makefile.am b/chalk/colorspaces/ycbcr_u16/Makefile.am
index 994fb478..709b89d7 100644
--- a/chalk/colorspaces/ycbcr_u16/Makefile.am
+++ b/chalk/colorspaces/ycbcr_u16/Makefile.am
@@ -16,7 +16,7 @@ libchalk_ycbcr_u16_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_ycbcr_u16_plugin.la
 
 # Srcs for the plugin
-chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cc
+chalk_ycbcr_u16_plugin_la_SOURCES = ycbcr_u16_plugin.cpp
 noinst_HEADERS = ycbcr_u16_plugin.h kis_ycbcr_u16_colorspace.h
 
 chalk_ycbcr_u16_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
@@ -24,6 +24,6 @@ chalk_ycbcr_u16_plugin_la_LIBADD =  libchalk_ycbcr_u16.la ../../chalkcolor/libch
 
 METASOURCES = AUTO
 
-libchalk_ycbcr_u16_la_SOURCES = kis_ycbcr_u16_colorspace.cc
+libchalk_ycbcr_u16_la_SOURCES = kis_ycbcr_u16_colorspace.cpp
 
 .NOTPARALLEL:
diff --git a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cpp
index 4d7493b2..4d7493b2 100644
--- a/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u16/kis_ycbcr_u16_colorspace.cpp
diff --git a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
index fdfb2310..4371a20a 100644
--- a/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cc
+++ b/chalk/colorspaces/ycbcr_u16/ycbcr_u16_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * ycbcr_u16_plugin.cc -- Part of Chalk
+ * ycbcr_u16_plugin.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <[email protected]>
  *
diff --git a/chalk/colorspaces/ycbcr_u8/Makefile.am b/chalk/colorspaces/ycbcr_u8/Makefile.am
index 5d496e78..b6175aa3 100644
--- a/chalk/colorspaces/ycbcr_u8/Makefile.am
+++ b/chalk/colorspaces/ycbcr_u8/Makefile.am
@@ -16,7 +16,7 @@ libchalk_ycbcr_u8_la_LIBADD =  ../../chalkcolor/libchalkcolor.la
 kde_module_LTLIBRARIES = chalk_ycbcr_u8_plugin.la
 
 # Srcs for the plugin
-chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cc
+chalk_ycbcr_u8_plugin_la_SOURCES = ycbcr_u8_plugin.cpp
 noinst_HEADERS = ycbcr_u8_plugin.h kis_ycbcr_u8_colorspace.h
 
 chalk_ycbcr_u8_plugin_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts -llcms
@@ -25,7 +25,7 @@ chalk_ycbcr_u8_plugin_la_LIBADD =  libchalk_ycbcr_u8.la ../../chalkcolor/libchal
 METASOURCES = AUTO
 
 
-libchalk_ycbcr_u8_la_SOURCES = kis_ycbcr_u8_colorspace.cc
+libchalk_ycbcr_u8_la_SOURCES = kis_ycbcr_u8_colorspace.cpp
 kde_services_DATA = chalk_ycbcr_u8_plugin.desktop
 
 .NOTPARALLEL:
diff --git a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cpp
index 5cd13231..5cd13231 100644
--- a/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cc
+++ b/chalk/colorspaces/ycbcr_u8/kis_ycbcr_u8_colorspace.cpp
diff --git a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
index 34207432..6c3ac243 100644
--- a/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cc
+++ b/chalk/colorspaces/ycbcr_u8/ycbcr_u8_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * ycbcr_u8_plugin.cc -- Part of Chalk
+ * ycbcr_u8_plugin.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <[email protected]>
  *
diff --git a/chalk/core/Makefile.am b/chalk/core/Makefile.am
index 39b59372..cd62152b 100644
--- a/chalk/core/Makefile.am
+++ b/chalk/core/Makefile.am
@@ -13,21 +13,21 @@ CXXFLAGS += $(OPENEXR_CXXFLAGS)
 
 lib_LTLIBRARIES = libchalkimage.la
 
-libchalkimage_la_SOURCES = kis_adjustment_layer.cc kis_alpha_mask.cc \
-				kis_autobrush_resource.cc kis_autogradient_resource.cc kis_background.cc kis_boundary.cc \
-				kis_brush.cc kis_command.cc kis_convolution_painter.cc kis_fill_painter.cc \
-				kis_filter.cc kis_filter_registry.cc kis_filter_strategy.cc \
-				kis_filter_configuration.cc kis_filter_config_widget.cc kis_gradient.cc kis_gradient_painter.cc \
-				kis_histogram.cc kis_image.cc kis_imagepipe_brush.cc kis_iterator.cc \
-				kis_iterators_pixel.cc kis_layer.cc kis_group_layer.cc kis_paint_layer.cc kis_meta_registry.cc \
-				kis_nameserver.cc kis_painter.cc kis_paintop.cc kis_paintop_registry.cc kis_palette.cc \
-				kis_pattern.cc kis_rect.cc kis_resource.cc kis_rotate_visitor.cc \
-				kis_selected_transaction.cc kis_selection.cc kis_strategy_move.cc kis_transaction.cc \
-				kis_transform_worker.cc kis_vec.cc kis_paint_device.cc kis_paint_device_iface.cc \
-				kis_paint_device_iface.skel kis_image_iface.cc kis_image_iface.skel kis_basic_math_toolbox.cpp \
-				kis_math_toolbox.cpp kis_exif_info.cc kis_thread_pool.cc kis_exif_value.cc \
+libchalkimage_la_SOURCES = kis_adjustment_layer.cpp kis_alpha_mask.cpp \
+				kis_autobrush_resource.cpp kis_autogradient_resource.cpp kis_background.cpp kis_boundary.cpp \
+				kis_brush.cpp kis_command.cpp kis_convolution_painter.cpp kis_fill_painter.cpp \
+				kis_filter.cpp kis_filter_registry.cpp kis_filter_strategy.cpp \
+				kis_filter_configuration.cpp kis_filter_config_widget.cpp kis_gradient.cpp kis_gradient_painter.cpp \
+				kis_histogram.cpp kis_image.cpp kis_imagepipe_brush.cpp kis_iterator.cpp \
+				kis_iterators_pixel.cpp kis_layer.cpp kis_group_layer.cpp kis_paint_layer.cpp kis_meta_registry.cpp \
+				kis_nameserver.cpp kis_painter.cpp kis_paintop.cpp kis_paintop_registry.cpp kis_palette.cpp \
+				kis_pattern.cpp kis_rect.cpp kis_resource.cpp kis_rotate_visitor.cpp \
+				kis_selected_transaction.cpp kis_selection.cpp kis_strategy_move.cpp kis_transaction.cpp \
+				kis_transform_worker.cpp kis_vec.cpp kis_paint_device.cpp kis_paint_device_iface.cpp \
+				kis_paint_device_iface.skel kis_image_iface.cpp kis_image_iface.skel kis_basic_math_toolbox.cpp \
+				kis_math_toolbox.cpp kis_exif_info.cpp kis_thread_pool.cpp kis_exif_value.cpp \
 				kis_filter_strategy.h kis_random_accessor.cpp kis_random_sub_accessor.cpp \
-			kis_perspective_grid.cpp kis_perspectivetransform_worker.cpp kis_perspective_math.cpp kis_scale_visitor.cc
+			kis_perspective_grid.cpp kis_perspectivetransform_worker.cpp kis_perspective_math.cpp kis_scale_visitor.cpp
 
 noinst_HEADERS = kis_rotate_visitor.h kis_selected_transaction.h \
 			kis_strategy_move.h kis_transform_worker.h kis_datamanager.h kis_iteratorpixeltrait.h \
diff --git a/chalk/core/createdcop.py b/chalk/core/createdcop.py
index ef7acc5e..337d9076 100755
--- a/chalk/core/createdcop.py
+++ b/chalk/core/createdcop.py
@@ -149,7 +149,7 @@ def createDCOP(header):
 		classname = classname + part.capitalize()
 		classname_upper = classname_upper + part.upper() + "_"
 	ifaceheader = header[:-2] + "_iface.h"
-	ifaceimplementation = header[:-2] + "_iface.cc"
+	ifaceimplementation = header[:-2] + "_iface.cpp"
 	ifaceclass = classname + "Iface"
 
 	#print "with: ", implementation, classname, classname_upper, ifaceheader, ifaceimplementation, ifaceclass
diff --git a/chalk/core/kis_adjustment_layer.cc b/chalk/core/kis_adjustment_layer.cpp
index 69e8b939..69e8b939 100644
--- a/chalk/core/kis_adjustment_layer.cc
+++ b/chalk/core/kis_adjustment_layer.cpp
diff --git a/chalk/core/kis_alpha_mask.cc b/chalk/core/kis_alpha_mask.cpp
index 15296308..15296308 100644
--- a/chalk/core/kis_alpha_mask.cc
+++ b/chalk/core/kis_alpha_mask.cpp
diff --git a/chalk/core/kis_autobrush_resource.cc b/chalk/core/kis_autobrush_resource.cpp
index 9a09fe78..9a09fe78 100644
--- a/chalk/core/kis_autobrush_resource.cc
+++ b/chalk/core/kis_autobrush_resource.cpp
diff --git a/chalk/core/kis_autogradient_resource.cc b/chalk/core/kis_autogradient_resource.cpp
index 671e8fc2..aaac54ef 100644
--- a/chalk/core/kis_autogradient_resource.cc
+++ b/chalk/core/kis_autogradient_resource.cpp
@@ -20,7 +20,7 @@
 #include "kis_gradient.h"
 #include "kis_autogradient_resource.h"
 
-// FIXME: use the same #define as in kis_gradient.cc, probably best customizable?
+// FIXME: use the same #define as in kis_gradient.cpp, probably best customizable?
 #define PREVIEW_WIDTH 64
 #define PREVIEW_HEIGHT 64
 
diff --git a/chalk/core/kis_background.cc b/chalk/core/kis_background.cpp
index 506d49e8..506d49e8 100644
--- a/chalk/core/kis_background.cc
+++ b/chalk/core/kis_background.cpp
diff --git a/chalk/core/kis_boundary.cc b/chalk/core/kis_boundary.cpp
index a15697a7..a15697a7 100644
--- a/chalk/core/kis_boundary.cc
+++ b/chalk/core/kis_boundary.cpp
diff --git a/chalk/core/kis_brush.cc b/chalk/core/kis_brush.cpp
index 49ee8e58..49ee8e58 100644
--- a/chalk/core/kis_brush.cc
+++ b/chalk/core/kis_brush.cpp
diff --git a/chalk/core/kis_command.cc b/chalk/core/kis_command.cpp
index 11da634b..11da634b 100644
--- a/chalk/core/kis_command.cc
+++ b/chalk/core/kis_command.cpp
diff --git a/chalk/core/kis_convolution_painter.cc b/chalk/core/kis_convolution_painter.cpp
index f5ee5573..f5ee5573 100644
--- a/chalk/core/kis_convolution_painter.cc
+++ b/chalk/core/kis_convolution_painter.cpp
diff --git a/chalk/core/kis_exif_info.cc b/chalk/core/kis_exif_info.cpp
index 5d54ed5e..5d54ed5e 100644
--- a/chalk/core/kis_exif_info.cc
+++ b/chalk/core/kis_exif_info.cpp
diff --git a/chalk/core/kis_exif_value.cc b/chalk/core/kis_exif_value.cpp
index 134d4009..134d4009 100644
--- a/chalk/core/kis_exif_value.cc
+++ b/chalk/core/kis_exif_value.cpp
diff --git a/chalk/core/kis_fill_painter.cc b/chalk/core/kis_fill_painter.cpp
index 6b88759a..6b88759a 100644
--- a/chalk/core/kis_fill_painter.cc
+++ b/chalk/core/kis_fill_painter.cpp
diff --git a/chalk/core/kis_filter.cc b/chalk/core/kis_filter.cpp
index ee396596..ee396596 100644
--- a/chalk/core/kis_filter.cc
+++ b/chalk/core/kis_filter.cpp
diff --git a/chalk/core/kis_filter_config_widget.cc b/chalk/core/kis_filter_config_widget.cpp
index 1df05f64..1df05f64 100644
--- a/chalk/core/kis_filter_config_widget.cc
+++ b/chalk/core/kis_filter_config_widget.cpp
diff --git a/chalk/core/kis_filter_configuration.cc b/chalk/core/kis_filter_configuration.cpp
index c1dec978..c1dec978 100644
--- a/chalk/core/kis_filter_configuration.cc
+++ b/chalk/core/kis_filter_configuration.cpp
diff --git a/chalk/core/kis_filter_registry.cc b/chalk/core/kis_filter_registry.cpp
index f67e3ecc..f67e3ecc 100644
--- a/chalk/core/kis_filter_registry.cc
+++ b/chalk/core/kis_filter_registry.cpp
diff --git a/chalk/core/kis_filter_strategy.cc b/chalk/core/kis_filter_strategy.cpp
index 650a9681..650a9681 100644
--- a/chalk/core/kis_filter_strategy.cc
+++ b/chalk/core/kis_filter_strategy.cpp
diff --git a/chalk/core/kis_gradient.cc b/chalk/core/kis_gradient.cpp
index 41541e80..9b240cb0 100644
--- a/chalk/core/kis_gradient.cc
+++ b/chalk/core/kis_gradient.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_gradient.cc - part of Krayon
+ *  kis_gradient.cpp - part of Krayon
  *
  *  Copyright (c) 2000 Matthias Elter <[email protected]>
  *                2001 John Califf
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cpp
index 7c2b00b1..7c2b00b1 100644
--- a/chalk/core/kis_gradient_painter.cc
+++ b/chalk/core/kis_gradient_painter.cpp
diff --git a/chalk/core/kis_group_layer.cc b/chalk/core/kis_group_layer.cpp
index 290d19f5..290d19f5 100644
--- a/chalk/core/kis_group_layer.cc
+++ b/chalk/core/kis_group_layer.cpp
diff --git a/chalk/core/kis_histogram.cc b/chalk/core/kis_histogram.cpp
index bece7c9a..bece7c9a 100644
--- a/chalk/core/kis_histogram.cc
+++ b/chalk/core/kis_histogram.cpp
diff --git a/chalk/core/kis_image.cc b/chalk/core/kis_image.cpp
index 1180bf4c..1180bf4c 100644
--- a/chalk/core/kis_image.cc
+++ b/chalk/core/kis_image.cpp
diff --git a/chalk/core/kis_image_iface.cc b/chalk/core/kis_image_iface.cpp
index 2cc16e27..2cc16e27 100644
--- a/chalk/core/kis_image_iface.cc
+++ b/chalk/core/kis_image_iface.cpp
diff --git a/chalk/core/kis_imagepipe_brush.cc b/chalk/core/kis_imagepipe_brush.cpp
index 5c60b517..5c60b517 100644
--- a/chalk/core/kis_imagepipe_brush.cc
+++ b/chalk/core/kis_imagepipe_brush.cpp
diff --git a/chalk/core/kis_iterator.cc b/chalk/core/kis_iterator.cpp
index 0e0c2d81..0e0c2d81 100644
--- a/chalk/core/kis_iterator.cc
+++ b/chalk/core/kis_iterator.cpp
diff --git a/chalk/core/kis_iterators_pixel.cc b/chalk/core/kis_iterators_pixel.cpp
index 741a20b0..741a20b0 100644
--- a/chalk/core/kis_iterators_pixel.cc
+++ b/chalk/core/kis_iterators_pixel.cpp
diff --git a/chalk/core/kis_layer.cc b/chalk/core/kis_layer.cpp
index f43570f0..f43570f0 100644
--- a/chalk/core/kis_layer.cc
+++ b/chalk/core/kis_layer.cpp
diff --git a/chalk/core/kis_meta_registry.cc b/chalk/core/kis_meta_registry.cpp
index 4bde87b2..4bde87b2 100644
--- a/chalk/core/kis_meta_registry.cc
+++ b/chalk/core/kis_meta_registry.cpp
diff --git a/chalk/core/kis_nameserver.cc b/chalk/core/kis_nameserver.cpp
index 4cb51a98..4cb51a98 100644
--- a/chalk/core/kis_nameserver.cc
+++ b/chalk/core/kis_nameserver.cpp
diff --git a/chalk/core/kis_paint_device.cc b/chalk/core/kis_paint_device.cpp
index da25caec..da25caec 100644
--- a/chalk/core/kis_paint_device.cc
+++ b/chalk/core/kis_paint_device.cpp
diff --git a/chalk/core/kis_paint_device_iface.cc b/chalk/core/kis_paint_device_iface.cpp
index c8afa80a..c8afa80a 100644
--- a/chalk/core/kis_paint_device_iface.cc
+++ b/chalk/core/kis_paint_device_iface.cpp
diff --git a/chalk/core/kis_paint_layer.cc b/chalk/core/kis_paint_layer.cpp
index a4c5412d..a4c5412d 100644
--- a/chalk/core/kis_paint_layer.cc
+++ b/chalk/core/kis_paint_layer.cpp
diff --git a/chalk/core/kis_painter.cc b/chalk/core/kis_painter.cpp
index f3f5c928..f3f5c928 100644
--- a/chalk/core/kis_painter.cc
+++ b/chalk/core/kis_painter.cpp
diff --git a/chalk/core/kis_paintop.cc b/chalk/core/kis_paintop.cpp
index 59cfef6b..59cfef6b 100644
--- a/chalk/core/kis_paintop.cc
+++ b/chalk/core/kis_paintop.cpp
diff --git a/chalk/core/kis_paintop_registry.cc b/chalk/core/kis_paintop_registry.cpp
index d549c3ad..d549c3ad 100644
--- a/chalk/core/kis_paintop_registry.cc
+++ b/chalk/core/kis_paintop_registry.cpp
diff --git a/chalk/core/kis_palette.cc b/chalk/core/kis_palette.cpp
index aa62b07a..aa62b07a 100644
--- a/chalk/core/kis_palette.cc
+++ b/chalk/core/kis_palette.cpp
diff --git a/chalk/core/kis_pattern.cc b/chalk/core/kis_pattern.cpp
index 654449b8..b2a52995 100644
--- a/chalk/core/kis_pattern.cc
+++ b/chalk/core/kis_pattern.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_pattern.cc - part of Krayon
+ *  kis_pattern.cpp - part of Krayon
  *
  *  Copyright (c) 2000 Matthias Elter <[email protected]>
  *                2001 John Califf
diff --git a/chalk/core/kis_rect.cc b/chalk/core/kis_rect.cpp
index 175a07a9..175a07a9 100644
--- a/chalk/core/kis_rect.cc
+++ b/chalk/core/kis_rect.cpp
diff --git a/chalk/core/kis_resource.cc b/chalk/core/kis_resource.cpp
index a856cbb1..a856cbb1 100644
--- a/chalk/core/kis_resource.cc
+++ b/chalk/core/kis_resource.cpp
diff --git a/chalk/core/kis_rotate_visitor.cc b/chalk/core/kis_rotate_visitor.cpp
index abb47a05..abb47a05 100644
--- a/chalk/core/kis_rotate_visitor.cc
+++ b/chalk/core/kis_rotate_visitor.cpp
diff --git a/chalk/core/kis_scale_visitor.cc b/chalk/core/kis_scale_visitor.cpp
index a06d674d..a06d674d 100644
--- a/chalk/core/kis_scale_visitor.cc
+++ b/chalk/core/kis_scale_visitor.cpp
diff --git a/chalk/core/kis_selected_transaction.cc b/chalk/core/kis_selected_transaction.cpp
index 44eec697..44eec697 100644
--- a/chalk/core/kis_selected_transaction.cc
+++ b/chalk/core/kis_selected_transaction.cpp
diff --git a/chalk/core/kis_selection.cc b/chalk/core/kis_selection.cpp
index ea8f2be2..ea8f2be2 100644
--- a/chalk/core/kis_selection.cc
+++ b/chalk/core/kis_selection.cpp
diff --git a/chalk/core/kis_strategy_move.cc b/chalk/core/kis_strategy_move.cpp
index d5102c8b..d5102c8b 100644
--- a/chalk/core/kis_strategy_move.cc
+++ b/chalk/core/kis_strategy_move.cpp
diff --git a/chalk/core/kis_thread_pool.cc b/chalk/core/kis_thread_pool.cpp
index 12807192..12807192 100644
--- a/chalk/core/kis_thread_pool.cc
+++ b/chalk/core/kis_thread_pool.cpp
diff --git a/chalk/core/kis_transaction.cc b/chalk/core/kis_transaction.cpp
index d0a10acc..d0a10acc 100644
--- a/chalk/core/kis_transaction.cc
+++ b/chalk/core/kis_transaction.cpp
diff --git a/chalk/core/kis_transform_worker.cc b/chalk/core/kis_transform_worker.cpp
index 0d4a98b4..0d4a98b4 100644
--- a/chalk/core/kis_transform_worker.cc
+++ b/chalk/core/kis_transform_worker.cpp
diff --git a/chalk/core/kis_vec.cc b/chalk/core/kis_vec.cpp
index fa54e1f9..9bd6ada9 100644
--- a/chalk/core/kis_vec.cc
+++ b/chalk/core/kis_vec.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_vec.cc - part of KImageShop
+ *  kis_vec.cpp - part of KImageShop
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *
diff --git a/chalk/core/tests/Makefile.am b/chalk/core/tests/Makefile.am
index 97316685..9b78866a 100644
--- a/chalk/core/tests/Makefile.am
+++ b/chalk/core/tests/Makefile.am
@@ -21,7 +21,7 @@ tdeunittest_kis_image_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
 tdeunittest_kis_image_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
 
-tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cc
+tdeunittest_kis_filter_configuration_tester_la_SOURCES = kis_filter_configuration_tester.cpp
 tdeunittest_kis_filter_configuration_tester_la_LIBADD = -ltdeunittest ../../libchalkcommon.la
 tdeunittest_kis_filter_configuration_tester_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)
 
diff --git a/chalk/core/tests/kis_filter_configuration_tester.cc b/chalk/core/tests/kis_filter_configuration_tester.cpp
index 135e7248..135e7248 100644
--- a/chalk/core/tests/kis_filter_configuration_tester.cc
+++ b/chalk/core/tests/kis_filter_configuration_tester.cpp
diff --git a/chalk/core/tiles/Makefile.am b/chalk/core/tiles/Makefile.am
index 7fad1ab9..9ebe93ec 100644
--- a/chalk/core/tiles/Makefile.am
+++ b/chalk/core/tiles/Makefile.am
@@ -12,9 +12,9 @@ INCLUDES  = -I$(srcdir)/../ \
 
 noinst_LTLIBRARIES = libchalktile.la
 
-libchalktile_la_SOURCES = kis_tiledvlineiterator.cc kis_tiledhlineiterator.cc \
-		kis_tileddatamanager.cc kis_tile.cc kis_tilediterator.cc kis_tiledrectiterator.cc \
-		kis_memento.cc kis_tilemanager.cc kis_tiled_random_accessor.cc 
+libchalktile_la_SOURCES = kis_tiledvlineiterator.cpp kis_tiledhlineiterator.cpp \
+		kis_tileddatamanager.cpp kis_tile.cpp kis_tilediterator.cpp kis_tiledrectiterator.cpp \
+		kis_memento.cpp kis_tilemanager.cpp kis_tiled_random_accessor.cpp 
 
 libchalktile_la_METASOURCES = AUTO
 
diff --git a/chalk/core/tiles/kis_memento.cc b/chalk/core/tiles/kis_memento.cpp
index 1181f70a..1181f70a 100644
--- a/chalk/core/tiles/kis_memento.cc
+++ b/chalk/core/tiles/kis_memento.cpp
diff --git a/chalk/core/tiles/kis_tile.cc b/chalk/core/tiles/kis_tile.cpp
index 743ca82b..743ca82b 100644
--- a/chalk/core/tiles/kis_tile.cc
+++ b/chalk/core/tiles/kis_tile.cpp
diff --git a/chalk/core/tiles/kis_tiled_random_accessor.cc b/chalk/core/tiles/kis_tiled_random_accessor.cpp
index 159faf18..159faf18 100644
--- a/chalk/core/tiles/kis_tiled_random_accessor.cc
+++ b/chalk/core/tiles/kis_tiled_random_accessor.cpp
diff --git a/chalk/core/tiles/kis_tileddatamanager.cc b/chalk/core/tiles/kis_tileddatamanager.cpp
index 4586903c..4586903c 100644
--- a/chalk/core/tiles/kis_tileddatamanager.cc
+++ b/chalk/core/tiles/kis_tileddatamanager.cpp
diff --git a/chalk/core/tiles/kis_tiledhlineiterator.cc b/chalk/core/tiles/kis_tiledhlineiterator.cpp
index cf023c1e..cf023c1e 100644
--- a/chalk/core/tiles/kis_tiledhlineiterator.cc
+++ b/chalk/core/tiles/kis_tiledhlineiterator.cpp
diff --git a/chalk/core/tiles/kis_tilediterator.cc b/chalk/core/tiles/kis_tilediterator.cpp
index 0f3bdf00..0f3bdf00 100644
--- a/chalk/core/tiles/kis_tilediterator.cc
+++ b/chalk/core/tiles/kis_tilediterator.cpp
diff --git a/chalk/core/tiles/kis_tiledrectiterator.cc b/chalk/core/tiles/kis_tiledrectiterator.cpp
index 8f0f7ed1..8f0f7ed1 100644
--- a/chalk/core/tiles/kis_tiledrectiterator.cc
+++ b/chalk/core/tiles/kis_tiledrectiterator.cpp
diff --git a/chalk/core/tiles/kis_tiledvlineiterator.cc b/chalk/core/tiles/kis_tiledvlineiterator.cpp
index 0fe8514f..0fe8514f 100644
--- a/chalk/core/tiles/kis_tiledvlineiterator.cc
+++ b/chalk/core/tiles/kis_tiledvlineiterator.cpp
diff --git a/chalk/core/tiles/kis_tilemanager.cc b/chalk/core/tiles/kis_tilemanager.cpp
index aa8a207c..aa8a207c 100644
--- a/chalk/core/tiles/kis_tilemanager.cc
+++ b/chalk/core/tiles/kis_tilemanager.cpp
diff --git a/chalk/doc/DESIGN.obsolete b/chalk/doc/DESIGN.obsolete
index a1b8e58d..2f0d25ca 100644
--- a/chalk/doc/DESIGN.obsolete
+++ b/chalk/doc/DESIGN.obsolete
@@ -169,7 +169,7 @@ Random head-scratchings
        - I take it that the two tests that are present in chalk/test
        are obsolete?
 
-       - what with the dummmmmy.cc?
+       - what with the dummmmmy.cpp?
 
        - which bits of the chalk/ui files are still relevant?
 
diff --git a/chalk/doc/brush.txt b/chalk/doc/brush.txt
index e2373258..afadadc5 100644
--- a/chalk/doc/brush.txt
+++ b/chalk/doc/brush.txt
@@ -4,7 +4,7 @@ Painting with brushes
 when I started working on Chalk, I felt I needed examples. I used the following
 sources:
 
-* The old Chalk brush code (http://webcvs.kde.org/cgi-bin/cvsweb.cgi/koffice/chalk/tools/kis_tool_brush.cc?rev=1.58&content-type=text/x-cvsweb-markup)
+* The old Chalk brush code (http://webcvs.kde.org/cgi-bin/cvsweb.cgi/koffice/chalk/tools/kis_tool_brush.cpp?rev=1.58&content-type=text/x-cvsweb-markup)
 * Peter Jodda's Perico (http://software.jodda.de/perico.html)
 * The source of the Gimp (both current and 0.99.11 -- the oldest version I could find) (http://www.gimp.org)
 * David Hodson's article on Gimp brushes (http://members.ozemail.com.au/~hodsond/gimpbrush.html)
diff --git a/chalk/main.cc b/chalk/main.cpp
index 592c1368..6d6b1781 100644
--- a/chalk/main.cc
+++ b/chalk/main.cpp
@@ -1,5 +1,5 @@
 /*
- *  main.cc - part of KImageShop
+ *  main.cpp - part of KImageShop
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *  Copyright (c) 2002 Patrick Julien <[email protected]>
diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am
index 6f52db6e..4f9a60ba 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 69bac7b1..69bac7b1 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 8d360497..8d360497 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 d4213bb5..d4213bb5 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 768aaa2d..4b525169 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 9d771222..9d771222 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 9f104bea..abd3e159 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 c8be0a6f..c8be0a6f 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 9ed82fe2..9ed82fe2 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 ba9e61e0..ba9e61e0 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 9a4eec53..09e254ba 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 d3cadc68..d3cadc68 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 26f42844..26f42844 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 eac48ad3..eac48ad3 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 31b726bf..31b726bf 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 43238c42..68859821 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 754bbc2c..754bbc2c 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 cbca7a08..cbca7a08 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 d479b27d..d479b27d 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 b82b044c..372827fc 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 8f108565..8f108565 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 08601d60..08601d60 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 dc73f197..dc73f197 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 fcffb3de..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.cpp
diff --git a/chalk/plugins/filters/cubismfilter/Makefile.am b/chalk/plugins/filters/cubismfilter/Makefile.am
index e281360e..a26a8e80 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 1eb2984e..1eb2984e 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 7215a2e3..7215a2e3 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 cd2d979f..cd2d979f 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 e3f686ac..cfd32d29 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 0d6974e0..0d6974e0 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 bd11b115..bd11b115 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 372de38c..915c66cb 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 a9ade724..a9ade724 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 a9df484c..4ddc2af2 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 c43e5690..c43e5690 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 32249b69..e717429c 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 6b26ab11..6b26ab11 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 118442c2..fba91885 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 b36e5ce9..b36e5ce9 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 84dbc035..84dbc035 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 89114378..89114378 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 78a648ab..a483535d 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 d8609ba2..d8609ba2 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 9fc08b25..284b2ee9 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 de869a42..de869a42 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 d9c9f3e6..d9c9f3e6 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 8836191e..f13d2df3 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 a6b77df7..a6b77df7 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 d93cad4e..d93cad4e 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 6239b066..97f8f6de 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 acb8c2e1..acb8c2e1 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 f62196cb..f62196cb 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 5f287f23..0e3cd61e 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 74368802..74368802 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 36281ac5..3f2ae4f0 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 698961a8..698961a8 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 14610c8e..14610c8e 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 1e78bdc2..a1d9f0c8 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 a0cf20f1..a0cf20f1 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 6a7fe9ea..6a7fe9ea 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 f9e2ce2c..9e3e5d87 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 623fc690..623fc690 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 3b21c547..3b21c547 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 7846c3c0..e1a7c267 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 8477c09c..8477c09c 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 1035d30f..3178e65c 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 845262b1..845262b1 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 627d105c..627d105c 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 3d90d49e..3d90d49e 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 4e983863..09cfe270 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 9f9777bf..9f9777bf 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 441e816b..00e94465 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 25f12b87..6e1d3f75 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 ([email protected])
  *
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cpp
index 2a8750f3..2a8750f3 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 285b4d6f..285b4d6f 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 708d792c..708d792c 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 556a7775..556a7775 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 55e3b7b8..55e3b7b8 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 4a8da9a1..4a8da9a1 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 f15077b3..f15077b3 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 b4159eac..6505a088 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 17e0feff..6f1bedbb 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 ([email protected])
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
index 7c83a36b..96e26202 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
index 40a09a91..40a09a91 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 7bb4c54f..0f917e7f 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
index 919454b2..0488dcb0 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 <[email protected]>
  *  Copyright (c) 2002 Patrick Julien <[email protected]>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
index df8e4f7c..ceb78f06 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 <[email protected]>
  *  Copyright (c) 2004 Boudewijn Rempt <[email protected]>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
index a46fee80..b8f72a3b 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 <[email protected]>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
index 4e118ccc..87cb9390 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 <[email protected]>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
index be506578..be506578 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 c95b1000..c95b1000 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 852d2c0e..69e306ec 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 <[email protected]>
  *  Copyright (c) 2002 Patrick Julien <[email protected]>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
index 1a2687f1..1a2687f1 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 fe449ee4..fe449ee4 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 49d3f571..6c476871 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 a1f0902f..a1f0902f 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 acc90362..ba80434f 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
index 1a4932b7..1a4932b7 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 def162ef..f85da332 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 ([email protected])
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
index af7f8d84..9cfef0a8 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
index 7f526736..7f526736 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 8d89eea2..8d89eea2 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 09d33866..5a6772ba 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 <[email protected]>
  *                2001 John Califf <[email protected]>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index 8407a076..f34a3b34 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 ([email protected])
  *
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index 9f46072e..51bfb5ce 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 11a47590..58454b4f 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 <[email protected]>
  *  Copyright (c) 2005 Michael Thaler <[email protected]>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 97f6e0e8..30df11ec 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 ([email protected])
  *
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index d2ddbf07..569c33b7 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 8a9b4c88..8a9b4c88 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 e4c1d05d..9195dfbd 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 <[email protected]>
  *
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 06f34f8c..a8d1514b 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 <[email protected]>
  *
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 72418920..65735860 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
index 7449e581..ea1f9a77 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
index 75e3da2b..a21bb808 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
index 178ff278..ebf82634 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index b21f5aae..28f65604 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index f775c435..e8e249d3 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 d3378730..d3378730 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 07133d3b..14e2d616 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index bda2357e..484a7d9f 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 ([email protected])
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index 53475991..3e72a0fc 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 2dbe56d3..7d5df0f2 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index f2800a59..2f326965 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index c34b906c..c22c2316 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 ae334e62..e73f5da3 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 0c4023cc..73705264 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index ad69e2cc..f9b64094 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 a7371e49..601fc690 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index 626a773d..f903551f 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index a058dc58..c9ca737f 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 c99513f4..ab89cf3f 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index a5bfa27f..d6abff71 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 84bb341e..e9e6241a 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 65b05957..65b05957 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 af807017..af807017 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 c8f65857..d75f6495 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 cd4bb0b2..3a260545 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cpp
index 9ac1b62f..7309e8a1 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 <[email protected]>
  *
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index 78aab31b..485184ae 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 de20ce7f..88a67566 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 <[email protected]>
  *  Copyright (c) 2005 Casper Boemann <[email protected]>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 82941e92..0f0dde27 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 ([email protected])
  *
diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am
index c8752391..e2ab687d 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 be0648ba..be0648ba 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 453bbec2..82748f4c 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
index 00f93d3c..23780106 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_QT) -ltdecore -ltdeui -lkjs -ltdefx -ltdeio -ltdeparts
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
index d956ee46..377f0569 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 ([email protected])
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
index 8159ad73..259c6f47 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am
index d65b4b0e..3b9a8620 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 59019489..c82bbbad 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 <[email protected]>
  *  Copyright (c) 2006 Cyrille Berger <[email protected]>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17e..97c2c17e 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 97a0b8a7..97a0b8a7 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 306076b6..7a67d360 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 337b55c0..337b55c0 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 e0bec7ec..e0bec7ec 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 31a044eb..b2ec010d 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 448a58cf..77ad0668 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cpp
index 8252a98d..8252a98d 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 c4983870..c4983870 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 0dcb9914..bdedf5dd 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 25a7b9cf..25a7b9cf 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 217a36d9..217a36d9 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 1ad197f9..1ad197f9 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 19599cd9..19599cd9 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 53511b3d..c77357f2 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 85e4df40..85e4df40 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 cea7a0e1..29ec8d09 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 8a9a8c09..c455af8c 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
index 1d30db6a..77979805 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 <[email protected]>
  *  Copyright (c) 2005 Sven Langkamp <[email protected]>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index c795924e..af9c2570 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 ([email protected])
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am
index 5b374888..89f6e633 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 7cd1c335..8e2bc4de 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
index 38c445b0..ae590eba 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
index f0129e74..ce4ce9d3 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 92d50ef7..82389995 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 ([email protected])
  *
diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am
index dc26593e..d68e6179 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_QT) -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 b2a72306..326d9727 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index f728043c..fa544551 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am
index 23839eca..e5d84219 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_QT) -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 84c11ffb..e7c3a8ce 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 8a0985cc..f58f7816 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 be88f9b8..f4084a46 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 207bc0ce..207bc0ce 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 731e091c..63efe384 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 61d85634..61d85634 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 eef7853d..15cdc0fd 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 6d2a59c3..d650a045 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84..ba8c6b84 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 db356a16..db356a16 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 65a3a735..e478bf0c 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_QT) -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 e7a63180..d295493d 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index 8e20b58d..2596e62e 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 c4eca055..e708a90d 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_QT) -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 a0dbc5aa..78847f05 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cc b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cpp
index e69de29b..e69de29b 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 ce13710b..ce13710b 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 3b1d4c78..f35bd875 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_QT) -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 afa6a3d7..4decbbd4 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 <[email protected]>
  *
diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cpp
index 5e2d65ba..5e2d65ba 100644
--- a/chalk/plugins/viewplugins/variations/variations.cc
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
diff --git a/chalk/sdk/Makefile.am b/chalk/sdk/Makefile.am
index 0c7f4c18..869b2c36 100644
--- a/chalk/sdk/Makefile.am
+++ b/chalk/sdk/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) \
 	        $(all_includes)
 
 noinst_LTLIBRARIES = libchalksdk.la
-libchalksdk_la_SOURCES = kis_progress_subject.cc 
+libchalksdk_la_SOURCES = kis_progress_subject.cpp 
 libchalksdk_la_METASOURCES = AUTO
 
 include_HEADERS = \
diff --git a/chalk/sdk/kis_progress_subject.cc b/chalk/sdk/kis_progress_subject.cpp
index fa53086b..fa53086b 100644
--- a/chalk/sdk/kis_progress_subject.cc
+++ b/chalk/sdk/kis_progress_subject.cpp
diff --git a/chalk/ui/Makefile.am b/chalk/ui/Makefile.am
index 34f67c91..3a2bff12 100644
--- a/chalk/ui/Makefile.am
+++ b/chalk/ui/Makefile.am
@@ -13,34 +13,34 @@ libchalkui_la_LDFLAGS =  -version-info 1:0:0 -no-undefined $(all_libraries)
 libchalkui_la_LIBADD = ../sdk/libchalksdk.la ../core/libchalkimage.la ../chalkcolor/libchalkcolor.la \
     $(LCMS_LIBS) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) $(LIB_KOPALETTE) $(LIB_XINPUTEXT) $(GLLIB)
 
-libchalkui_la_SOURCES = kis_import_catcher.cc kis_histogram_view.cc imageviewer.cc kcurve.cc \
-				kis_autobrush.cc kis_autogradient.cc kis_boundary_painter.cc kis_brush_chooser.cc \
-				kis_canvas.cc kis_canvas_painter.cc kis_clipboard.cc kis_cmb_composite.cc \
-				kis_cmb_idlist.cc kis_color_cup.cc kis_config.cc kis_controlframe.cc kis_cursor.cc \
-				kis_dlg_apply_profile.cc kis_dlg_image_properties.cc kis_dlg_layer_properties.cc \
-				kis_dlg_new_layer.cc kis_dlg_preferences.cc kis_doc.cc kis_doc_iface.cc kis_doc_iface.skel \
-				kis_double_widget.cc kis_factory.cc kis_filter_manager.cc kis_gradient_chooser.cc \
-				kis_gradient_slider_widget.cc kis_icon_item.cc kis_iconwidget.cc kis_int_spinbox.cc \
-	kis_itemchooser.cc 			kis_label_cursor_pos.cc kis_label_progress.cc kis_label_zoom.cc \
-	kis_layerbox.cc 			kis_layerlist.cc kis_multi_bool_filter_widget.cc \
-	kis_multi_double_filter_widget.cc 			kis_multi_integer_filter_widget.cc kis_opengl_canvas.cc \
-	kis_opengl_canvas_painter.cc 			kis_opengl_image_context.cc kis_paintop_box.cc kis_palette_view.cc \
-	kis_palette_widget.cc 			kis_part_layer.cc kis_pattern_chooser.cc kis_previewdialog.cc \
-	kis_previewwidget.cc 			kis_qpaintdevice_canvas.cc kis_qpaintdevice_canvas_painter.cc \
-	kis_resource_mediator.cc 			kis_resourceserver.cc kis_ruler.cc kis_selection_manager.cc \
-	kis_selection_options.cc 			kis_text_brush.cc kis_tool.cc kis_tool_dummy.cc kis_tool_freehand.cc \
-	kis_tool_manager.cc 			kis_tool_non_paint.cc kis_tool_paint.cc kis_tool_registry.cc \
-	kis_tool_shape.cc 			kis_birdeye_box.cc kis_view.cc kis_view_iface.cc kis_custom_brush.cc \
-	kis_custom_palette.cc 			kis_custom_pattern.cc kis_custom_image_widget.cc kis_view_iface.skel \
+libchalkui_la_SOURCES = kis_import_catcher.cpp kis_histogram_view.cpp imageviewer.cpp kcurve.cpp \
+				kis_autobrush.cpp kis_autogradient.cpp kis_boundary_painter.cpp kis_brush_chooser.cpp \
+				kis_canvas.cpp kis_canvas_painter.cpp kis_clipboard.cpp kis_cmb_composite.cpp \
+				kis_cmb_idlist.cpp kis_color_cup.cpp kis_config.cpp kis_controlframe.cpp kis_cursor.cpp \
+				kis_dlg_apply_profile.cpp kis_dlg_image_properties.cpp kis_dlg_layer_properties.cpp \
+				kis_dlg_new_layer.cpp kis_dlg_preferences.cpp kis_doc.cpp kis_doc_iface.cpp kis_doc_iface.skel \
+				kis_double_widget.cpp kis_factory.cpp kis_filter_manager.cpp kis_gradient_chooser.cpp \
+				kis_gradient_slider_widget.cpp kis_icon_item.cpp kis_iconwidget.cpp kis_int_spinbox.cpp \
+	kis_itemchooser.cpp 			kis_label_cursor_pos.cpp kis_label_progress.cpp kis_label_zoom.cpp \
+	kis_layerbox.cpp 			kis_layerlist.cpp kis_multi_bool_filter_widget.cpp \
+	kis_multi_double_filter_widget.cpp 			kis_multi_integer_filter_widget.cpp kis_opengl_canvas.cpp \
+	kis_opengl_canvas_painter.cpp 			kis_opengl_image_context.cpp kis_paintop_box.cpp kis_palette_view.cpp \
+	kis_palette_widget.cpp 			kis_part_layer.cpp kis_pattern_chooser.cpp kis_previewdialog.cpp \
+	kis_previewwidget.cpp 			kis_qpaintdevice_canvas.cpp kis_qpaintdevice_canvas_painter.cpp \
+	kis_resource_mediator.cpp 			kis_resourceserver.cpp kis_ruler.cpp kis_selection_manager.cpp \
+	kis_selection_options.cpp 			kis_text_brush.cpp kis_tool.cpp kis_tool_dummy.cpp kis_tool_freehand.cpp \
+	kis_tool_manager.cpp 			kis_tool_non_paint.cpp kis_tool_paint.cpp kis_tool_registry.cpp \
+	kis_tool_shape.cpp 			kis_birdeye_box.cpp kis_view.cpp kis_view_iface.cpp kis_custom_brush.cpp \
+	kis_custom_palette.cpp 			kis_custom_pattern.cpp kis_custom_image_widget.cpp kis_view_iface.skel \
 	kobirdeyepanel.cpp 			kis_matrix_widget.ui kis_previewwidgetbase.ui layerlist.cpp \
 	wdgapplyprofile.ui 			wdgautobrush.ui wdgautogradient.ui wdgbirdeye.ui wdgcolorsettings.ui \
 				wdgdisplaysettings.ui wdggeneralsettings.ui wdglayerproperties.ui wdglayerbox.ui \
 				wdgnewimage.ui wdgperformancesettings.ui wdgselectionoptions.ui wdgshapeoptions.ui \
 				wdgpressuresettings.ui wdgcustombrush.ui wdgcustompalette.ui wdgcustompattern.ui \
-				wdgtextbrush.ui kis_dlg_adjustment_layer.cc kis_filters_listview.cc \
+				wdgtextbrush.ui kis_dlg_adjustment_layer.cpp kis_filters_listview.cpp \
 				wdgpalettechooser.ui wdggridsettings.ui kis_grid_manager.cpp 			wdgtabletdevicesettings.ui \
-	wdgtabletsettings.ui kis_input_device.cc 			kis_part_layer_handler.cc \
-	kis_dlg_adj_layer_props.cc squeezedcombobox.cpp kis_perspective_grid_manager.cpp \
+	wdgtabletsettings.ui kis_input_device.cpp 			kis_part_layer_handler.cpp \
+	kis_dlg_adj_layer_props.cpp squeezedcombobox.cpp kis_perspective_grid_manager.cpp \
 	kis_grid_drawer.cpp
 
 noinst_HEADERS = kis_aboutdata.h imageviewer.h layerlist.h kcurve.h \
diff --git a/chalk/ui/imageviewer.cc b/chalk/ui/imageviewer.cpp
index 5e74c8fe..5e74c8fe 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cpp
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cpp
index b6bd5162..b6bd5162 100644
--- a/chalk/ui/kcurve.cc
+++ b/chalk/ui/kcurve.cpp
diff --git a/chalk/ui/kis_autobrush.cc b/chalk/ui/kis_autobrush.cpp
index c7127928..c7127928 100644
--- a/chalk/ui/kis_autobrush.cc
+++ b/chalk/ui/kis_autobrush.cpp
diff --git a/chalk/ui/kis_autogradient.cc b/chalk/ui/kis_autogradient.cpp
index bd5b80fb..bd5b80fb 100644
--- a/chalk/ui/kis_autogradient.cc
+++ b/chalk/ui/kis_autogradient.cpp
diff --git a/chalk/ui/kis_birdeye_box.cc b/chalk/ui/kis_birdeye_box.cpp
index 2b816f9c..2b816f9c 100644
--- a/chalk/ui/kis_birdeye_box.cc
+++ b/chalk/ui/kis_birdeye_box.cpp
diff --git a/chalk/ui/kis_boundary_painter.cc b/chalk/ui/kis_boundary_painter.cpp
index 2b842e53..2b842e53 100644
--- a/chalk/ui/kis_boundary_painter.cc
+++ b/chalk/ui/kis_boundary_painter.cpp
diff --git a/chalk/ui/kis_brush_chooser.cc b/chalk/ui/kis_brush_chooser.cpp
index db9aba98..db9aba98 100644
--- a/chalk/ui/kis_brush_chooser.cc
+++ b/chalk/ui/kis_brush_chooser.cpp
diff --git a/chalk/ui/kis_canvas.cc b/chalk/ui/kis_canvas.cpp
index 63ae4ab0..63ae4ab0 100644
--- a/chalk/ui/kis_canvas.cc
+++ b/chalk/ui/kis_canvas.cpp
diff --git a/chalk/ui/kis_canvas_painter.cc b/chalk/ui/kis_canvas_painter.cpp
index 9b3666e8..9b3666e8 100644
--- a/chalk/ui/kis_canvas_painter.cc
+++ b/chalk/ui/kis_canvas_painter.cpp
diff --git a/chalk/ui/kis_clipboard.cc b/chalk/ui/kis_clipboard.cpp
index bb80e75e..bb80e75e 100644
--- a/chalk/ui/kis_clipboard.cc
+++ b/chalk/ui/kis_clipboard.cpp
diff --git a/chalk/ui/kis_cmb_composite.cc b/chalk/ui/kis_cmb_composite.cpp
index 66e3a6b3..631f602e 100644
--- a/chalk/ui/kis_cmb_composite.cc
+++ b/chalk/ui/kis_cmb_composite.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_cmb_composite.cc - part of KImageShop/Krayon/Chalk
+ *  kis_cmb_composite.cpp - part of KImageShop/Krayon/Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cpp
index 92dc608f..39937752 100644
--- a/chalk/ui/kis_cmb_idlist.cc
+++ b/chalk/ui/kis_cmb_idlist.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_cmb_idlist.cc - part of KImageShop/Krayon/Chalk
+ *  kis_cmb_idlist.cpp - part of KImageShop/Krayon/Chalk
  *
  *  Copyright (c) 2005 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cpp
index ae0ddfac..ae0ddfac 100644
--- a/chalk/ui/kis_color_cup.cc
+++ b/chalk/ui/kis_color_cup.cpp
diff --git a/chalk/ui/kis_config.cc b/chalk/ui/kis_config.cpp
index 64939c4a..64939c4a 100644
--- a/chalk/ui/kis_config.cc
+++ b/chalk/ui/kis_config.cpp
diff --git a/chalk/ui/kis_controlframe.cc b/chalk/ui/kis_controlframe.cpp
index 6c57a7e6..e5a8ce1b 100644
--- a/chalk/ui/kis_controlframe.cc
+++ b/chalk/ui/kis_controlframe.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_controlframe.cc - part of Chalk
+ *  kis_controlframe.cpp - part of Chalk
  *
  *  Copyright (c) 1999 Matthias Elter  <[email protected]>
  *  Copyright (c) 2003 Patrick Julien  <[email protected]>
diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cpp
index c4281eac..146dc286 100644
--- a/chalk/ui/kis_cursor.cc
+++ b/chalk/ui/kis_cursor.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_cursor.cc - part of KImageShop
+ *  kis_cursor.cpp - part of KImageShop
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *  Copyright (c) 2004 Adrian Page <[email protected]>
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cpp
index 1802e6cf..1802e6cf 100644
--- a/chalk/ui/kis_custom_brush.cc
+++ b/chalk/ui/kis_custom_brush.cpp
diff --git a/chalk/ui/kis_custom_image_widget.cc b/chalk/ui/kis_custom_image_widget.cpp
index 93c82977..93c82977 100644
--- a/chalk/ui/kis_custom_image_widget.cc
+++ b/chalk/ui/kis_custom_image_widget.cpp
diff --git a/chalk/ui/kis_custom_palette.cc b/chalk/ui/kis_custom_palette.cpp
index 631b9abe..631b9abe 100644
--- a/chalk/ui/kis_custom_palette.cc
+++ b/chalk/ui/kis_custom_palette.cpp
diff --git a/chalk/ui/kis_custom_pattern.cc b/chalk/ui/kis_custom_pattern.cpp
index edf92be1..edf92be1 100644
--- a/chalk/ui/kis_custom_pattern.cc
+++ b/chalk/ui/kis_custom_pattern.cpp
diff --git a/chalk/ui/kis_dlg_adj_layer_props.cc b/chalk/ui/kis_dlg_adj_layer_props.cpp
index f7d75310..f7d75310 100644
--- a/chalk/ui/kis_dlg_adj_layer_props.cc
+++ b/chalk/ui/kis_dlg_adj_layer_props.cpp
diff --git a/chalk/ui/kis_dlg_adjustment_layer.cc b/chalk/ui/kis_dlg_adjustment_layer.cpp
index 997887f0..997887f0 100644
--- a/chalk/ui/kis_dlg_adjustment_layer.cc
+++ b/chalk/ui/kis_dlg_adjustment_layer.cpp
diff --git a/chalk/ui/kis_dlg_apply_profile.cc b/chalk/ui/kis_dlg_apply_profile.cpp
index fcdfbd09..fcdfbd09 100644
--- a/chalk/ui/kis_dlg_apply_profile.cc
+++ b/chalk/ui/kis_dlg_apply_profile.cpp
diff --git a/chalk/ui/kis_dlg_image_properties.cc b/chalk/ui/kis_dlg_image_properties.cpp
index 00acde27..00acde27 100644
--- a/chalk/ui/kis_dlg_image_properties.cc
+++ b/chalk/ui/kis_dlg_image_properties.cpp
diff --git a/chalk/ui/kis_dlg_layer_properties.cc b/chalk/ui/kis_dlg_layer_properties.cpp
index 832102c6..832102c6 100644
--- a/chalk/ui/kis_dlg_layer_properties.cc
+++ b/chalk/ui/kis_dlg_layer_properties.cpp
diff --git a/chalk/ui/kis_dlg_new_layer.cc b/chalk/ui/kis_dlg_new_layer.cpp
index 91f53a75..91f53a75 100644
--- a/chalk/ui/kis_dlg_new_layer.cc
+++ b/chalk/ui/kis_dlg_new_layer.cpp
diff --git a/chalk/ui/kis_dlg_preferences.cc b/chalk/ui/kis_dlg_preferences.cpp
index 61811d31..e35477dc 100644
--- a/chalk/ui/kis_dlg_preferences.cc
+++ b/chalk/ui/kis_dlg_preferences.cpp
@@ -1,5 +1,5 @@
 /*
- *  preferencesdlg.cc - part of KImageShop
+ *  preferencesdlg.cpp - part of KImageShop
  *
  *  Copyright (c) 1999 Michael Koch <[email protected]>
  *
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cpp
index 60dbbfdd..60dbbfdd 100644
--- a/chalk/ui/kis_doc.cc
+++ b/chalk/ui/kis_doc.cpp
diff --git a/chalk/ui/kis_doc_iface.cc b/chalk/ui/kis_doc_iface.cpp
index ae5a4a58..ae5a4a58 100644
--- a/chalk/ui/kis_doc_iface.cc
+++ b/chalk/ui/kis_doc_iface.cpp
diff --git a/chalk/ui/kis_double_widget.cc b/chalk/ui/kis_double_widget.cpp
index a966691d..3325f07b 100644
--- a/chalk/ui/kis_double_widget.cc
+++ b/chalk/ui/kis_double_widget.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_double_widget.cc - part of Chalk
+ *  kis_double_widget.cpp - part of Chalk
  *
  *  Copyright (c) 1999 Carsten Pfeiffer <[email protected]>
  *  Copyright (c) 2004 Adrian Page <[email protected]>
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cpp
index 154213b4..e9e51e48 100644
--- a/chalk/ui/kis_factory.cc
+++ b/chalk/ui/kis_factory.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_factory.cc - part of Krayon
+ *  kis_factory.cpp - part of Krayon
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cpp
index 848f99b7..848f99b7 100644
--- a/chalk/ui/kis_filter_manager.cc
+++ b/chalk/ui/kis_filter_manager.cpp
diff --git a/chalk/ui/kis_filters_listview.cc b/chalk/ui/kis_filters_listview.cpp
index e3674fc8..e3674fc8 100644
--- a/chalk/ui/kis_filters_listview.cc
+++ b/chalk/ui/kis_filters_listview.cpp
diff --git a/chalk/ui/kis_gradient_chooser.cc b/chalk/ui/kis_gradient_chooser.cpp
index 5022a28b..5022a28b 100644
--- a/chalk/ui/kis_gradient_chooser.cc
+++ b/chalk/ui/kis_gradient_chooser.cpp
diff --git a/chalk/ui/kis_gradient_slider_widget.cc b/chalk/ui/kis_gradient_slider_widget.cpp
index 255d3847..255d3847 100644
--- a/chalk/ui/kis_gradient_slider_widget.cc
+++ b/chalk/ui/kis_gradient_slider_widget.cpp
diff --git a/chalk/ui/kis_histogram_view.cc b/chalk/ui/kis_histogram_view.cpp
index 3b94db61..3b94db61 100644
--- a/chalk/ui/kis_histogram_view.cc
+++ b/chalk/ui/kis_histogram_view.cpp
diff --git a/chalk/ui/kis_icon_item.cc b/chalk/ui/kis_icon_item.cpp
index 339017fc..339017fc 100644
--- a/chalk/ui/kis_icon_item.cc
+++ b/chalk/ui/kis_icon_item.cpp
diff --git a/chalk/ui/kis_iconwidget.cc b/chalk/ui/kis_iconwidget.cpp
index 0109f7eb..0109f7eb 100644
--- a/chalk/ui/kis_iconwidget.cc
+++ b/chalk/ui/kis_iconwidget.cpp
diff --git a/chalk/ui/kis_import_catcher.cc b/chalk/ui/kis_import_catcher.cpp
index 26040309..26040309 100644
--- a/chalk/ui/kis_import_catcher.cc
+++ b/chalk/ui/kis_import_catcher.cpp
diff --git a/chalk/ui/kis_input_device.cc b/chalk/ui/kis_input_device.cpp
index 0923c727..0923c727 100644
--- a/chalk/ui/kis_input_device.cc
+++ b/chalk/ui/kis_input_device.cpp
diff --git a/chalk/ui/kis_int_spinbox.cc b/chalk/ui/kis_int_spinbox.cpp
index cb1b6938..cb1b6938 100644
--- a/chalk/ui/kis_int_spinbox.cc
+++ b/chalk/ui/kis_int_spinbox.cpp
diff --git a/chalk/ui/kis_itemchooser.cc b/chalk/ui/kis_itemchooser.cpp
index d33c3873..d33c3873 100644
--- a/chalk/ui/kis_itemchooser.cc
+++ b/chalk/ui/kis_itemchooser.cpp
diff --git a/chalk/ui/kis_label_cursor_pos.cc b/chalk/ui/kis_label_cursor_pos.cpp
index d28f1a83..d28f1a83 100644
--- a/chalk/ui/kis_label_cursor_pos.cc
+++ b/chalk/ui/kis_label_cursor_pos.cpp
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cpp
index 0caadcbb..0caadcbb 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cpp
diff --git a/chalk/ui/kis_label_zoom.cc b/chalk/ui/kis_label_zoom.cpp
index cd8620d6..cd8620d6 100644
--- a/chalk/ui/kis_label_zoom.cc
+++ b/chalk/ui/kis_label_zoom.cpp
diff --git a/chalk/ui/kis_layerbox.cc b/chalk/ui/kis_layerbox.cpp
index 058eb2f9..1d769fb4 100644
--- a/chalk/ui/kis_layerbox.cc
+++ b/chalk/ui/kis_layerbox.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_layerbox.cc - part of Chalk aka Krayon aka KimageShop
+ *  kis_layerbox.cpp - part of Chalk aka Krayon aka KimageShop
  *
  *  Copyright (c) 2002 Patrick Julien <[email protected]>
  *  Copyright (C) 2006 Gábor Lehel <[email protected]>
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cpp
index bfae8282..bfae8282 100644
--- a/chalk/ui/kis_layerlist.cc
+++ b/chalk/ui/kis_layerlist.cpp
diff --git a/chalk/ui/kis_multi_bool_filter_widget.cc b/chalk/ui/kis_multi_bool_filter_widget.cpp
index e0269504..e0269504 100644
--- a/chalk/ui/kis_multi_bool_filter_widget.cc
+++ b/chalk/ui/kis_multi_bool_filter_widget.cpp
diff --git a/chalk/ui/kis_multi_double_filter_widget.cc b/chalk/ui/kis_multi_double_filter_widget.cpp
index 9491f221..9491f221 100644
--- a/chalk/ui/kis_multi_double_filter_widget.cc
+++ b/chalk/ui/kis_multi_double_filter_widget.cpp
diff --git a/chalk/ui/kis_multi_integer_filter_widget.cc b/chalk/ui/kis_multi_integer_filter_widget.cpp
index aef29d2c..aef29d2c 100644
--- a/chalk/ui/kis_multi_integer_filter_widget.cc
+++ b/chalk/ui/kis_multi_integer_filter_widget.cpp
diff --git a/chalk/ui/kis_opengl_canvas.cc b/chalk/ui/kis_opengl_canvas.cpp
index 82363a0b..82363a0b 100644
--- a/chalk/ui/kis_opengl_canvas.cc
+++ b/chalk/ui/kis_opengl_canvas.cpp
diff --git a/chalk/ui/kis_opengl_canvas_painter.cc b/chalk/ui/kis_opengl_canvas_painter.cpp
index e6551f81..e6551f81 100644
--- a/chalk/ui/kis_opengl_canvas_painter.cc
+++ b/chalk/ui/kis_opengl_canvas_painter.cpp
diff --git a/chalk/ui/kis_opengl_image_context.cc b/chalk/ui/kis_opengl_image_context.cpp
index 6a302192..6a302192 100644
--- a/chalk/ui/kis_opengl_image_context.cc
+++ b/chalk/ui/kis_opengl_image_context.cpp
diff --git a/chalk/ui/kis_paintop_box.cc b/chalk/ui/kis_paintop_box.cpp
index 6036ef74..57ed7a73 100644
--- a/chalk/ui/kis_paintop_box.cc
+++ b/chalk/ui/kis_paintop_box.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_paintop_box.cc - part of KImageShop/Krayon/Chalk
+ *  kis_paintop_box.cpp - part of KImageShop/Krayon/Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt ([email protected])
  *
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cpp
index 2e17f651..2e17f651 100644
--- a/chalk/ui/kis_palette_view.cc
+++ b/chalk/ui/kis_palette_view.cpp
diff --git a/chalk/ui/kis_palette_widget.cc b/chalk/ui/kis_palette_widget.cpp
index e04b0494..e04b0494 100644
--- a/chalk/ui/kis_palette_widget.cc
+++ b/chalk/ui/kis_palette_widget.cpp
diff --git a/chalk/ui/kis_part_layer.cc b/chalk/ui/kis_part_layer.cpp
index 4c05360e..4c05360e 100644
--- a/chalk/ui/kis_part_layer.cc
+++ b/chalk/ui/kis_part_layer.cpp
diff --git a/chalk/ui/kis_part_layer_handler.cc b/chalk/ui/kis_part_layer_handler.cpp
index d44f928a..d44f928a 100644
--- a/chalk/ui/kis_part_layer_handler.cc
+++ b/chalk/ui/kis_part_layer_handler.cpp
diff --git a/chalk/ui/kis_pattern_chooser.cc b/chalk/ui/kis_pattern_chooser.cpp
index 741cba65..741cba65 100644
--- a/chalk/ui/kis_pattern_chooser.cc
+++ b/chalk/ui/kis_pattern_chooser.cpp
diff --git a/chalk/ui/kis_previewdialog.cc b/chalk/ui/kis_previewdialog.cpp
index d67d5e58..cfbe05b2 100644
--- a/chalk/ui/kis_previewdialog.cc
+++ b/chalk/ui/kis_previewdialog.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_previewdialog.cc - part of Chalk
+ *  kis_previewdialog.cpp - part of Chalk
  *
  *  Copyright (c) 2005 Sven Langkamp <[email protected]>
  *
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cpp
index 29a91fbd..f60755a1 100644
--- a/chalk/ui/kis_previewwidget.cc
+++ b/chalk/ui/kis_previewwidget.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_previewwidget.cc - part of Chalk
+ *  kis_previewwidget.cpp - part of Chalk
  *
  *  Copyright (c) 2001 John Califf  <[email protected]>
  *  Copyright (c) 2004 Bart Coppens <[email protected]>
diff --git a/chalk/ui/kis_qpaintdevice_canvas.cc b/chalk/ui/kis_qpaintdevice_canvas.cpp
index e3824f55..e3824f55 100644
--- a/chalk/ui/kis_qpaintdevice_canvas.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas.cpp
diff --git a/chalk/ui/kis_qpaintdevice_canvas_painter.cc b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
index 07f78eb9..07f78eb9 100644
--- a/chalk/ui/kis_qpaintdevice_canvas_painter.cc
+++ b/chalk/ui/kis_qpaintdevice_canvas_painter.cpp
diff --git a/chalk/ui/kis_resource_mediator.cc b/chalk/ui/kis_resource_mediator.cpp
index ddecf85a..ddecf85a 100644
--- a/chalk/ui/kis_resource_mediator.cc
+++ b/chalk/ui/kis_resource_mediator.cpp
diff --git a/chalk/ui/kis_resourceserver.cc b/chalk/ui/kis_resourceserver.cpp
index 3076bc00..333bccd1 100644
--- a/chalk/ui/kis_resourceserver.cc
+++ b/chalk/ui/kis_resourceserver.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_resourceserver.cc - part of KImageShop
+ *  kis_resourceserver.cpp - part of KImageShop
  *
  *  Copyright (c) 1999 Matthias Elter <[email protected]>
  *  Copyright (c) 2003 Patrick Julien <[email protected]>
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cpp
index 23426922..23426922 100644
--- a/chalk/ui/kis_ruler.cc
+++ b/chalk/ui/kis_ruler.cpp
diff --git a/chalk/ui/kis_selection_manager.cc b/chalk/ui/kis_selection_manager.cpp
index 7d001586..7d001586 100644
--- a/chalk/ui/kis_selection_manager.cc
+++ b/chalk/ui/kis_selection_manager.cpp
diff --git a/chalk/ui/kis_selection_options.cc b/chalk/ui/kis_selection_options.cpp
index 8593d22a..8593d22a 100644
--- a/chalk/ui/kis_selection_options.cc
+++ b/chalk/ui/kis_selection_options.cpp
diff --git a/chalk/ui/kis_text_brush.cc b/chalk/ui/kis_text_brush.cpp
index 8666f1a1..8666f1a1 100644
--- a/chalk/ui/kis_text_brush.cc
+++ b/chalk/ui/kis_text_brush.cpp
diff --git a/chalk/ui/kis_tool.cc b/chalk/ui/kis_tool.cpp
index 02674741..02674741 100644
--- a/chalk/ui/kis_tool.cc
+++ b/chalk/ui/kis_tool.cpp
diff --git a/chalk/ui/kis_tool_dummy.cc b/chalk/ui/kis_tool_dummy.cpp
index 759136f4..759136f4 100644
--- a/chalk/ui/kis_tool_dummy.cc
+++ b/chalk/ui/kis_tool_dummy.cpp
diff --git a/chalk/ui/kis_tool_freehand.cc b/chalk/ui/kis_tool_freehand.cpp
index 787afee4..74eec406 100644
--- a/chalk/ui/kis_tool_freehand.cc
+++ b/chalk/ui/kis_tool_freehand.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 <[email protected]>
  *  Copyright (c) 2004 Bart Coppens <[email protected]>
diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cpp
index 04388058..04388058 100644
--- a/chalk/ui/kis_tool_manager.cc
+++ b/chalk/ui/kis_tool_manager.cpp
diff --git a/chalk/ui/kis_tool_non_paint.cc b/chalk/ui/kis_tool_non_paint.cpp
index 4adccc60..4adccc60 100644
--- a/chalk/ui/kis_tool_non_paint.cc
+++ b/chalk/ui/kis_tool_non_paint.cpp
diff --git a/chalk/ui/kis_tool_paint.cc b/chalk/ui/kis_tool_paint.cpp
index 143bd675..143bd675 100644
--- a/chalk/ui/kis_tool_paint.cc
+++ b/chalk/ui/kis_tool_paint.cpp
diff --git a/chalk/ui/kis_tool_registry.cc b/chalk/ui/kis_tool_registry.cpp
index 036e538f..036e538f 100644
--- a/chalk/ui/kis_tool_registry.cc
+++ b/chalk/ui/kis_tool_registry.cpp
diff --git a/chalk/ui/kis_tool_shape.cc b/chalk/ui/kis_tool_shape.cpp
index 68ce4c69..68ce4c69 100644
--- a/chalk/ui/kis_tool_shape.cc
+++ b/chalk/ui/kis_tool_shape.cpp
diff --git a/chalk/ui/kis_view.cc b/chalk/ui/kis_view.cpp
index 59da5189..59da5189 100644
--- a/chalk/ui/kis_view.cc
+++ b/chalk/ui/kis_view.cpp
diff --git a/chalk/ui/kis_view_iface.cc b/chalk/ui/kis_view_iface.cpp
index 7de36c48..7de36c48 100644
--- a/chalk/ui/kis_view_iface.cc
+++ b/chalk/ui/kis_view_iface.cpp