Renaming of files in preparation for code style tools.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 8b78a8791bc539bcffe7159f9d9714d577cb3d7d)

107 files changed, 107 insertions, 107 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 6a0eab165..d4d0da435 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -14,15 +14,15 @@ SUBDIRS = store kwmf kofficecore kofficeui kotext \
 endif
 
 messages:
-#	$(MAKE) -C kformula -f Makefile.am symbolnames.cc
+#	$(MAKE) -C kformula -f Makefile.am symbolnames.cpp
 	EXCLUDE="-path ./koproperty"; \
 	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.ui -o -name \*.rc \) -type f | grep -v -e '/\.'`; \
 	$(EXTRACTRC) $$LIST > rc.cpp; \
-	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp -o -name \*.cc \) -type f | grep -v -e '/\.'`; \
+	LIST=`find . \( \( $$EXCLUDE \) -prune -o -name \*.cpp \) -type f | grep -v -e '/\.'`; \
 	$(XGETTEXT) $$LIST -o $(podir)/koffice.pot
 #	$(EXTRACTRC) */*.rc */*.ui > rc.cpp
-#	$(XGETTEXT) kotext/kohyphen/*.cpp */*.cc */*.cpp -o $(podir)/koffice.pot
-#	rm -f kformula/symbolnames.cc
+#	$(XGETTEXT) kotext/kohyphen/*.cpp */*.cpp -o $(podir)/koffice.pot
+#	rm -f kformula/symbolnames.cpp
 
 DOXYGEN_REFERENCES = dcop kprint tdeui tdeparts
 include ../admin/Doxyfile.am
diff --git a/lib/kformula/Makefile.am b/lib/kformula/Makefile.am
index 4ad27bcc9..e666bf48f 100644
--- a/lib/kformula/Makefile.am
+++ b/lib/kformula/Makefile.am
@@ -7,20 +7,20 @@ SUBDIRS = pics fonts dtd
 # We have to name it kformulalib, not just kformula, since that's the name of the tdeinit module for kformula.
 lib_LTLIBRARIES = libkformulalib.la
 
-libkformulalib_la_SOURCES	= basicelement.cc contextstyle.cc formulacursor.cc \
-	formulaelement.cc indexelement.cc kformulacontainer.cc \
-	sequenceelement.cc textelement.cc bracketelement.cc \
-	matrixelement.cc fractionelement.cc rootelement.cc symbolelement.cc \
-	kformulacommand.cc kformulamimesource.cc \
-	MatrixDialog.cc sequenceparser.cc elementtype.cc kformuladocument.cc \
-	symboltable.cc kformulainputfilter.cc kformulaview.cc \
-	spaceelement.cc kformulaconfigpage.cc \
-	symbolaction.cc fontstyle.cc creationstrategy.cc \
-	oasiscreationstrategy.cc tokenstyleelement.cc tokenelement.cc \
-	identifierelement.cc operatorelement.cc glyphelement.cc styleelement.cc \
-	stringelement.cc paddedelement.cc errorelement.cc phantomelement.cc \
-	actionelement.cc encloseelement.cc entities.cc operatordictionary.cc \
-	numberelement.cc
+libkformulalib_la_SOURCES	= basicelement.cpp contextstyle.cpp formulacursor.cpp \
+	formulaelement.cpp indexelement.cpp kformulacontainer.cpp \
+	sequenceelement.cpp textelement.cpp bracketelement.cpp \
+	matrixelement.cpp fractionelement.cpp rootelement.cpp symbolelement.cpp \
+	kformulacommand.cpp kformulamimesource.cpp \
+	MatrixDialog.cpp sequenceparser.cpp elementtype.cpp kformuladocument.cpp \
+	symboltable.cpp kformulainputfilter.cpp kformulaview.cpp \
+	spaceelement.cpp kformulaconfigpage.cpp \
+	symbolaction.cpp fontstyle.cpp creationstrategy.cpp \
+	oasiscreationstrategy.cpp tokenstyleelement.cpp tokenelement.cpp \
+	identifierelement.cpp operatorelement.cpp glyphelement.cpp styleelement.cpp \
+	stringelement.cpp paddedelement.cpp errorelement.cpp phantomelement.cpp \
+	actionelement.cpp encloseelement.cpp entities.cpp operatordictionary.cpp \
+	numberelement.cpp
 
 #include_HEADERS = kformulacontainer.h kformuladocument.h kformulaview.h \
 #	kformuladefs.h kformulaconfigpage.h
@@ -32,8 +32,8 @@ libkformulalib_la_METASOURCES = AUTO
 
 check_PROGRAMS = kformulatest
 
-kformulatest_SOURCES = main.cc kformulawidget.cc
+kformulatest_SOURCES = main.cpp kformulawidget.cpp
 kformulatest_LDADD = libkformulalib.la
 
-#symbolnames.cc: 
-#	awk -F, '$$1 !~ "#" {if (split($$3,a," ")>0) print "i18n(\"" a[1] "\");"}' config/unicode.tbl > symbolnames.cc
+#symbolnames.cpp: 
+#	awk -F, '$$1 !~ "#" {if (split($$3,a," ")>0) print "i18n(\"" a[1] "\");"}' config/unicode.tbl > symbolnames.cpp
diff --git a/lib/kformula/MatrixDialog.cc b/lib/kformula/MatrixDialog.cpp
index feac37cea..feac37cea 100644
--- a/lib/kformula/MatrixDialog.cc
+++ b/lib/kformula/MatrixDialog.cpp
diff --git a/lib/kformula/actionelement.cc b/lib/kformula/actionelement.cpp
index e1dce9371..e1dce9371 100644
--- a/lib/kformula/actionelement.cc
+++ b/lib/kformula/actionelement.cpp
diff --git a/lib/kformula/basicelement.cc b/lib/kformula/basicelement.cpp
index 096814aad..096814aad 100644
--- a/lib/kformula/basicelement.cc
+++ b/lib/kformula/basicelement.cpp
diff --git a/lib/kformula/bracketelement.cc b/lib/kformula/bracketelement.cpp
index 45aa54697..45aa54697 100644
--- a/lib/kformula/bracketelement.cc
+++ b/lib/kformula/bracketelement.cpp
diff --git a/lib/kformula/contextstyle.cc b/lib/kformula/contextstyle.cpp
index a744e02dd..a744e02dd 100644
--- a/lib/kformula/contextstyle.cc
+++ b/lib/kformula/contextstyle.cpp
diff --git a/lib/kformula/creationstrategy.cc b/lib/kformula/creationstrategy.cpp
index 592c744b8..592c744b8 100644
--- a/lib/kformula/creationstrategy.cc
+++ b/lib/kformula/creationstrategy.cpp
diff --git a/lib/kformula/elementtype.cc b/lib/kformula/elementtype.cpp
index bd2c33738..bd2c33738 100644
--- a/lib/kformula/elementtype.cc
+++ b/lib/kformula/elementtype.cpp
diff --git a/lib/kformula/encloseelement.cc b/lib/kformula/encloseelement.cpp
index 846f6bb2d..846f6bb2d 100644
--- a/lib/kformula/encloseelement.cc
+++ b/lib/kformula/encloseelement.cpp
diff --git a/lib/kformula/entities.cc b/lib/kformula/entities.cpp
index c6696e1ff..c6696e1ff 100644
--- a/lib/kformula/entities.cc
+++ b/lib/kformula/entities.cpp
diff --git a/lib/kformula/errorelement.cc b/lib/kformula/errorelement.cpp
index cb1f6c545..cb1f6c545 100644
--- a/lib/kformula/errorelement.cc
+++ b/lib/kformula/errorelement.cpp
diff --git a/lib/kformula/fontstyle.cc b/lib/kformula/fontstyle.cpp
index 32479b0f3..33f9e9f76 100644
--- a/lib/kformula/fontstyle.cc
+++ b/lib/kformula/fontstyle.cpp
@@ -35,7 +35,7 @@
 
 KFORMULA_NAMESPACE_BEGIN
 
-#include "unicodetable.cc"
+#include "unicodetable.cpp"
 
 bool FontStyle::m_installed = false;
 
diff --git a/lib/kformula/formulacursor.cc b/lib/kformula/formulacursor.cpp
index 53d02b1f8..53d02b1f8 100644
--- a/lib/kformula/formulacursor.cc
+++ b/lib/kformula/formulacursor.cpp
diff --git a/lib/kformula/formulaelement.cc b/lib/kformula/formulaelement.cpp
index 946e595d3..946e595d3 100644
--- a/lib/kformula/formulaelement.cc
+++ b/lib/kformula/formulaelement.cpp
diff --git a/lib/kformula/fractionelement.cc b/lib/kformula/fractionelement.cpp
index 9f1125e12..9f1125e12 100644
--- a/lib/kformula/fractionelement.cc
+++ b/lib/kformula/fractionelement.cpp
diff --git a/lib/kformula/glyphelement.cc b/lib/kformula/glyphelement.cpp
index 709609cf1..709609cf1 100644
--- a/lib/kformula/glyphelement.cc
+++ b/lib/kformula/glyphelement.cpp
diff --git a/lib/kformula/identifierelement.cc b/lib/kformula/identifierelement.cpp
index 63275e1c6..63275e1c6 100644
--- a/lib/kformula/identifierelement.cc
+++ b/lib/kformula/identifierelement.cpp
diff --git a/lib/kformula/indexelement.cc b/lib/kformula/indexelement.cpp
index 6f2f6d1d7..6f2f6d1d7 100644
--- a/lib/kformula/indexelement.cc
+++ b/lib/kformula/indexelement.cpp
diff --git a/lib/kformula/kformulacommand.cc b/lib/kformula/kformulacommand.cpp
index 4aa311610..4aa311610 100644
--- a/lib/kformula/kformulacommand.cc
+++ b/lib/kformula/kformulacommand.cpp
diff --git a/lib/kformula/kformulacompatibility.cc b/lib/kformula/kformulacompatibility.cpp
index f64bf9de4..f64bf9de4 100644
--- a/lib/kformula/kformulacompatibility.cc
+++ b/lib/kformula/kformulacompatibility.cpp
diff --git a/lib/kformula/kformulaconfigpage.cc b/lib/kformula/kformulaconfigpage.cpp
index ce95c40c8..ce95c40c8 100644
--- a/lib/kformula/kformulaconfigpage.cc
+++ b/lib/kformula/kformulaconfigpage.cpp
diff --git a/lib/kformula/kformulacontainer.cc b/lib/kformula/kformulacontainer.cpp
index a6123154d..a6123154d 100644
--- a/lib/kformula/kformulacontainer.cc
+++ b/lib/kformula/kformulacontainer.cpp
diff --git a/lib/kformula/kformuladocument.cc b/lib/kformula/kformuladocument.cpp
index c041232fb..c041232fb 100644
--- a/lib/kformula/kformuladocument.cc
+++ b/lib/kformula/kformuladocument.cpp
diff --git a/lib/kformula/kformulainputfilter.cc b/lib/kformula/kformulainputfilter.cpp
index a26752710..a26752710 100644
--- a/lib/kformula/kformulainputfilter.cc
+++ b/lib/kformula/kformulainputfilter.cpp
diff --git a/lib/kformula/kformulamathmlread.cc b/lib/kformula/kformulamathmlread.cpp
index ff941d6f3..ff941d6f3 100644
--- a/lib/kformula/kformulamathmlread.cc
+++ b/lib/kformula/kformulamathmlread.cpp
diff --git a/lib/kformula/kformulamimesource.cc b/lib/kformula/kformulamimesource.cpp
index 4c7df0c77..4c7df0c77 100644
--- a/lib/kformula/kformulamimesource.cc
+++ b/lib/kformula/kformulamimesource.cpp
diff --git a/lib/kformula/kformulaview.cc b/lib/kformula/kformulaview.cpp
index 1e50694da..1e50694da 100644
--- a/lib/kformula/kformulaview.cc
+++ b/lib/kformula/kformulaview.cpp
diff --git a/lib/kformula/kformulawidget.cc b/lib/kformula/kformulawidget.cpp
index 68f941d98..68f941d98 100644
--- a/lib/kformula/kformulawidget.cc
+++ b/lib/kformula/kformulawidget.cpp
diff --git a/lib/kformula/main.cc b/lib/kformula/main.cpp
index c92adfd74..c92adfd74 100644
--- a/lib/kformula/main.cc
+++ b/lib/kformula/main.cpp
diff --git a/lib/kformula/matrixelement.cc b/lib/kformula/matrixelement.cpp
index 6b8783802..6b8783802 100644
--- a/lib/kformula/matrixelement.cc
+++ b/lib/kformula/matrixelement.cpp
diff --git a/lib/kformula/numberelement.cc b/lib/kformula/numberelement.cpp
index 7705e3ab5..7705e3ab5 100644
--- a/lib/kformula/numberelement.cc
+++ b/lib/kformula/numberelement.cpp
diff --git a/lib/kformula/oasiscreationstrategy.cc b/lib/kformula/oasiscreationstrategy.cpp
index 7d7a65cc1..7d7a65cc1 100644
--- a/lib/kformula/oasiscreationstrategy.cc
+++ b/lib/kformula/oasiscreationstrategy.cpp
diff --git a/lib/kformula/operatordictionary.cc b/lib/kformula/operatordictionary.cpp
index 787a58b55..787a58b55 100644
--- a/lib/kformula/operatordictionary.cc
+++ b/lib/kformula/operatordictionary.cpp
diff --git a/lib/kformula/operatorelement.cc b/lib/kformula/operatorelement.cpp
index 882eed01e..882eed01e 100644
--- a/lib/kformula/operatorelement.cc
+++ b/lib/kformula/operatorelement.cpp
diff --git a/lib/kformula/paddedelement.cc b/lib/kformula/paddedelement.cpp
index e4f28ce71..e4f28ce71 100644
--- a/lib/kformula/paddedelement.cc
+++ b/lib/kformula/paddedelement.cpp
diff --git a/lib/kformula/phantomelement.cc b/lib/kformula/phantomelement.cpp
index 78b0a1cb1..78b0a1cb1 100644
--- a/lib/kformula/phantomelement.cc
+++ b/lib/kformula/phantomelement.cpp
diff --git a/lib/kformula/prototype/gensymbolfontmap.py b/lib/kformula/prototype/gensymbolfontmap.py
index a13738152..df06eeed8 100644
--- a/lib/kformula/prototype/gensymbolfontmap.py
+++ b/lib/kformula/prototype/gensymbolfontmap.py
@@ -62,12 +62,12 @@ def write_header(f):
 '''
     
 def main():
-    f = open('../symbolfontmapping.cc', 'w')
+    f = open('../symbolfontmapping.cpp', 'w')
     write_header(f)
     writeFontTable("symbol", f)
     f.close()
     
-    f = open('../esstixfontmapping.cc', 'w')
+    f = open('../esstixfontmapping.cpp', 'w')
     write_header(f)
     fontnames = [ "esstixnine", 
                   "esstixthirteen", 
@@ -90,7 +90,7 @@ def main():
         writeFontTable(fn, f)
     f.close()
 
-    f = open('../cmmapping.cc', 'w')
+    f = open('../cmmapping.cpp', 'w')
     write_header(f)
     fontnames = [ "cmbx10", 
                   "cmex10", 
@@ -107,7 +107,7 @@ def main():
         writeFontTable(fn, f)
     f.close()
 
-    f = open('../unicodenames.cc', 'w')
+    f = open('../unicodenames.cpp', 'w')
     write_header(f)
     print >>f, 'struct UnicodeNameTable { short unicode; const char* name; };'
     print >>f, 'static UnicodeNameTable nameTable[] = {'
diff --git a/lib/kformula/rootelement.cc b/lib/kformula/rootelement.cpp
index 5e511cbee..5e511cbee 100644
--- a/lib/kformula/rootelement.cc
+++ b/lib/kformula/rootelement.cpp
diff --git a/lib/kformula/scripts/bynames.py b/lib/kformula/scripts/bynames.py
index afb9ece55..6b8c1d7ae 100755
--- a/lib/kformula/scripts/bynames.py
+++ b/lib/kformula/scripts/bynames.py
@@ -144,7 +144,7 @@ if __name__ == '__main__':
 	write_header( fh )
 	write_h( fh )
 	fh.close()
-	fcc = open( '../entities.cc', 'w' )
+	fcc = open( '../entities.cpp', 'w' )
 	write_header( fcc )
 	fr = open( sys.argv[1] )
 	write_cc( fr , fcc )
diff --git a/lib/kformula/scripts/oper-dict.py b/lib/kformula/scripts/oper-dict.py
index 49191ef62..e9e105508 100755
--- a/lib/kformula/scripts/oper-dict.py
+++ b/lib/kformula/scripts/oper-dict.py
@@ -247,7 +247,7 @@ if __name__ == '__main__':
 	write_header( fh )
 	write_h( fh )
 	fh.close()
-	fcc = codecs.open( '../operatordictionary.cc', 'w', 'utf-8' )
+	fcc = codecs.open( '../operatordictionary.cpp', 'w', 'utf-8' )
 	write_header( fcc )
 	fr = open( sys.argv[1] )
 	write_cc( fr , fcc )
diff --git a/lib/kformula/sequenceelement.cc b/lib/kformula/sequenceelement.cpp
index 187bcd65b..187bcd65b 100644
--- a/lib/kformula/sequenceelement.cc
+++ b/lib/kformula/sequenceelement.cpp
diff --git a/lib/kformula/sequenceparser.cc b/lib/kformula/sequenceparser.cpp
index bbc2f0b10..bbc2f0b10 100644
--- a/lib/kformula/sequenceparser.cc
+++ b/lib/kformula/sequenceparser.cpp
diff --git a/lib/kformula/spaceelement.cc b/lib/kformula/spaceelement.cpp
index 7d3723602..7d3723602 100644
--- a/lib/kformula/spaceelement.cc
+++ b/lib/kformula/spaceelement.cpp
diff --git a/lib/kformula/stringelement.cc b/lib/kformula/stringelement.cpp
index e98510331..e98510331 100644
--- a/lib/kformula/stringelement.cc
+++ b/lib/kformula/stringelement.cpp
diff --git a/lib/kformula/styleelement.cc b/lib/kformula/styleelement.cpp
index de7604532..de7604532 100644
--- a/lib/kformula/styleelement.cc
+++ b/lib/kformula/styleelement.cpp
diff --git a/lib/kformula/symbolaction.cc b/lib/kformula/symbolaction.cpp
index 8fe3d8f8a..8fe3d8f8a 100644
--- a/lib/kformula/symbolaction.cc
+++ b/lib/kformula/symbolaction.cpp
diff --git a/lib/kformula/symbolelement.cc b/lib/kformula/symbolelement.cpp
index 31787b160..31787b160 100644
--- a/lib/kformula/symbolelement.cc
+++ b/lib/kformula/symbolelement.cpp
diff --git a/lib/kformula/symbolfontmapping.cc b/lib/kformula/symbolfontmapping.cpp
index 71fbfcb09..71fbfcb09 100644
--- a/lib/kformula/symbolfontmapping.cc
+++ b/lib/kformula/symbolfontmapping.cpp
diff --git a/lib/kformula/symboltable.cc b/lib/kformula/symboltable.cpp
index aca50b3ab..a25e1b157 100644
--- a/lib/kformula/symboltable.cc
+++ b/lib/kformula/symboltable.cpp
@@ -34,12 +34,12 @@
 
 #include "symboltable.h"
 #include "contextstyle.h"
-#include "unicodetable.cc"
+#include "unicodetable.cpp"
 
 
 KFORMULA_NAMESPACE_BEGIN
 
-#include "symbolfontmapping.cc"
+#include "symbolfontmapping.cpp"
 
 SymbolFontHelper::SymbolFontHelper()
     : greek("abgdezhqiklmnxpvrstufjcywGDTQLXPSUFYVW")
diff --git a/lib/kformula/textelement.cc b/lib/kformula/textelement.cpp
index 7f146b49b..7f146b49b 100644
--- a/lib/kformula/textelement.cc
+++ b/lib/kformula/textelement.cpp
diff --git a/lib/kformula/tokenelement.cc b/lib/kformula/tokenelement.cpp
index 9970ac450..9970ac450 100644
--- a/lib/kformula/tokenelement.cc
+++ b/lib/kformula/tokenelement.cpp
diff --git a/lib/kformula/tokenstyleelement.cc b/lib/kformula/tokenstyleelement.cpp
index fcce16e7c..fcce16e7c 100644
--- a/lib/kformula/tokenstyleelement.cc
+++ b/lib/kformula/tokenstyleelement.cpp
diff --git a/lib/kformula/unicodetable.cc b/lib/kformula/unicodetable.cpp
index 23dc8636e..23dc8636e 100644
--- a/lib/kformula/unicodetable.cc
+++ b/lib/kformula/unicodetable.cpp
diff --git a/lib/kofficecore/KoApplicationIface.cc b/lib/kofficecore/KoApplicationIface.cpp
index e8995ad66..e8995ad66 100644
--- a/lib/kofficecore/KoApplicationIface.cc
+++ b/lib/kofficecore/KoApplicationIface.cpp
diff --git a/lib/kofficecore/KoDocument.cpp b/lib/kofficecore/KoDocument.cpp
index 67e70ecc8..b8dbea814 100644
--- a/lib/kofficecore/KoDocument.cpp
+++ b/lib/kofficecore/KoDocument.cpp
@@ -74,7 +74,7 @@
 // some kind of relative path to KoDocumentChild
 #define INTERNAL_PROTOCOL "intern"
 #define INTERNAL_PREFIX "intern:/"
-// Warning, keep it sync in koStore.cc and koDocumentChild.cc
+// Warning, keep it sync in koStore.cpp and koDocumentChild.cpp
 
 TQPtrList<KoDocument> *KoDocument::s_documentList=0L;
 
@@ -138,7 +138,7 @@ public:
     bool m_confirmNonNativeSave [2]; // used to pop up a dialog when saving for the
                                      // first time if the file is in a foreign format
                                      // (Save/Save As, Export)
-    int m_specialOutputFlag; // See KoFileDialog in koMainWindow.cc
+    int m_specialOutputFlag; // See KoFileDialog in koMainWindow.cpp
     bool m_isImporting, m_isExporting; // File --> Import/Export vs File --> Open/Save
 
     TQTimer m_autoSaveTimer;
diff --git a/lib/kofficecore/KoDocumentChild.cpp b/lib/kofficecore/KoDocumentChild.cpp
index 00d6038ba..90a992801 100644
--- a/lib/kofficecore/KoDocumentChild.cpp
+++ b/lib/kofficecore/KoDocumentChild.cpp
@@ -44,7 +44,7 @@
 // so let's simply make it "tar" !
 #define STORE_PROTOCOL "tar"
 #define INTERNAL_PROTOCOL "intern"
-// Warning, keep it sync in koStore.cc and koDocument.cc
+// Warning, keep it sync in koStore.cpp and koDocument.cpp
 
 /**********************************************************
  *
diff --git a/lib/kofficecore/KoDocumentIface.cc b/lib/kofficecore/KoDocumentIface.cpp
index e0196fdf3..e0196fdf3 100644
--- a/lib/kofficecore/KoDocumentIface.cc
+++ b/lib/kofficecore/KoDocumentIface.cpp
diff --git a/lib/kofficecore/KoMainWindowIface.cc b/lib/kofficecore/KoMainWindowIface.cpp
index 146831880..51d782b14 100644
--- a/lib/kofficecore/KoMainWindowIface.cc
+++ b/lib/kofficecore/KoMainWindowIface.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (c) 2001 David Faure <faure@kde.org>
 
-   $Id: KoMainWindowIface.cc 508787 2006-02-12 18:28:12Z ingwa $
+   $Id: KoMainWindowIface.cpp 508787 2006-02-12 18:28:12Z ingwa $
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/kofficecore/KoViewIface.cc b/lib/kofficecore/KoViewIface.cpp
index ae5449b9f..18c5dae57 100644
--- a/lib/kofficecore/KoViewIface.cc
+++ b/lib/kofficecore/KoViewIface.cpp
@@ -1,7 +1,7 @@
 /* This file is part of the KDE project
    Copyright (c) 2000 Simon Hausmann <hausmann@kde.org>
 
-   $Id: KoViewIface.cc 508787 2006-02-12 18:28:12Z ingwa $
+   $Id: KoViewIface.cpp 508787 2006-02-12 18:28:12Z ingwa $
 
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff --git a/lib/kofficecore/Makefile.am b/lib/kofficecore/Makefile.am
index dafab0540..8e30efb8f 100644
--- a/lib/kofficecore/Makefile.am
+++ b/lib/kofficecore/Makefile.am
@@ -24,9 +24,9 @@ libkofficecore_la_SOURCES = KoDocument.cpp \
 	KoDocumentInfoDlg.cpp KoFactory.cpp KoChild.cpp \
 	koDocumentInfoAboutWidget.ui koDocumentInfoAuthorWidget.ui \
 	koDocumentInfoUserMetadataWidget.ui \
-	KoApplicationIface.cc KoApplicationIface.skel \
-	KoDocumentIface.cc KoDocumentIface.skel KoViewIface.cc KoViewIface.skel \
-	KoMainWindowIface.cc KoMainWindowIface.skel kofficeversion.cc KoOasisStyles.cpp \
+	KoApplicationIface.cpp KoApplicationIface.skel \
+	KoDocumentIface.cpp KoDocumentIface.skel KoViewIface.cpp KoViewIface.skel \
+	KoMainWindowIface.cpp KoMainWindowIface.skel kofficeversion.cpp KoOasisStyles.cpp \
 	KoStyleStack.cpp KoGenStyles.cpp KoOasisSettings.cpp KoPageLayout.cpp \
 	KoFileDialog.cpp KoXmlNS.cpp KoDom.cpp Koversiondialog.cpp KoOasisStore.cpp \
 	kkbdaccessextensions.cpp koDetailsPaneBase.ui koOpenPaneBase.ui KoOpenPane.cpp \
diff --git a/lib/kofficecore/kofficeversion.cc b/lib/kofficecore/kofficeversion.cpp
index 262664fce..262664fce 100644
--- a/lib/kofficecore/kofficeversion.cc
+++ b/lib/kofficecore/kofficeversion.cpp
diff --git a/lib/kofficeui/KoImageResource.cpp b/lib/kofficeui/KoImageResource.cpp
index 9f92ef3d5..9572b0602 100644
--- a/lib/kofficeui/KoImageResource.cpp
+++ b/lib/kofficeui/KoImageResource.cpp
@@ -1,5 +1,5 @@
 /*
- *  koImageResource.cc - part of KOffice
+ *  koImageResource.cpp - part of KOffice
  *
  *  Copyright (c) 2005 Thomas Zander <zander@kde.org>
  *
diff --git a/lib/kopainter/Makefile.am b/lib/kopainter/Makefile.am
index 8143db4d0..310b5f8c7 100644
--- a/lib/kopainter/Makefile.am
+++ b/lib/kopainter/Makefile.am
@@ -1,18 +1,18 @@
 INCLUDES= $(KOFFICECORE_INCLUDES) $(KOFFICEUI_INCLUDES) $(all_includes)
 
 lib_LTLIBRARIES = libkopainter.la
-libkopainter_la_SOURCES = svgpathparser.cc \
-	koColor.cc \
-	koFrameButton.cc \
-	koColorSlider.cc \
-	koColorChooser.cc \
-	koIconChooser.cc \
-	kogradientmanager.cc \
-	ko_color_wheel.cc \
-	ko_gray_widget.cc \
-	ko_hsv_widget.cc \
-	ko_rgb_widget.cc \
-	ko_cmyk_widget.cc
+libkopainter_la_SOURCES = svgpathparser.cpp \
+	koColor.cpp \
+	koFrameButton.cpp \
+	koColorSlider.cpp \
+	koColorChooser.cpp \
+	koIconChooser.cpp \
+	kogradientmanager.cpp \
+	ko_color_wheel.cpp \
+	ko_gray_widget.cpp \
+	ko_hsv_widget.cpp \
+	ko_rgb_widget.cpp \
+	ko_cmyk_widget.cpp
 
 libkopainter_la_LDFLAGS = $(all_libraries) -version-info 2:0:0 -no-undefined
 
diff --git a/lib/kopainter/koColor.cc b/lib/kopainter/koColor.cpp
index 813aee8dc..813aee8dc 100644
--- a/lib/kopainter/koColor.cc
+++ b/lib/kopainter/koColor.cpp
diff --git a/lib/kopainter/koColorChooser.cc b/lib/kopainter/koColorChooser.cpp
index 02439a8cb..02439a8cb 100644
--- a/lib/kopainter/koColorChooser.cc
+++ b/lib/kopainter/koColorChooser.cpp
diff --git a/lib/kopainter/koColorSlider.cc b/lib/kopainter/koColorSlider.cpp
index 6e7c0239e..6e7c0239e 100644
--- a/lib/kopainter/koColorSlider.cc
+++ b/lib/kopainter/koColorSlider.cpp
diff --git a/lib/kopainter/koFrameButton.cc b/lib/kopainter/koFrameButton.cpp
index d5f2dada0..d5f2dada0 100644
--- a/lib/kopainter/koFrameButton.cc
+++ b/lib/kopainter/koFrameButton.cpp
diff --git a/lib/kopainter/koIconChooser.cc b/lib/kopainter/koIconChooser.cpp
index e8647ffb3..e8647ffb3 100644
--- a/lib/kopainter/koIconChooser.cc
+++ b/lib/kopainter/koIconChooser.cpp
diff --git a/lib/kopainter/ko_cmyk_widget.cc b/lib/kopainter/ko_cmyk_widget.cpp
index af2136f97..af2136f97 100644
--- a/lib/kopainter/ko_cmyk_widget.cc
+++ b/lib/kopainter/ko_cmyk_widget.cpp
diff --git a/lib/kopainter/ko_color_wheel.cc b/lib/kopainter/ko_color_wheel.cpp
index f309125ca..f309125ca 100644
--- a/lib/kopainter/ko_color_wheel.cc
+++ b/lib/kopainter/ko_color_wheel.cpp
diff --git a/lib/kopainter/ko_gray_widget.cc b/lib/kopainter/ko_gray_widget.cpp
index af09dfa08..af09dfa08 100644
--- a/lib/kopainter/ko_gray_widget.cc
+++ b/lib/kopainter/ko_gray_widget.cpp
diff --git a/lib/kopainter/ko_hsv_widget.cc b/lib/kopainter/ko_hsv_widget.cpp
index 8d77bedc9..8d77bedc9 100644
--- a/lib/kopainter/ko_hsv_widget.cc
+++ b/lib/kopainter/ko_hsv_widget.cpp
diff --git a/lib/kopainter/ko_rgb_widget.cc b/lib/kopainter/ko_rgb_widget.cpp
index 7680d50ac..7680d50ac 100644
--- a/lib/kopainter/ko_rgb_widget.cc
+++ b/lib/kopainter/ko_rgb_widget.cpp
diff --git a/lib/kopainter/kogradientmanager.cc b/lib/kopainter/kogradientmanager.cpp
index c95a5671c..c95a5671c 100644
--- a/lib/kopainter/kogradientmanager.cc
+++ b/lib/kopainter/kogradientmanager.cpp
diff --git a/lib/kopainter/svgpathparser.cc b/lib/kopainter/svgpathparser.cpp
index 5698cd47e..5698cd47e 100644
--- a/lib/kopainter/svgpathparser.cc
+++ b/lib/kopainter/svgpathparser.cpp
diff --git a/lib/kopalette/Makefile.am b/lib/kopalette/Makefile.am
index ad9a29e02..e19b6a638 100644
--- a/lib/kopalette/Makefile.am
+++ b/lib/kopalette/Makefile.am
@@ -6,10 +6,10 @@ INCLUDES  = -I$(srcdir) \
 lib_LTLIBRARIES = libkopalette.la
 
 libkopalette_la_SOURCES = \
-	kopalette.cc \
-	kopalettemanager.cc \
-	kotoolboxpalette.cc \
-	kotabpalette.cc
+	kopalette.cpp \
+	kopalettemanager.cpp \
+	kotoolboxpalette.cpp \
+	kotabpalette.cpp
 
 libkopalette_la_LDFLAGS = -version-info 1:0:0 -no-undefined $(all_libraries)
 libkopalette_la_LIBADD  = $(LIB_KOFFICECORE)
diff --git a/lib/kopalette/kopalette.cc b/lib/kopalette/kopalette.cpp
index cd3922055..cd3922055 100644
--- a/lib/kopalette/kopalette.cc
+++ b/lib/kopalette/kopalette.cpp
diff --git a/lib/kopalette/kopalettemanager.cc b/lib/kopalette/kopalettemanager.cpp
index 26f309925..26f309925 100644
--- a/lib/kopalette/kopalettemanager.cc
+++ b/lib/kopalette/kopalettemanager.cpp
diff --git a/lib/kopalette/kotabpalette.cc b/lib/kopalette/kotabpalette.cpp
index 0e7988429..0e7988429 100644
--- a/lib/kopalette/kotabpalette.cc
+++ b/lib/kopalette/kotabpalette.cpp
diff --git a/lib/kopalette/kotoolboxpalette.cc b/lib/kopalette/kotoolboxpalette.cpp
index e4c2bd630..e4c2bd630 100644
--- a/lib/kopalette/kotoolboxpalette.cc
+++ b/lib/kopalette/kotoolboxpalette.cpp
diff --git a/lib/kotext/KoRichText.cpp b/lib/kotext/KoRichText.cpp
index cc0fe4a9a..5d3e99d11 100644
--- a/lib/kotext/KoRichText.cpp
+++ b/lib/kotext/KoRichText.cpp
@@ -1199,7 +1199,7 @@ void KoTextString::clear()
 	KoTextStringChar &ch = data[ i ];
 	if ( ch.isCustom() ) {
             // Can't do that here, no access to the doc. See ~KoTextParag instead.
-            // However clear() is also called by operator=, many times in kotextobject.cc...
+            // However clear() is also called by operator=, many times in kotextobject.cpp...
             // Hopefully not with customitems in there...
             //if ( doc )
             //    doc->unregisterCustomItem( ch->customItem(), this );
diff --git a/lib/kotext/KoTextFormatter.cpp b/lib/kotext/KoTextFormatter.cpp
index 39817a201..60e6528f5 100644
--- a/lib/kotext/KoTextFormatter.cpp
+++ b/lib/kotext/KoTextFormatter.cpp
@@ -39,7 +39,7 @@
 // Hyphenation
 //#define DEBUG_HYPHENATION
 
-/////// keep in sync with kotextformat.cc !
+/////// keep in sync with kotextformat.cpp !
 //#define REF_IS_LU
 
 KoTextFormatter::KoTextFormatter()
diff --git a/lib/kotext/KoTextParag.h b/lib/kotext/KoTextParag.h
index 86fc40116..c89582c5e 100644
--- a/lib/kotext/KoTextParag.h
+++ b/lib/kotext/KoTextParag.h
@@ -132,7 +132,7 @@ public:
     uint alignment() const;
 
     virtual void paint( TQPainter &painter, const TQColorGroup &cg, KoTextCursor *cursor, bool drawSelections,
-                       int clipx, int clipy, int clipw, int cliph ); // kotextparag.cc
+                       int clipx, int clipy, int clipw, int cliph ); // kotextparag.cpp
 
 
     int topMargin() const;
diff --git a/lib/kotext/KoTextViewIface.cc b/lib/kotext/KoTextViewIface.cpp
index dec0e0320..dec0e0320 100644
--- a/lib/kotext/KoTextViewIface.cc
+++ b/lib/kotext/KoTextViewIface.cpp
diff --git a/lib/kotext/Makefile.am b/lib/kotext/Makefile.am
index ab2214555..c186cd8ce 100644
--- a/lib/kotext/Makefile.am
+++ b/lib/kotext/Makefile.am
@@ -15,7 +15,7 @@ libkotext_la_SOURCES = KoComplexText.cpp KoRichText.cpp \
 	TDEFontDialog_local.cpp kofonttabbase.ui KoFontTab.cpp kohighlightingtabbase.ui KoHighlightingTab.cpp \
 	kodecorationtabbase.ui KoDecorationTab.cpp kolayouttabbase.ui KoLayoutTab.cpp kolanguagetabbase.ui KoLanguageTab.cpp \
 	KoFontDiaPreview.cpp KoCompletionDia.cpp KoCompletionBase.ui \
-	KoTextViewIface.skel KoTextViewIface.cc KoFontDia.cpp KoBgSpellCheck.cpp \
+	KoTextViewIface.skel KoTextViewIface.cpp KoFontDia.cpp KoBgSpellCheck.cpp \
 	KoCommentDia.cpp KoSpell.cpp KoCreateStyleDia.cpp KoTextCustomItem.cpp \
 	KoImportStyleDia.cpp KoTextIterator.cpp KoOasisContext.cpp KoListStyleStack.cpp \
 	KoUserStyle.cpp KoUserStyleCollection.cpp KoParagStyle.cpp KoParagDecorationTab.ui \
diff --git a/lib/kotext/tests/kotextformattertest.cpp b/lib/kotext/tests/kotextformattertest.cpp
index 74014c2d5..69d5b1592 100644
--- a/lib/kotext/tests/kotextformattertest.cpp
+++ b/lib/kotext/tests/kotextformattertest.cpp
@@ -130,7 +130,7 @@ void KoTextFormatterTest::noWidthEverTest()
     KoTextParag* parag = doc->firstParag();
     parag->append( "abcdefghi" );
     parag->format();
-    // The resulting paragraph is NOT marked as formatted. See kotextformatter.cc -r1.79
+    // The resulting paragraph is NOT marked as formatted. See kotextformatter.cpp -r1.79
     assert( !parag->isValid() );
     doc->clear(false);
     doc->setFlow( new KoTextFlow ); // default
diff --git a/lib/kross/python/cxx/Config.hxx b/lib/kross/python/cxx/Config.h
index 7959c4039..7959c4039 100644
--- a/lib/kross/python/cxx/Config.hxx
+++ b/lib/kross/python/cxx/Config.h
diff --git a/lib/kross/python/cxx/Exception.hxx b/lib/kross/python/cxx/Exception.h
index 044d4198e..94cfcff4a 100644
--- a/lib/kross/python/cxx/Exception.hxx
+++ b/lib/kross/python/cxx/Exception.h
@@ -7,8 +7,8 @@
 #define __CXX_Exception_h
 
 #include "Python.h"
-#include "Config.hxx"
-#include "IndirectPythonInterface.hxx"
+#include "Config.h"
+#include "IndirectPythonInterface.h"
 
 #include <string>
 #include <iostream>
diff --git a/lib/kross/python/cxx/Extensions.hxx b/lib/kross/python/cxx/Extensions.h
index 5c7c2bcf3..48eb4e091 100644
--- a/lib/kross/python/cxx/Extensions.hxx
+++ b/lib/kross/python/cxx/Extensions.h
@@ -14,8 +14,8 @@
 #endif
 
 
-#include "Config.hxx"
-#include "Objects.hxx"
+#include "Config.h"
+#include "Objects.h"
 
 extern "C"
 	{
diff --git a/lib/kross/python/cxx/IndirectPythonInterface.cxx b/lib/kross/python/cxx/IndirectPythonInterface.cpp
index caaa09134..6f3be354e 100644
--- a/lib/kross/python/cxx/IndirectPythonInterface.cxx
+++ b/lib/kross/python/cxx/IndirectPythonInterface.cpp
@@ -1,8 +1,8 @@
 //
-//	IndirectPythonInterface.cxx
+//	IndirectPythonInterface.cpp
 //
 #undef _XOPEN_SOURCE
-#include "IndirectPythonInterface.hxx"
+#include "IndirectPythonInterface.h"
 
 namespace Py
 {
diff --git a/lib/kross/python/cxx/IndirectPythonInterface.hxx b/lib/kross/python/cxx/IndirectPythonInterface.h
index 8f2d275dd..8cc0bcec7 100644
--- a/lib/kross/python/cxx/IndirectPythonInterface.hxx
+++ b/lib/kross/python/cxx/IndirectPythonInterface.h
@@ -1,5 +1,5 @@
-#ifndef __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
-#define __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
+#ifndef __CXX_INDIRECT_PYTHON_INTERFACE__H__
+#define __CXX_INDIRECT_PYTHON_INTERFACE__H__
 
 #include <Python.h>
 
@@ -153,4 +153,4 @@ void _XDECREF( PyObject *op );
 char *__Py_PackageContext();
 }
 
-#endif	// __CXX_INDIRECT_PYTHON_INTERFACE__HXX__
+#endif	// __CXX_INDIRECT_PYTHON_INTERFACE__H__
diff --git a/lib/kross/python/cxx/Makefile.am b/lib/kross/python/cxx/Makefile.am
index 4e1377c00..702027dab 100644
--- a/lib/kross/python/cxx/Makefile.am
+++ b/lib/kross/python/cxx/Makefile.am
@@ -5,10 +5,10 @@ CXXFLAGS += $(USE_EXCEPTIONS)
 noinst_LTLIBRARIES = libkrosspythoncxx.la
 
 libkrosspythoncxx_la_SOURCES = \
-    cxxsupport.cxx \
-    cxx_extensions.cxx \
+    cxxsupport.cpp \
+    cxx_extensions.cpp \
     cxxextensions.c \
-    IndirectPythonInterface.cxx
+    IndirectPythonInterface.cpp
 
 libkrosspythoncxx_la_LDFLAGS = $(LIBPYTHON) $(all_libraries) -Wnounresolved
 
diff --git a/lib/kross/python/cxx/Objects.hxx b/lib/kross/python/cxx/Objects.h
index 97e52fc0e..b6ab958bb 100644
--- a/lib/kross/python/cxx/Objects.hxx
+++ b/lib/kross/python/cxx/Objects.h
@@ -12,8 +12,8 @@
 #endif
 
 #include "Python.h"
-#include "Config.hxx"
-#include "Exception.hxx"
+#include "Config.h"
+#include "Exception.h"
 
 
 #include <iostream>
@@ -110,7 +110,7 @@ namespace Py
 	// If you are inheriting from PythonExtension<T> to define an object
 	// note that it contains PythonExtension<T>::check
 	// which you can use in accepts when writing a wrapper class.
-	// See Demo/range.h and Demo/range.cxx for an example.
+	// See Demo/range.h and Demo/range.cpp for an example.
 
 	class Object
 		{
diff --git a/lib/kross/python/cxx/PyCXX.html b/lib/kross/python/cxx/PyCXX.html
index 566974c14..0c7172a1a 100644
--- a/lib/kross/python/cxx/PyCXX.html
+++ b/lib/kross/python/cxx/PyCXX.html
@@ -83,7 +83,7 @@ Unix: <cite>/usr/local/PyCXX</cite>
 Windows: <cite>cl /I=C:\PyCXX ...</cite><br>
 Unix: <cite>g++ -I/usr/local/PyCXX ...</cite>
 <li>Include PyCXX headers files in your code using the CXX prefix:<br>
-<cite>#include &quot;CXX/Object.hxx&quot;</cite>
+<cite>#include &quot;CXX/Object.h&quot;</cite>
 </ul>
 
 <p>The header file CXX/config.h may need to be adjusted for the
@@ -100,7 +100,7 @@ the Py:: prefix when referring to them, or include the statement:</p>
 
 <h2>Wrappers for standard objects: CXX_Objects.h</h2>
 
-<p>Header file CXX_Objects.h requires adding file Src/cxxsupport.cxx to
+<p>Header file CXX_Objects.h requires adding file Src/cxxsupport.cpp to
 your module sources. CXX_Objects provides a set of wrapper classes that allow you access
 to most of the Python C API using a C++ notation that closely resembles Python. For
 example, this Python:</p>
@@ -121,7 +121,7 @@ alist = d.keys();
 std::cout &lt;&lt; alist &lt;&lt; std::endl;
 </pre>
 
-<p>You can optionally use the CXX/Extensions.hxx facility described later
+<p>You can optionally use the CXX/Extensions.h facility described later
 to define Python extension modules and extension objects.</p>
 
 <h3>We avoid programming with Python object pointers</h3>
@@ -165,8 +165,8 @@ integer argument, that will create a Python <cite>dict</cite>
 
 <p>If you have written a significant Python extension, this tedium looks all too familiar.
 The vast bulk of the coding is error checking and cleanup. Now compare the same thing
-written in C++ using CXX/Objects.hxx. The things with Python-like names (Int, Dict, Tuple) are
-from CXX/Objects.hxx.</p>
+written in C++ using CXX/Objects.h. The things with Python-like names (Int, Dict, Tuple) are
+from CXX/Objects.h.</p>
 
 <pre>static PyObject* mymodule_addvalue (PyObject* self, PyObject* pargs)
         { 
@@ -211,7 +211,7 @@ Object addvalue (Object &amp; self, const Tuple &amp; args)
 <h2>The basic concept is to wrap Python pointers</h2>
 
 
-<p>The basic concept of CXX/Objects.hxx is to create a wrapper around 
+<p>The basic concept of CXX/Objects.h is to create a wrapper around 
 each <cite>PyObject *</cite> so that the reference counting can be
 done automatically, thus eliminating the most frequent source of errors. In addition, we
 can then add methods and operators so that Python objects can be manipulated in C++
@@ -223,7 +223,7 @@ the pointer. Since C++ calls the destructors on objects that are about to go out
 we are guaranteed that we will keep the reference counts right even if we unexpectedly
 leave a routine with an exception.</p>
 
-<p>As a matter of philosophy, CXX/Objects.hxx prevents the creation of instances of its
+<p>As a matter of philosophy, CXX/Objects.h prevents the creation of instances of its
 classes unless the instance will be a valid instance of its class. When an attempt is made
 to create an object that will not be valid, an exception is thrown.</p>
 
@@ -1713,17 +1713,17 @@ Exception to clear it.:</p>
 
 <h2>Extension Facilities</h2>
 
-<p>CXX/Extensions.hxx provides facilities for: 
+<p>CXX/Extensions.h provides facilities for: 
 
 <ul>
   <li>Creating a Python extension module</li>
   <li>Creating new Python extension types</li>
 </ul>
 
-<p>These facilities use CXX/Objects.hxx and its support file cxxsupport.cxx.</p>
+<p>These facilities use CXX/Objects.h and its support file cxxsupport.cpp.</p>
 
-<p>If you use CXX/Extensions.hxx you must also include source files cxxextensions.c and
-cxx_extensions.cxx</p>
+<p>If you use CXX/Extensions.h you must also include source files cxxextensions.c and
+cxx_extensions.cpp</p>
 
 <h3>Creating an Python extension module</h3>
 
@@ -1745,7 +1745,7 @@ details are necessary:
 <p>To create an extension module, you inherit from class ExtensionModule templated on
 yourself: In the constructor, you make calls to register methods of this class with Python
 as extension module methods. In this example, two methods are added (this is a simplified
-form of the example in Demo/example.cxx):</p>
+form of the example in Demo/example.cpp):</p>
 
 <pre>class example_module : public ExtensionModule&lt;example_module&gt;
 {
@@ -1859,7 +1859,7 @@ addresses of functions can be added in order to give the object the desired beha
 
 <p>Creating extension objects is of course harder since you must specify
 how the object behaves and give it methods. This is shown in some detail in the example
-range.h and range.cxx, with the test routine rangetest.cxx, in directory Demo. If you have never
+range.h and range.cpp, with the test routine rangetest.cpp, in directory Demo. If you have never
 created a Python extension before, you should read the Extension manual first and be very
 familiar with Python's &quot;special class methods&quot;. Then what follows will make more
 sense.</p>
diff --git a/lib/kross/python/cxx/README.html b/lib/kross/python/cxx/README.html
index d698725a2..b29f5b159 100644
--- a/lib/kross/python/cxx/README.html
+++ b/lib/kross/python/cxx/README.html
@@ -176,8 +176,8 @@ is not compiled and linked to support C and C++.</p>
 <p>New in this release:</p>
 <ul>
 <li>Support for the Windows Linker /DELAYLOAD feature. Enable this feature by
-defining PY_WIN32_DELAYLOAD_PYTHON_DLL when compiling IndirectPythonInterface.cxx
-<li>Remove "CXX/Array.hxx" and associated code - its does not belong in PyCXX
+defining PY_WIN32_DELAYLOAD_PYTHON_DLL when compiling IndirectPythonInterface.cpp
+<li>Remove "CXX/Array.h" and associated code - its does not belong in PyCXX
 <li>Work on the docs. Mostly to clean up the HTML to allow more extensive work.
 <li>Reformated the sources to a consistent style. The mix of styles and tabs sizes
 was making working on the sources error prone.
@@ -193,10 +193,10 @@ C++ header files.
 <p>
 <table cellspacing=0 cellpadding=3px>
 <tr><th>Old</th><th>New</th></tr>
-<tr><td>#include "CXX_Config.h"</td><td>#include "CXX/Config.hxx"</td>
-<tr><td>#include "CXX_Exception.h"</td><td>#include "CXX/Exception.hxx"</td>
-<tr><td>#include "CXX_Extensions.h"</td><td>#include "CXX/Extensions.hxx"</td>
-<tr><td>#include "CXX_Objects.h"</td><td>#include "CXX/Objects.hxx"</td>
+<tr><td>#include "CXX_Config.h"</td><td>#include "CXX/Config.h"</td>
+<tr><td>#include "CXX_Exception.h"</td><td>#include "CXX/Exception.h"</td>
+<tr><td>#include "CXX_Extensions.h"</td><td>#include "CXX/Extensions.h"</td>
+<tr><td>#include "CXX_Objects.h"</td><td>#include "CXX/Objects.h"</td>
 </table>
 
 <h3>Version 5 (May 18, 2000)</h3>
@@ -254,7 +254,7 @@ coding so much that we think it is worth the disruption.</p>
 <p>To create an extension module, you inherit from class ExtensionModule templated on
 yourself: In the constructor, you make calls to register methods of this class with Python
 as extension module methods. In this example, two methods are added (this is a simplified
-form of the example in Demo/example.cxx):</p>
+form of the example in Demo/example.cpp):</p>
 
 <pre>class example_module : public ExtensionModule&lt;example_module&gt;
 {
@@ -309,8 +309,8 @@ return its dictionary.</p>
 <h4>Creating extension objects</h4>
 
 <p>Creating extension objects is of course harder since you must specify how the object
-behaves and give it methods. This is shown in some detail in the example range.h and range.cxx,
-with the test routine rangetest.cxx, in directory Demo.</p>
+behaves and give it methods. This is shown in some detail in the example range.h and range.cpp,
+with the test routine rangetest.cpp, in directory Demo.</p>
 
 <p>Here is a brief overview. You create a class that inherits from PythonExtension
 templated upon itself. You override various methods from PythonExtension to implement
@@ -426,8 +426,8 @@ setenv CCC &quot;KCC -x&quot;
 
 <p>before running makethis.py.</p>
 
-<p>There is also a python.cxx file for making a stand-alone Python containing this
-example, as well as a similar file arraytest.cxx for testing Array.</p>
+<p>There is also a python.cpp file for making a stand-alone Python containing this
+example, as well as a similar file arraytest.cpp for testing Array.</p>
 
 <p>Comments to barry@barrys-emacs.org, please.</p>
 
diff --git a/lib/kross/python/cxx/cxx_extensions.cxx b/lib/kross/python/cxx/cxx_extensions.cpp
index f9c942adf..6bbe12785 100644
--- a/lib/kross/python/cxx/cxx_extensions.cxx
+++ b/lib/kross/python/cxx/cxx_extensions.cpp
@@ -1,5 +1,5 @@
-#include "Extensions.hxx"
-#include "Exception.hxx"
+#include "Extensions.h"
+#include "Exception.h"
 
 #include <assert.h>
 
diff --git a/lib/kross/python/cxx/cxxsupport.cxx b/lib/kross/python/cxx/cxxsupport.cpp
index 7bab6cc37..6f2234b26 100644
--- a/lib/kross/python/cxx/cxxsupport.cxx
+++ b/lib/kross/python/cxx/cxxsupport.cpp
@@ -3,7 +3,7 @@
 // All rights reserved. See Legal.htm for full text and disclaimer.
 //---------------------------------------------------------------------------//
 
-#include "Objects.hxx"
+#include "Objects.h"
 namespace Py {
 
 Py_UNICODE unicode_null_string[1] = { 0 };
diff --git a/lib/kross/python/pythonconfig.h b/lib/kross/python/pythonconfig.h
index 64b4eefb7..349d838b0 100644
--- a/lib/kross/python/pythonconfig.h
+++ b/lib/kross/python/pythonconfig.h
@@ -38,9 +38,9 @@
 #include <frameobject.h>
 
 // Include the PyCXX stuff.
-#include "cxx/Config.hxx"
-#include "cxx/Objects.hxx"
-#include "cxx/Extensions.hxx"
+#include "cxx/Config.h"
+#include "cxx/Objects.h"
+#include "cxx/Extensions.h"
 
 namespace Kross {
 
diff --git a/lib/kwmf/Makefile.am b/lib/kwmf/Makefile.am
index 51bb4e26b..a6d9a16c8 100644
--- a/lib/kwmf/Makefile.am
+++ b/lib/kwmf/Makefile.am
@@ -9,11 +9,11 @@ libkwmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
 
 lib_LTLIBRARIES = libkwmf.la libkowmf.la
 
-libkwmf_la_SOURCES = kwmf.cc qwmf.cc
+libkwmf_la_SOURCES = kwmf.cpp qwmf.cpp
 
 #include_HEADERS = kowmfread.h kowmfwrite.h kowmfpaint.h
 noinst_HEADERS = kwmf.h qwmf.h metafuncs.h wmfstruct.h kowmfreadprivate.h kowmfstack.h kowmfstruct.h
 
-libkowmf_la_SOURCES  = kowmfreadprivate.cc kowmfstack.cc kowmfread.cc kowmfwrite.cc kowmfpaint.cc
+libkowmf_la_SOURCES  = kowmfreadprivate.cpp kowmfstack.cpp kowmfread.cpp kowmfwrite.cpp kowmfpaint.cpp
 libkowmf_la_LDFLAGS = $(all_libraries) -version-info 2:0:0  -no-undefined
 libkowmf_la_LIBADD = $(LIB_TDECORE) $(LIB_QT)
diff --git a/lib/kwmf/kowmfpaint.cc b/lib/kwmf/kowmfpaint.cpp
index 430672731..430672731 100644
--- a/lib/kwmf/kowmfpaint.cc
+++ b/lib/kwmf/kowmfpaint.cpp
diff --git a/lib/kwmf/kowmfread.cc b/lib/kwmf/kowmfread.cpp
index f932ae3a3..f932ae3a3 100644
--- a/lib/kwmf/kowmfread.cc
+++ b/lib/kwmf/kowmfread.cpp
diff --git a/lib/kwmf/kowmfreadprivate.cc b/lib/kwmf/kowmfreadprivate.cpp
index f812b7660..f812b7660 100644
--- a/lib/kwmf/kowmfreadprivate.cc
+++ b/lib/kwmf/kowmfreadprivate.cpp
diff --git a/lib/kwmf/kowmfstack.cc b/lib/kwmf/kowmfstack.cpp
index 80896690f..80896690f 100644
--- a/lib/kwmf/kowmfstack.cc
+++ b/lib/kwmf/kowmfstack.cpp
diff --git a/lib/kwmf/kowmfwrite.cc b/lib/kwmf/kowmfwrite.cpp
index 22a0d131e..22a0d131e 100644
--- a/lib/kwmf/kowmfwrite.cc
+++ b/lib/kwmf/kowmfwrite.cpp
diff --git a/lib/kwmf/kwmf.cc b/lib/kwmf/kwmf.cpp
index 06092a825..06092a825 100644
--- a/lib/kwmf/kwmf.cc
+++ b/lib/kwmf/kwmf.cpp
diff --git a/lib/kwmf/qwmf.cc b/lib/kwmf/qwmf.cpp
index 8b6572aee..8b6572aee 100644
--- a/lib/kwmf/qwmf.cc
+++ b/lib/kwmf/qwmf.cpp