Renaming of files in preparation for code style tools.

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

370 files changed, 346 insertions, 346 deletions

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 410c95ea2..431704334 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 9e84cfa15..d12b57ed5 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_TQT) -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 e6bfcf29a..b41d09585 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 d314e65a3..93822d1fc 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 b07e3eee7..f53432aba 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 035a188e0..ccf3503eb 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_TQT) -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_TQT) -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 be0b835ff..d955dbef0 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 86d7e4114..2a12d23b6 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 b8e08060f..289f689a7 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 54bae415f..976888ac1 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_TQT) -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_TQT) -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 f3a1b3ac2..bc16ca76d 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 6c440ed1b..864653e33 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_TQT) -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 95bee7d58..25bf902f8 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_TQT) -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 277f063d2..43b599bf2 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_TQT) -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 144cfbb2a..9ef58a21a 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_TQT) -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 dcfa91f28..c1024e311 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_TQT) -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 5d2d42e4e..667c76494 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_TQT) -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 ea7713283..5802ff7ea 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_TQT) -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 9f371d22d..1f966ef73 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_TQT) -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 053dd4323..0460b4be6 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_TQT) -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 75552b425..85488d7bd 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_TQT) -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 e55af45a2..f766e72a8 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_TQT) -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 7cb99e348..4a3b963cf 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_TQT) -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 c94df3fd0..8bb2ea29d 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_TQT) -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_TQT) -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 b62ee9c43..c1c11316e 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_TQT) -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 01e45a9af..4fe88b426 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_TQT) -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