1326 files changed, 1183 insertions, 1189 deletions

diff --git a/chalk/Makefile.am b/chalk/Makefile.am
index 1c2e60ef3..b0b06bbde 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 b56919749..1915112e4 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 <elter@kde.org>
  *
diff --git a/chalk/chalkcolor/Makefile.am b/chalk/chalkcolor/Makefile.am
index e8667a2b5..64a7937a9 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 90f75d290..18bd587b1 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 f7c1fbce3..f7c1fbce3 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 c5c7ac5a0..c5c7ac5a0 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 835ebfa1f..835ebfa1f 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 7f5155348..7f5155348 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 a37a1fb3f..a37a1fb3f 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 7d6acb896..7d6acb896 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 e517c9f75..e517c9f75 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 c13a2e08e..c13a2e08e 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 d9b2591ca..d9b2591ca 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 bde82ff3a..bde82ff3a 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 4cffd7668..4cffd7668 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 d4886c5f5..d4886c5f5 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 27a6a312e..27a6a312e 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 bbea95bac..bbea95bac 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 61b2ad327..df98a7506 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 <elter@kde.org>
  *                2001 John Califf
diff --git a/chalk/chalkcolor/kis_u16_base_colorspace.cc b/chalk/chalkcolor/kis_u16_base_colorspace.cpp
index a735e35ce..a735e35ce 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 338d95d6b..338d95d6b 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 457f3c51b..28d013ac2 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 4b3afa299..4195ff225 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cc b/chalk/colorspaces/cmyk_u16/kis_cmyk_u16_colorspace.cpp
index 96a6f1323..96a6f1323 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 ba455504f..a13017952 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 7b09ecca9..588e286cd 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 (boud@valdyas.org)
  *
diff --git a/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cc b/chalk/colorspaces/cmyk_u8/kis_cmyk_colorspace.cpp
index 09c517df8..09c517df8 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 a168e5bad..f8a0c33e8 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 5e9e17f93..7c1896f94 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cc b/chalk/colorspaces/gray_u16/kis_gray_u16_colorspace.cpp
index 43bdf40ff..43bdf40ff 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 9f4352665..4cdaf81b1 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 7d03d5f63..7f177eea1 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 (boud@valdyas.org)
  *
diff --git a/chalk/colorspaces/gray_u8/kis_gray_colorspace.cc b/chalk/colorspaces/gray_u8/kis_gray_colorspace.cpp
index 989cc2c58..989cc2c58 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 9e5d02cf1..c93c74471 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 67ad17d0e..67ad17d0e 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 f7e581ace..2c83ccd6c 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/rgb_f16half/Makefile.am b/chalk/colorspaces/rgb_f16half/Makefile.am
index 8f88e632e..1aaccf15d 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 fd065637e..fd065637e 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 911da6a0b..32505bc88 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/rgb_f16half/tests/Makefile.am b/chalk/colorspaces/rgb_f16half/tests/Makefile.am
index cdb3f06c5..ae1cfc827 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 bb2094ef5..bb2094ef5 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 1632d78e1..7b909d1a4 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 d4eb9eaca..d4eb9eaca 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 c6551a4ce..785009e06 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 7c1149711..adc540ac0 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/rgb_f32/tests/Makefile.am b/chalk/colorspaces/rgb_f32/tests/Makefile.am
index 9ad10271b..073c5da74 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 4a446a83b..4a446a83b 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 a0987b148..ce2f08bb8 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 40198c91a..40198c91a 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 bc362a83e..da6e6e427 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 (boud@valdyas.org)
 * Copyright (c) 2005 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/colorspaces/rgb_u16/tests/Makefile.am b/chalk/colorspaces/rgb_u16/tests/Makefile.am
index 76c4d175b..5bed7dfa6 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 dedc28a9d..dedc28a9d 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 3705ea701..68a010b3e 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 0aaea6daa..0aaea6daa 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 263101259..33f18b17f 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 (boud@valdyas.org)
 *
diff --git a/chalk/colorspaces/wet/Makefile.am b/chalk/colorspaces/wet/Makefile.am
index 74c6e7db5..fb1eaf2be 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 6f58cd14a..f70272dbf 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 <kde@bartcoppens.be>
  *
diff --git a/chalk/colorspaces/wet/kis_texture_painter.cc b/chalk/colorspaces/wet/kis_texture_painter.cpp
index 9300e808b..9300e808b 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 b867e01ea..b867e01ea 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 43cfd559a..43cfd559a 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 f17f4e1c4..634424469 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 <kde@bartcoppens.be>
  *
diff --git a/chalk/colorspaces/wet/kis_wetop.cc b/chalk/colorspaces/wet/kis_wetop.cpp
index 15625e5d3..15625e5d3 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 b919a2897..259fe5d1c 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 (boud@valdyas.org)
  *
diff --git a/chalk/colorspaces/wet/wetphysicsfilter.cc b/chalk/colorspaces/wet/wetphysicsfilter.cpp
index 3a4394439..3a4394439 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 4ade368a8..5d4e02894 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 8df4d61e3..eae064f8e 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 ed828bf51..ed828bf51 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 1f141bb4f..97c892b2b 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 (boud@valdyas.org)
  *
diff --git a/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cc b/chalk/colorspaces/wetsticky/kis_wet_sticky_colorspace.cpp
index 3e47114ae..3e47114ae 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 c53f6ea08..c53f6ea08 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 76dee20e6..e56e4cc88 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 (boud@valdyas.org)
  *
diff --git a/chalk/colorspaces/ycbcr_u16/Makefile.am b/chalk/colorspaces/ycbcr_u16/Makefile.am
index 994fb478f..709b89d7a 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 4d7493b27..4d7493b27 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 fdfb23106..4371a20a4 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 <cberger@cberger.net>
  *
diff --git a/chalk/colorspaces/ycbcr_u8/Makefile.am b/chalk/colorspaces/ycbcr_u8/Makefile.am
index 5d496e78c..b6175aa3c 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 5cd132319..5cd132319 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 342074329..6c3ac2437 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 <cberger@cberger.net>
  *
diff --git a/chalk/core/Makefile.am b/chalk/core/Makefile.am
index 39b59372a..cd62152b3 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 ef7acc5ef..337d90761 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 69e8b9398..69e8b9398 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 152963087..152963087 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 9a09fe788..9a09fe788 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 671e8fc2f..aaac54efd 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 506d49e8e..506d49e8e 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 a15697a7f..a15697a7f 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 49ee8e581..49ee8e581 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 11da634b8..11da634b8 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 f5ee5573f..f5ee5573f 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 5d54ed5e7..5d54ed5e7 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 134d4009a..134d4009a 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 6b88759a4..6b88759a4 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 ee396596a..ee396596a 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 1df05f64d..1df05f64d 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 c1dec9782..c1dec9782 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 f67e3ecc8..f67e3ecc8 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 650a96812..650a96812 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 41541e80e..9b240cb06 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 <elter@kde.org>
  *                2001 John Califf
diff --git a/chalk/core/kis_gradient_painter.cc b/chalk/core/kis_gradient_painter.cpp
index 7c2b00b18..7c2b00b18 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 290d19f5c..290d19f5c 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 bece7c9a3..bece7c9a3 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 1180bf4cf..1180bf4cf 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 2cc16e27e..2cc16e27e 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 5c60b5174..5c60b5174 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 0e0c2d813..0e0c2d813 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 741a20b00..741a20b00 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 f43570f08..f43570f08 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 4bde87b22..4bde87b22 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 4cb51a989..4cb51a989 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 da25caecb..da25caecb 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 c8afa80a3..c8afa80a3 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 a4c5412d5..a4c5412d5 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 f3f5c9286..f3f5c9286 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 59cfef6b2..59cfef6b2 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 d549c3ad5..d549c3ad5 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 aa62b07a0..aa62b07a0 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 654449b80..b2a529958 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 <elter@kde.org>
  *                2001 John Califf
diff --git a/chalk/core/kis_rect.cc b/chalk/core/kis_rect.cpp
index 175a07a97..175a07a97 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 a856cbb12..a856cbb12 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 abb47a056..abb47a056 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 a06d674d1..a06d674d1 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 44eec6976..44eec6976 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 ea8f2be2b..ea8f2be2b 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 d5102c8b2..d5102c8b2 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 128071922..128071922 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 d0a10acc3..d0a10acc3 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 0d4a98b4c..0d4a98b4c 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 fa54e1f90..9bd6ada9f 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 <me@kde.org>
  *
diff --git a/chalk/core/tests/Makefile.am b/chalk/core/tests/Makefile.am
index 973166855..9b78866a8 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 135e72489..135e72489 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 7fad1ab90..9ebe93ec2 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 1181f70a3..1181f70a3 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 743ca82be..743ca82be 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 159faf18c..159faf18c 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 4586903ce..4586903ce 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 cf023c1ed..cf023c1ed 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 0f3bdf001..0f3bdf001 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 8f0f7ed1d..8f0f7ed1d 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 0fe8514f8..0fe8514f8 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 aa8a207c5..aa8a207c5 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 a1b8e58d4..2f0d25ca6 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 e2373258f..afadadc5b 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 592c1368f..6d6b1781f 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 <me@kde.org>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/filters/blur/Makefile.am b/chalk/plugins/filters/blur/Makefile.am
index 6f52db6e6..4f9a60bae 100644
--- a/chalk/plugins/filters/blur/Makefile.am
+++ b/chalk/plugins/filters/blur/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkblurfilter_la_SOURCES = wdgblur.ui blur.cc kis_blur_filter.cc kis_wdg_blur.cc
+chalkblurfilter_la_SOURCES = wdgblur.ui blur.cpp kis_blur_filter.cpp kis_wdg_blur.cpp
 
 kde_module_LTLIBRARIES = chalkblurfilter.la
 noinst_HEADERS = blur.h kis_blur_filter.h
diff --git a/chalk/plugins/filters/blur/blur.cc b/chalk/plugins/filters/blur/blur.cpp
index 69bac7b1d..69bac7b1d 100644
--- a/chalk/plugins/filters/blur/blur.cc
+++ b/chalk/plugins/filters/blur/blur.cpp
diff --git a/chalk/plugins/filters/blur/kis_blur_filter.cc b/chalk/plugins/filters/blur/kis_blur_filter.cpp
index 8d3604974..8d3604974 100644
--- a/chalk/plugins/filters/blur/kis_blur_filter.cc
+++ b/chalk/plugins/filters/blur/kis_blur_filter.cpp
diff --git a/chalk/plugins/filters/blur/kis_wdg_blur.cc b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
index d4213bb58..d4213bb58 100644
--- a/chalk/plugins/filters/blur/kis_wdg_blur.cc
+++ b/chalk/plugins/filters/blur/kis_wdg_blur.cpp
diff --git a/chalk/plugins/filters/bumpmap/Makefile.am b/chalk/plugins/filters/bumpmap/Makefile.am
index 768aaa2d1..4b525169a 100644
--- a/chalk/plugins/filters/bumpmap/Makefile.am
+++ b/chalk/plugins/filters/bumpmap/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../../lib/kofficecore \
 	$(all_includes)
 
-chalkbumpmap_la_SOURCES = bumpmap.cc wdgbumpmap.ui
+chalkbumpmap_la_SOURCES = bumpmap.cpp wdgbumpmap.ui
 
 kde_module_LTLIBRARIES = chalkbumpmap.la
 noinst_HEADERS = bumpmap.h
diff --git a/chalk/plugins/filters/bumpmap/bumpmap.cc b/chalk/plugins/filters/bumpmap/bumpmap.cpp
index 9d7712228..9d7712228 100644
--- a/chalk/plugins/filters/bumpmap/bumpmap.cc
+++ b/chalk/plugins/filters/bumpmap/bumpmap.cpp
diff --git a/chalk/plugins/filters/cimg/Makefile.am b/chalk/plugins/filters/cimg/Makefile.am
index 9f104bea8..abd3e159e 100644
--- a/chalk/plugins/filters/cimg/Makefile.am
+++ b/chalk/plugins/filters/cimg/Makefile.am
@@ -12,9 +12,9 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalkcimg_la_SOURCES = \
 	wdg_cimg.ui\
-	kis_cimg_filter.cc\
-	kis_cimg_plugin.cc\
-	kis_cimgconfig_widget.cc
+	kis_cimg_filter.cpp\
+	kis_cimg_plugin.cpp\
+	kis_cimgconfig_widget.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalkcimg.la
diff --git a/chalk/plugins/filters/cimg/kis_cimg_filter.cc b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
index c8be0a6f6..c8be0a6f6 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_filter.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_filter.cpp
diff --git a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc b/chalk/plugins/filters/cimg/kis_cimg_plugin.cpp
index 9ed82fe26..9ed82fe26 100644
--- a/chalk/plugins/filters/cimg/kis_cimg_plugin.cc
+++ b/chalk/plugins/filters/cimg/kis_cimg_plugin.cpp
diff --git a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
index ba9e61e06..ba9e61e06 100644
--- a/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cc
+++ b/chalk/plugins/filters/cimg/kis_cimgconfig_widget.cpp
diff --git a/chalk/plugins/filters/colors/Makefile.am b/chalk/plugins/filters/colors/Makefile.am
index 9a4eec53f..09e254baf 100644
--- a/chalk/plugins/filters/colors/Makefile.am
+++ b/chalk/plugins/filters/colors/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES = -I$(srcdir)/../../../sdk \
         $(KOFFICE_INCLUDES) \
         $(all_includes)
 
-chalkextensioncolorsfilters_la_SOURCES = colors.cc kis_minmax_filters.cc kis_color_to_alpha.cc wdgcolortoalphabase.ui kis_wdg_color_to_alpha.cc
+chalkextensioncolorsfilters_la_SOURCES = colors.cpp kis_minmax_filters.cpp kis_color_to_alpha.cpp wdgcolortoalphabase.ui kis_wdg_color_to_alpha.cpp
 
 kde_module_LTLIBRARIES = chalkextensioncolorsfilters.la
 noinst_HEADERS = colors.h
diff --git a/chalk/plugins/filters/colors/colors.cc b/chalk/plugins/filters/colors/colors.cpp
index d3cadc68a..d3cadc68a 100644
--- a/chalk/plugins/filters/colors/colors.cc
+++ b/chalk/plugins/filters/colors/colors.cpp
diff --git a/chalk/plugins/filters/colors/kis_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_color_to_alpha.cpp
index 26f428448..26f428448 100644
--- a/chalk/plugins/filters/colors/kis_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_color_to_alpha.cpp
diff --git a/chalk/plugins/filters/colors/kis_minmax_filters.cc b/chalk/plugins/filters/colors/kis_minmax_filters.cpp
index eac48ad3c..eac48ad3c 100644
--- a/chalk/plugins/filters/colors/kis_minmax_filters.cc
+++ b/chalk/plugins/filters/colors/kis_minmax_filters.cpp
diff --git a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
index 31b726bf0..31b726bf0 100644
--- a/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cc
+++ b/chalk/plugins/filters/colors/kis_wdg_color_to_alpha.cpp
diff --git a/chalk/plugins/filters/colorsfilters/Makefile.am b/chalk/plugins/filters/colorsfilters/Makefile.am
index 43238c42e..688598219 100644
--- a/chalk/plugins/filters/colorsfilters/Makefile.am
+++ b/chalk/plugins/filters/colorsfilters/Makefile.am
@@ -7,11 +7,11 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkcolorsfilters_la_SOURCES = colorsfilters.cc \
-	kis_perchannel_filter.cc \
+chalkcolorsfilters_la_SOURCES = colorsfilters.cpp \
+	kis_perchannel_filter.cpp \
 	wdg_perchannel.ui \
 	wdg_brightness_contrast.ui \
-	kis_brightness_contrast_filter.cc
+	kis_brightness_contrast_filter.cpp
 
 noinst_HEADERS = colorsfilters.h \
 	kis_perchannel_filter.h \
diff --git a/chalk/plugins/filters/colorsfilters/colorsfilters.cc b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
index 754bbc2c0..754bbc2c0 100644
--- a/chalk/plugins/filters/colorsfilters/colorsfilters.cc
+++ b/chalk/plugins/filters/colorsfilters/colorsfilters.cpp
diff --git a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
index cbca7a08c..cbca7a08c 100644
--- a/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_brightness_contrast_filter.cpp
diff --git a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
index d479b27d6..d479b27d6 100644
--- a/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cc
+++ b/chalk/plugins/filters/colorsfilters/kis_perchannel_filter.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/Makefile.am b/chalk/plugins/filters/convolutionfilters/Makefile.am
index b82b044c0..372827fc0 100644
--- a/chalk/plugins/filters/convolutionfilters/Makefile.am
+++ b/chalk/plugins/filters/convolutionfilters/Makefile.am
@@ -12,10 +12,10 @@ INCLUDES  = \
 kde_module_LTLIBRARIES = chalkconvolutionfilters.la
 
 chalkconvolutionfilters_la_SOURCES = kis_custom_convolution_filter_configuration_base_widget.ui \
-	kis_custom_convolution_filter_configuration_widget.cc \
-	kis_custom_convolution_filter.cc \
-	convolutionfilters.cc \
-	kis_convolution_filter.cc
+	kis_custom_convolution_filter_configuration_widget.cpp \
+	kis_custom_convolution_filter.cpp \
+	convolutionfilters.cpp \
+	kis_convolution_filter.cpp
 
 noinst_HEADERS = convolutionfilters.h \
 	kis_custom_convolution_filter_configuration_widget.h \
diff --git a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
index 8f1085654..8f1085654 100644
--- a/chalk/plugins/filters/convolutionfilters/convolutionfilters.cc
+++ b/chalk/plugins/filters/convolutionfilters/convolutionfilters.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cpp
index 08601d600..08601d600 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_convolution_filter.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cpp
index dc73f197b..dc73f197b 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter.cpp
diff --git a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
index fcffb3def..fcffb3def 100644
--- a/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cc
+++ b/chalk/plugins/filters/convolutionfilters/kis_custom_convolution_filter_configuration_widget.cpp
diff --git a/chalk/plugins/filters/cubismfilter/Makefile.am b/chalk/plugins/filters/cubismfilter/Makefile.am
index e281360ed..a26a8e806 100644
--- a/chalk/plugins/filters/cubismfilter/Makefile.am
+++ b/chalk/plugins/filters/cubismfilter/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkcubismfilter.la
 
-chalkcubismfilter_la_SOURCES = kis_cubism_filter_plugin.cc \
-	kis_cubism_filter.cc \
-        kis_polygon.cc
+chalkcubismfilter_la_SOURCES = kis_cubism_filter_plugin.cpp \
+	kis_cubism_filter.cpp \
+        kis_polygon.cpp
 
 noinst_HEADERS = kis_cubism_filter_plugin.h \
 	kis_cubism_filter.h \
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
index 1eb2984ef..1eb2984ef 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter.cpp
diff --git a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cpp
index 7215a2e3b..7215a2e3b 100644
--- a/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_cubism_filter_plugin.cpp
diff --git a/chalk/plugins/filters/cubismfilter/kis_polygon.cc b/chalk/plugins/filters/cubismfilter/kis_polygon.cpp
index cd2d979f2..cd2d979f2 100644
--- a/chalk/plugins/filters/cubismfilter/kis_polygon.cc
+++ b/chalk/plugins/filters/cubismfilter/kis_polygon.cpp
diff --git a/chalk/plugins/filters/embossfilter/Makefile.am b/chalk/plugins/filters/embossfilter/Makefile.am
index e3f686ac4..cfd32d299 100644
--- a/chalk/plugins/filters/embossfilter/Makefile.am
+++ b/chalk/plugins/filters/embossfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkembossfilter.la
 
-chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cc \
-	kis_emboss_filter.cc
+chalkembossfilter_la_SOURCES = kis_emboss_filter_plugin.cpp \
+	kis_emboss_filter.cpp
 
 noinst_HEADERS = kis_emboss_filter_plugin.h \
         kis_emboss_filter.h
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
index 0d6974e0c..0d6974e0c 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter.cpp
diff --git a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
index bd11b115b..bd11b115b 100644
--- a/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cc
+++ b/chalk/plugins/filters/embossfilter/kis_emboss_filter_plugin.cpp
diff --git a/chalk/plugins/filters/example/Makefile.am b/chalk/plugins/filters/example/Makefile.am
index 372de38ce..915c66cbb 100644
--- a/chalk/plugins/filters/example/Makefile.am
+++ b/chalk/plugins/filters/example/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkexample_la_SOURCES = example.cc
+chalkexample_la_SOURCES = example.cpp
 
 kde_module_LTLIBRARIES = chalkexample.la
 noinst_HEADERS = example.h
diff --git a/chalk/plugins/filters/example/example.cc b/chalk/plugins/filters/example/example.cpp
index a9ade7249..a9ade7249 100644
--- a/chalk/plugins/filters/example/example.cc
+++ b/chalk/plugins/filters/example/example.cpp
diff --git a/chalk/plugins/filters/fastcolortransfer/Makefile.am b/chalk/plugins/filters/fastcolortransfer/Makefile.am
index a9df484cd..4ddc2af26 100644
--- a/chalk/plugins/filters/fastcolortransfer/Makefile.am
+++ b/chalk/plugins/filters/fastcolortransfer/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cc \
+chalkfastcolortransfer_la_SOURCES = wdgfastcolortransfer.ui fastcolortransfer.cpp \
 	kis_wdg_fastcolortransfer.cpp
 
 kde_module_LTLIBRARIES = chalkfastcolortransfer.la
diff --git a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
index c43e56900..c43e56900 100644
--- a/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cc
+++ b/chalk/plugins/filters/fastcolortransfer/fastcolortransfer.cpp
diff --git a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
index 32249b69d..e717429ce 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
+++ b/chalk/plugins/filters/lenscorrectionfilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cc \
+chalklenscorrectionfilter_la_SOURCES = lenscorrectionfilter.cpp \
 	wdglenscorrectionoptions.ui kis_wdg_lens_correction.cpp
 
 kde_module_LTLIBRARIES = chalklenscorrectionfilter.la
diff --git a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
index 6b26ab11a..6b26ab11a 100644
--- a/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cc
+++ b/chalk/plugins/filters/lenscorrectionfilter/lenscorrectionfilter.cpp
diff --git a/chalk/plugins/filters/levelfilter/Makefile.am b/chalk/plugins/filters/levelfilter/Makefile.am
index 118442c24..fba918854 100644
--- a/chalk/plugins/filters/levelfilter/Makefile.am
+++ b/chalk/plugins/filters/levelfilter/Makefile.am
@@ -7,10 +7,10 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalklevelfilter_la_SOURCES = levelfilter.cc \
+chalklevelfilter_la_SOURCES = levelfilter.cpp \
 	wdg_level.ui \
-	kis_level_filter.cc \
-	kgradientslider.cc
+	kis_level_filter.cpp \
+	kgradientslider.cpp
 
 noinst_HEADERS = levelfilter.h \
 	kis_level_filter.h \
diff --git a/chalk/plugins/filters/levelfilter/kgradientslider.cc b/chalk/plugins/filters/levelfilter/kgradientslider.cpp
index b36e5ce97..b36e5ce97 100644
--- a/chalk/plugins/filters/levelfilter/kgradientslider.cc
+++ b/chalk/plugins/filters/levelfilter/kgradientslider.cpp
diff --git a/chalk/plugins/filters/levelfilter/kis_level_filter.cc b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
index 84dbc035c..84dbc035c 100644
--- a/chalk/plugins/filters/levelfilter/kis_level_filter.cc
+++ b/chalk/plugins/filters/levelfilter/kis_level_filter.cpp
diff --git a/chalk/plugins/filters/levelfilter/levelfilter.cc b/chalk/plugins/filters/levelfilter/levelfilter.cpp
index 891143783..891143783 100644
--- a/chalk/plugins/filters/levelfilter/levelfilter.cc
+++ b/chalk/plugins/filters/levelfilter/levelfilter.cpp
diff --git a/chalk/plugins/filters/noisefilter/Makefile.am b/chalk/plugins/filters/noisefilter/Makefile.am
index 78a648ab5..a483535de 100644
--- a/chalk/plugins/filters/noisefilter/Makefile.am
+++ b/chalk/plugins/filters/noisefilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalknoisefilter_la_SOURCES = noisefilter.cc wdgnoiseoptions.ui \
+chalknoisefilter_la_SOURCES = noisefilter.cpp wdgnoiseoptions.ui \
 	kis_wdg_noise.cpp
 
 kde_module_LTLIBRARIES = chalknoisefilter.la
diff --git a/chalk/plugins/filters/noisefilter/noisefilter.cc b/chalk/plugins/filters/noisefilter/noisefilter.cpp
index d8609ba2b..d8609ba2b 100644
--- a/chalk/plugins/filters/noisefilter/noisefilter.cc
+++ b/chalk/plugins/filters/noisefilter/noisefilter.cpp
diff --git a/chalk/plugins/filters/oilpaintfilter/Makefile.am b/chalk/plugins/filters/oilpaintfilter/Makefile.am
index 9fc08b250..284b2ee95 100644
--- a/chalk/plugins/filters/oilpaintfilter/Makefile.am
+++ b/chalk/plugins/filters/oilpaintfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkoilpaintfilter.la
 
-chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cc \
-	kis_oilpaint_filter.cc
+chalkoilpaintfilter_la_SOURCES = kis_oilpaint_filter_plugin.cpp \
+	kis_oilpaint_filter.cpp
 
 noinst_HEADERS = kis_oilpaint_filter_plugin.h \
 	kis_oilpaint_filter.h
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
index de869a424..de869a424 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter.cpp
diff --git a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
index d9c9f3e6f..d9c9f3e6f 100644
--- a/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cc
+++ b/chalk/plugins/filters/oilpaintfilter/kis_oilpaint_filter_plugin.cpp
diff --git a/chalk/plugins/filters/pixelizefilter/Makefile.am b/chalk/plugins/filters/pixelizefilter/Makefile.am
index 8836191e6..f13d2df3c 100644
--- a/chalk/plugins/filters/pixelizefilter/Makefile.am
+++ b/chalk/plugins/filters/pixelizefilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkpixelizefilter.la
 
-chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cc \
-	kis_pixelize_filter.cc
+chalkpixelizefilter_la_SOURCES = kis_pixelize_filter_plugin.cpp \
+	kis_pixelize_filter.cpp
 
 noinst_HEADERS = kis_pixelize_filter_plugin.h \
 	kis_pixelize_filter.h
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
index a6b77df76..a6b77df76 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter.cpp
diff --git a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
index d93cad4e1..d93cad4e1 100644
--- a/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cc
+++ b/chalk/plugins/filters/pixelizefilter/kis_pixelize_filter_plugin.cpp
diff --git a/chalk/plugins/filters/raindropsfilter/Makefile.am b/chalk/plugins/filters/raindropsfilter/Makefile.am
index 6239b0669..97f8f6ded 100644
--- a/chalk/plugins/filters/raindropsfilter/Makefile.am
+++ b/chalk/plugins/filters/raindropsfilter/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkraindropsfilter.la
 
-chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cc \
-	kis_raindrops_filter.cc
+chalkraindropsfilter_la_SOURCES = kis_raindrops_filter_plugin.cpp \
+	kis_raindrops_filter.cpp
 
 noinst_HEADERS = kis_raindrops_filter_plugin.h \
 	kis_raindrops_filter.h
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
index acb8c2e17..acb8c2e17 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter.cpp
diff --git a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
index f62196cb9..f62196cb9 100644
--- a/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cc
+++ b/chalk/plugins/filters/raindropsfilter/kis_raindrops_filter_plugin.cpp
diff --git a/chalk/plugins/filters/randompickfilter/Makefile.am b/chalk/plugins/filters/randompickfilter/Makefile.am
index 5f287f235..0e3cd61e6 100644
--- a/chalk/plugins/filters/randompickfilter/Makefile.am
+++ b/chalk/plugins/filters/randompickfilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkrandompickfilter_la_SOURCES = randompickfilter.cc wdgrandompickoptions.ui \
+chalkrandompickfilter_la_SOURCES = randompickfilter.cpp wdgrandompickoptions.ui \
 	kis_wdg_random_pick.cpp
 
 kde_module_LTLIBRARIES = chalkrandompickfilter.la
diff --git a/chalk/plugins/filters/randompickfilter/randompickfilter.cc b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
index 74368802a..74368802a 100644
--- a/chalk/plugins/filters/randompickfilter/randompickfilter.cc
+++ b/chalk/plugins/filters/randompickfilter/randompickfilter.cpp
diff --git a/chalk/plugins/filters/roundcorners/Makefile.am b/chalk/plugins/filters/roundcorners/Makefile.am
index 36281ac53..3f2ae4f05 100644
--- a/chalk/plugins/filters/roundcorners/Makefile.am
+++ b/chalk/plugins/filters/roundcorners/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalkroundcornersfilter.la
 
-chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cc \
-	kis_round_corners_filter.cc
+chalkroundcornersfilter_la_SOURCES = kis_round_corners_filter_plugin.cpp \
+	kis_round_corners_filter.cpp
 
 noinst_HEADERS = kis_round_corners_filter_plugin.h \
 	kis_round_corners_filter.h
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
index 698961a82..698961a82 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter.cpp
diff --git a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
index 14610c8e5..14610c8e5 100644
--- a/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cc
+++ b/chalk/plugins/filters/roundcorners/kis_round_corners_filter_plugin.cpp
diff --git a/chalk/plugins/filters/smalltilesfilter/Makefile.am b/chalk/plugins/filters/smalltilesfilter/Makefile.am
index 1e78bdc26..a1d9f0c86 100644
--- a/chalk/plugins/filters/smalltilesfilter/Makefile.am
+++ b/chalk/plugins/filters/smalltilesfilter/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalksmalltilesfilter.la
 
-chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cc \
-	kis_small_tiles_filter.cc
+chalksmalltilesfilter_la_SOURCES = kis_small_tiles_filter_plugin.cpp \
+	kis_small_tiles_filter.cpp
 
 noinst_HEADERS = kis_small_tiles_filter_plugin.h \
 	kis_small_tiles_filter.h
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
index a0cf20f17..a0cf20f17 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter.cpp
diff --git a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
index 6a7fe9ea8..6a7fe9ea8 100644
--- a/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cc
+++ b/chalk/plugins/filters/smalltilesfilter/kis_small_tiles_filter_plugin.cpp
diff --git a/chalk/plugins/filters/sobelfilter/Makefile.am b/chalk/plugins/filters/sobelfilter/Makefile.am
index f9e2ce2c5..9e3e5d874 100644
--- a/chalk/plugins/filters/sobelfilter/Makefile.am
+++ b/chalk/plugins/filters/sobelfilter/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES  = \
 
 kde_module_LTLIBRARIES = chalksobelfilter.la
 
-chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cc \
-	kis_sobel_filter.cc
+chalksobelfilter_la_SOURCES = kis_sobel_filter_plugin.cpp \
+	kis_sobel_filter.cpp
 
 noinst_HEADERS = kis_sobel_filter_plugin.h \
 	kis_sobel_filter.h
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
index 623fc690b..623fc690b 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter.cpp
diff --git a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
index 3b21c5477..3b21c5477 100644
--- a/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cc
+++ b/chalk/plugins/filters/sobelfilter/kis_sobel_filter_plugin.cpp
diff --git a/chalk/plugins/filters/threadtest/Makefile.am b/chalk/plugins/filters/threadtest/Makefile.am
index 7846c3c0e..e1a7c2675 100644
--- a/chalk/plugins/filters/threadtest/Makefile.am
+++ b/chalk/plugins/filters/threadtest/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	-I$(srcdir)/../../../../lib/kofficecore \
 	$(all_includes)
 
-chalkthreadtest_la_SOURCES = threadtest.cc
+chalkthreadtest_la_SOURCES = threadtest.cpp
 
 kde_module_LTLIBRARIES = chalkthreadtest.la
 noinst_HEADERS = threadtest.h
diff --git a/chalk/plugins/filters/threadtest/threadtest.cc b/chalk/plugins/filters/threadtest/threadtest.cpp
index 8477c09c7..8477c09c7 100644
--- a/chalk/plugins/filters/threadtest/threadtest.cc
+++ b/chalk/plugins/filters/threadtest/threadtest.cpp
diff --git a/chalk/plugins/filters/unsharp/Makefile.am b/chalk/plugins/filters/unsharp/Makefile.am
index 1035d30fa..3178e65ce 100644
--- a/chalk/plugins/filters/unsharp/Makefile.am
+++ b/chalk/plugins/filters/unsharp/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
         $(KOFFICE_INCLUDES) \
         $(all_includes)
 
-chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cc unsharp.cc kis_unsharp_filter.cc 
+chalkunsharpfilter_la_SOURCES = wdgunsharp.ui kis_wdg_unsharp.cpp unsharp.cpp kis_unsharp_filter.cpp 
 
 kde_module_LTLIBRARIES = chalkunsharpfilter.la
 
diff --git a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cpp
index 845262b17..845262b17 100644
--- a/chalk/plugins/filters/unsharp/kis_unsharp_filter.cc
+++ b/chalk/plugins/filters/unsharp/kis_unsharp_filter.cpp
diff --git a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
index 627d105cf..627d105cf 100644
--- a/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cc
+++ b/chalk/plugins/filters/unsharp/kis_wdg_unsharp.cpp
diff --git a/chalk/plugins/filters/unsharp/unsharp.cc b/chalk/plugins/filters/unsharp/unsharp.cpp
index 3d90d49ed..3d90d49ed 100644
--- a/chalk/plugins/filters/unsharp/unsharp.cc
+++ b/chalk/plugins/filters/unsharp/unsharp.cpp
diff --git a/chalk/plugins/filters/wavefilter/Makefile.am b/chalk/plugins/filters/wavefilter/Makefile.am
index 4e9838636..09cfe2708 100644
--- a/chalk/plugins/filters/wavefilter/Makefile.am
+++ b/chalk/plugins/filters/wavefilter/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkwavefilter_la_SOURCES = wavefilter.cc wdgwaveoptions.ui \
+chalkwavefilter_la_SOURCES = wavefilter.cpp wdgwaveoptions.ui \
 	kis_wdg_wave.cpp
 
 kde_module_LTLIBRARIES = chalkwavefilter.la
diff --git a/chalk/plugins/filters/wavefilter/wavefilter.cc b/chalk/plugins/filters/wavefilter/wavefilter.cpp
index 9f9777bf6..9f9777bf6 100644
--- a/chalk/plugins/filters/wavefilter/wavefilter.cc
+++ b/chalk/plugins/filters/wavefilter/wavefilter.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/Makefile.am b/chalk/plugins/paintops/defaultpaintops/Makefile.am
index 441e816bc..00e944658 100644
--- a/chalk/plugins/paintops/defaultpaintops/Makefile.am
+++ b/chalk/plugins/paintops/defaultpaintops/Makefile.am
@@ -18,14 +18,14 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 
 
 chalkdefaultpaintops_la_SOURCES = \
-	defaultpaintops_plugin.cc \
-	kis_airbrushop.cc \
-	kis_brushop.cc \
-	kis_duplicateop.cc \
-	kis_eraseop.cc \
-	kis_penop.cc \
+	defaultpaintops_plugin.cpp \
+	kis_airbrushop.cpp \
+	kis_brushop.cpp \
+	kis_duplicateop.cpp \
+	kis_eraseop.cpp \
+	kis_penop.cpp \
 	kis_dlgbrushcurvecontrol.ui \
-	kis_smudgeop.cc
+	kis_smudgeop.cpp
 
 noinst_HEADERS = defaultpaintops_plugin.h 	kis_airbrushop.h 	kis_brushop.h \
 		kis_duplicateop.h 	kis_eraseop.h 	kis_penop.h kis_smudgeop.h
diff --git a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
index 25f12b87b..6e1d3f754 100644
--- a/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cc
+++ b/chalk/plugins/paintops/defaultpaintops/defaultpaintops_plugin.cpp
@@ -1,5 +1,5 @@
 /*
- * defaultpaintops_plugin.cc -- Part of Chalk
+ * defaultpaintops_plugin.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cpp
index 2a8750f33..2a8750f33 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_airbrushop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
index 285b4d6fc..285b4d6fc 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_brushop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_brushop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cc b/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cpp
index 708d792c9..708d792c9 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_convolveop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cpp
index 556a77751..556a77751 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_duplicateop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cpp
index 55e3b7b84..55e3b7b84 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_eraseop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc b/chalk/plugins/paintops/defaultpaintops/kis_penop.cpp
index 4a8da9a16..4a8da9a16 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_penop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_penop.cpp
diff --git a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
index f15077b37..f15077b37 100644
--- a/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cc
+++ b/chalk/plugins/paintops/defaultpaintops/kis_smudgeop.cpp
diff --git a/chalk/plugins/tools/defaulttools/Makefile.am b/chalk/plugins/tools/defaulttools/Makefile.am
index b4159eac9..6505a0889 100644
--- a/chalk/plugins/tools/defaulttools/Makefile.am
+++ b/chalk/plugins/tools/defaulttools/Makefile.am
@@ -10,19 +10,19 @@ INCLUDES = -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalkdefaulttools_la_SOURCES = \
-	default_tools.cc \
-	kis_tool_colorpicker.cc \
-	kis_tool_move.cc \
-	kis_tool_zoom.cc \
-	kis_tool_brush.cc \
-	kis_tool_line.cc \
-	kis_tool_duplicate.cc \
-    kis_tool_fill.cc \
-    kis_tool_rectangle.cc \
-    kis_tool_ellipse.cc \
-	kis_tool_pan.cc \
-	kis_tool_text.cc \
-	kis_tool_gradient.cc \
+	default_tools.cpp \
+	kis_tool_colorpicker.cpp \
+	kis_tool_move.cpp \
+	kis_tool_zoom.cpp \
+	kis_tool_brush.cpp \
+	kis_tool_line.cpp \
+	kis_tool_duplicate.cpp \
+    kis_tool_fill.cpp \
+    kis_tool_rectangle.cpp \
+    kis_tool_ellipse.cpp \
+	kis_tool_pan.cpp \
+	kis_tool_text.cpp \
+	kis_tool_gradient.cpp \
 	wdgcolorpicker.ui
 
 # Install this plugin in the KDE modules directory
diff --git a/chalk/plugins/tools/defaulttools/default_tools.cc b/chalk/plugins/tools/defaulttools/default_tools.cpp
index 17e0feff0..6f1bedbbf 100644
--- a/chalk/plugins/tools/defaulttools/default_tools.cc
+++ b/chalk/plugins/tools/defaulttools/default_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * default_tools.cc -- Part of Chalk
+ * default_tools.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
index 7c83a36b0..96e262022 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_brush.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_brush.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_brush.cc - part of Chalk
+ *  kis_tool_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2003-2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
index 40a09a91f..40a09a91f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_colorpicker.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
index 7bb4c54fd..0f917e7f7 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_duplicate.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_duplicate.cc - part of Chalk
+ *  kis_tool_duplicate.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
index 919454b26..0488dcb05 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_ellipse.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_ellipse.cc - part of Krayon
+ *  kis_tool_ellipse.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
index df8e4f7c5..ceb78f06b 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_fill.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_fill.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_fill.cc - part of Krayon
+ *  kis_tool_fill.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
index a46fee808..b8f72a3bb 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_gradient.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_gradient.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_gradient.cc - part of Chalk
+ *  kis_tool_gradient.cpp - part of Chalk
  *
  *  Copyright (c) 2000 John Califf
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_line.cc b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
index 4e118cccb..87cb93907 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_line.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_line.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_line.cc - part of Krayon
+ *  kis_tool_line.cpp - part of Krayon
  *
  *  Copyright (c) 2000 John Califf
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_move.cc b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
index be5065784..be5065784 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_move.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_move.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
index c95b10000..c95b10000 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_pan.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_pan.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
index 852d2c0e0..69e306ecf 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_rectangle.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_rectangle.cc - part of Chalk
+ *  kis_tool_rectangle.cpp - part of Chalk
  *
  *  Copyright (c) 2000 John Califf <jcaliff@compuzone.net>
  *  Copyright (c) 2002 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_text.cc b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
index 1a2687f13..1a2687f13 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_text.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_text.cpp
diff --git a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
index fe449ee4f..fe449ee4f 100644
--- a/chalk/plugins/tools/defaulttools/kis_tool_zoom.cc
+++ b/chalk/plugins/tools/defaulttools/kis_tool_zoom.cpp
diff --git a/chalk/plugins/tools/selectiontools/Makefile.am b/chalk/plugins/tools/selectiontools/Makefile.am
index 49d3f5711..6c4768716 100644
--- a/chalk/plugins/tools/selectiontools/Makefile.am
+++ b/chalk/plugins/tools/selectiontools/Makefile.am
@@ -9,10 +9,10 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkselectiontools_la_SOURCES = kis_tool_move_selection.cc \
-	kis_tool_select_brush.cc kis_tool_select_contiguous.cc kis_tool_select_elliptical.cc \
-	kis_tool_select_eraser.cc kis_tool_select_outline.cc kis_tool_select_polygonal.cc \
-	kis_tool_select_rectangular.cc selection_tools.cc
+chalkselectiontools_la_SOURCES = kis_tool_move_selection.cpp \
+	kis_tool_select_brush.cpp kis_tool_select_contiguous.cpp kis_tool_select_elliptical.cpp \
+	kis_tool_select_eraser.cpp kis_tool_select_outline.cpp kis_tool_select_polygonal.cpp \
+	kis_tool_select_rectangular.cpp selection_tools.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalkselectiontools.la
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
index a1f0902f4..a1f0902f4 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_move_selection.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
index acc903620..ba80434f3 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_brush.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_brush.cc - part of Chalk
+ *  kis_tool_select_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
index 1a4932b75..1a4932b75 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_contiguous.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
index def162ef4..f85da3327 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_elliptical.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_elliptical.cc -- part of Chalk
+ *  kis_tool_select_elliptical.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
index af7f8d84a..9cfef0a80 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_eraser.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_select_brush.cc - part of Chalk
+ *  kis_tool_select_brush.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
index 7f5267366..7f5267366 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_outline.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
index 8d89eea2f..8d89eea2f 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_polygonal.cpp
diff --git a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
index 09d338663..5a6772bac 100644
--- a/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cc
+++ b/chalk/plugins/tools/selectiontools/kis_tool_select_rectangular.cpp
@@ -1,6 +1,6 @@
 
 /*
- *  kis_tool_select_rectangular.cc -- part of Chalk
+ *  kis_tool_select_rectangular.cpp -- part of Chalk
  *
  *  Copyright (c) 1999 Michael Koch <koch@kde.org>
  *                2001 John Califf <jcaliff@compuzone.net>
diff --git a/chalk/plugins/tools/selectiontools/selection_tools.cc b/chalk/plugins/tools/selectiontools/selection_tools.cpp
index 8407a076e..f34a3b34c 100644
--- a/chalk/plugins/tools/selectiontools/selection_tools.cc
+++ b/chalk/plugins/tools/selectiontools/selection_tools.cpp
@@ -1,5 +1,5 @@
 /*
- * selection_tools.cc -- Part of Chalk
+ * selection_tools.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_crop/Makefile.am b/chalk/plugins/tools/tool_crop/Makefile.am
index 9f46072e7..51bfb5cee 100644
--- a/chalk/plugins/tools/tool_crop/Makefile.am
+++ b/chalk/plugins/tools/tool_crop/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktoolcrop_la_SOURCES = \
 	wdg_tool_crop.ui \
-	tool_crop.cc \
-	kis_tool_crop.cc 
+	tool_crop.cpp \
+	kis_tool_crop.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolcrop.la
diff --git a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
index 11a47590c..58454b4f5 100644
--- a/chalk/plugins/tools/tool_crop/kis_tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/kis_tool_crop.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_crop.cc -- part of Chalk
+ *  kis_tool_crop.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
diff --git a/chalk/plugins/tools/tool_crop/tool_crop.cc b/chalk/plugins/tools/tool_crop/tool_crop.cpp
index 97f6e0e85..30df11ec3 100644
--- a/chalk/plugins/tools/tool_crop/tool_crop.cc
+++ b/chalk/plugins/tools/tool_crop/tool_crop.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_crop.cc -- Part of Chalk
+ * tool_crop.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_curves/Makefile.am b/chalk/plugins/tools/tool_curves/Makefile.am
index d2ddbf07c..569c33b70 100644
--- a/chalk/plugins/tools/tool_curves/Makefile.am
+++ b/chalk/plugins/tools/tool_curves/Makefile.am
@@ -10,15 +10,15 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolcurves_la_SOURCES = \
-	kis_curve_framework.cc \
-	kis_tool_curve.cc \
-		tool_curves.cc \
+	kis_curve_framework.cpp \
+	kis_tool_curve.cpp \
+		tool_curves.cpp \
 	wdg_tool_example.ui \
-	kis_tool_example.cc \
-	kis_tool_bezier.cc \
-	kis_tool_bezier_paint.cc \
-	kis_tool_bezier_select.cc \
-	kis_tool_moutline.cc
+	kis_tool_example.cpp \
+	kis_tool_bezier.cpp \
+	kis_tool_bezier_paint.cpp \
+	kis_tool_bezier_select.cpp \
+	kis_tool_moutline.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolcurves.la
diff --git a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc b/chalk/plugins/tools/tool_curves/kis_curve_framework.cpp
index 8a9b4c886..8a9b4c886 100644
--- a/chalk/plugins/tools/tool_curves/kis_curve_framework.cc
+++ b/chalk/plugins/tools/tool_curves/kis_curve_framework.cpp
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cpp
index e4c1d05d0..9195dfbd7 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_bezier.cc -- part of Chalk
+ *  kis_tool_bezier.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
index 06f34f8cc..a8d1514be 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_paint.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
index 724189208..657358609 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_bezier_select.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
index 7449e5817..ea1f9a773 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_curve.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_curve.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_curve.cc -- part of Chalk
+ *  kis_tool_curve.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_example.cc b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
index 75e3da2be..a21bb8089 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_example.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_example.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_example.cc -- part of Chalk
+ *  kis_tool_example.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
index 178ff278f..ebf82634f 100644
--- a/chalk/plugins/tools/tool_curves/kis_tool_moutline.cc
+++ b/chalk/plugins/tools/tool_curves/kis_tool_moutline.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_moutline.cc -- part of Chalk
+ *  kis_tool_moutline.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_curves/tool_curves.cc b/chalk/plugins/tools/tool_curves/tool_curves.cpp
index b21f5aae3..28f65604a 100644
--- a/chalk/plugins/tools/tool_curves/tool_curves.cc
+++ b/chalk/plugins/tools/tool_curves/tool_curves.cpp
@@ -1,5 +1,5 @@
 /*
- *  tool_bezier.cc -- part of Chalk
+ *  tool_bezier.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Emanuele Tamponi <emanuele@valinor.it>
  *
diff --git a/chalk/plugins/tools/tool_filter/Makefile.am b/chalk/plugins/tools/tool_filter/Makefile.am
index f775c4357..e8e249d38 100644
--- a/chalk/plugins/tools/tool_filter/Makefile.am
+++ b/chalk/plugins/tools/tool_filter/Makefile.am
@@ -10,9 +10,9 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolfilter_la_SOURCES = \
-	kis_filterop.cc \
-	kis_tool_filter.cc \
-	tool_filter.cc
+	kis_filterop.cpp \
+	kis_tool_filter.cpp \
+	tool_filter.cpp
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolfilter.la
diff --git a/chalk/plugins/tools/tool_filter/kis_filterop.cc b/chalk/plugins/tools/tool_filter/kis_filterop.cpp
index d3378730f..d3378730f 100644
--- a/chalk/plugins/tools/tool_filter/kis_filterop.cc
+++ b/chalk/plugins/tools/tool_filter/kis_filterop.cpp
diff --git a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
index 07133d3bb..14e2d6168 100644
--- a/chalk/plugins/tools/tool_filter/kis_tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/kis_tool_filter.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_filter.cc - part of Chalk
+ *  kis_tool_filter.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_filter/tool_filter.cc b/chalk/plugins/tools/tool_filter/tool_filter.cpp
index bda2357e3..484a7d9f3 100644
--- a/chalk/plugins/tools/tool_filter/tool_filter.cc
+++ b/chalk/plugins/tools/tool_filter/tool_filter.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_filter.cc -- Part of Chalk
+ * tool_filter.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
index 534759916..3e72a0fc5 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivegrid/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolperspectivegrid_la_SOURCES = \
-	tool_perspectivegrid.cc \
-	kis_tool_perspectivegrid.cc 
+	tool_perspectivegrid.cpp \
+	kis_tool_perspectivegrid.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolperspectivegrid.la
diff --git a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
index 2dbe56d3d..7d5df0f2b 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/kis_tool_perspectivegrid.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_perspectivegrid.cc - part of Chalk
+ *  kis_tool_perspectivegrid.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
index f2800a594..2f326965b 100644
--- a/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cc
+++ b/chalk/plugins/tools/tool_perspectivegrid/tool_perspectivegrid.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_perspectivegrid.cc -- Part of Chalk
+ * tool_perspectivegrid.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
index c34b906c3..c22c23168 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
+++ b/chalk/plugins/tools/tool_perspectivetransform/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolperspectivetransform_la_SOURCES = \
-	tool_perspectivetransform.cc \
-	kis_tool_perspectivetransform.cc 
+	tool_perspectivetransform.cpp \
+	kis_tool_perspectivetransform.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolperspectivetransform.la
diff --git a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
index ae334e627..e73f5da3c 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/kis_tool_perspectivetransform.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_transform.cc -- part of Chalk
+ *  kis_tool_transform.cpp -- part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
index 0c4023cce..73705264b 100644
--- a/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cc
+++ b/chalk/plugins/tools/tool_perspectivetransform/tool_perspectivetransform.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_perspectivetransform.cc -- Part of Chalk
+ * tool_perspectivetransform.cpp -- Part of Chalk
  *
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
  *
diff --git a/chalk/plugins/tools/tool_polygon/Makefile.am b/chalk/plugins/tools/tool_polygon/Makefile.am
index ad69e2cc2..f9b640946 100644
--- a/chalk/plugins/tools/tool_polygon/Makefile.am
+++ b/chalk/plugins/tools/tool_polygon/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolpolygon_la_SOURCES = \
-        tool_polygon.cc \
-	kis_tool_polygon.cc 
+        tool_polygon.cpp \
+	kis_tool_polygon.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolpolygon.la
diff --git a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
index a7371e49f..601fc6907 100644
--- a/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/kis_tool_polygon.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_polygon.cc -- part of Chalk
+ *  kis_tool_polygon.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polygon/tool_polygon.cc b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
index 626a773d3..f903551fb 100644
--- a/chalk/plugins/tools/tool_polygon/tool_polygon.cc
+++ b/chalk/plugins/tools/tool_polygon/tool_polygon.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_polygon.cc -- Part of Chalk
+ * tool_polygon.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polyline/Makefile.am b/chalk/plugins/tools/tool_polyline/Makefile.am
index a058dc589..c9ca737fb 100644
--- a/chalk/plugins/tools/tool_polyline/Makefile.am
+++ b/chalk/plugins/tools/tool_polyline/Makefile.am
@@ -10,8 +10,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalktoolpolyline_la_SOURCES = \
-        tool_polyline.cc \
-	kis_tool_polyline.cc 
+        tool_polyline.cpp \
+	kis_tool_polyline.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolpolyline.la
diff --git a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
index c99513f47..ab89cf3f4 100644
--- a/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/kis_tool_polyline.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_polyline.cc -- part of Chalk
+ *  kis_tool_polyline.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_polyline/tool_polyline.cc b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
index a5bfa27f2..d6abff71a 100644
--- a/chalk/plugins/tools/tool_polyline/tool_polyline.cc
+++ b/chalk/plugins/tools/tool_polyline/tool_polyline.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_polyline.cc -- Part of Chalk
+ * tool_polyline.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_selectsimilar/Makefile.am b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
index 84bb341e1..e9e6241a2 100644
--- a/chalk/plugins/tools/tool_selectsimilar/Makefile.am
+++ b/chalk/plugins/tools/tool_selectsimilar/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 
-chalktoolselectsimilar_la_SOURCES = selectsimilar.cc kis_tool_selectsimilar.cc
+chalktoolselectsimilar_la_SOURCES = selectsimilar.cpp kis_tool_selectsimilar.cpp
 noinst_HEADERS = selectsimilar.h kis_tool_selectsimilar.h
 
 kde_module_LTLIBRARIES = chalktoolselectsimilar.la
diff --git a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
index 65b05957a..65b05957a 100644
--- a/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/kis_tool_selectsimilar.cpp
diff --git a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
index af8070171..af8070171 100644
--- a/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cc
+++ b/chalk/plugins/tools/tool_selectsimilar/selectsimilar.cpp
diff --git a/chalk/plugins/tools/tool_star/Makefile.am b/chalk/plugins/tools/tool_star/Makefile.am
index c8f65857c..d75f64957 100644
--- a/chalk/plugins/tools/tool_star/Makefile.am
+++ b/chalk/plugins/tools/tool_star/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktoolstar_la_SOURCES = \
 	wdg_tool_star.ui \
-        tool_star.cc \
-	kis_tool_star.cc 
+        tool_star.cpp \
+	kis_tool_star.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktoolstar.la
diff --git a/chalk/plugins/tools/tool_star/kis_tool_star.cc b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
index cd4bb0b2e..3a260545b 100644
--- a/chalk/plugins/tools/tool_star/kis_tool_star.cc
+++ b/chalk/plugins/tools/tool_star/kis_tool_star.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_star.cc -- part of Chalk
+ *  kis_tool_star.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_star/tool_star.cc b/chalk/plugins/tools/tool_star/tool_star.cpp
index 9ac1b62f8..7309e8a1a 100644
--- a/chalk/plugins/tools/tool_star/tool_star.cc
+++ b/chalk/plugins/tools/tool_star/tool_star.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_star.cc -- Part of Chalk
+ * tool_star.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/tools/tool_transform/Makefile.am b/chalk/plugins/tools/tool_transform/Makefile.am
index 78aab31b8..485184aed 100644
--- a/chalk/plugins/tools/tool_transform/Makefile.am
+++ b/chalk/plugins/tools/tool_transform/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES =  -I$(srcdir)/../../../sdk \
 
 chalktooltransform_la_SOURCES = \
 	wdg_tool_transform.ui \
-	tool_transform.cc \
-	kis_tool_transform.cc 
+	tool_transform.cpp \
+	kis_tool_transform.cpp 
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = chalktooltransform.la
diff --git a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
index de20ce7f6..88a675663 100644
--- a/chalk/plugins/tools/tool_transform/kis_tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/kis_tool_transform.cpp
@@ -1,5 +1,5 @@
 /*
- *  kis_tool_transform.cc -- part of Chalk
+ *  kis_tool_transform.cpp -- part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Casper Boemann <cbr@boemann.dk>
diff --git a/chalk/plugins/tools/tool_transform/tool_transform.cc b/chalk/plugins/tools/tool_transform/tool_transform.cpp
index 82941e92c..0f0dde27d 100644
--- a/chalk/plugins/tools/tool_transform/tool_transform.cc
+++ b/chalk/plugins/tools/tool_transform/tool_transform.cpp
@@ -1,5 +1,5 @@
 /*
- * tool_transform.cc -- Part of Chalk
+ * tool_transform.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/colorrange/Makefile.am b/chalk/plugins/viewplugins/colorrange/Makefile.am
index c8752391c..e2ab687d2 100644
--- a/chalk/plugins/viewplugins/colorrange/Makefile.am
+++ b/chalk/plugins/viewplugins/colorrange/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkcolorrange.la
 
-chalkcolorrange_la_SOURCES = colorrange.cc dlg_colorrange.cc wdg_colorrange.ui
+chalkcolorrange_la_SOURCES = colorrange.cpp dlg_colorrange.cpp wdg_colorrange.ui
 noinst_HEADERS = wdg_colorrange.h dlg_colorrange.h colorrange.h
 
 chalkcolorrange_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
diff --git a/chalk/plugins/viewplugins/colorrange/colorrange.cc b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
index be0648bab..be0648bab 100644
--- a/chalk/plugins/viewplugins/colorrange/colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/colorrange.cpp
diff --git a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
index 453bbec27..82748f4c8 100644
--- a/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cc
+++ b/chalk/plugins/viewplugins/colorrange/dlg_colorrange.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_colorrange.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_colorrange.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am b/chalk/plugins/viewplugins/colorspaceconversion/Makefile.am
index 00f93d3c5..237801063 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 d956ee460..377f0569d 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/colorspaceconversion.cpp
@@ -1,5 +1,5 @@
 /*
- * colorspaceconversion.cc -- Part of Chalk
+ * colorspaceconversion.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
index 8159ad73f..259c6f470 100644
--- a/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cc
+++ b/chalk/plugins/viewplugins/colorspaceconversion/dlg_colorspaceconversion.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_colorspaceconversion.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_colorspaceconversion.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/dropshadow/Makefile.am b/chalk/plugins/viewplugins/dropshadow/Makefile.am
index d65b4b0e0..3b9a86204 100644
--- a/chalk/plugins/viewplugins/dropshadow/Makefile.am
+++ b/chalk/plugins/viewplugins/dropshadow/Makefile.am
@@ -14,8 +14,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkdropshadow.la
 
 chalkdropshadow_la_SOURCES = wdg_dropshadow.ui \
-	kis_dropshadow.cc dlg_dropshadow.cc  \
-	kis_dropshadow_plugin.cc
+	kis_dropshadow.cpp dlg_dropshadow.cpp  \
+	kis_dropshadow_plugin.cpp
 
 noinst_HEADERS = wdg_dropshadow.h kis_dropshadow_plugin.h \
 		kis_dropshadow.h dlg_dropshadow.h
diff --git a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
index 59019489c..c82bbbad6 100644
--- a/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/dlg_dropshadow.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_dropshadow.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_dropshadow.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2005 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *  Copyright (c) 2006 Cyrille Berger <cberger@cberger.net>
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
index 97c2c17ed..97c2c17ed 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow.cpp
diff --git a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
index 97a0b8a7a..97a0b8a7a 100644
--- a/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cc
+++ b/chalk/plugins/viewplugins/dropshadow/kis_dropshadow_plugin.cpp
diff --git a/chalk/plugins/viewplugins/filtersgallery/Makefile.am b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
index 306076b61..7a67d3604 100644
--- a/chalk/plugins/viewplugins/filtersgallery/Makefile.am
+++ b/chalk/plugins/viewplugins/filtersgallery/Makefile.am
@@ -11,8 +11,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkfiltersgallery_la_SOURCES = filters_gallery.cc \
-		kis_dlg_filtersgallery.cc kis_wdg_filtersgallery.ui
+chalkfiltersgallery_la_SOURCES = filters_gallery.cpp \
+		kis_dlg_filtersgallery.cpp kis_wdg_filtersgallery.ui
 
 kde_module_LTLIBRARIES = chalkfiltersgallery.la
 noinst_HEADERS = filters_gallery.h kis_dlg_filtersgallery.h
diff --git a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
index 337b55c02..337b55c02 100644
--- a/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/filters_gallery.cpp
diff --git a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
index e0bec7ec6..e0bec7ec6 100644
--- a/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cc
+++ b/chalk/plugins/viewplugins/filtersgallery/kis_dlg_filtersgallery.cpp
diff --git a/chalk/plugins/viewplugins/histogram/Makefile.am b/chalk/plugins/viewplugins/histogram/Makefile.am
index 31a044eb0..b2ec010d4 100644
--- a/chalk/plugins/viewplugins/histogram/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkhistogram.la
 
-chalkhistogram_la_SOURCES = histogram.cc dlg_histogram.cc wdghistogram.ui kis_histogram_widget.cc
+chalkhistogram_la_SOURCES = histogram.cpp dlg_histogram.cpp wdghistogram.ui kis_histogram_widget.cpp
 noinst_HEADERS = dlg_histogram.h histogram.h wdghistogram.h kis_histogram_widget.h
 
 kde_services_DATA = chalkhistogram.desktop
diff --git a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc b/chalk/plugins/viewplugins/histogram/dlg_histogram.cpp
index 448a58cfc..77ad06686 100644
--- a/chalk/plugins/viewplugins/histogram/dlg_histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/dlg_histogram.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_histogram.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_histogram.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/histogram/histogram.cc b/chalk/plugins/viewplugins/histogram/histogram.cpp
index 8252a98db..8252a98db 100644
--- a/chalk/plugins/viewplugins/histogram/histogram.cc
+++ b/chalk/plugins/viewplugins/histogram/histogram.cpp
diff --git a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
index c49838706..c49838706 100644
--- a/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cc
+++ b/chalk/plugins/viewplugins/histogram/kis_histogram_widget.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/Makefile.am b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
index 0dcb9914d..bdedf5ddb 100644
--- a/chalk/plugins/viewplugins/histogram_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/histogram_docker/Makefile.am
@@ -10,7 +10,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkhistogramdocker_la_SOURCES = histogramdocker.cc  kis_imagerasteredcache.cc kis_cachedhistogram.cc kis_accumulating_producer.cc
+chalkhistogramdocker_la_SOURCES = histogramdocker.cpp  kis_imagerasteredcache.cpp kis_cachedhistogram.cpp kis_accumulating_producer.cpp
 
 kde_module_LTLIBRARIES = chalkhistogramdocker.la
 noinst_HEADERS = histogramdocker.h kis_imagerasteredcache.h kis_cachedhistogram.h kis_accumulating_producer.h
diff --git a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
index 25a7b9cff..25a7b9cff 100644
--- a/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/histogramdocker.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc b/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cpp
index 217a36d91..217a36d91 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_accumulating_producer.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cc b/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cpp
index 1ad197f9d..1ad197f9d 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_cachedhistogram.cpp
diff --git a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
index 19599cd9c..19599cd9c 100644
--- a/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cc
+++ b/chalk/plugins/viewplugins/histogram_docker/kis_imagerasteredcache.cpp
diff --git a/chalk/plugins/viewplugins/history_docker/Makefile.am b/chalk/plugins/viewplugins/history_docker/Makefile.am
index 53511b3d9..c77357f23 100644
--- a/chalk/plugins/viewplugins/history_docker/Makefile.am
+++ b/chalk/plugins/viewplugins/history_docker/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  = -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkhistorydocker_la_SOURCES = historydocker.cc 
+chalkhistorydocker_la_SOURCES = historydocker.cpp 
 
 kde_module_LTLIBRARIES = chalkhistorydocker.la
 noinst_HEADERS = historydocker.h 
diff --git a/chalk/plugins/viewplugins/history_docker/historydocker.cc b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
index 85e4df406..85e4df406 100644
--- a/chalk/plugins/viewplugins/history_docker/historydocker.cc
+++ b/chalk/plugins/viewplugins/history_docker/historydocker.cpp
diff --git a/chalk/plugins/viewplugins/imagesize/Makefile.am b/chalk/plugins/viewplugins/imagesize/Makefile.am
index cea7a0e12..29ec8d09c 100644
--- a/chalk/plugins/viewplugins/imagesize/Makefile.am
+++ b/chalk/plugins/viewplugins/imagesize/Makefile.am
@@ -12,7 +12,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkimagesize_la_SOURCES = wdg_imagesize.ui wdg_layersize.ui imagesize.cc dlg_imagesize.cc dlg_layersize.cc wdg_resolution.ui
+chalkimagesize_la_SOURCES = wdg_imagesize.ui wdg_layersize.ui imagesize.cpp dlg_imagesize.cpp dlg_layersize.cpp wdg_resolution.ui
 
 noinst_HEADERS = wdg_imagesize.h dlg_imagesize.h imagesize.h dlg_layersize.h
 
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
index 8a9a8c098..c455af8cc 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_imagesize.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_imagesize.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_imagesize.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
index 1d30db6a0..779798056 100644
--- a/chalk/plugins/viewplugins/imagesize/dlg_layersize.cc
+++ b/chalk/plugins/viewplugins/imagesize/dlg_layersize.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_layersize.cc - part of Chalk
+ *  dlg_layersize.cpp - part of Chalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *  Copyright (c) 2005 Sven Langkamp <longamp@reallygood.de>
diff --git a/chalk/plugins/viewplugins/imagesize/imagesize.cc b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
index c795924e1..af9c2570f 100644
--- a/chalk/plugins/viewplugins/imagesize/imagesize.cc
+++ b/chalk/plugins/viewplugins/imagesize/imagesize.cpp
@@ -1,5 +1,5 @@
 /*
- * imagesize.cc -- Part of Chalk
+ * imagesize.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt (boud@valdyas.org)
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/Makefile.am b/chalk/plugins/viewplugins/modify_selection/Makefile.am
index 5b374888c..89f6e6339 100644
--- a/chalk/plugins/viewplugins/modify_selection/Makefile.am
+++ b/chalk/plugins/viewplugins/modify_selection/Makefile.am
@@ -13,7 +13,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 	$(all_includes)
 
 chalkmodifyselection_la_SOURCES = wdg_grow_selection.ui wdg_shrink_selection.ui wdg_border_selection.ui \
-dlg_grow_selection.cc dlg_shrink_selection.cc dlg_border_selection.cc modify_selection.cc
+dlg_grow_selection.cpp dlg_shrink_selection.cpp dlg_border_selection.cpp modify_selection.cpp
 
 noinst_HEADERS = wdg_grow_selection.h wdg_shrink_selection.h wdg_border_selection.h dlg_grow_selection.h \
 dlg_shrink_selection.h dlg_border_selection.h modify_selection.h
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
index 7cd1c335d..8e2bc4de8 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_border_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_border_selection.cc - part of Chalk
+ *  dlg_border_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
index 38c445b01..ae590eba9 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_grow_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_grow_selection.cc - part of Chalk
+ *  dlg_grow_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
index f0129e742..ce4ce9d3b 100644
--- a/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/dlg_shrink_selection.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_shrink_selection.cc - part of Chalk
+ *  dlg_shrink_selection.cpp - part of Chalk
  *
  *  Copyright (c) 2006 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
index 92d50ef7a..823899958 100644
--- a/chalk/plugins/viewplugins/modify_selection/modify_selection.cc
+++ b/chalk/plugins/viewplugins/modify_selection/modify_selection.cpp
@@ -1,5 +1,5 @@
 /*
- * modify_selection.cc -- Part of Chalk
+ * modify_selection.cpp -- Part of Chalk
  *
  * Copyright (c) 2006 Michael Thaler (michael.thaler@physik.tu-muenchen.de)
  *
diff --git a/chalk/plugins/viewplugins/performancetest/Makefile.am b/chalk/plugins/viewplugins/performancetest/Makefile.am
index dc26593ed..d68e61792 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 b2a723069..326d97272 100644
--- a/chalk/plugins/viewplugins/performancetest/dlg_perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/dlg_perftest.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_perftest.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_perftest.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/performancetest/perftest.cc b/chalk/plugins/viewplugins/performancetest/perftest.cpp
index f728043cd..fa5445516 100644
--- a/chalk/plugins/viewplugins/performancetest/perftest.cc
+++ b/chalk/plugins/viewplugins/performancetest/perftest.cpp
@@ -1,5 +1,5 @@
 /*
- * perftest.cc -- Part of Chalk
+ * perftest.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/Makefile.am b/chalk/plugins/viewplugins/rotateimage/Makefile.am
index 23839ecac..e5d84219a 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 84c11ffb5..e7c3a8ce9 100644
--- a/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/dlg_rotateimage.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_rotateimage.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_rotateimage.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
index 8a0985cc3..f58f78168 100644
--- a/chalk/plugins/viewplugins/rotateimage/rotateimage.cc
+++ b/chalk/plugins/viewplugins/rotateimage/rotateimage.cpp
@@ -1,5 +1,5 @@
 /*
- * rotateimage.cc -- Part of Chalk
+ * rotateimage.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler
  *
diff --git a/chalk/plugins/viewplugins/scripting/Makefile.am b/chalk/plugins/viewplugins/scripting/Makefile.am
index be88f9b8b..f4084a46a 100644
--- a/chalk/plugins/viewplugins/scripting/Makefile.am
+++ b/chalk/plugins/viewplugins/scripting/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES  =  -I$(top_srcdir)/chalk/sdk \
 	$(KOFFICE_INCLUDES) \
 	$(all_includes)
 
-chalkscripting_la_SOURCES = scripting.cc
+chalkscripting_la_SOURCES = scripting.cpp
 
 kde_module_LTLIBRARIES = chalkscripting.la
 noinst_HEADERS = scripting.h
diff --git a/chalk/plugins/viewplugins/scripting/scripting.cc b/chalk/plugins/viewplugins/scripting/scripting.cpp
index 207bc0ce3..207bc0ce3 100644
--- a/chalk/plugins/viewplugins/scripting/scripting.cc
+++ b/chalk/plugins/viewplugins/scripting/scripting.cpp
diff --git a/chalk/plugins/viewplugins/selectopaque/Makefile.am b/chalk/plugins/viewplugins/selectopaque/Makefile.am
index 731e091c8..63efe384c 100644
--- a/chalk/plugins/viewplugins/selectopaque/Makefile.am
+++ b/chalk/plugins/viewplugins/selectopaque/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 
 kde_module_LTLIBRARIES = chalkselectopaque.la
 
-chalkselectopaque_la_SOURCES = selectopaque.cc 
+chalkselectopaque_la_SOURCES = selectopaque.cpp 
 noinst_HEADERS = selectopaque.h
 
 chalkselectopaque_la_LIBADD = $(LIB_KOFFICEUI) ../../../libchalkcommon.la \
diff --git a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
index 61d856344..61d856344 100644
--- a/chalk/plugins/viewplugins/selectopaque/selectopaque.cc
+++ b/chalk/plugins/viewplugins/selectopaque/selectopaque.cpp
diff --git a/chalk/plugins/viewplugins/separate_channels/Makefile.am b/chalk/plugins/viewplugins/separate_channels/Makefile.am
index eef7853da..15cdc0fdc 100644
--- a/chalk/plugins/viewplugins/separate_channels/Makefile.am
+++ b/chalk/plugins/viewplugins/separate_channels/Makefile.am
@@ -12,8 +12,8 @@ INCLUDES  =  -I$(srcdir)/../../../sdk \
 kde_module_LTLIBRARIES = chalkseparatechannels.la
 
 chalkseparatechannels_la_SOURCES = wdg_separations.ui \
-	kis_channel_separator.cc dlg_separate.cc  \
-	kis_separate_channels_plugin.cc
+	kis_channel_separator.cpp dlg_separate.cpp  \
+	kis_separate_channels_plugin.cpp
 
 noinst_HEADERS = wdg_separations.h kis_separate_channels_plugin.h \
 		kis_channel_separator.h dlg_separate.h
diff --git a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
index 6d2a59c32..d650a045a 100644
--- a/chalk/plugins/viewplugins/separate_channels/dlg_separate.cc
+++ b/chalk/plugins/viewplugins/separate_channels/dlg_separate.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_separate.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_separate.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
index ba8c6b84a..ba8c6b84a 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_channel_separator.cpp
diff --git a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
index db356a164..db356a164 100644
--- a/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cc
+++ b/chalk/plugins/viewplugins/separate_channels/kis_separate_channels_plugin.cpp
diff --git a/chalk/plugins/viewplugins/shearimage/Makefile.am b/chalk/plugins/viewplugins/shearimage/Makefile.am
index 65a3a7352..e478bf0c4 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 e7a63180b..d295493d0 100644
--- a/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/dlg_shearimage.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_shearimage.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_shearimage.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Michael Thaler <michael.thaler@physik.tu-muenchen.de>
  *
diff --git a/chalk/plugins/viewplugins/shearimage/shearimage.cc b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
index 8e20b58d6..2596e62ee 100644
--- a/chalk/plugins/viewplugins/shearimage/shearimage.cc
+++ b/chalk/plugins/viewplugins/shearimage/shearimage.cpp
@@ -1,5 +1,5 @@
 /*
- * shearimage.cc -- Part of Chalk
+ * shearimage.cpp -- Part of Chalk
  *
  * Copyright (c) 2004 Michael Thaler
  *
diff --git a/chalk/plugins/viewplugins/substrate/Makefile.am b/chalk/plugins/viewplugins/substrate/Makefile.am
index c4eca055b..e708a90d3 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 a0dbc5aa2..78847f056 100644
--- a/chalk/plugins/viewplugins/substrate/dlg_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/dlg_substrate.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_substrate.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_substrate.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cc b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cpp
index e69de29bb..e69de29bb 100644
--- a/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/kis_repeating_substrate.cpp
diff --git a/chalk/plugins/viewplugins/substrate/substrate.cc b/chalk/plugins/viewplugins/substrate/substrate.cpp
index ce13710be..ce13710be 100644
--- a/chalk/plugins/viewplugins/substrate/substrate.cc
+++ b/chalk/plugins/viewplugins/substrate/substrate.cpp
diff --git a/chalk/plugins/viewplugins/variations/Makefile.am b/chalk/plugins/viewplugins/variations/Makefile.am
index 3b1d4c78f..f35bd875b 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 afa6a3d74..4decbbd41 100644
--- a/chalk/plugins/viewplugins/variations/dlg_variations.cc
+++ b/chalk/plugins/viewplugins/variations/dlg_variations.cpp
@@ -1,5 +1,5 @@
 /*
- *  dlg_variations.cc - part of KimageShop^WKrayon^WChalk
+ *  dlg_variations.cpp - part of KimageShop^WKrayon^WChalk
  *
  *  Copyright (c) 2004 Boudewijn Rempt <boud@valdyas.org>
  *
diff --git a/chalk/plugins/viewplugins/variations/variations.cc b/chalk/plugins/viewplugins/variations/variations.cpp
index 5e2d65ba8..5e2d65ba8 100644
--- a/chalk/plugins/viewplugins/variations/variations.cc
+++ b/chalk/plugins/viewplugins/variations/variations.cpp
diff --git a/chalk/sdk/Makefile.am b/chalk/sdk/Makefile.am
index 0c7f4c186..869b2c362 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 fa53086b8..fa53086b8 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 34f67c916..3a2bff125 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 5e74c8fe8..5e74c8fe8 100644
--- a/chalk/ui/imageviewer.cc
+++ b/chalk/ui/imageviewer.cpp
diff --git a/chalk/ui/kcurve.cc b/chalk/ui/kcurve.cpp
index b6bd51629..b6bd51629 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 c7127928d..c7127928d 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 bd5b80fb4..bd5b80fb4 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 2b816f9cb..2b816f9cb 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 2b842e53c..2b842e53c 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 db9aba981..db9aba981 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 63ae4ab06..63ae4ab06 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 9b3666e89..9b3666e89 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 bb80e75e0..bb80e75e0 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 66e3a6b39..631f602e9 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 (boud@valdyas.org)
  *
diff --git a/chalk/ui/kis_cmb_idlist.cc b/chalk/ui/kis_cmb_idlist.cpp
index 92dc608f6..39937752a 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 (boud@valdyas.org)
  *
diff --git a/chalk/ui/kis_color_cup.cc b/chalk/ui/kis_color_cup.cpp
index ae0ddfacb..ae0ddfacb 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 64939c4a6..64939c4a6 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 6c57a7e6a..e5a8ce1bb 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  <elter@kde.org>
  *  Copyright (c) 2003 Patrick Julien  <freak@codepimps.org>
diff --git a/chalk/ui/kis_cursor.cc b/chalk/ui/kis_cursor.cpp
index c4281eac9..146dc2863 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 <elter@kde.org>
  *  Copyright (c) 2004 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/ui/kis_custom_brush.cc b/chalk/ui/kis_custom_brush.cpp
index 1802e6cfd..1802e6cfd 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 93c829778..93c829778 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 631b9abed..631b9abed 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 edf92be12..edf92be12 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 f7d75310e..f7d75310e 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 997887f00..997887f00 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 fcdfbd099..fcdfbd099 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 00acde270..00acde270 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 832102c6d..832102c6d 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 91f53a751..91f53a751 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 61811d31f..e35477dc5 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 <koch@kde.org>
  *
diff --git a/chalk/ui/kis_doc.cc b/chalk/ui/kis_doc.cpp
index 60dbbfdda..60dbbfdda 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 ae5a4a581..ae5a4a581 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 a966691dd..3325f07bb 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 <pfeiffer@kde.org>
  *  Copyright (c) 2004 Adrian Page <adrian@pagenet.plus.com>
diff --git a/chalk/ui/kis_factory.cc b/chalk/ui/kis_factory.cpp
index 154213b49..e9e51e487 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 <elter@kde.org>
  *
diff --git a/chalk/ui/kis_filter_manager.cc b/chalk/ui/kis_filter_manager.cpp
index 848f99b73..848f99b73 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 e3674fc89..e3674fc89 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 5022a28b9..5022a28b9 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 255d3847a..255d3847a 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 3b94db619..3b94db619 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 339017fc3..339017fc3 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 0109f7ebd..0109f7ebd 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 26040309b..26040309b 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 0923c7274..0923c7274 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 cb1b69384..cb1b69384 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 d33c38738..d33c38738 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 d28f1a83b..d28f1a83b 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 0caadcbba..0caadcbba 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 cd8620d68..cd8620d68 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 058eb2f96..1d769fb42 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 <freak@codepimps.org>
  *  Copyright (C) 2006 Gábor Lehel <illissius@gmail.com>
diff --git a/chalk/ui/kis_layerlist.cc b/chalk/ui/kis_layerlist.cpp
index bfae82825..bfae82825 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 e02695049..e02695049 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 9491f2218..9491f2218 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 aef29d2cb..aef29d2cb 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 82363a0b8..82363a0b8 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 e6551f816..e6551f816 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 6a302192b..6a302192b 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 6036ef74c..57ed7a736 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 (boud@valdyas.org)
  *
diff --git a/chalk/ui/kis_palette_view.cc b/chalk/ui/kis_palette_view.cpp
index 2e17f651a..2e17f651a 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 e04b04942..e04b04942 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 4c05360eb..4c05360eb 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 d44f928a8..d44f928a8 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 741cba653..741cba653 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 d67d5e58b..cfbe05b23 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 <longamp@reallygood.de>
  *
diff --git a/chalk/ui/kis_previewwidget.cc b/chalk/ui/kis_previewwidget.cpp
index 29a91fbdb..f60755a14 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  <jwcaliff@compuzone.net>
  *  Copyright (c) 2004 Bart Coppens <kde@bartcoppens.be>
diff --git a/chalk/ui/kis_qpaintdevice_canvas.cc b/chalk/ui/kis_qpaintdevice_canvas.cpp
index e3824f555..e3824f555 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 07f78eb9a..07f78eb9a 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 ddecf85a6..ddecf85a6 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 3076bc00d..333bccd1d 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 <elter@kde.org>
  *  Copyright (c) 2003 Patrick Julien <freak@codepimps.org>
diff --git a/chalk/ui/kis_ruler.cc b/chalk/ui/kis_ruler.cpp
index 234269227..234269227 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 7d001586a..7d001586a 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 8593d22ae..8593d22ae 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 8666f1a19..8666f1a19 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 026747417..026747417 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 759136f44..759136f44 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 787afee47..74eec4066 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 <boud@valdyas.org>
  *  Copyright (c) 2004 Bart Coppens <kde@bartcoppens.be>
diff --git a/chalk/ui/kis_tool_manager.cc b/chalk/ui/kis_tool_manager.cpp
index 043880586..043880586 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 4adccc602..4adccc602 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 143bd6754..143bd6754 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 036e538fc..036e538fc 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 68ce4c69e..68ce4c69e 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 59da51890..59da51890 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 7de36c483..7de36c483 100644
--- a/chalk/ui/kis_view_iface.cc
+++ b/chalk/ui/kis_view_iface.cpp
diff --git a/doc/chalk/developers-plugins.docbook b/doc/chalk/developers-plugins.docbook
index 029af8d7e..bf5fab62f 100644
--- a/doc/chalk/developers-plugins.docbook
+++ b/doc/chalk/developers-plugins.docbook
@@ -195,7 +195,7 @@ kde_services_DATA = chalkLIBRARYNAME.desktop
 
 INCLUDES = $(all_includes)
 
-chalkLIBRARYNAME_la_SOURCES = sourcefile1.cc sourcefile2.cc
+chalkLIBRARYNAME_la_SOURCES = sourcefile1.cpp sourcefile2.cpp
 
 kde_module_LTLIBRARIES = chalkLIBRARYNAME.la
 noinst_HEADERS = header1.h header2.h
@@ -878,14 +878,14 @@ A good example of a tool is the star tool:
 </para>
 
 <screen>
-kis_tool_star.cc       Makefile.am   tool_star_cursor.png  wdg_tool_star.ui
+kis_tool_star.cpp       Makefile.am   tool_star_cursor.png  wdg_tool_star.ui
 kis_tool_star.h        Makefile.in   tool_star.h           
-chalktoolstar.desktop  tool_star.cc  tool_star.png         
+chalktoolstar.desktop  tool_star.cpp  tool_star.png         
 </screen>
 
 <para>
 As you see, you need two images: one for the cursor and one for the toolbox.
-<filename>tool_star.cc</filename> is just the plugin loader, similar to what
+<filename>tool_star.cpp</filename> is just the plugin loader, similar to what
 we have seen above. The real meat is in the implementation:
 </para>
 
diff --git a/example/Makefile.am b/example/Makefile.am
index 96799ae0a..0bcdf91bb 100644
--- a/example/Makefile.am
+++ b/example/Makefile.am
@@ -3,8 +3,8 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 
 ## The part
 kde_module_LTLIBRARIES = libexamplepart.la
-libexamplepart_la_SOURCES = example_part.cc \
-	example_view.cc example_factory.cc
+libexamplepart_la_SOURCES = example_part.cpp \
+	example_view.cpp example_factory.cpp
 libexamplepart_la_LDFLAGS = $(KDE_PLUGIN)
 libexamplepart_la_LIBADD = $(LIB_KOFFICEUI)
 
@@ -12,7 +12,7 @@ libexamplepart_la_LIBADD = $(LIB_KOFFICEUI)
 tdeinit_LTLIBRARIES = example.la
 lib_LTLIBRARIES =
 bin_PROGRAMS =
-example_la_SOURCES = main.cc
+example_la_SOURCES = main.cpp
 example_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 example_la_LIBADD = $(LIB_KOFFICEUI)
 
@@ -32,7 +32,7 @@ rc_DATA = example.rc example_readonly.rc
 rcdir = $(kde_datadir)/example
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cc example_aboutdata.h -o $(podir)/example.pot
+	$(XGETTEXT) rc.cpp *.cpp example_aboutdata.h -o $(podir)/example.pot
 kde_services_DATA = examplepart.desktop
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/example/example_factory.cc b/example/example_factory.cpp
index 9564e5fae..9564e5fae 100644
--- a/example/example_factory.cc
+++ b/example/example_factory.cpp
diff --git a/example/example_part.cc b/example/example_part.cpp
index 4afc46b0e..4afc46b0e 100644
--- a/example/example_part.cc
+++ b/example/example_part.cpp
diff --git a/example/example_view.cc b/example/example_view.cpp
index 1a8e07e19..1a8e07e19 100644
--- a/example/example_view.cc
+++ b/example/example_view.cpp
diff --git a/example/main.cc b/example/main.cpp
index ecffb3736..ecffb3736 100644
--- a/example/main.cc
+++ b/example/main.cpp
diff --git a/filters/Makefile.am b/filters/Makefile.am
index e8473741e..83ea4f863 100644
--- a/filters/Makefile.am
+++ b/filters/Makefile.am
@@ -43,6 +43,6 @@ SUBDIRS = generic_wrapper libdialogfilter liboofilter $(KSPREADDIR) $(KCHARTDIR)
 
 messages:
 	$(EXTRACTRC) `find . -name \*.ui` > rc.cpp
-	$(XGETTEXT) `find . -name \*.cpp -o -name \*.cc` -o $(podir)/kofficefilters.pot
+	$(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kofficefilters.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/filters/chalk/gmagick/Makefile.am b/filters/chalk/gmagick/Makefile.am
index ed9cf4e92..35a8c755e 100644
--- a/filters/chalk/gmagick/Makefile.am
+++ b/filters/chalk/gmagick/Makefile.am
@@ -39,8 +39,8 @@ servicedir = $(kde_servicesdir)
 kdelnk_DATA = chalk_magick.desktop
 kdelnkdir = $(kde_appsdir)/.hidden
 
-libchalkgmagickimport_la_SOURCES = magickimport.cpp kis_image_magick_converter.cc
-libchalkgmagickexport_la_SOURCES = magickexport.cpp kis_image_magick_converter.cc
+libchalkgmagickimport_la_SOURCES = magickimport.cpp kis_image_magick_converter.cpp
+libchalkgmagickexport_la_SOURCES = magickexport.cpp kis_image_magick_converter.cpp
 
 METASOURCES = AUTO
 
diff --git a/filters/chalk/gmagick/kis_image_magick_converter.cc b/filters/chalk/gmagick/kis_image_magick_converter.cpp
index f25449ec4..f25449ec4 100644
--- a/filters/chalk/gmagick/kis_image_magick_converter.cc
+++ b/filters/chalk/gmagick/kis_image_magick_converter.cpp
diff --git a/filters/chalk/jpeg/Makefile.am b/filters/chalk/jpeg/Makefile.am
index c99183ecf..1aae7bf6b 100644
--- a/filters/chalk/jpeg/Makefile.am
+++ b/filters/chalk/jpeg/Makefile.am
@@ -3,7 +3,7 @@ kde_module_LTLIBRARIES = libchalkjpegimport.la libchalkjpegexport.la
 
 libchalkconverter_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts \
         -llcms
-libchalkconverter_la_SOURCES = kis_jpeg_converter.cc iccjpeg.c
+libchalkconverter_la_SOURCES = kis_jpeg_converter.cpp iccjpeg.c
 libchalkconverter_la_LIBADD = $(KOFFICE_LIBS) $(top_builddir)/filters/chalk/libkisexif/libkisexif.la \
 	../../../chalk/core/libchalkimage.la \
 	../../../chalk/ui/libchalkui.la \
@@ -49,8 +49,8 @@ servicedir = $(kde_servicesdir)
 kdelnk_DATA = chalk_jpeg.desktop
 kdelnkdir = $(kde_appsdir)/.hidden
 
-libchalkjpegimport_la_SOURCES = kis_jpeg_import.cc
-libchalkjpegexport_la_SOURCES = kis_wdg_options_jpeg.ui kis_jpeg_export.cc
+libchalkjpegimport_la_SOURCES = kis_jpeg_import.cpp
+libchalkjpegexport_la_SOURCES = kis_wdg_options_jpeg.ui kis_jpeg_export.cpp
 
 METASOURCES = AUTO
 
diff --git a/filters/chalk/jpeg/kis_jpeg_converter.cc b/filters/chalk/jpeg/kis_jpeg_converter.cpp
index fd0630ecf..fd0630ecf 100644
--- a/filters/chalk/jpeg/kis_jpeg_converter.cc
+++ b/filters/chalk/jpeg/kis_jpeg_converter.cpp
diff --git a/filters/chalk/jpeg/kis_jpeg_export.cc b/filters/chalk/jpeg/kis_jpeg_export.cpp
index 042a3c8ef..042a3c8ef 100644
--- a/filters/chalk/jpeg/kis_jpeg_export.cc
+++ b/filters/chalk/jpeg/kis_jpeg_export.cpp
diff --git a/filters/chalk/jpeg/kis_jpeg_import.cc b/filters/chalk/jpeg/kis_jpeg_import.cpp
index bacec6794..bacec6794 100644
--- a/filters/chalk/jpeg/kis_jpeg_import.cc
+++ b/filters/chalk/jpeg/kis_jpeg_import.cpp
diff --git a/filters/chalk/magick/Makefile.am b/filters/chalk/magick/Makefile.am
index ee28139f1..9177421b1 100644
--- a/filters/chalk/magick/Makefile.am
+++ b/filters/chalk/magick/Makefile.am
@@ -39,8 +39,8 @@ servicedir = $(kde_servicesdir)
 kdelnk_DATA = chalk_magick.desktop
 kdelnkdir = $(kde_appsdir)/Office
 
-libchalkmagickimport_la_SOURCES = magickimport.cpp kis_image_magick_converter.cc
-libchalkmagickexport_la_SOURCES = magickexport.cpp kis_image_magick_converter.cc
+libchalkmagickimport_la_SOURCES = magickimport.cpp kis_image_magick_converter.cpp
+libchalkmagickexport_la_SOURCES = magickexport.cpp kis_image_magick_converter.cpp
 
 METASOURCES = AUTO
 
diff --git a/filters/chalk/magick/kis_image_magick_converter.cc b/filters/chalk/magick/kis_image_magick_converter.cpp
index 5f8bafa3a..5f8bafa3a 100644
--- a/filters/chalk/magick/kis_image_magick_converter.cc
+++ b/filters/chalk/magick/kis_image_magick_converter.cpp
diff --git a/filters/chalk/png/Makefile.am b/filters/chalk/png/Makefile.am
index c9e7fe6a5..c70d5444a 100644
--- a/filters/chalk/png/Makefile.am
+++ b/filters/chalk/png/Makefile.am
@@ -39,8 +39,8 @@ servicedir = $(kde_servicesdir)
 kdelnk_DATA = chalk_png.desktop
 kdelnkdir = $(kde_appsdir)/.hidden
 
-libchalkpngimport_la_SOURCES = kis_png_import.cc kis_png_converter.cc
-libchalkpngexport_la_SOURCES = kis_wdg_options_png.ui kis_png_export.cc kis_png_converter.cc
+libchalkpngimport_la_SOURCES = kis_png_import.cpp kis_png_converter.cpp
+libchalkpngexport_la_SOURCES = kis_wdg_options_png.ui kis_png_export.cpp kis_png_converter.cpp
 
 METASOURCES = AUTO
 
diff --git a/filters/chalk/png/kis_png_converter.cc b/filters/chalk/png/kis_png_converter.cpp
index 3956b640b..3956b640b 100644
--- a/filters/chalk/png/kis_png_converter.cc
+++ b/filters/chalk/png/kis_png_converter.cpp
diff --git a/filters/chalk/png/kis_png_export.cc b/filters/chalk/png/kis_png_export.cpp
index bb071ff2e..bb071ff2e 100644
--- a/filters/chalk/png/kis_png_export.cc
+++ b/filters/chalk/png/kis_png_export.cpp
diff --git a/filters/chalk/png/kis_png_import.cc b/filters/chalk/png/kis_png_import.cpp
index dc2a63256..dc2a63256 100644
--- a/filters/chalk/png/kis_png_import.cc
+++ b/filters/chalk/png/kis_png_import.cpp
diff --git a/filters/chalk/tiff/Makefile.am b/filters/chalk/tiff/Makefile.am
index 4afb0402d..4c3383419 100644
--- a/filters/chalk/tiff/Makefile.am
+++ b/filters/chalk/tiff/Makefile.am
@@ -46,8 +46,8 @@ METASOURCES = AUTO
 
 
 KDE_CXXFLAGS = $(USE_EXCEPTIONS)
-libchalktiffimport_la_SOURCES = kis_tiff_import.cc
-libchalktiffexport_la_SOURCES = kis_tiff_export.cc kis_wdg_options_tiff.ui \
+libchalktiffimport_la_SOURCES = kis_tiff_import.cpp
+libchalktiffexport_la_SOURCES = kis_tiff_export.cpp kis_wdg_options_tiff.ui \
 	kis_dlg_options_tiff.cpp
 service_DATA = chalk_tiff_export.desktop chalk_tiff_import.desktop
 kdelnk_DATA = chalk_tiff.desktop
@@ -60,5 +60,5 @@ libchalktiffconverter_la_LIBADD = $(KOFFICE_LIBS) \
 	../../../chalk/ui/libchalkui.la \
 	../../../chalk/chalkcolor/libchalkcolor.la
 noinst_LTLIBRARIES = libchalktiffconverter.la
-libchalktiffconverter_la_SOURCES = kis_tiff_converter.cc kis_tiff_stream.cc \
-	kis_tiff_writer_visitor.cpp kis_tiff_reader.cc kis_tiff_ycbcr_reader.cc
+libchalktiffconverter_la_SOURCES = kis_tiff_converter.cpp kis_tiff_stream.cpp \
+	kis_tiff_writer_visitor.cpp kis_tiff_reader.cpp kis_tiff_ycbcr_reader.cpp
diff --git a/filters/chalk/tiff/kis_tiff_converter.cc b/filters/chalk/tiff/kis_tiff_converter.cpp
index ea39dec28..ea39dec28 100644
--- a/filters/chalk/tiff/kis_tiff_converter.cc
+++ b/filters/chalk/tiff/kis_tiff_converter.cpp
diff --git a/filters/chalk/tiff/kis_tiff_export.cc b/filters/chalk/tiff/kis_tiff_export.cpp
index 41f38fc80..41f38fc80 100644
--- a/filters/chalk/tiff/kis_tiff_export.cc
+++ b/filters/chalk/tiff/kis_tiff_export.cpp
diff --git a/filters/chalk/tiff/kis_tiff_import.cc b/filters/chalk/tiff/kis_tiff_import.cpp
index 8c785ffec..8c785ffec 100644
--- a/filters/chalk/tiff/kis_tiff_import.cc
+++ b/filters/chalk/tiff/kis_tiff_import.cpp
diff --git a/filters/chalk/tiff/kis_tiff_reader.cc b/filters/chalk/tiff/kis_tiff_reader.cpp
index f2eabd878..f2eabd878 100644
--- a/filters/chalk/tiff/kis_tiff_reader.cc
+++ b/filters/chalk/tiff/kis_tiff_reader.cpp
diff --git a/filters/chalk/tiff/kis_tiff_stream.cc b/filters/chalk/tiff/kis_tiff_stream.cpp
index 4c80fefcd..4c80fefcd 100644
--- a/filters/chalk/tiff/kis_tiff_stream.cc
+++ b/filters/chalk/tiff/kis_tiff_stream.cpp
diff --git a/filters/chalk/tiff/kis_tiff_ycbcr_reader.cc b/filters/chalk/tiff/kis_tiff_ycbcr_reader.cpp
index ce5e4ae95..ce5e4ae95 100644
--- a/filters/chalk/tiff/kis_tiff_ycbcr_reader.cc
+++ b/filters/chalk/tiff/kis_tiff_ycbcr_reader.cpp
diff --git a/filters/chalk/xcf/xcf/xcf-load.cc b/filters/chalk/xcf/xcf/xcf-load.cpp
index 3209e1811..3209e1811 100644
--- a/filters/chalk/xcf/xcf/xcf-load.cc
+++ b/filters/chalk/xcf/xcf/xcf-load.cpp
diff --git a/filters/chalk/xcf/xcf/xcf-read.cc b/filters/chalk/xcf/xcf/xcf-read.cpp
index 314daa900..314daa900 100644
--- a/filters/chalk/xcf/xcf/xcf-read.cc
+++ b/filters/chalk/xcf/xcf/xcf-read.cpp
diff --git a/filters/chalk/xcf/xcf/xcf-save.cc b/filters/chalk/xcf/xcf/xcf-save.cpp
index a0dbb9b5a..a0dbb9b5a 100644
--- a/filters/chalk/xcf/xcf/xcf-save.cc
+++ b/filters/chalk/xcf/xcf/xcf-save.cpp
diff --git a/filters/chalk/xcf/xcf/xcf-seek.cc b/filters/chalk/xcf/xcf/xcf-seek.cpp
index a24271f5e..a24271f5e 100644
--- a/filters/chalk/xcf/xcf/xcf-seek.cc
+++ b/filters/chalk/xcf/xcf/xcf-seek.cpp
diff --git a/filters/chalk/xcf/xcf/xcf-write.cc b/filters/chalk/xcf/xcf/xcf-write.cpp
index 4010ab18f..4010ab18f 100644
--- a/filters/chalk/xcf/xcf/xcf-write.cc
+++ b/filters/chalk/xcf/xcf/xcf-write.cpp
diff --git a/filters/generic_wrapper/Makefile.am b/filters/generic_wrapper/Makefile.am
index 8d1cb7a05..66d95473f 100644
--- a/filters/generic_wrapper/Makefile.am
+++ b/filters/generic_wrapper/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = libgenerickofilter.la 
 
 
-libgenerickofilter_la_SOURCES = generic_filter.cc
+libgenerickofilter_la_SOURCES = generic_filter.cpp
 libgenerickofilter_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libgenerickofilter_la_LIBADD  = $(KOFFICE_LIBS) $(LIB_TDEIO)
 
diff --git a/filters/generic_wrapper/generic_filter.cc b/filters/generic_wrapper/generic_filter.cpp
index 112c29d1c..112c29d1c 100644
--- a/filters/generic_wrapper/generic_filter.cc
+++ b/filters/generic_wrapper/generic_filter.cpp
diff --git a/filters/karbon/ai/Makefile.am b/filters/karbon/ai/Makefile.am
index 761feaffd..2bbc124df 100644
--- a/filters/karbon/ai/Makefile.am
+++ b/filters/karbon/ai/Makefile.am
@@ -30,14 +30,14 @@ noinst_HEADERS = \
 	karbonaiparserbase.h
 
 libkarbonaiimport_la_SOURCES = \
-	aicolor.cc \
-	aielement.cc \
-	aiimport.cc \
-	ailexer.cc \
-	aiparserbase.cc \
-	ai88handler.cc \
-	ai3handler.cc \
-	karbonaiparserbase.cc
+	aicolor.cpp \
+	aielement.cpp \
+	aiimport.cpp \
+	ailexer.cpp \
+	aiparserbase.cpp \
+	ai88handler.cpp \
+	ai3handler.cpp \
+	karbonaiparserbase.cpp
 
 libkarbonaiimport_la_METASOURCES = \
 	AUTO
diff --git a/filters/karbon/ai/ai3handler.cc b/filters/karbon/ai/ai3handler.cpp
index c014d9306..c014d9306 100644
--- a/filters/karbon/ai/ai3handler.cc
+++ b/filters/karbon/ai/ai3handler.cpp
diff --git a/filters/karbon/ai/ai88handler.cc b/filters/karbon/ai/ai88handler.cpp
index 87a937ae9..87a937ae9 100644
--- a/filters/karbon/ai/ai88handler.cc
+++ b/filters/karbon/ai/ai88handler.cpp
diff --git a/filters/karbon/ai/aicolor.cc b/filters/karbon/ai/aicolor.cpp
index cabc932fb..cabc932fb 100644
--- a/filters/karbon/ai/aicolor.cc
+++ b/filters/karbon/ai/aicolor.cpp
diff --git a/filters/karbon/ai/aielement.cc b/filters/karbon/ai/aielement.cpp
index 2f514d06c..2f514d06c 100644
--- a/filters/karbon/ai/aielement.cc
+++ b/filters/karbon/ai/aielement.cpp
diff --git a/filters/karbon/ai/aiimport.cc b/filters/karbon/ai/aiimport.cpp
index 0af2cc939..0af2cc939 100644
--- a/filters/karbon/ai/aiimport.cc
+++ b/filters/karbon/ai/aiimport.cpp
diff --git a/filters/karbon/ai/ailexer.cc b/filters/karbon/ai/ailexer.cpp
index 352b8f48a..352b8f48a 100644
--- a/filters/karbon/ai/ailexer.cc
+++ b/filters/karbon/ai/ailexer.cpp
diff --git a/filters/karbon/ai/aiparserbase.cc b/filters/karbon/ai/aiparserbase.cpp
index 24f9920e7..24f9920e7 100644
--- a/filters/karbon/ai/aiparserbase.cc
+++ b/filters/karbon/ai/aiparserbase.cpp
diff --git a/filters/karbon/ai/karbonaiparserbase.cc b/filters/karbon/ai/karbonaiparserbase.cpp
index c4321252d..c4321252d 100644
--- a/filters/karbon/ai/karbonaiparserbase.cc
+++ b/filters/karbon/ai/karbonaiparserbase.cpp
diff --git a/filters/karbon/applixgraphics/Makefile.am b/filters/karbon/applixgraphics/Makefile.am
index b3c03f384..83fefb227 100644
--- a/filters/karbon/applixgraphics/Makefile.am
+++ b/filters/karbon/applixgraphics/Makefile.am
@@ -7,7 +7,7 @@ libapplixgraphicimport_la_LDFLAGS	= -module -avoid-version -no-undefined $(all_l
 
 kde_module_LTLIBRARIES = libapplixgraphicimport.la
 
-libapplixgraphicimport_la_SOURCES = applixgraphicimport.cc
+libapplixgraphicimport_la_SOURCES = applixgraphicimport.cpp
 libapplixgraphicimport_la_LIBADD = $(KOFFICE_LIBS)
 noinst_HEADERS = applixgraphicimport.h
 
@@ -17,4 +17,4 @@ service_DATA = kontour_applixgraphic_import.desktop
 servicedir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cc *.cpp -o $(podir)/kontourapplixgraphicsfilter.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kontourapplixgraphicsfilter.pot
diff --git a/filters/karbon/applixgraphics/applixgraphicimport.cc b/filters/karbon/applixgraphics/applixgraphicimport.cpp
index fd81b108c..fd81b108c 100644
--- a/filters/karbon/applixgraphics/applixgraphicimport.cc
+++ b/filters/karbon/applixgraphics/applixgraphicimport.cpp
diff --git a/filters/karbon/eps/Makefile.am b/filters/karbon/eps/Makefile.am
index ca67aaf7b..40ffa3c2c 100644
--- a/filters/karbon/eps/Makefile.am
+++ b/filters/karbon/eps/Makefile.am
@@ -3,13 +3,13 @@ kde_module_LTLIBRARIES = \
 	libkarbonepsimport.la
 
 libkarbonepsexport_la_SOURCES = \
-	epsexport.cc \
-	epsexportdlg.cc
+	epsexport.cpp \
+	epsexportdlg.cpp
 
 libkarbonepsexport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonepsexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../karbon/libkarboncommon.la
 
-libkarbonepsimport_la_SOURCES = epsimport.cc pscommentlexer.cc
+libkarbonepsimport_la_SOURCES = epsimport.cpp pscommentlexer.cpp
 libkarbonepsimport_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkarbonepsimport_la_LIBADD  = $(KOFFICE_LIBS)
 
diff --git a/filters/karbon/eps/epsexport.cc b/filters/karbon/eps/epsexport.cpp
index 023074daa..023074daa 100644
--- a/filters/karbon/eps/epsexport.cc
+++ b/filters/karbon/eps/epsexport.cpp
diff --git a/filters/karbon/eps/epsexportdlg.cc b/filters/karbon/eps/epsexportdlg.cpp
index 4bf4aec7e..4bf4aec7e 100644
--- a/filters/karbon/eps/epsexportdlg.cc
+++ b/filters/karbon/eps/epsexportdlg.cpp
diff --git a/filters/karbon/eps/epsimport.cc b/filters/karbon/eps/epsimport.cpp
index 72bb1334d..72bb1334d 100644
--- a/filters/karbon/eps/epsimport.cc
+++ b/filters/karbon/eps/epsimport.cpp
diff --git a/filters/karbon/eps/pscommentlexer.cc b/filters/karbon/eps/pscommentlexer.cpp
index e15dcc59e..e15dcc59e 100644
--- a/filters/karbon/eps/pscommentlexer.cc
+++ b/filters/karbon/eps/pscommentlexer.cpp
diff --git a/filters/karbon/kontour/Makefile.am b/filters/karbon/kontour/Makefile.am
index 52d51c666..264357c9b 100644
--- a/filters/karbon/kontour/Makefile.am
+++ b/filters/karbon/kontour/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/
 ####### Files
 # Obviously you have to change "foo" (and maybe "import") to
 # reflect the name of your filter. If you have more files
-# than just fooimport.cc please add them to the _SOURCES line.
+# than just fooimport.cpp please add them to the _SOURCES line.
 
 kde_module_LTLIBRARIES = libkarbonkontourimport.la
 
diff --git a/filters/karbon/msod/Makefile.am b/filters/karbon/msod/Makefile.am
index f7191cd11..a555234a4 100644
--- a/filters/karbon/msod/Makefile.am
+++ b/filters/karbon/msod/Makefile.am
@@ -8,7 +8,7 @@ libkarbonmsodimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBZ)
 
 kde_module_LTLIBRARIES = libkarbonmsodimport.la
 
-libkarbonmsodimport_la_SOURCES = msodimport.cc msod.cc
+libkarbonmsodimport_la_SOURCES = msodimport.cpp msod.cpp
 
 noinst_HEADERS = msodimport.h msod.h
 
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cpp
index 35445e18f..35445e18f 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cpp
diff --git a/filters/karbon/msod/msodimport.cc b/filters/karbon/msod/msodimport.cpp
index bd272271e..bd272271e 100644
--- a/filters/karbon/msod/msodimport.cc
+++ b/filters/karbon/msod/msodimport.cpp
diff --git a/filters/karbon/oodraw/Makefile.am b/filters/karbon/oodraw/Makefile.am
index 4cca1e325..3ace9839b 100644
--- a/filters/karbon/oodraw/Makefile.am
+++ b/filters/karbon/oodraw/Makefile.am
@@ -11,7 +11,7 @@ INCLUDES= -I$(srcdir)/../../liboofilter \
 kde_module_LTLIBRARIES = liboodrawimport.la
 
 
-liboodrawimport_la_SOURCES = oodrawimport.cc
+liboodrawimport_la_SOURCES = oodrawimport.cpp
 liboodrawimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 liboodrawimport_la_LIBADD  = ../../liboofilter/liboofilter.la \
 							../../../karbon/libkarboncommon.la \
diff --git a/filters/karbon/oodraw/oodrawimport.cc b/filters/karbon/oodraw/oodrawimport.cpp
index fba488671..fba488671 100644
--- a/filters/karbon/oodraw/oodrawimport.cc
+++ b/filters/karbon/oodraw/oodrawimport.cpp
diff --git a/filters/karbon/png/Makefile.am b/filters/karbon/png/Makefile.am
index 520531d64..e4fb6c116 100644
--- a/filters/karbon/png/Makefile.am
+++ b/filters/karbon/png/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	pngexport.h
 
 libkarbonpngexport_la_SOURCES = \
-	pngexport.cc
+	pngexport.cpp
 
 libkarbonpngexport_la_METASOURCES = \
 	AUTO
diff --git a/filters/karbon/png/pngexport.cc b/filters/karbon/png/pngexport.cpp
index 89b43d03f..89b43d03f 100644
--- a/filters/karbon/png/pngexport.cc
+++ b/filters/karbon/png/pngexport.cpp
diff --git a/filters/karbon/svg/Makefile.am b/filters/karbon/svg/Makefile.am
index 48cf2c272..1f96b0702 100644
--- a/filters/karbon/svg/Makefile.am
+++ b/filters/karbon/svg/Makefile.am
@@ -25,10 +25,10 @@ noinst_HEADERS = \
 	svgexport.h
 
 libkarbonsvgexport_la_SOURCES = \
-	svgexport.cc
+	svgexport.cpp
 
 METASOURCES = AUTO
 
 libkarbonsvgimport_la_SOURCES = \
-	svgimport.cc
+	svgimport.cpp
 
diff --git a/filters/karbon/svg/svgexport.cc b/filters/karbon/svg/svgexport.cpp
index 41fd6a542..41fd6a542 100644
--- a/filters/karbon/svg/svgexport.cc
+++ b/filters/karbon/svg/svgexport.cpp
diff --git a/filters/karbon/svg/svgimport.cc b/filters/karbon/svg/svgimport.cpp
index 9d323d3da..9d323d3da 100644
--- a/filters/karbon/svg/svgimport.cc
+++ b/filters/karbon/svg/svgimport.cpp
diff --git a/filters/karbon/wmf/Makefile.am b/filters/karbon/wmf/Makefile.am
index 561aaa1f5..6ab547e2a 100644
--- a/filters/karbon/wmf/Makefile.am
+++ b/filters/karbon/wmf/Makefile.am
@@ -13,11 +13,11 @@ kde_module_LTLIBRARIES = libwmfimport.la libwmfexport.la
 
 libwmfimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libwmfimport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
-libwmfimport_la_SOURCES = wmfimport.cc wmfimportparser.cc
+libwmfimport_la_SOURCES = wmfimport.cpp wmfimportparser.cpp
 
 libwmfexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libwmfexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../../../karbon/libkarboncommon.la
-libwmfexport_la_SOURCES = wmfexport.cc
+libwmfexport_la_SOURCES = wmfexport.cpp
 
 noinst_HEADERS = wmfimport.h wmfimportparser.h wmfexport.h 
 
diff --git a/filters/karbon/wmf/wmfexport.cc b/filters/karbon/wmf/wmfexport.cpp
index de929ca88..de929ca88 100644
--- a/filters/karbon/wmf/wmfexport.cc
+++ b/filters/karbon/wmf/wmfexport.cpp
diff --git a/filters/karbon/wmf/wmfimport.cc b/filters/karbon/wmf/wmfimport.cpp
index f7dcdcf3d..f7dcdcf3d 100644
--- a/filters/karbon/wmf/wmfimport.cc
+++ b/filters/karbon/wmf/wmfimport.cpp
diff --git a/filters/karbon/wmf/wmfimportparser.cc b/filters/karbon/wmf/wmfimportparser.cpp
index 275490fef..275490fef 100644
--- a/filters/karbon/wmf/wmfimportparser.cc
+++ b/filters/karbon/wmf/wmfimportparser.cpp
diff --git a/filters/karbon/xaml/Makefile.am b/filters/karbon/xaml/Makefile.am
index f7036adac..9bf1e0686 100644
--- a/filters/karbon/xaml/Makefile.am
+++ b/filters/karbon/xaml/Makefile.am
@@ -26,10 +26,10 @@ noinst_HEADERS = \
 	xamlimport.h
 
 libkarbonxamlexport_la_SOURCES = \
-	xamlexport.cc
+	xamlexport.cpp
 
 libkarbonxamlimport_la_SOURCES = \
-	xamlimport.cc
+	xamlimport.cpp
 
 METASOURCES = AUTO
 
diff --git a/filters/karbon/xaml/xamlexport.cc b/filters/karbon/xaml/xamlexport.cpp
index e1599a8cf..e1599a8cf 100644
--- a/filters/karbon/xaml/xamlexport.cc
+++ b/filters/karbon/xaml/xamlexport.cpp
diff --git a/filters/karbon/xaml/xamlimport.cc b/filters/karbon/xaml/xamlimport.cpp
index 002001e27..002001e27 100644
--- a/filters/karbon/xaml/xamlimport.cc
+++ b/filters/karbon/xaml/xamlimport.cpp
diff --git a/filters/karbon/xcf/Makefile.am b/filters/karbon/xcf/Makefile.am
index 18ed61510..b72847fa2 100644
--- a/filters/karbon/xcf/Makefile.am
+++ b/filters/karbon/xcf/Makefile.am
@@ -20,7 +20,7 @@ noinst_HEADERS = \
 	xcfexport.h
 
 libkarbonxcfexport_la_SOURCES = \
-	xcfexport.cc
+	xcfexport.cpp
 
 libkarbonxcfexport_la_METASOURCES = \
 	AUTO
diff --git a/filters/karbon/xcf/xcfexport.cc b/filters/karbon/xcf/xcfexport.cpp
index 215c4f018..215c4f018 100644
--- a/filters/karbon/xcf/xcfexport.cc
+++ b/filters/karbon/xcf/xcfexport.cpp
diff --git a/filters/karbon/xfig/xfigimport.cc b/filters/karbon/xfig/xfigimport.cpp
index c3d6ab6a9..c3d6ab6a9 100644
--- a/filters/karbon/xfig/xfigimport.cc
+++ b/filters/karbon/xfig/xfigimport.cpp
diff --git a/filters/karbon/xfig/xfigimport_factory.cc b/filters/karbon/xfig/xfigimport_factory.cpp
index 1e2311997..1e2311997 100644
--- a/filters/karbon/xfig/xfigimport_factory.cc
+++ b/filters/karbon/xfig/xfigimport_factory.cpp
diff --git a/filters/kchart/svg/Makefile.am b/filters/kchart/svg/Makefile.am
index b5399a261..139d6b931 100644
--- a/filters/kchart/svg/Makefile.am
+++ b/filters/kchart/svg/Makefile.am
@@ -9,7 +9,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 ####### Files
 kde_module_LTLIBRARIES = libkchartsvgexport.la
 
-libkchartsvgexport_la_SOURCES = svgexport.cc
+libkchartsvgexport_la_SOURCES = svgexport.cpp
 libkchartsvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkchartsvgexport_la_LIBADD = ../../../kchart/libkchartcommon.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
diff --git a/filters/kchart/svg/svgexport.cc b/filters/kchart/svg/svgexport.cpp
index 062ccd9b0..062ccd9b0 100644
--- a/filters/kchart/svg/svgexport.cc
+++ b/filters/kchart/svg/svgexport.cpp
diff --git a/filters/kformula/latex/Makefile.am b/filters/kformula/latex/Makefile.am
index 1a2b49d33..76f174bb9 100644
--- a/filters/kformula/latex/Makefile.am
+++ b/filters/kformula/latex/Makefile.am
@@ -8,13 +8,13 @@ libkfolatexexport_la_LIBADD    = $(KOFFICE_LIBS) $(LIB_KFORMULA)
 
 kde_module_LTLIBRARIES = libkfolatexexport.la
 
-libkfolatexexport_la_SOURCES = latexexport.cc
+libkfolatexexport_la_SOURCES = latexexport.cpp
 
 noinst_HEADERS = latexexport.h
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kformula/latex/latexexport.cc b/filters/kformula/latex/latexexport.cpp
index d47e36bd3..d47e36bd3 100644
--- a/filters/kformula/latex/latexexport.cc
+++ b/filters/kformula/latex/latexexport.cpp
diff --git a/filters/kformula/mathml/Makefile.am b/filters/kformula/mathml/Makefile.am
index cdd07955a..0d2a9c386 100644
--- a/filters/kformula/mathml/Makefile.am
+++ b/filters/kformula/mathml/Makefile.am
@@ -10,9 +10,9 @@ libkfomathmlimport_la_LIBADD    = $(KOFFICE_LIBS) $(LIB_KFORMULA)
 
 kde_module_LTLIBRARIES = libkfomathmlexport.la libkfomathmlimport.la
 
-libkfomathmlexport_la_SOURCES = mathmlexport.cc
+libkfomathmlexport_la_SOURCES = mathmlexport.cpp
 
-libkfomathmlimport_la_SOURCES = mathmlimport.cc
+libkfomathmlimport_la_SOURCES = mathmlimport.cpp
 
 noinst_HEADERS = mathmlexport.h mathmlimport.h
 
diff --git a/filters/kformula/mathml/mathmlexport.cc b/filters/kformula/mathml/mathmlexport.cpp
index 37951d2de..37951d2de 100644
--- a/filters/kformula/mathml/mathmlexport.cc
+++ b/filters/kformula/mathml/mathmlexport.cpp
diff --git a/filters/kformula/mathml/mathmlimport.cc b/filters/kformula/mathml/mathmlimport.cpp
index b8fa07ed4..b8fa07ed4 100644
--- a/filters/kformula/mathml/mathmlimport.cc
+++ b/filters/kformula/mathml/mathmlimport.cpp
diff --git a/filters/kformula/png/Makefile.am b/filters/kformula/png/Makefile.am
index 94e04539a..b6fb010e5 100644
--- a/filters/kformula/png/Makefile.am
+++ b/filters/kformula/png/Makefile.am
@@ -8,13 +8,13 @@ libkfopngexport_la_LIBADD    = $(KOFFICE_LIBS) $(LIB_KFORMULA)
 
 kde_module_LTLIBRARIES = libkfopngexport.la
 
-libkfopngexport_la_SOURCES = pngexport.cc pngexportdia.cc
+libkfopngexport_la_SOURCES = pngexport.cpp pngexportdia.cpp
 
 noinst_HEADERS = pngexport.h pngexportdia.h
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kformula/png/pngexport.cc b/filters/kformula/png/pngexport.cpp
index 47b0d316f..47b0d316f 100644
--- a/filters/kformula/png/pngexport.cc
+++ b/filters/kformula/png/pngexport.cpp
diff --git a/filters/kformula/png/pngexportdia.cc b/filters/kformula/png/pngexportdia.cpp
index 938fed782..938fed782 100644
--- a/filters/kformula/png/pngexportdia.cc
+++ b/filters/kformula/png/pngexportdia.cpp
diff --git a/filters/kformula/svg/Makefile.am b/filters/kformula/svg/Makefile.am
index 443abda5f..d1643bd33 100644
--- a/filters/kformula/svg/Makefile.am
+++ b/filters/kformula/svg/Makefile.am
@@ -8,13 +8,13 @@ libkfosvgexport_la_LIBADD    = $(KOFFICE_LIBS) $(LIB_KFORMULA)
 
 kde_module_LTLIBRARIES = libkfosvgexport.la
 
-libkfosvgexport_la_SOURCES = svgexport.cc
+libkfosvgexport_la_SOURCES = svgexport.cpp
 
 noinst_HEADERS = svgexport.h
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kformula/svg/svgexport.cc b/filters/kformula/svg/svgexport.cpp
index 35896ac1b..35896ac1b 100644
--- a/filters/kformula/svg/svgexport.cc
+++ b/filters/kformula/svg/svgexport.cpp
diff --git a/filters/kpresenter/kword/Makefile.am b/filters/kpresenter/kword/Makefile.am
index 0e579f5cb..829aa93c9 100644
--- a/filters/kpresenter/kword/Makefile.am
+++ b/filters/kpresenter/kword/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libkprkword.la
 
-libkprkword_la_SOURCES = kprkword.cc
+libkprkword_la_SOURCES = kprkword.cpp
 libkprkword_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
 libkprkword_la_LIBADD = $(KOFFICE_LIBS) 
 
diff --git a/filters/kpresenter/kword/kprkword.cc b/filters/kpresenter/kword/kprkword.cpp
index fc0f50cd0..fc0f50cd0 100644
--- a/filters/kpresenter/kword/kprkword.cc
+++ b/filters/kpresenter/kword/kprkword.cpp
diff --git a/filters/kpresenter/ooimpress/Makefile.am b/filters/kpresenter/ooimpress/Makefile.am
index b69dc04cf..f17330405 100644
--- a/filters/kpresenter/ooimpress/Makefile.am
+++ b/filters/kpresenter/ooimpress/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES= -I$(srcdir)/../../liboofilter $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = libooimpressimport.la libooimpressexport.la
 
 
-libooimpressimport_la_SOURCES = ooimpressimport.cc
+libooimpressimport_la_SOURCES = ooimpressimport.cpp
 libooimpressimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libooimpressimport_la_LIBADD  = ../../liboofilter/liboofilter.la $(KOFFICE_LIBS)
 
-libooimpressexport_la_SOURCES = ooimpressexport.cc stylefactory.cc
+libooimpressexport_la_SOURCES = ooimpressexport.cpp stylefactory.cpp
 libooimpressexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libooimpressexport_la_LIBADD  = ../../liboofilter/liboofilter.la $(KOFFICE_LIBS)
 
diff --git a/filters/kpresenter/ooimpress/ooimpressexport.cc b/filters/kpresenter/ooimpress/ooimpressexport.cpp
index 507ba84e3..507ba84e3 100644
--- a/filters/kpresenter/ooimpress/ooimpressexport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressexport.cpp
diff --git a/filters/kpresenter/ooimpress/ooimpressimport.cc b/filters/kpresenter/ooimpress/ooimpressimport.cpp
index 5d6c9da4a..5d6c9da4a 100644
--- a/filters/kpresenter/ooimpress/ooimpressimport.cc
+++ b/filters/kpresenter/ooimpress/ooimpressimport.cpp
diff --git a/filters/kpresenter/ooimpress/stylefactory.cc b/filters/kpresenter/ooimpress/stylefactory.cpp
index e50b652e2..e50b652e2 100644
--- a/filters/kpresenter/ooimpress/stylefactory.cc
+++ b/filters/kpresenter/ooimpress/stylefactory.cpp
diff --git a/filters/kpresenter/powerpoint/import/Makefile.am b/filters/kpresenter/powerpoint/import/Makefile.am
index 91f27887b..0034dfbb5 100644
--- a/filters/kpresenter/powerpoint/import/Makefile.am
+++ b/filters/kpresenter/powerpoint/import/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir) -I$(srcdir)/../libppt $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libpowerpointimport.la
 
-libpowerpointimport_la_SOURCES = powerpointimport.cc
+libpowerpointimport_la_SOURCES = powerpointimport.cpp
 libpowerpointimport_la_LIBADD  = $(KOFFICE_LIBS) ../libppt/libppt.la
 libpowerpointimport_la_LDFLAGS = -module $(KDE_PLUGIN)
 noinst_HEADERS = powerpointimport.h
diff --git a/filters/kpresenter/powerpoint/import/powerpointimport.cc b/filters/kpresenter/powerpoint/import/powerpointimport.cpp
index 4291c0a4e..4291c0a4e 100644
--- a/filters/kpresenter/powerpoint/import/powerpointimport.cc
+++ b/filters/kpresenter/powerpoint/import/powerpointimport.cpp
diff --git a/filters/kpresenter/svg/Makefile.am b/filters/kpresenter/svg/Makefile.am
index 04b7b0bbf..08f6c1595 100644
--- a/filters/kpresenter/svg/Makefile.am
+++ b/filters/kpresenter/svg/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) \
 ####### Files
 kde_module_LTLIBRARIES = libkpresentersvgexport.la
 
-libkpresentersvgexport_la_SOURCES = svgexport.cc
+libkpresentersvgexport_la_SOURCES = svgexport.cpp
 libkpresentersvgexport_la_LDFLAGS = -module $(KDE_PLUGIN) -no-undefined $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkpresentersvgexport_la_LIBADD = ../../../kpresenter/libkpresenterprivate.la $(KOFFICE_LIBS)
 noinst_HEADERS = \
diff --git a/filters/kpresenter/svg/svgexport.cc b/filters/kpresenter/svg/svgexport.cpp
index 5b6ed8928..711864df4 100644
--- a/filters/kpresenter/svg/svgexport.cc
+++ b/filters/kpresenter/svg/svgexport.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
    Copyright (C) 2005 Laurent Montel <montel@kde.org>
-   code based on svgexport.cc from Inge Wallin <inge@lysator.liu.se>
+   code based on svgexport.cpp from Inge Wallin <inge@lysator.liu.se>
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/filters/kpresenter/svg/svgexport.h b/filters/kpresenter/svg/svgexport.h
index d46ba5faa..e08171ec5 100644
--- a/filters/kpresenter/svg/svgexport.h
+++ b/filters/kpresenter/svg/svgexport.h
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
    Copyright (C) 2005 Laurent Montel <montel@kde.org>
-   code based on svgexport.cc from Inge Wallin <inge@lysator.liu.se>
+   code based on svgexport.cpp from Inge Wallin <inge@lysator.liu.se>
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/filters/kspread/applixspread/Makefile.am b/filters/kspread/applixspread/Makefile.am
index d61f78531..e27ed4c91 100644
--- a/filters/kspread/applixspread/Makefile.am
+++ b/filters/kspread/applixspread/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libapplixspreadimport.la
 
-libapplixspreadimport_la_SOURCES = applixspreadimport.cc
+libapplixspreadimport_la_SOURCES = applixspreadimport.cpp
 libapplixspreadimport_la_LIBADD = $(KOFFICE_LIBS)
 libapplixspreadimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = applixspreadimport.h
diff --git a/filters/kspread/applixspread/applixspreadimport.cc b/filters/kspread/applixspread/applixspreadimport.cpp
index cb60c83ae..cb60c83ae 100644
--- a/filters/kspread/applixspread/applixspreadimport.cc
+++ b/filters/kspread/applixspread/applixspreadimport.cpp
diff --git a/filters/kspread/applixspread/status.html b/filters/kspread/applixspread/status.html
index c944ef5c0..859f8b155 100644
--- a/filters/kspread/applixspread/status.html
+++ b/filters/kspread/applixspread/status.html
@@ -236,7 +236,7 @@
          <spacer size="20">If the value of r, g or b if less then 0 you must set it to 0 .<BR>
          <BR>
          <spacer size="20">For examples inside koffice look a this files too<br>
-         <spacer size="20"><I>koffice/kimageshop/core/kis_color.cc and kis_color.h</I><BR>
+         <spacer size="20"><I>koffice/kimageshop/core/kis_color.cpp and kis_color.h</I><BR>
          <BR><BR>
 
          <spacer size="10"><U>2.3. Colormap end:</U><BR> 
diff --git a/filters/kspread/csv/DESIGN b/filters/kspread/csv/DESIGN
index 9c6c4c909..5f9a3ed13 100644
--- a/filters/kspread/csv/DESIGN
+++ b/filters/kspread/csv/DESIGN
@@ -32,6 +32,6 @@ EOL : End Of Line.
 
 Ugly isn't it ? :) One can't be good in drawings AND in hacking :)
 
-That's all. For the rest, see csvfilter.cc
+That's all. For the rest, see csvfilter.cpp
 
 David Faure <faure@kde.org>, 1999
diff --git a/filters/kspread/csv/Makefile.am b/filters/kspread/csv/Makefile.am
index 32c8408a5..c46b0302a 100644
--- a/filters/kspread/csv/Makefile.am
+++ b/filters/kspread/csv/Makefile.am
@@ -7,11 +7,11 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/kspread $(KOFFICE_INCLUDES) \
 
 kde_module_LTLIBRARIES = libcsvimport.la libcsvexport.la
 
-libcsvimport_la_SOURCES = csvimport.cc xmltree.cc csvdialog.cpp dialogui.ui
+libcsvimport_la_SOURCES = csvimport.cpp xmltree.cpp csvdialog.cpp dialogui.ui
 libcsvimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined 
 libcsvimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la
 
-libcsvexport_la_SOURCES = csvexport.cc csvexportdialog.cpp exportdialogui.ui
+libcsvexport_la_SOURCES = csvexport.cpp csvexportdialog.cpp exportdialogui.ui
 libcsvexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libcsvexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la
 
diff --git a/filters/kspread/csv/csvexport.cc b/filters/kspread/csv/csvexport.cpp
index ceeb8b5ec..ceeb8b5ec 100644
--- a/filters/kspread/csv/csvexport.cc
+++ b/filters/kspread/csv/csvexport.cpp
diff --git a/filters/kspread/csv/csvimport.cc b/filters/kspread/csv/csvimport.cpp
index 72cadfa2b..72cadfa2b 100644
--- a/filters/kspread/csv/csvimport.cc
+++ b/filters/kspread/csv/csvimport.cpp
diff --git a/filters/kspread/csv/status.html b/filters/kspread/csv/status.html
index c4379ade8..e31c27613 100644
--- a/filters/kspread/csv/status.html
+++ b/filters/kspread/csv/status.html
@@ -117,7 +117,7 @@ EOL  : End Of Line.
 
 Ugly isn't it ? :) One can't be good in drawings AND in hacking :)
 
-That's all. For the rest, see csvfilter.cc
+That's all. For the rest, see csvfilter.cpp
 
 David Faure &lt;faure@kde.org&gt;, 1999 
 </PRE> 
diff --git a/filters/kspread/csv/xmltree.cc b/filters/kspread/csv/xmltree.cpp
index f5c56373a..f5c56373a 100644
--- a/filters/kspread/csv/xmltree.cc
+++ b/filters/kspread/csv/xmltree.cpp
diff --git a/filters/kspread/dbase/Makefile.am b/filters/kspread/dbase/Makefile.am
index 7bba5c86e..849b0c6df 100644
--- a/filters/kspread/dbase/Makefile.am
+++ b/filters/kspread/dbase/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libdbaseimport.la
 
-libdbaseimport_la_SOURCES = dbaseimport.cc dbase.cpp
+libdbaseimport_la_SOURCES = dbaseimport.cpp dbase.cpp
 libdbaseimport_la_LIBADD = $(KOFFICE_LIBS)
 libdbaseimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = dbaseimport.h dbase.h
diff --git a/filters/kspread/dbase/dbaseimport.cc b/filters/kspread/dbase/dbaseimport.cpp
index 001b35a20..001b35a20 100644
--- a/filters/kspread/dbase/dbaseimport.cc
+++ b/filters/kspread/dbase/dbaseimport.cpp
diff --git a/filters/kspread/excel/Makefile.am b/filters/kspread/excel/Makefile.am
index 73d5db56a..329f247c4 100644
--- a/filters/kspread/excel/Makefile.am
+++ b/filters/kspread/excel/Makefile.am
@@ -12,4 +12,4 @@ METASOURCES = AUTO
 servicedir = $(kde_servicesdir)
 
 messages: rc.cpp
-	$(XGETTEXT) *.cc *.cpp -o $(podir)/kspreadexcelfilter.pot
+	$(XGETTEXT) *.cpp *.cpp -o $(podir)/kspreadexcelfilter.pot
diff --git a/filters/kspread/excel/excelexport.cc b/filters/kspread/excel/excelexport.cpp
index 0ecf41f7b..0ecf41f7b 100644
--- a/filters/kspread/excel/excelexport.cc
+++ b/filters/kspread/excel/excelexport.cpp
diff --git a/filters/kspread/excel/import/Makefile.am b/filters/kspread/excel/import/Makefile.am
index fb49d8ff5..1dcc3191f 100644
--- a/filters/kspread/excel/import/Makefile.am
+++ b/filters/kspread/excel/import/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) -I$(srcdir)/../sidewinder $(KOFFICE_INCLUDES) $(all_includ
 
 kde_module_LTLIBRARIES = libexcelimport.la
 
-libexcelimport_la_SOURCES = excelimport.cc 
+libexcelimport_la_SOURCES = excelimport.cpp 
 libexcelimport_la_LIBADD = $(KOFFICE_LIBS) ../sidewinder/libsidewinder.la
 libexcelimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 noinst_HEADERS = excelimport.h
diff --git a/filters/kspread/excel/import/excelimport.cc b/filters/kspread/excel/import/excelimport.cpp
index 19f5888bf..19f5888bf 100644
--- a/filters/kspread/excel/import/excelimport.cc
+++ b/filters/kspread/excel/import/excelimport.cpp
diff --git a/filters/kspread/gnumeric/Makefile.am b/filters/kspread/gnumeric/Makefile.am
index 6bb9608ed..a16f0024e 100644
--- a/filters/kspread/gnumeric/Makefile.am
+++ b/filters/kspread/gnumeric/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/kspread $(KOFFICE_INCLUDES) \
 ####### Files
 kde_module_LTLIBRARIES = libgnumericexport.la libgnumericimport.la
 
-libgnumericexport_la_SOURCES = gnumericexport.cc
+libgnumericexport_la_SOURCES = gnumericexport.cpp
 libgnumericexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libgnumericexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la
 
-libgnumericimport_la_SOURCES = gnumericimport.cc
+libgnumericimport_la_SOURCES = gnumericimport.cpp
 libgnumericimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libgnumericimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la
 
diff --git a/filters/kspread/gnumeric/gnumericexport.cc b/filters/kspread/gnumeric/gnumericexport.cpp
index 28f5453e9..28f5453e9 100644
--- a/filters/kspread/gnumeric/gnumericexport.cc
+++ b/filters/kspread/gnumeric/gnumericexport.cpp
diff --git a/filters/kspread/gnumeric/gnumericimport.cc b/filters/kspread/gnumeric/gnumericimport.cpp
index f437aad00..f437aad00 100644
--- a/filters/kspread/gnumeric/gnumericimport.cc
+++ b/filters/kspread/gnumeric/gnumericimport.cpp
diff --git a/filters/kspread/html/Makefile.am b/filters/kspread/html/Makefile.am
index 87018febd..b170396fd 100644
--- a/filters/kspread/html/Makefile.am
+++ b/filters/kspread/html/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/kspread $(KOFFICE_INCLUDES) \
 
 kde_module_LTLIBRARIES = libkspreadhtmlexport.la
 
-libkspreadhtmlexport_la_SOURCES = htmlexport.cc exportdialog.cc exportwidget.ui
+libkspreadhtmlexport_la_SOURCES = htmlexport.cpp exportdialog.cpp exportwidget.ui
 libkspreadhtmlexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libkspreadhtmlexport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la
 
diff --git a/filters/kspread/html/exportdialog.cc b/filters/kspread/html/exportdialog.cpp
index 8df7e0ce2..8df7e0ce2 100644
--- a/filters/kspread/html/exportdialog.cc
+++ b/filters/kspread/html/exportdialog.cpp
diff --git a/filters/kspread/html/htmlexport.cc b/filters/kspread/html/htmlexport.cpp
index f680207e4..f680207e4 100644
--- a/filters/kspread/html/htmlexport.cc
+++ b/filters/kspread/html/htmlexport.cpp
diff --git a/filters/kspread/kexi/Makefile.am b/filters/kspread/kexi/Makefile.am
index 6f76a2969..acfedf973 100644
--- a/filters/kspread/kexi/Makefile.am
+++ b/filters/kspread/kexi/Makefile.am
@@ -7,9 +7,9 @@ INCLUDES= -I$(srcdir) -I$(top_srcdir)/kspread -I$(top_srcdir)/kexi $(KOFFICE_INC
 
 kde_module_LTLIBRARIES = libkspreadkexiimport.la
 
-libkspreadkexiimport_la_SOURCES = kspread_kexiimport.cc \
+libkspreadkexiimport_la_SOURCES = kspread_kexiimport.cpp \
 				kspread_kexiimportdialogbase.ui \
-				kspread_kexiimportdialog.cc
+				kspread_kexiimportdialog.cpp
 libkspreadkexiimport_la_LDFLAGS = -avoid-version -module -no-undefined \
 	$(all_libraries)
 libkspreadkexiimport_la_LIBADD = ../../../kexi/kexidb/libkexidb.la \
diff --git a/filters/kspread/kexi/kspread_kexiimport.cc b/filters/kspread/kexi/kspread_kexiimport.cpp
index 6100dabe3..6100dabe3 100644
--- a/filters/kspread/kexi/kspread_kexiimport.cc
+++ b/filters/kspread/kexi/kspread_kexiimport.cpp
diff --git a/filters/kspread/kexi/kspread_kexiimportdialog.cc b/filters/kspread/kexi/kspread_kexiimportdialog.cpp
index 0e15acbe7..0e15acbe7 100644
--- a/filters/kspread/kexi/kspread_kexiimportdialog.cc
+++ b/filters/kspread/kexi/kspread_kexiimportdialog.cpp
diff --git a/filters/kspread/latex/export/Makefile.am b/filters/kspread/latex/export/Makefile.am
index 21ea2021b..bc552ee94 100644
--- a/filters/kspread/latex/export/Makefile.am
+++ b/filters/kspread/latex/export/Makefile.am
@@ -8,11 +8,11 @@ libkspreadlatexexport_la_LIBADD    = $(KOFFICE_LIBS) $(LIB_KFORMULA)
 
 kde_module_LTLIBRARIES = libkspreadlatexexport.la
 
-libkspreadlatexexport_la_SOURCES = cell.cc column.cc config.cc document.cc fileheader.cc \
-				 format.cc latexexportdia.ui kspreadlatexexportdiaImpl.cc \
-				 latexexport.cc latexexportIface.cc latexexportIface.skel \
-				 map.cc pen.cc row.cc spreadsheet.cc table.cc \
-				 xmlparser.cc
+libkspreadlatexexport_la_SOURCES = cell.cpp column.cpp config.cpp document.cpp fileheader.cpp \
+				 format.cpp latexexportdia.ui kspreadlatexexportdiaImpl.cpp \
+				 latexexport.cpp latexexportIface.cpp latexexportIface.skel \
+				 map.cpp pen.cpp row.cpp spreadsheet.cpp table.cpp \
+				 xmlparser.cpp
 
 noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
 					kspreadlatexexportdiaImpl.h latexexport.h latexexportIface.h \
@@ -20,7 +20,7 @@ noinst_HEADERS = cell.h column.h config.h document.h fileheader.h format.h \
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kspread/latex/export/cell.cc b/filters/kspread/latex/export/cell.cpp
index 74eb95bb6..74eb95bb6 100644
--- a/filters/kspread/latex/export/cell.cc
+++ b/filters/kspread/latex/export/cell.cpp
diff --git a/filters/kspread/latex/export/column.cc b/filters/kspread/latex/export/column.cpp
index fece8cb8c..fece8cb8c 100644
--- a/filters/kspread/latex/export/column.cc
+++ b/filters/kspread/latex/export/column.cpp
diff --git a/filters/kspread/latex/export/config.cc b/filters/kspread/latex/export/config.cpp
index 8460aae41..8460aae41 100644
--- a/filters/kspread/latex/export/config.cc
+++ b/filters/kspread/latex/export/config.cpp
diff --git a/filters/kspread/latex/export/document.cc b/filters/kspread/latex/export/document.cpp
index 45cdbb734..45cdbb734 100644
--- a/filters/kspread/latex/export/document.cc
+++ b/filters/kspread/latex/export/document.cpp
diff --git a/filters/kspread/latex/export/fileheader.cc b/filters/kspread/latex/export/fileheader.cpp
index 07b1fbe4e..07b1fbe4e 100644
--- a/filters/kspread/latex/export/fileheader.cc
+++ b/filters/kspread/latex/export/fileheader.cpp
diff --git a/filters/kspread/latex/export/format.cc b/filters/kspread/latex/export/format.cpp
index 96f2ad089..96f2ad089 100644
--- a/filters/kspread/latex/export/format.cc
+++ b/filters/kspread/latex/export/format.cpp
diff --git a/filters/kspread/latex/export/formula.cc b/filters/kspread/latex/export/formula.cpp
index 1d805a2a3..1d805a2a3 100644
--- a/filters/kspread/latex/export/formula.cc
+++ b/filters/kspread/latex/export/formula.cpp
diff --git a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
index b088afe14..b088afe14 100644
--- a/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cc
+++ b/filters/kspread/latex/export/kspreadlatexexportdiaImpl.cpp
diff --git a/filters/kspread/latex/export/latexexport.cc b/filters/kspread/latex/export/latexexport.cpp
index d9ebd7946..d9ebd7946 100644
--- a/filters/kspread/latex/export/latexexport.cc
+++ b/filters/kspread/latex/export/latexexport.cpp
diff --git a/filters/kspread/latex/export/latexexportIface.cc b/filters/kspread/latex/export/latexexportIface.cpp
index f99e6745b..f99e6745b 100644
--- a/filters/kspread/latex/export/latexexportIface.cc
+++ b/filters/kspread/latex/export/latexexportIface.cpp
diff --git a/filters/kspread/latex/export/map.cc b/filters/kspread/latex/export/map.cpp
index 886f6c115..886f6c115 100644
--- a/filters/kspread/latex/export/map.cc
+++ b/filters/kspread/latex/export/map.cpp
diff --git a/filters/kspread/latex/export/pen.cc b/filters/kspread/latex/export/pen.cpp
index 03a87bd80..03a87bd80 100644
--- a/filters/kspread/latex/export/pen.cc
+++ b/filters/kspread/latex/export/pen.cpp
diff --git a/filters/kspread/latex/export/row.cc b/filters/kspread/latex/export/row.cpp
index 3aaaaaba7..3aaaaaba7 100644
--- a/filters/kspread/latex/export/row.cc
+++ b/filters/kspread/latex/export/row.cpp
diff --git a/filters/kspread/latex/export/spreadsheet.cc b/filters/kspread/latex/export/spreadsheet.cpp
index afb02cad6..afb02cad6 100644
--- a/filters/kspread/latex/export/spreadsheet.cc
+++ b/filters/kspread/latex/export/spreadsheet.cpp
diff --git a/filters/kspread/latex/export/table.cc b/filters/kspread/latex/export/table.cpp
index 0f300356f..0f300356f 100644
--- a/filters/kspread/latex/export/table.cc
+++ b/filters/kspread/latex/export/table.cpp
diff --git a/filters/kspread/latex/export/xmlparser.cc b/filters/kspread/latex/export/xmlparser.cpp
index fb2c8e1f2..fb2c8e1f2 100644
--- a/filters/kspread/latex/export/xmlparser.cc
+++ b/filters/kspread/latex/export/xmlparser.cpp
diff --git a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cpp
index cc7b2b462..cc7b2b462 100644
--- a/filters/kspread/libkspreadexport/KSpreadBaseWorker.cc
+++ b/filters/kspread/libkspreadexport/KSpreadBaseWorker.cpp
diff --git a/filters/kspread/libkspreadexport/KSpreadLeader.cc b/filters/kspread/libkspreadexport/KSpreadLeader.cpp
index 8e300c7d1..8e300c7d1 100644
--- a/filters/kspread/libkspreadexport/KSpreadLeader.cc
+++ b/filters/kspread/libkspreadexport/KSpreadLeader.cpp
diff --git a/filters/kspread/libkspreadexport/Makefile.am b/filters/kspread/libkspreadexport/Makefile.am
index a36b3ad92..4411804a5 100644
--- a/filters/kspread/libkspreadexport/Makefile.am
+++ b/filters/kspread/libkspreadexport/Makefile.am
@@ -11,7 +11,7 @@ libkspreadexport_la_LIBADD = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.l
 
 lib_LTLIBRARIES = libkspreadexport.la
 
-libkspreadexport_la_SOURCES = KSpreadLeader.cc KSpreadBaseWorker.cc
+libkspreadexport_la_SOURCES = KSpreadLeader.cpp KSpreadBaseWorker.cpp
 
 noinst_HEADERS = KSpreadLeader.h KSpreadBaseWorker.h
 
diff --git a/filters/kspread/opencalc/Makefile.am b/filters/kspread/opencalc/Makefile.am
index 65741b1d7..1312119fa 100644
--- a/filters/kspread/opencalc/Makefile.am
+++ b/filters/kspread/opencalc/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES= -I$(srcdir)/../../liboofilter -I$(srcdir) -I$(top_srcdir)/kspread $(KO
 ####### Files
 kde_module_LTLIBRARIES = libopencalcimport.la libopencalcexport.la
 
-libopencalcexport_la_SOURCES = opencalcexport.cc opencalcstyleexport.cc
+libopencalcexport_la_SOURCES = opencalcexport.cpp opencalcstyleexport.cpp
 libopencalcexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libopencalcexport_la_LIBADD  = ../../../kspread/libkspreadcommon.la ../../liboofilter/liboofilter.la $(KOFFICE_LIBS)
 
-libopencalcimport_la_SOURCES = opencalcimport.cc
+libopencalcimport_la_SOURCES = opencalcimport.cpp
 libopencalcimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libopencalcimport_la_LIBADD  = ../../../kspread/libkspreadcommon.la ../../liboofilter/liboofilter.la $(KOFFICE_LIBS)
 
diff --git a/filters/kspread/opencalc/opencalcexport.cc b/filters/kspread/opencalc/opencalcexport.cpp
index 2db60420f..2db60420f 100644
--- a/filters/kspread/opencalc/opencalcexport.cc
+++ b/filters/kspread/opencalc/opencalcexport.cpp
diff --git a/filters/kspread/opencalc/opencalcimport.cc b/filters/kspread/opencalc/opencalcimport.cpp
index 6dc3216ed..6dc3216ed 100644
--- a/filters/kspread/opencalc/opencalcimport.cc
+++ b/filters/kspread/opencalc/opencalcimport.cpp
diff --git a/filters/kspread/opencalc/opencalcstyleexport.cc b/filters/kspread/opencalc/opencalcstyleexport.cpp
index 9585ae139..9585ae139 100644
--- a/filters/kspread/opencalc/opencalcstyleexport.cc
+++ b/filters/kspread/opencalc/opencalcstyleexport.cpp
diff --git a/filters/kspread/qpro/Makefile.am b/filters/kspread/qpro/Makefile.am
index 9f34af473..95ecdb8aa 100644
--- a/filters/kspread/qpro/Makefile.am
+++ b/filters/kspread/qpro/Makefile.am
@@ -10,7 +10,7 @@ SUBDIRS = libqpro
 
 kde_module_LTLIBRARIES = libqproimport.la
 
-libqproimport_la_SOURCES = qproimport.cc qproformula.cc
+libqproimport_la_SOURCES = qproimport.cpp qproformula.cpp
 
 libqproimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 libqproimport_la_LIBADD  = $(KOFFICE_LIBS) ../../../kspread/libkspreadcommon.la \
diff --git a/filters/kspread/qpro/libqpro/ChangeLog b/filters/kspread/qpro/libqpro/ChangeLog
index 35dbf4c2f..18a733a2e 100644
--- a/filters/kspread/qpro/libqpro/ChangeLog
+++ b/filters/kspread/qpro/libqpro/ChangeLog
@@ -6,16 +6,16 @@
 
 	* /cvsroot/libqpro/libqpro/Makefile.in: Update version number to 0.2
 
-	* /cvsroot/libqpro/libqpro/src/record.cc, /cvsroot/libqpro/libqpro/src/record_factory.cc, /cvsroot/libqpro/libqpro/src/stream.cc, /cvsroot/libqpro/libqpro/src/tablenames.cc:
+	* /cvsroot/libqpro/libqpro/src/record.cpp, /cvsroot/libqpro/libqpro/src/record_factory.cpp, /cvsroot/libqpro/libqpro/src/stream.cpp, /cvsroot/libqpro/libqpro/src/tablenames.cpp:
 	libqpro library.  C++ libray for reading & writing Quattro Pro spreadsheet files.
 
-	* /cvsroot/libqpro/libqpro/src/record.cc, /cvsroot/libqpro/libqpro/src/record_factory.cc, /cvsroot/libqpro/libqpro/src/stream.cc, /cvsroot/libqpro/libqpro/src/tablenames.cc:
+	* /cvsroot/libqpro/libqpro/src/record.cpp, /cvsroot/libqpro/libqpro/src/record_factory.cpp, /cvsroot/libqpro/libqpro/src/stream.cpp, /cvsroot/libqpro/libqpro/src/tablenames.cpp:
 	New file.
 
-	* /cvsroot/libqpro/libqpro/src/formula.cc:
+	* /cvsroot/libqpro/libqpro/src/formula.cpp:
 	libqpro library.  C++ libray for reading & writing Quattro Pro spreadsheet files.
 
-	* /cvsroot/libqpro/libqpro/src/formula.cc: New file.
+	* /cvsroot/libqpro/libqpro/src/formula.cpp: New file.
 
 	* /cvsroot/libqpro/libqpro/src/Makefile.am, /cvsroot/libqpro/libqpro/src/Makefile.in:
 	libqpro library.  C++ libray for reading & writing Quattro Pro spreadsheet files.
diff --git a/filters/kspread/qpro/libqpro/src/Makefile.am b/filters/kspread/qpro/libqpro/src/Makefile.am
index 9eac256cd..1a6393bbd 100644
--- a/filters/kspread/qpro/libqpro/src/Makefile.am
+++ b/filters/kspread/qpro/libqpro/src/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES= -I$(srcdir) -I$(srcdir)/.. $(all_includes)
 
 noinst_LTLIBRARIES = libqpro.la
-libqpro_la_SOURCES = formula.cc  record.cc  record_factory.cc  stream.cc  tablenames.cc
+libqpro_la_SOURCES = formula.cpp  record.cpp  record_factory.cpp  stream.cpp  tablenames.cpp
 
diff --git a/filters/kspread/qpro/libqpro/src/formula.cc b/filters/kspread/qpro/libqpro/src/formula.cpp
index aab0bb8d4..aab0bb8d4 100644
--- a/filters/kspread/qpro/libqpro/src/formula.cc
+++ b/filters/kspread/qpro/libqpro/src/formula.cpp
diff --git a/filters/kspread/qpro/libqpro/src/record.cc b/filters/kspread/qpro/libqpro/src/record.cpp
index 461b65d34..461b65d34 100644
--- a/filters/kspread/qpro/libqpro/src/record.cc
+++ b/filters/kspread/qpro/libqpro/src/record.cpp
diff --git a/filters/kspread/qpro/libqpro/src/record_factory.cc b/filters/kspread/qpro/libqpro/src/record_factory.cpp
index ed6e86174..ed6e86174 100644
--- a/filters/kspread/qpro/libqpro/src/record_factory.cc
+++ b/filters/kspread/qpro/libqpro/src/record_factory.cpp
diff --git a/filters/kspread/qpro/libqpro/src/stream.cc b/filters/kspread/qpro/libqpro/src/stream.cpp
index 390fc3703..390fc3703 100644
--- a/filters/kspread/qpro/libqpro/src/stream.cc
+++ b/filters/kspread/qpro/libqpro/src/stream.cpp
diff --git a/filters/kspread/qpro/libqpro/src/tablenames.cc b/filters/kspread/qpro/libqpro/src/tablenames.cpp
index 4b9b7248c..4b9b7248c 100644
--- a/filters/kspread/qpro/libqpro/src/tablenames.cc
+++ b/filters/kspread/qpro/libqpro/src/tablenames.cpp
diff --git a/filters/kspread/qpro/qproformula.cc b/filters/kspread/qpro/qproformula.cpp
index 4f437cb16..4f437cb16 100644
--- a/filters/kspread/qpro/qproformula.cc
+++ b/filters/kspread/qpro/qproformula.cpp
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cpp
index e282a7698..e282a7698 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cpp
diff --git a/filters/kword/abiword/ImportField.cc b/filters/kword/abiword/ImportField.cpp
index e9474364f..e9474364f 100644
--- a/filters/kword/abiword/ImportField.cc
+++ b/filters/kword/abiword/ImportField.cpp
diff --git a/filters/kword/abiword/ImportFormatting.cc b/filters/kword/abiword/ImportFormatting.cpp
index 7c45f07a0..7c45f07a0 100644
--- a/filters/kword/abiword/ImportFormatting.cc
+++ b/filters/kword/abiword/ImportFormatting.cpp
diff --git a/filters/kword/abiword/ImportHelpers.cc b/filters/kword/abiword/ImportHelpers.cpp
index c3cad308a..c3cad308a 100644
--- a/filters/kword/abiword/ImportHelpers.cc
+++ b/filters/kword/abiword/ImportHelpers.cpp
diff --git a/filters/kword/abiword/ImportStyle.cc b/filters/kword/abiword/ImportStyle.cpp
index 1a023c8e5..1a023c8e5 100644
--- a/filters/kword/abiword/ImportStyle.cc
+++ b/filters/kword/abiword/ImportStyle.cpp
diff --git a/filters/kword/abiword/Makefile.am b/filters/kword/abiword/Makefile.am
index 0a0f1f824..098266e96 100644
--- a/filters/kword/abiword/Makefile.am
+++ b/filters/kword/abiword/Makefile.am
@@ -12,10 +12,10 @@ libabiwordexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libabiwordimport.la libabiwordexport.la
 
-libabiwordimport_la_SOURCES = abiwordimport.cc ImportHelpers.cc\
-ImportFormatting.cc ImportStyle.cc ImportField.cc
+libabiwordimport_la_SOURCES = abiwordimport.cpp ImportHelpers.cpp\
+ImportFormatting.cpp ImportStyle.cpp ImportField.cpp
 
-libabiwordexport_la_SOURCES = abiwordexport.cc
+libabiwordexport_la_SOURCES = abiwordexport.cpp
 
 noinst_HEADERS = abiwordimport.h ImportHelpers.h ImportFormatting.h\
 ImportStyle.h ImportField.h abiwordexport.h
diff --git a/filters/kword/abiword/abiwordexport.cc b/filters/kword/abiword/abiwordexport.cpp
index 11f5d2dd7..d1b5a98a2 100644
--- a/filters/kword/abiword/abiwordexport.cc
+++ b/filters/kword/abiword/abiwordexport.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/abiword/abiwordimport.cc b/filters/kword/abiword/abiwordimport.cpp
index bd6ea1e38..bd6ea1e38 100644
--- a/filters/kword/abiword/abiwordimport.cc
+++ b/filters/kword/abiword/abiwordimport.cpp
diff --git a/filters/kword/amipro/Makefile.am b/filters/kword/amipro/Makefile.am
index f872af037..845049868 100644
--- a/filters/kword/amipro/Makefile.am
+++ b/filters/kword/amipro/Makefile.am
@@ -11,8 +11,8 @@ libamiproexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.l
 
 kde_module_LTLIBRARIES = libamiproimport.la libamiproexport.la
 
-libamiproimport_la_SOURCES = amiproimport.cc amiproparser.cpp
-libamiproexport_la_SOURCES = amiproexport.cc
+libamiproimport_la_SOURCES = amiproimport.cpp amiproparser.cpp
+libamiproexport_la_SOURCES = amiproexport.cpp
 
 noinst_HEADERS = amiproparser.h
 
diff --git a/filters/kword/amipro/amiproexport.cc b/filters/kword/amipro/amiproexport.cpp
index e6703fc02..e6703fc02 100644
--- a/filters/kword/amipro/amiproexport.cc
+++ b/filters/kword/amipro/amiproexport.cpp
diff --git a/filters/kword/amipro/amiproimport.cc b/filters/kword/amipro/amiproimport.cpp
index fe45ca18e..fe45ca18e 100644
--- a/filters/kword/amipro/amiproimport.cc
+++ b/filters/kword/amipro/amiproimport.cpp
diff --git a/filters/kword/applixword/Makefile.am b/filters/kword/applixword/Makefile.am
index 14e899746..7bc406c7d 100644
--- a/filters/kword/applixword/Makefile.am
+++ b/filters/kword/applixword/Makefile.am
@@ -7,7 +7,7 @@ libapplixwordimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-und
 
 kde_module_LTLIBRARIES = libapplixwordimport.la
 
-libapplixwordimport_la_SOURCES = applixwordimport.cc
+libapplixwordimport_la_SOURCES = applixwordimport.cpp
 libapplixwordimport_la_LIBADD = $(KOFFICE_LIBS)
 noinst_HEADERS = applixwordimport.h
 
diff --git a/filters/kword/applixword/applixwordimport.cc b/filters/kword/applixword/applixwordimport.cpp
index 4c8b6620a..4c8b6620a 100644
--- a/filters/kword/applixword/applixwordimport.cc
+++ b/filters/kword/applixword/applixwordimport.cpp
diff --git a/filters/kword/ascii/ExportDialog.cc b/filters/kword/ascii/ExportDialog.cpp
index 577fb72b9..577fb72b9 100644
--- a/filters/kword/ascii/ExportDialog.cc
+++ b/filters/kword/ascii/ExportDialog.cpp
diff --git a/filters/kword/ascii/ImportDialog.cc b/filters/kword/ascii/ImportDialog.cpp
index 09c81a090..09c81a090 100644
--- a/filters/kword/ascii/ImportDialog.cc
+++ b/filters/kword/ascii/ImportDialog.cpp
diff --git a/filters/kword/ascii/Makefile.am b/filters/kword/ascii/Makefile.am
index 74b9dde20..22a5d5555 100644
--- a/filters/kword/ascii/Makefile.am
+++ b/filters/kword/ascii/Makefile.am
@@ -12,9 +12,9 @@ libasciiexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la
 
 kde_module_LTLIBRARIES = libasciiimport.la libasciiexport.la
 
-libasciiimport_la_SOURCES = asciiimport.cc ImportDialogUI.ui ImportDialog.cc
+libasciiimport_la_SOURCES = asciiimport.cpp ImportDialogUI.ui ImportDialog.cpp
 
-libasciiexport_la_SOURCES = asciiexport.cc ExportDialogUI.ui ExportDialog.cc
+libasciiexport_la_SOURCES = asciiexport.cpp ExportDialogUI.ui ExportDialog.cpp
 
 noinst_HEADERS = asciiimport.h ImportDialog.h asciiexport.h ExportDialog.h
 
diff --git a/filters/kword/ascii/asciiexport.cc b/filters/kword/ascii/asciiexport.cpp
index 1bea9a269..1bea9a269 100644
--- a/filters/kword/ascii/asciiexport.cc
+++ b/filters/kword/ascii/asciiexport.cpp
diff --git a/filters/kword/ascii/asciiimport.cc b/filters/kword/ascii/asciiimport.cpp
index b7c4c0f5e..b7c4c0f5e 100644
--- a/filters/kword/ascii/asciiimport.cc
+++ b/filters/kword/ascii/asciiimport.cpp
diff --git a/filters/kword/docbook/Makefile.am b/filters/kword/docbook/Makefile.am
index 9ce299cbb..93967bc11 100644
--- a/filters/kword/docbook/Makefile.am
+++ b/filters/kword/docbook/Makefile.am
@@ -8,7 +8,7 @@ libdocbookexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libdocbookexport.la
 
-libdocbookexport_la_SOURCES = docbookexport.cc
+libdocbookexport_la_SOURCES = docbookexport.cpp
 
 noinst_HEADERS = docbookexport.h 
 
diff --git a/filters/kword/docbook/docbookexport.cc b/filters/kword/docbook/docbookexport.cpp
index f54bec6b1..f54bec6b1 100644
--- a/filters/kword/docbook/docbookexport.cc
+++ b/filters/kword/docbook/docbookexport.cpp
diff --git a/filters/kword/html/export/ExportBasic.cc b/filters/kword/html/export/ExportBasic.cpp
index d222d7df4..d222d7df4 100644
--- a/filters/kword/html/export/ExportBasic.cc
+++ b/filters/kword/html/export/ExportBasic.cpp
diff --git a/filters/kword/html/export/ExportCss.cc b/filters/kword/html/export/ExportCss.cpp
index 2388477c3..2388477c3 100644
--- a/filters/kword/html/export/ExportCss.cc
+++ b/filters/kword/html/export/ExportCss.cpp
diff --git a/filters/kword/html/export/ExportDialog.cc b/filters/kword/html/export/ExportDialog.cpp
index 5fc3fdc59..5fc3fdc59 100644
--- a/filters/kword/html/export/ExportDialog.cc
+++ b/filters/kword/html/export/ExportDialog.cpp
diff --git a/filters/kword/html/export/ExportDocStruct.cc b/filters/kword/html/export/ExportDocStruct.cpp
index eccdead1d..eccdead1d 100644
--- a/filters/kword/html/export/ExportDocStruct.cc
+++ b/filters/kword/html/export/ExportDocStruct.cpp
diff --git a/filters/kword/html/export/ExportFilter.cc b/filters/kword/html/export/ExportFilter.cpp
index 96f0b6c5b..96f0b6c5b 100644
--- a/filters/kword/html/export/ExportFilter.cc
+++ b/filters/kword/html/export/ExportFilter.cpp
diff --git a/filters/kword/html/export/Makefile.am b/filters/kword/html/export/Makefile.am
index e35b70a5a..280dbb5e4 100644
--- a/filters/kword/html/export/Makefile.am
+++ b/filters/kword/html/export/Makefile.am
@@ -10,8 +10,8 @@ libhtmlexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libhtmlexport.la
 
-libhtmlexport_la_SOURCES = htmlexport.cc ExportDialog.cc ExportDialogUI.ui \
-ExportFilter.cc ExportCss.cc ExportDocStruct.cc ExportBasic.cc
+libhtmlexport_la_SOURCES = htmlexport.cpp ExportDialog.cpp ExportDialogUI.ui \
+ExportFilter.cpp ExportCss.cpp ExportDocStruct.cpp ExportBasic.cpp
 
 noinst_HEADERS = htmlexport.h ExportDialog.h ExportDialogUI.h ExportFilter.h \
 ExportCss.h ExportDocStruct.h ExportBasic.h
diff --git a/filters/kword/html/export/htmlexport.cc b/filters/kword/html/export/htmlexport.cpp
index 285735176..76d780527 100644
--- a/filters/kword/html/export/htmlexport.cc
+++ b/filters/kword/html/export/htmlexport.cpp
@@ -20,7 +20,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/latex/export/Makefile.am b/filters/kword/latex/export/Makefile.am
index 24900b6ef..180d45dc3 100644
--- a/filters/kword/latex/export/Makefile.am
+++ b/filters/kword/latex/export/Makefile.am
@@ -8,17 +8,17 @@ libkwordlatexexport_la_LIBADD  = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIBMAGICK_LIB
 
 kde_module_LTLIBRARIES = libkwordlatexexport.la
 
-libkwordlatexexport_la_SOURCES = anchor.cc config.cc document.cc element.cc fileheader.cc \
- latexexportdia.ui footnote.cc format.cc formula.cc key.cc \
- kwordlatexexportdia.cc latexexport.cc latexexportIface.cc \
- latexexportIface.skel layout.cc listtable.cc para.cc \
- pixmapFrame.cc table.cc \
- textFrame.cc textformat.cc textzone.cc variableformat.cc \
- variablezone.cc xml2latexparser.cc xmlparser.cc
+libkwordlatexexport_la_SOURCES = anchor.cpp config.cpp document.cpp element.cpp fileheader.cpp \
+ latexexportdia.ui footnote.cpp format.cpp formula.cpp key.cpp \
+ kwordlatexexportdia.cpp latexexport.cpp latexexportIface.cpp \
+ latexexportIface.skel layout.cpp listtable.cpp para.cpp \
+ pixmapFrame.cpp table.cpp \
+ textFrame.cpp textformat.cpp textzone.cpp variableformat.cpp \
+ variablezone.cpp xml2latexparser.cpp xmlparser.cpp
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/export/anchor.cc b/filters/kword/latex/export/anchor.cpp
index 999153847..999153847 100644
--- a/filters/kword/latex/export/anchor.cc
+++ b/filters/kword/latex/export/anchor.cpp
diff --git a/filters/kword/latex/export/config.cc b/filters/kword/latex/export/config.cpp
index 8460aae41..8460aae41 100644
--- a/filters/kword/latex/export/config.cc
+++ b/filters/kword/latex/export/config.cpp
diff --git a/filters/kword/latex/export/document.cc b/filters/kword/latex/export/document.cpp
index 13d40415f..13d40415f 100644
--- a/filters/kword/latex/export/document.cc
+++ b/filters/kword/latex/export/document.cpp
diff --git a/filters/kword/latex/export/element.cc b/filters/kword/latex/export/element.cpp
index 992293243..992293243 100644
--- a/filters/kword/latex/export/element.cc
+++ b/filters/kword/latex/export/element.cpp
diff --git a/filters/kword/latex/export/fileheader.cc b/filters/kword/latex/export/fileheader.cpp
index 8da25a16e..8da25a16e 100644
--- a/filters/kword/latex/export/fileheader.cc
+++ b/filters/kword/latex/export/fileheader.cpp
diff --git a/filters/kword/latex/export/footnote.cc b/filters/kword/latex/export/footnote.cpp
index fbfba354f..fbfba354f 100644
--- a/filters/kword/latex/export/footnote.cc
+++ b/filters/kword/latex/export/footnote.cpp
diff --git a/filters/kword/latex/export/format.cc b/filters/kword/latex/export/format.cpp
index d2e7d4a2b..d2e7d4a2b 100644
--- a/filters/kword/latex/export/format.cc
+++ b/filters/kword/latex/export/format.cpp
diff --git a/filters/kword/latex/export/formula.cc b/filters/kword/latex/export/formula.cpp
index 98f173797..98f173797 100644
--- a/filters/kword/latex/export/formula.cc
+++ b/filters/kword/latex/export/formula.cpp
diff --git a/filters/kword/latex/export/key.cc b/filters/kword/latex/export/key.cpp
index dccf89c6e..dccf89c6e 100644
--- a/filters/kword/latex/export/key.cc
+++ b/filters/kword/latex/export/key.cpp
diff --git a/filters/kword/latex/export/kwordlatexexportdia.cc b/filters/kword/latex/export/kwordlatexexportdia.cpp
index 3498bcdb9..3498bcdb9 100644
--- a/filters/kword/latex/export/kwordlatexexportdia.cc
+++ b/filters/kword/latex/export/kwordlatexexportdia.cpp
diff --git a/filters/kword/latex/export/latexexport.cc b/filters/kword/latex/export/latexexport.cpp
index fed29704f..fed29704f 100644
--- a/filters/kword/latex/export/latexexport.cc
+++ b/filters/kword/latex/export/latexexport.cpp
diff --git a/filters/kword/latex/export/latexexportIface.cc b/filters/kword/latex/export/latexexportIface.cpp
index 102845b10..102845b10 100644
--- a/filters/kword/latex/export/latexexportIface.cc
+++ b/filters/kword/latex/export/latexexportIface.cpp
diff --git a/filters/kword/latex/export/layout.cc b/filters/kword/latex/export/layout.cpp
index 74cee48ba..74cee48ba 100644
--- a/filters/kword/latex/export/layout.cc
+++ b/filters/kword/latex/export/layout.cpp
diff --git a/filters/kword/latex/export/listeformat.cc b/filters/kword/latex/export/listeformat.cpp
index 1122e70bb..1122e70bb 100644
--- a/filters/kword/latex/export/listeformat.cc
+++ b/filters/kword/latex/export/listeformat.cpp
diff --git a/filters/kword/latex/export/listelement.cc b/filters/kword/latex/export/listelement.cpp
index bb309ee93..bb309ee93 100644
--- a/filters/kword/latex/export/listelement.cc
+++ b/filters/kword/latex/export/listelement.cpp
diff --git a/filters/kword/latex/export/listepara.cc b/filters/kword/latex/export/listepara.cpp
index 0eb8dcad2..0eb8dcad2 100644
--- a/filters/kword/latex/export/listepara.cc
+++ b/filters/kword/latex/export/listepara.cpp
diff --git a/filters/kword/latex/export/listtable.cc b/filters/kword/latex/export/listtable.cpp
index 55cbf2382..55cbf2382 100644
--- a/filters/kword/latex/export/listtable.cc
+++ b/filters/kword/latex/export/listtable.cpp
diff --git a/filters/kword/latex/export/para.cc b/filters/kword/latex/export/para.cpp
index 9cc829b57..9cc829b57 100644
--- a/filters/kword/latex/export/para.cc
+++ b/filters/kword/latex/export/para.cpp
diff --git a/filters/kword/latex/export/pixmapFrame.cc b/filters/kword/latex/export/pixmapFrame.cpp
index 25f5951d7..25f5951d7 100644
--- a/filters/kword/latex/export/pixmapFrame.cc
+++ b/filters/kword/latex/export/pixmapFrame.cpp
diff --git a/filters/kword/latex/export/table.cc b/filters/kword/latex/export/table.cpp
index 90fdc378c..90fdc378c 100644
--- a/filters/kword/latex/export/table.cc
+++ b/filters/kword/latex/export/table.cpp
diff --git a/filters/kword/latex/export/texlauncher.cc b/filters/kword/latex/export/texlauncher.cpp
index 17c00b7d9..17c00b7d9 100644
--- a/filters/kword/latex/export/texlauncher.cc
+++ b/filters/kword/latex/export/texlauncher.cpp
diff --git a/filters/kword/latex/export/textFrame.cc b/filters/kword/latex/export/textFrame.cpp
index d6141e966..d6141e966 100644
--- a/filters/kword/latex/export/textFrame.cc
+++ b/filters/kword/latex/export/textFrame.cpp
diff --git a/filters/kword/latex/export/textformat.cc b/filters/kword/latex/export/textformat.cpp
index 02576354d..02576354d 100644
--- a/filters/kword/latex/export/textformat.cc
+++ b/filters/kword/latex/export/textformat.cpp
diff --git a/filters/kword/latex/export/textzone.cc b/filters/kword/latex/export/textzone.cpp
index 0bf4e436e..0bf4e436e 100644
--- a/filters/kword/latex/export/textzone.cc
+++ b/filters/kword/latex/export/textzone.cpp
diff --git a/filters/kword/latex/export/variableformat.cc b/filters/kword/latex/export/variableformat.cpp
index 5c6f9f40e..5c6f9f40e 100644
--- a/filters/kword/latex/export/variableformat.cc
+++ b/filters/kword/latex/export/variableformat.cpp
diff --git a/filters/kword/latex/export/variablezone.cc b/filters/kword/latex/export/variablezone.cpp
index b73788b3e..b73788b3e 100644
--- a/filters/kword/latex/export/variablezone.cc
+++ b/filters/kword/latex/export/variablezone.cpp
diff --git a/filters/kword/latex/export/xml2latexparser.cc b/filters/kword/latex/export/xml2latexparser.cpp
index 88936c9a1..88936c9a1 100644
--- a/filters/kword/latex/export/xml2latexparser.cc
+++ b/filters/kword/latex/export/xml2latexparser.cpp
diff --git a/filters/kword/latex/export/xmlparser.cc b/filters/kword/latex/export/xmlparser.cpp
index 9d83bedb8..9d83bedb8 100644
--- a/filters/kword/latex/export/xmlparser.cc
+++ b/filters/kword/latex/export/xmlparser.cpp
diff --git a/filters/kword/latex/import/Makefile.am b/filters/kword/latex/import/Makefile.am
index 25c8a12ea..428f8f15d 100644
--- a/filters/kword/latex/import/Makefile.am
+++ b/filters/kword/latex/import/Makefile.am
@@ -10,14 +10,14 @@ libkwordlateximport_la_LIBADD = $(KOFFICE_LIBS) parser/liblatexparser.la generat
 
 kde_module_LTLIBRARIES = libkwordlateximport.la
 
-libkwordlateximport_la_SOURCES = config.cc lateximport.cc \
-																 lateximportdia.cc lateximportdia.skel
+libkwordlateximport_la_SOURCES = config.cpp lateximport.cpp \
+																 lateximportdia.cpp lateximportdia.skel
 
 noinst_HEADERS = config.h lateximport.h lateximportdia.h
 
 ######## Debug
 #check_PROGRAMS = texlauncher
-#texlauncher_SOURCES = texlauncher.cc
+#texlauncher_SOURCES = texlauncher.cpp
 #texlauncher_LDADD = liblatexexport.la
 #texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/import/config.cc b/filters/kword/latex/import/config.cpp
index d4594f700..d4594f700 100644
--- a/filters/kword/latex/import/config.cc
+++ b/filters/kword/latex/import/config.cpp
diff --git a/filters/kword/latex/import/generator/Makefile.am b/filters/kword/latex/import/generator/Makefile.am
index 089014e34..308e11c69 100644
--- a/filters/kword/latex/import/generator/Makefile.am
+++ b/filters/kword/latex/import/generator/Makefile.am
@@ -8,7 +8,7 @@ liblatexgenerator_la_LIBADD  = -lm $(KOFFICE_LIBS)
 
 kde_module_LTLIBRARIES = liblatexgenerator.la
 
-liblatexgenerator_la_SOURCES = body.cc document.cc kwordgenerator.cc latex.cc paragraph.cc
+liblatexgenerator_la_SOURCES = body.cpp document.cpp kwordgenerator.cpp latex.cpp paragraph.cpp
 
 noinst_HEADERS = body.h document.h kwordgenerator.h latex.h paragraph.h
 
diff --git a/filters/kword/latex/import/generator/body.cc b/filters/kword/latex/import/generator/body.cpp
index fcf5e534c..fcf5e534c 100644
--- a/filters/kword/latex/import/generator/body.cc
+++ b/filters/kword/latex/import/generator/body.cpp
diff --git a/filters/kword/latex/import/generator/document.cc b/filters/kword/latex/import/generator/document.cpp
index cb333d41f..cb333d41f 100644
--- a/filters/kword/latex/import/generator/document.cc
+++ b/filters/kword/latex/import/generator/document.cpp
diff --git a/filters/kword/latex/import/generator/kwordgenerator.cc b/filters/kword/latex/import/generator/kwordgenerator.cpp
index 945c3869b..945c3869b 100644
--- a/filters/kword/latex/import/generator/kwordgenerator.cc
+++ b/filters/kword/latex/import/generator/kwordgenerator.cpp
diff --git a/filters/kword/latex/import/generator/latex.cc b/filters/kword/latex/import/generator/latex.cpp
index 22c773d83..22c773d83 100644
--- a/filters/kword/latex/import/generator/latex.cc
+++ b/filters/kword/latex/import/generator/latex.cpp
diff --git a/filters/kword/latex/import/generator/paragraph.cc b/filters/kword/latex/import/generator/paragraph.cpp
index c25ab9946..c25ab9946 100644
--- a/filters/kword/latex/import/generator/paragraph.cc
+++ b/filters/kword/latex/import/generator/paragraph.cpp
diff --git a/filters/kword/latex/import/lateximport.cc b/filters/kword/latex/import/lateximport.cpp
index 5bea13ccb..5bea13ccb 100644
--- a/filters/kword/latex/import/lateximport.cc
+++ b/filters/kword/latex/import/lateximport.cpp
diff --git a/filters/kword/latex/import/lateximportdia.cc b/filters/kword/latex/import/lateximportdia.cpp
index c69b7e901..f0dd908bd 100644
--- a/filters/kword/latex/import/lateximportdia.cc
+++ b/filters/kword/latex/import/lateximportdia.cpp
@@ -19,11 +19,11 @@
 
 /*
    This file is based on the file :
-    koffice/filters/kword/html/htmlexportdia.cc
+    koffice/filters/kword/html/htmlexportdia.cpp
 	Copyright (C) 2001 Nicolas Goutte <goutte@kde.org>
 
    which was based on the old file:
-    /home/kde/koffice/filters/kspread/csv/csvfilterdia.cc
+    /home/kde/koffice/filters/kspread/csv/csvfilterdia.cpp
 
    The old file was copyrighted by
     Copyright (C) 1999 David Faure <faure@kde.org>
diff --git a/filters/kword/latex/import/parser/Makefile.am b/filters/kword/latex/import/parser/Makefile.am
index d397bcd7b..c10e7df4f 100644
--- a/filters/kword/latex/import/parser/Makefile.am
+++ b/filters/kword/latex/import/parser/Makefile.am
@@ -8,22 +8,22 @@ liblatexparser_la_LIBADD  = -lm $(KOFFICE_LIBS)
 
 kde_module_LTLIBRARIES = liblatexparser.la
 
-liblatexparser_la_SOURCES = command.cc comment.cc element.cc env.cc group.cc \
-														latexparser.cc param.cc text.cc texparser.cc \
-														texscaner.cc
+liblatexparser_la_SOURCES = command.cpp comment.cpp element.cpp env.cpp group.cpp \
+														latexparser.cpp param.cpp text.cpp texparser.cpp \
+														texscaner.cpp
 
 noinst_HEADERS = command.h comment.h element.h env.h group.h \
 								 latexparser.h param.h text.h
 
-texparser.cc: $(srcdir)/texparser.l texscaner.cc
-		flex -B -8 -otexparser.cc $(srcdir)/texparser.l
+texparser.cpp: $(srcdir)/texparser.l texscaner.cpp
+		flex -B -8 -otexparser.cpp $(srcdir)/texparser.l
 
-texscaner.cc: $(srcdir)/texscaner.y
-		bison --debug --verbose -d -o texscaner.cc $(srcdir)/texscaner.y && mv -f texscaner.cc.h texscaner.hh
+texscaner.cpp: $(srcdir)/texscaner.y
+		bison --debug --verbose -d -o texscaner.cpp $(srcdir)/texscaner.y && mv -f texscaner.cpp.h texscaner.hh
 # -p texparser
 ######## Debug
 check_PROGRAMS = texlauncher
-texlauncher_SOURCES = texlauncher.cc
+texlauncher_SOURCES = texlauncher.cpp
 texlauncher_LDADD = liblatexexport.la
 texlauncher_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/filters/kword/latex/import/parser/command.cc b/filters/kword/latex/import/parser/command.cpp
index d110c0899..d110c0899 100644
--- a/filters/kword/latex/import/parser/command.cc
+++ b/filters/kword/latex/import/parser/command.cpp
diff --git a/filters/kword/latex/import/parser/comment.cc b/filters/kword/latex/import/parser/comment.cpp
index ba52332e0..ba52332e0 100644
--- a/filters/kword/latex/import/parser/comment.cc
+++ b/filters/kword/latex/import/parser/comment.cpp
diff --git a/filters/kword/latex/import/parser/element.cc b/filters/kword/latex/import/parser/element.cpp
index 40a5ab981..40a5ab981 100644
--- a/filters/kword/latex/import/parser/element.cc
+++ b/filters/kword/latex/import/parser/element.cpp
diff --git a/filters/kword/latex/import/parser/env.cc b/filters/kword/latex/import/parser/env.cpp
index 14abad37a..14abad37a 100644
--- a/filters/kword/latex/import/parser/env.cc
+++ b/filters/kword/latex/import/parser/env.cpp
diff --git a/filters/kword/latex/import/parser/group.cc b/filters/kword/latex/import/parser/group.cpp
index 6654ea73f..6654ea73f 100644
--- a/filters/kword/latex/import/parser/group.cc
+++ b/filters/kword/latex/import/parser/group.cpp
diff --git a/filters/kword/latex/import/parser/latexparser.cc b/filters/kword/latex/import/parser/latexparser.cpp
index a5b3a8228..a5b3a8228 100644
--- a/filters/kword/latex/import/parser/latexparser.cc
+++ b/filters/kword/latex/import/parser/latexparser.cpp
diff --git a/filters/kword/latex/import/parser/main.cc b/filters/kword/latex/import/parser/main.cpp
index bce8e7714..bce8e7714 100644
--- a/filters/kword/latex/import/parser/main.cc
+++ b/filters/kword/latex/import/parser/main.cpp
diff --git a/filters/kword/latex/import/parser/param.cc b/filters/kword/latex/import/parser/param.cpp
index 66bb7fffb..66bb7fffb 100644
--- a/filters/kword/latex/import/parser/param.cc
+++ b/filters/kword/latex/import/parser/param.cpp
diff --git a/filters/kword/latex/import/parser/texparser.l b/filters/kword/latex/import/parser/texparser.l
index c187f29d6..ea78619fe 100644
--- a/filters/kword/latex/import/parser/texparser.l
+++ b/filters/kword/latex/import/parser/texparser.l
@@ -2,8 +2,8 @@
  * Ajouter une pile contenant tout les environnements.
  *
  * To compil :
- * flex -+ -otexparser.cc texparser.lex
- * g++ -o texparser texparser.cc -lfl -lm
+ * flex -+ -otexparser.cpp texparser.lex
+ * g++ -o texparser texparser.cpp -lfl -lm
  *
  */
 
diff --git a/filters/kword/latex/import/parser/texparser.lex b/filters/kword/latex/import/parser/texparser.lex
index eb9b27aac..e945f48dd 100644
--- a/filters/kword/latex/import/parser/texparser.lex
+++ b/filters/kword/latex/import/parser/texparser.lex
@@ -2,8 +2,8 @@
  * Ajouter une pile contenant tout les environnements.
  *
  * To compil :
- * flex -+ -otexparser.cc texparser.lex
- * g++ -o texparser texparser.cc -lfl -lm
+ * flex -+ -otexparser.cpp texparser.lex
+ * g++ -o texparser texparser.cpp -lfl -lm
  *
  */
 
diff --git a/filters/kword/latex/import/parser/text.cc b/filters/kword/latex/import/parser/text.cpp
index 62fd09982..62fd09982 100644
--- a/filters/kword/latex/import/parser/text.cc
+++ b/filters/kword/latex/import/parser/text.cpp
diff --git a/filters/kword/libexport/KWEFBaseWorker.cc b/filters/kword/libexport/KWEFBaseWorker.cpp
index a47f647da..a47f647da 100644
--- a/filters/kword/libexport/KWEFBaseWorker.cc
+++ b/filters/kword/libexport/KWEFBaseWorker.cpp
diff --git a/filters/kword/libexport/KWEFKWordLeader.cc b/filters/kword/libexport/KWEFKWordLeader.cpp
index b0a7913d8..05e4024a5 100644
--- a/filters/kword/libexport/KWEFKWordLeader.cc
+++ b/filters/kword/libexport/KWEFKWordLeader.cpp
@@ -22,7 +22,7 @@
 
 /*
    Part of this code comes from the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/KWEFStructures.cc b/filters/kword/libexport/KWEFStructures.cpp
index 6c9c301f2..6c9c301f2 100644
--- a/filters/kword/libexport/KWEFStructures.cc
+++ b/filters/kword/libexport/KWEFStructures.cpp
diff --git a/filters/kword/libexport/KWEFStructures.h b/filters/kword/libexport/KWEFStructures.h
index 682606feb..2f8ba74ab 100644
--- a/filters/kword/libexport/KWEFStructures.h
+++ b/filters/kword/libexport/KWEFStructures.h
@@ -22,8 +22,8 @@
 
 /*
    The classes in this file are based on a class in the old files:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
-    /home/kde/koffice/filters/kword/docbookexpert/docbookexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
+    /home/kde/koffice/filters/kword/docbookexpert/docbookexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/KWEFUtil.cc b/filters/kword/libexport/KWEFUtil.cpp
index a02a45ece..a02a45ece 100644
--- a/filters/kword/libexport/KWEFUtil.cc
+++ b/filters/kword/libexport/KWEFUtil.cpp
diff --git a/filters/kword/libexport/Makefile.am b/filters/kword/libexport/Makefile.am
index 6e2581749..cef09322c 100644
--- a/filters/kword/libexport/Makefile.am
+++ b/filters/kword/libexport/Makefile.am
@@ -10,8 +10,8 @@ libkwordexportfilters_la_LIBADD = $(KOFFICE_LIBS)
 
 lib_LTLIBRARIES = libkwordexportfilters.la
 
-libkwordexportfilters_la_SOURCES = TagProcessing.cc KWEFStructures.cc\
-ProcessDocument.cc KWEFUtil.cc KWEFKWordLeader.cc KWEFBaseWorker.cc
+libkwordexportfilters_la_SOURCES = TagProcessing.cpp KWEFStructures.cpp\
+ProcessDocument.cpp KWEFUtil.cpp KWEFKWordLeader.cpp KWEFBaseWorker.cpp
 
 noinst_HEADERS = TagProcessing.h KWEFStructures.h\
 ProcessDocument.h KWEFUtil.h KWEFKWordLeader.h KWEFBaseWorker.h
diff --git a/filters/kword/libexport/ProcessDocument.cc b/filters/kword/libexport/ProcessDocument.cpp
index 3a626f7f1..69b14857f 100644
--- a/filters/kword/libexport/ProcessDocument.cc
+++ b/filters/kword/libexport/ProcessDocument.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/TagProcessing.cc b/filters/kword/libexport/TagProcessing.cpp
index b70d58d9b..46a8fb353 100644
--- a/filters/kword/libexport/TagProcessing.cc
+++ b/filters/kword/libexport/TagProcessing.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/libexport/TagProcessing.h b/filters/kword/libexport/TagProcessing.h
index f2bf46652..62176fd36 100644
--- a/filters/kword/libexport/TagProcessing.h
+++ b/filters/kword/libexport/TagProcessing.h
@@ -20,7 +20,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/msword/document.cpp b/filters/kword/msword/document.cpp
index 043c1bc24..2e20b999d 100644
--- a/filters/kword/msword/document.cpp
+++ b/filters/kword/msword/document.cpp
@@ -498,9 +498,9 @@ KoStoreDevice* Document::createPictureFrameSet( const KoSize& size )
 
     // The position doesn't matter as long as the picture is inline
     // FIXME for non-inline pics ####
-    // To determine the size, look at OOo's filter (WW8PicDesc in ww8graf2.cxx, version 1.50, line 406)
+    // To determine the size, look at OOo's filter (WW8PicDesc in ww8graf2.cpp, version 1.50, line 406)
     // Hint: #i17200#, a bit of guesswork I'm afraid
-    //        if (aPic.dxaGoal == 1000 && aPic.mx == 1)  //100% hack ? (from ww8graf2.cxx)
+    //        if (aPic.dxaGoal == 1000 && aPic.mx == 1)  //100% hack ? (from ww8graf2.cpp)
     createInitialFrame( framesetElement, 0, size.width(), 0, size.height(), false, NoFollowup );
 
     TQDomElement pictureElem = m_mainDocument.createElement("PICTURE");
diff --git a/filters/kword/msword/texthandler.cpp b/filters/kword/msword/texthandler.cpp
index 775f8bce8..d25408693 100644
--- a/filters/kword/msword/texthandler.cpp
+++ b/filters/kword/msword/texthandler.cpp
@@ -659,7 +659,7 @@ void KWordTextHandler::writeLayout( TQDomElement& parentElement, const wvWare::P
             // which kword doesn't support. We map it to 0 with a clever '%4' :)
             tabElement.setAttribute( "type", td.tbd.jc % 4 );
             int filling = 0;
-            double width = 0.5; // default kword value, see koparaglayout.cc
+            double width = 0.5; // default kword value, see koparaglayout.cpp
             switch ( td.tbd.tlc ) {
             case 1: // dots
             case 2: // hyphenated
diff --git a/filters/kword/mswrite/ImportDialog.cc b/filters/kword/mswrite/ImportDialog.cpp
index cb9834913..cb9834913 100644
--- a/filters/kword/mswrite/ImportDialog.cc
+++ b/filters/kword/mswrite/ImportDialog.cpp
diff --git a/filters/kword/mswrite/Makefile.am b/filters/kword/mswrite/Makefile.am
index c1318f7a6..dc0f110fe 100644
--- a/filters/kword/mswrite/Makefile.am
+++ b/filters/kword/mswrite/Makefile.am
@@ -6,13 +6,13 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(srcdir)/../libexport $(all_include
 
 kde_module_LTLIBRARIES = libmswriteimport.la libmswriteexport.la
 
-libmswriteimport_la_SOURCES = mswriteimport.cc \
-								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cc
+libmswriteimport_la_SOURCES = mswriteimport.cpp \
+								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp ImportDialogUI.ui ImportDialog.cpp
 
 libmswriteimport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteimport_la_LIBADD = $(KOFFICE_LIBS)
 
-libmswriteexport_la_SOURCES = mswriteexport.cc	\
+libmswriteexport_la_SOURCES = mswriteexport.cpp	\
 								libmswrite_defs.cpp structures_generated.cpp structures_private.cpp structures.cpp libmswrite.cpp
 libmswriteexport_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libmswriteexport_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KOWMF) ../libexport/libkwordexportfilters.la
diff --git a/filters/kword/mswrite/mswriteexport.cc b/filters/kword/mswrite/mswriteexport.cpp
index abf007f88..abf007f88 100644
--- a/filters/kword/mswrite/mswriteexport.cc
+++ b/filters/kword/mswrite/mswriteexport.cpp
diff --git a/filters/kword/mswrite/mswriteimport.cc b/filters/kword/mswrite/mswriteimport.cpp
index 7fd3b63e3..7fd3b63e3 100644
--- a/filters/kword/mswrite/mswriteimport.cc
+++ b/filters/kword/mswrite/mswriteimport.cpp
diff --git a/filters/kword/mswrite/status.html b/filters/kword/mswrite/status.html
index 5a8bddd15..9d70e7b21 100644
--- a/filters/kword/mswrite/status.html
+++ b/filters/kword/mswrite/status.html
@@ -99,7 +99,7 @@
 
 		<br>
 	  	<b> Version 0.3-1: KOffice 1.2 Beta1 </b> <br>
-		- fixed mswritelib.cc crash on files with an unusual font table <br>
+		- fixed mswritelib.cpp crash on files with an unusual font table <br>
 		- emulates image position from left margin by using paragraph indents <br>
 		- WMFs now render correctly in KWord (thanks to Lorthiois Thierry); note that only TQWMF code was changed <br>
 		- gcc 2.95.3 internal error workaround <br>
diff --git a/filters/kword/oowriter/ExportFilter.cc b/filters/kword/oowriter/ExportFilter.cpp
index 216ace492..0894d0443 100644
--- a/filters/kword/oowriter/ExportFilter.cc
+++ b/filters/kword/oowriter/ExportFilter.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/ExportFilter.h b/filters/kword/oowriter/ExportFilter.h
index c89e15acb..d4fa9db2e 100644
--- a/filters/kword/oowriter/ExportFilter.h
+++ b/filters/kword/oowriter/ExportFilter.h
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/Makefile.am b/filters/kword/oowriter/Makefile.am
index 63b37bbfc..775b2beb6 100644
--- a/filters/kword/oowriter/Makefile.am
+++ b/filters/kword/oowriter/Makefile.am
@@ -7,13 +7,13 @@ $(KOFFICE_INCLUDES) $(all_includes)
 kde_module_LTLIBRARIES = liboowriterimport.la liboowriterexport.la
 
 noinst_LTLIBRARIES = libcommon.la
-libcommon_la_SOURCES = conversion.cc
+libcommon_la_SOURCES = conversion.cpp
 
-liboowriterimport_la_SOURCES = oowriterimport.cc
+liboowriterimport_la_SOURCES = oowriterimport.cpp
 liboowriterimport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 liboowriterimport_la_LIBADD  = ../../liboofilter/liboofilter.la libcommon.la $(KOFFICE_LIBS)
 
-liboowriterexport_la_SOURCES = oowriterexport.cc ExportFilter.cc
+liboowriterexport_la_SOURCES = oowriterexport.cpp ExportFilter.cpp
 liboowriterexport_la_LDFLAGS = $(all_libraries) -module -avoid-version -no-undefined
 liboowriterexport_la_LIBADD  = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la libcommon.la
 
diff --git a/filters/kword/oowriter/conversion.cc b/filters/kword/oowriter/conversion.cpp
index 259d97b5b..259d97b5b 100644
--- a/filters/kword/oowriter/conversion.cc
+++ b/filters/kword/oowriter/conversion.cpp
diff --git a/filters/kword/oowriter/oowriterexport.cc b/filters/kword/oowriter/oowriterexport.cpp
index aba0ee9fd..5c974084e 100644
--- a/filters/kword/oowriter/oowriterexport.cc
+++ b/filters/kword/oowriter/oowriterexport.cpp
@@ -19,7 +19,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/oowriter/oowriterimport.cc b/filters/kword/oowriter/oowriterimport.cpp
index 5e54ce06f..5e54ce06f 100644
--- a/filters/kword/oowriter/oowriterimport.cc
+++ b/filters/kword/oowriter/oowriterimport.cpp
diff --git a/filters/kword/palmdoc/Makefile.am b/filters/kword/palmdoc/Makefile.am
index 1e0e7d9ec..6f1b64e47 100644
--- a/filters/kword/palmdoc/Makefile.am
+++ b/filters/kword/palmdoc/Makefile.am
@@ -10,8 +10,8 @@ libpalmdocexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.
 
 kde_module_LTLIBRARIES = libpalmdocimport.la libpalmdocexport.la
 
-libpalmdocimport_la_SOURCES = palmdocimport.cc palmdb.cpp palmdoc.cpp
-libpalmdocexport_la_SOURCES = palmdocexport.cc palmdb.cpp palmdoc.cpp
+libpalmdocimport_la_SOURCES = palmdocimport.cpp palmdb.cpp palmdoc.cpp
+libpalmdocexport_la_SOURCES = palmdocexport.cpp palmdb.cpp palmdoc.cpp
 
 noinst_HEADERS = palmdocimport.h palmdb.h palmdoc.h
 
diff --git a/filters/kword/palmdoc/palmdocexport.cc b/filters/kword/palmdoc/palmdocexport.cpp
index 37f8d9cf2..37f8d9cf2 100644
--- a/filters/kword/palmdoc/palmdocexport.cc
+++ b/filters/kword/palmdoc/palmdocexport.cpp
diff --git a/filters/kword/palmdoc/palmdocimport.cc b/filters/kword/palmdoc/palmdocimport.cpp
index a1e8107bc..a1e8107bc 100644
--- a/filters/kword/palmdoc/palmdocimport.cc
+++ b/filters/kword/palmdoc/palmdocimport.cpp
diff --git a/filters/kword/pdf/diffs/goo_enable-final.diff b/filters/kword/pdf/diffs/goo_enable-final.diff
index b3d137ad7..7993ce58e 100644
--- a/filters/kword/pdf/diffs/goo_enable-final.diff
+++ b/filters/kword/pdf/diffs/goo_enable-final.diff
@@ -1,11 +1,11 @@
-Index: GHash.cc
+Index: GHash.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v
 retrieving revision 1.2
 retrieving revision 1.3
 diff -u -p -r1.2 -r1.3
---- GHash.cc	13 Jan 2003 14:51:16 -0000	1.2
-+++ GHash.cc	10 Oct 2004 21:37:09 -0000	1.3
+--- GHash.cpp	13 Jan 2003 14:51:16 -0000	1.2
++++ GHash.cpp	10 Oct 2004 21:37:09 -0000	1.3
 @@ -8,9 +8,6 @@
  
  #include <aconf.h>
@@ -34,14 +34,14 @@ diff -u -p -r1.2 -r1.3
  
  #include "gtypes.h"
  
-Index: GList.cc
+Index: GList.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v
 retrieving revision 1.1
 retrieving revision 1.2
 diff -u -p -r1.1 -r1.2
---- GList.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ GList.cc	10 Oct 2004 21:37:09 -0000	1.2
+--- GList.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ GList.cpp	10 Oct 2004 21:37:09 -0000	1.2
 @@ -8,9 +8,6 @@
  
  #include <aconf.h>
@@ -70,14 +70,14 @@ diff -u -p -r1.1 -r1.2
  
  #include "gtypes.h"
  
-Index: GString.cc
+Index: GString.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v
 retrieving revision 1.1
 retrieving revision 1.2
 diff -u -p -r1.1 -r1.2
---- GString.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ GString.cc	10 Oct 2004 21:37:09 -0000	1.2
+--- GString.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ GString.cpp	10 Oct 2004 21:37:09 -0000	1.2
 @@ -10,9 +10,6 @@
  
  #include <aconf.h>
diff --git a/filters/kword/pdf/diffs/goo_gfile.diff b/filters/kword/pdf/diffs/goo_gfile.diff
index 6aac2487c..2e9cdd537 100644
--- a/filters/kword/pdf/diffs/goo_gfile.diff
+++ b/filters/kword/pdf/diffs/goo_gfile.diff
@@ -1,6 +1,6 @@
-diff -u /home/azhyd/xpdf-2.00/goo/gfile.cc goo/gfile.cc
---- /home/azhyd/xpdf-2.00/goo/gfile.cc	Sun Nov  3 23:15:36 2002
-+++ goo/gfile.cc	Wed Nov 20 06:43:32 2002
+diff -u /home/azhyd/xpdf-2.00/goo/gfile.cpp goo/gfile.cpp
+--- /home/azhyd/xpdf-2.00/goo/gfile.cpp	Sun Nov  3 23:15:36 2002
++++ goo/gfile.cpp	Wed Nov 20 06:43:32 2002
 @@ -443,7 +443,7 @@
  #endif
  }
diff --git a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
index ec981364b..693ecb556 100644
--- a/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
+++ b/filters/kword/pdf/diffs/xpdf_TextOutputDev.diff
@@ -1,6 +1,6 @@
-diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc
---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc	Thu Nov 14 04:41:00 2002
-+++ xpdf/TextOutputDev.cc	Sat Nov 23 21:01:14 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp	Thu Nov 14 04:41:00 2002
++++ xpdf/TextOutputDev.cpp	Sat Nov 23 21:01:14 2002
 @@ -46,26 +46,6 @@
  // TextBlock
  //------------------------------------------------------------------------
diff --git a/filters/kword/pdf/diffs/xpdf_includes.diff b/filters/kword/pdf/diffs/xpdf_includes.diff
index 33fbea601..c9eeb465d 100644
--- a/filters/kword/pdf/diffs/xpdf_includes.diff
+++ b/filters/kword/pdf/diffs/xpdf_includes.diff
@@ -10,9 +10,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Error.h xpdf/Error.h
  
  extern void CDECL error(int pos, char *msg, ...);
  
-diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc
---- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc	Sun Nov  3 23:15:36 2002
-+++ xpdf/PDFDoc.cc	Wed Nov 20 07:30:55 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp xpdf/PDFDoc.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cpp	Sun Nov  3 23:15:36 2002
++++ xpdf/PDFDoc.cpp	Wed Nov 20 07:30:55 2002
 @@ -17,7 +17,7 @@
  #include <stddef.h>
  #include <string.h>
@@ -22,9 +22,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/PDFDoc.cc xpdf/PDFDoc.cc
  #include "GlobalParams.h"
  #include "Page.h"
  #include "Catalog.h"
-diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc
---- /home/azhyd/xpdf-2.00/xpdf/Stream.cc	Sun Nov  3 23:15:37 2002
-+++ xpdf/Stream.cc	Wed Nov 20 07:31:33 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cpp xpdf/Stream.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/Stream.cpp	Sun Nov  3 23:15:37 2002
++++ xpdf/Stream.cpp	Wed Nov 20 07:31:33 2002
 @@ -22,7 +22,7 @@
  #include <ctype.h>
  #include "gmem.h"
@@ -34,9 +34,9 @@ diff -u /home/azhyd/xpdf-2.00/xpdf/Stream.cc xpdf/Stream.cc
  #include "Error.h"
  #include "Object.h"
  #ifndef NO_DECRYPTION
-diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc xpdf/TextOutputDev.cc
---- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cc	Thu Nov 14 04:41:00 2002
-+++ xpdf/TextOutputDev.cc	Wed Nov 20 07:31:41 2002
+diff -u /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp xpdf/TextOutputDev.cpp
+--- /home/azhyd/xpdf-2.00/xpdf/TextOutputDev.cpp	Thu Nov 14 04:41:00 2002
++++ xpdf/TextOutputDev.cpp	Wed Nov 20 07:31:41 2002
 @@ -19,7 +19,7 @@
  #include <ctype.h>
  #include "GString.h"
diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
index 1b3872083..d5261ba68 100644
--- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
+++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow.diff
@@ -1,10 +1,10 @@
-Index: Catalog.cc
+Index: Catalog.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Catalog.cpp,v
 retrieving revision 1.1
-diff -u -p -r1.1 Catalog.cc
---- Catalog.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ Catalog.cc	30 Oct 2004 16:34:49 -0000
+diff -u -p -r1.1 Catalog.cpp
+--- Catalog.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ Catalog.cpp	30 Oct 2004 16:34:49 -0000
 @@ -12,6 +12,7 @@
  #pragma implementation
  #endif
@@ -38,13 +38,13 @@ diff -u -p -r1.1 Catalog.cc
  	pages = (Page **)grealloc(pages, pagesSize * sizeof(Page *));
  	pageRefs = (Ref *)grealloc(pageRefs, pagesSize * sizeof(Ref));
  	for (j = pagesSize - 32; j < pagesSize; ++j) {
-Index: XRef.cc
+Index: XRef.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/XRef.cpp,v
 retrieving revision 1.1
-diff -u -p -r1.1 XRef.cc
---- XRef.cc	23 Nov 2002 14:15:14 -0000	1.1
-+++ XRef.cc	30 Oct 2004 16:34:53 -0000
+diff -u -p -r1.1 XRef.cpp
+--- XRef.cpp	23 Nov 2002 14:15:14 -0000	1.1
++++ XRef.cpp	30 Oct 2004 16:34:53 -0000
 @@ -12,6 +12,7 @@
  #pragma implementation
  #endif
diff --git a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
index e64646128..38bb723ec 100644
--- a/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
+++ b/filters/kword/pdf/diffs/xpdf_security_integer_overflow_2.diff
@@ -1,11 +1,11 @@
-Index: goo/GHash.cc
+Index: goo/GHash.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GHash.cpp,v
 retrieving revision 1.3
 retrieving revision 1.2.2.1
 diff -u -p -r1.3 -r1.2.2.1
---- goo/GHash.cc	10 Oct 2004 21:37:09 -0000	1.3
-+++ goo/GHash.cc	21 Oct 2004 20:32:51 -0000	1.2.2.1
+--- goo/GHash.cpp	10 Oct 2004 21:37:09 -0000	1.3
++++ goo/GHash.cpp	21 Oct 2004 20:32:51 -0000	1.2.2.1
 @@ -8,7 +8,6 @@
  
  #include <aconf.h>
@@ -30,14 +30,14 @@ diff -u -p -r1.3 -r1.2.2.1
  #include "gtypes.h"
  
  class GString;
-Index: goo/GList.cc
+Index: goo/GList.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GList.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.2.1
 diff -u -p -r1.2 -r1.1.2.1
---- goo/GList.cc	10 Oct 2004 21:37:09 -0000	1.2
-+++ goo/GList.cc	21 Oct 2004 20:32:51 -0000	1.1.2.1
+--- goo/GList.cpp	10 Oct 2004 21:37:09 -0000	1.2
++++ goo/GList.cpp	21 Oct 2004 20:32:51 -0000	1.1.2.1
 @@ -8,7 +8,6 @@
  
  #include <aconf.h>
@@ -62,14 +62,14 @@ diff -u -p -r1.2 -r1.1.2.1
  #include "gtypes.h"
  
  //------------------------------------------------------------------------
-Index: goo/GString.cc
+Index: goo/GString.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/goo/GString.cpp,v
 retrieving revision 1.2
 retrieving revision 1.1.2.1
 diff -u -p -r1.2 -r1.1.2.1
---- goo/GString.cc	10 Oct 2004 21:37:09 -0000	1.2
-+++ goo/GString.cc	21 Oct 2004 20:32:51 -0000	1.1.2.1
+--- goo/GString.cpp	10 Oct 2004 21:37:09 -0000	1.2
++++ goo/GString.cpp	21 Oct 2004 20:32:51 -0000	1.1.2.1
 @@ -10,7 +10,6 @@
  
  #include <aconf.h>
@@ -94,14 +94,14 @@ diff -u -p -r1.3 -r1.2.2.1
  #include <string.h>
  
  class GString {
-Index: xpdf/Gfx.cc
+Index: xpdf/Gfx.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/Gfx.cpp,v
 retrieving revision 1.3
 retrieving revision 1.3.2.1
 diff -u -p -r1.3 -r1.3.2.1
---- xpdf/Gfx.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ xpdf/Gfx.cc	22 Dec 2004 12:07:12 -0000	1.3.2.1
+--- xpdf/Gfx.cpp	25 Jan 2003 23:17:44 -0000	1.3
++++ xpdf/Gfx.cpp	22 Dec 2004 12:07:12 -0000	1.3.2.1
 @@ -2379,7 +2379,9 @@ void Gfx::doImage(Object *ref, Stream *s
      haveMask = gFalse;
      dict->lookup("Mask", &maskObj);
@@ -113,14 +113,14 @@ diff -u -p -r1.3 -r1.3.2.1
  	maskObj.arrayGet(i, &obj1);
  	maskColors[i] = obj1.getInt();
  	obj1.free();
-Index: xpdf/GfxState.cc
+Index: xpdf/GfxState.cpp
 ===================================================================
-RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cc,v
+RCS file: /home/kde/koffice/filters/kword/pdf/xpdf/xpdf/GfxState.cpp,v
 retrieving revision 1.3
 retrieving revision 1.3.2.2
 diff -u -p -r1.3 -r1.3.2.2
---- xpdf/GfxState.cc	25 Jan 2003 23:17:44 -0000	1.3
-+++ xpdf/GfxState.cc	22 Dec 2004 13:50:53 -0000	1.3.2.2
+--- xpdf/GfxState.cpp	25 Jan 2003 23:17:44 -0000	1.3
++++ xpdf/GfxState.cpp	22 Dec 2004 13:50:53 -0000	1.3.2.2
 @@ -682,6 +682,11 @@ GfxColorSpace *GfxICCBasedColorSpace::pa
    }
    nCompsA = obj2.getInt();
diff --git a/filters/kword/pdf/xpdf/CHANGES b/filters/kword/pdf/xpdf/CHANGES
index 7a09620d2..6cf5c8ef1 100644
--- a/filters/kword/pdf/xpdf/CHANGES
+++ b/filters/kword/pdf/xpdf/CHANGES
@@ -44,7 +44,7 @@ Changed several things to ease porting:
   - changed '__inline' to 'inline' (to adhere to the ANSI standard)
   - surrounded interface/implementation pragmas with #ifdef _GNUC__
   - got rid of empty array initializer lists
-  - moved Operator type definition from Gfx.cc to Gfx.h
+  - moved Operator type definition from Gfx.cpp to Gfx.h
   - renamed String, uint, etc.
   - ability to uncompress to file (NO_POPEN and USE_GZIP flags)
   - added definitions of XK_Page_Up/Down and XPointer for old versions
@@ -75,7 +75,7 @@ Fixed PostScript output:
   - if page is larger than paper size, scale it down.
 Set default MediaBox to 8.5" x 11" to deal with non-compliant PDF
   files which don't specify a MediaBox.
-Added DEBUG_MEM stuff in gmem.c and gmempp.cc.
+Added DEBUG_MEM stuff in gmem.c and gmempp.cpp.
 Fixed memory leaks:
   - LTKWindow didn't delete the LTKBox.
   - LinkAction needs a virtual destructor.
@@ -149,7 +149,7 @@ Added file name to window title.
 Implemented RunLength filter.
 Implemented forms.
 Convert ObjType to an enum.
-Changed isDict("Pages") to isDict() (in Catalog.cc) to deal with
+Changed isDict("Pages") to isDict() (in Catalog.cpp) to deal with
   incorrect PDF files.
 Changed color selection so that very pale colors don't map to white.
 Fixed bug in CCITTFax filter (multiple make-up codes).
@@ -292,10 +292,10 @@ ASCII85Stream, ASCIIHexStream, and DCTStream didn't check for EOF and
   could run past the end of the stream in damaged files.
 Handle hex escapes (#xx) in names.  Still allow the name /# for
   backward-compatibility.
-Check for NULL characters in encoding array in GfxFont.cc (was calling
+Check for NULL characters in encoding array in GfxFont.cpp (was calling
   strcmp() with NULL which crashed under Solaris).
 PageAttrs::PageAttrs() didn't initialize crop box boundaries.
-Changed uses of lookup() to lookupNF() in XRef.cc.
+Changed uses of lookup() to lookupNF() in XRef.cpp.
 Fixed type checking of operators which take a variable number of
   args.
 Gfx::buildImageStream() doesn't need to check for parser (since I got
@@ -311,7 +311,7 @@ Throw away zero-length strings in TextOutputDev -- they don't have
   valid xMin/xMax values.
 Swapped order of XLIBS and XPMLIB in xpdf/Makefile.
 Deleted 'LTKApp::' in function declaration in LTKApp.h.
-Changed '(XKeyEvent *)&event' to '&event.xkey' in LTKApp.cc.
+Changed '(XKeyEvent *)&event' to '&event.xkey' in LTKApp.cpp.
 Check that the link rectangle coordinates are in the correct order,
   and swap if necessary.
 TextOutputDev didn't set text to NULL, which caused pdftotext to
@@ -346,7 +346,7 @@ Rewrote XRef::readXRef() to avoid using a parser to read the xref
   entries.
 Added NO_TEXT_SELECT option.
 Ignore APPn/COM/etc. markers in DCT streams.
-Replaced select() with XMultiplexInput() in LTKApp.cc for VMS.
+Replaced select() with XMultiplexInput() in LTKApp.cpp for VMS.
 Handle WM_DELETE_WINDOW protocol -- if you ask the window manager to
   delete the xpdf window, xpdf will exit cleanly; other
   windows/dialogs are simply closed.
@@ -359,7 +359,7 @@ Added "normal" SETWIDTH parameter to all font descriptors in
 Added FOPEN_READ_BIN and FOPEN_WRITE_BIN to support Win32.
 Added a hack which allows better font substitution for some Type 3
   fonts.  Also allow character names of the form /nn and /nnn.
-Added <strings.h> and <bstring.h> to LTKApp.cc (needed by AIX and IRIX
+Added <strings.h> and <bstring.h> to LTKApp.cpp (needed by AIX and IRIX
   for bzero() declaration for FD_ZERO).
 
 0.80 (98-nov-27)
@@ -404,7 +404,7 @@ Changes to configure script and Makefiles:
   - Get rid of AC_C_INLINE -- this is meant for C, not C++.
   - Changed -USE_GZIP to -DUSE_GZIP.
   - Added ability to compile ouside of the source tree.
-  - Added .cc.o rule to {goo,ltk,xpdf}/Makefile.in.
+  - Added .cpp.o rule to {goo,ltk,xpdf}/Makefile.in.
   - Added @LIBS@ to XLIBS in xpdf/Makefile.in.
   - In top-level Makefile.in: added '-' to clean commands; added
     distclean rule.
@@ -529,7 +529,7 @@ Do a better job with anti-aliased Type 1 fonts on non-white
 Handle Lab color spaces.
 Handle non-null user passwords.
 Avoid security hole with tmpnam()/fopen() -- added openTempFile() in
-  goo/gfile.cc.  [Thanks to Joseph S. Myers for pointing this out.]
+  goo/gfile.cpp.  [Thanks to Joseph S. Myers for pointing this out.]
 Filter out quote marks (' and ") in URLs before running urlCommand to
   avoid a potential security hole.  [Thanks to Frank Doepper for
   pointing this out.]
@@ -582,7 +582,7 @@ Fixed a memory (malloc size) bug in CCITTFaxStream.
 Fixed two bugs in FontEncoding::hash() -- handle zero-length character
   names (which were found in a (buggy?) PDF file), and handle
   character names with high-bit-set characters (use unsigned ints).
-Added PDFDoc::isLinearized() and corresponding code in pdfinfo.cc.
+Added PDFDoc::isLinearized() and corresponding code in pdfinfo.cpp.
 Handle files with an incorrect page count in the Pages dictionary
   (FOP, from the Apache project produces a page count of 0).
 Handle TrueType equivalents to the Base14 fonts (Arial, TimesNewRoman,
@@ -602,7 +602,7 @@ Configure script switches to C++ for the strings.h/bstring.h test.
 Gfx::opRestore() calls clearPath() to handle (apparently) buggy PDF
   files produced by FreeHand.
 The /Type field in most dictionaries is optional (PDF 1.3 change).
-Move printCommands variable definition into Gfx.cc.
+Move printCommands variable definition into Gfx.cpp.
 If page is smaller than paper, center the PostScript output.
 Fix a minor bug in the SELECT_TAKES_INT detection in the configure
   script.
@@ -661,7 +661,7 @@ Rearranged the GfxResources class.
 Clean up white space handling in Lexer.
 Make the dpi parameter to PDFDoc::displayPage etc. a double - this
   avoids margin gaps with fit-page and fit-width.
-Fix a rounding problem in xpdf.cc that was causing the window to
+Fix a rounding problem in xpdf.cpp that was causing the window to
   sometimes be one pixel too small.
 Fixed a minor bug in dealing with Base-14 TrueType font names.
 Fixed Lab -> RGB color space conversion.
@@ -998,7 +998,7 @@ Added psASCIIHex parameter.
 Added the GBK Unicode map to the simplified Chinese language pack.
 Pdftotext now opens the text file in binary mode to avoid Microsoft's
   annoying automatic end-of-line translation stuff.
-Added an executeCommand function in goo/gfile.cc.  [Thanks to Mikhail
+Added an executeCommand function in goo/gfile.cpp.  [Thanks to Mikhail
   Kruk.]
 The %ALDImagePosition OPI comment was wrong if the page was scaled to
   a different paper size.
diff --git a/filters/kword/pdf/xpdf/goo/GHash.cc b/filters/kword/pdf/xpdf/goo/GHash.cpp
index d336f88e3..94b327766 100644
--- a/filters/kword/pdf/xpdf/goo/GHash.cc
+++ b/filters/kword/pdf/xpdf/goo/GHash.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GHash.cc
+// GHash.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/goo/GList.cc b/filters/kword/pdf/xpdf/goo/GList.cpp
index 3754cc713..5d2a76467 100644
--- a/filters/kword/pdf/xpdf/goo/GList.cc
+++ b/filters/kword/pdf/xpdf/goo/GList.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GList.cc
+// GList.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/goo/GString.cc b/filters/kword/pdf/xpdf/goo/GString.cpp
index 6a556fab8..ef792adba 100644
--- a/filters/kword/pdf/xpdf/goo/GString.cc
+++ b/filters/kword/pdf/xpdf/goo/GString.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GString.cc
+// GString.cpp
 //
 // Simple variable-length string type.
 //
diff --git a/filters/kword/pdf/xpdf/goo/Makefile.am b/filters/kword/pdf/xpdf/goo/Makefile.am
index 186aa0db3..3a5700d7b 100644
--- a/filters/kword/pdf/xpdf/goo/Makefile.am
+++ b/filters/kword/pdf/xpdf/goo/Makefile.am
@@ -3,5 +3,5 @@ INCLUDES= -I$(srcdir)
 
 noinst_LTLIBRARIES = libgoo.la
 
-libgoo_la_SOURCES = GHash.cc GList.cc GString.cc gmempp.cc gfile.cc \
+libgoo_la_SOURCES = GHash.cpp GList.cpp GString.cpp gmempp.cpp gfile.cpp \
                     gmem.c parseargs.c
diff --git a/filters/kword/pdf/xpdf/goo/gfile.cc b/filters/kword/pdf/xpdf/goo/gfile.cpp
index 55fb2f837..7fb7aaefb 100644
--- a/filters/kword/pdf/xpdf/goo/gfile.cc
+++ b/filters/kword/pdf/xpdf/goo/gfile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gfile.cc
+// gfile.cpp
 //
 // Miscellaneous file and directory name manipulation.
 //
diff --git a/filters/kword/pdf/xpdf/goo/gmempp.cc b/filters/kword/pdf/xpdf/goo/gmempp.cpp
index ed94f7a1d..6339f2e8f 100644
--- a/filters/kword/pdf/xpdf/goo/gmempp.cc
+++ b/filters/kword/pdf/xpdf/goo/gmempp.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// gmempp.cc
+// gmempp.cpp
 //
 // Use gmalloc/gfree for C++ new/delete operators.
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Annot.cc b/filters/kword/pdf/xpdf/xpdf/Annot.cpp
index 8ebf6a0c0..c3a161190 100644
--- a/filters/kword/pdf/xpdf/xpdf/Annot.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Annot.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Annot.cc
+// Annot.cpp
 //
 // Copyright 2000-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Array.cc b/filters/kword/pdf/xpdf/xpdf/Array.cpp
index 9c6cb3415..758dbfd0b 100644
--- a/filters/kword/pdf/xpdf/xpdf/Array.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Array.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Array.cc
+// Array.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cc b/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cpp
index 72b845792..3f1effb5e 100644
--- a/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFont.cc
+// BuiltinFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cc b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
index e2acfef8a..3120d0852 100644
--- a/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cc
+++ b/filters/kword/pdf/xpdf/xpdf/BuiltinFontTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// BuiltinFontTables.cc
+// BuiltinFontTables.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/CMap.cc b/filters/kword/pdf/xpdf/xpdf/CMap.cpp
index b00021835..09a7bfe43 100644
--- a/filters/kword/pdf/xpdf/xpdf/CMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CMap.cc
+// CMap.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Catalog.cc b/filters/kword/pdf/xpdf/xpdf/Catalog.cpp
index 8f7e6b04e..583666b22 100644
--- a/filters/kword/pdf/xpdf/xpdf/Catalog.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Catalog.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Catalog.cc
+// Catalog.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cc b/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cpp
index f61d4007d..1a01b37d6 100644
--- a/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cc
+++ b/filters/kword/pdf/xpdf/xpdf/CharCodeToUnicode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// CharCodeToUnicode.cc
+// CharCodeToUnicode.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Decrypt.cc b/filters/kword/pdf/xpdf/xpdf/Decrypt.cpp
index 920cd63f4..11767f752 100644
--- a/filters/kword/pdf/xpdf/xpdf/Decrypt.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Decrypt.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Decrypt.cc
+// Decrypt.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Dict.cc b/filters/kword/pdf/xpdf/xpdf/Dict.cpp
index 351c23a02..70592a61b 100644
--- a/filters/kword/pdf/xpdf/xpdf/Dict.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Dict.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Dict.cc
+// Dict.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Error.cc b/filters/kword/pdf/xpdf/xpdf/Error.cpp
index c1985ca85..e7312a006 100644
--- a/filters/kword/pdf/xpdf/xpdf/Error.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Error.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Error.cc
+// Error.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FTFont.cc b/filters/kword/pdf/xpdf/xpdf/FTFont.cpp
index 8de09e0e6..f993ca05e 100644
--- a/filters/kword/pdf/xpdf/xpdf/FTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FTFont.cc
+// FTFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cc b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
index db4f9dd8b..83774bf87 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontEncodingTables.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontEncodingTables.cc
+// FontEncodingTables.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/FontFile.cc b/filters/kword/pdf/xpdf/xpdf/FontFile.cpp
index ccb880bfb..8a6597b08 100644
--- a/filters/kword/pdf/xpdf/xpdf/FontFile.cc
+++ b/filters/kword/pdf/xpdf/xpdf/FontFile.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// FontFile.cc
+// FontFile.cpp
 //
 // Copyright 1999-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Function.cc b/filters/kword/pdf/xpdf/xpdf/Function.cpp
index e72d3d288..84e27d197 100644
--- a/filters/kword/pdf/xpdf/xpdf/Function.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Function.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Function.cc
+// Function.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Gfx.cc b/filters/kword/pdf/xpdf/xpdf/Gfx.cpp
index 7948d78ae..cb6b47831 100644
--- a/filters/kword/pdf/xpdf/xpdf/Gfx.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Gfx.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Gfx.cc
+// Gfx.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc b/filters/kword/pdf/xpdf/xpdf/GfxFont.cpp
index 1ed211743..53708b492 100644
--- a/filters/kword/pdf/xpdf/xpdf/GfxFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GfxFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxFont.cc
+// GfxFont.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GfxState.cc b/filters/kword/pdf/xpdf/xpdf/GfxState.cpp
index 5101f773d..866e692f1 100644
--- a/filters/kword/pdf/xpdf/xpdf/GfxState.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GfxState.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GfxState.cc
+// GfxState.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cpp
index 8a7b36de8..be2569d34 100644
--- a/filters/kword/pdf/xpdf/xpdf/GlobalParams.cc
+++ b/filters/kword/pdf/xpdf/xpdf/GlobalParams.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// GlobalParams.cc
+// GlobalParams.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cpp
index 1a6d87e1f..9c1628437 100644
--- a/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/ImageOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// ImageOutputDev.cc
+// ImageOutputDev.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cpp
index 6312cacae..fefab4a7e 100644
--- a/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/JBIG2Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// JBIG2Stream.cc
+// JBIG2Stream.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Lexer.cc b/filters/kword/pdf/xpdf/xpdf/Lexer.cpp
index 982295ee3..2d588814c 100644
--- a/filters/kword/pdf/xpdf/xpdf/Lexer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Lexer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Lexer.cc
+// Lexer.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Link.cc b/filters/kword/pdf/xpdf/xpdf/Link.cpp
index 345e7296a..45805d20d 100644
--- a/filters/kword/pdf/xpdf/xpdf/Link.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Link.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Link.cc
+// Link.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Makefile.am b/filters/kword/pdf/xpdf/xpdf/Makefile.am
index 2ad61b24f..001e9ea00 100644
--- a/filters/kword/pdf/xpdf/xpdf/Makefile.am
+++ b/filters/kword/pdf/xpdf/xpdf/Makefile.am
@@ -4,11 +4,11 @@ INCLUDES= -I$(srcdir) -I$(srcdir)/../goo $(all_includes)
 
 noinst_LTLIBRARIES = libxpdf.la
 
-libxpdf_la_SOURCES = Array.cc BuiltinFont.cc BuiltinFontTables.cc Catalog.cc \
-	CharCodeToUnicode.cc CMap.cc Decrypt.cc Dict.cc Error.cc \
-	FontEncodingTables.cc FontFile.cc Function.cc Gfx.cc \
-	GfxFont.cc GfxState.cc GlobalParams.cc Lexer.cc Link.cc \
-	NameToCharCode.cc Object.cc OutputDev.cc Page.cc Parser.cc PDFDoc.cc \
-	PSTokenizer.cc Stream.cc UnicodeMap.cc XRef.cc Annot.cc \
-    Outline.cc JBIG2Stream.cc PDFDocEncoding.cc \
-    TextOutputDev.cc
+libxpdf_la_SOURCES = Array.cpp BuiltinFont.cpp BuiltinFontTables.cpp Catalog.cpp \
+	CharCodeToUnicode.cpp CMap.cpp Decrypt.cpp Dict.cpp Error.cpp \
+	FontEncodingTables.cpp FontFile.cpp Function.cpp Gfx.cpp \
+	GfxFont.cpp GfxState.cpp GlobalParams.cpp Lexer.cpp Link.cpp \
+	NameToCharCode.cpp Object.cpp OutputDev.cpp Page.cpp Parser.cpp PDFDoc.cpp \
+	PSTokenizer.cpp Stream.cpp UnicodeMap.cpp XRef.cpp Annot.cpp \
+    Outline.cpp JBIG2Stream.cpp PDFDocEncoding.cpp \
+    TextOutputDev.cpp
diff --git a/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cc b/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cpp
index bc5165335..81739488a 100644
--- a/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cc
+++ b/filters/kword/pdf/xpdf/xpdf/NameToCharCode.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// NameToCharCode.cc
+// NameToCharCode.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Object.cc b/filters/kword/pdf/xpdf/xpdf/Object.cpp
index 296522ce4..2a251536f 100644
--- a/filters/kword/pdf/xpdf/xpdf/Object.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Object.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Object.cc
+// Object.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Outline.cc b/filters/kword/pdf/xpdf/xpdf/Outline.cpp
index 256d38d4b..b0753fda2 100644
--- a/filters/kword/pdf/xpdf/xpdf/Outline.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Outline.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Outline.cc
+// Outline.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc b/filters/kword/pdf/xpdf/xpdf/OutputDev.cpp
index 34ec56836..84f7a2ac9 100644
--- a/filters/kword/pdf/xpdf/xpdf/OutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/OutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// OutputDev.cc
+// OutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cpp
index 34432991d..4a65ac041 100644
--- a/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PBMOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PBMOutputDev.cc
+// PBMOutputDev.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDoc.cc b/filters/kword/pdf/xpdf/xpdf/PDFDoc.cpp
index 19efc1aa6..63f5d2da4 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDoc.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDoc.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PDFDoc.cc
+// PDFDoc.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cc b/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cpp
index 4f1e20132..4f1e20132 100644
--- a/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PDFDocEncoding.cpp
diff --git a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cpp
index 111d8717b..66fd3fa6a 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSOutputDev.cc
+// PSOutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cc b/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cpp
index 570a7bac7..73b04323e 100644
--- a/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/PSTokenizer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// PSTokenizer.cc
+// PSTokenizer.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Page.cc b/filters/kword/pdf/xpdf/xpdf/Page.cpp
index 891ed82ee..96cb4613d 100644
--- a/filters/kword/pdf/xpdf/xpdf/Page.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Page.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Page.cc
+// Page.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Parser.cc b/filters/kword/pdf/xpdf/xpdf/Parser.cpp
index 4bcb0ceb8..3fb58d6b2 100644
--- a/filters/kword/pdf/xpdf/xpdf/Parser.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Parser.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Parser.cc
+// Parser.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/SFont.cc b/filters/kword/pdf/xpdf/xpdf/SFont.cpp
index 53214b08f..9899301cf 100644
--- a/filters/kword/pdf/xpdf/xpdf/SFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/SFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// SFont.cc
+// SFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/Stream.cc b/filters/kword/pdf/xpdf/xpdf/Stream.cpp
index 8c997d032..7b3dbb5d5 100644
--- a/filters/kword/pdf/xpdf/xpdf/Stream.cc
+++ b/filters/kword/pdf/xpdf/xpdf/Stream.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// Stream.cc
+// Stream.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/T1Font.cc b/filters/kword/pdf/xpdf/xpdf/T1Font.cpp
index 9815e4901..350f7bd66 100644
--- a/filters/kword/pdf/xpdf/xpdf/T1Font.cc
+++ b/filters/kword/pdf/xpdf/xpdf/T1Font.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// T1Font.cc
+// T1Font.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/TTFont.cc b/filters/kword/pdf/xpdf/xpdf/TTFont.cpp
index 6107fd43a..51761fbf1 100644
--- a/filters/kword/pdf/xpdf/xpdf/TTFont.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TTFont.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TTFont.cc
+// TTFont.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cpp
index 8eb789032..3266678fb 100644
--- a/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/TextOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// TextOutputDev.cc
+// TextOutputDev.cpp
 //
 // Copyright 1997-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cpp
index fe1185d7d..dce0cae7a 100644
--- a/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cc
+++ b/filters/kword/pdf/xpdf/xpdf/UnicodeMap.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// UnicodeMap.cc
+// UnicodeMap.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cpp
index 3c58f5650..e8acbf66a 100644
--- a/filters/kword/pdf/xpdf/xpdf/XOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XOutputDev.cc
+// XOutputDev.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cpp
index e456310b6..b64f17c7f 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFApp.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFApp.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFApp.cc
+// XPDFApp.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cpp
index 8376ce97d..517b99700 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFCore.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFCore.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFCore.cc
+// XPDFCore.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cpp
index 46e5466c5..edc7fb8fc 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFTree.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFTree.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFTree.cc
+// XPDFTree.cpp
 //
 //========================================================================
 
diff --git a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cpp
index a8c8f8f0f..8327a7a22 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPDFViewer.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPDFViewer.cc
+// XPDFViewer.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cc b/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cpp
index ecd149801..39fc474e2 100644
--- a/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XPixmapOutputDev.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XPixmapOutputDev.cc
+// XPixmapOutputDev.cpp
 //
 // Copyright 2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/XRef.cc b/filters/kword/pdf/xpdf/xpdf/XRef.cpp
index 0553b1595..471d5c854 100644
--- a/filters/kword/pdf/xpdf/xpdf/XRef.cc
+++ b/filters/kword/pdf/xpdf/xpdf/XRef.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// XRef.cc
+// XRef.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdffonts.cc b/filters/kword/pdf/xpdf/xpdf/pdffonts.cpp
index fcb739a20..831e773ca 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdffonts.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdffonts.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdffonts.cc
+// pdffonts.cpp
 //
 // Copyright 2001-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdfimages.cc b/filters/kword/pdf/xpdf/xpdf/pdfimages.cpp
index 5e35bfb48..c2f4bf804 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdfimages.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdfimages.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdfimages.cc
+// pdfimages.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdfinfo.cc b/filters/kword/pdf/xpdf/xpdf/pdfinfo.cpp
index 43bf38afb..e21a299fd 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdfinfo.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdfinfo.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdfinfo.cc
+// pdfinfo.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftopbm.cc b/filters/kword/pdf/xpdf/xpdf/pdftopbm.cpp
index 76f60a6af..9a2002296 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftopbm.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftopbm.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftopbm.cc
+// pdftopbm.cpp
 //
 // Copyright 1998-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftops.cc b/filters/kword/pdf/xpdf/xpdf/pdftops.cpp
index d5d2de85d..91a324ac2 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftops.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftops.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftops.cc
+// pdftops.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/pdftotext.cc b/filters/kword/pdf/xpdf/xpdf/pdftotext.cpp
index 150954fc9..b2e68b422 100644
--- a/filters/kword/pdf/xpdf/xpdf/pdftotext.cc
+++ b/filters/kword/pdf/xpdf/xpdf/pdftotext.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// pdftotext.cc
+// pdftotext.cpp
 //
 // Copyright 1997-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/pdf/xpdf/xpdf/xpdf.cc b/filters/kword/pdf/xpdf/xpdf/xpdf.cpp
index ef47fb6e5..9cb3f82d7 100644
--- a/filters/kword/pdf/xpdf/xpdf/xpdf.cc
+++ b/filters/kword/pdf/xpdf/xpdf/xpdf.cpp
@@ -1,6 +1,6 @@
 //========================================================================
 //
-// xpdf.cc
+// xpdf.cpp
 //
 // Copyright 1996-2002 Glyph & Cog, LLC
 //
diff --git a/filters/kword/rtf/export/ExportFilter.cc b/filters/kword/rtf/export/ExportFilter.cpp
index eba2b645d..eba2b645d 100644
--- a/filters/kword/rtf/export/ExportFilter.cc
+++ b/filters/kword/rtf/export/ExportFilter.cpp
diff --git a/filters/kword/rtf/export/Makefile.am b/filters/kword/rtf/export/Makefile.am
index ba3d5c097..e6c49d00c 100644
--- a/filters/kword/rtf/export/Makefile.am
+++ b/filters/kword/rtf/export/Makefile.am
@@ -10,7 +10,7 @@ librtfexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.l
 
 kde_module_LTLIBRARIES = librtfexport.la
 
-librtfexport_la_SOURCES = rtfexport.cc ExportFilter.cc
+librtfexport_la_SOURCES = rtfexport.cpp ExportFilter.cpp
 
 noinst_HEADERS = rtfexport.h ExportFilter.h
 
diff --git a/filters/kword/rtf/export/rtfexport.cc b/filters/kword/rtf/export/rtfexport.cpp
index 6f23530b1..91f35523d 100644
--- a/filters/kword/rtf/export/rtfexport.cc
+++ b/filters/kword/rtf/export/rtfexport.cpp
@@ -22,7 +22,7 @@
 
 /*
    This file is based on the old file:
-    /home/kde/koffice/filters/kword/ascii/asciiexport.cc
+    /home/kde/koffice/filters/kword/ascii/asciiexport.cpp
 
    The old file was copyrighted by
     Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
diff --git a/filters/kword/starwriter/Makefile.am b/filters/kword/starwriter/Makefile.am
index 6ad15ba84..bba3714d3 100644
--- a/filters/kword/starwriter/Makefile.am
+++ b/filters/kword/starwriter/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = libstarwriterimport.la
 
-libstarwriterimport_la_SOURCES = pole.cpp starwriterimport.cc
+libstarwriterimport_la_SOURCES = pole.cpp starwriterimport.cpp
 libstarwriterimport_la_LDFLAGS	= -module $(KDE_PLUGIN)
 libstarwriterimport_la_LIBADD = $(KOFFICE_LIBS)
 
diff --git a/filters/kword/starwriter/starwriterimport.cc b/filters/kword/starwriter/starwriterimport.cpp
index 43dc1b623..43dc1b623 100644
--- a/filters/kword/starwriter/starwriterimport.cc
+++ b/filters/kword/starwriter/starwriterimport.cpp
diff --git a/filters/kword/wml/Makefile.am b/filters/kword/wml/Makefile.am
index d22ac2c59..892a57cbf 100644
--- a/filters/kword/wml/Makefile.am
+++ b/filters/kword/wml/Makefile.am
@@ -10,8 +10,8 @@ libwmlexport_la_LIBADD = $(KOFFICE_LIBS) ../libexport/libkwordexportfilters.la
 
 kde_module_LTLIBRARIES = libwmlimport.la libwmlexport.la
 
-libwmlimport_la_SOURCES = wmlimport.cc wmlparser.cpp
-libwmlexport_la_SOURCES = wmlexport.cc
+libwmlimport_la_SOURCES = wmlimport.cpp wmlparser.cpp
+libwmlexport_la_SOURCES = wmlexport.cpp
 
 noinst_HEADERS = wmlparser.h
 
diff --git a/filters/kword/wml/wmlexport.cc b/filters/kword/wml/wmlexport.cpp
index 978cb14d2..978cb14d2 100644
--- a/filters/kword/wml/wmlexport.cc
+++ b/filters/kword/wml/wmlexport.cpp
diff --git a/filters/kword/wml/wmlimport.cc b/filters/kword/wml/wmlimport.cpp
index 83e14d9f0..83e14d9f0 100644
--- a/filters/kword/wml/wmlimport.cc
+++ b/filters/kword/wml/wmlimport.cpp
diff --git a/filters/kword/wordperfect/export/Makefile.am b/filters/kword/wordperfect/export/Makefile.am
index a3ef671a3..bc23e5fd2 100644
--- a/filters/kword/wordperfect/export/Makefile.am
+++ b/filters/kword/wordperfect/export/Makefile.am
@@ -2,7 +2,7 @@
 INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) -I$(srcdir)/../../libexport $(all_includes)
 kde_module_LTLIBRARIES = libwpexport.la
 
-libwpexport_la_SOURCES = wpexport.cc wp5.cc wp6.cc
+libwpexport_la_SOURCES = wpexport.cpp wp5.cpp wp6.cpp
 libwpexport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
 libwpexport_la_LIBADD = $(KOFFICE_LIBS) ../../libexport/libkwordexportfilters.la
 
diff --git a/filters/kword/wordperfect/export/wp5.cc b/filters/kword/wordperfect/export/wp5.cpp
index 965753537..965753537 100644
--- a/filters/kword/wordperfect/export/wp5.cc
+++ b/filters/kword/wordperfect/export/wp5.cpp
diff --git a/filters/kword/wordperfect/export/wp6.cc b/filters/kword/wordperfect/export/wp6.cpp
index 5d0079b44..5d0079b44 100644
--- a/filters/kword/wordperfect/export/wp6.cc
+++ b/filters/kword/wordperfect/export/wp6.cpp
diff --git a/filters/kword/wordperfect/export/wpexport.cc b/filters/kword/wordperfect/export/wpexport.cpp
index 619d5d476..619d5d476 100644
--- a/filters/kword/wordperfect/export/wpexport.cc
+++ b/filters/kword/wordperfect/export/wpexport.cpp
diff --git a/filters/kword/wordperfect/import/DocumentElement.cxx b/filters/kword/wordperfect/import/DocumentElement.cpp
index a1a928925..f10e56969 100644
--- a/filters/kword/wordperfect/import/DocumentElement.cxx
+++ b/filters/kword/wordperfect/import/DocumentElement.cpp
@@ -26,9 +26,9 @@
  * Corel Corporation or Corel Corporation Limited."
  */
 
-#include "DocumentElement.hxx"
-#include "DocumentHandler.hxx"
-#include "FilterInternal.hxx"
+#include "DocumentElement.h"
+#include "DocumentHandler.h"
+#include "FilterInternal.h"
 #include <string.h>
 
 #define ASCII_SPACE 0x0020
diff --git a/filters/kword/wordperfect/import/DocumentElement.hxx b/filters/kword/wordperfect/import/DocumentElement.h
index 764758e83..3fc2cf532 100644
--- a/filters/kword/wordperfect/import/DocumentElement.hxx
+++ b/filters/kword/wordperfect/import/DocumentElement.h
@@ -32,7 +32,7 @@
 #include <libwpd/libwpd.h>
 #include <vector>
 #include "shared_headers.h"
-#include "DocumentHandler.hxx"
+#include "DocumentHandler.h"
 
 const float fDefaultSideMargin = 1.0f; // inches
 const float fDefaultPageWidth = 8.5f; // inches (OOo required default: we will handle this later)
diff --git a/filters/kword/wordperfect/import/DocumentHandler.hxx b/filters/kword/wordperfect/import/DocumentHandler.h
index ff8e39f03..ff8e39f03 100644
--- a/filters/kword/wordperfect/import/DocumentHandler.hxx
+++ b/filters/kword/wordperfect/import/DocumentHandler.h
diff --git a/filters/kword/wordperfect/import/FilterInternal.hxx b/filters/kword/wordperfect/import/FilterInternal.h
index 51615951e..0a20f7c60 100644
--- a/filters/kword/wordperfect/import/FilterInternal.hxx
+++ b/filters/kword/wordperfect/import/FilterInternal.h
@@ -28,7 +28,7 @@
 #endif
 
 #if 0
-#include <rtl/string.hxx>
+#include <rtl/string.h>
 inline rtl::OString utf8_itoa(int i)
 {
 	return rtl::OString::valueOf( (sal_Int32) i );
diff --git a/filters/kword/wordperfect/import/FontStyle.cxx b/filters/kword/wordperfect/import/FontStyle.cpp
index b926ccddc..6099e7e39 100644
--- a/filters/kword/wordperfect/import/FontStyle.cxx
+++ b/filters/kword/wordperfect/import/FontStyle.cpp
@@ -25,9 +25,9 @@
 /* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FontStyle.hxx"
-#include "WriterProperties.hxx"
-#include "DocumentElement.hxx"
+#include "FontStyle.h"
+#include "WriterProperties.h"
+#include "DocumentElement.h"
 
 FontStyle::FontStyle(const char *psName, const char *psFontFamily) : Style(psName),
 	msFontFamily(psFontFamily),
diff --git a/filters/kword/wordperfect/import/FontStyle.hxx b/filters/kword/wordperfect/import/FontStyle.h
index 6d09de5c8..994184950 100644
--- a/filters/kword/wordperfect/import/FontStyle.hxx
+++ b/filters/kword/wordperfect/import/FontStyle.h
@@ -29,8 +29,8 @@
 #define _FONTSTYLE_H
 
 #include <libwpd/libwpd.h>
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 #include "shared_headers.h"
 
 class FontStyle : public Style
diff --git a/filters/kword/wordperfect/import/ListStyle.cxx b/filters/kword/wordperfect/import/ListStyle.cpp
index 66373a109..baba4b679 100644
--- a/filters/kword/wordperfect/import/ListStyle.cxx
+++ b/filters/kword/wordperfect/import/ListStyle.cpp
@@ -25,9 +25,9 @@
 /* "This product is not manufactured, approved, or supported by 
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "ListStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "ListStyle.h"
+#include "DocumentElement.h"
 
 OrderedListLevelStyle::OrderedListLevelStyle(const _SH_PropertyList &xPropList) : 
         mPropList(xPropList)
diff --git a/filters/kword/wordperfect/import/ListStyle.hxx b/filters/kword/wordperfect/import/ListStyle.h
index d8e6a25f2..11bda504d 100644
--- a/filters/kword/wordperfect/import/ListStyle.hxx
+++ b/filters/kword/wordperfect/import/ListStyle.h
@@ -32,8 +32,8 @@
 
 #define WP6_NUM_LIST_LEVELS 8 // see WP6FileStructure.h (we shouldn't need to reference this)
 
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 class DocumentElement;
 
diff --git a/filters/kword/wordperfect/import/Makefile.am b/filters/kword/wordperfect/import/Makefile.am
index 92494e0ea..f5380749a 100644
--- a/filters/kword/wordperfect/import/Makefile.am
+++ b/filters/kword/wordperfect/import/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES= -I$(srcdir) $(KOFFICE_INCLUDES) $(LIBWPD_CFLAGS) $(all_includes)
 
 kde_module_LTLIBRARIES = libwpimport.la 
 
-libwpimport_la_SOURCES = wpimport.cc DocumentElement.cxx FontStyle.cxx ListStyle.cxx PageSpan.cxx SectionStyle.cxx TableStyle.cxx TextRunStyle.cxx WordPerfectCollector.cxx
+libwpimport_la_SOURCES = wpimport.cpp DocumentElement.cpp FontStyle.cpp ListStyle.cpp PageSpan.cpp SectionStyle.cpp TableStyle.cpp TextRunStyle.cpp WordPerfectCollector.cpp
 libwpimport_la_LDFLAGS	= $(all_libraries) -module -avoid-version -no-undefined
 libwpimport_la_LIBADD = $(KOFFICE_LIBS) $(LIBWPD_LIBS)
 
-noinst_HEADERS = wpimport.h FilterInternal.hxx Style.hxx WriterProperties.hxx DocumentElement.hxx DocumentHandler.hxx FontStyle.hxx ListStyle.hxx PageSpan.hxx SectionStyle.hxx TableStyle.hxx TextRunStyle.hxx WordPerfectCollector.hxx
+noinst_HEADERS = wpimport.h FilterInternal.h Style.h WriterProperties.h DocumentElement.h DocumentHandler.h FontStyle.h ListStyle.h PageSpan.h SectionStyle.h TableStyle.h TextRunStyle.h WordPerfectCollector.h
 
 
 METASOURCES = AUTO
diff --git a/filters/kword/wordperfect/import/PageSpan.cxx b/filters/kword/wordperfect/import/PageSpan.cpp
index 1113004d7..0127d0804 100644
--- a/filters/kword/wordperfect/import/PageSpan.cxx
+++ b/filters/kword/wordperfect/import/PageSpan.cpp
@@ -28,9 +28,9 @@
  */
 #include <config.h>
 
-#include "FilterInternal.hxx"
-#include "PageSpan.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "PageSpan.h"
+#include "DocumentElement.h"
 
 
 PageSpan::PageSpan(const _SH_PropertyList &xPropList) :
diff --git a/filters/kword/wordperfect/import/PageSpan.hxx b/filters/kword/wordperfect/import/PageSpan.h
index 58c5ad811..58c5ad811 100644
--- a/filters/kword/wordperfect/import/PageSpan.hxx
+++ b/filters/kword/wordperfect/import/PageSpan.h
diff --git a/filters/kword/wordperfect/import/SectionStyle.cxx b/filters/kword/wordperfect/import/SectionStyle.cpp
index 153ee45d7..9a8b6790f 100644
--- a/filters/kword/wordperfect/import/SectionStyle.cxx
+++ b/filters/kword/wordperfect/import/SectionStyle.cpp
@@ -27,9 +27,9 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "SectionStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "SectionStyle.h"
+#include "DocumentElement.h"
 #include <math.h>
 
 #ifdef _MSC_VER
diff --git a/filters/kword/wordperfect/import/SectionStyle.hxx b/filters/kword/wordperfect/import/SectionStyle.h
index 2f01d7520..5614f1182 100644
--- a/filters/kword/wordperfect/import/SectionStyle.hxx
+++ b/filters/kword/wordperfect/import/SectionStyle.h
@@ -30,8 +30,8 @@
 #include <libwpd/libwpd.h>
 #include "shared_headers.h"
 
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 
 class SectionStyle : public Style
diff --git a/filters/kword/wordperfect/import/Style.hxx b/filters/kword/wordperfect/import/Style.h
index 49f5e28e4..08e53eff4 100644
--- a/filters/kword/wordperfect/import/Style.hxx
+++ b/filters/kword/wordperfect/import/Style.h
@@ -29,7 +29,7 @@
 #ifndef _STYLE_H
 #define _STYLE_H
 #include <libwpd/libwpd.h>
-#include "DocumentElement.hxx"
+#include "DocumentElement.h"
 
 #include <cstddef>
 
diff --git a/filters/kword/wordperfect/import/TableStyle.cxx b/filters/kword/wordperfect/import/TableStyle.cpp
index 2913fea1f..e35d7acb8 100644
--- a/filters/kword/wordperfect/import/TableStyle.cxx
+++ b/filters/kword/wordperfect/import/TableStyle.cpp
@@ -29,9 +29,9 @@
  */
 #include <cstring>
 #include <math.h>
-#include "FilterInternal.hxx"
-#include "TableStyle.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "TableStyle.h"
+#include "DocumentElement.h"
 
 #ifdef _MSC_VER
 #include <minmax.h>
diff --git a/filters/kword/wordperfect/import/TableStyle.hxx b/filters/kword/wordperfect/import/TableStyle.h
index 3730da4b2..c15f4d81f 100644
--- a/filters/kword/wordperfect/import/TableStyle.hxx
+++ b/filters/kword/wordperfect/import/TableStyle.h
@@ -31,8 +31,8 @@
 #include <libwpd/libwpd.h>
 #include <vector>
 #include "shared_headers.h"
-#include "Style.hxx"
-#include "WriterProperties.hxx"
+#include "Style.h"
+#include "WriterProperties.h"
 
 class DocumentElement;
 class DocumentHandler;
diff --git a/filters/kword/wordperfect/import/TextRunStyle.cxx b/filters/kword/wordperfect/import/TextRunStyle.cpp
index b188632c5..06cbc4c6c 100644
--- a/filters/kword/wordperfect/import/TextRunStyle.cxx
+++ b/filters/kword/wordperfect/import/TextRunStyle.cpp
@@ -28,10 +28,10 @@
 /* "This product is not manufactured, approved, or supported by
  * Corel Corporation or Corel Corporation Limited."
  */
-#include "FilterInternal.hxx"
-#include "TextRunStyle.hxx"
-#include "WriterProperties.hxx"
-#include "DocumentElement.hxx"
+#include "FilterInternal.h"
+#include "TextRunStyle.h"
+#include "WriterProperties.h"
+#include "DocumentElement.h"
 
 #include <cstring>
 
diff --git a/filters/kword/wordperfect/import/TextRunStyle.hxx b/filters/kword/wordperfect/import/TextRunStyle.h
index e0847e2fa..139b32bec 100644
--- a/filters/kword/wordperfect/import/TextRunStyle.hxx
+++ b/filters/kword/wordperfect/import/TextRunStyle.h
@@ -32,7 +32,7 @@
 #define _TEXTRUNSTYLE_H
 
 #include <libwpd/libwpd.h>
-#include "Style.hxx"
+#include "Style.h"
 #include "shared_headers.h"
 
 class TagOpenElement;
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.cxx b/filters/kword/wordperfect/import/WordPerfectCollector.cpp
index eb59a70f0..76fe6fc65 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.cxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.cpp
@@ -34,16 +34,16 @@
 #include <libwpd/libwpd.h>
 #include <string.h> // for strcmp
 
-#include "WordPerfectCollector.hxx"
-#include "DocumentElement.hxx"
-#include "TextRunStyle.hxx"
-#include "FontStyle.hxx"
-#include "ListStyle.hxx"
-#include "PageSpan.hxx"
-#include "SectionStyle.hxx"
-#include "TableStyle.hxx"
-#include "FilterInternal.hxx"
-#include "WriterProperties.hxx"
+#include "WordPerfectCollector.h"
+#include "DocumentElement.h"
+#include "TextRunStyle.h"
+#include "FontStyle.h"
+#include "ListStyle.h"
+#include "PageSpan.h"
+#include "SectionStyle.h"
+#include "TableStyle.h"
+#include "FilterInternal.h"
+#include "WriterProperties.h"
 
 _WriterDocumentState::_WriterDocumentState() :
 	mbFirstElement(true),
diff --git a/filters/kword/wordperfect/import/WordPerfectCollector.hxx b/filters/kword/wordperfect/import/WordPerfectCollector.h
index 7c5e8286b..2f0af74a3 100644
--- a/filters/kword/wordperfect/import/WordPerfectCollector.hxx
+++ b/filters/kword/wordperfect/import/WordPerfectCollector.h
@@ -32,7 +32,7 @@
 #ifndef _WORDPERFECTCOLLECTOR_H
 #define _WORDPERFECTCOLLECTOR_H
 
-#include "SectionStyle.hxx"
+#include "SectionStyle.h"
 
 #include <config.h>
 #include <libwpd/libwpd.h>
diff --git a/filters/kword/wordperfect/import/WriterProperties.hxx b/filters/kword/wordperfect/import/WriterProperties.h
index a3c643301..a3c643301 100644
--- a/filters/kword/wordperfect/import/WriterProperties.hxx
+++ b/filters/kword/wordperfect/import/WriterProperties.h
diff --git a/filters/kword/wordperfect/import/wpimport.cc b/filters/kword/wordperfect/import/wpimport.cpp
index e8537b76c..12f5446e3 100644
--- a/filters/kword/wordperfect/import/wpimport.cc
+++ b/filters/kword/wordperfect/import/wpimport.cpp
@@ -35,8 +35,8 @@ typedef KGenericFactory<WPImport, KoFilter> WPImportFactory;
 K_EXPORT_COMPONENT_FACTORY( libwpimport, WPImportFactory( "kofficefilters" ) )
 
 #include <libwpd/libwpd.h>
-#include "DocumentHandler.hxx"
-#include "WordPerfectCollector.hxx"
+#include "DocumentHandler.h"
+#include "WordPerfectCollector.h"
 
 class _SH_MemoryInputStream : public _SH_InputStream
 {
diff --git a/filters/liboofilter/Makefile.am b/filters/liboofilter/Makefile.am
index 22e60f13d..9a758eadb 100644
--- a/filters/liboofilter/Makefile.am
+++ b/filters/liboofilter/Makefile.am
@@ -1,5 +1,5 @@
 INCLUDES = $(KOFFICE_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = liboofilter.la
-liboofilter_la_SOURCES = ooutils.cc liststylestack.cc
+liboofilter_la_SOURCES = ooutils.cpp liststylestack.cpp
 
diff --git a/filters/liboofilter/liststylestack.cc b/filters/liboofilter/liststylestack.cpp
index b5eff1337..b5eff1337 100644
--- a/filters/liboofilter/liststylestack.cc
+++ b/filters/liboofilter/liststylestack.cpp
diff --git a/filters/liboofilter/ooutils.cc b/filters/liboofilter/ooutils.cpp
index a04633fe3..a04633fe3 100644
--- a/filters/liboofilter/ooutils.cc
+++ b/filters/liboofilter/ooutils.cpp
diff --git a/filters/olefilters/Makefile.am b/filters/olefilters/Makefile.am
index e7bd753ac..f6aadf4d6 100644
--- a/filters/olefilters/Makefile.am
+++ b/filters/olefilters/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = lib powerpoint97
 
 kde_module_LTLIBRARIES = libolefilter.la
 
-libolefilter_la_SOURCES = olefilter.cc
+libolefilter_la_SOURCES = olefilter.cpp
 
 noinst_HEADERS = olefilter.h
 
diff --git a/filters/olefilters/lib/Makefile.am b/filters/olefilters/lib/Makefile.am
index 9e902fd25..0edcbd2f2 100644
--- a/filters/olefilters/lib/Makefile.am
+++ b/filters/olefilters/lib/Makefile.am
@@ -6,11 +6,11 @@ INCLUDES = -I$(srcdir) $(KOFFICE_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = libfilterbase.la libklaola.la
 
-libfilterbase_la_SOURCES = filterbase.cc
+libfilterbase_la_SOURCES = filterbase.cpp
 libfilterbase_la_METASOURCES = filterbase.moc
 libfilterbase_la_LDFLAGS = $(all_libraries)
 
-libklaola_la_SOURCES = klaola.cc
+libklaola_la_SOURCES = klaola.cpp
 libklaola_la_LDFLAGS = $(all_libraries)
 
 noinst_HEADERS = filterbase.h klaola.h
diff --git a/filters/olefilters/lib/filterbase.cc b/filters/olefilters/lib/filterbase.cpp
index dbb7edd06..dbb7edd06 100644
--- a/filters/olefilters/lib/filterbase.cc
+++ b/filters/olefilters/lib/filterbase.cpp
diff --git a/filters/olefilters/lib/klaola.cc b/filters/olefilters/lib/klaola.cpp
index 28af157c8..28af157c8 100644
--- a/filters/olefilters/lib/klaola.cc
+++ b/filters/olefilters/lib/klaola.cpp
diff --git a/filters/olefilters/olefilter.cc b/filters/olefilters/olefilter.cpp
index ae0395a94..ae0395a94 100644
--- a/filters/olefilters/olefilter.cc
+++ b/filters/olefilters/olefilter.cpp
diff --git a/filters/olefilters/powerpoint97/Makefile.am b/filters/olefilters/powerpoint97/Makefile.am
index d0c3fc2ba..873a81e5f 100644
--- a/filters/olefilters/powerpoint97/Makefile.am
+++ b/filters/olefilters/powerpoint97/Makefile.am
@@ -6,7 +6,7 @@ INCLUDES= -I$(srcdir) -I$(srcdir)/../lib $(KOFFICE_INCLUDES) $(all_includes)
 
 noinst_LTLIBRARIES = libpowerpoint97.la
 
-libpowerpoint97_la_SOURCES = powerpointfilter.cc powerpoint.cc pptdoc.cc pptxml.cc pptSlide.cpp
+libpowerpoint97_la_SOURCES = powerpointfilter.cpp powerpoint.cpp pptdoc.cpp pptxml.cpp pptSlide.cpp
 libpowerpoint97_la_LDFLAGS = $(all_libraries)
 
 noinst_HEADERS = powerpointfilter.h powerpoint.h pptdoc.h pptxml.h pptSlide.h
diff --git a/filters/olefilters/powerpoint97/powerpoint.cc b/filters/olefilters/powerpoint97/powerpoint.cpp
index 3f330fa75..3f330fa75 100644
--- a/filters/olefilters/powerpoint97/powerpoint.cc
+++ b/filters/olefilters/powerpoint97/powerpoint.cpp
diff --git a/filters/olefilters/powerpoint97/powerpointfilter.cc b/filters/olefilters/powerpoint97/powerpointfilter.cpp
index 5359dd985..5359dd985 100644
--- a/filters/olefilters/powerpoint97/powerpointfilter.cc
+++ b/filters/olefilters/powerpoint97/powerpointfilter.cpp
diff --git a/filters/olefilters/powerpoint97/pptdoc.cc b/filters/olefilters/powerpoint97/pptdoc.cpp
index 9aa10ee4f..9aa10ee4f 100644
--- a/filters/olefilters/powerpoint97/pptdoc.cc
+++ b/filters/olefilters/powerpoint97/pptdoc.cpp
diff --git a/filters/olefilters/powerpoint97/pptxml.cc b/filters/olefilters/powerpoint97/pptxml.cpp
index 42be4de5c..42be4de5c 100644
--- a/filters/olefilters/powerpoint97/pptxml.cc
+++ b/filters/olefilters/powerpoint97/pptxml.cpp
diff --git a/filters/xsltfilter/export/Makefile.am b/filters/xsltfilter/export/Makefile.am
index fc45037a3..f67ae51a8 100644
--- a/filters/xsltfilter/export/Makefile.am
+++ b/filters/xsltfilter/export/Makefile.am
@@ -8,7 +8,7 @@ CXXFLAGS += $(ICU_CXXFLAGS)
 
 kde_module_LTLIBRARIES = libxsltexport.la
 
-libxsltexport_la_SOURCES = xsltexport.cc xsltexportdia.cc xsltproc.cc xsltdialog.ui
+libxsltexport_la_SOURCES = xsltexport.cpp xsltexportdia.cpp xsltproc.cpp xsltdialog.ui
 libxsltexport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libxsltexport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
@@ -16,7 +16,7 @@ noinst_HEADERS = xsltexport.h xsltexportdia.h xsltproc.h
 
 ######## Debug
 #check_PROGRAMS = xsltfilter
-#xsltfilter_SOURCES = xsltfilter.cc
+#xsltfilter_SOURCES = xsltfilter.cpp
 #xsltfilter_LDADD = $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 #xsltfilter_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries)
 
diff --git a/filters/xsltfilter/export/xsltexport.cc b/filters/xsltfilter/export/xsltexport.cpp
index b1d9d84e6..b1d9d84e6 100644
--- a/filters/xsltfilter/export/xsltexport.cc
+++ b/filters/xsltfilter/export/xsltexport.cpp
diff --git a/filters/xsltfilter/export/xsltexportdia.cc b/filters/xsltfilter/export/xsltexportdia.cpp
index bf141f903..bf141f903 100644
--- a/filters/xsltfilter/export/xsltexportdia.cc
+++ b/filters/xsltfilter/export/xsltexportdia.cpp
diff --git a/filters/xsltfilter/export/xsltproc.cc b/filters/xsltfilter/export/xsltproc.cpp
index 3bd20408a..3bd20408a 100644
--- a/filters/xsltfilter/export/xsltproc.cc
+++ b/filters/xsltfilter/export/xsltproc.cpp
diff --git a/filters/xsltfilter/import/Makefile.am b/filters/xsltfilter/import/Makefile.am
index 965911f25..c39176c8d 100644
--- a/filters/xsltfilter/import/Makefile.am
+++ b/filters/xsltfilter/import/Makefile.am
@@ -7,7 +7,7 @@ CXXFLAGS += $(ICU_CXXFLAGS)
 
 kde_module_LTLIBRARIES = libxsltimport.la
 
-libxsltimport_la_SOURCES = xsltimport.cc xsltimportdia.cc xsltproc.cc xsltdialog.ui
+libxsltimport_la_SOURCES = xsltimport.cpp xsltimportdia.cpp xsltproc.cpp xsltdialog.ui
 libxsltimport_la_LDFLAGS = $(KDE_RPATH) $(LIBXML_RPATH) $(LIBXSLT_RPATH) $(all_libraries) -module $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libxsltimport_la_LIBADD	= $(KOFFICE_LIBS) $(LIBXSLT_LIBS) $(LIBXML_LIBS)
 
diff --git a/filters/xsltfilter/import/xsltimport.cc b/filters/xsltfilter/import/xsltimport.cpp
index 24dfb5477..24dfb5477 100644
--- a/filters/xsltfilter/import/xsltimport.cc
+++ b/filters/xsltfilter/import/xsltimport.cpp
diff --git a/filters/xsltfilter/import/xsltimportdia.cc b/filters/xsltfilter/import/xsltimportdia.cpp
index 9052e4ecc..9052e4ecc 100644
--- a/filters/xsltfilter/import/xsltimportdia.cc
+++ b/filters/xsltfilter/import/xsltimportdia.cpp
diff --git a/filters/xsltfilter/import/xsltproc.cc b/filters/xsltfilter/import/xsltproc.cpp
index 3bd20408a..3bd20408a 100644
--- a/filters/xsltfilter/import/xsltproc.cc
+++ b/filters/xsltfilter/import/xsltproc.cpp
diff --git a/interfaces/Makefile.am b/interfaces/Makefile.am
index e4ac9a6f1..dd523fa14 100644
--- a/interfaces/Makefile.am
+++ b/interfaces/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES  = $(KOFFICE_INCLUDES) -I$(top_srcdir)/kchart/kdchart -I$(interfacedir)
 
 lib_LTLIBRARIES = libkochart.la
 
-libkochart_la_SOURCES = koChart.cc
+libkochart_la_SOURCES = koChart.cpp
 libkochart_la_LDFLAGS = $(all_libraries) -version-info 1:0:0 -no-undefined
 libkochart_la_LIBADD = $(LIB_KOFFICECORE)
 METASOURCES = AUTO
diff --git a/interfaces/koChart.cc b/interfaces/koChart.cpp
index d66578ab5..d66578ab5 100644
--- a/interfaces/koChart.cc
+++ b/interfaces/koChart.cpp
diff --git a/karbon/Makefile.am b/karbon/Makefile.am
index 924d7c350..3739c7972 100644
--- a/karbon/Makefile.am
+++ b/karbon/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = commands visitors core shapes widgets dialogs dockers render . tools p
 lib_LTLIBRARIES = libkarboncommon.la
 kde_module_LTLIBRARIES = libkarbonpart.la
 
-libkarboncommon_la_SOURCES = karbon_factory.cc 	karbon_resourceserver.cc 	karbon_part.cc 	karbon_part_iface.cc 	karbon_part_iface.skel 	karbon_view.cc 	karbon_view_iface.cc 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cc karbon_tool_factory.cc	vtoolcontroller.cc vtool.cc
+libkarboncommon_la_SOURCES = karbon_factory.cpp 	karbon_resourceserver.cpp 	karbon_part.cpp 	karbon_part_iface.cpp 	karbon_part_iface.skel 	karbon_view.cpp 	karbon_view_iface.cpp 	karbon_view_iface.skel karbon_drag.cpp karbon_grid_data.cpp karbon_tool_registry.cpp karbon_tool_factory.cpp	vtoolcontroller.cpp vtool.cpp
 
 libkarboncommon_la_LDFLAGS = $(KDE_RPATH) $(LIBFREETYPE_RPATH) $(LIBMAGICK_LDFLAGS) -no-undefined $(LIB_QT)
 libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE) $(LIB_KOPAINTER) $(LIB_KOTEXT) \
@@ -32,13 +32,13 @@ libkarboncommon_la_LIBADD = $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPALETTE)
 	$(LIBMAGICK_LIBS) \
 	$(LIBFREETYPE_LIBS)
 
-libkarbonpart_la_SOURCES = karbon_factory_init.cc
+libkarbonpart_la_SOURCES = karbon_factory_init.cpp
 libkarbonpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIBFREETYPE_RPATH) $(LIB_QT)
 libkarbonpart_la_LIBADD = libkarboncommon.la
 
 bin_PROGRAMS =
 tdeinit_LTLIBRARIES = karbon.la
-karbon_la_SOURCES = main.cc
+karbon_la_SOURCES = main.cpp
 karbon_la_LDFLAGS = $(all_libraries) -module -avoid-version $(LIB_QT)
 karbon_la_LIBADD = libkarboncommon.la $(LIB_QT) $(LIB_KOFFICECORE)
 
@@ -55,7 +55,7 @@ METASOURCES = AUTO
 
 messages: rc.cpp
 	$(EXTRACTRC) data/*.rc >> rc.cpp
-	$(XGETTEXT) rc.cpp *.cpp *.cc */*.cc tools/*.h plugins/*/*.cc -o $(podir)/karbon.pot
+	$(XGETTEXT) rc.cpp *.cpp *.cpp */*.cpp tools/*.h plugins/*/*.cpp -o $(podir)/karbon.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
 
diff --git a/karbon/TODO b/karbon/TODO
index c09f9a595..d63ee979b 100644
--- a/karbon/TODO
+++ b/karbon/TODO
@@ -90,7 +90,7 @@ MAKE IT NICE:
 -	can't we pass VTool::draw() a painter inseatd of each tool creating a painter itself?
 -	remove V*Tool::refreshUnit(). call this directly via dialog() instead
 -	pass all dialogs a parent
--	think about using ghostscript's flatten algo (see comments in vflatten.cc)
+-	think about using ghostscript's flatten algo (see comments in vflatten.cpp)
 -	why represent opacity as float, not as short?
 -	introduce our own "Color drag" class, since we have in addition to rgb also opacity,
 	and maybe also gradient info could be dragged later.
diff --git a/karbon/commands/Makefile.am b/karbon/commands/Makefile.am
index fb5ac24a9..bebbfd1e6 100644
--- a/karbon/commands/Makefile.am
+++ b/karbon/commands/Makefile.am
@@ -29,26 +29,26 @@ noinst_HEADERS = \
 	vzordercmd.h
 
 libkarboncommands_la_SOURCES = \
-	valigncmd.cc \
-	vbooleancmd.cc \
-	vcleanupcmd.cc \
-	vclipartcmd.cc \
-	vclosepathcmd.cc \
-	vcommand.cc \
-	vdeletecmd.cc \
-	vdistributecmd.cc \
-	vfillcmd.cc \
-	vflattencmd.cc \
-	vgroupcmd.cc \
-	vdeletenodescmd.cc \
-	vlayercmd.cc \
-	vreplacingcmd.cc \
-	vshapecmd.cc \
-	vstrokecmd.cc \
-	vtransformcmd.cc \
-	vinsertcmd.cc \
-	vungroupcmd.cc \
-	vzordercmd.cc
+	valigncmd.cpp \
+	vbooleancmd.cpp \
+	vcleanupcmd.cpp \
+	vclipartcmd.cpp \
+	vclosepathcmd.cpp \
+	vcommand.cpp \
+	vdeletecmd.cpp \
+	vdistributecmd.cpp \
+	vfillcmd.cpp \
+	vflattencmd.cpp \
+	vgroupcmd.cpp \
+	vdeletenodescmd.cpp \
+	vlayercmd.cpp \
+	vreplacingcmd.cpp \
+	vshapecmd.cpp \
+	vstrokecmd.cpp \
+	vtransformcmd.cpp \
+	vinsertcmd.cpp \
+	vungroupcmd.cpp \
+	vzordercmd.cpp
 
 libkarboncommands_la_METASOURCES = \
 	AUTO
diff --git a/karbon/commands/valigncmd.cc b/karbon/commands/valigncmd.cpp
index d79c8485c..d79c8485c 100644
--- a/karbon/commands/valigncmd.cc
+++ b/karbon/commands/valigncmd.cpp
diff --git a/karbon/commands/vbooleancmd.cc b/karbon/commands/vbooleancmd.cpp
index dbfccffeb..dbfccffeb 100644
--- a/karbon/commands/vbooleancmd.cc
+++ b/karbon/commands/vbooleancmd.cpp
diff --git a/karbon/commands/vcleanupcmd.cc b/karbon/commands/vcleanupcmd.cpp
index 2c9d49627..2c9d49627 100644
--- a/karbon/commands/vcleanupcmd.cc
+++ b/karbon/commands/vcleanupcmd.cpp
diff --git a/karbon/commands/vclipartcmd.cc b/karbon/commands/vclipartcmd.cpp
index a9465e4e0..a9465e4e0 100644
--- a/karbon/commands/vclipartcmd.cc
+++ b/karbon/commands/vclipartcmd.cpp
diff --git a/karbon/commands/vclosepathcmd.cc b/karbon/commands/vclosepathcmd.cpp
index 652ed2df0..652ed2df0 100644
--- a/karbon/commands/vclosepathcmd.cc
+++ b/karbon/commands/vclosepathcmd.cpp
diff --git a/karbon/commands/vcommand.cc b/karbon/commands/vcommand.cpp
index fe5e9adaf..fe5e9adaf 100644
--- a/karbon/commands/vcommand.cc
+++ b/karbon/commands/vcommand.cpp
diff --git a/karbon/commands/vdeletecmd.cc b/karbon/commands/vdeletecmd.cpp
index 2cd6a711b..2cd6a711b 100644
--- a/karbon/commands/vdeletecmd.cc
+++ b/karbon/commands/vdeletecmd.cpp
diff --git a/karbon/commands/vdeletenodescmd.cc b/karbon/commands/vdeletenodescmd.cpp
index e83c160a1..e83c160a1 100644
--- a/karbon/commands/vdeletenodescmd.cc
+++ b/karbon/commands/vdeletenodescmd.cpp
diff --git a/karbon/commands/vdistributecmd.cc b/karbon/commands/vdistributecmd.cpp
index 7a23072f8..7a23072f8 100644
--- a/karbon/commands/vdistributecmd.cc
+++ b/karbon/commands/vdistributecmd.cpp
diff --git a/karbon/commands/vfillcmd.cc b/karbon/commands/vfillcmd.cpp
index 75d5284cc..75d5284cc 100644
--- a/karbon/commands/vfillcmd.cc
+++ b/karbon/commands/vfillcmd.cpp
diff --git a/karbon/commands/vflattencmd.cc b/karbon/commands/vflattencmd.cpp
index 21d5b50c2..21d5b50c2 100644
--- a/karbon/commands/vflattencmd.cc
+++ b/karbon/commands/vflattencmd.cpp
diff --git a/karbon/commands/vgroupcmd.cc b/karbon/commands/vgroupcmd.cpp
index 70bd2933f..70bd2933f 100644
--- a/karbon/commands/vgroupcmd.cc
+++ b/karbon/commands/vgroupcmd.cpp
diff --git a/karbon/commands/vinsertcmd.cc b/karbon/commands/vinsertcmd.cpp
index fb544a0c3..fb544a0c3 100644
--- a/karbon/commands/vinsertcmd.cc
+++ b/karbon/commands/vinsertcmd.cpp
diff --git a/karbon/commands/vlayercmd.cc b/karbon/commands/vlayercmd.cpp
index 9a1fe7bdf..9a1fe7bdf 100644
--- a/karbon/commands/vlayercmd.cc
+++ b/karbon/commands/vlayercmd.cpp
diff --git a/karbon/commands/vreplacingcmd.cc b/karbon/commands/vreplacingcmd.cpp
index 427ecdcab..427ecdcab 100644
--- a/karbon/commands/vreplacingcmd.cc
+++ b/karbon/commands/vreplacingcmd.cpp
diff --git a/karbon/commands/vshapecmd.cc b/karbon/commands/vshapecmd.cpp
index 9a59fcd9f..9a59fcd9f 100644
--- a/karbon/commands/vshapecmd.cc
+++ b/karbon/commands/vshapecmd.cpp
diff --git a/karbon/commands/vstrokecmd.cc b/karbon/commands/vstrokecmd.cpp
index 7b99f2d75..7b99f2d75 100644
--- a/karbon/commands/vstrokecmd.cc
+++ b/karbon/commands/vstrokecmd.cpp
diff --git a/karbon/commands/vtextcmd.cc b/karbon/commands/vtextcmd.cpp
index fd7424ba1..fd7424ba1 100644
--- a/karbon/commands/vtextcmd.cc
+++ b/karbon/commands/vtextcmd.cpp
diff --git a/karbon/commands/vtransformcmd.cc b/karbon/commands/vtransformcmd.cpp
index ebcb443ed..ebcb443ed 100644
--- a/karbon/commands/vtransformcmd.cc
+++ b/karbon/commands/vtransformcmd.cpp
diff --git a/karbon/commands/vungroupcmd.cc b/karbon/commands/vungroupcmd.cpp
index 947c4afe3..947c4afe3 100644
--- a/karbon/commands/vungroupcmd.cc
+++ b/karbon/commands/vungroupcmd.cpp
diff --git a/karbon/commands/vzordercmd.cc b/karbon/commands/vzordercmd.cpp
index 2a25edf95..2a25edf95 100644
--- a/karbon/commands/vzordercmd.cc
+++ b/karbon/commands/vzordercmd.cpp
diff --git a/karbon/core/Makefile.am b/karbon/core/Makefile.am
index aabebf800..1f7d8312e 100644
--- a/karbon/core/Makefile.am
+++ b/karbon/core/Makefile.am
@@ -35,37 +35,37 @@ noinst_HEADERS = \
 	vcursor.h
 
 libkarboncore_la_SOURCES = \
-	vcolor.cc \
-	vcomposite.cc \
-	vcomposite_iface.cc \
+	vcolor.cpp \
+	vcomposite.cpp \
+	vcomposite_iface.cpp \
 	vcomposite_iface.skel \
-	vdashpattern.cc \
-	vdocument.cc \
-	vfill.cc \
-	vglobal.cc \
-	vgradient.cc \
-	vgroup.cc \
-	vobject_iface.cc \
+	vdashpattern.cpp \
+	vdocument.cpp \
+	vfill.cpp \
+	vglobal.cpp \
+	vgradient.cpp \
+	vgroup.cpp \
+	vobject_iface.cpp \
 	vobject_iface.skel \
-	vgroup_iface.cc \
+	vgroup_iface.cpp \
 	vgroup_iface.skel \
-	vimage.cc \
-	vkarbonplugin.cc \
-	vlayer.cc \
-	vobject.cc \
-	vpath.cc \
-	vpattern.cc \
-	vsegment.cc \
-	vselection.cc \
-	vstroke.cc \
-	vvisitor.cc \
-	vlayer_iface.cc \
+	vimage.cpp \
+	vkarbonplugin.cpp \
+	vlayer.cpp \
+	vobject.cpp \
+	vpath.cpp \
+	vpattern.cpp \
+	vsegment.cpp \
+	vselection.cpp \
+	vstroke.cpp \
+	vvisitor.cpp \
+	vlayer_iface.cpp \
 	vlayer_iface.skel \
-	vtext.cc \
-	vtext_iface.cc \
+	vtext.cpp \
+	vtext_iface.cpp \
 	vtext_iface.skel \
-	vclipgroup.cc \
-	vcursor.cc
+	vclipgroup.cpp \
+	vcursor.cpp
 
 libkarboncore_la_LIBADD = $(LIBFONTCONFIG_LIBS)
 
diff --git a/karbon/core/vclipgroup.cc b/karbon/core/vclipgroup.cpp
index 9a36c1c55..9a36c1c55 100644
--- a/karbon/core/vclipgroup.cc
+++ b/karbon/core/vclipgroup.cpp
diff --git a/karbon/core/vcolor.cc b/karbon/core/vcolor.cpp
index f8f237d50..f8f237d50 100644
--- a/karbon/core/vcolor.cc
+++ b/karbon/core/vcolor.cpp
diff --git a/karbon/core/vcomposite.cc b/karbon/core/vcomposite.cpp
index 256362116..256362116 100644
--- a/karbon/core/vcomposite.cc
+++ b/karbon/core/vcomposite.cpp
diff --git a/karbon/core/vcomposite_iface.cc b/karbon/core/vcomposite_iface.cpp
index 2cc07c530..2cc07c530 100644
--- a/karbon/core/vcomposite_iface.cc
+++ b/karbon/core/vcomposite_iface.cpp
diff --git a/karbon/core/vcursor.cc b/karbon/core/vcursor.cpp
index c5fb2f402..c5fb2f402 100644
--- a/karbon/core/vcursor.cc
+++ b/karbon/core/vcursor.cpp
diff --git a/karbon/core/vdashpattern.cc b/karbon/core/vdashpattern.cpp
index cc167584d..cc167584d 100644
--- a/karbon/core/vdashpattern.cc
+++ b/karbon/core/vdashpattern.cpp
diff --git a/karbon/core/vdocument.cc b/karbon/core/vdocument.cpp
index 2de51bf14..2de51bf14 100644
--- a/karbon/core/vdocument.cc
+++ b/karbon/core/vdocument.cpp
diff --git a/karbon/core/vfill.cc b/karbon/core/vfill.cpp
index dfa4d5dfb..dfa4d5dfb 100644
--- a/karbon/core/vfill.cc
+++ b/karbon/core/vfill.cpp
diff --git a/karbon/core/vglobal.cc b/karbon/core/vglobal.cpp
index b118e5e26..b118e5e26 100644
--- a/karbon/core/vglobal.cc
+++ b/karbon/core/vglobal.cpp
diff --git a/karbon/core/vgradient.cc b/karbon/core/vgradient.cpp
index 577d13735..577d13735 100644
--- a/karbon/core/vgradient.cc
+++ b/karbon/core/vgradient.cpp
diff --git a/karbon/core/vgroup.cc b/karbon/core/vgroup.cpp
index 1d18f54f5..1d18f54f5 100644
--- a/karbon/core/vgroup.cc
+++ b/karbon/core/vgroup.cpp
diff --git a/karbon/core/vgroup_iface.cc b/karbon/core/vgroup_iface.cpp
index 8a22343a8..8a22343a8 100644
--- a/karbon/core/vgroup_iface.cc
+++ b/karbon/core/vgroup_iface.cpp
diff --git a/karbon/core/vimage.cc b/karbon/core/vimage.cpp
index 4e8466613..4e8466613 100644
--- a/karbon/core/vimage.cc
+++ b/karbon/core/vimage.cpp
diff --git a/karbon/core/vkarbonplugin.cc b/karbon/core/vkarbonplugin.cpp
index 41fd47a89..41fd47a89 100644
--- a/karbon/core/vkarbonplugin.cc
+++ b/karbon/core/vkarbonplugin.cpp
diff --git a/karbon/core/vlayer.cc b/karbon/core/vlayer.cpp
index 55602598e..55602598e 100644
--- a/karbon/core/vlayer.cc
+++ b/karbon/core/vlayer.cpp
diff --git a/karbon/core/vlayer_iface.cc b/karbon/core/vlayer_iface.cpp
index 168e6a4a9..168e6a4a9 100644
--- a/karbon/core/vlayer_iface.cc
+++ b/karbon/core/vlayer_iface.cpp
diff --git a/karbon/core/vobject.cc b/karbon/core/vobject.cpp
index 897652c37..897652c37 100644
--- a/karbon/core/vobject.cc
+++ b/karbon/core/vobject.cpp
diff --git a/karbon/core/vobject_iface.cc b/karbon/core/vobject_iface.cpp
index 25f9959f7..25f9959f7 100644
--- a/karbon/core/vobject_iface.cc
+++ b/karbon/core/vobject_iface.cpp
diff --git a/karbon/core/vpath.cc b/karbon/core/vpath.cpp
index ea05fc762..ea05fc762 100644
--- a/karbon/core/vpath.cc
+++ b/karbon/core/vpath.cpp
diff --git a/karbon/core/vpattern.cc b/karbon/core/vpattern.cpp
index 3a9c181f1..3a9c181f1 100644
--- a/karbon/core/vpattern.cc
+++ b/karbon/core/vpattern.cpp
diff --git a/karbon/core/vsegment.cc b/karbon/core/vsegment.cpp
index d18baeba8..d18baeba8 100644
--- a/karbon/core/vsegment.cc
+++ b/karbon/core/vsegment.cpp
diff --git a/karbon/core/vselection.cc b/karbon/core/vselection.cpp
index 5a10373f4..5a10373f4 100644
--- a/karbon/core/vselection.cc
+++ b/karbon/core/vselection.cpp
diff --git a/karbon/core/vstroke.cc b/karbon/core/vstroke.cpp
index d0cea9c72..d0cea9c72 100644
--- a/karbon/core/vstroke.cc
+++ b/karbon/core/vstroke.cpp
diff --git a/karbon/core/vtext.cc b/karbon/core/vtext.cpp
index b8e15c4f3..b8e15c4f3 100644
--- a/karbon/core/vtext.cc
+++ b/karbon/core/vtext.cpp
diff --git a/karbon/core/vtext_iface.cc b/karbon/core/vtext_iface.cpp
index 7cbeaf377..7cbeaf377 100644
--- a/karbon/core/vtext_iface.cc
+++ b/karbon/core/vtext_iface.cpp
diff --git a/karbon/core/vvisitor.cc b/karbon/core/vvisitor.cpp
index 90085c4a0..90085c4a0 100644
--- a/karbon/core/vvisitor.cc
+++ b/karbon/core/vvisitor.cpp
diff --git a/karbon/dialogs/Makefile.am b/karbon/dialogs/Makefile.am
index 7856355a5..18bd36146 100644
--- a/karbon/dialogs/Makefile.am
+++ b/karbon/dialogs/Makefile.am
@@ -13,9 +13,9 @@ noinst_HEADERS = \
 	vcolortab.h
 
 libkarbondialogs_la_SOURCES = \
-	vcolordlg.cc \
-	vconfiguredlg.cc \
-	vcolortab.cc
+	vcolordlg.cpp \
+	vconfiguredlg.cpp \
+	vcolortab.cpp
 
 libkarbondialogs_la_METASOURCES = \
 	AUTO
diff --git a/karbon/dialogs/vcolordlg.cc b/karbon/dialogs/vcolordlg.cpp
index ae8e399a5..ae8e399a5 100644
--- a/karbon/dialogs/vcolordlg.cc
+++ b/karbon/dialogs/vcolordlg.cpp
diff --git a/karbon/dialogs/vcolortab.cc b/karbon/dialogs/vcolortab.cpp
index 0b2c3bab9..0b2c3bab9 100644
--- a/karbon/dialogs/vcolortab.cc
+++ b/karbon/dialogs/vcolortab.cpp
diff --git a/karbon/dialogs/vconfiguredlg.cc b/karbon/dialogs/vconfiguredlg.cpp
index 49f874fc4..49f874fc4 100644
--- a/karbon/dialogs/vconfiguredlg.cc
+++ b/karbon/dialogs/vconfiguredlg.cpp
diff --git a/karbon/dialogs/vstrokedlg.cc b/karbon/dialogs/vstrokedlg.cpp
index 27009bf21..27009bf21 100644
--- a/karbon/dialogs/vstrokedlg.cc
+++ b/karbon/dialogs/vstrokedlg.cpp
diff --git a/karbon/dockers/Makefile.am b/karbon/dockers/Makefile.am
index 9df79e8b9..36a918adc 100644
--- a/karbon/dockers/Makefile.am
+++ b/karbon/dockers/Makefile.am
@@ -19,18 +19,18 @@ noinst_HEADERS = \
 	vtransformdocker.h
 
 libkarbondockers_la_SOURCES = \
-	dummy.cc \
-	vcolordocker.cc \
-	vdocumentdocker.cc \
-	vstrokedocker.cc \
-	vstyledocker.cc \
-	vtransformdocker.cc
+	dummy.cpp \
+	vcolordocker.cpp \
+	vdocumentdocker.cpp \
+	vstrokedocker.cpp \
+	vstyledocker.cpp \
+	vtransformdocker.cpp
 
 libkarbondockers_la_METASOURCES = AUTO
 
 DISTCLEANFILES = \
-	dummy.cc
+	dummy.cpp
 
-dummy.cc:
-	echo > dummy.cc
+dummy.cpp:
+	echo > dummy.cpp
 
diff --git a/karbon/dockers/vcolordocker.cc b/karbon/dockers/vcolordocker.cpp
index 328f4f3ff..328f4f3ff 100644
--- a/karbon/dockers/vcolordocker.cc
+++ b/karbon/dockers/vcolordocker.cpp
diff --git a/karbon/dockers/vdocumentdocker.cc b/karbon/dockers/vdocumentdocker.cpp
index dc676a85c..dc676a85c 100644
--- a/karbon/dockers/vdocumentdocker.cc
+++ b/karbon/dockers/vdocumentdocker.cpp
diff --git a/karbon/dockers/vstrokedocker.cc b/karbon/dockers/vstrokedocker.cpp
index 13fe44c16..13fe44c16 100644
--- a/karbon/dockers/vstrokedocker.cc
+++ b/karbon/dockers/vstrokedocker.cpp
diff --git a/karbon/dockers/vstyledocker.cc b/karbon/dockers/vstyledocker.cpp
index 9f3d12e6f..9f3d12e6f 100644
--- a/karbon/dockers/vstyledocker.cc
+++ b/karbon/dockers/vstyledocker.cpp
diff --git a/karbon/dockers/vtransformdocker.cc b/karbon/dockers/vtransformdocker.cpp
index 69c9a87cb..69c9a87cb 100644
--- a/karbon/dockers/vtransformdocker.cc
+++ b/karbon/dockers/vtransformdocker.cpp
diff --git a/karbon/karbon_factory.cc b/karbon/karbon_factory.cpp
index 6dd94ed36..6dd94ed36 100644
--- a/karbon/karbon_factory.cc
+++ b/karbon/karbon_factory.cpp
diff --git a/karbon/karbon_factory_init.cc b/karbon/karbon_factory_init.cpp
index 76315b5e3..76315b5e3 100644
--- a/karbon/karbon_factory_init.cc
+++ b/karbon/karbon_factory_init.cpp
diff --git a/karbon/karbon_part.cc b/karbon/karbon_part.cpp
index a34a4da11..a34a4da11 100644
--- a/karbon/karbon_part.cc
+++ b/karbon/karbon_part.cpp
diff --git a/karbon/karbon_part_iface.cc b/karbon/karbon_part_iface.cpp
index a87b454b3..a87b454b3 100644
--- a/karbon/karbon_part_iface.cc
+++ b/karbon/karbon_part_iface.cpp
diff --git a/karbon/karbon_resourceserver.cc b/karbon/karbon_resourceserver.cpp
index 2b31e4d71..2b31e4d71 100644
--- a/karbon/karbon_resourceserver.cc
+++ b/karbon/karbon_resourceserver.cpp
diff --git a/karbon/karbon_tool_factory.cc b/karbon/karbon_tool_factory.cpp
index 081a9148b..081a9148b 100644
--- a/karbon/karbon_tool_factory.cc
+++ b/karbon/karbon_tool_factory.cpp
diff --git a/karbon/karbon_tool_registry.cc b/karbon/karbon_tool_registry.cpp
index bc699d455..bc699d455 100644
--- a/karbon/karbon_tool_registry.cc
+++ b/karbon/karbon_tool_registry.cpp
diff --git a/karbon/karbon_view.cc b/karbon/karbon_view.cpp
index 3fc8eaf5b..3fc8eaf5b 100644
--- a/karbon/karbon_view.cc
+++ b/karbon/karbon_view.cpp
diff --git a/karbon/karbon_view_iface.cc b/karbon/karbon_view_iface.cpp
index 3fdf17783..3fdf17783 100644
--- a/karbon/karbon_view_iface.cc
+++ b/karbon/karbon_view_iface.cpp
diff --git a/karbon/main.cc b/karbon/main.cpp
index 434134fee..434134fee 100644
--- a/karbon/main.cc
+++ b/karbon/main.cpp
diff --git a/karbon/plugins/flattenpath/Makefile.am b/karbon/plugins/flattenpath/Makefile.am
index 3686a993e..50c0e0b4c 100644
--- a/karbon/plugins/flattenpath/Makefile.am
+++ b/karbon/plugins/flattenpath/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
 
 kde_module_LTLIBRARIES = karbon_flattenpathplugin.la
 
-karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cc
+karbon_flattenpathplugin_la_SOURCES = flattenpathplugin.cpp
 karbon_flattenpathplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/flattenpath/flattenpathplugin.cc b/karbon/plugins/flattenpath/flattenpathplugin.cpp
index 6c4a33d8d..6c4a33d8d 100644
--- a/karbon/plugins/flattenpath/flattenpathplugin.cc
+++ b/karbon/plugins/flattenpath/flattenpathplugin.cpp
diff --git a/karbon/plugins/imagetool/Makefile.am b/karbon/plugins/imagetool/Makefile.am
index d2cb53e31..521e26979 100644
--- a/karbon/plugins/imagetool/Makefile.am
+++ b/karbon/plugins/imagetool/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
 
 kde_module_LTLIBRARIES = karbon_imagetoolplugin.la
 
-karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cc vimagetool.cc
+karbon_imagetoolplugin_la_SOURCES = imagetoolplugin.cpp vimagetool.cpp
 karbon_imagetoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/imagetool/imagetoolplugin.cc b/karbon/plugins/imagetool/imagetoolplugin.cpp
index 5a0d49a8c..5a0d49a8c 100644
--- a/karbon/plugins/imagetool/imagetoolplugin.cc
+++ b/karbon/plugins/imagetool/imagetoolplugin.cpp
diff --git a/karbon/plugins/imagetool/vimagetool.cc b/karbon/plugins/imagetool/vimagetool.cpp
index 749e07a1f..749e07a1f 100644
--- a/karbon/plugins/imagetool/vimagetool.cc
+++ b/karbon/plugins/imagetool/vimagetool.cpp
diff --git a/karbon/plugins/insertknots/Makefile.am b/karbon/plugins/insertknots/Makefile.am
index a8b9ce0de..5605f1ef0 100644
--- a/karbon/plugins/insertknots/Makefile.am
+++ b/karbon/plugins/insertknots/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
 
 kde_module_LTLIBRARIES = karbon_insertknotsplugin.la
 
-karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cc
+karbon_insertknotsplugin_la_SOURCES = insertknotsplugin.cpp
 karbon_insertknotsplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/insertknots/insertknotsplugin.cc b/karbon/plugins/insertknots/insertknotsplugin.cpp
index 19a1e4d56..19a1e4d56 100644
--- a/karbon/plugins/insertknots/insertknotsplugin.cc
+++ b/karbon/plugins/insertknots/insertknotsplugin.cpp
diff --git a/karbon/plugins/roundcorners/Makefile.am b/karbon/plugins/roundcorners/Makefile.am
index 1b56da82c..b05a4f150 100644
--- a/karbon/plugins/roundcorners/Makefile.am
+++ b/karbon/plugins/roundcorners/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
 
 kde_module_LTLIBRARIES = karbon_roundcornersplugin.la
 
-karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cc
+karbon_roundcornersplugin_la_SOURCES = roundcornersplugin.cpp
 karbon_roundcornersplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/roundcorners/roundcornersplugin.cc b/karbon/plugins/roundcorners/roundcornersplugin.cpp
index 1841c5eb1..1841c5eb1 100644
--- a/karbon/plugins/roundcorners/roundcornersplugin.cc
+++ b/karbon/plugins/roundcorners/roundcornersplugin.cpp
diff --git a/karbon/plugins/shadoweffect/Makefile.am b/karbon/plugins/shadoweffect/Makefile.am
index a8e622a05..dc459d00a 100644
--- a/karbon/plugins/shadoweffect/Makefile.am
+++ b/karbon/plugins/shadoweffect/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOPAINTER_INCLUDES) -I$(top_srcdir)/karbon  -I$
 
 kde_module_LTLIBRARIES = karbon_shadoweffectplugin.la
 
-karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cc vshadowdecorator.cc 
+karbon_shadoweffectplugin_la_SOURCES = shadoweffectplugin.cpp vshadowdecorator.cpp 
 karbon_shadoweffectplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 					$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/shadoweffect/shadoweffectplugin.cc b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp
index 019b4024a..019b4024a 100644
--- a/karbon/plugins/shadoweffect/shadoweffectplugin.cc
+++ b/karbon/plugins/shadoweffect/shadoweffectplugin.cpp
diff --git a/karbon/plugins/shadoweffect/vshadowdecorator.cc b/karbon/plugins/shadoweffect/vshadowdecorator.cpp
index 99ee8c8c3..99ee8c8c3 100644
--- a/karbon/plugins/shadoweffect/vshadowdecorator.cc
+++ b/karbon/plugins/shadoweffect/vshadowdecorator.cpp
diff --git a/karbon/plugins/whirlpinch/Makefile.am b/karbon/plugins/whirlpinch/Makefile.am
index 3272ffd52..4a30bc85b 100644
--- a/karbon/plugins/whirlpinch/Makefile.am
+++ b/karbon/plugins/whirlpinch/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon -I$(top_srcdir)/karbon/cor
 
 kde_module_LTLIBRARIES = karbon_whirlpinchplugin.la
 
-karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cc
+karbon_whirlpinchplugin_la_SOURCES = whirlpinchplugin.cpp
 karbon_whirlpinchplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOPAINTER) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				../../libkarboncommon.la
 
diff --git a/karbon/plugins/whirlpinch/whirlpinchplugin.cc b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp
index d2b91a185..d2b91a185 100644
--- a/karbon/plugins/whirlpinch/whirlpinchplugin.cc
+++ b/karbon/plugins/whirlpinch/whirlpinchplugin.cpp
diff --git a/karbon/plugins/zoomtool/Makefile.am b/karbon/plugins/zoomtool/Makefile.am
index a3cb2f096..2c90805ae 100644
--- a/karbon/plugins/zoomtool/Makefile.am
+++ b/karbon/plugins/zoomtool/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(KOFFICE_INCLUDES) -I$(top_srcdir)/karbon  -I$(top_srcdir)/karbon/co
 
 kde_module_LTLIBRARIES = karbon_zoomtoolplugin.la
 
-karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cc zoomtoolplugin.cc
+karbon_zoomtoolplugin_la_SOURCES = vzoomtool.cpp zoomtoolplugin.cpp
 karbon_zoomtoolplugin_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) \
 				$(LIB_KOPAINTER) ../../libkarboncommon.la
 
diff --git a/karbon/plugins/zoomtool/vzoomtool.cc b/karbon/plugins/zoomtool/vzoomtool.cpp
index 1cecb94a8..1cecb94a8 100644
--- a/karbon/plugins/zoomtool/vzoomtool.cc
+++ b/karbon/plugins/zoomtool/vzoomtool.cpp
diff --git a/karbon/plugins/zoomtool/zoomtoolplugin.cc b/karbon/plugins/zoomtool/zoomtoolplugin.cpp
index 3ad73ee9f..3ad73ee9f 100644
--- a/karbon/plugins/zoomtool/zoomtoolplugin.cc
+++ b/karbon/plugins/zoomtool/zoomtoolplugin.cpp
diff --git a/karbon/render/Makefile.am b/karbon/render/Makefile.am
index 5f604f6cf..42c837724 100644
--- a/karbon/render/Makefile.am
+++ b/karbon/render/Makefile.am
@@ -21,14 +21,14 @@ noinst_HEADERS = \
 	vkopainter.h
 
 libvpainter_la_SOURCES = \
-	vpainterfactory.cc \
-	vqpainter.cc \
+	vpainterfactory.cpp \
+	vqpainter.cpp \
 	art_render_pattern.c \
 	art_render_misc.c \
 	art_rgb_svp.c \
 	art_rgb.c \
 	art_rgba_affine.c \
-	vkopainter.cc
+	vkopainter.cpp
 
 libvpainter_la_METASOURCES = \
 	AUTO
diff --git a/karbon/render/vkopainter.cc b/karbon/render/vkopainter.cpp
index 3f81f3c32..3f81f3c32 100644
--- a/karbon/render/vkopainter.cc
+++ b/karbon/render/vkopainter.cpp
diff --git a/karbon/render/vpainterfactory.cc b/karbon/render/vpainterfactory.cpp
index 2d36882d9..2d36882d9 100644
--- a/karbon/render/vpainterfactory.cc
+++ b/karbon/render/vpainterfactory.cpp
diff --git a/karbon/render/vqpainter.cc b/karbon/render/vqpainter.cpp
index 51819ae30..51819ae30 100644
--- a/karbon/render/vqpainter.cc
+++ b/karbon/render/vqpainter.cpp
diff --git a/karbon/shapes/Makefile.am b/karbon/shapes/Makefile.am
index bbb7899b1..5f8ba408b 100644
--- a/karbon/shapes/Makefile.am
+++ b/karbon/shapes/Makefile.am
@@ -16,13 +16,13 @@ noinst_HEADERS = \
 	vstar.h
 
 libkarbonshapes_la_SOURCES = \
-	vellipse.cc \
-	vpolyline.cc \
-	vpolygon.cc \
-	vrectangle.cc \
-	vsinus.cc \
-	vspiral.cc \
-	vstar.cc
+	vellipse.cpp \
+	vpolyline.cpp \
+	vpolygon.cpp \
+	vrectangle.cpp \
+	vsinus.cpp \
+	vspiral.cpp \
+	vstar.cpp
 
 libkarbonshapes_la_METASOURCES = \
 	AUTO
diff --git a/karbon/shapes/vellipse.cc b/karbon/shapes/vellipse.cpp
index 1a9462b81..1a9462b81 100644
--- a/karbon/shapes/vellipse.cc
+++ b/karbon/shapes/vellipse.cpp
diff --git a/karbon/shapes/vpolygon.cc b/karbon/shapes/vpolygon.cpp
index fdf0f745d..fdf0f745d 100644
--- a/karbon/shapes/vpolygon.cc
+++ b/karbon/shapes/vpolygon.cpp
diff --git a/karbon/shapes/vpolyline.cc b/karbon/shapes/vpolyline.cpp
index 519422ed9..519422ed9 100644
--- a/karbon/shapes/vpolyline.cc
+++ b/karbon/shapes/vpolyline.cpp
diff --git a/karbon/shapes/vrectangle.cc b/karbon/shapes/vrectangle.cpp
index 3190c93c9..3190c93c9 100644
--- a/karbon/shapes/vrectangle.cc
+++ b/karbon/shapes/vrectangle.cpp
diff --git a/karbon/shapes/vsinus.cc b/karbon/shapes/vsinus.cpp
index f27cee4b3..f27cee4b3 100644
--- a/karbon/shapes/vsinus.cc
+++ b/karbon/shapes/vsinus.cpp
diff --git a/karbon/shapes/vspiral.cc b/karbon/shapes/vspiral.cpp
index ff2f691e0..ff2f691e0 100644
--- a/karbon/shapes/vspiral.cc
+++ b/karbon/shapes/vspiral.cpp
diff --git a/karbon/shapes/vstar.cc b/karbon/shapes/vstar.cpp
index a43413c99..a43413c99 100644
--- a/karbon/shapes/vstar.cc
+++ b/karbon/shapes/vstar.cpp
diff --git a/karbon/tools/Makefile.am b/karbon/tools/Makefile.am
index 06d4e3059..44880a130 100644
--- a/karbon/tools/Makefile.am
+++ b/karbon/tools/Makefile.am
@@ -36,25 +36,25 @@ noinst_HEADERS = \
 	vdefaulttools.h
 
 karbon_defaulttools_la_SOURCES = \
-	vcurvefit.cc \
-	vrotatetool.cc \
-	vselectnodestool.cc \
-	vselecttool.cc \
-	vsheartool.cc \
-	vellipsetool.cc \
-	vgradienttool.cc \
-	vpatterntool.cc \
-	vpenciltool.cc \
-	vpolygontool.cc \
-	vpolylinetool.cc \
-	vrectangletool.cc \
-	vroundrecttool.cc \
-	vshapetool.cc \
-	vsinustool.cc \
-	vspiraltool.cc \
-	vstartool.cc \
-	vtexttool.cc \
-	vdefaulttools.cc
+	vcurvefit.cpp \
+	vrotatetool.cpp \
+	vselectnodestool.cpp \
+	vselecttool.cpp \
+	vsheartool.cpp \
+	vellipsetool.cpp \
+	vgradienttool.cpp \
+	vpatterntool.cpp \
+	vpenciltool.cpp \
+	vpolygontool.cpp \
+	vpolylinetool.cpp \
+	vrectangletool.cpp \
+	vroundrecttool.cpp \
+	vshapetool.cpp \
+	vsinustool.cpp \
+	vspiraltool.cpp \
+	vstartool.cpp \
+	vtexttool.cpp \
+	vdefaulttools.cpp
 
 karbon_defaulttools_la_LIBADD = $(LIB_TDEPARTS) $(LIB_KOFFICECORE) $(LIB_KOFFICEUI) $(LIB_KOPAINTER) ../libkarboncommon.la
 karbon_defaulttools_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio
diff --git a/karbon/tools/vcurvefit.cc b/karbon/tools/vcurvefit.cpp
index 40d7b7e3e..40d7b7e3e 100644
--- a/karbon/tools/vcurvefit.cc
+++ b/karbon/tools/vcurvefit.cpp
diff --git a/karbon/tools/vdefaulttools.cc b/karbon/tools/vdefaulttools.cpp
index 3be8a8bd2..3be8a8bd2 100644
--- a/karbon/tools/vdefaulttools.cc
+++ b/karbon/tools/vdefaulttools.cpp
diff --git a/karbon/tools/vellipsetool.cc b/karbon/tools/vellipsetool.cpp
index 170a51dde..170a51dde 100644
--- a/karbon/tools/vellipsetool.cc
+++ b/karbon/tools/vellipsetool.cpp
diff --git a/karbon/tools/vgradienttool.cc b/karbon/tools/vgradienttool.cpp
index e7d2db3ca..e7d2db3ca 100644
--- a/karbon/tools/vgradienttool.cc
+++ b/karbon/tools/vgradienttool.cpp
diff --git a/karbon/tools/vpatterntool.cc b/karbon/tools/vpatterntool.cpp
index 8c42d5e00..8c42d5e00 100644
--- a/karbon/tools/vpatterntool.cc
+++ b/karbon/tools/vpatterntool.cpp
diff --git a/karbon/tools/vpenciltool.cc b/karbon/tools/vpenciltool.cpp
index 1239923ea..1239923ea 100644
--- a/karbon/tools/vpenciltool.cc
+++ b/karbon/tools/vpenciltool.cpp
diff --git a/karbon/tools/vpolygontool.cc b/karbon/tools/vpolygontool.cpp
index de4756919..de4756919 100644
--- a/karbon/tools/vpolygontool.cc
+++ b/karbon/tools/vpolygontool.cpp
diff --git a/karbon/tools/vpolylinetool.cc b/karbon/tools/vpolylinetool.cpp
index 38ac9d256..38ac9d256 100644
--- a/karbon/tools/vpolylinetool.cc
+++ b/karbon/tools/vpolylinetool.cpp
diff --git a/karbon/tools/vrectangletool.cc b/karbon/tools/vrectangletool.cpp
index 4572cc237..4572cc237 100644
--- a/karbon/tools/vrectangletool.cc
+++ b/karbon/tools/vrectangletool.cpp
diff --git a/karbon/tools/vrotatetool.cc b/karbon/tools/vrotatetool.cpp
index 4230cac7f..4230cac7f 100644
--- a/karbon/tools/vrotatetool.cc
+++ b/karbon/tools/vrotatetool.cpp
diff --git a/karbon/tools/vroundrecttool.cc b/karbon/tools/vroundrecttool.cpp
index 02f694c69..02f694c69 100644
--- a/karbon/tools/vroundrecttool.cc
+++ b/karbon/tools/vroundrecttool.cpp
diff --git a/karbon/tools/vselectnodestool.cc b/karbon/tools/vselectnodestool.cpp
index 2a3c38bba..2a3c38bba 100644
--- a/karbon/tools/vselectnodestool.cc
+++ b/karbon/tools/vselectnodestool.cpp
diff --git a/karbon/tools/vselecttool.cc b/karbon/tools/vselecttool.cpp
index b2c28d661..b2c28d661 100644
--- a/karbon/tools/vselecttool.cc
+++ b/karbon/tools/vselecttool.cpp
diff --git a/karbon/tools/vshapetool.cc b/karbon/tools/vshapetool.cpp
index 9b59104d1..9b59104d1 100644
--- a/karbon/tools/vshapetool.cc
+++ b/karbon/tools/vshapetool.cpp
diff --git a/karbon/tools/vsheartool.cc b/karbon/tools/vsheartool.cpp
index 4bc80810e..4bc80810e 100644
--- a/karbon/tools/vsheartool.cc
+++ b/karbon/tools/vsheartool.cpp
diff --git a/karbon/tools/vsinustool.cc b/karbon/tools/vsinustool.cpp
index 12dbe1282..12dbe1282 100644
--- a/karbon/tools/vsinustool.cc
+++ b/karbon/tools/vsinustool.cpp
diff --git a/karbon/tools/vspiraltool.cc b/karbon/tools/vspiraltool.cpp
index c414be41f..c414be41f 100644
--- a/karbon/tools/vspiraltool.cc
+++ b/karbon/tools/vspiraltool.cpp
diff --git a/karbon/tools/vstartool.cc b/karbon/tools/vstartool.cpp
index 9a92cd376..9a92cd376 100644
--- a/karbon/tools/vstartool.cc
+++ b/karbon/tools/vstartool.cpp
diff --git a/karbon/tools/vtexttool.cc b/karbon/tools/vtexttool.cpp
index e7fa848d2..e7fa848d2 100644
--- a/karbon/tools/vtexttool.cc
+++ b/karbon/tools/vtexttool.cpp
diff --git a/karbon/usablity-review.txt b/karbon/usablity-review.txt
index 5d2eb8b44..a977c8d0b 100644
--- a/karbon/usablity-review.txt
+++ b/karbon/usablity-review.txt
@@ -1,6 +1,6 @@
 Since I think the following link is closely related, I am including it here :
 
-http://dan.ostrowski.cc/suggestions.html
+http://dan.ostrowski.cpp/suggestions.html
 
 Rob Buis <buis@kde.org>
 17-12-2003
diff --git a/karbon/visitors/Makefile.am b/karbon/visitors/Makefile.am
index 60bc3caa2..e4ce58ccc 100644
--- a/karbon/visitors/Makefile.am
+++ b/karbon/visitors/Makefile.am
@@ -17,12 +17,12 @@ noinst_HEADERS = \
 	vcomputeboundingbox.h
 
 libkarbonvisitors_la_SOURCES = \
-	vselectnodes.cc \
-	vselectobjects.cc \
-	vdrawselection.cc \
-	vselectiondesc.cc \
-	vtransformnodes.cc \
-	vcomputeboundingbox.cc
+	vselectnodes.cpp \
+	vselectobjects.cpp \
+	vdrawselection.cpp \
+	vselectiondesc.cpp \
+	vtransformnodes.cpp \
+	vcomputeboundingbox.cpp
 
 libkarbonvisitors_la_METASOURCES = \
 	AUTO
diff --git a/karbon/visitors/vcomputeboundingbox.cc b/karbon/visitors/vcomputeboundingbox.cpp
index e303a2f97..e303a2f97 100644
--- a/karbon/visitors/vcomputeboundingbox.cc
+++ b/karbon/visitors/vcomputeboundingbox.cpp
diff --git a/karbon/visitors/vdrawselection.cc b/karbon/visitors/vdrawselection.cpp
index dbd932471..dbd932471 100644
--- a/karbon/visitors/vdrawselection.cc
+++ b/karbon/visitors/vdrawselection.cpp
diff --git a/karbon/visitors/vselectiondesc.cc b/karbon/visitors/vselectiondesc.cpp
index 8518b7b62..8518b7b62 100644
--- a/karbon/visitors/vselectiondesc.cc
+++ b/karbon/visitors/vselectiondesc.cpp
diff --git a/karbon/visitors/vselectnodes.cc b/karbon/visitors/vselectnodes.cpp
index 00f56de39..00f56de39 100644
--- a/karbon/visitors/vselectnodes.cc
+++ b/karbon/visitors/vselectnodes.cpp
diff --git a/karbon/visitors/vselectobjects.cc b/karbon/visitors/vselectobjects.cpp
index 060eeacbc..060eeacbc 100644
--- a/karbon/visitors/vselectobjects.cc
+++ b/karbon/visitors/vselectobjects.cpp
diff --git a/karbon/visitors/vtransformnodes.cc b/karbon/visitors/vtransformnodes.cpp
index 102bb33d6..102bb33d6 100644
--- a/karbon/visitors/vtransformnodes.cc
+++ b/karbon/visitors/vtransformnodes.cpp
diff --git a/karbon/vtool.cc b/karbon/vtool.cpp
index 140d65131..140d65131 100644
--- a/karbon/vtool.cc
+++ b/karbon/vtool.cpp
diff --git a/karbon/vtoolcontroller.cc b/karbon/vtoolcontroller.cpp
index 4a8eaa9fe..4a8eaa9fe 100644
--- a/karbon/vtoolcontroller.cc
+++ b/karbon/vtoolcontroller.cpp
diff --git a/karbon/widgets/Makefile.am b/karbon/widgets/Makefile.am
index c78d166c7..35828299a 100644
--- a/karbon/widgets/Makefile.am
+++ b/karbon/widgets/Makefile.am
@@ -27,27 +27,27 @@ noinst_HEADERS = \
 	vruler.h
 
 libkarbonwidgets_la_SOURCES = \
-	dummy.cc \
-	vcanvas.cc \
-	vcolorslider.cc \
-	vgradientwidget.cc \
-	vgradienttabwidget.cc \
-	vreference.cc \
-	vstrokefillpreview.cc \
-	vtranslate.cc \
-	vselecttoolbar.cc \
-	vsmallpreview.cc \
-	vstatebutton.cc \
-	vtoolbox.cc \
-	vtypebuttonbox.cc \
-	vruler.cc
+	dummy.cpp \
+	vcanvas.cpp \
+	vcolorslider.cpp \
+	vgradientwidget.cpp \
+	vgradienttabwidget.cpp \
+	vreference.cpp \
+	vstrokefillpreview.cpp \
+	vtranslate.cpp \
+	vselecttoolbar.cpp \
+	vsmallpreview.cpp \
+	vstatebutton.cpp \
+	vtoolbox.cpp \
+	vtypebuttonbox.cpp \
+	vruler.cpp
 
 libkarbonwidgets_la_METASOURCES = \
 	AUTO
 
 DISTCLEANFILES = \
-	dummy.cc
+	dummy.cpp
 
-dummy.cc:
-	echo > dummy.cc
+dummy.cpp:
+	echo > dummy.cpp
 
diff --git a/karbon/widgets/vcanvas.cc b/karbon/widgets/vcanvas.cpp
index d4cd64972..d4cd64972 100644
--- a/karbon/widgets/vcanvas.cc
+++ b/karbon/widgets/vcanvas.cpp
diff --git a/karbon/widgets/vcolorslider.cc b/karbon/widgets/vcolorslider.cpp
index 42c4f0588..d2d0a0ab5 100644
--- a/karbon/widgets/vcolorslider.cc
+++ b/karbon/widgets/vcolorslider.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-/* vcolorslider.cc */
+/* vcolorslider.cpp */
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/karbon/widgets/vgradienttabwidget.cc b/karbon/widgets/vgradienttabwidget.cpp
index 5c57efaba..5c57efaba 100644
--- a/karbon/widgets/vgradienttabwidget.cc
+++ b/karbon/widgets/vgradienttabwidget.cpp
diff --git a/karbon/widgets/vgradientwidget.cc b/karbon/widgets/vgradientwidget.cpp
index 64cbf3731..64cbf3731 100644
--- a/karbon/widgets/vgradientwidget.cc
+++ b/karbon/widgets/vgradientwidget.cpp
diff --git a/karbon/widgets/vreference.cc b/karbon/widgets/vreference.cpp
index c85800002..c4e96ddff 100644
--- a/karbon/widgets/vreference.cc
+++ b/karbon/widgets/vreference.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-/* vreference.cc */
+/* vreference.cpp */
 
 #include <tqbuttongroup.h>
 #include <tqlayout.h>
diff --git a/karbon/widgets/vruler.cc b/karbon/widgets/vruler.cpp
index c0ff0a201..c0ff0a201 100644
--- a/karbon/widgets/vruler.cc
+++ b/karbon/widgets/vruler.cpp
diff --git a/karbon/widgets/vselecttoolbar.cc b/karbon/widgets/vselecttoolbar.cpp
index 2e32a6773..b0dc9a7c8 100644
--- a/karbon/widgets/vselecttoolbar.cc
+++ b/karbon/widgets/vselecttoolbar.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-/* vselecttoolbar.cc */
+/* vselecttoolbar.cpp */
 
 #include <tqlabel.h>
 
diff --git a/karbon/widgets/vsmallpreview.cc b/karbon/widgets/vsmallpreview.cpp
index 28a8dd27d..c422104ea 100644
--- a/karbon/widgets/vsmallpreview.cc
+++ b/karbon/widgets/vsmallpreview.cpp
@@ -18,7 +18,7 @@
  * Boston, MA 02110-1301, USA.
 */
 
-/* vsmallpreview.cc */
+/* vsmallpreview.cpp */
 #include <tqcolor.h>
 #include <tqframe.h>
 #include <tqlabel.h>
diff --git a/karbon/widgets/vstatebutton.cc b/karbon/widgets/vstatebutton.cpp
index 1ea8e27a7..1ea8e27a7 100644
--- a/karbon/widgets/vstatebutton.cc
+++ b/karbon/widgets/vstatebutton.cpp
diff --git a/karbon/widgets/vstrokefillpreview.cc b/karbon/widgets/vstrokefillpreview.cpp
index f69d5d855..f69d5d855 100644
--- a/karbon/widgets/vstrokefillpreview.cc
+++ b/karbon/widgets/vstrokefillpreview.cpp
diff --git a/karbon/widgets/vtoolbox.cc b/karbon/widgets/vtoolbox.cpp
index e048555cb..e048555cb 100644
--- a/karbon/widgets/vtoolbox.cc
+++ b/karbon/widgets/vtoolbox.cpp
diff --git a/karbon/widgets/vtranslate.cc b/karbon/widgets/vtranslate.cpp
index 35a25a719..35a25a719 100644
--- a/karbon/widgets/vtranslate.cc
+++ b/karbon/widgets/vtranslate.cpp
diff --git a/karbon/widgets/vtypebuttonbox.cc b/karbon/widgets/vtypebuttonbox.cpp
index 9a98a125a..9a98a125a 100644
--- a/karbon/widgets/vtypebuttonbox.cc
+++ b/karbon/widgets/vtypebuttonbox.cpp
diff --git a/kchart/ChangeLog b/kchart/ChangeLog
index 5d38df2f5..1d9263a9b 100644
--- a/kchart/ChangeLog
+++ b/kchart/ChangeLog
@@ -13,16 +13,16 @@
 	Start on bug 134194: Impossible to change the data range.
 	Step 1: Actually set and read the data area.
 	* kchart_params.h: store the data area in the params.
-	* kchartDataConfigPage.cc (init): Set dataArea lineEdit.
+	* kchartDataConfigPage.cpp (init): Set dataArea lineEdit.
 	(defaults): clear it
 	(apply): set dataArea from the lineEdit
-	* kchartWizardSelectDataFormatPage.cc (constructor): set dataArea lineEdit 
+	* kchartWizardSelectDataFormatPage.cpp (constructor): set dataArea lineEdit 
 	(apply): set dataArea from the lineEdit
 
 2006-11-06  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix  bug 128758: misinterpretation of the checkbox "first row as label"
-	* kchart_part.cc (createLabelsAndLegend): Pass parameters as
+	* kchart_part.cpp (createLabelsAndLegend): Pass parameters as
 	references.
 
 2006-10-29  Inge Wallin  <inge@lysator.liu.se>
@@ -31,38 +31,38 @@
 
 2006-10-10  Inge Wallin  <inge@lysator.liu.se>
 
-	* kchart_params.cc (saveOasisAxis): Add saving of axis titles.
+	* kchart_params.cpp (saveOasisAxis): Add saving of axis titles.
 
 2006-10-06  ----  Version 1.6.0 tagged  ----
 
 2006-10-03  Inge Wallin  <inge@lysator.liu.se>
 
-	* kchart_params.cc (loadOasisPlotarea): Fix bug.  Pie charts use
+	* kchart_params.cpp (loadOasisPlotarea): Fix bug.  Pie charts use
 	only the y axis, not only the x axis.
 
 2006-09-28  Inge Wallin  <inge@lysator.liu.se>
 
-	* kchart_params.cc (loadOasisPlotarea): Add support for
+	* kchart_params.cpp (loadOasisPlotarea): Add support for
 	chart:series-source (row or column):
 
 2006-08-11  Inge Wallin  <inge@lysator.liu.se>
 
 	Only show checkboxes in config dialog if applicable.
 	* kchart_params.h (KChartParams::part): new method
-	* kchartDataConfigPage.cc: Only show the checkboxes "First row/col
+	* kchartDataConfigPage.cpp: Only show the checkboxes "First row/col
 	as headers" if we have external data.
 
 2006-08-06  Inge Wallin  <inge@lysator.liu.se>
 
 	Disable "First row/col as label in the data editor.
-	* kchartDataEditor.cc (kchartDataEditor): Disable checkboxes
+	* kchartDataEditor.cpp (kchartDataEditor): Disable checkboxes
 	
 2006-08-04  Inge Wallin  <inge@lysator.liu.se>
 
 	Let the Data Editor use icons for it's buttons.
-	* kchartDataEditor.cc (kchartDataEditor): Make the insert / delete
+	* kchartDataEditor.cpp (kchartDataEditor): Make the insert / delete
 	row / col buttons show an icon instead of text.
-	* kchartDataEditor.cc (addDocs): Add ToolTips to the buttons.
+	* kchartDataEditor.cpp (addDocs): Add ToolTips to the buttons.
 
 2006-07-18  Inge Wallin  <inge@lysator.liu.se>
 
@@ -71,7 +71,7 @@
 	* kchartDataEditor.{h,cc} (currentChanged): New method
 	(m_insertRowButton, m_removeRowButton, m_insertRowButton,
 	  m_removeRowButton): New members
-	* kchartDataEditor.cc (removeCurrentRow, removeCurrentCol): Don't
+	* kchartDataEditor.cpp (removeCurrentRow, removeCurrentCol): Don't
 	allow to remove a row or column if it's the first column or if
 	there are only 2 of them.
 
@@ -80,9 +80,9 @@
 2006-07-17  Inge Wallin  <inge@lysator.liu.se>
 
 	Add "first row/col as legend" checkboxes to data editor.
-	* kchartDataEditor.cc (kchartDataEditor): Enable existing code
-	* kchartDataEditor.cc (setData): Enable existing code
-	* kchartDataEditor.cc (getData): Enable existing code
+	* kchartDataEditor.cpp (kchartDataEditor): Enable existing code
+	* kchartDataEditor.cpp (setData): Enable existing code
+	* kchartDataEditor.cpp (getData): Enable existing code
 
 	Simplify paintContent():
 	* kchart_part.{h,cc} (createLabelsAndLegend): New function
@@ -99,7 +99,7 @@
 	Fix bug 108770: [PATCH] kchart should have a format menu
 	* kchart.rc (Format): New menu
 	(KChartTypes toolbar): place to the left
-	* kchart_view.cc (KChartView::KChartView): change strings for some
+	* kchart_view.cpp (KChartView::KChartView): change strings for some
 	actions.
 
 2005-08-08  Inge Wallin  <inge@lysator.liu.se>
@@ -110,7 +110,7 @@
 2005-07-28  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix bug 108461: Bug in generation of HiLo charts
-	* kchart_part.cc (paintContent): Add code to handle HiLo chart
+	* kchart_part.cpp (paintContent): Add code to handle HiLo chart
 	separately.
 
 	General code cleaning.
@@ -153,7 +153,7 @@
 	* kdchart/KDChartParams.h (lineColor): return _lineColor again.
 	* kdchart/KDChartParams_io.h (saveXML): Only save the line color
 	if it is non-null.
-	* kchart_part.cc (setAxisDefaults): Always set lineColor to
+	* kchart_part.cpp (setAxisDefaults): Always set lineColor to
 	null. This compensates for the (now fixed) bug in saving when
 	reading back old charts.
 	
@@ -169,7 +169,7 @@
 	Fix bug 99995: KChart should be able to import CSV data
 	* kchart_part.{h,cc} (doSetData): new method broken out of setData()
 	(setData): Call doSetData
-	kchart_view.cc (importData): Get data from the dialog and call
+	kchart_view.cpp (importData): Get data from the dialog and call
 	KChartPart::doSetData()
 
 	Code cleaning
@@ -195,7 +195,7 @@
 	negative numbers in a 3D bar chart. If all bars are <= 0 the bars
 	with value 0 will still have an arrow.
 	
-        * kchart_part.cc (KChartPart), kchart_params.cc (KChartParams):
+        * kchart_part.cpp (KChartPart), kchart_params.cpp (KChartParams):
 	Make sure the excess arrow is solid by calling
 	setDrawSolidExcessArrows(true) after a chart has been loaded or
 	created.
@@ -203,7 +203,7 @@
 2005-04-13  Inge Wallin  <inge@lysator.liu.se>
 
 	CSV import: Disable irrelevant formats
-	* csvimportdialog.cc (CSVImportDialog): Disable formats Currency
+	* csvimportdialog.cpp (CSVImportDialog): Disable formats Currency
 	and Date.
 
 	Disable "Import Data" if inside KSpread
@@ -214,7 +214,7 @@
 
 	Get a file name for "Import Data" and actually read data.
 	(No new strings).
-	* kchart_view.cc (importData): Open a file dialog, and read data.
+	* kchart_view.cpp (importData): Open a file dialog, and read data.
 	
 	----------------------------------------------------------------
 
@@ -224,31 +224,31 @@
 	* csvimportdialogui.ui: new file
 	* Makefile.am: Add files above
 	* kchart.rc (File menu): Add Action import_data
-	* kchart_view.cc (import_data): new TDEAction
+	* kchart_view.cpp (import_data): new TDEAction
 	(importData): new slot
 	
 
 2005-04-10  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix the margins on the pie config page.
-	* kchartParameterPieConfigPage.cc (KChartParameterPieConfigPage):
+	* kchartParameterPieConfigPage.cpp (KChartParameterPieConfigPage):
 	Added a toplevel layout.
 
 2005-04-07  Fredrik Edemar  <f_edemar@linux.se>
 
-        * kchart_part.cc (KChartPart): Set modified when the chart type is
+        * kchart_part.cpp (KChartPart): Set modified when the chart type is
 	changed.
 
 2005-04-07  Inge Wallin  <inge@lysator.liu.se>
 
-	* kchartWizardLabelsLegendPage.cc (KChartWizardLabelsLegendPage):
+	* kchartWizardLabelsLegendPage.cpp (KChartWizardLabelsLegendPage):
 	Reenable titles for X and Y axis.
 
 2005-04-07  Fredrik Edemar  <f_edemar@linux.se>
 
-	* kchart_part.cc (KChartPart): The decimal symbol and thousends
+	* kchart_part.cpp (KChartPart): The decimal symbol and thousends
 	separator is the same as the rest of KDE.
-	* kchart_params.cc (KChartParams): Revert my last change: use
+	* kchart_params.cpp (KChartParams): Revert my last change: use
 	KDChart's default precision instead.
 	* KDChart (KDChartAxesPainter.cpp): The axis label: Use at most 6
 	digits after the decimal point.
@@ -258,7 +258,7 @@
 	Fix bug 103267: Unreasonable precison in axis values 
 	* kchartParameterConfigPage.{h,cc} (KChartParameterConfigPage):
 	Add settings for decimal precision for the left axis.
-	* kchart_params.cc (KChartParams): Set 2 as default decimal
+	* kchart_params.cpp (KChartParams): Set 2 as default decimal
 	precision.
 	* KDChart: If the totalLen property is >0, the text label should
 	be truncated at the position of totalLen.
@@ -268,7 +268,7 @@
 2005-04-06  Inge Wallin  <inge@lysator.liu.se>
 
 	Enable axis titles again.
-	* kchartParameterConfigPage.cc (KChartParameterConfigPage): Don't
+	* kchartParameterConfigPage.cpp (KChartParameterConfigPage): Don't
 	disable xtitle and ytitle.
 	
 	----------------------------------------------------------------
@@ -276,15 +276,15 @@
 	Fix line specific settings
 	* kchartConfigDialog.{h,cc} (linepage3d): resurrected page
 	(all members except 
-	* kchartLine3dConfigPage.cc (lineMarkers): new method
+	* kchartLine3dConfigPage.cpp (lineMarkers): new method
 	(all 3d stuff): disabled
-	* kchartParameterConfigPage.cc (lineMarker): moved to the line
+	* kchartParameterConfigPage.cpp (lineMarker): moved to the line
 	page.
 
 	----------------------------------------------------------------
 
 	Fix pie specific settings.
-	* kchartConfigDialog.cc (constructor): Move all type specific
+	* kchartConfigDialog.cpp (constructor): Move all type specific
 	settings immediately after the subtype page.
 	(constructor): disable the piepage.
 	* kchartParameterPieConfigPage.{h,cc} (explode): new member
@@ -292,10 +292,10 @@
 	* kchartPieConfigPage (explose): Moved to kchartParameterPieConfigPage.
 	
 	Code cleaning
-	* kchartConfigDialog.cc (constructor): order initializations
+	* kchartConfigDialog.cpp (constructor): order initializations
 	logically
 	(all): Fix indentation and other smaller stuff.
-	* kchart_view.cc: Remove reduntant variable actionExtraCreateTemplate.
+	* kchart_view.cpp: Remove reduntant variable actionExtraCreateTemplate.
 
 2005-04-05  Fredrik Edemar  <f_edemar@linux.se>
     * Use a better layout in KChartParameterPieConfigPage and KChartParameterPolarConfigPage.
@@ -328,7 +328,7 @@
 
 	Fix bug 102414: KChart shows the startup dialog even when embedded
 	into a spreadsheet. 
-	* kchart_part.cc (constructor): Initialize members but don't call
+	* kchart_part.cpp (constructor): Initialize members but don't call
 	initDoc().
 	(initDoc): don't initialize members, and return immediately if
 	called for an embedded chart.
@@ -342,14 +342,14 @@
 	(misc): set m_modified if data changed, including headers.
 	* kchart_part.{h,cc} (slotModified): new slot
 	(setData): connect wizard::finished() with slotModified
-	* kchart_view.cc (edit, apply, wizard): call setModified() in document
+	* kchart_view.cpp (edit, apply, wizard): call setModified() in document
 
 2005-03-23  Inge Wallin  <inge@lysator.liu.se>
 
 	Implement wish 45358: KChart start up dialog?
-	* kchart_part.cc (initNullChart): New method
+	* kchart_part.cpp (initNullChart): New method
 	(initDoc): Call KoTemplateChooseDia().
-	* kchart_view.cc (KChartView): Don't initialize the standard chart.
+	* kchart_view.cpp (KChartView): Don't initialize the standard chart.
 
 	----------------------------------------------------------------
 
@@ -361,7 +361,7 @@
 	----------------------------------------------------------------
 
 	Bug fix.
-	* kchartDataEditor.cc (setCols): Set width for all new columns.
+	* kchartDataEditor.cpp (setCols): Set width for all new columns.
 	(misc): Code cleaning
 	
 	Code cleaning
@@ -382,22 +382,22 @@
 2005-03-18  Inge Wallin  <inge@lysator.liu.se>
 
 	Improve layout for 3D bar chart parameters.
-	* kchartParameter3dConfigPage.cc (KChartParameter3dConfigPage):
+	* kchartParameter3dConfigPage.cpp (KChartParameter3dConfigPage):
 	Improve layout.
 
 2005-03-17  Inge Wallin  <inge@lysator.liu.se>
 
 	Remove the 3D Line Parameters page from the config dialog due to
 	general uselessness and uglyness.
-	* kchartConfigDialog.cc (KChartConfigDialog): Disabled 3D Line
+	* kchartConfigDialog.cpp (KChartConfigDialog): Disabled 3D Line
 	page.
-	* kchartLine3dConfigPage.cc (constructor): Changed layout
+	* kchartLine3dConfigPage.cpp (constructor): Changed layout
 	somewhat, during the experiments.
 	
 	----------------------------------------------------------------
 
 	Fix the uglyness of the font config dialog.
-	* kchartFontConfigPage.cc (KChartFontConfigPage): Add some stretch
+	* kchartFontConfigPage.cpp (KChartFontConfigPage): Add some stretch
 	in suitable places.
 
 	----------------------------------------------------------------
@@ -432,13 +432,13 @@
 	----------------------------------------------------------------
 
 	Don't include kchartDataEditor.h where is shouldn't be included.
-	* kchartBarConfigDialog.cc, kchartColorConfigPage.cc,
-	kchartDataConfigPage.cc: remove it, and include koChart.h instead
+	* kchartBarConfigDialog.cpp, kchartColorConfigPage.cpp,
+	kchartDataConfigPage.cpp: remove it, and include koChart.h instead
 
 2005-03-13  Inge Wallin  <inge@lysator.liu.se>
 
 	Make the page layout dialog better looking.
-	* kchartPageLayout.cc (constructor): Place settings inside a
+	* kchartPageLayout.cpp (constructor): Place settings inside a
 	button box.
 	
 	----------------------------------------------------------------
@@ -450,21 +450,21 @@
 	(getXLabel): removed
 	* kchart_part.h (axisLabelText{short,long}): removed
 	(m_longLabels, m_shortLabels): removed
-	* kchart_view.cc (edit): remove all stuff within #if 0 - #endif
+	* kchart_view.cpp (edit): remove all stuff within #if 0 - #endif
 	
 	----------------------------------------------------------------
 
 	Fix problem with mixed plurals/singulars in chart names.
-	* kchart_view.cc (KChartView): Rename some actions.
+	* kchart_view.cpp (KChartView): Rename some actions.
 
 	The default chart is marked as modified even when it's not.
-	* kchart_part.cc (KChartPart): Remove call to setModified().
+	* kchart_part.cpp (KChartPart): Remove call to setModified().
 
 2005-03-12  Inge Wallin  <inge@lysator.liu.se>
 
 	Remove the defaults button from the config dialog.  It wasn't
 	working anyway.
-	* kchartConfigDialog.cc (KChartConfigDialog): Disable the Defaults
+	* kchartConfigDialog.cpp (KChartConfigDialog): Disable the Defaults
 	button.
 
 	----------------------------------------------------------------
@@ -473,7 +473,7 @@
 	logarithmic axes.
 	* kchartParameterConfigPage.h (KChartParameterConfigPage::lin and
 	log): new members
-	* kchartParameterConfigPage.cc (KChartParameterConfigPage): Add
+	* kchartParameterConfigPage.cpp (KChartParameterConfigPage): Add
 	new widgets to the Settings buttonbox (used to be Title)
 	(init): initialize the members from the params.
 	(apply): store the parameters from the values of the widgets
@@ -481,13 +481,13 @@
 	----------------------------------------------------------------
 
 	Fix the bad layout of the title buttonbox.
-	* kchartParameterConfigPage.cc (KChartParameterConfigPage): Change
+	* kchartParameterConfigPage.cpp (KChartParameterConfigPage): Change
 	the layout slightly, and add row and col stretch.
 
 	----------------------------------------------------------------
 
 	Load row and column headers from XML file.
-	* kchart_part.cc (loadXML): Get the legend and axis label strings
+	* kchart_part.cpp (loadXML): Get the legend and axis label strings
 	from the KDChart parameters and store in the column and row
 	headers.
 
@@ -497,8 +497,8 @@
 
 	Clean up the data editor and remove old cruft.
 	* kchartDataEditor.{h,cc}: Remove all #if 0:ed code.
-	* Makefile.am (libkchartpart_la_SOURCES): Removed parser.cc,
-	sheet.cc, sheetdlg.cc, table.cc qttableview.cpp
+	* Makefile.am (libkchartpart_la_SOURCES): Removed parser.cpp,
+	sheet.cpp, sheetdlg.cpp, table.cpp qttableview.cpp
 	(noinst_HEADERS): Removed parser.h sheet.h sheetdlg.h table.h
 	qttableview.h 
 	Files mentioned above: Removed.
@@ -507,20 +507,20 @@
 
 	Move Tooltips and Whatsthis help from the old data editor to the
 	new one.
-	* kchartDataEditor.cc (addDocs): New method
+	* kchartDataEditor.cpp (addDocs): New method
 	(constructor): Clean up by moving all help generation to addDocs().
 
 	----------------------------------------------------------------
 
 	Enable "Finish" button for all pages in the wizard.
-	* kchartWizard.cc (KChartWizard): Enable Finish button for
+	* kchartWizard.cpp (KChartWizard): Enable Finish button for
 	"Subtypes" and "Labels & Legend" pages.
 
 2005-03-10  Inge Wallin  <inge@lysator.liu.se>
 
 	Make the table in the data editor shrink when number of rows/cols
 	are decreased in the spinboxes.
-	* kchartDataEditor.cc (askUserForConfirmation): new static
+	* kchartDataEditor.cpp (askUserForConfirmation): new static
 	function.
 	(setRows, setCols): Handle shrinking
 
@@ -546,25 +546,25 @@
 	----------------------------------------------------------------
 
 	Cleaning
-	* kchart_part.cc (paintContent): break out common code out of an
+	* kchart_part.cpp (paintContent): break out common code out of an
 	if/else construction.
 	
 	----------------------------------------------------------------
 	
 	More experiments with visual appearance of the data editor
-	* kchartDataEditor.cc (setData): Set size of the table widget to
+	* kchartDataEditor.cpp (setData): Set size of the table widget to
 	(600,300)
 	
 	----------------------------------------------------------------
 	
 	Experiment with visual appearance of the new data editor
-	* kchartDataEditor.cc (setData): Set column widths to 80.
+	* kchartDataEditor.cpp (setData): Set column widths to 80.
 	
 	----------------------------------------------------------------
 	
 	Fix bug introduced by patch to fix bug 14971: Axes label handling
 	in connection with KSpread was broken.
-	* kchart_part.cc (setData): set m_rowLabels and m_colLabels
+	* kchart_part.cpp (setData): set m_rowLabels and m_colLabels
 	instead of storing axes labels to the params.
 
 2005-03-08  Inge Wallin  <inge@lysator.liu.se>
@@ -580,13 +580,13 @@
 	This fixes bug 14971.
 	* kchart_part.h (m_rowLabels, m_colLabels): new members
 	(rowLabelTexts, colLabelTexts): new methods
-	* kchart_part.cc (paintContent): Paint using the new labels, both
+	* kchart_part.cpp (paintContent): Paint using the new labels, both
 	for ordinary and transposed tables.
 	* kchartDataEditor.{h,cc} (setRowLabels): new method
 	 (getRowLabels): new method
 	 (setColLabels): new method
 	 (getColLabels): new method
-	* kchart_view.cc (edit): call new methods above in data editor,
+	* kchart_view.cpp (edit): call new methods above in data editor,
 	and don't call old methods setLegend, getLegend, setXLabel, etc.
 
 2005-03-07  Inge Wallin  <inge@lysator.liu.se>
@@ -608,18 +608,18 @@
 	----------------------------------------------------------------
 	
 	Cleaning:
-	* kchart_part.cc (loadOasis): remove parameter names to remove
+	* kchart_part.cpp (loadOasis): remove parameter names to remove
 	warnings.
 
 	Reorder chart types to make it more logical order
 	* kchart.rc (Toolbar): Reorder chart types
-	* kchartWizardSelectChartTypePage.cc (constructor): Reorder chart
+	* kchartWizardSelectChartTypePage.cpp (constructor): Reorder chart
 	types into same order.
 
 2005-03-06  Inge Wallin  <inge@lysator.liu.se>
 
 	Begin to support the Apply button in the data editor.
-	* kchartDataEditor.cc (kchartDataEditor): connect applyClicked()
+	* kchartDataEditor.cpp (kchartDataEditor): connect applyClicked()
 	to apply()
 	* kchartDataEditor.{h,cc} (apply): new method.
 
@@ -630,11 +630,11 @@
 	author.
 
 	Continue with the new data editor.
-	* kchartDataEditor.cc (setLegend): Always initialize the row
+	* kchartDataEditor.cpp (setLegend): Always initialize the row
 	headers, not only the first time.
 	
 	Start fixing default handling in the config dialog.
-	* kchartConfigDialog.cc (defaults): Call datapage->defaults()
+	* kchartConfigDialog.cpp (defaults): Call datapage->defaults()
 	instead of init.
 	* kchartDataConfigPage.{h,cc} (defaults): New method.
 
@@ -649,13 +649,13 @@
 	* kchartDataEditor.{h,cc}: First prototype of a new data editor.
 
 	Code cleaning.
-	* kchartFontConfigPage.cc (class KChartFontListBoxItem): Move from
+	* kchartFontConfigPage.cpp (class KChartFontListBoxItem): Move from
 	kchartDataConfigPage.h.  That used to be an error.
 
 2005-02-25  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix bug 99998: KChart: 3d Depth parameter has ludicrous max value
-	* kchartParameter3dConfigPage.cc (KChartParameter3dConfigPage):
+	* kchartParameter3dConfigPage.cpp (KChartParameter3dConfigPage):
 	Make the depth parameter go from 0 to 2.0 instead of 0 to 40.
 
 2005-02-24  Inge Wallin  <inge@lysator.liu.se>
@@ -689,7 +689,7 @@
 
 	Fix bug 99765: "Chart Subtype" config page is missing for Pie,
 	Ring, Box&Whisker chart types.
-	* kchartConfigDialog.cc (initSubtypePage): Don't create a
+	* kchartConfigDialog.cpp (initSubtypePage): Don't create a
 	configuration page for subtype if the type doesn't have a
 	subtype.  Applicable to Pie, Ring and Box&Whiskers.
 
@@ -698,9 +698,9 @@
 	Start of a new page in the config dialog for configuring Data.
 	This is not yet finished.
 	* kchartDataConfigPage.h: New file
-	* kchartDataConfigPage.cc: New file
+	* kchartDataConfigPage.cpp: New file
 	* kchartConfigDialog.h (KChartConfigDialog::m_datapage): New member
-	* kchartConfigDialog.cc (KChartConfigDialog): Create the data page
+	* kchartConfigDialog.cpp (KChartConfigDialog): Create the data page
 
 2005-01-07  Raphael Langerhorst <raphael-langerhorst@gmx.at>
 
@@ -711,10 +711,10 @@
 2005-01-06  Raphael Langerhorst <raphael-langerhorst@gmx.at>
 
 	Improve Data Editor usability:
-	* sheet.cc: Add tooltips and what's this help.
-	* sheet.cc: Use a different color for first row and column
-	* sheetdlg.cc: Add tooltips and what's this help.
-	* sheetdlg.cc: Change order of widget initialization (better tab order).
+	* sheet.cpp: Add tooltips and what's this help.
+	* sheet.cpp: Use a different color for first row and column
+	* sheetdlg.cpp: Add tooltips and what's this help.
+	* sheetdlg.cpp: Change order of widget initialization (better tab order).
 
 2004-11-16  Inge Wallin  <inge@lysator.liu.se>
 
@@ -725,7 +725,7 @@
 2004-11-05  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix bug 90895: save config is not needed
-	* kchart_view.cc (KChartView): Remove actions "loadconfig",
+	* kchart_view.cpp (KChartView): Remove actions "loadconfig",
 	"saveconfig" and "defaultconfig".
 	* kchart.rc: Remove reference to them in the definition of the
 	Settings menu.
@@ -733,26 +733,26 @@
 	Fix bug 90904: edit/configure is confusingly named 
 	* kchart.rc: Add a sub menu for editing only one aspect of the
 	chart.
-	* kchart_view.cc: Change shortcut for Edit Data
-	* kchart_view.cc: Change string for Configure Chart
+	* kchart_view.cpp: Change shortcut for Edit Data
+	* kchart_view.cpp: Change string for Configure Chart
 
 2004-10-07  Inge Wallin  <inge@lysator.liu.se>
 
 	* Cleanup of the following files.  Made the code more readable,
 	fixed indentation, added some comments:
 	- sheet.h
-	- sheet.cc
+	- sheet.cpp
 
 2004-10-06  Inge Wallin  <inge@lysator.liu.se>
 
 	Fix bug 55603: Pressing Enter in Data Editor doesn't update any
 	changes.	
-	* sheetdlg.cc (SheetDlg): Make the OK button the default.
+	* sheetdlg.cpp (SheetDlg): Make the OK button the default.
 
 	* Cleanup of the following files.  Made the code more readable,
 	fixed indentation, added some comments:
 	- parser.h
-	- parser.cc
+	- parser.cpp
 
 2004-10-04  Inge Wallin  <inge@lysator.liu.se>
 
@@ -760,19 +760,19 @@
 	readable, fixed indentation, added (a few) comments:
 	(Man, there are a lot of coding styles in there...)
 	- kchart_part.h
-	- kchart_part.cc
+	- kchart_part.cpp
 	
 	* Cleaned the following files a little.  Made the code more
 	readable, fixed indentation, added (a few) comments:
-	- kchart.la.cc
-	- main.cc
-	- kchart_dummy.cc
+	- kchart.la.cpp
+	- main.cpp
+	- kchart_dummy.cpp
 	- kchart_aboutdata.h
 	- kchart_factory.h
-	- kchart_factory.cc
+	- kchart_factory.cpp
 	- kchart_params.h
-	- kchart_params.cc
+	- kchart_params.cpp
 	- kchart_view.h
-	- kchart_view.cc
+	- kchart_view.cpp
 
 
diff --git a/kchart/KChartParamsIface.cc b/kchart/KChartParamsIface.cpp
index 794c46790..794c46790 100644
--- a/kchart/KChartParamsIface.cc
+++ b/kchart/KChartParamsIface.cpp
diff --git a/kchart/KChartViewIface.cc b/kchart/KChartViewIface.cpp
index c9c2cbadb..c9c2cbadb 100644
--- a/kchart/KChartViewIface.cc
+++ b/kchart/KChartViewIface.cpp
diff --git a/kchart/Makefile.am b/kchart/Makefile.am
index fc98f26e7..c17ed0c0e 100644
--- a/kchart/Makefile.am
+++ b/kchart/Makefile.am
@@ -3,34 +3,34 @@ INCLUDES  = $(KOFFICE_INCLUDES) -I$(srcdir)/kdchart -I$(top_srcdir)/interfaces -
 ## The lib with most of the code (shared with the kchart filters)
 lib_LTLIBRARIES = libkchartcommon.la
 
-libkchartcommon_la_SOURCES = kchart_part.cc \
-	kchart_view.cc kchart_factory.cc \
-	kchartColorConfigPage.cc \
-	kchartParameterConfigPage.cc \
-	kchartParameter3dConfigPage.cc \
-	kchartBackgroundPixmapConfigPage.cc	\
-	kchartSubTypeChartPage.cc	\
-	kchartComboConfigPage.cc \
-	kchartFontConfigPage.cc \
-	kchartDataConfigPage.cc \
-	kchartPieConfigPage.cc \
-	kchartParameterPieConfigPage.cc \
-	kchartConfigDialog.cc \
-	kchartWizard.cc \
-	kchartWizardLabelsLegendPage.cc \
-	kchartWizardSelectChartSubTypePage.cc \
-	kchartWizardSelectChartTypePage.cc \
-	kchartWizardSelectDataPage.cc \
-	kchartWizardSetupAxesPage.cc \
-	kchartWizardSetupDataPage.cc \
-        kchartWizardSelectDataFormatPage.cc \
-	kchartDataEditor.cc \
-	KChartViewIface.skel KChartViewIface.cc \
-	kchartLegendConfigPage.cc kchart_params.cc KChartParamsIface.skel \
-	KChartParamsIface.cc kchartHeaderFooterConfigPage.cc \
-	kchartLine3dConfigPage.cc kchartParameterPolarConfigPage.cc kchartPageLayout.cc \
-	kchartPrinterDlg.cc \
-        csvimportdialog.cc csvimportdialogui.ui
+libkchartcommon_la_SOURCES = kchart_part.cpp \
+	kchart_view.cpp kchart_factory.cpp \
+	kchartColorConfigPage.cpp \
+	kchartParameterConfigPage.cpp \
+	kchartParameter3dConfigPage.cpp \
+	kchartBackgroundPixmapConfigPage.cpp	\
+	kchartSubTypeChartPage.cpp	\
+	kchartComboConfigPage.cpp \
+	kchartFontConfigPage.cpp \
+	kchartDataConfigPage.cpp \
+	kchartPieConfigPage.cpp \
+	kchartParameterPieConfigPage.cpp \
+	kchartConfigDialog.cpp \
+	kchartWizard.cpp \
+	kchartWizardLabelsLegendPage.cpp \
+	kchartWizardSelectChartSubTypePage.cpp \
+	kchartWizardSelectChartTypePage.cpp \
+	kchartWizardSelectDataPage.cpp \
+	kchartWizardSetupAxesPage.cpp \
+	kchartWizardSetupDataPage.cpp \
+        kchartWizardSelectDataFormatPage.cpp \
+	kchartDataEditor.cpp \
+	KChartViewIface.skel KChartViewIface.cpp \
+	kchartLegendConfigPage.cpp kchart_params.cpp KChartParamsIface.skel \
+	KChartParamsIface.cpp kchartHeaderFooterConfigPage.cpp \
+	kchartLine3dConfigPage.cpp kchartParameterPolarConfigPage.cpp kchartPageLayout.cpp \
+	kchartPrinterDlg.cpp \
+        csvimportdialog.cpp csvimportdialogui.ui
 
 libkchartcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
                             $(LIB_KOFFICEUI) \
@@ -39,14 +39,14 @@ libkchartcommon_la_LDFLAGS = $(KDE_RPATH) -version-info 2:0:0 -no-undefined $(LI
 
 ## The part
 kde_module_LTLIBRARIES = libkchartpart.la
-libkchartpart_la_SOURCES = kchart_factory_init.cc
+libkchartpart_la_SOURCES = kchart_factory_init.cpp
 libkchartpart_la_LDFLAGS = $(KDE_PLUGIN) $(LIB_QT)
 libkchartpart_la_LIBADD = libkchartcommon.la
 
 ## The tdeinit loadable module and executable
 tdeinit_LTLIBRARIES = kchart.la
 bin_PROGRAMS =
-kchart_la_SOURCES = main.cc
+kchart_la_SOURCES = main.cpp
 kchart_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
 kchart_la_LIBADD = $(LIB_KOFFICECORE)
 
@@ -91,7 +91,7 @@ xdg_apps_DATA = kchart.desktop
 SUBDIRS =  kdchart . toolbar pics templates
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cc kchart_aboutdata.h kdchart/*.cpp -o $(podir)/kchart.pot
+	$(XGETTEXT) rc.cpp *.cpp kchart_aboutdata.h kdchart/*.cpp -o $(podir)/kchart.pot
 
 kde_services_DATA = kchartpart.desktop
 
diff --git a/kchart/csvimportdialog.cc b/kchart/csvimportdialog.cpp
index cf13c1b5e..cf13c1b5e 100644
--- a/kchart/csvimportdialog.cc
+++ b/kchart/csvimportdialog.cpp
diff --git a/kchart/kchartBackgroundPixmapConfigPage.cc b/kchart/kchartBackgroundPixmapConfigPage.cpp
index d7716d311..c92131166 100644
--- a/kchart/kchartBackgroundPixmapConfigPage.cc
+++ b/kchart/kchartBackgroundPixmapConfigPage.cpp
@@ -172,7 +172,7 @@ KChartBackgroundPixmapConfigPage::KChartBackgroundPixmapConfigPage( KChartParams
     intensitySB->hide(); //the property doesn't work atm
 }
 
-//Code from kcontrol/background/bgdialog.cc
+//Code from kcontrol/background/bgdialog.cpp
 void KChartBackgroundPixmapConfigPage::loadWallpaperFilesList()
 {
    // Wallpapers
diff --git a/kchart/kchartColorConfigPage.cc b/kchart/kchartColorConfigPage.cpp
index 921b42c47..921b42c47 100644
--- a/kchart/kchartColorConfigPage.cc
+++ b/kchart/kchartColorConfigPage.cpp
diff --git a/kchart/kchartComboConfigPage.cc b/kchart/kchartComboConfigPage.cpp
index dcf99e4ac..dcf99e4ac 100644
--- a/kchart/kchartComboConfigPage.cc
+++ b/kchart/kchartComboConfigPage.cpp
diff --git a/kchart/kchartConfigDialog.cc b/kchart/kchartConfigDialog.cpp
index f0f57d625..f0f57d625 100644
--- a/kchart/kchartConfigDialog.cc
+++ b/kchart/kchartConfigDialog.cpp
diff --git a/kchart/kchartDataConfigPage.cc b/kchart/kchartDataConfigPage.cpp
index f9cc7e25d..3a3968e40 100644
--- a/kchart/kchartDataConfigPage.cc
+++ b/kchart/kchartDataConfigPage.cpp
@@ -66,7 +66,7 @@ KChartDataConfigPage::KChartDataConfigPage( KChartParams* params,
 	TQButtonGroup *gb1 = new TQVButtonGroup( i18n( "Data Area" ), this );
 
 	// ================================================================
-	// This code is copied from kchartWizardSelectDataFormatPage.cc
+	// This code is copied from kchartWizardSelectDataFormatPage.cpp
 	TQHBox   *hbox = new TQHBox( gb1 );
 	(void) new TQLabel( i18n("Area: "), hbox);
 	m_dataArea = new TQLineEdit( hbox );
diff --git a/kchart/kchartDataEditor.cc b/kchart/kchartDataEditor.cpp
index 8f08dd78b..8f08dd78b 100644
--- a/kchart/kchartDataEditor.cc
+++ b/kchart/kchartDataEditor.cpp
diff --git a/kchart/kchartFontConfigPage.cc b/kchart/kchartFontConfigPage.cpp
index 27f91581d..27f91581d 100644
--- a/kchart/kchartFontConfigPage.cc
+++ b/kchart/kchartFontConfigPage.cpp
diff --git a/kchart/kchartHeaderFooterConfigPage.cc b/kchart/kchartHeaderFooterConfigPage.cpp
index 8e11184ed..8e11184ed 100644
--- a/kchart/kchartHeaderFooterConfigPage.cc
+++ b/kchart/kchartHeaderFooterConfigPage.cpp
diff --git a/kchart/kchartLegendConfigPage.cc b/kchart/kchartLegendConfigPage.cpp
index dc18d7176..dc18d7176 100644
--- a/kchart/kchartLegendConfigPage.cc
+++ b/kchart/kchartLegendConfigPage.cpp
diff --git a/kchart/kchartLine3dConfigPage.cc b/kchart/kchartLine3dConfigPage.cpp
index f3750f739..f3750f739 100644
--- a/kchart/kchartLine3dConfigPage.cc
+++ b/kchart/kchartLine3dConfigPage.cpp
diff --git a/kchart/kchartPageLayout.cc b/kchart/kchartPageLayout.cpp
index e2587b9ff..e2587b9ff 100644
--- a/kchart/kchartPageLayout.cc
+++ b/kchart/kchartPageLayout.cpp
diff --git a/kchart/kchartParameter3dConfigPage.cc b/kchart/kchartParameter3dConfigPage.cpp
index 1b37b8cca..1b37b8cca 100644
--- a/kchart/kchartParameter3dConfigPage.cc
+++ b/kchart/kchartParameter3dConfigPage.cpp
diff --git a/kchart/kchartParameterConfigPage.cc b/kchart/kchartParameterConfigPage.cpp
index da6c8017f..da6c8017f 100644
--- a/kchart/kchartParameterConfigPage.cc
+++ b/kchart/kchartParameterConfigPage.cpp
diff --git a/kchart/kchartParameterPieConfigPage.cc b/kchart/kchartParameterPieConfigPage.cpp
index d640333ee..d640333ee 100644
--- a/kchart/kchartParameterPieConfigPage.cc
+++ b/kchart/kchartParameterPieConfigPage.cpp
diff --git a/kchart/kchartParameterPolarConfigPage.cc b/kchart/kchartParameterPolarConfigPage.cpp
index b6e1fe59d..b6e1fe59d 100644
--- a/kchart/kchartParameterPolarConfigPage.cc
+++ b/kchart/kchartParameterPolarConfigPage.cpp
diff --git a/kchart/kchartPieConfigPage.cc b/kchart/kchartPieConfigPage.cpp
index 31ec42a6b..31ec42a6b 100644
--- a/kchart/kchartPieConfigPage.cc
+++ b/kchart/kchartPieConfigPage.cpp
diff --git a/kchart/kchartPrinterDlg.cc b/kchart/kchartPrinterDlg.cpp
index a02592ded..a02592ded 100644
--- a/kchart/kchartPrinterDlg.cc
+++ b/kchart/kchartPrinterDlg.cpp
diff --git a/kchart/kchartSubTypeChartPage.cc b/kchart/kchartSubTypeChartPage.cpp
index 9ccad59eb..9ccad59eb 100644
--- a/kchart/kchartSubTypeChartPage.cc
+++ b/kchart/kchartSubTypeChartPage.cpp
diff --git a/kchart/kchartWizard.cc b/kchart/kchartWizard.cpp
index 01e5bf456..01e5bf456 100644
--- a/kchart/kchartWizard.cc
+++ b/kchart/kchartWizard.cpp
diff --git a/kchart/kchartWizardLabelsLegendPage.cc b/kchart/kchartWizardLabelsLegendPage.cpp
index 3899a2766..3899a2766 100644
--- a/kchart/kchartWizardLabelsLegendPage.cc
+++ b/kchart/kchartWizardLabelsLegendPage.cpp
diff --git a/kchart/kchartWizardSelectChartSubTypePage.cc b/kchart/kchartWizardSelectChartSubTypePage.cpp
index 2c86549a8..2c86549a8 100644
--- a/kchart/kchartWizardSelectChartSubTypePage.cc
+++ b/kchart/kchartWizardSelectChartSubTypePage.cpp
diff --git a/kchart/kchartWizardSelectChartTypePage.cc b/kchart/kchartWizardSelectChartTypePage.cpp
index 8ea02100b..8ea02100b 100644
--- a/kchart/kchartWizardSelectChartTypePage.cc
+++ b/kchart/kchartWizardSelectChartTypePage.cpp
diff --git a/kchart/kchartWizardSelectChartTypePage.h b/kchart/kchartWizardSelectChartTypePage.h
index 16c289440..91b62da34 100644
--- a/kchart/kchartWizardSelectChartTypePage.h
+++ b/kchart/kchartWizardSelectChartTypePage.h
@@ -18,7 +18,7 @@ class KChartPart;
 
 // Contains a button with a text label below it
 //
-// FIXME: Move to kchartWizardSelectChartTypePage.cc
+// FIXME: Move to kchartWizardSelectChartTypePage.cpp
 class KChartButton : public TQVBox
 {
   Q_OBJECT
diff --git a/kchart/kchartWizardSelectDataFormatPage.cc b/kchart/kchartWizardSelectDataFormatPage.cpp
index d40e95fe7..d40e95fe7 100644
--- a/kchart/kchartWizardSelectDataFormatPage.cc
+++ b/kchart/kchartWizardSelectDataFormatPage.cpp
diff --git a/kchart/kchartWizardSelectDataPage.cc b/kchart/kchartWizardSelectDataPage.cpp
index 40dafc123..40dafc123 100644
--- a/kchart/kchartWizardSelectDataPage.cc
+++ b/kchart/kchartWizardSelectDataPage.cpp
diff --git a/kchart/kchartWizardSetupAxesPage.cc b/kchart/kchartWizardSetupAxesPage.cpp
index 5514e82b8..5514e82b8 100644
--- a/kchart/kchartWizardSetupAxesPage.cc
+++ b/kchart/kchartWizardSetupAxesPage.cpp
diff --git a/kchart/kchartWizardSetupDataPage.cc b/kchart/kchartWizardSetupDataPage.cpp
index 1d057d4ca..1d057d4ca 100644
--- a/kchart/kchartWizardSetupDataPage.cc
+++ b/kchart/kchartWizardSetupDataPage.cpp
diff --git a/kchart/kchart_factory.cc b/kchart/kchart_factory.cpp
index 053627387..ff00f2058 100644
--- a/kchart/kchart_factory.cc
+++ b/kchart/kchart_factory.cpp
@@ -1,5 +1,5 @@
 /**
- * $Id: kchart_factory.cc 483001 2005-11-24 18:27:18Z dfaure $
+ * $Id: kchart_factory.cpp 483001 2005-11-24 18:27:18Z dfaure $
  *
  * Kalle Dalheimer <kalle@kde.org>
  */
diff --git a/kchart/kchart_factory_init.cc b/kchart/kchart_factory_init.cpp
index 42b2b2caf..42b2b2caf 100644
--- a/kchart/kchart_factory_init.cc
+++ b/kchart/kchart_factory_init.cpp
diff --git a/kchart/kchart_params.cc b/kchart/kchart_params.cpp
index 2cd8da51d..2cd8da51d 100644
--- a/kchart/kchart_params.cc
+++ b/kchart/kchart_params.cpp
diff --git a/kchart/kchart_part.cc b/kchart/kchart_part.cpp
index fb6a64143..fb6a64143 100644
--- a/kchart/kchart_part.cc
+++ b/kchart/kchart_part.cpp
diff --git a/kchart/kchart_view.cc b/kchart/kchart_view.cpp
index ba2d1321e..ba2d1321e 100644
--- a/kchart/kchart_view.cc
+++ b/kchart/kchart_view.cpp
diff --git a/kchart/main.cc b/kchart/main.cpp
index 97d046d1a..97d046d1a 100644
--- a/kchart/main.cc
+++ b/kchart/main.cpp
diff --git a/kexi/3rdparty/kexisql/Makefile.msvc b/kexi/3rdparty/kexisql/Makefile.msvc
index 192ae2931..604442563 100644
--- a/kexi/3rdparty/kexisql/Makefile.msvc
+++ b/kexi/3rdparty/kexisql/Makefile.msvc
@@ -107,18 +107,13 @@ TARGET	=	$(TDEDIR)/bin/kexisql2_d.dll
 
 ####### Implicit rules
 
-.SUFFIXES: .c .cpp .cc .cxx .C
+.SUFFIXES: .c .cpp .cxx .C
 
 {.}.cpp{obj\}.obj::
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
 	$<
 <<
 
-{.}.cc{obj\}.obj::
-	$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
-	$<
-<<
-
 {.}.cxx{obj\}.obj::
 	$(CXX) -c $(CXXFLAGS) $(INCPATH) -Foobj\ @<<
 	$<
diff --git a/kexi/3rdparty/kolibs/Makefile.am b/kexi/3rdparty/kolibs/Makefile.am
index 05d3fbd31..c5b1cf7b2 100644
--- a/kexi/3rdparty/kolibs/Makefile.am
+++ b/kexi/3rdparty/kolibs/Makefile.am
@@ -3,10 +3,10 @@ include $(top_srcdir)/kexi/Makefile.global
 noinst_LTLIBRARIES = libkexikolibs.la
 
 libkexikolibs_la_SOURCES = \
-koGlobal.cc \
-koUnit.cc \
-koUnitWidgets.cc \
-koPageLayoutDia.cc \
+koGlobal.cpp \
+koUnit.cpp \
+koUnitWidgets.cpp \
+koPageLayoutDia.cpp \
 KoPageLayoutColumnsBase.ui \
 KoPageLayoutColumns.cpp \
 koPageLayout.cpp \
diff --git a/kexi/3rdparty/kolibs/koGlobal.cc b/kexi/3rdparty/kolibs/koGlobal.cpp
index a375327fd..a375327fd 100644
--- a/kexi/3rdparty/kolibs/koGlobal.cc
+++ b/kexi/3rdparty/kolibs/koGlobal.cpp
diff --git a/kexi/3rdparty/kolibs/koPageLayoutDia.cc b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
index 2f0db91a3..2f0db91a3 100644
--- a/kexi/3rdparty/kolibs/koPageLayoutDia.cc
+++ b/kexi/3rdparty/kolibs/koPageLayoutDia.cpp
diff --git a/kexi/3rdparty/kolibs/koUnit.cc b/kexi/3rdparty/kolibs/koUnit.cpp
index a2eb289a1..a2eb289a1 100644
--- a/kexi/3rdparty/kolibs/koUnit.cc
+++ b/kexi/3rdparty/kolibs/koUnit.cpp
diff --git a/kexi/3rdparty/kolibs/koUnitWidgets.cc b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
index 097dfc250..097dfc250 100644
--- a/kexi/3rdparty/kolibs/koUnitWidgets.cc
+++ b/kexi/3rdparty/kolibs/koUnitWidgets.cpp
diff --git a/kexi/doc/dev/TODO-Kexi-js b/kexi/doc/dev/TODO-Kexi-js
index 880c0d138..90b7d5f6e 100644
--- a/kexi/doc/dev/TODO-Kexi-js
+++ b/kexi/doc/dev/TODO-Kexi-js
@@ -607,7 +607,7 @@ for blobs...The client has to read the _entire_ blob into memory."; use:
 - port to libpq
 - set version information in drv_useDatabase()
   There's connection_base::server_version() in libpqxx trunk - 
-  http://thaiopensource.org/development/libpqxx/file/trunk/include/pqxx/connection_base.hxx
+  http://thaiopensource.org/development/libpqxx/file/trunk/include/pqxx/connection_base.h
 
 === KEXIDB TESTS=== 
 - add tests for DatabaseProperties
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
index a1b1c6ea7..cf6604779 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2005-2006 Jaroslaw Staniek <js@iidea.pl>
 
-   This work is based on kspread/dialogs/kspread_dlg_csv.cc
+   This work is based on kspread/dialogs/kspread_dlg_csv.cpp
    and will be merged back with KOffice libraries.
 
    Copyright (C) 2002-2003 Norbert Andres <nandres@web.de>
diff --git a/kexi/plugins/importexport/csv/kexicsvimportdialog.h b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
index 4df8a621a..52724ca69 100644
--- a/kexi/plugins/importexport/csv/kexicsvimportdialog.h
+++ b/kexi/plugins/importexport/csv/kexicsvimportdialog.h
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2005-2006 Jaroslaw Staniek <js@iidea.pl>
 
-   This work is based on kspread/dialogs/kspread_dlg_csv.cc
+   This work is based on kspread/dialogs/kspread_dlg_csv.cpp
    and will be merged back with KOffice libraries.
 
    Copyright (C) 2002-2003 Norbert Andres <nandres@web.de>
diff --git a/kexi/tools/build_tarball/build_kexi_tarball.sh b/kexi/tools/build_tarball/build_kexi_tarball.sh
index efc607df9..3159d815e 100755
--- a/kexi/tools/build_tarball/build_kexi_tarball.sh
+++ b/kexi/tools/build_tarball/build_kexi_tarball.sh
@@ -187,7 +187,7 @@ for dir in $EXC; do
   mkdir $dir
 done
 #fix exectutable bits for sources:
-find . -name \*.h -o -name \*.cpp -o -name \*.c -o -name \*.cc -o -name \*.1 | xargs chmod a-x
+find . -name \*.h -o -name \*.cpp -o -name \*.c -o -name \*.1 | xargs chmod a-x
 
 #other app-specific fixes:
 fixAppSpecific
diff --git a/kformula/Makefile.am b/kformula/Makefile.am
index a00235b23..b8b101662 100644
--- a/kformula/Makefile.am
+++ b/kformula/Makefile.am
@@ -3,16 +3,16 @@ KDE_CXXFLAGS = $(USE_RTTI)
 
 ## The part
 kde_module_LTLIBRARIES = libkformulapart.la
-libkformulapart_la_SOURCES = kformula_doc.cc \
-	kformula_view.cc kformula_factory.cc kformulawidget.cc kfconfig.cc \
-	kformula_view_iface.skel kformula_view_iface.cc formulastring.cc fsparser.cc
+libkformulapart_la_SOURCES = kformula_doc.cpp \
+	kformula_view.cpp kformula_factory.cpp kformulawidget.cpp kfconfig.cpp \
+	kformula_view_iface.skel kformula_view_iface.cpp formulastring.cpp fsparser.cpp
 libkformulapart_la_LDFLAGS = $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio $(KDE_PLUGIN) -lDCOP -ltdeparts
 libkformulapart_la_LIBADD = $(KOFFICE_LIBS) $(LIB_KFORMULA) $(LIB_KOTEXT)
 libkformulapart_la_METASOURCES = AUTO
 
 ## The tdeinit loadable module
 tdeinit_LTLIBRARIES = kformula.la
-kformula_la_SOURCES = main.cc
+kformula_la_SOURCES = main.cpp
 kformula_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
 kformula_la_LIBADD = $(LIB_KOFFICECORE)
 
@@ -35,7 +35,7 @@ tip_DATA = tips
 
 messages: rc.cpp
 	$(PREPARETIPS) >> rc.cpp
-	$(XGETTEXT) rc.cpp *.cc kformula_aboutdata.h -o $(podir)/kformula.pot
+	$(XGETTEXT) rc.cpp *.cpp kformula_aboutdata.h -o $(podir)/kformula.pot
 kde_services_DATA = kformulapart.desktop
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/kformula/formulastring.cc b/kformula/formulastring.cpp
index f86b113a4..f86b113a4 100644
--- a/kformula/formulastring.cc
+++ b/kformula/formulastring.cpp
diff --git a/kformula/fsparser.cc b/kformula/fsparser.cpp
index b6bdd787c..b6bdd787c 100644
--- a/kformula/fsparser.cc
+++ b/kformula/fsparser.cpp
diff --git a/kformula/kfconfig.cc b/kformula/kfconfig.cpp
index 82e3ae65f..82e3ae65f 100644
--- a/kformula/kfconfig.cc
+++ b/kformula/kfconfig.cpp
diff --git a/kformula/kformula_doc.cc b/kformula/kformula_doc.cpp
index 5eeb59f4b..5eeb59f4b 100644
--- a/kformula/kformula_doc.cc
+++ b/kformula/kformula_doc.cpp
diff --git a/kformula/kformula_factory.cc b/kformula/kformula_factory.cpp
index 1aebcfbd7..1aebcfbd7 100644
--- a/kformula/kformula_factory.cc
+++ b/kformula/kformula_factory.cpp
diff --git a/kformula/kformula_view.cc b/kformula/kformula_view.cpp
index 2d93ce5d8..2d93ce5d8 100644
--- a/kformula/kformula_view.cc
+++ b/kformula/kformula_view.cpp
diff --git a/kformula/kformula_view_iface.cc b/kformula/kformula_view_iface.cpp
index c3b859087..c3b859087 100644
--- a/kformula/kformula_view_iface.cc
+++ b/kformula/kformula_view_iface.cpp
diff --git a/kformula/kformulawidget.cc b/kformula/kformulawidget.cpp
index b505d817d..b505d817d 100644
--- a/kformula/kformulawidget.cc
+++ b/kformula/kformulawidget.cpp
diff --git a/kformula/main.cc b/kformula/main.cpp
index a2337241d..a2337241d 100644
--- a/kformula/main.cc
+++ b/kformula/main.cpp
diff --git a/kivio/kiviopart/KIvioDocIface.cc b/kivio/kiviopart/KIvioDocIface.cpp
index e9ab089f1..e9ab089f1 100644
--- a/kivio/kiviopart/KIvioDocIface.cc
+++ b/kivio/kiviopart/KIvioDocIface.cpp
diff --git a/kivio/kiviopart/KIvioLayerIface.cc b/kivio/kiviopart/KIvioLayerIface.cpp
index c2e667afe..c2e667afe 100644
--- a/kivio/kiviopart/KIvioLayerIface.cc
+++ b/kivio/kiviopart/KIvioLayerIface.cpp
diff --git a/kivio/kiviopart/KIvioMapIface.cc b/kivio/kiviopart/KIvioMapIface.cpp
index 99397692e..99397692e 100644
--- a/kivio/kiviopart/KIvioMapIface.cc
+++ b/kivio/kiviopart/KIvioMapIface.cpp
diff --git a/kivio/kiviopart/KIvioPageIface.cc b/kivio/kiviopart/KIvioPageIface.cpp
index 26ba9a2e4..26ba9a2e4 100644
--- a/kivio/kiviopart/KIvioPageIface.cc
+++ b/kivio/kiviopart/KIvioPageIface.cpp
diff --git a/kivio/kiviopart/KIvioStencilIface.cc b/kivio/kiviopart/KIvioStencilIface.cpp
index 61c5542e1..61c5542e1 100644
--- a/kivio/kiviopart/KIvioStencilIface.cc
+++ b/kivio/kiviopart/KIvioStencilIface.cpp
diff --git a/kivio/kiviopart/KIvioViewIface.cc b/kivio/kiviopart/KIvioViewIface.cpp
index f8d7477c8..f8d7477c8 100644
--- a/kivio/kiviopart/KIvioViewIface.cc
+++ b/kivio/kiviopart/KIvioViewIface.cpp
diff --git a/kivio/kiviopart/Makefile.am b/kivio/kiviopart/Makefile.am
index 39bae3fb0..8eb5a7ec0 100644
--- a/kivio/kiviopart/Makefile.am
+++ b/kivio/kiviopart/Makefile.am
@@ -30,17 +30,17 @@ libkiviocommon_la_SOURCES = kivio_canvas.cpp kivio_doc.cpp kivio_factory.cpp \
 	kivio_view.cpp kivio_map.cpp kivio_page.cpp kivio_dlg_pageshow.cpp \
 	kivio_zoomaction.cpp kivio_icon_view.cpp kivio_spawner_drag.cpp kivio_intra_stencil_data.cpp \
 	kivio_stackbar.cpp stencilbarbutton.cpp stencilbardockmanager.cpp kivio_grid_data.cpp \
-	kivio_stencil_geometry_panel.cpp KIvioViewIface.skel KIvioViewIface.cc KIvioDocIface.skel \
-	KIvioDocIface.cc KIvioMapIface.skel KIvioMapIface.cc KIvioPageIface.skel \
-	KIvioPageIface.cc kivio_command.cc KIvioLayerIface.skel KIvioLayerIface.cc \
+	kivio_stencil_geometry_panel.cpp KIvioViewIface.skel KIvioViewIface.cpp KIvioDocIface.skel \
+	KIvioDocIface.cpp KIvioMapIface.skel KIvioMapIface.cpp KIvioPageIface.skel \
+	KIvioPageIface.cpp kivio_command.cpp KIvioLayerIface.skel KIvioLayerIface.cpp \
 	kivioglobal.cpp kiviostencilsetaction.cpp kivioarrowheadaction.cpp \
-	KIvioStencilIface.skel KIvioStencilIface.cc kiviodragobject.cpp kiviostencilsetinstaller.cpp \
+	KIvioStencilIface.skel KIvioStencilIface.cpp kiviodragobject.cpp kiviostencilsetinstaller.cpp \
 	addstenciltool.cpp
 
 kde_module_LTLIBRARIES = libkiviopart.la
 libkiviopart_la_LDFLAGS = -avoid-version $(all_libraries) -module
 libkiviopart_la_LIBADD  = libkiviocommon.la
-libkiviopart_la_SOURCES = kivio_part_init.cc
+libkiviopart_la_SOURCES = kivio_part_init.cpp
 
 dummy.cpp:
 	echo > dummy.cpp
diff --git a/kivio/kiviopart/kivio_command.cc b/kivio/kiviopart/kivio_command.cpp
index 4633a60fe..4633a60fe 100644
--- a/kivio/kiviopart/kivio_command.cc
+++ b/kivio/kiviopart/kivio_command.cpp
diff --git a/kivio/kiviopart/kivio_part_init.cc b/kivio/kiviopart/kivio_part_init.cpp
index 9800fb0f6..9800fb0f6 100644
--- a/kivio/kiviopart/kivio_part_init.cc
+++ b/kivio/kiviopart/kivio_part_init.cpp
diff --git a/koshell/Makefile.am b/koshell/Makefile.am
index 43dc43a0c..58d90caf9 100644
--- a/koshell/Makefile.am
+++ b/koshell/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 lib_LTLIBRARIES = 
 tdeinit_LTLIBRARIES = koshell.la
 bin_PROGRAMS =
-koshell_la_SOURCES = koshell_main.cc koshell_shell.cc iconsidepane.cpp koshellsettings.kcfgc
+koshell_la_SOURCES = koshell_main.cpp koshell_shell.cpp iconsidepane.cpp koshellsettings.kcfgc
 koshell_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(LIB_QT)
 koshell_la_LIBADD = $(LIB_KOFFICEUI)
 kde_kcfg_DATA = koshell.kcfg
@@ -20,7 +20,7 @@ rc_DATA = koshellui.rc
 xdg_apps_DATA = koshell.desktop
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cc *.cpp -o $(podir)/koshell.pot
+	$(XGETTEXT) rc.cpp *.cpp *.cpp -o $(podir)/koshell.pot
 
 include $(top_srcdir)/admin/Doxyfile.am
 
diff --git a/koshell/koshell_main.cc b/koshell/koshell_main.cpp
index e816cd9e1..e816cd9e1 100644
--- a/koshell/koshell_main.cc
+++ b/koshell/koshell_main.cpp
diff --git a/koshell/koshell_shell.cc b/koshell/koshell_shell.cpp
index aaff3c02b..aaff3c02b 100644
--- a/koshell/koshell_shell.cc
+++ b/koshell/koshell_shell.cpp
diff --git a/kounavail/Makefile.am b/kounavail/Makefile.am
index 079b81992..187b26321 100644
--- a/kounavail/Makefile.am
+++ b/kounavail/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(all_includes)
 
 ## The part
 kde_module_LTLIBRARIES = libkounavailpart.la
-libkounavailpart_la_SOURCES = kounavail.cc
+libkounavailpart_la_SOURCES = kounavail.cpp
 libkounavailpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkounavailpart_la_LIBADD = $(LIB_KOFFICECORE)
 
@@ -13,4 +13,4 @@ kdelnk_DATA = kounavail.desktop
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/kounavail.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kounavail.pot
diff --git a/kounavail/kounavail.cc b/kounavail/kounavail.cpp
index 47bfd5036..47bfd5036 100644
--- a/kounavail/kounavail.cc
+++ b/kounavail/kounavail.cpp
diff --git a/kplato/KPtViewIface.cc b/kplato/KPtViewIface.cpp
index dafd718d3..dafd718d3 100644
--- a/kplato/KPtViewIface.cc
+++ b/kplato/KPtViewIface.cpp
diff --git a/kplato/Makefile.am b/kplato/Makefile.am
index 96ea9294d..f2f331973 100644
--- a/kplato/Makefile.am
+++ b/kplato/Makefile.am
@@ -6,56 +6,56 @@ INCLUDES = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) \
 
 libkplatopart_la_SOURCES = \
     kptsummarytaskgeneralpanelbase.ui \
-    kptsummarytaskdialog.cc \
-    kptsummarytaskgeneralpanel.cc \
-    kptschedule.cc \
-    kptappointment.cc \
+    kptsummarytaskdialog.cpp \
+    kptsummarytaskgeneralpanel.cpp \
+    kptschedule.cpp \
+    kptappointment.cpp \
     kptcalendarlistpanel.ui \
-    kptresourceappointmentsview.cc \
-    kpttaskappointmentsview.cc \
-    kptdoublelistviewbase.cc \
-    kptaccountsviewconfigdialog.cc \
+    kptresourceappointmentsview.cpp \
+    kpttaskappointmentsview.cpp \
+    kptdoublelistviewbase.cpp \
+    kptaccountsviewconfigdialog.cpp \
     kptaccountsviewconfigurepanelbase.ui \
-    kptaccountsview.cc \
+    kptaccountsview.cpp \
     kpttaskcostpanelbase.ui \
-    kpttaskcostpanel.cc \
-    kptmilestoneprogresspanel.cc \
+    kpttaskcostpanel.cpp \
+    kptmilestoneprogresspanel.cpp \
     kptmilestoneprogresspanelbase.ui \
-    kptmilestoneprogressdialog.cc \
-    kptaccount.cc kptaccountsdialog.cc kptaccountspanel.cc kptaccountspanelbase.ui \
-    kptnode.cc kptproject.cc \
-    kptrelation.cc kptresource.cc kpttask.cc \
-    kptduration.cc kptfactory.cc kptpart.cc kptview.cc \
+    kptmilestoneprogressdialog.cpp \
+    kptaccount.cpp kptaccountsdialog.cpp kptaccountspanel.cpp kptaccountspanelbase.ui \
+    kptnode.cpp kptproject.cpp \
+    kptrelation.cpp kptresource.cpp kpttask.cpp \
+    kptduration.cpp kptfactory.cpp kptpart.cpp kptview.cpp \
     kptdurationwidget.ui relationpanel.ui\
-    kptprojectdialog.cc kpttaskdialog.cc  \
-    kptmainprojectdialog.cc kptmainprojectpanel.cc kptmainprojectpanelbase.ui \
-    kptganttview.cc kptresourcespanel.cc \
-    kptpertview.cc kptpertcanvas.cc kptrelationdialog.cc \
-    kptcanvasitem.cc kptprojectdialogbase.ui \
+    kptprojectdialog.cpp kpttaskdialog.cpp  \
+    kptmainprojectdialog.cpp kptmainprojectpanel.cpp kptmainprojectpanelbase.ui \
+    kptganttview.cpp kptresourcespanel.cpp \
+    kptpertview.cpp kptpertcanvas.cpp kptrelationdialog.cpp \
+    kptcanvasitem.cpp kptprojectdialogbase.ui \
     resourcespanelbase.ui \
-    kptresourceview.cc \
-    kpttastderesourcespanelbase.ui kptrequestresourcespanel.cc \
-    resourcedialogbase.ui kptresourcedialog.cc \
+    kptresourceview.cpp \
+    kpttastderesourcespanelbase.ui kptrequestresourcespanel.cpp \
+    resourcedialogbase.ui kptresourcedialog.cpp \
     kpttaskgeneralpanelbase.ui \
     kpttasknotespanelbase.ui \
-    kptdatetime.cc \
-    kptcalendar.cc kptcalendaredit.cc kptcalendarlistdialog.cc \
-    kptcalendarpanel.cc kptdatetable.cc \
-    kptcalendarlistdialogbase.cc kptcalendareditbase.cc \
-    kptcommand.cc KPtViewIface.cc KPtViewIface.skel  \
-    standardworktimedialogbase.ui kptstandardworktimedialog.cc \
-    kptintervaleditbase.ui kptintervaledit.cc \
-    kpttaskgeneralpanel.cc kpttaskdefaultpanel.cc \
+    kptdatetime.cpp \
+    kptcalendar.cpp kptcalendaredit.cpp kptcalendarlistdialog.cpp \
+    kptcalendarpanel.cpp kptdatetable.cpp \
+    kptcalendarlistdialogbase.cpp kptcalendareditbase.cpp \
+    kptcommand.cpp KPtViewIface.cpp KPtViewIface.skel  \
+    standardworktimedialogbase.ui kptstandardworktimedialog.cpp \
+    kptintervaleditbase.ui kptintervaledit.cpp \
+    kpttaskgeneralpanel.cpp kpttaskdefaultpanel.cpp \
     kptconfigtaskpanelbase.ui \
-    kptconfigdialog.cc \
-    kpttaskprogresspanel.cc kpttaskprogresspanelbase.ui \
-    kpttaskprogressdialog.cc \
-    kptconfig.cc kptcontext.cc \
-    kptresourcesdialog.cc \
-    kptwbsdefinitiondialog.cc kptwbsdefinitionpanel.cc kptwbsdefinitionpanelbase.ui \
-    kptwbsdefinition.cc
-##    kptconfigbehaviorpanel.cc kptconfigbehaviorpanelbase.ui \
-##    kptreportview.cc 
+    kptconfigdialog.cpp \
+    kpttaskprogresspanel.cpp kpttaskprogresspanelbase.ui \
+    kpttaskprogressdialog.cpp \
+    kptconfig.cpp kptcontext.cpp \
+    kptresourcesdialog.cpp \
+    kptwbsdefinitiondialog.cpp kptwbsdefinitionpanel.cpp kptwbsdefinitionpanelbase.ui \
+    kptwbsdefinition.cpp
+##    kptconfigbehaviorpanel.cpp kptconfigbehaviorpanelbase.ui \
+##    kptreportview.cpp 
 
 # (this is not used)
 noinst_HEADERS = \
@@ -112,7 +112,7 @@ libkplatopart_la_METASOURCES = AUTO
 ## The tdeinit loadable module and executable
 tdeinit_LTLIBRARIES = kplato.la
 bin_PROGRAMS =
-kplato_la_SOURCES = main.cc
+kplato_la_SOURCES = main.cpp
 kplato_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeprint
 kplato_la_LIBADD = $(KOFFICE_LIBS)
 
@@ -124,7 +124,7 @@ rc_DATA = kplato.rc kplato_readonly.rc
 ## NOTE: extractattr needs <Label & Text on same line!
 messages: rc.cpp
 	$(EXTRACTATTR) --attr=Label,Text reports/*.ktf >>rc.cpp
-	$(XGETTEXT) rc.cpp *.cc kptaboutdata.h -o $(podir)/kplato.pot
+	$(XGETTEXT) rc.cpp *.cpp kptaboutdata.h -o $(podir)/kplato.pot
 
 kde_services_DATA = kplatopart.desktop
 
diff --git a/kplato/TODO b/kplato/TODO
index 746a4a272..0526cf557 100644
--- a/kplato/TODO
+++ b/kplato/TODO
@@ -97,7 +97,7 @@ Taken       User manual (contact: raphael.langerhorst@kdemail.net)
             Taskjuggler???
             
             Change source filenames to 'classname'.cpp and d:o .h
-            Eg: kpttask.cc -> Task.cpp kpttask.h -> Task.h
+            Eg: kpttask.cpp -> Task.cpp kpttask.h -> Task.h
             Also remove the .ui filename prefix.
 ------------------------------------------------------------------
 Done        Remove Networkview.
diff --git a/kplato/kplato.tdevelop b/kplato/kplato.tdevelop
index cae30836d..2be3b5395 100644
--- a/kplato/kplato.tdevelop
+++ b/kplato/kplato.tdevelop
@@ -17,7 +17,7 @@
   </general>
   <kdevfileview>
     <groups>
-      <group pattern="*.cpp;*.cxx;*.h" name="Sources" />
+      <group pattern="*.cpp;*.h" name="Sources" />
       <group pattern="*.ui" name="User Interface" />
       <group pattern="*.png" name="Icons" />
       <group pattern="*.po;*.ts" name="Translations" />
diff --git a/kplato/kptaccount.cc b/kplato/kptaccount.cpp
index f6016ff45..f6016ff45 100644
--- a/kplato/kptaccount.cc
+++ b/kplato/kptaccount.cpp
diff --git a/kplato/kptaccountsdialog.cc b/kplato/kptaccountsdialog.cpp
index 7ecc7bf1e..7ecc7bf1e 100644
--- a/kplato/kptaccountsdialog.cc
+++ b/kplato/kptaccountsdialog.cpp
diff --git a/kplato/kptaccountspanel.cc b/kplato/kptaccountspanel.cpp
index 3a6015d8b..3a6015d8b 100644
--- a/kplato/kptaccountspanel.cc
+++ b/kplato/kptaccountspanel.cpp
diff --git a/kplato/kptaccountsview.cc b/kplato/kptaccountsview.cpp
index 3352a87de..3352a87de 100644
--- a/kplato/kptaccountsview.cc
+++ b/kplato/kptaccountsview.cpp
diff --git a/kplato/kptaccountsviewconfigdialog.cc b/kplato/kptaccountsviewconfigdialog.cpp
index 18e63fb66..18e63fb66 100644
--- a/kplato/kptaccountsviewconfigdialog.cc
+++ b/kplato/kptaccountsviewconfigdialog.cpp
diff --git a/kplato/kptappointment.cc b/kplato/kptappointment.cpp
index f09b4bcc6..f09b4bcc6 100644
--- a/kplato/kptappointment.cc
+++ b/kplato/kptappointment.cpp
diff --git a/kplato/kptcalendar.cc b/kplato/kptcalendar.cpp
index 461950410..461950410 100644
--- a/kplato/kptcalendar.cc
+++ b/kplato/kptcalendar.cpp
diff --git a/kplato/kptcalendaredit.cc b/kplato/kptcalendaredit.cpp
index a29eb8c09..a29eb8c09 100644
--- a/kplato/kptcalendaredit.cc
+++ b/kplato/kptcalendaredit.cpp
diff --git a/kplato/kptcalendareditbase.cc b/kplato/kptcalendareditbase.cpp
index 6349c273e..6349c273e 100644
--- a/kplato/kptcalendareditbase.cc
+++ b/kplato/kptcalendareditbase.cpp
diff --git a/kplato/kptcalendarlistdialog.cc b/kplato/kptcalendarlistdialog.cpp
index 496cc786b..496cc786b 100644
--- a/kplato/kptcalendarlistdialog.cc
+++ b/kplato/kptcalendarlistdialog.cpp
diff --git a/kplato/kptcalendarlistdialogbase.cc b/kplato/kptcalendarlistdialogbase.cpp
index bc59788ff..bc59788ff 100644
--- a/kplato/kptcalendarlistdialogbase.cc
+++ b/kplato/kptcalendarlistdialogbase.cpp
diff --git a/kplato/kptcalendarpanel.cc b/kplato/kptcalendarpanel.cpp
index 8717f187b..8717f187b 100644
--- a/kplato/kptcalendarpanel.cc
+++ b/kplato/kptcalendarpanel.cpp
diff --git a/kplato/kptcanvasitem.cc b/kplato/kptcanvasitem.cpp
index 152fd837f..152fd837f 100644
--- a/kplato/kptcanvasitem.cc
+++ b/kplato/kptcanvasitem.cpp
diff --git a/kplato/kptcommand.cc b/kplato/kptcommand.cpp
index 11c920006..11c920006 100644
--- a/kplato/kptcommand.cc
+++ b/kplato/kptcommand.cpp
diff --git a/kplato/kptconfig.cc b/kplato/kptconfig.cpp
index 358b57978..358b57978 100644
--- a/kplato/kptconfig.cc
+++ b/kplato/kptconfig.cpp
diff --git a/kplato/kptconfigbehaviorpanel.cc b/kplato/kptconfigbehaviorpanel.cpp
index f721ae234..f721ae234 100644
--- a/kplato/kptconfigbehaviorpanel.cc
+++ b/kplato/kptconfigbehaviorpanel.cpp
diff --git a/kplato/kptconfigdialog.cc b/kplato/kptconfigdialog.cpp
index 384c4abde..384c4abde 100644
--- a/kplato/kptconfigdialog.cc
+++ b/kplato/kptconfigdialog.cpp
diff --git a/kplato/kptcontext.cc b/kplato/kptcontext.cpp
index 830c6c957..830c6c957 100644
--- a/kplato/kptcontext.cc
+++ b/kplato/kptcontext.cpp
diff --git a/kplato/kptdatetable.cc b/kplato/kptdatetable.cpp
index ea8e16afb..ea8e16afb 100644
--- a/kplato/kptdatetable.cc
+++ b/kplato/kptdatetable.cpp
diff --git a/kplato/kptdatetime.cc b/kplato/kptdatetime.cpp
index 2a05ace5c..2a05ace5c 100644
--- a/kplato/kptdatetime.cc
+++ b/kplato/kptdatetime.cpp
diff --git a/kplato/kptdoublelistviewbase.cc b/kplato/kptdoublelistviewbase.cpp
index d6bc73d4f..d6bc73d4f 100644
--- a/kplato/kptdoublelistviewbase.cc
+++ b/kplato/kptdoublelistviewbase.cpp
diff --git a/kplato/kptduration.cc b/kplato/kptduration.cpp
index 87e0e54a0..87e0e54a0 100644
--- a/kplato/kptduration.cc
+++ b/kplato/kptduration.cpp
diff --git a/kplato/kptfactory.cc b/kplato/kptfactory.cpp
index 7d66a7406..7d66a7406 100644
--- a/kplato/kptfactory.cc
+++ b/kplato/kptfactory.cpp
diff --git a/kplato/kptganttview.cc b/kplato/kptganttview.cpp
index b84bbbc49..b84bbbc49 100644
--- a/kplato/kptganttview.cc
+++ b/kplato/kptganttview.cpp
diff --git a/kplato/kptintervaledit.cc b/kplato/kptintervaledit.cpp
index a37ec064c..a37ec064c 100644
--- a/kplato/kptintervaledit.cc
+++ b/kplato/kptintervaledit.cpp
diff --git a/kplato/kptmainprojectdialog.cc b/kplato/kptmainprojectdialog.cpp
index 3d9065e20..3d9065e20 100644
--- a/kplato/kptmainprojectdialog.cc
+++ b/kplato/kptmainprojectdialog.cpp
diff --git a/kplato/kptmainprojectpanel.cc b/kplato/kptmainprojectpanel.cpp
index 375b04f12..375b04f12 100644
--- a/kplato/kptmainprojectpanel.cc
+++ b/kplato/kptmainprojectpanel.cpp
diff --git a/kplato/kptmilestoneprogressdialog.cc b/kplato/kptmilestoneprogressdialog.cpp
index f9bf729e9..f9bf729e9 100644
--- a/kplato/kptmilestoneprogressdialog.cc
+++ b/kplato/kptmilestoneprogressdialog.cpp
diff --git a/kplato/kptmilestoneprogresspanel.cc b/kplato/kptmilestoneprogresspanel.cpp
index 977878f10..977878f10 100644
--- a/kplato/kptmilestoneprogresspanel.cc
+++ b/kplato/kptmilestoneprogresspanel.cpp
diff --git a/kplato/kptnode.cc b/kplato/kptnode.cpp
index b56146094..b56146094 100644
--- a/kplato/kptnode.cc
+++ b/kplato/kptnode.cpp
diff --git a/kplato/kptpart.cc b/kplato/kptpart.cpp
index 53ed107f0..53ed107f0 100644
--- a/kplato/kptpart.cc
+++ b/kplato/kptpart.cpp
diff --git a/kplato/kptpertcanvas.cc b/kplato/kptpertcanvas.cpp
index 9d12945cf..9d12945cf 100644
--- a/kplato/kptpertcanvas.cc
+++ b/kplato/kptpertcanvas.cpp
diff --git a/kplato/kptpertview.cc b/kplato/kptpertview.cpp
index f68d9eb8e..f68d9eb8e 100644
--- a/kplato/kptpertview.cc
+++ b/kplato/kptpertview.cpp
diff --git a/kplato/kptproject.cc b/kplato/kptproject.cpp
index 97eb82028..97eb82028 100644
--- a/kplato/kptproject.cc
+++ b/kplato/kptproject.cpp
diff --git a/kplato/kptprojectdialog.cc b/kplato/kptprojectdialog.cpp
index 1b547629b..1b547629b 100644
--- a/kplato/kptprojectdialog.cc
+++ b/kplato/kptprojectdialog.cpp
diff --git a/kplato/kptrelation.cc b/kplato/kptrelation.cpp
index e84b72a29..e84b72a29 100644
--- a/kplato/kptrelation.cc
+++ b/kplato/kptrelation.cpp
diff --git a/kplato/kptrelationdialog.cc b/kplato/kptrelationdialog.cpp
index 4de50c110..4de50c110 100644
--- a/kplato/kptrelationdialog.cc
+++ b/kplato/kptrelationdialog.cpp
diff --git a/kplato/kptreportview.cc b/kplato/kptreportview.cpp
index dbbae9a17..dbbae9a17 100644
--- a/kplato/kptreportview.cc
+++ b/kplato/kptreportview.cpp
diff --git a/kplato/kptrequestresourcespanel.cc b/kplato/kptrequestresourcespanel.cpp
index 790a61777..790a61777 100644
--- a/kplato/kptrequestresourcespanel.cc
+++ b/kplato/kptrequestresourcespanel.cpp
diff --git a/kplato/kptresource.cc b/kplato/kptresource.cpp
index 763c0c86c..763c0c86c 100644
--- a/kplato/kptresource.cc
+++ b/kplato/kptresource.cpp
diff --git a/kplato/kptresourceappointmentsview.cc b/kplato/kptresourceappointmentsview.cpp
index a251eddba..a251eddba 100644
--- a/kplato/kptresourceappointmentsview.cc
+++ b/kplato/kptresourceappointmentsview.cpp
diff --git a/kplato/kptresourcedialog.cc b/kplato/kptresourcedialog.cpp
index 8e2c24fd8..8e2c24fd8 100644
--- a/kplato/kptresourcedialog.cc
+++ b/kplato/kptresourcedialog.cpp
diff --git a/kplato/kptresourcesdialog.cc b/kplato/kptresourcesdialog.cpp
index 37ce45298..37ce45298 100644
--- a/kplato/kptresourcesdialog.cc
+++ b/kplato/kptresourcesdialog.cpp
diff --git a/kplato/kptresourcespanel.cc b/kplato/kptresourcespanel.cpp
index 86275cd73..86275cd73 100644
--- a/kplato/kptresourcespanel.cc
+++ b/kplato/kptresourcespanel.cpp
diff --git a/kplato/kptresourceview.cc b/kplato/kptresourceview.cpp
index c20b9fd26..c20b9fd26 100644
--- a/kplato/kptresourceview.cc
+++ b/kplato/kptresourceview.cpp
diff --git a/kplato/kptschedule.cc b/kplato/kptschedule.cpp
index 7581312e0..7581312e0 100644
--- a/kplato/kptschedule.cc
+++ b/kplato/kptschedule.cpp
diff --git a/kplato/kptstandardworktimedialog.cc b/kplato/kptstandardworktimedialog.cpp
index 31fcae494..31fcae494 100644
--- a/kplato/kptstandardworktimedialog.cc
+++ b/kplato/kptstandardworktimedialog.cpp
diff --git a/kplato/kptsummarytaskdialog.cc b/kplato/kptsummarytaskdialog.cpp
index adf152a19..adf152a19 100644
--- a/kplato/kptsummarytaskdialog.cc
+++ b/kplato/kptsummarytaskdialog.cpp
diff --git a/kplato/kptsummarytaskgeneralpanel.cc b/kplato/kptsummarytaskgeneralpanel.cpp
index 8fff18211..8fff18211 100644
--- a/kplato/kptsummarytaskgeneralpanel.cc
+++ b/kplato/kptsummarytaskgeneralpanel.cpp
diff --git a/kplato/kpttask.cc b/kplato/kpttask.cpp
index 4e41e6bc8..4e41e6bc8 100644
--- a/kplato/kpttask.cc
+++ b/kplato/kpttask.cpp
diff --git a/kplato/kpttaskappointmentsview.cc b/kplato/kpttaskappointmentsview.cpp
index 669bf0654..669bf0654 100644
--- a/kplato/kpttaskappointmentsview.cc
+++ b/kplato/kpttaskappointmentsview.cpp
diff --git a/kplato/kpttaskcostpanel.cc b/kplato/kpttaskcostpanel.cpp
index d33e2c7cb..d33e2c7cb 100644
--- a/kplato/kpttaskcostpanel.cc
+++ b/kplato/kpttaskcostpanel.cpp
diff --git a/kplato/kpttaskdefaultpanel.cc b/kplato/kpttaskdefaultpanel.cpp
index d3fb322ed..d3fb322ed 100644
--- a/kplato/kpttaskdefaultpanel.cc
+++ b/kplato/kpttaskdefaultpanel.cpp
diff --git a/kplato/kpttaskdialog.cc b/kplato/kpttaskdialog.cpp
index 65aa917f2..65aa917f2 100644
--- a/kplato/kpttaskdialog.cc
+++ b/kplato/kpttaskdialog.cpp
diff --git a/kplato/kpttaskgeneralpanel.cc b/kplato/kpttaskgeneralpanel.cpp
index 854197e39..854197e39 100644
--- a/kplato/kpttaskgeneralpanel.cc
+++ b/kplato/kpttaskgeneralpanel.cpp
diff --git a/kplato/kpttaskprogressdialog.cc b/kplato/kpttaskprogressdialog.cpp
index 180d3a53d..180d3a53d 100644
--- a/kplato/kpttaskprogressdialog.cc
+++ b/kplato/kpttaskprogressdialog.cpp
diff --git a/kplato/kpttaskprogresspanel.cc b/kplato/kpttaskprogresspanel.cpp
index 00de2b225..00de2b225 100644
--- a/kplato/kpttaskprogresspanel.cc
+++ b/kplato/kpttaskprogresspanel.cpp
diff --git a/kplato/kptview.cc b/kplato/kptview.cpp
index 238ff733f..238ff733f 100644
--- a/kplato/kptview.cc
+++ b/kplato/kptview.cpp
diff --git a/kplato/kptwbsdefinition.cc b/kplato/kptwbsdefinition.cpp
index fcf2d41f2..4c1465334 100644
--- a/kplato/kptwbsdefinition.cc
+++ b/kplato/kptwbsdefinition.cpp
@@ -131,7 +131,7 @@ TQString WBSDefinition::code(CodeDef &def, uint index) {
     return TQString();
 }
 
-// Nicked from koparagcounter.cc
+// Nicked from koparagcounter.cpp
 const TQCString RNUnits[] = {"", "i", "ii", "iii", "iv", "v", "vi", "vii", "viii", "ix"};
 const TQCString RNTens[] = {"", "x", "xx", "xxx", "xl", "l", "lx", "lxx", "lxxx", "xc"};
 const TQCString RNHundreds[] = {"", "c", "cc", "ccc", "cd", "d", "dc", "dcc", "dccc", "cm"};
diff --git a/kplato/kptwbsdefinitiondialog.cc b/kplato/kptwbsdefinitiondialog.cpp
index 181cbd43a..181cbd43a 100644
--- a/kplato/kptwbsdefinitiondialog.cc
+++ b/kplato/kptwbsdefinitiondialog.cpp
diff --git a/kplato/kptwbsdefinitionpanel.cc b/kplato/kptwbsdefinitionpanel.cpp
index 3843a98c8..3843a98c8 100644
--- a/kplato/kptwbsdefinitionpanel.cc
+++ b/kplato/kptwbsdefinitionpanel.cpp
diff --git a/kplato/main.cc b/kplato/main.cpp
index 75af7b84b..75af7b84b 100644
--- a/kplato/main.cc
+++ b/kplato/main.cpp
diff --git a/kpresenter/KPrMSPresentationSetup.cpp b/kpresenter/KPrMSPresentationSetup.cpp
index de0f888ca..557b87c48 100644
--- a/kpresenter/KPrMSPresentationSetup.cpp
+++ b/kpresenter/KPrMSPresentationSetup.cpp
@@ -1,6 +1,6 @@
 /* This file is part of the KDE project
    Copyright 2004 Brad Hards <bradh@frogmouth.net>
-   Loosely based on webpresention.cc, which is:
+   Loosely based on webpresention.cpp, which is:
      Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
      Copyright 2001, 2002 Nicolas GOUTTE <goutte@kde.org>
      Copyright 2002 Ariya Hidayat <ariya@kde.org>
diff --git a/kpresenter/KPrMarginWidget.cpp b/kpresenter/KPrMarginWidget.cpp
index a67fa96ec..a8aa403e3 100644
--- a/kpresenter/KPrMarginWidget.cpp
+++ b/kpresenter/KPrMarginWidget.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2005 Thorsten Zachmann <zachmann@kde.org>
 
-   The code is mostly a copy from kword/framedia.cc
+   The code is mostly a copy from kword/framedia.cpp
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/kpresenter/KPrSoundPlayer.cpp b/kpresenter/KPrSoundPlayer.cpp
index ff4b1ffd3..22b986735 100644
--- a/kpresenter/KPrSoundPlayer.cpp
+++ b/kpresenter/KPrSoundPlayer.cpp
@@ -4,7 +4,7 @@ base code from kaudioplayer.h, kaudioplayer.cpp
 Copyright (C) 2000 Stefan Westerfeld
 stefan@space.twc.de
 
-and konq_sound.h konq_sound.cc
+and konq_sound.h konq_sound.cpp
 Copyright (c) 2001 Malte Starostik <malte@kde.org>
 
 This file's authors :
diff --git a/kpresenter/KPrSoundPlayer.h b/kpresenter/KPrSoundPlayer.h
index 384ee0666..4ef27a20a 100644
--- a/kpresenter/KPrSoundPlayer.h
+++ b/kpresenter/KPrSoundPlayer.h
@@ -4,7 +4,7 @@ base code from kaudioplayer.h, kaudioplayer.cpp
 Copyright (C) 2000 Stefan Westerfeld
 stefan@space.twc.de
 
-and konq_sound.h konq_sound.cc
+and konq_sound.h konq_sound.cpp
 Copyright (c) 2001 Malte Starostik <malte@kde.org>
 
 This file's authors :
diff --git a/kpresenter/KPrTextObject.cpp b/kpresenter/KPrTextObject.cpp
index 4c7f6bdd1..461015faf 100644
--- a/kpresenter/KPrTextObject.cpp
+++ b/kpresenter/KPrTextObject.cpp
@@ -439,7 +439,7 @@ void KPrTextObject::paint( TQPainter *_painter, KoTextZoomHandler*_zoomHandler,
     }
     if ( !editingTextObj || !onlyChanged )
     {
-        /// #### Port this to KoBorder, see e.g. kword/kwframe.cc:590
+        /// #### Port this to KoBorder, see e.g. kword/kwframe.cpp:590
         // (so that the border gets drawn OUTSIDE of the object area)
         _painter->drawRect( _zoomHandler->zoomItX(pw), _zoomHandler->zoomItX(pw), _zoomHandler->zoomItX( ow - 2 * pw),
                             _zoomHandler->zoomItY( oh - 2 * pw) );
diff --git a/kpresenter/KPrTextProperty.cpp b/kpresenter/KPrTextProperty.cpp
index bb5073ff0..e10fd701a 100644
--- a/kpresenter/KPrTextProperty.cpp
+++ b/kpresenter/KPrTextProperty.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2005 Thorsten Zachmann <zachmann@kde.org>
 
-   The code is mostly a copy from kword/framedia.cc
+   The code is mostly a copy from kword/framedia.cpp
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/kpresenter/KPrTextProperty.h b/kpresenter/KPrTextProperty.h
index dd018c2fc..2a33b56f7 100644
--- a/kpresenter/KPrTextProperty.h
+++ b/kpresenter/KPrTextProperty.h
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (C) 2005 Thorsten Zachmann <zachmann@kde.org>
 
-   The code is mostly a copy from kword/framedia.cc
+   The code is mostly a copy from kword/framedia.cpp
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/kpresenter/KPrView.cpp b/kpresenter/KPrView.cpp
index cfbe5f231..220dc91b6 100644
--- a/kpresenter/KPrView.cpp
+++ b/kpresenter/KPrView.cpp
@@ -2894,7 +2894,7 @@ void KPrView::setupActions()
                                     actionCollection(), "insert_link" );
 
 #if 0
-    //code from page.cc
+    //code from page.cpp
     //not implemented
     picResizeMenu->insertSeparator();
     picResizeMenu->insertItem( i18n( "Enter Custom Factor..." ), TQT_TQOBJECT(this), TQT_SLOT( picViewOrigFactor() ) );
diff --git a/kpresenter/KPrWebPresentation.cpp b/kpresenter/KPrWebPresentation.cpp
index 00c0dbf4e..5d8998474 100644
--- a/kpresenter/KPrWebPresentation.cpp
+++ b/kpresenter/KPrWebPresentation.cpp
@@ -76,7 +76,7 @@
 #include "KoDocumentInfo.h"
 
 
-// Comes from koffice/filters/libexport/KWEFUtils.cc
+// Comes from koffice/filters/libexport/KWEFUtils.cpp
 static TQString EscapeSgmlText(const TQTextCodec* codec, const TQString& strIn,
                               const bool quot = false , const bool apos = false )
 {
diff --git a/kspread/CHANGES b/kspread/CHANGES
index 9b9b654ef..514e7bf8b 100644
--- a/kspread/CHANGES
+++ b/kspread/CHANGES
@@ -386,7 +386,7 @@ Until beta1:
 - many new built-in functions (see detailed list below)
 - function name is now case-insensitive
 - "Related Function" in formula editor
-- move functions in kspread_interpreter into several kspread_functions_*.cc
+- move functions in kspread_interpreter into several kspread_functions_*.cpp
 
 New functions added:
  conversion:
diff --git a/kspread/DESIGN.html b/kspread/DESIGN.html
index 3c43a860c..4bfa7e8af 100644
--- a/kspread/DESIGN.html
+++ b/kspread/DESIGN.html
@@ -684,7 +684,7 @@ existing tester and modify it. Basically, it must be a subclass of class Tester
 (see <tt>koffice/kspread/tests/tester.h</tt>). Just reimplement the virtual 
 function <tt>run()</tt> and it is ready. In order to make it possible to run 
 the new tester, add an instance of the class in TestRunner 
-(for details, see <tt>koffice/kspread/tests/testrunner.cc</tt>).</p>
+(for details, see <tt>koffice/kspread/tests/testrunner.cpp</tt>).</p>
 
 <p>A tester must be self-contained, it should not use any test data from 
 current document. If necessary, it must create (or hard code) the data by 
@@ -739,7 +739,7 @@ would not cause tons of recompile.</p>
 <p>When creating a new class, use namespace KSpread. Do not use KSpread prefix
 anymore. Example: use <tt>KSpread::Foo</tt> instead of <tt>KSpreadFoo</tt>.
 Also source file name should not contain kspread prefix anymore, i.e.
-<tt>foo.h</tt> and <tt>foo.cc</tt> (but not <tt>kspread_foo.h</tt> and
-<tt>kspread_foo.cc</tt>) for the above example.</p>
+<tt>foo.h</tt> and <tt>foo.cpp</tt> (but not <tt>kspread_foo.h</tt> and
+<tt>kspread_foo.cpp</tt>) for the above example.</p>
 
 </body></html>
diff --git a/kspread/Doxyfile b/kspread/Doxyfile
index 38131dfba..bb39c7ba8 100644
--- a/kspread/Doxyfile
+++ b/kspread/Doxyfile
@@ -397,12 +397,11 @@ INPUT                  =
 # FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
 # and *.h) to filter out the source-files in the directories. If left 
 # blank the following patterns are tested: 
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
+# *.c *.cpp *.cxx *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx *.hpp 
 # *.h++ *.idl *.odl *.cs *.php *.php3 *.inc
 
 FILE_PATTERNS          = *.h \
                          *.cpp \
-                         *.cc \
                          *.hpp \
                          *.dox \
                          *.c++ \
diff --git a/kspread/KSpreadAppIface.cc b/kspread/KSpreadAppIface.cpp
index 6f0c8362e..6f0c8362e 100644
--- a/kspread/KSpreadAppIface.cc
+++ b/kspread/KSpreadAppIface.cpp
diff --git a/kspread/KSpreadCellIface.cc b/kspread/KSpreadCellIface.cpp
index 4188a1e4e..4188a1e4e 100644
--- a/kspread/KSpreadCellIface.cc
+++ b/kspread/KSpreadCellIface.cpp
diff --git a/kspread/KSpreadColumnIface.cc b/kspread/KSpreadColumnIface.cpp
index c0fc813f4..c0fc813f4 100644
--- a/kspread/KSpreadColumnIface.cc
+++ b/kspread/KSpreadColumnIface.cpp
diff --git a/kspread/KSpreadDocIface.cc b/kspread/KSpreadDocIface.cpp
index e8f1df462..e8f1df462 100644
--- a/kspread/KSpreadDocIface.cc
+++ b/kspread/KSpreadDocIface.cpp
diff --git a/kspread/KSpreadLayoutIface.cc b/kspread/KSpreadLayoutIface.cpp
index d3c5e1b75..d3c5e1b75 100644
--- a/kspread/KSpreadLayoutIface.cc
+++ b/kspread/KSpreadLayoutIface.cpp
diff --git a/kspread/KSpreadMapIface.cc b/kspread/KSpreadMapIface.cpp
index ba8071f9c..ba8071f9c 100644
--- a/kspread/KSpreadMapIface.cc
+++ b/kspread/KSpreadMapIface.cpp
diff --git a/kspread/KSpreadRowIface.cc b/kspread/KSpreadRowIface.cpp
index 69db292f6..69db292f6 100644
--- a/kspread/KSpreadRowIface.cc
+++ b/kspread/KSpreadRowIface.cpp
diff --git a/kspread/KSpreadTableIface.cc b/kspread/KSpreadTableIface.cpp
index cbf37f202..cbf37f202 100644
--- a/kspread/KSpreadTableIface.cc
+++ b/kspread/KSpreadTableIface.cpp
diff --git a/kspread/KSpreadViewIface.cc b/kspread/KSpreadViewIface.cpp
index 1fb76f460..1fb76f460 100644
--- a/kspread/KSpreadViewIface.cc
+++ b/kspread/KSpreadViewIface.cpp
diff --git a/kspread/Makefile.am b/kspread/Makefile.am
index d3965a2d1..6df5c80d6 100644
--- a/kspread/Makefile.am
+++ b/kspread/Makefile.am
@@ -8,24 +8,24 @@ INCLUDES  = $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES) -I$(interfacedir) \
 lib_LTLIBRARIES = libkspreadcommon.la
 kde_module_LTLIBRARIES = libkspreadpart.la
 
-libkspreadcommon_la_SOURCES = digest.cc commands.cc damages.cc dependencies.cc \
-	formula.cc 	functions.cc kspread_autofill.cc kspread_canvas.cc \
-	kspread_cell.cc kspread_cluster.cc kspread_condition.cc kspread_doc.cc \
-	kspread_editors.cc kspread_events.cc kspread_factory.cc kspread_format.cc \
-	kspread_functions_conversion.cc kspread_functions_database.cc kspread_functions_datetime.cc \
-	kspread_functions_engineering.cc kspread_functions_financial.cc kspread_functions_helper.cc \
-	kspread_functions_information.cc kspread_functions_logic.cc kspread_functions_math.cc \
-	kspread_functions_reference.cc kspread_functions_statistical.cc kspread_functions_text.cc \
-	kspread_functions_trig.cc kspread_handler.cc kspread_locale.cc kspread_map.cc \
-	kspread_numformat.cc kspread_object.cc kspread_style.cc kspread_style_manager.cc \
-	kspread_undo.cc kspread_value.cc kspread_view.cc kspread_sheet.cc kspread_sheetprint.cc \
-	kspread_util.cc kspread_toolbox.cc 	valuecalc.cc 	valueconverter.cc 	valueformatter.cc \
-		valueparser.cc KSpreadAppIface.cc KSpreadAppIface.skel KSpreadCellIface.cc \
-	KSpreadCellIface.skel KSpreadColumnIface.skel KSpreadColumnIface.cc KSpreadDocIface.cc \
-	KSpreadDocIface.skel KSpreadLayoutIface.skel KSpreadLayoutIface.cc KSpreadMapIface.cc \
-	KSpreadMapIface.skel KSpreadRowIface.skel KSpreadRowIface.cc KSpreadTableIface.cc \
-	KSpreadTableIface.skel KSpreadViewIface.skel KSpreadViewIface.cc \
-		kspread_genvalidationstyle.cc region.cc selection.cc manipulator.cc manipulator_data.cc \
+libkspreadcommon_la_SOURCES = digest.cpp commands.cpp damages.cpp dependencies.cpp \
+	formula.cpp 	functions.cpp kspread_autofill.cpp kspread_canvas.cpp \
+	kspread_cell.cpp kspread_cluster.cpp kspread_condition.cpp kspread_doc.cpp \
+	kspread_editors.cpp kspread_events.cpp kspread_factory.cpp kspread_format.cpp \
+	kspread_functions_conversion.cpp kspread_functions_database.cpp kspread_functions_datetime.cpp \
+	kspread_functions_engineering.cpp kspread_functions_financial.cpp kspread_functions_helper.cpp \
+	kspread_functions_information.cpp kspread_functions_logic.cpp kspread_functions_math.cpp \
+	kspread_functions_reference.cpp kspread_functions_statistical.cpp kspread_functions_text.cpp \
+	kspread_functions_trig.cpp kspread_handler.cpp kspread_locale.cpp kspread_map.cpp \
+	kspread_numformat.cpp kspread_object.cpp kspread_style.cpp kspread_style_manager.cpp \
+	kspread_undo.cpp kspread_value.cpp kspread_view.cpp kspread_sheet.cpp kspread_sheetprint.cpp \
+	kspread_util.cpp kspread_toolbox.cpp 	valuecalc.cpp 	valueconverter.cpp 	valueformatter.cpp \
+		valueparser.cpp KSpreadAppIface.cpp KSpreadAppIface.skel KSpreadCellIface.cpp \
+	KSpreadCellIface.skel KSpreadColumnIface.skel KSpreadColumnIface.cpp KSpreadDocIface.cpp \
+	KSpreadDocIface.skel KSpreadLayoutIface.skel KSpreadLayoutIface.cpp KSpreadMapIface.cpp \
+	KSpreadMapIface.skel KSpreadRowIface.skel KSpreadRowIface.cpp KSpreadTableIface.cpp \
+	KSpreadTableIface.skel KSpreadViewIface.skel KSpreadViewIface.cpp \
+		kspread_genvalidationstyle.cpp region.cpp selection.cpp manipulator.cpp manipulator_data.cpp \
 	kspread_generalProperty.cpp kspread_propertyEditor.cpp 
 
 libkspreadcommon_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -no-undefined -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts -ltdeutils
@@ -35,7 +35,7 @@ libkspreadcommon_la_LIBADD = $(top_builddir)/interfaces/libkochart.la \
 
 libkspreadpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 libkspreadpart_la_LIBADD  = libkspreadcommon.la
-libkspreadpart_la_SOURCES = kspread_factory_init.cc
+libkspreadpart_la_SOURCES = kspread_factory_init.cpp
 
 
 METASOURCES = AUTO
@@ -43,7 +43,7 @@ METASOURCES = AUTO
 ## The tdeinit loadable module and the executable
 tdeinit_LTLIBRARIES = kspread.la
 bin_PROGRAMS =
-kspread_la_SOURCES = main.cc
+kspread_la_SOURCES = main.cpp
 kspread_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) -ltdecore -ltdeui $(LIB_QT) -lkjs -ltdefx -ltdeio -ltdeparts
 kspread_la_LIBADD = $(LIB_KOFFICECORE)
 
@@ -63,10 +63,10 @@ parser:
 	bison -p dep -b dep -d yacc.dep.y
 
 messages: rc.cpp
-	$(EXTRACTRC) --tag-group=koffice extensions/*.xml > xml_doc.cc
+	$(EXTRACTRC) --tag-group=koffice extensions/*.xml > xml_doc.cpp
 	$(EXTRACTRC) dialogs/*.ui >> rc.cpp
-	$(XGETTEXT) rc.cpp *.cc kspread_aboutdata.h dialogs/*.cc tests/*.cc -o $(podir)/kspread.pot
-	-rm xml_doc.cc
+	$(XGETTEXT) rc.cpp *.cpp kspread_aboutdata.h dialogs/*.cpp tests/*.cpp -o $(podir)/kspread.pot
+	-rm xml_doc.cpp
 
 include ../admin/Doxyfile.am
 
diff --git a/kspread/TODO b/kspread/TODO
index 575d8c8d0..0769dc6f4 100644
--- a/kspread/TODO
+++ b/kspread/TODO
@@ -160,7 +160,7 @@ Things to do after the release of KOffice 1.4
   + code cleanups						      3 ----
     - Merge Cell::checkForNamedAreas(.) into Oasis::decodeFormula(.).
     - Move Cell::convertFormulaToOasisFormat(..) to
-      Oasis::encodeFormula to reduce the size of kspread_cell.cc
+      Oasis::encodeFormula to reduce the size of kspread_cell.cpp
       and to have encoding/decoding in one place.
     - Check if all logic of Point and Range is materialized in Region.
       Replace all occurences of Point and Range by Region.
diff --git a/kspread/commands.cc b/kspread/commands.cpp
index 490bee81b..490bee81b 100644
--- a/kspread/commands.cc
+++ b/kspread/commands.cpp
diff --git a/kspread/damages.cc b/kspread/damages.cpp
index 291db4087..291db4087 100644
--- a/kspread/damages.cc
+++ b/kspread/damages.cpp
diff --git a/kspread/dependencies.cc b/kspread/dependencies.cpp
index 66bbe61a1..66bbe61a1 100644
--- a/kspread/dependencies.cc
+++ b/kspread/dependencies.cpp
diff --git a/kspread/dialogs/Makefile.am b/kspread/dialogs/Makefile.am
index 71d7a476e..6f2dce6dc 100644
--- a/kspread/dialogs/Makefile.am
+++ b/kspread/dialogs/Makefile.am
@@ -10,38 +10,38 @@ noinst_LTLIBRARIES = \
 	libdialogs.la
 
 libdialogs_la_SOURCES = \
-	kspread_dlg_angle.cc \
-	kspread_dlg_area.cc \
-	kspread_dlg_comment.cc \
-	kspread_dlg_conditional.cc \
-	kspread_dlg_cons.cc \
-	kspread_dlg_csv.cc \
-	kspread_dlg_database.cc \
-	kspread_dlg_format.cc \
-	kspread_dlg_formula.cc \
-	kspread_dlg_goalseek.cc \
-	kspread_dlg_goto.cc \
-	kspread_dlg_insert.cc \
-	kspread_dlg_layout.cc \
-	kspread_dlg_list.cc \
-	kspread_dlg_paperlayout.cc \
-	kspread_dlg_pasteinsert.cc \
-	kspread_dlg_preference.cc \
-	kspread_dlg_reference.cc \
-	kspread_dlg_resize2.cc \
-	kspread_dlg_series.cc \
-	kspread_dlg_show.cc \
-	kspread_dlg_showColRow.cc \
-	kspread_dlg_sort.cc \
-	kspread_dlg_special.cc \
-	kspread_dlg_styles.cc \
-	kspread_dlg_subtotal.cc \
-	kspread_dlg_validity.cc \
+	kspread_dlg_angle.cpp \
+	kspread_dlg_area.cpp \
+	kspread_dlg_comment.cpp \
+	kspread_dlg_conditional.cpp \
+	kspread_dlg_cons.cpp \
+	kspread_dlg_csv.cpp \
+	kspread_dlg_database.cpp \
+	kspread_dlg_format.cpp \
+	kspread_dlg_formula.cpp \
+	kspread_dlg_goalseek.cpp \
+	kspread_dlg_goto.cpp \
+	kspread_dlg_insert.cpp \
+	kspread_dlg_layout.cpp \
+	kspread_dlg_list.cpp \
+	kspread_dlg_paperlayout.cpp \
+	kspread_dlg_pasteinsert.cpp \
+	kspread_dlg_preference.cpp \
+	kspread_dlg_reference.cpp \
+	kspread_dlg_resize2.cpp \
+	kspread_dlg_series.cpp \
+	kspread_dlg_show.cpp \
+	kspread_dlg_showColRow.cpp \
+	kspread_dlg_sort.cpp \
+	kspread_dlg_special.cpp \
+	kspread_dlg_styles.cpp \
+	kspread_dlg_subtotal.cpp \
+	kspread_dlg_validity.cpp \
 	kspreadsubtotal.ui \
-    link.cc \
+    link.cpp \
 	sheet_properties_base.ui \
-	sheet_properties.cc \
-	kspread_dlg_find.cc \
+	sheet_properties.cpp \
+	kspread_dlg_find.cpp \
 	position_cell_format.ui \
 	font_cell_format.ui \
 	protection_cell_format.ui \
diff --git a/kspread/dialogs/kspread_dlg_angle.cc b/kspread/dialogs/kspread_dlg_angle.cpp
index 763e47a59..763e47a59 100644
--- a/kspread/dialogs/kspread_dlg_angle.cc
+++ b/kspread/dialogs/kspread_dlg_angle.cpp
diff --git a/kspread/dialogs/kspread_dlg_area.cc b/kspread/dialogs/kspread_dlg_area.cpp
index 108511ad0..108511ad0 100644
--- a/kspread/dialogs/kspread_dlg_area.cc
+++ b/kspread/dialogs/kspread_dlg_area.cpp
diff --git a/kspread/dialogs/kspread_dlg_comment.cc b/kspread/dialogs/kspread_dlg_comment.cpp
index 2494959c2..2494959c2 100644
--- a/kspread/dialogs/kspread_dlg_comment.cc
+++ b/kspread/dialogs/kspread_dlg_comment.cpp
diff --git a/kspread/dialogs/kspread_dlg_conditional.cc b/kspread/dialogs/kspread_dlg_conditional.cpp
index a75bd5bd0..a75bd5bd0 100644
--- a/kspread/dialogs/kspread_dlg_conditional.cc
+++ b/kspread/dialogs/kspread_dlg_conditional.cpp
diff --git a/kspread/dialogs/kspread_dlg_cons.cc b/kspread/dialogs/kspread_dlg_cons.cpp
index 139113c79..139113c79 100644
--- a/kspread/dialogs/kspread_dlg_cons.cc
+++ b/kspread/dialogs/kspread_dlg_cons.cpp
diff --git a/kspread/dialogs/kspread_dlg_csv.cc b/kspread/dialogs/kspread_dlg_csv.cpp
index c068810b0..c068810b0 100644
--- a/kspread/dialogs/kspread_dlg_csv.cc
+++ b/kspread/dialogs/kspread_dlg_csv.cpp
diff --git a/kspread/dialogs/kspread_dlg_database.cc b/kspread/dialogs/kspread_dlg_database.cpp
index 34e680cdb..34e680cdb 100644
--- a/kspread/dialogs/kspread_dlg_database.cc
+++ b/kspread/dialogs/kspread_dlg_database.cpp
diff --git a/kspread/dialogs/kspread_dlg_find.cc b/kspread/dialogs/kspread_dlg_find.cpp
index aa1c7f71e..aa1c7f71e 100644
--- a/kspread/dialogs/kspread_dlg_find.cc
+++ b/kspread/dialogs/kspread_dlg_find.cpp
diff --git a/kspread/dialogs/kspread_dlg_format.cc b/kspread/dialogs/kspread_dlg_format.cpp
index 501d8bf36..501d8bf36 100644
--- a/kspread/dialogs/kspread_dlg_format.cc
+++ b/kspread/dialogs/kspread_dlg_format.cpp
diff --git a/kspread/dialogs/kspread_dlg_formula.cc b/kspread/dialogs/kspread_dlg_formula.cpp
index 8e53c5254..8e53c5254 100644
--- a/kspread/dialogs/kspread_dlg_formula.cc
+++ b/kspread/dialogs/kspread_dlg_formula.cpp
diff --git a/kspread/dialogs/kspread_dlg_goalseek.cc b/kspread/dialogs/kspread_dlg_goalseek.cpp
index b45525ad2..b45525ad2 100644
--- a/kspread/dialogs/kspread_dlg_goalseek.cc
+++ b/kspread/dialogs/kspread_dlg_goalseek.cpp
diff --git a/kspread/dialogs/kspread_dlg_goto.cc b/kspread/dialogs/kspread_dlg_goto.cpp
index 2d9935ac2..2d9935ac2 100644
--- a/kspread/dialogs/kspread_dlg_goto.cc
+++ b/kspread/dialogs/kspread_dlg_goto.cpp
diff --git a/kspread/dialogs/kspread_dlg_insert.cc b/kspread/dialogs/kspread_dlg_insert.cpp
index 454a43ba4..454a43ba4 100644
--- a/kspread/dialogs/kspread_dlg_insert.cc
+++ b/kspread/dialogs/kspread_dlg_insert.cpp
diff --git a/kspread/dialogs/kspread_dlg_layout.cc b/kspread/dialogs/kspread_dlg_layout.cpp
index ad876b3b4..ad876b3b4 100644
--- a/kspread/dialogs/kspread_dlg_layout.cc
+++ b/kspread/dialogs/kspread_dlg_layout.cpp
diff --git a/kspread/dialogs/kspread_dlg_list.cc b/kspread/dialogs/kspread_dlg_list.cpp
index 254470e19..254470e19 100644
--- a/kspread/dialogs/kspread_dlg_list.cc
+++ b/kspread/dialogs/kspread_dlg_list.cpp
diff --git a/kspread/dialogs/kspread_dlg_paperlayout.cc b/kspread/dialogs/kspread_dlg_paperlayout.cpp
index 3305963e2..3305963e2 100644
--- a/kspread/dialogs/kspread_dlg_paperlayout.cc
+++ b/kspread/dialogs/kspread_dlg_paperlayout.cpp
diff --git a/kspread/dialogs/kspread_dlg_pasteinsert.cc b/kspread/dialogs/kspread_dlg_pasteinsert.cpp
index 93d67b06a..93d67b06a 100644
--- a/kspread/dialogs/kspread_dlg_pasteinsert.cc
+++ b/kspread/dialogs/kspread_dlg_pasteinsert.cpp
diff --git a/kspread/dialogs/kspread_dlg_preference.cc b/kspread/dialogs/kspread_dlg_preference.cpp
index d82af591b..d82af591b 100644
--- a/kspread/dialogs/kspread_dlg_preference.cc
+++ b/kspread/dialogs/kspread_dlg_preference.cpp
diff --git a/kspread/dialogs/kspread_dlg_reference.cc b/kspread/dialogs/kspread_dlg_reference.cpp
index 9e747dfbb..9e747dfbb 100644
--- a/kspread/dialogs/kspread_dlg_reference.cc
+++ b/kspread/dialogs/kspread_dlg_reference.cpp
diff --git a/kspread/dialogs/kspread_dlg_resize2.cc b/kspread/dialogs/kspread_dlg_resize2.cpp
index e6d74d26d..e6d74d26d 100644
--- a/kspread/dialogs/kspread_dlg_resize2.cc
+++ b/kspread/dialogs/kspread_dlg_resize2.cpp
diff --git a/kspread/dialogs/kspread_dlg_series.cc b/kspread/dialogs/kspread_dlg_series.cpp
index ee241617d..ee241617d 100644
--- a/kspread/dialogs/kspread_dlg_series.cc
+++ b/kspread/dialogs/kspread_dlg_series.cpp
diff --git a/kspread/dialogs/kspread_dlg_show.cc b/kspread/dialogs/kspread_dlg_show.cpp
index 11f55e6d0..11f55e6d0 100644
--- a/kspread/dialogs/kspread_dlg_show.cc
+++ b/kspread/dialogs/kspread_dlg_show.cpp
diff --git a/kspread/dialogs/kspread_dlg_showColRow.cc b/kspread/dialogs/kspread_dlg_showColRow.cpp
index 32c4c631a..32c4c631a 100644
--- a/kspread/dialogs/kspread_dlg_showColRow.cc
+++ b/kspread/dialogs/kspread_dlg_showColRow.cpp
diff --git a/kspread/dialogs/kspread_dlg_sort.cc b/kspread/dialogs/kspread_dlg_sort.cpp
index 52cda9b64..52cda9b64 100644
--- a/kspread/dialogs/kspread_dlg_sort.cc
+++ b/kspread/dialogs/kspread_dlg_sort.cpp
diff --git a/kspread/dialogs/kspread_dlg_special.cc b/kspread/dialogs/kspread_dlg_special.cpp
index 2fbeb7ebe..2fbeb7ebe 100644
--- a/kspread/dialogs/kspread_dlg_special.cc
+++ b/kspread/dialogs/kspread_dlg_special.cpp
diff --git a/kspread/dialogs/kspread_dlg_styles.cc b/kspread/dialogs/kspread_dlg_styles.cpp
index bf8f4de26..bf8f4de26 100644
--- a/kspread/dialogs/kspread_dlg_styles.cc
+++ b/kspread/dialogs/kspread_dlg_styles.cpp
diff --git a/kspread/dialogs/kspread_dlg_subtotal.cc b/kspread/dialogs/kspread_dlg_subtotal.cpp
index 054cc1f76..054cc1f76 100644
--- a/kspread/dialogs/kspread_dlg_subtotal.cc
+++ b/kspread/dialogs/kspread_dlg_subtotal.cpp
diff --git a/kspread/dialogs/kspread_dlg_validity.cc b/kspread/dialogs/kspread_dlg_validity.cpp
index ea4625272..ea4625272 100644
--- a/kspread/dialogs/kspread_dlg_validity.cc
+++ b/kspread/dialogs/kspread_dlg_validity.cpp
diff --git a/kspread/dialogs/link.cc b/kspread/dialogs/link.cpp
index e0c1be217..e0c1be217 100644
--- a/kspread/dialogs/link.cc
+++ b/kspread/dialogs/link.cpp
diff --git a/kspread/dialogs/sheet_properties.cc b/kspread/dialogs/sheet_properties.cpp
index c4b79a9d4..c4b79a9d4 100644
--- a/kspread/dialogs/sheet_properties.cc
+++ b/kspread/dialogs/sheet_properties.cpp
diff --git a/kspread/digest.cc b/kspread/digest.cpp
index c4aa90c6d..c4aa90c6d 100644
--- a/kspread/digest.cc
+++ b/kspread/digest.cpp
diff --git a/kspread/formula.cc b/kspread/formula.cpp
index 3522f06b1..3522f06b1 100644
--- a/kspread/formula.cc
+++ b/kspread/formula.cpp
diff --git a/kspread/functions.cc b/kspread/functions.cpp
index f6bc16e2f..fa485171a 100644
--- a/kspread/functions.cc
+++ b/kspread/functions.cpp
@@ -162,7 +162,7 @@ Value Function::exec (valVector args, ValueCalc *calc, FuncExtra *extra)
 }
 
 
-// these are defined in kspread_function_*.cc
+// these are defined in kspread_function_*.cpp
 void RegisterConversionFunctions();
 void RegisterDatabaseFunctions();
 void RegisterDateTimeFunctions();
diff --git a/kspread/kspread_autofill.cc b/kspread/kspread_autofill.cpp
index e110e1adb..e110e1adb 100644
--- a/kspread/kspread_autofill.cc
+++ b/kspread/kspread_autofill.cpp
diff --git a/kspread/kspread_brush.cc b/kspread/kspread_brush.cpp
index d585950b7..d585950b7 100644
--- a/kspread/kspread_brush.cc
+++ b/kspread/kspread_brush.cpp
diff --git a/kspread/kspread_canvas.cc b/kspread/kspread_canvas.cpp
index 0518e2740..0518e2740 100644
--- a/kspread/kspread_canvas.cc
+++ b/kspread/kspread_canvas.cpp
diff --git a/kspread/kspread_cell.cc b/kspread/kspread_cell.cpp
index fca76bbe0..fca76bbe0 100644
--- a/kspread/kspread_cell.cc
+++ b/kspread/kspread_cell.cpp
diff --git a/kspread/kspread_cluster.cc b/kspread/kspread_cluster.cpp
index 318ee7582..318ee7582 100644
--- a/kspread/kspread_cluster.cc
+++ b/kspread/kspread_cluster.cpp
diff --git a/kspread/kspread_condition.cc b/kspread/kspread_condition.cpp
index 876dfbf07..876dfbf07 100644
--- a/kspread/kspread_condition.cc
+++ b/kspread/kspread_condition.cpp
diff --git a/kspread/kspread_doc.cc b/kspread/kspread_doc.cpp
index 7643b31d8..7643b31d8 100644
--- a/kspread/kspread_doc.cc
+++ b/kspread/kspread_doc.cpp
diff --git a/kspread/kspread_editors.cc b/kspread/kspread_editors.cpp
index 4af76159e..4af76159e 100644
--- a/kspread/kspread_editors.cc
+++ b/kspread/kspread_editors.cpp
diff --git a/kspread/kspread_events.cc b/kspread/kspread_events.cpp
index 7026be1df..7026be1df 100644
--- a/kspread/kspread_events.cc
+++ b/kspread/kspread_events.cpp
diff --git a/kspread/kspread_factory.cc b/kspread/kspread_factory.cpp
index 861b9d962..861b9d962 100644
--- a/kspread/kspread_factory.cc
+++ b/kspread/kspread_factory.cpp
diff --git a/kspread/kspread_factory_init.cc b/kspread/kspread_factory_init.cpp
index d62e304f6..d62e304f6 100644
--- a/kspread/kspread_factory_init.cc
+++ b/kspread/kspread_factory_init.cpp
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cpp
index 430e23869..430e23869 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cpp
diff --git a/kspread/kspread_functions_conversion.cc b/kspread/kspread_functions_conversion.cpp
index 23f2ca015..23f2ca015 100644
--- a/kspread/kspread_functions_conversion.cc
+++ b/kspread/kspread_functions_conversion.cpp
diff --git a/kspread/kspread_functions_database.cc b/kspread/kspread_functions_database.cpp
index a294914d6..a294914d6 100644
--- a/kspread/kspread_functions_database.cc
+++ b/kspread/kspread_functions_database.cpp
diff --git a/kspread/kspread_functions_datetime.cc b/kspread/kspread_functions_datetime.cpp
index d322b6a49..d322b6a49 100644
--- a/kspread/kspread_functions_datetime.cc
+++ b/kspread/kspread_functions_datetime.cpp
diff --git a/kspread/kspread_functions_engineering.cc b/kspread/kspread_functions_engineering.cpp
index bca81ec8d..bca81ec8d 100644
--- a/kspread/kspread_functions_engineering.cc
+++ b/kspread/kspread_functions_engineering.cpp
diff --git a/kspread/kspread_functions_financial.cc b/kspread/kspread_functions_financial.cpp
index daccb6408..daccb6408 100644
--- a/kspread/kspread_functions_financial.cc
+++ b/kspread/kspread_functions_financial.cpp
diff --git a/kspread/kspread_functions_helper.cc b/kspread/kspread_functions_helper.cpp
index 92f7b1ae9..92f7b1ae9 100644
--- a/kspread/kspread_functions_helper.cc
+++ b/kspread/kspread_functions_helper.cpp
diff --git a/kspread/kspread_functions_information.cc b/kspread/kspread_functions_information.cpp
index 30d64263c..30d64263c 100644
--- a/kspread/kspread_functions_information.cc
+++ b/kspread/kspread_functions_information.cpp
diff --git a/kspread/kspread_functions_logic.cc b/kspread/kspread_functions_logic.cpp
index 87dd26d48..87dd26d48 100644
--- a/kspread/kspread_functions_logic.cc
+++ b/kspread/kspread_functions_logic.cpp
diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cpp
index 06b6da2b5..06b6da2b5 100644
--- a/kspread/kspread_functions_math.cc
+++ b/kspread/kspread_functions_math.cpp
diff --git a/kspread/kspread_functions_reference.cc b/kspread/kspread_functions_reference.cpp
index 7dacb0548..7dacb0548 100644
--- a/kspread/kspread_functions_reference.cc
+++ b/kspread/kspread_functions_reference.cpp
diff --git a/kspread/kspread_functions_statistical.cc b/kspread/kspread_functions_statistical.cpp
index 26c9d4834..26c9d4834 100644
--- a/kspread/kspread_functions_statistical.cc
+++ b/kspread/kspread_functions_statistical.cpp
diff --git a/kspread/kspread_functions_text.cc b/kspread/kspread_functions_text.cpp
index 5a8dccf69..5a8dccf69 100644
--- a/kspread/kspread_functions_text.cc
+++ b/kspread/kspread_functions_text.cpp
diff --git a/kspread/kspread_functions_trig.cc b/kspread/kspread_functions_trig.cpp
index f79d7f814..f79d7f814 100644
--- a/kspread/kspread_functions_trig.cc
+++ b/kspread/kspread_functions_trig.cpp
diff --git a/kspread/kspread_genvalidationstyle.cc b/kspread/kspread_genvalidationstyle.cpp
index 613be1769..613be1769 100644
--- a/kspread/kspread_genvalidationstyle.cc
+++ b/kspread/kspread_genvalidationstyle.cpp
diff --git a/kspread/kspread_handler.cc b/kspread/kspread_handler.cpp
index 262774ffe..262774ffe 100644
--- a/kspread/kspread_handler.cc
+++ b/kspread/kspread_handler.cpp
diff --git a/kspread/kspread_locale.cc b/kspread/kspread_locale.cpp
index fc665f0a5..fc665f0a5 100644
--- a/kspread/kspread_locale.cc
+++ b/kspread/kspread_locale.cpp
diff --git a/kspread/kspread_map.cc b/kspread/kspread_map.cpp
index d54c340a1..d54c340a1 100644
--- a/kspread/kspread_map.cc
+++ b/kspread/kspread_map.cpp
diff --git a/kspread/kspread_numformat.cc b/kspread/kspread_numformat.cpp
index e3a0bee7a..e3a0bee7a 100644
--- a/kspread/kspread_numformat.cc
+++ b/kspread/kspread_numformat.cpp
diff --git a/kspread/kspread_object.cc b/kspread/kspread_object.cpp
index 2fce26968..2fce26968 100644
--- a/kspread/kspread_object.cc
+++ b/kspread/kspread_object.cpp
diff --git a/kspread/kspread_pen.cc b/kspread/kspread_pen.cpp
index 52a0ada6b..52a0ada6b 100644
--- a/kspread/kspread_pen.cc
+++ b/kspread/kspread_pen.cpp
diff --git a/kspread/kspread_sheet.cc b/kspread/kspread_sheet.cpp
index a8965b9e7..a8965b9e7 100644
--- a/kspread/kspread_sheet.cc
+++ b/kspread/kspread_sheet.cpp
diff --git a/kspread/kspread_sheet.h b/kspread/kspread_sheet.h
index 2b2ed21cd..a99024529 100644
--- a/kspread/kspread_sheet.h
+++ b/kspread/kspread_sheet.h
@@ -787,7 +787,7 @@ public:
 
     void setFirstLetterUpper(bool _firstUpper);
 
-    // TODO Stefan: remove after kspread_undo.cc|h and commands.cc|h are obsolete
+    // TODO Stefan: remove after kspread_undo.cpp|h and commands.cpp|h are obsolete
     void changeMergedCell( int /*m_iCol*/, int /*m_iRow*/, int /*m_iExtraX*/, int /*m_iExtraY*/) {}
 
     /**
@@ -1317,7 +1317,7 @@ protected:
     static TQIntDict<Sheet>* s_mapSheets;
 
 public:
-    // see kspread_sheet.cc for an explanation of this
+    // see kspread_sheet.cpp for an explanation of this
     // this is for type B and also for type A (better use CellWorkerTypeA for that)
     struct CellWorker
     {
diff --git a/kspread/kspread_sheetprint.cc b/kspread/kspread_sheetprint.cpp
index 3cc26bf3e..974e89945 100644
--- a/kspread/kspread_sheetprint.cc
+++ b/kspread/kspread_sheetprint.cpp
@@ -1018,7 +1018,7 @@ TQString SheetPrint::localizeHeadFootLine ( const TQString &_text )
     /*
       i18n:
       Please use the same words (even upper/lower case) as in
-      KoPageLayoutDia.cc function setupTab2(), without the brakets "<" and ">"
+      KoPageLayoutDia.cpp function setupTab2(), without the brakets "<" and ">"
     */
     replaceHeadFootLineMacro ( tmp, "page",   i18n("page") );
     replaceHeadFootLineMacro ( tmp, "pages",  i18n("pages") );
@@ -1042,7 +1042,7 @@ TQString SheetPrint::delocalizeHeadFootLine ( const TQString &_text )
     /*
       i18n:
       Please use the same words (even upper/lower case) as in
-      KoPageLayoutDia.cc function setupTab2(), without the brakets "<" and ">"
+      KoPageLayoutDia.cpp function setupTab2(), without the brakets "<" and ">"
     */
     replaceHeadFootLineMacro ( tmp, i18n("page"),   "page" );
     replaceHeadFootLineMacro ( tmp, i18n("pages"),  "pages" );
diff --git a/kspread/kspread_style.cc b/kspread/kspread_style.cpp
index bd58ac885..bd58ac885 100644
--- a/kspread/kspread_style.cc
+++ b/kspread/kspread_style.cpp
diff --git a/kspread/kspread_style_manager.cc b/kspread/kspread_style_manager.cpp
index 8bfb8acf9..8bfb8acf9 100644
--- a/kspread/kspread_style_manager.cc
+++ b/kspread/kspread_style_manager.cpp
diff --git a/kspread/kspread_toolbox.cc b/kspread/kspread_toolbox.cpp
index b868d9131..b868d9131 100644
--- a/kspread/kspread_toolbox.cc
+++ b/kspread/kspread_toolbox.cpp
diff --git a/kspread/kspread_undo.cc b/kspread/kspread_undo.cpp
index 28f592651..28f592651 100644
--- a/kspread/kspread_undo.cc
+++ b/kspread/kspread_undo.cpp
diff --git a/kspread/kspread_util.cc b/kspread/kspread_util.cpp
index 3950c5b94..c7b28af12 100644
--- a/kspread/kspread_util.cc
+++ b/kspread/kspread_util.cpp
@@ -53,7 +53,7 @@ bool KSpread::formatIsFraction (FormatType fmt)
 
 
 //used in Point::init, Cell::encodeFormula and
-//  dialogs/kspread_dlg_paperlayout.cc
+//  dialogs/kspread_dlg_paperlayout.cpp
 int KSpread::util_decodeColumnLabelText( const TQString &_col )
 {
     int col = 0;
@@ -72,7 +72,7 @@ int KSpread::util_decodeColumnLabelText( const TQString &_col )
     return col;
 }
 
-//used in dialogs/kspread_dlg_paperlayout.cc
+//used in dialogs/kspread_dlg_paperlayout.cpp
 TQString KSpread::util_rangeColumnName( const TQRect &_area)
 {
     return TQString("%1:%2")
@@ -80,7 +80,7 @@ TQString KSpread::util_rangeColumnName( const TQRect &_area)
         .arg( Cell::columnName(_area.right()));
 }
 
-//used in dialogs/kspread_dlg_paperlayout.cc
+//used in dialogs/kspread_dlg_paperlayout.cpp
 TQString KSpread::util_rangeRowName( const TQRect &_area)
 {
     return TQString("%1:%2")
diff --git a/kspread/kspread_value.cc b/kspread/kspread_value.cpp
index 898abd11b..898abd11b 100644
--- a/kspread/kspread_value.cc
+++ b/kspread/kspread_value.cpp
diff --git a/kspread/kspread_view.cc b/kspread/kspread_view.cpp
index 0fe4f80d3..0fe4f80d3 100644
--- a/kspread/kspread_view.cc
+++ b/kspread/kspread_view.cpp
diff --git a/kspread/main.cc b/kspread/main.cpp
index dd5962781..dd5962781 100644
--- a/kspread/main.cc
+++ b/kspread/main.cpp
diff --git a/kspread/manipulator.cc b/kspread/manipulator.cpp
index b8b603c8f..b8b603c8f 100644
--- a/kspread/manipulator.cc
+++ b/kspread/manipulator.cpp
diff --git a/kspread/manipulator_data.cc b/kspread/manipulator_data.cpp
index af2317225..af2317225 100644
--- a/kspread/manipulator_data.cc
+++ b/kspread/manipulator_data.cpp
diff --git a/kspread/plugins/insertcalendar/Makefile.am b/kspread/plugins/insertcalendar/Makefile.am
index f8b72e81b..730df0bf0 100644
--- a/kspread/plugins/insertcalendar/Makefile.am
+++ b/kspread/plugins/insertcalendar/Makefile.am
@@ -2,9 +2,9 @@ INCLUDES  = -I$(srcdir)/../../../kspread $(KOFFICE_INCLUDES) $(KOTEXT_INCLUDES)
 
 kde_module_LTLIBRARIES = libkspreadinsertcalendar.la
 
-libkspreadinsertcalendar_la_SOURCES = kspread_plugininsertcalendar.cc \
+libkspreadinsertcalendar_la_SOURCES = kspread_plugininsertcalendar.cpp \
 				kspread_insertcalendardialogbase.ui \
-				kspread_insertcalendardialog.cc
+				kspread_insertcalendardialog.cpp
 libkspreadinsertcalendar_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 libkspreadinsertcalendar_la_LIBADD = ../../libkspreadcommon.la
 
@@ -23,4 +23,4 @@ rcdir = $(kde_datadir)/kspread/kpartplugins
 SUBDIRS =
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cc -o $(podir)/kspreadinsertcalendar.pot
+	$(XGETTEXT) rc.cpp *.cpp -o $(podir)/kspreadinsertcalendar.pot
diff --git a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp
index 0311c9137..0311c9137 100644
--- a/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cc
+++ b/kspread/plugins/insertcalendar/kspread_insertcalendardialog.cpp
diff --git a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp
index e2f9d954c..e2f9d954c 100644
--- a/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cc
+++ b/kspread/plugins/insertcalendar/kspread_plugininsertcalendar.cpp
diff --git a/kspread/plugins/scripting/Makefile.am b/kspread/plugins/scripting/Makefile.am
index 25e2bb913..e6a87ef2f 100644
--- a/kspread/plugins/scripting/Makefile.am
+++ b/kspread/plugins/scripting/Makefile.am
@@ -7,7 +7,7 @@ INCLUDES = -I$(top_builddir)/lib/kross/main \
            $(KOFFICE_INCLUDES) \
            $(all_includes)
 
-kspreadscripting_la_SOURCES = scripting.cc
+kspreadscripting_la_SOURCES = scripting.cpp
 
 kde_module_LTLIBRARIES = kspreadscripting.la
 noinst_HEADERS = scripting.h
diff --git a/kspread/plugins/scripting/scripting.cc b/kspread/plugins/scripting/scripting.cpp
index 040bd98d7..040bd98d7 100644
--- a/kspread/plugins/scripting/scripting.cc
+++ b/kspread/plugins/scripting/scripting.cpp
diff --git a/kspread/region.cc b/kspread/region.cpp
index 92c408ef0..92c408ef0 100644
--- a/kspread/region.cc
+++ b/kspread/region.cpp
diff --git a/kspread/selection.cc b/kspread/selection.cpp
index f05a6db50..f05a6db50 100644
--- a/kspread/selection.cc
+++ b/kspread/selection.cpp
diff --git a/kspread/tests/Makefile.am b/kspread/tests/Makefile.am
index 87c3bbdca..16de4ba7c 100644
--- a/kspread/tests/Makefile.am
+++ b/kspread/tests/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = \
 
 check_PROGRAMS = formulatest
 TESTS = formulatest
-formulatest_SOURCES = test_formula.cc
+formulatest_SOURCES = test_formula.cpp
 formulatest_LDADD = ../libkspreadcommon.la
 
 
@@ -16,11 +16,11 @@ noinst_LTLIBRARIES = \
 	libtests.la
 
 libtests_la_SOURCES = \
-	tester.cc \
-	testrunner.cc \
-	value_tester.cc \
-	formula_tester.cc \
-	inspector.cc
+	tester.cpp \
+	testrunner.cpp \
+	value_tester.cpp \
+	formula_tester.cpp \
+	inspector.cpp
 
 noinst_HEADERS = \
 	tester.h \
diff --git a/kspread/tests/formula_tester.cc b/kspread/tests/formula_tester.cpp
index 2c7381e17..2c7381e17 100644
--- a/kspread/tests/formula_tester.cc
+++ b/kspread/tests/formula_tester.cpp
diff --git a/kspread/tests/inspector.cc b/kspread/tests/inspector.cpp
index d44b7bf33..d44b7bf33 100644
--- a/kspread/tests/inspector.cc
+++ b/kspread/tests/inspector.cpp
diff --git a/kspread/tests/test_formula.cc b/kspread/tests/test_formula.cpp
index 433efab3e..433efab3e 100644
--- a/kspread/tests/test_formula.cc
+++ b/kspread/tests/test_formula.cpp
diff --git a/kspread/tests/tester.cc b/kspread/tests/tester.cpp
index 05df95d10..05df95d10 100644
--- a/kspread/tests/tester.cc
+++ b/kspread/tests/tester.cpp
diff --git a/kspread/tests/testrunner.cc b/kspread/tests/testrunner.cpp
index d16dc1661..d16dc1661 100644
--- a/kspread/tests/testrunner.cc
+++ b/kspread/tests/testrunner.cpp
diff --git a/kspread/tests/value_tester.cc b/kspread/tests/value_tester.cpp
index 84e9e5637..84e9e5637 100644
--- a/kspread/tests/value_tester.cc
+++ b/kspread/tests/value_tester.cpp
diff --git a/kspread/valuecalc.cc b/kspread/valuecalc.cpp
index 3a1182e54..3a1182e54 100644
--- a/kspread/valuecalc.cc
+++ b/kspread/valuecalc.cpp
diff --git a/kspread/valueconverter.cc b/kspread/valueconverter.cpp
index 21cb75310..21cb75310 100644
--- a/kspread/valueconverter.cc
+++ b/kspread/valueconverter.cpp
diff --git a/kspread/valueformatter.cc b/kspread/valueformatter.cpp
index 94b6b57c2..94b6b57c2 100644
--- a/kspread/valueformatter.cc
+++ b/kspread/valueformatter.cpp
diff --git a/kspread/valueparser.cc b/kspread/valueparser.cpp
index 08ebe628a..08ebe628a 100644
--- a/kspread/valueparser.cc
+++ b/kspread/valueparser.cpp
diff --git a/kword/DEBUG b/kword/DEBUG
index 8e7924833..58a5f9d3e 100644
--- a/kword/DEBUG
+++ b/kword/DEBUG
@@ -12,4 +12,4 @@ Ctrl-Shift-V : Verbose parag debug. Includes formatting of each character.
 Ctrl-Shift-S : Styles debug. Prints all KoStyles.
 Ctrl-Shift-M : Mark the debug output. Just prints the current date/time.
 
-(The code is in koffice/kword/kwcanvas.cc.)
+(The code is in koffice/kword/kwcanvas.cpp.)
diff --git a/kword/HACKING b/kword/HACKING
index b288e2e81..a9d30dabd 100644
--- a/kword/HACKING
+++ b/kword/HACKING
@@ -86,9 +86,9 @@ FILES:
     *IFace.h/cc                 - the dcop interface
 
   misc app stuff:
-    main.cc                     - the main
+    main.cpp                     - the main
     kwaboutdata.h               - the appname, authors...
-                                - shared between main.cc and kwfactory.cc
+                                - shared between main.cpp and kwfactory.cpp
     kword.rc                    - xml-gui layout
     kword.desktop               - application .desktop file
 
@@ -127,7 +127,7 @@ FILES:
     doc outline:
         docstruct.h/cc          - gui for overall document structure
     styles:
-        stylenames.cc           - contains builtin style names,
+        stylenames.cpp           - contains builtin style names,
                                   for translation purposes
         kwstylemanager.h/cc     - KWStyleManager, extension to KoStyleManager
                                   (the style editor is in libkotext)
@@ -195,9 +195,9 @@ FILES:
     mailmerge:
         mailmerge.h/cc
         mailmerge_actions.h/cc
-        kwordmailmergedatabaseiface.cc
+        kwordmailmergedatabaseiface.cpp
         mailmerge_interface.h/cc    - dcop
-        mailmerge_interface_skel.cc - (ditto)
+        mailmerge_interface_skel.cpp - (ditto)
         kwmailmerge.desktop         - mailmerge .desktop file
     expressions:
         kweditpersonnalexpressiondia.h/cc
@@ -207,7 +207,7 @@ FILES:
   misc weird files: ;-)
     kwstyle.h                   - Forwarder to kostyle.h,
                                 - they're the same thing now.
-    dummy.cc                    - empty file to compile as a
+    dummy.cpp                    - empty file to compile as a
                                 - "tdeinit loadable module"
 
 MISC FILES:
diff --git a/kword/KWCommand.cpp b/kword/KWCommand.cpp
index fec98ab78..8356ede9d 100644
--- a/kword/KWCommand.cpp
+++ b/kword/KWCommand.cpp
@@ -1266,7 +1266,7 @@ void KWInsertColumnCommand::execute()
 {
     kdDebug(32001) << "KWInsertColumnCommand::execute" << endl;
     KWDocument * doc = m_pTable->kWordDocument();
-    // a insert column = KWTableFrameSet::m_sDefaultColWidth, see kwtableframeset.cc
+    // a insert column = KWTableFrameSet::m_sDefaultColWidth, see kwtableframeset.cpp
     if (m_pTable->boundingRect().right() + KWTableFrameSet::m_sDefaultColWidth >= static_cast<int>(m_maxRight))
     {   // must create space (resize the table)
         m_oldWidth = m_pTable->boundingRect().width();
diff --git a/kword/KWFrameSet.cpp b/kword/KWFrameSet.cpp
index 515b0df0c..1195815a4 100644
--- a/kword/KWFrameSet.cpp
+++ b/kword/KWFrameSet.cpp
@@ -960,7 +960,7 @@ KWFrame* KWFrameSet::loadOasisFrame( const TQDomElement& tag, KoOasisContext& co
     frame->setZOrder( tag.attributeNS( KoXmlNS::draw, "z-index", TQString() ).toInt() );
     // Copy-frames.
     // We currently ignore the value of the copy-of attribute. It probably needs to
-    // be handled like chain-next-name (kwtextframeset.cc) but for all types of frameset.
+    // be handled like chain-next-name (kwtextframeset.cpp) but for all types of frameset.
     frame->setCopy( tag.hasAttributeNS( KoXmlNS::draw, "copy-of" ) );
     frame->loadCommonOasisProperties( context, this, "graphic" );
 
diff --git a/kword/defs.h b/kword/defs.h
index b4b606655..aeaf3aeb3 100644
--- a/kword/defs.h
+++ b/kword/defs.h
@@ -53,7 +53,7 @@ enum FrameSetType { FT_BASE = 0, FT_TEXT = 1, FT_PICTURE = 2, FT_PART = 3,
                     FT_TABLE = 10 };
 // This has to remain here because of KWDocument::refreshDocStructure()
 
-// This one has better remain here, otherwise kwdoc.cc needs docstruct.h
+// This one has better remain here, otherwise kwdoc.cpp needs docstruct.h
 enum TypeStructDocItem {Arrangement=1, Tables=2, Pictures=4, TextFrames=16, Embedded=32, FormulaFrames=64};
 
 // This one has better remain here, otherwise kwtexframeset.h needs footnote.h
diff --git a/kword/mailmerge/KWClassicSerialDataSource.cpp b/kword/mailmerge/KWClassicSerialDataSource.cpp
index 73eee9942..2588b06e4 100644
--- a/kword/mailmerge/KWClassicSerialDataSource.cpp
+++ b/kword/mailmerge/KWClassicSerialDataSource.cpp
@@ -1,5 +1,5 @@
 /* This file is part of the KDE project
-   Original file (mailmerge.cc): Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
+   Original file (mailmerge.cpp): Copyright (C) 1998, 1999 Reginald Stadlbauer <reggie@kde.org>
    Copyright (C) 2001 Joseph Wenninger <jowenn@kde.org>
 
    This library is free software; you can redistribute it and/or
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6a0eab165..d4d0da435 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,15 +14,15 @@ SUBDIRS = store kwmf kofficecore kofficeui kotext \
 endif
 
 messages:
-#	$(MAKE) -C kformula -f Makefile.am symbolnames.cc
+#	$(MAKE) -C kformula -f Makefile.am symbolnames.cpp
 	EXCLUDE="-path ./koproperty"; \
 	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.ui -o -name \*.rc \) -type f | grep -v -e '/\.'`; \
 	$(EXTRACTRC) $$LIST > rc.cpp; \
-	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp -o -name \*.cc \) -type f | grep -v -e '/\.'`; \
+	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp \) -type f | grep -v -e '/\.'`; \
 	$(XGETTEXT) $$LIST -o $(podir)/koffice.pot
 #	$(EXTRACTRC) */*.rc */*.ui > rc.cpp
-#	$(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot
-#	rm -f kformula/symbolnames.cc
+#	$(XGETTEXT) kotext/kohyphen/*.cpp */*.cpp -o $(podir)/koffice.pot
+#	rm -f kformula/symbolnames.cpp
 
 DOXYGEN_REFERENCES = dcop kprint tdeui tdeparts
 include ../admin/Doxyfile.am
diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am
index 4ad27bcc9..e666bf48f 100644
--- a/lib/kformula/Makefile.am
+++ b/lib/kformula/Makefile.am
@@ -7,20 +7,20 @@ SUBDIRS = pics fonts dtd
 # We have to name it kformulalib, not just kformula, since that's the name of the tdeinit module for kformula.
 lib_LTLIBRARIES = libkformulalib.la
 
-libkformulalib_la_SOURCES	= basicelement.cc contextstyle.cc formulacursor.cc \
-	formulaelement.cc indexelement.cc kformulacontainer.cc \
-	sequenceelement.cc textelement.cc bracketelement.cc \
-	matrixelement.cc fractionelement.cc rootelement.cc symbolelement.cc \
-	kformulacommand.cc kformulamimesource.cc \
-	MatrixDialog.cc sequenceparser.cc elementtype.cc kformuladocument.cc \
-	symboltable.cc kformulainputfilter.cc kformulaview.cc \
-	spaceelement.cc kformulaconfigpage.cc \
-	symbolaction.cc fontstyle.cc creationstrategy.cc \
-	oasiscreationstrategy.cc tokenstyleelement.cc tokenelement.cc \
-	identifierelement.cc operatorelement.cc glyphelement.cc styleelement.cc \
-	stringelement.cc paddedelement.cc errorelement.cc phantomelement.cc \
-	actionelement.cc encloseelement.cc entities.cc operatordictionary.cc \
-	numberelement.cc
+libkformulalib_la_SOURCES	= basicelement.cpp contextstyle.cpp formulacursor.cpp \
+	formulaelement.cpp indexelement.cpp kformulacontainer.cpp \
+	sequenceelement.cpp textelement.cpp bracketelement.cpp \
+	matrixelement.cpp fractionelement.cpp rootelement.cpp symbolelement.cpp \
+	kformulacommand.cpp kformulamimesource.cpp \
+	MatrixDialog.cpp sequenceparser.cpp elementtype.cpp kformuladocument.cpp \
+	symboltable.cpp kformulainputfilter.cpp kformulaview.cpp \
+	spaceelement.cpp kformulaconfigpage.cpp \
+	symbolaction.cpp fontstyle.cpp creationstrategy.cpp \
+	oasiscreationstrategy.cpp tokenstyleelement.cpp tokenelement.cpp \
+	identifierelement.cpp operatorelement.cpp glyphelement.cpp styleelement.cpp \
+	stringelement.cpp paddedelement.cpp errorelement.cpp phantomelement.cpp \
+	actionelement.cpp encloseelement.cpp entities.cpp operatordictionary.cpp \
+	numberelement.cpp
 
 #include_HEADERS = kformulacontainer.h kformuladocument.h kformulaview.h \
 #	kformuladefs.h kformulaconfigpage.h
@@ -32,8 +32,8 @@ libkformulalib_la_METASOURCES = AUTO
 
 check_PROGRAMS = kformulatest
 
-kformulatest_SOURCES = main.cc kformulawidget.cc
+kformulatest_SOURCES = main.cpp kformulawidget.cpp
 kformulatest_LDADD = libkformulalib.la
 
-#symbolnames.cc: 
-#	awk -F, '$$1 !~ "#" {if (split($$3,a," ")>0) print "i18n(\"" a[1] "\");"}' config/unicode.tbl > symbolnames.cc
+#symbolnames.cpp: 
+#	awk -F, '$$1 !~ "#" {if (split($$3,a," ")>0) print "i18n(\"" a[1] "\");"}' config/unicode.tbl > symbolnames.cpp
diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cpp
index feac37cea..feac37cea 100644
--- a/lib/kformula/MatrixDialog.cc
+++ b/lib/kformula/MatrixDialog.cpp
diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cpp
index e1dce9371..e1dce9371 100644
--- a/lib/kformula/actionelement.cc
+++ b/lib/kformula/actionelement.cpp
diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cpp
index 096814aad..096814aad 100644
--- a/lib/kformula/basicelement.cc
+++ b/lib/kformula/basicelement.cpp
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cpp
index 45aa54697..45aa54697 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cpp
diff --git a/lib/kformula/contextstyle.cc b/lib/kformula/contextstyle.cpp
index a744e02dd..a744e02dd 100644
--- a/lib/kformula/contextstyle.cc
+++ b/lib/kformula/contextstyle.cpp
diff --git a/lib/kformula/creationstrategy.cc b/lib/kformula/creationstrategy.cpp
index 592c744b8..592c744b8 100644
--- a/lib/kformula/creationstrategy.cc
+++ b/lib/kformula/creationstrategy.cpp
diff --git a/lib/kformula/elementtype.cc b/lib/kformula/elementtype.cpp
index bd2c33738..bd2c33738 100644
--- a/lib/kformula/elementtype.cc
+++ b/lib/kformula/elementtype.cpp
diff --git a/lib/kformula/encloseelement.cc b/lib/kformula/encloseelement.cpp
index 846f6bb2d..846f6bb2d 100644
--- a/lib/kformula/encloseelement.cc
+++ b/lib/kformula/encloseelement.cpp
diff --git a/lib/kformula/entities.cc b/lib/kformula/entities.cpp
index c6696e1ff..c6696e1ff 100644
--- a/lib/kformula/entities.cc
+++ b/lib/kformula/entities.cpp
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cpp
index cb1f6c545..cb1f6c545 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cpp
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cpp
index 32479b0f3..33f9e9f76 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cpp
@@ -35,7 +35,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-#include "unicodetable.cc"
+#include "unicodetable.cpp"
 
 bool FontStyle::m_installed = false;
 
diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cpp
index 53d02b1f8..53d02b1f8 100644
--- a/lib/kformula/formulacursor.cc
+++ b/lib/kformula/formulacursor.cpp
diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cpp
index 946e595d3..946e595d3 100644
--- a/lib/kformula/formulaelement.cc
+++ b/lib/kformula/formulaelement.cpp
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cpp
index 9f1125e12..9f1125e12 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cpp
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cpp
index 709609cf1..709609cf1 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cpp
diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cpp
index 63275e1c6..63275e1c6 100644
--- a/lib/kformula/identifierelement.cc
+++ b/lib/kformula/identifierelement.cpp
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cpp
index 6f2f6d1d7..6f2f6d1d7 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cpp
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cpp
index 4aa311610..4aa311610 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cpp
diff --git a/lib/kformula/kformulacompatibility.cc b/lib/kformula/kformulacompatibility.cpp
index f64bf9de4..f64bf9de4 100644
--- a/lib/kformula/kformulacompatibility.cc
+++ b/lib/kformula/kformulacompatibility.cpp
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cpp
index ce95c40c8..ce95c40c8 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cpp
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cpp
index a6123154d..a6123154d 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cpp
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cpp
index c041232fb..c041232fb 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cpp
diff --git a/lib/kformula/kformulainputfilter.cc b/lib/kformula/kformulainputfilter.cpp
index a26752710..a26752710 100644
--- a/lib/kformula/kformulainputfilter.cc
+++ b/lib/kformula/kformulainputfilter.cpp
diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cpp
index ff941d6f3..ff941d6f3 100644
--- a/lib/kformula/kformulamathmlread.cc
+++ b/lib/kformula/kformulamathmlread.cpp
diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cpp
index 4c7df0c77..4c7df0c77 100644
--- a/lib/kformula/kformulamimesource.cc
+++ b/lib/kformula/kformulamimesource.cpp
diff --git a/lib/kformula/kformulaview.cc b/lib/kformula/kformulaview.cpp
index 1e50694da..1e50694da 100644
--- a/lib/kformula/kformulaview.cc
+++ b/lib/kformula/kformulaview.cpp
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cpp
index 68f941d98..68f941d98 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cpp
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cpp
index c92adfd74..c92adfd74 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cpp
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cpp
index 6b8783802..6b8783802 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cpp
diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cpp
index 7705e3ab5..7705e3ab5 100644
--- a/lib/kformula/numberelement.cc
+++ b/lib/kformula/numberelement.cpp
diff --git a/lib/kformula/oasiscreationstrategy.cc b/lib/kformula/oasiscreationstrategy.cpp
index 7d7a65cc1..7d7a65cc1 100644
--- a/lib/kformula/oasiscreationstrategy.cc
+++ b/lib/kformula/oasiscreationstrategy.cpp
diff --git a/lib/kformula/operatordictionary.cc b/lib/kformula/operatordictionary.cpp
index 787a58b55..787a58b55 100644
--- a/lib/kformula/operatordictionary.cc
+++ b/lib/kformula/operatordictionary.cpp
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cpp
index 882eed01e..882eed01e 100644
--- a/lib/kformula/operatorelement.cc
+++ b/lib/kformula/operatorelement.cpp
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cpp
index e4f28ce71..e4f28ce71 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cpp
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cpp
index 78b0a1cb1..78b0a1cb1 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cpp
diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py
index a13738152..df06eeed8 100644
--- a/lib/kformula/prototype/gensymbolfontmap.py
+++ b/lib/kformula/prototype/gensymbolfontmap.py
@@ -62,12 +62,12 @@ def write_header(f):
 '''
     
 def main():
-    f = open('../symbolfontmapping.cc', 'w')
+    f = open('../symbolfontmapping.cpp', 'w')
     write_header(f)
     writeFontTable("symbol", f)
     f.close()
     
-    f = open('../esstixfontmapping.cc', 'w')
+    f = open('../esstixfontmapping.cpp', 'w')
     write_header(f)
     fontnames = [ "esstixnine", 
                   "esstixthirteen", 
@@ -90,7 +90,7 @@ def main():
         writeFontTable(fn, f)
     f.close()
 
-    f = open('../cmmapping.cc', 'w')
+    f = open('../cmmapping.cpp', 'w')
     write_header(f)
     fontnames = [ "cmbx10", 
                   "cmex10", 
@@ -107,7 +107,7 @@ def main():
         writeFontTable(fn, f)
     f.close()
 
-    f = open('../unicodenames.cc', 'w')
+    f = open('../unicodenames.cpp', 'w')
     write_header(f)
     print >>f, 'struct UnicodeNameTable { short unicode; const char* name; };'
     print >>f, 'static UnicodeNameTable nameTable[] = {'
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cpp
index 5e511cbee..5e511cbee 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cpp
diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py
index afb9ece55..6b8c1d7ae 100755
--- a/lib/kformula/scripts/bynames.py
+++ b/lib/kformula/scripts/bynames.py
@@ -144,7 +144,7 @@ if __name__ == '__main__':
 	write_header( fh )
 	write_h( fh )
 	fh.close()
-	fcc = open( '../entities.cc', 'w' )
+	fcc = open( '../entities.cpp', 'w' )
 	write_header( fcc )
 	fr = open( sys.argv[1] )
 	write_cc( fr , fcc )
diff --git a/lib/kformula/scripts/oper-dict.py b/lib/kformula/scripts/oper-dict.py
index 49191ef62..e9e105508 100755
--- a/lib/kformula/scripts/oper-dict.py
+++ b/lib/kformula/scripts/oper-dict.py
@@ -247,7 +247,7 @@ if __name__ == '__main__':
 	write_header( fh )
 	write_h( fh )
 	fh.close()
-	fcc = codecs.open( '../operatordictionary.cc', 'w', 'utf-8' )
+	fcc = codecs.open( '../operatordictionary.cpp', 'w', 'utf-8' )
 	write_header( fcc )
 	fr = open( sys.argv[1] )
 	write_cc( fr , fcc )
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cpp
index 187bcd65b..187bcd65b 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cpp
diff --git a/lib/kformula/sequenceparser.cc b/lib/kformula/sequenceparser.cpp
index bbc2f0b10..bbc2f0b10 100644
--- a/lib/kformula/sequenceparser.cc
+++ b/lib/kformula/sequenceparser.cpp
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cpp
index 7d3723602..7d3723602 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cpp
diff --git a/lib/kformula/stringelement.cc b/lib/kformula/stringelement.cpp
index e98510331..e98510331 100644
--- a/lib/kformula/stringelement.cc
+++ b/lib/kformula/stringelement.cpp
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cpp
index de7604532..de7604532 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cpp
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cpp
index 8fe3d8f8a..8fe3d8f8a 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cpp
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cpp
index 31787b160..31787b160 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cpp
diff --git a/lib/kformula/symbolfontmapping.cc b/lib/kformula/symbolfontmapping.cpp
index 71fbfcb09..71fbfcb09 100644
--- a/lib/kformula/symbolfontmapping.cc
+++ b/lib/kformula/symbolfontmapping.cpp
diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cpp
index aca50b3ab..a25e1b157 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cpp
@@ -34,12 +34,12 @@
 
 #include "symboltable.h"
 #include "contextstyle.h"
-#include "unicodetable.cc"
+#include "unicodetable.cpp"
 
 
 KFORMULA_NAMESPACE_BEGIN
 
-#include "symbolfontmapping.cc"
+#include "symbolfontmapping.cpp"
 
 SymbolFontHelper::SymbolFontHelper()
     : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW")
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cpp
index 7f146b49b..7f146b49b 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cpp
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cpp
index 9970ac450..9970ac450 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cpp
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cpp
index fcce16e7c..fcce16e7c 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cpp
diff --git a/lib/kformula/unicodetable.cc b/lib/kformula/unicodetable.cpp
index 23dc8636e..23dc8636e 100644
--- a/lib/kformula/unicodetable.cc
+++ b/lib/kformula/unicodetable.cpp
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cpp
index e8995ad66..e8995ad66 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cpp
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 67e70ecc8..b8dbea814 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -74,7 +74,7 @@
 // some kind of relative path to KoDocumentChild
 #define INTERNAL_PROTOCOL "intern"
 #define INTERNAL_PREFIX "intern:/"
-// Warning, keep it sync in koStore.cc and koDocumentChild.cc
+// Warning, keep it sync in koStore.cpp and koDocumentChild.cpp
 
 TQPtrList<KoDocument> *KoDocument::s_documentList=0L;
 
@@ -138,7 +138,7 @@ public:
     bool m_confirmNonNativeSave [2]; // used to pop up a dialog when saving for the
                                      // first time if the file is in a foreign format
                                      // (Save/Save As, Export)
-    int m_specialOutputFlag; // See KoFileDialog in koMainWindow.cc
+    int m_specialOutputFlag; // See KoFileDialog in koMainWindow.cpp
     bool m_isImporting, m_isExporting; // File --> Import/Export vs File --> Open/Save
 
     TQTimer m_autoSaveTimer;
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 00d6038ba..90a992801 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -44,7 +44,7 @@
 // so let's simply make it "tar" !
 #define STORE_PROTOCOL "tar"
 #define INTERNAL_PROTOCOL "intern"
-// Warning, keep it sync in koStore.cc and koDocument.cc
+// Warning, keep it sync in koStore.cpp and koDocument.cpp
 
 /**********************************************************
  *
diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cpp
index e0196fdf3..e0196fdf3 100644
--- a/lib/kofficecore/KoDocumentIface.cc
+++ b/lib/kofficecore/KoDocumentIface.cpp
diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cpp
index 146831880..51d782b14 100644
--- a/lib/kofficecore/KoMainWindowIface.cc
+++ b/lib/kofficecore/KoMainWindowIface.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (c) 2001 David Faure <faure@kde.org>
 
-   $Id: KoMainWindowIface.cc 508787 2006-02-12 18:28:12Z ingwa $
+   $Id: KoMainWindowIface.cpp 508787 2006-02-12 18:28:12Z ingwa $
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cpp
index ae5449b9f..18c5dae57 100644
--- a/lib/kofficecore/KoViewIface.cc
+++ b/lib/kofficecore/KoViewIface.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (c) 2000 Simon Hausmann <hausmann@kde.org>
 
-   $Id: KoViewIface.cc 508787 2006-02-12 18:28:12Z ingwa $
+   $Id: KoViewIface.cpp 508787 2006-02-12 18:28:12Z ingwa $
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index dafab0540..8e30efb8f 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -24,9 +24,9 @@ libkofficecore_la_SOURCES = KoDocument.cpp \
 	KoDocumentInfoDlg.cpp KoFactory.cpp KoChild.cpp \
 	koDocumentInfoAboutWidget.ui koDocumentInfoAuthorWidget.ui \
 	koDocumentInfoUserMetadataWidget.ui \
-	KoApplicationIface.cc KoApplicationIface.skel \
-	KoDocumentIface.cc KoDocumentIface.skel KoViewIface.cc KoViewIface.skel \
-	KoMainWindowIface.cc KoMainWindowIface.skel kofficeversion.cc KoOasisStyles.cpp \
+	KoApplicationIface.cpp KoApplicationIface.skel \
+	KoDocumentIface.cpp KoDocumentIface.skel KoViewIface.cpp KoViewIface.skel \
+	KoMainWindowIface.cpp KoMainWindowIface.skel kofficeversion.cpp KoOasisStyles.cpp \
 	KoStyleStack.cpp KoGenStyles.cpp KoOasisSettings.cpp KoPageLayout.cpp \
 	KoFileDialog.cpp KoXmlNS.cpp KoDom.cpp Koversiondialog.cpp KoOasisStore.cpp \
 	kkbdaccessextensions.cpp koDetailsPaneBase.ui koOpenPaneBase.ui KoOpenPane.cpp \
diff --git a/lib/kofficecore/kofficeversion.cc b/lib/kofficecore/kofficeversion.cpp
index 262664fce..262664fce 100644
--- a/lib/kofficecore/kofficeversion.cc
+++ b/lib/kofficecore/kofficeversion.cpp
diff --git a/lib/kofficeui/KoImageResource.cpp b/lib/kofficeui/KoImageResource.cpp
index 9f92ef3d5..9572b0602 100644
--- a/lib/kofficeui/KoImageResource.cpp
+++ b/lib/kofficeui/KoImageResource.cpp
@@ -1,5 +1,5 @@
 /*
- *  koImageResource.cc - part of KOffice
+ *  koImageResource.cpp - part of KOffice
  *
  *  Copyright (c) 2005 Thomas Zander <zander@kde.org>
  *
diff --git a/lib/kopainter/Makefile.am b/lib/kopainter/Makefile.am
index 8143db4d0..310b5f8c7 100644
--- a/lib/kopainter/Makefile.am
+++ b/lib/kopainter/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES= $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(all_includes)
 
 lib_LTLIBRARIES = libkopainter.la
-libkopainter_la_SOURCES = svgpathparser.cc \
-	koColor.cc \
-	koFrameButton.cc \
-	koColorSlider.cc \
-	koColorChooser.cc \
-	koIconChooser.cc \
-	kogradientmanager.cc \
-	ko_color_wheel.cc \
-	ko_gray_widget.cc \
-	ko_hsv_widget.cc \
-	ko_rgb_widget.cc \
-	ko_cmyk_widget.cc
+libkopainter_la_SOURCES = svgpathparser.cpp \
+	koColor.cpp \
+	koFrameButton.cpp \
+	koColorSlider.cpp \
+	koColorChooser.cpp \
+	koIconChooser.cpp \
+	kogradientmanager.cpp \
+	ko_color_wheel.cpp \
+	ko_gray_widget.cpp \
+	ko_hsv_widget.cpp \
+	ko_rgb_widget.cpp \
+	ko_cmyk_widget.cpp
 
 libkopainter_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined
 
diff --git a/lib/kopainter/koColor.cc b/lib/kopainter/koColor.cpp
index 813aee8dc..813aee8dc 100644
--- a/lib/kopainter/koColor.cc
+++ b/lib/kopainter/koColor.cpp
diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cpp
index 02439a8cb..02439a8cb 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cpp
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cpp
index 6e7c0239e..6e7c0239e 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cpp
diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cpp
index d5f2dada0..d5f2dada0 100644
--- a/lib/kopainter/koFrameButton.cc
+++ b/lib/kopainter/koFrameButton.cpp
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cpp
index e8647ffb3..e8647ffb3 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cpp
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cpp
index af2136f97..af2136f97 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cpp
diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cpp
index f309125ca..f309125ca 100644
--- a/lib/kopainter/ko_color_wheel.cc
+++ b/lib/kopainter/ko_color_wheel.cpp
diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cpp
index af09dfa08..af09dfa08 100644
--- a/lib/kopainter/ko_gray_widget.cc
+++ b/lib/kopainter/ko_gray_widget.cpp
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cpp
index 8d77bedc9..8d77bedc9 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cpp
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cpp
index 7680d50ac..7680d50ac 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cpp
diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cpp
index c95a5671c..c95a5671c 100644
--- a/lib/kopainter/kogradientmanager.cc
+++ b/lib/kopainter/kogradientmanager.cpp
diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cpp
index 5698cd47e..5698cd47e 100644
--- a/lib/kopainter/svgpathparser.cc
+++ b/lib/kopainter/svgpathparser.cpp
diff --git a/lib/kopalette/Makefile.am b/lib/kopalette/Makefile.am
index ad9a29e02..e19b6a638 100644
--- a/lib/kopalette/Makefile.am
+++ b/lib/kopalette/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES  = -I$(srcdir) \
 lib_LTLIBRARIES = libkopalette.la
 
 libkopalette_la_SOURCES = \
-	kopalette.cc \
-	kopalettemanager.cc \
-	kotoolboxpalette.cc \
-	kotabpalette.cc
+	kopalette.cpp \
+	kopalettemanager.cpp \
+	kotoolboxpalette.cpp \
+	kotabpalette.cpp
 
 libkopalette_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
 libkopalette_la_LIBADD  = $(LIB_KOFFICECORE)
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cpp
index cd3922055..cd3922055 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cpp
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cpp
index 26f309925..26f309925 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cpp
diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cpp
index 0e7988429..0e7988429 100644
--- a/lib/kopalette/kotabpalette.cc
+++ b/lib/kopalette/kotabpalette.cpp
diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cpp
index e4c2bd630..e4c2bd630 100644
--- a/lib/kopalette/kotoolboxpalette.cc
+++ b/lib/kopalette/kotoolboxpalette.cpp
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index cc0fe4a9a..5d3e99d11 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -1199,7 +1199,7 @@ void KoTextString::clear()
 	KoTextStringChar &ch = data[ i ];
 	if ( ch.isCustom() ) {
             // Can't do that here, no access to the doc. See ~KoTextParag instead.
-            // However clear() is also called by operator=, many times in kotextobject.cc...
+            // However clear() is also called by operator=, many times in kotextobject.cpp...
             // Hopefully not with customitems in there...
             //if ( doc )
             //    doc->unregisterCustomItem( ch->customItem(), this );
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 39817a201..60e6528f5 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -39,7 +39,7 @@
 // Hyphenation
 //#define DEBUG_HYPHENATION
 
-/////// keep in sync with kotextformat.cc !
+/////// keep in sync with kotextformat.cpp !
 //#define REF_IS_LU
 
 KoTextFormatter::KoTextFormatter()
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 86fc40116..c89582c5e 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -132,7 +132,7 @@ public:
     uint alignment() const;
 
     virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
-                       int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc
+                       int clipx, int clipy, int clipw, int cliph ); // kotextparag.cpp
 
 
     int topMargin() const;
diff --git a/lib/kotext/KoTextViewIface.cc b/lib/kotext/KoTextViewIface.cpp
index dec0e0320..dec0e0320 100644
--- a/lib/kotext/KoTextViewIface.cc
+++ b/lib/kotext/KoTextViewIface.cpp
diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am
index ab2214555..c186cd8ce 100644
--- a/lib/kotext/Makefile.am
+++ b/lib/kotext/Makefile.am
@@ -15,7 +15,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \
 	TDEFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \
 	kodecorationtabbase.ui KoDecorationTab.cpp kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp \
 	KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui \
-	KoTextViewIface.skel KoTextViewIface.cc KoFontDia.cpp KoBgSpellCheck.cpp \
+	KoTextViewIface.skel KoTextViewIface.cpp KoFontDia.cpp KoBgSpellCheck.cpp \
 	KoCommentDia.cpp KoSpell.cpp KoCreateStyleDia.cpp KoTextCustomItem.cpp \
 	KoImportStyleDia.cpp KoTextIterator.cpp KoOasisContext.cpp KoListStyleStack.cpp \
 	KoUserStyle.cpp KoUserStyleCollection.cpp KoParagStyle.cpp KoParagDecorationTab.ui \
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 74014c2d5..69d5b1592 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -130,7 +130,7 @@ void KoTextFormatterTest::noWidthEverTest()
     KoTextParag* parag = doc->firstParag();
     parag->append( "abcdefghi" );
     parag->format();
-    // The resulting paragraph is NOT marked as formatted. See kotextformatter.cc -r1.79
+    // The resulting paragraph is NOT marked as formatted. See kotextformatter.cpp -r1.79
     assert( !parag->isValid() );
     doc->clear(false);
     doc->setFlow( new KoTextFlow ); // default
diff --git a/lib/kross/python/cxx/Config.hxx b/lib/kross/python/cxx/Config.h
index 7959c4039..7959c4039 100644
--- a/lib/kross/python/cxx/Config.hxx
+++ b/lib/kross/python/cxx/Config.h
diff --git a/lib/kross/python/cxx/Exception.hxx b/lib/kross/python/cxx/Exception.h
index 044d4198e..94cfcff4a 100644
--- a/lib/kross/python/cxx/Exception.hxx
+++ b/lib/kross/python/cxx/Exception.h
@@ -7,8 +7,8 @@
 #define __CXX_Exception_h
 
 #include "Python.h"
-#include "Config.hxx"
-#include "IndirectPythonInterface.hxx"
+#include "Config.h"
+#include "IndirectPythonInterface.h"
 
 #include <string>
 #include <iostream>
diff --git a/lib/kross/python/cxx/Extensions.hxx b/lib/kross/python/cxx/Extensions.h
index 5c7c2bcf3..48eb4e091 100644
--- a/lib/kross/python/cxx/Extensions.hxx
+++ b/lib/kross/python/cxx/Extensions.h
@@ -14,8 +14,8 @@
 #endif
 
 
-#include "Config.hxx"
-#include "Objects.hxx"
+#include "Config.h"
+#include "Objects.h"
 
 extern "C"
 	{
diff --git a/lib/kross/python/cxx/IndirectPythonInterface.cxx b/lib/kross/python/cxx/IndirectPythonInterface.cpp
index caaa09134..6f3be354e 100644
--- a/lib/kross/python/cxx/IndirectPythonInterface.cxx
+++ b/lib/kross/python/cxx/IndirectPythonInterface.cpp
@@ -1,8 +1,8 @@
 //
-//	IndirectPythonInterface.cxx
+//	IndirectPythonInterface.cpp
 //
 #undef _XOPEN_SOURCE
-#include "IndirectPythonInterface.hxx"
+#include "IndirectPythonInterface.h"
 
 namespace Py
 {
diff --git a/lib/kross/python/cxx/IndirectPythonInterface.hxx b/lib/kross/python/cxx/IndirectPythonInterface.h
index 8f2d275dd..8cc0bcec7 100644
--- a/lib/kross/python/cxx/IndirectPythonInterface.hxx
+++ b/lib/kross/python/cxx/IndirectPythonInterface.h
@@ -1,5 +1,5 @@
-#ifndef __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
-#define __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
+#ifndef __CXX_INDIRECT_PYTHON_INTERFACE__H__
+#define __CXX_INDIRECT_PYTHON_INTERFACE__H__
 
 #include <Python.h>
 
@@ -153,4 +153,4 @@ void _XDECREF( PyObject *op );
 char *__Py_PackageContext();
 }
 
-#endif	// __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
+#endif	// __CXX_INDIRECT_PYTHON_INTERFACE__H__
diff --git a/lib/kross/python/cxx/Makefile.am b/lib/kross/python/cxx/Makefile.am
index 4e1377c00..702027dab 100644
--- a/lib/kross/python/cxx/Makefile.am
+++ b/lib/kross/python/cxx/Makefile.am
@@ -5,10 +5,10 @@ CXXFLAGS += $(USE_EXCEPTIONS)
 noinst_LTLIBRARIES = libkrosspythoncxx.la
 
 libkrosspythoncxx_la_SOURCES = \
-    cxxsupport.cxx \
-    cxx_extensions.cxx \
+    cxxsupport.cpp \
+    cxx_extensions.cpp \
     cxxextensions.c \
-    IndirectPythonInterface.cxx
+    IndirectPythonInterface.cpp
 
 libkrosspythoncxx_la_LDFLAGS = $(LIBPYTHON) $(all_libraries) -Wnounresolved
 
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.h
index 97e52fc0e..b6ab958bb 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.h
@@ -12,8 +12,8 @@
 #endif
 
 #include "Python.h"
-#include "Config.hxx"
-#include "Exception.hxx"
+#include "Config.h"
+#include "Exception.h"
 
 
 #include <iostream>
@@ -110,7 +110,7 @@ namespace Py
 	// If you are inheriting from PythonExtension<T> to define an object
 	// note that it contains PythonExtension<T>::check
 	// which you can use in accepts when writing a wrapper class.
-	// See Demo/range.h and Demo/range.cxx for an example.
+	// See Demo/range.h and Demo/range.cpp for an example.
 
 	class Object
 		{
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index 566974c14..0c7172a1a 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -83,7 +83,7 @@ Unix: <cite>/usr/local/PyCXX</cite>
 Windows: <cite>cl /I=C:\PyCXX ...</cite><br>
 Unix: <cite>g++ -I/usr/local/PyCXX ...</cite>
 <li>Include PyCXX headers files in your code using the CXX prefix:<br>
-<cite>#include &quot;CXX/Object.hxx&quot;</cite>
+<cite>#include &quot;CXX/Object.h&quot;</cite>
 </ul>
 
 <p>The header file CXX/config.h may need to be adjusted for the
@@ -100,7 +100,7 @@ the Py:: prefix when referring to them, or include the statement:</p>
 
 <h2>Wrappers for standard objects: CXX_Objects.h</h2>
 
-<p>Header file CXX_Objects.h requires adding file Src/cxxsupport.cxx to
+<p>Header file CXX_Objects.h requires adding file Src/cxxsupport.cpp to
 your module sources. CXX_Objects provides a set of wrapper classes that allow you access
 to most of the Python C API using a C++ notation that closely resembles Python. For
 example, this Python:</p>
@@ -121,7 +121,7 @@ alist = d.keys();
 std::cout &lt;&lt; alist &lt;&lt; std::endl;
 </pre>
 
-<p>You can optionally use the CXX/Extensions.hxx facility described later
+<p>You can optionally use the CXX/Extensions.h facility described later
 to define Python extension modules and extension objects.</p>
 
 <h3>We avoid programming with Python object pointers</h3>
@@ -165,8 +165,8 @@ integer argument, that will create a Python <cite>dict</cite>
 
 <p>If you have written a significant Python extension, this tedium looks all too familiar.
 The vast bulk of the coding is error checking and cleanup. Now compare the same thing
-written in C++ using CXX/Objects.hxx. The things with Python-like names (Int, Dict, Tuple) are
-from CXX/Objects.hxx.</p>
+written in C++ using CXX/Objects.h. The things with Python-like names (Int, Dict, Tuple) are
+from CXX/Objects.h.</p>
 
 <pre>static PyObject* mymodule_addvalue (PyObject* self, PyObject* pargs)
         { 
@@ -211,7 +211,7 @@ Object addvalue (Object &amp; self, const Tuple &amp; args)
 <h2>The basic concept is to wrap Python pointers</h2>
 
 
-<p>The basic concept of CXX/Objects.hxx is to create a wrapper around 
+<p>The basic concept of CXX/Objects.h is to create a wrapper around 
 each <cite>PyObject *</cite> so that the reference counting can be
 done automatically, thus eliminating the most frequent source of errors. In addition, we
 can then add methods and operators so that Python objects can be manipulated in C++
@@ -223,7 +223,7 @@ the pointer. Since C++ calls the destructors on objects that are about to go out
 we are guaranteed that we will keep the reference counts right even if we unexpectedly
 leave a routine with an exception.</p>
 
-<p>As a matter of philosophy, CXX/Objects.hxx prevents the creation of instances of its
+<p>As a matter of philosophy, CXX/Objects.h prevents the creation of instances of its
 classes unless the instance will be a valid instance of its class. When an attempt is made
 to create an object that will not be valid, an exception is thrown.</p>
 
@@ -1713,17 +1713,17 @@ Exception to clear it.:</p>
 
 <h2>Extension Facilities</h2>
 
-<p>CXX/Extensions.hxx provides facilities for: 
+<p>CXX/Extensions.h provides facilities for: 
 
 <ul>
   <li>Creating a Python extension module</li>
   <li>Creating new Python extension types</li>
 </ul>
 
-<p>These facilities use CXX/Objects.hxx and its support file cxxsupport.cxx.</p>
+<p>These facilities use CXX/Objects.h and its support file cxxsupport.cpp.</p>
 
-<p>If you use CXX/Extensions.hxx you must also include source files cxxextensions.c and
-cxx_extensions.cxx</p>
+<p>If you use CXX/Extensions.h you must also include source files cxxextensions.c and
+cxx_extensions.cpp</p>
 
 <h3>Creating an Python extension module</h3>
 
@@ -1745,7 +1745,7 @@ details are necessary:
 <p>To create an extension module, you inherit from class ExtensionModule templated on
 yourself: In the constructor, you make calls to register methods of this class with Python
 as extension module methods. In this example, two methods are added (this is a simplified
-form of the example in Demo/example.cxx):</p>
+form of the example in Demo/example.cpp):</p>
 
 <pre>class example_module : public ExtensionModule&lt;example_module&gt;
 {
@@ -1859,7 +1859,7 @@ addresses of functions can be added in order to give the object the desired beha
 
 <p>Creating extension objects is of course harder since you must specify
 how the object behaves and give it methods. This is shown in some detail in the example
-range.h and range.cxx, with the test routine rangetest.cxx, in directory Demo. If you have never
+range.h and range.cpp, with the test routine rangetest.cpp, in directory Demo. If you have never
 created a Python extension before, you should read the Extension manual first and be very
 familiar with Python's &quot;special class methods&quot;. Then what follows will make more
 sense.</p>
diff --git a/lib/kross/python/cxx/README.html b/lib/kross/python/cxx/README.html
index d698725a2..b29f5b159 100644
--- a/lib/kross/python/cxx/README.html
+++ b/lib/kross/python/cxx/README.html
@@ -176,8 +176,8 @@ is not compiled and linked to support C and C++.</p>
 <p>New in this release:</p>
 <ul>
 <li>Support for the Windows Linker /DELAYLOAD feature. Enable this feature by
-defining PY_WIN32_DELAYLOAD_PYTHON_DLL when compiling IndirectPythonInterface.cxx
-<li>Remove "CXX/Array.hxx" and associated code - its does not belong in PyCXX
+defining PY_WIN32_DELAYLOAD_PYTHON_DLL when compiling IndirectPythonInterface.cpp
+<li>Remove "CXX/Array.h" and associated code - its does not belong in PyCXX
 <li>Work on the docs. Mostly to clean up the HTML to allow more extensive work.
 <li>Reformated the sources to a consistent style. The mix of styles and tabs sizes
 was making working on the sources error prone.
@@ -193,10 +193,10 @@ C++ header files.
 <p>
 <table cellspacing=0 cellpadding=3px>
 <tr><th>Old</th><th>New</th></tr>
-<tr><td>#include "CXX_Config.h"</td><td>#include "CXX/Config.hxx"</td>
-<tr><td>#include "CXX_Exception.h"</td><td>#include "CXX/Exception.hxx"</td>
-<tr><td>#include "CXX_Extensions.h"</td><td>#include "CXX/Extensions.hxx"</td>
-<tr><td>#include "CXX_Objects.h"</td><td>#include "CXX/Objects.hxx"</td>
+<tr><td>#include "CXX_Config.h"</td><td>#include "CXX/Config.h"</td>
+<tr><td>#include "CXX_Exception.h"</td><td>#include "CXX/Exception.h"</td>
+<tr><td>#include "CXX_Extensions.h"</td><td>#include "CXX/Extensions.h"</td>
+<tr><td>#include "CXX_Objects.h"</td><td>#include "CXX/Objects.h"</td>
 </table>
 
 <h3>Version 5 (May 18, 2000)</h3>
@@ -254,7 +254,7 @@ coding so much that we think it is worth the disruption.</p>
 <p>To create an extension module, you inherit from class ExtensionModule templated on
 yourself: In the constructor, you make calls to register methods of this class with Python
 as extension module methods. In this example, two methods are added (this is a simplified
-form of the example in Demo/example.cxx):</p>
+form of the example in Demo/example.cpp):</p>
 
 <pre>class example_module : public ExtensionModule&lt;example_module&gt;
 {
@@ -309,8 +309,8 @@ return its dictionary.</p>
 <h4>Creating extension objects</h4>
 
 <p>Creating extension objects is of course harder since you must specify how the object
-behaves and give it methods. This is shown in some detail in the example range.h and range.cxx,
-with the test routine rangetest.cxx, in directory Demo.</p>
+behaves and give it methods. This is shown in some detail in the example range.h and range.cpp,
+with the test routine rangetest.cpp, in directory Demo.</p>
 
 <p>Here is a brief overview. You create a class that inherits from PythonExtension
 templated upon itself. You override various methods from PythonExtension to implement
@@ -426,8 +426,8 @@ setenv CCC &quot;KCC -x&quot;
 
 <p>before running makethis.py.</p>
 
-<p>There is also a python.cxx file for making a stand-alone Python containing this
-example, as well as a similar file arraytest.cxx for testing Array.</p>
+<p>There is also a python.cpp file for making a stand-alone Python containing this
+example, as well as a similar file arraytest.cpp for testing Array.</p>
 
 <p>Comments to barry@barrys-emacs.org, please.</p>
 
diff --git a/lib/kross/python/cxx/cxx_extensions.cxx b/lib/kross/python/cxx/cxx_extensions.cpp
index f9c942adf..6bbe12785 100644
--- a/lib/kross/python/cxx/cxx_extensions.cxx
+++ b/lib/kross/python/cxx/cxx_extensions.cpp
@@ -1,5 +1,5 @@
-#include "Extensions.hxx"
-#include "Exception.hxx"
+#include "Extensions.h"
+#include "Exception.h"
 
 #include <assert.h>
 
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cpp
index 7bab6cc37..6f2234b26 100644
--- a/lib/kross/python/cxx/cxxsupport.cxx
+++ b/lib/kross/python/cxx/cxxsupport.cpp
@@ -3,7 +3,7 @@
 // All rights reserved. See Legal.htm for full text and disclaimer.
 //---------------------------------------------------------------------------//
 
-#include "Objects.hxx"
+#include "Objects.h"
 namespace Py {
 
 Py_UNICODE unicode_null_string[1] = { 0 };
diff --git a/lib/kross/python/pythonconfig.h b/lib/kross/python/pythonconfig.h
index 64b4eefb7..349d838b0 100644
--- a/lib/kross/python/pythonconfig.h
+++ b/lib/kross/python/pythonconfig.h
@@ -38,9 +38,9 @@
 #include <frameobject.h>
 
 // Include the PyCXX stuff.
-#include "cxx/Config.hxx"
-#include "cxx/Objects.hxx"
-#include "cxx/Extensions.hxx"
+#include "cxx/Config.h"
+#include "cxx/Objects.h"
+#include "cxx/Extensions.h"
 
 namespace Kross {
 
diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am
index 51bb4e26b..a6d9a16c8 100644
--- a/lib/kwmf/Makefile.am
+++ b/lib/kwmf/Makefile.am
@@ -9,11 +9,11 @@ libkwmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 lib_LTLIBRARIES = libkwmf.la libkowmf.la
 
-libkwmf_la_SOURCES = kwmf.cc qwmf.cc
+libkwmf_la_SOURCES = kwmf.cpp qwmf.cpp
 
 #include_HEADERS = kowmfread.h kowmfwrite.h kowmfpaint.h
 noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfstack.h kowmfstruct.h
 
-libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
+libkowmf_la_SOURCES  = kowmfreadprivate.cpp kowmfstack.cpp kowmfread.cpp kowmfwrite.cpp kowmfpaint.cpp
 libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
 libkowmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cpp
index 430672731..430672731 100644
--- a/lib/kwmf/kowmfpaint.cc
+++ b/lib/kwmf/kowmfpaint.cpp
diff --git a/lib/kwmf/kowmfread.cc b/lib/kwmf/kowmfread.cpp
index f932ae3a3..f932ae3a3 100644
--- a/lib/kwmf/kowmfread.cc
+++ b/lib/kwmf/kowmfread.cpp
diff --git a/lib/kwmf/kowmfreadprivate.cc b/lib/kwmf/kowmfreadprivate.cpp
index f812b7660..f812b7660 100644
--- a/lib/kwmf/kowmfreadprivate.cc
+++ b/lib/kwmf/kowmfreadprivate.cpp
diff --git a/lib/kwmf/kowmfstack.cc b/lib/kwmf/kowmfstack.cpp
index 80896690f..80896690f 100644
--- a/lib/kwmf/kowmfstack.cc
+++ b/lib/kwmf/kowmfstack.cpp
diff --git a/lib/kwmf/kowmfwrite.cc b/lib/kwmf/kowmfwrite.cpp
index 22a0d131e..22a0d131e 100644
--- a/lib/kwmf/kowmfwrite.cc
+++ b/lib/kwmf/kowmfwrite.cpp
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cpp
index 06092a825..06092a825 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cpp
diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cpp
index 8b6572aee..8b6572aee 100644
--- a/lib/kwmf/qwmf.cc
+++ b/lib/kwmf/qwmf.cpp
diff --git a/tools/converter/koconverter.cpp b/tools/converter/koconverter.cpp
index 9bad2fb57..86063f4e0 100644
--- a/tools/converter/koconverter.cpp
+++ b/tools/converter/koconverter.cpp
@@ -102,7 +102,7 @@ int main( int argc, char **argv )
 
         if ( args->isSet("backup") )
         {
-            // Code form koDocument.cc
+            // Code form koDocument.cpp
             TDEIO::UDSEntry entry;
             if ( TDEIO::NetAccess::stat( uOut, entry, 0L ) ) // this file exists => backup
             {
diff --git a/tools/kthesaurus/Makefile.am b/tools/kthesaurus/Makefile.am
index 95d0acb4e..82a53e5b6 100644
--- a/tools/kthesaurus/Makefile.am
+++ b/tools/kthesaurus/Makefile.am
@@ -6,13 +6,13 @@ lib_LTLIBRARIES =
 tdeinit_LTLIBRARIES = kthesaurus.la
 
 kthesaurus_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) -module -avoid-version
-kthesaurus_la_SOURCES = main.cc
+kthesaurus_la_SOURCES = main.cpp
 kthesaurus_la_LIBADD = $(LIB_TDESYCOCA)
 
 appsdir = $(kde_appsdir)/Office
 apps_DATA = KThesaurus.desktop
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/kthesaurus.pot
+	$(XGETTEXT) *.cpp -o $(podir)/kthesaurus.pot
 
 KDE_ICON = kthesaurus
diff --git a/tools/kthesaurus/main.cc b/tools/kthesaurus/main.cpp
index f94373f84..9db6e571b 100644
--- a/tools/kthesaurus/main.cc
+++ b/tools/kthesaurus/main.cpp
@@ -1,10 +1,10 @@
 /***************************************************************************
-                       main.cc - using the thesaurus KDataTool stand alone
+                       main.cpp - using the thesaurus KDataTool stand alone
                        -------------------
     begin            : 2001-12-22
     copyright        : (C) 2001 by Daniel Naber
     email            : daniel.naber@t-online.de
-	$Id: main.cc 381440 2005-01-23 07:53:34Z mlaurent $
+	$Id: main.cpp 381440 2005-01-23 07:53:34Z mlaurent $
  ***************************************************************************/
 
 /***************************************************************************
diff --git a/tools/spell/Makefile.am b/tools/spell/Makefile.am
index 7c90d34b9..826f32f71 100644
--- a/tools/spell/Makefile.am
+++ b/tools/spell/Makefile.am
@@ -7,7 +7,7 @@
 
 #kde_module_LTLIBRARIES = libtdespelltool.la
 
-#libtdespelltool_la_SOURCES = main.cc
+#libtdespelltool_la_SOURCES = main.cpp
 
 #libtdespelltool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
diff --git a/tools/spell/main.cc b/tools/spell/main.cpp
index 564f66622..564f66622 100644
--- a/tools/spell/main.cc
+++ b/tools/spell/main.cpp
diff --git a/tools/thesaurus/Makefile.am b/tools/thesaurus/Makefile.am
index 927c7245b..6a57a1c43 100644
--- a/tools/thesaurus/Makefile.am
+++ b/tools/thesaurus/Makefile.am
@@ -6,7 +6,7 @@ libthesaurustool_la_LIBADD = $(LIB_TDESYCOCA)
 
 kde_module_LTLIBRARIES = libthesaurustool.la
 
-libthesaurustool_la_SOURCES = main.cc
+libthesaurustool_la_SOURCES = main.cpp
 
 libthesaurustool_la_LDFLAGS = $(all_libraries) -avoid-version -module -no-undefined
 
@@ -21,4 +21,4 @@ thesaurusdir = $(kde_datadir)/thesaurus
 thesaurus_DATA = thesaurus.txt
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/thesaurus_tool.pot
+	$(XGETTEXT) *.cpp -o $(podir)/thesaurus_tool.pot
diff --git a/tools/thesaurus/main.cc b/tools/thesaurus/main.cpp
index 57b1d7790..06da26824 100644
--- a/tools/thesaurus/main.cc
+++ b/tools/thesaurus/main.cpp
@@ -1,5 +1,5 @@
 /*
-   $Id: main.cc 466447 2005-10-02 17:54:10Z zander $
+   $Id: main.cpp 466447 2005-10-02 17:54:10Z zander $
    This file is part of the KDE project
    Copyright (C) 2001,2002,2003 Daniel Naber <daniel.naber@t-online.de>
    This is a thesaurus based on a subset of WordNet. It also offers an