Renaming of files in preparation for code style tools.

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

111 files changed, 186 insertions, 186 deletions

diff --git a/kbruch/src/Makefile.am b/kbruch/src/Makefile.am
index ede0aee6..6459bbf1 100644
--- a/kbruch/src/Makefile.am
+++ b/kbruch/src/Makefile.am
@@ -36,7 +36,7 @@ rcdir = $(kde_datadir)/kbruch
 rc_DATA = kbruchui.rc
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kbruch.pot; \
 	fi
diff --git a/keduca/Makefile.am b/keduca/Makefile.am
index 37f0a527..55f21c8e 100644
--- a/keduca/Makefile.am
+++ b/keduca/Makefile.am
@@ -7,7 +7,7 @@ messages:
 	$(EXTRACTRC) `find . -name *.rc` > rc.cpp
 	$(EXTRACTRC) `find . -name *.ui` >> rc.cpp
 
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 		$(XGETTEXT) $$LIST -o $(podir)/keduca.pot; \
 	fi
diff --git a/keduca/keducabuilder/Makefile.am b/keduca/keducabuilder/Makefile.am
index 160d29c1..b3978ca9 100644
--- a/keduca/keducabuilder/Makefile.am
+++ b/keduca/keducabuilder/Makefile.am
@@ -31,7 +31,7 @@ rcdir = $(kde_datadir)/keduca
 rc_DATA = keducabuilderui.rc
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/keduca.pot; \
 	fi
diff --git a/khangman/khangman/Makefile.am b/khangman/khangman/Makefile.am
index 50652ad6..1a3111d7 100644
--- a/khangman/khangman/Makefile.am
+++ b/khangman/khangman/Makefile.am
@@ -24,7 +24,7 @@ rcdir = $(kde_datadir)/khangman
 
 messages:  rc.cpp
 	$(EXTRACTRC) *.ui *.rc > rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) data.i18n $$LIST -o $(podir)/khangman.pot; \
 	fi
diff --git a/kig/ChangeLog b/kig/ChangeLog
index ddbb1309..50e1c288 100644
--- a/kig/ChangeLog
+++ b/kig/ChangeLog
@@ -234,7 +234,7 @@
 
 2005-02-07  Maurizio Paolini <paolini@dmf.unicatt.it>
 
-	* Bug fix: new algorithm for calcPath in calcpath.cc; the
+	* Bug fix: new algorithm for calcPath in calcpath.cpp; the
 	previous had exponential complexity for some examples
 
 2005-02-03  Dominique Devriese  <devriese@kde.org>
@@ -1052,7 +1052,7 @@
 
 2004-02-14  Dominique Devriese  <devriese@kde.org>
 
-	* Fix a bug waiting to pop up in construct_mode.cc, where you
+	* Fix a bug waiting to pop up in construct_mode.cpp, where you
 	select the same object twice.
 
 	* Add documentation about the locus and textlabel design to the
@@ -1061,7 +1061,7 @@
 2004-02-10  Dominique Devriese  <devriese@kde.org>
 
 	* Fix a bug which caused Kig to crash on moving a text label by
-	removing a wrong assertion in objects/object_calcer.cc
+	removing a wrong assertion in objects/object_calcer.cpp
 
 2004-02-09  Dominique Devriese  <devriese@kde.org>
 
@@ -1286,7 +1286,7 @@
 2003-07-17  Dominique Devriese  <devriese@kde.org>
 
 	* fix the "conversion from const char* to char*" problem in
-	python_scripter.cc.  This introduces a small, harmless memory leak
+	python_scripter.cpp.  This introduces a small, harmless memory leak
 	because of how the python libs work..
 
 2003-07-16  Dominique Devriese  <devriese@kde.org>
diff --git a/kig/DESIGN b/kig/DESIGN
index fd887779..0de0c986 100644
--- a/kig/DESIGN
+++ b/kig/DESIGN
@@ -31,7 +31,7 @@ holding data for other objects to use.  Examples are StringImp,
 IntImp, ConicImp etc.
 
 There are a lot of ObjectImp's in Kig, most of them are in files
-called *_imp.h and *_imp.cc or *_imp.cpp in the objects subdirectory.
+called *_imp.h and *_imp.cpp in the objects subdirectory.
 Examples are PointImp, LineImp, ConicImp, CircleImp, CubicImp,
 AngleImp etc.
 
diff --git a/kig/Makefile.am b/kig/Makefile.am
index 5081c354..eea9593b 100644
--- a/kig/Makefile.am
+++ b/kig/Makefile.am
@@ -41,7 +41,7 @@ messages: rc.cpp
 		cat "$$file" | grep '<UseText>' | sed -e 's/^ *<UseText>\([^<]*\)<\/UseText>/i18n( "\1" );/' | sed -e 's/&amp;/\&/g' >> rc.cpp; \
 		cat "$$file" | grep '<SelectStatement>' | sed -e 's/^ *<SelectStatement>\([^<]*\)<\/SelectStatement>/i18n( "\1" );/' | sed -e 's/&amp;/\&/g' >> rc.cpp; \
 	done
-	$(XGETTEXT) tips.cpp rc.cpp filters/*.h kig/*.h misc/*.h modes/*.h objects/*.h scripting/*.h */*.cc kig/*.cpp misc/*.cpp modes/*.cpp -o $(podir)/kig.pot
+	$(XGETTEXT) tips.cpp rc.cpp filters/*.h kig/*.h misc/*.h modes/*.h objects/*.h scripting/*.h */*.cpp kig/*.cpp misc/*.cpp modes/*.cpp -o $(podir)/kig.pot
 	$(XGETTEXT) tdefile/tdefile_drgeo.cpp tdefile/tdefile_drgeo.h -o $(podir)/tdefile_drgeo.pot
 	$(XGETTEXT) tdefile/tdefile_kig.cpp tdefile/tdefile_kig.h -o $(podir)/tdefile_kig.pot
 
@@ -51,7 +51,7 @@ dummy.cpp:
 	touch dummy.cpp
 
 TAGS: 
-	find -name '*.cc' -o -name '*.cpp' -o -name '*.h' | etags -
+	find -name '*.cpp' -o -name '*.h' | etags -
 
 # Want to do the scripting part separately, but
 # include everything else.
diff --git a/kig/filters/CMakeLists.txt b/kig/filters/CMakeLists.txt
index 35ded394..1685098e 100644
--- a/kig/filters/CMakeLists.txt
+++ b/kig/filters/CMakeLists.txt
@@ -23,18 +23,18 @@ tde_add_library( kigfilters STATIC_PIC AUTOMOC
         latexexporteroptions.ui
         svgexporteroptions.ui
         drgeo-filter-chooserbase.ui
-        cabri-filter.cc
-        exporter.cc
-        filter.cc
-        filters-common.cc
-        imageexporteroptions.cc
-        kgeo-filter.cc
-        kseg-filter.cc
-        latexexporter.cc
-        native-filter.cc
-        svgexporter.cc
-        drgeo-filter.cc
-        drgeo-filter-chooser.cc
+        cabri-filter.cpp
+        exporter.cpp
+        filter.cpp
+        filters-common.cpp
+        imageexporteroptions.cpp
+        kgeo-filter.cpp
+        kseg-filter.cpp
+        latexexporter.cpp
+        native-filter.cpp
+        svgexporter.cpp
+        drgeo-filter.cpp
+        drgeo-filter-chooser.cpp
 
   LINK
     kigmisc-static
diff --git a/kig/filters/Makefile.am b/kig/filters/Makefile.am
index bb827b5a..c7e82bb8 100644
--- a/kig/filters/Makefile.am
+++ b/kig/filters/Makefile.am
@@ -19,20 +19,20 @@ noinst_HEADERS= \
 	drgeo-filter.h \
 	drgeo-filter-chooser.h
 libfilters_la_SOURCES= \
-	cabri-filter.cc \
-	exporter.cc \
-	filter.cc \
-	filters-common.cc \
-	imageexporteroptions.cc \
+	cabri-filter.cpp \
+	exporter.cpp \
+	filter.cpp \
+	filters-common.cpp \
+	imageexporteroptions.cpp \
 	imageexporteroptionsbase.ui \
-	kgeo-filter.cc \
-	kseg-filter.cc \
-	latexexporter.cc \
+	kgeo-filter.cpp \
+	kseg-filter.cpp \
+	latexexporter.cpp \
 	latexexporteroptions.ui \
-	native-filter.cc \
-	svgexporter.cc \
+	native-filter.cpp \
+	svgexporter.cpp \
 	svgexporteroptions.ui \
-	drgeo-filter.cc \
-	drgeo-filter-chooser.cc \
+	drgeo-filter.cpp \
+	drgeo-filter-chooser.cpp \
 	drgeo-filter-chooserbase.ui
 
diff --git a/kig/filters/cabri-filter.cc b/kig/filters/cabri-filter.cpp
index 0a94f140..0a94f140 100644
--- a/kig/filters/cabri-filter.cc
+++ b/kig/filters/cabri-filter.cpp
diff --git a/kig/filters/drgeo-filter-chooser.cc b/kig/filters/drgeo-filter-chooser.cpp
index 89250235..89250235 100644
--- a/kig/filters/drgeo-filter-chooser.cc
+++ b/kig/filters/drgeo-filter-chooser.cpp
diff --git a/kig/filters/drgeo-filter.cc b/kig/filters/drgeo-filter.cpp
index 9742fcf5..9742fcf5 100644
--- a/kig/filters/drgeo-filter.cc
+++ b/kig/filters/drgeo-filter.cpp
diff --git a/kig/filters/exporter.cc b/kig/filters/exporter.cpp
index 32b25f01..32b25f01 100644
--- a/kig/filters/exporter.cc
+++ b/kig/filters/exporter.cpp
diff --git a/kig/filters/filter.cc b/kig/filters/filter.cpp
index 6a543430..6a543430 100644
--- a/kig/filters/filter.cc
+++ b/kig/filters/filter.cpp
diff --git a/kig/filters/filters-common.cc b/kig/filters/filters-common.cpp
index 4ba24e9f..4ba24e9f 100644
--- a/kig/filters/filters-common.cc
+++ b/kig/filters/filters-common.cpp
diff --git a/kig/filters/imageexporteroptions.cc b/kig/filters/imageexporteroptions.cpp
index cd68a0af..cd68a0af 100644
--- a/kig/filters/imageexporteroptions.cc
+++ b/kig/filters/imageexporteroptions.cpp
diff --git a/kig/filters/kgeo-filter.cc b/kig/filters/kgeo-filter.cpp
index 8849256b..8849256b 100644
--- a/kig/filters/kgeo-filter.cc
+++ b/kig/filters/kgeo-filter.cpp
diff --git a/kig/filters/kseg-filter.cc b/kig/filters/kseg-filter.cpp
index 1567ed37..1567ed37 100644
--- a/kig/filters/kseg-filter.cc
+++ b/kig/filters/kseg-filter.cpp
diff --git a/kig/filters/latexexporter.cc b/kig/filters/latexexporter.cpp
index 622a1a49..622a1a49 100644
--- a/kig/filters/latexexporter.cc
+++ b/kig/filters/latexexporter.cpp
diff --git a/kig/filters/native-filter.cc b/kig/filters/native-filter.cpp
index cf6521b2..cf6521b2 100644
--- a/kig/filters/native-filter.cc
+++ b/kig/filters/native-filter.cpp
diff --git a/kig/filters/svgexporter.cc b/kig/filters/svgexporter.cpp
index 2fd53756..2fd53756 100644
--- a/kig/filters/svgexporter.cc
+++ b/kig/filters/svgexporter.cpp
diff --git a/kig/kig/CMakeLists.txt b/kig/kig/CMakeLists.txt
index 8134f923..a1d88e24 100644
--- a/kig/kig/CMakeLists.txt
+++ b/kig/kig/CMakeLists.txt
@@ -17,7 +17,7 @@ link_directories(
 tde_add_library( kigpart STATIC_PIC AUTOMOC
 
   SOURCES
-        kig_document.cc
+        kig_document.cpp
         kig_part.cpp
         kig_view.cpp
         kig_commands.cpp
diff --git a/kig/kig/Makefile.am b/kig/kig/Makefile.am
index f01a4b29..063b1e2e 100644
--- a/kig/kig/Makefile.am
+++ b/kig/kig/Makefile.am
@@ -40,7 +40,7 @@ noinst_LTLIBRARIES = libkigparttemp.la
 
 # the Part's source, library search path, and link libraries
 libkigparttemp_la_SOURCES = \
-	kig_document.cc \
+	kig_document.cpp \
 	kig_part.cpp \
 	kig_view.cpp \
 	kig_commands.cpp
diff --git a/kig/kig/kig_document.cc b/kig/kig/kig_document.cpp
index 884b41c5..884b41c5 100644
--- a/kig/kig/kig_document.cc
+++ b/kig/kig/kig_document.cpp
diff --git a/kig/misc/CMakeLists.txt b/kig/misc/CMakeLists.txt
index 57449131..3d9b9852 100644
--- a/kig/misc/CMakeLists.txt
+++ b/kig/misc/CMakeLists.txt
@@ -18,23 +18,23 @@ tde_add_library( kigmisc STATIC_PIC AUTOMOC
 
   SOURCES
         argsparser.cpp
-        builtin_stuff.cc
-        calcpaths.cc
+        builtin_stuff.cpp
+        calcpaths.cpp
         common.cpp
         conic-common.cpp
         coordinate.cpp
         coordinate_system.cpp
-        cubic-common.cc
-        goniometry.cc
-        guiaction.cc
-        kigfiledialog.cc
-        kiginputdialog.cc
+        cubic-common.cpp
+        goniometry.cpp
+        guiaction.cpp
+        kigfiledialog.cpp
+        kiginputdialog.cpp
         kignumerics.cpp
         kigpainter.cpp
         kigtransform.cpp
-        lists.cc
-        object_constructor.cc
-        object_hierarchy.cc
-        rect.cc screeninfo.cc
-        special_constructors.cc
+        lists.cpp
+        object_constructor.cpp
+        object_hierarchy.cpp
+        rect.cpp screeninfo.cpp
+        special_constructors.cpp
 )
diff --git a/kig/misc/Makefile.am b/kig/misc/Makefile.am
index d97d7989..be1bb571 100644
--- a/kig/misc/Makefile.am
+++ b/kig/misc/Makefile.am
@@ -25,26 +25,26 @@ noinst_HEADERS = \
 
 libmisc_la_SOURCES = \
 	argsparser.cpp \
-	builtin_stuff.cc \
-	calcpaths.cc \
+	builtin_stuff.cpp \
+	calcpaths.cpp \
 	common.cpp \
 	conic-common.cpp \
 	coordinate.cpp \
 	coordinate_system.cpp \
-	cubic-common.cc \
-	goniometry.cc \
-	guiaction.cc \
-	kigfiledialog.cc \
-	kiginputdialog.cc \
+	cubic-common.cpp \
+	goniometry.cpp \
+	guiaction.cpp \
+	kigfiledialog.cpp \
+	kiginputdialog.cpp \
 	kignumerics.cpp \
 	kigpainter.cpp \
 	kigtransform.cpp \
-	lists.cc \
-	object_constructor.cc \
-	object_hierarchy.cc \
-	rect.cc \
-	screeninfo.cc \
-	special_constructors.cc
+	lists.cpp \
+	object_constructor.cpp \
+	object_hierarchy.cpp \
+	rect.cpp \
+	screeninfo.cpp \
+	special_constructors.cpp
 
 libmisc_la_LIBADD=-lm
 METASOURCES=AUTO
diff --git a/kig/misc/boost_intrusive_pointer.hpp b/kig/misc/boost_intrusive_pointer.h
index a278e736..1dd2dd81 100644
--- a/kig/misc/boost_intrusive_pointer.hpp
+++ b/kig/misc/boost_intrusive_pointer.h
@@ -21,11 +21,11 @@
 //  suit my needs ( no dependencies on other boost libs, change the
 //  namespace to avoid conflicts,
 
-#ifndef MYBOOST_INTRUSIVE_PTR_HPP_INCLUDED
-#define MYBOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#ifndef MYBOOST_INTRUSIVE_PTR_H_INCLUDED
+#define MYBOOST_INTRUSIVE_PTR_H_INCLUDED
 
 //
-//  intrusive_ptr.hpp
+//  intrusive_ptr.h
 //
 //  Copyright (c) 2001, 2002 Peter Dimov
 //
@@ -253,4 +253,4 @@ template<class E, class T, class Y> std::basic_ostream<E, T> & operator<< (std::
 # pragma warning(pop)
 #endif
 
-#endif  // #ifndef MYBOOST_INTRUSIVE_PTR_HPP_INCLUDED
+#endif  // #ifndef MYBOOST_INTRUSIVE_PTR_H_INCLUDED
diff --git a/kig/misc/builtin_stuff.cc b/kig/misc/builtin_stuff.cpp
index d42ef8ad..d42ef8ad 100644
--- a/kig/misc/builtin_stuff.cc
+++ b/kig/misc/builtin_stuff.cpp
diff --git a/kig/misc/calcpaths.cc b/kig/misc/calcpaths.cpp
index 1532715b..1532715b 100644
--- a/kig/misc/calcpaths.cc
+++ b/kig/misc/calcpaths.cpp
diff --git a/kig/misc/cubic-common.cc b/kig/misc/cubic-common.cpp
index 029f1194..029f1194 100644
--- a/kig/misc/cubic-common.cc
+++ b/kig/misc/cubic-common.cpp
diff --git a/kig/misc/goniometry.cc b/kig/misc/goniometry.cpp
index ee4f75fa..ee4f75fa 100644
--- a/kig/misc/goniometry.cc
+++ b/kig/misc/goniometry.cpp
diff --git a/kig/misc/guiaction.cc b/kig/misc/guiaction.cpp
index 0d7b35d9..0d7b35d9 100644
--- a/kig/misc/guiaction.cc
+++ b/kig/misc/guiaction.cpp
diff --git a/kig/misc/kigfiledialog.cc b/kig/misc/kigfiledialog.cpp
index 28d4dc74..28d4dc74 100644
--- a/kig/misc/kigfiledialog.cc
+++ b/kig/misc/kigfiledialog.cpp
diff --git a/kig/misc/kiginputdialog.cc b/kig/misc/kiginputdialog.cpp
index a596c87c..a596c87c 100644
--- a/kig/misc/kiginputdialog.cc
+++ b/kig/misc/kiginputdialog.cpp
diff --git a/kig/misc/lists.cc b/kig/misc/lists.cpp
index f0e0c3f7..f0e0c3f7 100644
--- a/kig/misc/lists.cc
+++ b/kig/misc/lists.cpp
diff --git a/kig/misc/object_constructor.cc b/kig/misc/object_constructor.cpp
index ae2a37d0..ae2a37d0 100644
--- a/kig/misc/object_constructor.cc
+++ b/kig/misc/object_constructor.cpp
diff --git a/kig/misc/object_hierarchy.cc b/kig/misc/object_hierarchy.cpp
index 7861c56e..7861c56e 100644
--- a/kig/misc/object_hierarchy.cc
+++ b/kig/misc/object_hierarchy.cpp
diff --git a/kig/misc/rect.cc b/kig/misc/rect.cpp
index 6a7ded12..6a7ded12 100644
--- a/kig/misc/rect.cc
+++ b/kig/misc/rect.cpp
diff --git a/kig/misc/screeninfo.cc b/kig/misc/screeninfo.cpp
index 91a6cb74..91a6cb74 100644
--- a/kig/misc/screeninfo.cc
+++ b/kig/misc/screeninfo.cpp
diff --git a/kig/misc/special_constructors.cc b/kig/misc/special_constructors.cpp
index 9618bc90..9618bc90 100644
--- a/kig/misc/special_constructors.cc
+++ b/kig/misc/special_constructors.cpp
diff --git a/kig/modes/CMakeLists.txt b/kig/modes/CMakeLists.txt
index ab62086d..a6b2fb4c 100644
--- a/kig/modes/CMakeLists.txt
+++ b/kig/modes/CMakeLists.txt
@@ -21,18 +21,18 @@ tde_add_library( kigmodes STATIC_PIC AUTOMOC
         macrowizardbase.ui
         textlabelwizardbase.ui
         typesdialogbase.ui
-        base_mode.cc
-        construct_mode.cc
-        dragrectmode.cc
-        edittype.cc
-        label.cc
+        base_mode.cpp
+        construct_mode.cpp
+        dragrectmode.cpp
+        edittype.cpp
+        label.cpp
         linkslabel.cpp
-        macro.cc
-        macrowizard.cc
-        mode.cc
-        moving.cc
-        normal.cc
-        popup.cc
-        textlabelwizard.cc
+        macro.cpp
+        macrowizard.cpp
+        mode.cpp
+        moving.cpp
+        normal.cpp
+        popup.cpp
+        textlabelwizard.cpp
         typesdialog.cpp
 )
diff --git a/kig/modes/Makefile.am b/kig/modes/Makefile.am
index 5f7518e5..76d3d773 100644
--- a/kig/modes/Makefile.am
+++ b/kig/modes/Makefile.am
@@ -2,21 +2,21 @@ INCLUDES=$(all_includes)
 
 noinst_LTLIBRARIES=libmodes.la
 libmodes_la_SOURCES= \
-	base_mode.cc \
-	construct_mode.cc \
-	dragrectmode.cc \
-	edittype.cc \
+	base_mode.cpp \
+	construct_mode.cpp \
+	dragrectmode.cpp \
+	edittype.cpp \
 	edittypebase.ui \
-	label.cc \
+	label.cpp \
 	linkslabel.cpp \
-	macro.cc \
-	macrowizard.cc \
+	macro.cpp \
+	macrowizard.cpp \
 	macrowizardbase.ui \
-	mode.cc \
-	moving.cc \
-	normal.cc \
-	popup.cc \
-	textlabelwizard.cc \
+	mode.cpp \
+	moving.cpp \
+	normal.cpp \
+	popup.cpp \
+	textlabelwizard.cpp \
 	textlabelwizardbase.ui \
 	typesdialog.cpp \
 	typesdialogbase.ui
diff --git a/kig/modes/base_mode.cc b/kig/modes/base_mode.cpp
index 487eaf9e..487eaf9e 100644
--- a/kig/modes/base_mode.cc
+++ b/kig/modes/base_mode.cpp
diff --git a/kig/modes/construct_mode.cc b/kig/modes/construct_mode.cpp
index e9c13364..02bb98fc 100644
--- a/kig/modes/construct_mode.cc
+++ b/kig/modes/construct_mode.cpp
@@ -381,7 +381,7 @@ void BaseConstructMode::selectObjects( const std::vector<ObjectHolder*>& os, Kig
 
 void ConstructMode::handlePrelim( const std::vector<ObjectCalcer*>& args, const TQPoint& p, KigPainter& pter, KigWidget& w )
 {
-  // set the text next to the arrow cursor like in modes/normal.cc
+  // set the text next to the arrow cursor like in modes/normal.cpp
   TQPoint textloc = p;
   textloc.setX( textloc.x() + 15 );
 
diff --git a/kig/modes/dragrectmode.cc b/kig/modes/dragrectmode.cpp
index 29b00886..29b00886 100644
--- a/kig/modes/dragrectmode.cc
+++ b/kig/modes/dragrectmode.cpp
diff --git a/kig/modes/edittype.cc b/kig/modes/edittype.cpp
index 00686392..00686392 100644
--- a/kig/modes/edittype.cc
+++ b/kig/modes/edittype.cpp
diff --git a/kig/modes/label.cc b/kig/modes/label.cpp
index 12f0d57c..12f0d57c 100644
--- a/kig/modes/label.cc
+++ b/kig/modes/label.cpp
diff --git a/kig/modes/macro.cc b/kig/modes/macro.cpp
index 8fe16b4d..8fe16b4d 100644
--- a/kig/modes/macro.cc
+++ b/kig/modes/macro.cpp
diff --git a/kig/modes/macrowizard.cc b/kig/modes/macrowizard.cpp
index c6b8f36c..c6b8f36c 100644
--- a/kig/modes/macrowizard.cc
+++ b/kig/modes/macrowizard.cpp
diff --git a/kig/modes/mode.cc b/kig/modes/mode.cpp
index dbc6f7d6..dbc6f7d6 100644
--- a/kig/modes/mode.cc
+++ b/kig/modes/mode.cpp
diff --git a/kig/modes/moving.cc b/kig/modes/moving.cpp
index 593c7077..593c7077 100644
--- a/kig/modes/moving.cc
+++ b/kig/modes/moving.cpp
diff --git a/kig/modes/normal.cc b/kig/modes/normal.cpp
index 9a30c213..9a30c213 100644
--- a/kig/modes/normal.cc
+++ b/kig/modes/normal.cpp
diff --git a/kig/modes/popup.cc b/kig/modes/popup.cpp
index 05dc5d24..05dc5d24 100644
--- a/kig/modes/popup.cc
+++ b/kig/modes/popup.cpp
diff --git a/kig/modes/textlabelwizard.cc b/kig/modes/textlabelwizard.cpp
index c92068de..c92068de 100644
--- a/kig/modes/textlabelwizard.cc
+++ b/kig/modes/textlabelwizard.cpp
diff --git a/kig/objects/CMakeLists.txt b/kig/objects/CMakeLists.txt
index 80157665..7bde2dde 100644
--- a/kig/objects/CMakeLists.txt
+++ b/kig/objects/CMakeLists.txt
@@ -17,42 +17,42 @@ link_directories(
 tde_add_library( kigobjects STATIC_PIC AUTOMOC
 
   SOURCES
-        angle_type.cc
-        arc_type.cc
-        base_type.cc
-        bogus_imp.cc
-        circle_imp.cc
-        circle_type.cc
-        polygon_type.cc
-        common.cc
-        conic_imp.cc
-        conic_types.cc
-        cubic_imp.cc
-        cubic_type.cc
-        curve_imp.cc
-        intersection_types.cc
-        inversion_type.cc
-        line_imp.cc
-        line_type.cc
-        locus_imp.cc
-        object_calcer.cc
-        object_drawer.cc
-        object_factory.cc
-        object_holder.cc
-        object_imp.cc
-        object_imp_factory.cc
-        object_type.cc
-        object_type_factory.cc
-        other_imp.cc
-        other_type.cc
-        point_imp.cc
-        point_type.cc
-        polygon_imp.cc
-        tangent_type.cc
-        centerofcurvature_type.cc
-        tests_type.cc
-        text_imp.cc
-        text_type.cc
-        transform_types.cc
-        vector_type.cc
+        angle_type.cpp
+        arc_type.cpp
+        base_type.cpp
+        bogus_imp.cpp
+        circle_imp.cpp
+        circle_type.cpp
+        polygon_type.cpp
+        common.cpp
+        conic_imp.cpp
+        conic_types.cpp
+        cubic_imp.cpp
+        cubic_type.cpp
+        curve_imp.cpp
+        intersection_types.cpp
+        inversion_type.cpp
+        line_imp.cpp
+        line_type.cpp
+        locus_imp.cpp
+        object_calcer.cpp
+        object_drawer.cpp
+        object_factory.cpp
+        object_holder.cpp
+        object_imp.cpp
+        object_imp_factory.cpp
+        object_type.cpp
+        object_type_factory.cpp
+        other_imp.cpp
+        other_type.cpp
+        point_imp.cpp
+        point_type.cpp
+        polygon_imp.cpp
+        tangent_type.cpp
+        centerofcurvature_type.cpp
+        tests_type.cpp
+        text_imp.cpp
+        text_type.cpp
+        transform_types.cpp
+        vector_type.cpp
 )
diff --git a/kig/objects/Makefile.am b/kig/objects/Makefile.am
index 21a02c6f..383fb35f 100644
--- a/kig/objects/Makefile.am
+++ b/kig/objects/Makefile.am
@@ -39,43 +39,43 @@ noinst_HEADERS=\
 	transform_types.h \
 	vector_type.h
 libobjects_la_SOURCES=\
-	angle_type.cc \
-	arc_type.cc \
-	base_type.cc \
-	bogus_imp.cc \
-	circle_imp.cc \
-	circle_type.cc \
-	polygon_type.cc \
-	common.cc \
-	conic_imp.cc \
-	conic_types.cc \
-	cubic_imp.cc \
-	cubic_type.cc \
-	curve_imp.cc \
-	intersection_types.cc \
-	inversion_type.cc \
-	line_imp.cc \
-	line_type.cc \
-	locus_imp.cc \
-	object_calcer.cc \
-	object_drawer.cc \
-	object_factory.cc \
-	object_holder.cc \
-	object_imp.cc \
-	object_imp_factory.cc \
-	object_type.cc \
-	object_type_factory.cc \
-	other_imp.cc \
-	other_type.cc \
-	point_imp.cc \
-	point_type.cc \
-	polygon_imp.cc \
-	tangent_type.cc \
-	centerofcurvature_type.cc \
-	tests_type.cc \
-	text_imp.cc \
-	text_type.cc \
-	transform_types.cc \
-	vector_type.cc
+	angle_type.cpp \
+	arc_type.cpp \
+	base_type.cpp \
+	bogus_imp.cpp \
+	circle_imp.cpp \
+	circle_type.cpp \
+	polygon_type.cpp \
+	common.cpp \
+	conic_imp.cpp \
+	conic_types.cpp \
+	cubic_imp.cpp \
+	cubic_type.cpp \
+	curve_imp.cpp \
+	intersection_types.cpp \
+	inversion_type.cpp \
+	line_imp.cpp \
+	line_type.cpp \
+	locus_imp.cpp \
+	object_calcer.cpp \
+	object_drawer.cpp \
+	object_factory.cpp \
+	object_holder.cpp \
+	object_imp.cpp \
+	object_imp_factory.cpp \
+	object_type.cpp \
+	object_type_factory.cpp \
+	other_imp.cpp \
+	other_type.cpp \
+	point_imp.cpp \
+	point_type.cpp \
+	polygon_imp.cpp \
+	tangent_type.cpp \
+	centerofcurvature_type.cpp \
+	tests_type.cpp \
+	text_imp.cpp \
+	text_type.cpp \
+	transform_types.cpp \
+	vector_type.cpp
 libobjects_la_LIBADD=-lm
 METASOURCES=AUTO
diff --git a/kig/objects/angle_type.cc b/kig/objects/angle_type.cpp
index 7b86411b..7b86411b 100644
--- a/kig/objects/angle_type.cc
+++ b/kig/objects/angle_type.cpp
diff --git a/kig/objects/arc_type.cc b/kig/objects/arc_type.cpp
index 59d38054..59d38054 100644
--- a/kig/objects/arc_type.cc
+++ b/kig/objects/arc_type.cpp
diff --git a/kig/objects/base_type.cc b/kig/objects/base_type.cpp
index 0f8eecec..0f8eecec 100644
--- a/kig/objects/base_type.cc
+++ b/kig/objects/base_type.cpp
diff --git a/kig/objects/bogus_imp.cc b/kig/objects/bogus_imp.cpp
index 76d724b1..76d724b1 100644
--- a/kig/objects/bogus_imp.cc
+++ b/kig/objects/bogus_imp.cpp
diff --git a/kig/objects/centerofcurvature_type.cc b/kig/objects/centerofcurvature_type.cpp
index 8111410f..8111410f 100644
--- a/kig/objects/centerofcurvature_type.cc
+++ b/kig/objects/centerofcurvature_type.cpp
diff --git a/kig/objects/circle_imp.cc b/kig/objects/circle_imp.cpp
index 16b3a5b7..16b3a5b7 100644
--- a/kig/objects/circle_imp.cc
+++ b/kig/objects/circle_imp.cpp
diff --git a/kig/objects/circle_type.cc b/kig/objects/circle_type.cpp
index c47677ab..c47677ab 100644
--- a/kig/objects/circle_type.cc
+++ b/kig/objects/circle_type.cpp
diff --git a/kig/objects/common.cc b/kig/objects/common.cpp
index 9932734c..9932734c 100644
--- a/kig/objects/common.cc
+++ b/kig/objects/common.cpp
diff --git a/kig/objects/conic_imp.cc b/kig/objects/conic_imp.cpp
index dcbd23fd..dcbd23fd 100644
--- a/kig/objects/conic_imp.cc
+++ b/kig/objects/conic_imp.cpp
diff --git a/kig/objects/conic_types.cc b/kig/objects/conic_types.cpp
index be94cf56..be94cf56 100644
--- a/kig/objects/conic_types.cc
+++ b/kig/objects/conic_types.cpp
diff --git a/kig/objects/cubic_imp.cc b/kig/objects/cubic_imp.cpp
index 7fb5ec63..7fb5ec63 100644
--- a/kig/objects/cubic_imp.cc
+++ b/kig/objects/cubic_imp.cpp
diff --git a/kig/objects/cubic_type.cc b/kig/objects/cubic_type.cpp
index 24bfbda4..24bfbda4 100644
--- a/kig/objects/cubic_type.cc
+++ b/kig/objects/cubic_type.cpp
diff --git a/kig/objects/curve_imp.cc b/kig/objects/curve_imp.cpp
index 315cd8cb..315cd8cb 100644
--- a/kig/objects/curve_imp.cc
+++ b/kig/objects/curve_imp.cpp
diff --git a/kig/objects/intersection_types.cc b/kig/objects/intersection_types.cpp
index 0718bc23..0718bc23 100644
--- a/kig/objects/intersection_types.cc
+++ b/kig/objects/intersection_types.cpp
diff --git a/kig/objects/inversion_type.cc b/kig/objects/inversion_type.cpp
index 4f270582..4f270582 100644
--- a/kig/objects/inversion_type.cc
+++ b/kig/objects/inversion_type.cpp
diff --git a/kig/objects/line_imp.cc b/kig/objects/line_imp.cpp
index 4223000b..4223000b 100644
--- a/kig/objects/line_imp.cc
+++ b/kig/objects/line_imp.cpp
diff --git a/kig/objects/line_type.cc b/kig/objects/line_type.cpp
index bd9a5f3e..bd9a5f3e 100644
--- a/kig/objects/line_type.cc
+++ b/kig/objects/line_type.cpp
diff --git a/kig/objects/locus_imp.cc b/kig/objects/locus_imp.cpp
index fcbfe7a7..fcbfe7a7 100644
--- a/kig/objects/locus_imp.cc
+++ b/kig/objects/locus_imp.cpp
diff --git a/kig/objects/object_calcer.cc b/kig/objects/object_calcer.cpp
index 40545ed1..40545ed1 100644
--- a/kig/objects/object_calcer.cc
+++ b/kig/objects/object_calcer.cpp
diff --git a/kig/objects/object_calcer.h b/kig/objects/object_calcer.h
index 6df94fe8..777d3af8 100644
--- a/kig/objects/object_calcer.h
+++ b/kig/objects/object_calcer.h
@@ -19,7 +19,7 @@
 #define KIG_OBJECTS_OBJECT_CALCER_H
 
 #include "common.h"
-#include "../misc/boost_intrusive_pointer.hpp"
+#include "../misc/boost_intrusive_pointer.h"
 
 class ObjectCalcer;
 
diff --git a/kig/objects/object_drawer.cc b/kig/objects/object_drawer.cpp
index d6e41144..d6e41144 100644
--- a/kig/objects/object_drawer.cc
+++ b/kig/objects/object_drawer.cpp
diff --git a/kig/objects/object_factory.cc b/kig/objects/object_factory.cpp
index f2957a7e..bf333094 100644
--- a/kig/objects/object_factory.cc
+++ b/kig/objects/object_factory.cpp
@@ -233,7 +233,7 @@ ObjectCalcer* ObjectFactory::getAttachPoint(
  * changed the preference order 2005/01/21 (now attachPoint has preference over points)
  *
  * NOTE: changes in the tests performed should be matched also in
- * modes/popup.cc (addNameLabel) and in label.cc (TextLabelModeBase::mouseMoved)
+ * modes/popup.cpp (addNameLabel) and in label.cpp (TextLabelModeBase::mouseMoved)
  */
 
   if ( p && p->imp()->attachPoint().valid() )
diff --git a/kig/objects/object_holder.cc b/kig/objects/object_holder.cpp
index cdf06396..cdf06396 100644
--- a/kig/objects/object_holder.cc
+++ b/kig/objects/object_holder.cpp
diff --git a/kig/objects/object_imp.cc b/kig/objects/object_imp.cpp
index 1f7ad798..1f7ad798 100644
--- a/kig/objects/object_imp.cc
+++ b/kig/objects/object_imp.cpp
diff --git a/kig/objects/object_imp_factory.cc b/kig/objects/object_imp_factory.cpp
index dd184295..dd184295 100644
--- a/kig/objects/object_imp_factory.cc
+++ b/kig/objects/object_imp_factory.cpp
diff --git a/kig/objects/object_type.cc b/kig/objects/object_type.cpp
index 3b2fc108..3b2fc108 100644
--- a/kig/objects/object_type.cc
+++ b/kig/objects/object_type.cpp
diff --git a/kig/objects/object_type_factory.cc b/kig/objects/object_type_factory.cpp
index a6d527ce..a6d527ce 100644
--- a/kig/objects/object_type_factory.cc
+++ b/kig/objects/object_type_factory.cpp
diff --git a/kig/objects/other_imp.cc b/kig/objects/other_imp.cpp
index 5c063753..5c063753 100644
--- a/kig/objects/other_imp.cc
+++ b/kig/objects/other_imp.cpp
diff --git a/kig/objects/other_type.cc b/kig/objects/other_type.cpp
index 27787986..27787986 100644
--- a/kig/objects/other_type.cc
+++ b/kig/objects/other_type.cpp
diff --git a/kig/objects/point_imp.cc b/kig/objects/point_imp.cpp
index 4cc4168c..4cc4168c 100644
--- a/kig/objects/point_imp.cc
+++ b/kig/objects/point_imp.cpp
diff --git a/kig/objects/point_type.cc b/kig/objects/point_type.cpp
index 59f495b9..59f495b9 100644
--- a/kig/objects/point_type.cc
+++ b/kig/objects/point_type.cpp
diff --git a/kig/objects/polygon_imp.cc b/kig/objects/polygon_imp.cpp
index 43ee16f9..43ee16f9 100644
--- a/kig/objects/polygon_imp.cc
+++ b/kig/objects/polygon_imp.cpp
diff --git a/kig/objects/polygon_type.cc b/kig/objects/polygon_type.cpp
index cd1fb544..cd1fb544 100644
--- a/kig/objects/polygon_type.cc
+++ b/kig/objects/polygon_type.cpp
diff --git a/kig/objects/special_calcers.cc b/kig/objects/special_calcers.cpp
index e70bd4e9..e70bd4e9 100644
--- a/kig/objects/special_calcers.cc
+++ b/kig/objects/special_calcers.cpp
diff --git a/kig/objects/tangent_type.cc b/kig/objects/tangent_type.cpp
index 12ebda23..12ebda23 100644
--- a/kig/objects/tangent_type.cc
+++ b/kig/objects/tangent_type.cpp
diff --git a/kig/objects/tests_type.cc b/kig/objects/tests_type.cpp
index e85c111e..e85c111e 100644
--- a/kig/objects/tests_type.cc
+++ b/kig/objects/tests_type.cpp
diff --git a/kig/objects/text_imp.cc b/kig/objects/text_imp.cpp
index 32591c16..32591c16 100644
--- a/kig/objects/text_imp.cc
+++ b/kig/objects/text_imp.cpp
diff --git a/kig/objects/text_type.cc b/kig/objects/text_type.cpp
index c82c2047..c82c2047 100644
--- a/kig/objects/text_type.cc
+++ b/kig/objects/text_type.cpp
diff --git a/kig/objects/transform_types.cc b/kig/objects/transform_types.cpp
index 3a8d32db..3a8d32db 100644
--- a/kig/objects/transform_types.cc
+++ b/kig/objects/transform_types.cpp
diff --git a/kig/objects/vector_type.cc b/kig/objects/vector_type.cpp
index d96be07b..d96be07b 100644
--- a/kig/objects/vector_type.cc
+++ b/kig/objects/vector_type.cpp
diff --git a/kig/scripting/CMakeLists.txt b/kig/scripting/CMakeLists.txt
index ab158e89..ab53fef7 100644
--- a/kig/scripting/CMakeLists.txt
+++ b/kig/scripting/CMakeLists.txt
@@ -20,11 +20,11 @@ tde_add_library( kigscripting STATIC_PIC AUTOMOC
 
   SOURCES
         newscriptwizardbase.ui
-        python_type.cc
-        python_scripter.cc
-        script-common.cc
-        script_mode.cc
-        newscriptwizard.cc
+        python_type.cpp
+        python_scripter.cpp
+        script-common.cpp
+        script_mode.cpp
+        newscriptwizard.cpp
    LINK
       katepartinterfaces
       tdetexteditor-shared
diff --git a/kig/scripting/Makefile.am b/kig/scripting/Makefile.am
index c007a612..7f66791a 100644
--- a/kig/scripting/Makefile.am
+++ b/kig/scripting/Makefile.am
@@ -8,12 +8,12 @@ noinst_HEADERS = \
 	script_mode.h \
 	newscriptwizard.h
 libscripting_la_SOURCES = \
-	python_type.cc \
-	python_scripter.cc \
-	script-common.cc \
-	script_mode.cc \
+	python_type.cpp \
+	python_scripter.cpp \
+	script-common.cpp \
+	script_mode.cpp \
 	newscriptwizardbase.ui \
-	newscriptwizard.cc
+	newscriptwizard.cpp
 libscripting_la_LIBADD = $(BOOST_PYTHON_LIBS) $(PYTHON_LIBS) -lkatepartinterfaces
 libscripting_la_LDFLAGS = $(all_libraries) $(PYTHON_LDFLAGS)
 METASOURCES=AUTO
diff --git a/kig/scripting/newscriptwizard.cc b/kig/scripting/newscriptwizard.cpp
index 9cb4d9e2..9cb4d9e2 100644
--- a/kig/scripting/newscriptwizard.cc
+++ b/kig/scripting/newscriptwizard.cpp
diff --git a/kig/scripting/python_scripter.cc b/kig/scripting/python_scripter.cpp
index 00c7e162..00c7e162 100644
--- a/kig/scripting/python_scripter.cc
+++ b/kig/scripting/python_scripter.cpp
diff --git a/kig/scripting/python_type.cc b/kig/scripting/python_type.cpp
index cc5a00ea..cc5a00ea 100644
--- a/kig/scripting/python_type.cc
+++ b/kig/scripting/python_type.cpp
diff --git a/kig/scripting/script-common.cc b/kig/scripting/script-common.cpp
index e2c15786..e2c15786 100644
--- a/kig/scripting/script-common.cc
+++ b/kig/scripting/script-common.cpp
diff --git a/kig/scripting/script_mode.cc b/kig/scripting/script_mode.cpp
index 1fd88405..1fd88405 100644
--- a/kig/scripting/script_mode.cc
+++ b/kig/scripting/script_mode.cpp
diff --git a/kmplot/kmplot/Makefile.am b/kmplot/kmplot/Makefile.am
index 4d971fbd..c845aecc 100644
--- a/kmplot/kmplot/Makefile.am
+++ b/kmplot/kmplot/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 
 messages: rc.cpp
 	$(EXTRACTRC) *.ui >> rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kmplot.pot; \
 	fi
diff --git a/kpercentage/kpercentage/Makefile.am b/kpercentage/kpercentage/Makefile.am
index 6eefc6cc..2b919e79 100644
--- a/kpercentage/kpercentage/Makefile.am
+++ b/kpercentage/kpercentage/Makefile.am
@@ -42,7 +42,7 @@ stringstocpp:
 
 
 messages: stringstocpp rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kpercentage.pot; \
 	fi
diff --git a/kverbos/kverbos/Makefile.am b/kverbos/kverbos/Makefile.am
index 88dd731f..a6b79650 100644
--- a/kverbos/kverbos/Makefile.am
+++ b/kverbos/kverbos/Makefile.am
@@ -25,7 +25,7 @@ rcdir = $(kde_datadir)/kverbos
 rc_DATA = kverbosui.rc
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kverbos.pot; \
 	fi
diff --git a/kwordquiz/src/Makefile.am b/kwordquiz/src/Makefile.am
index 131e89a7..b8d820f1 100644
--- a/kwordquiz/src/Makefile.am
+++ b/kwordquiz/src/Makefile.am
@@ -58,7 +58,7 @@ rc_DATA = kwordquizui.rc eventsrc
 xdg_apps_DATA = kwordquiz.desktop
 
 messages: rc.cpp
-	LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
+	LIST=`find . -name \*.h -o -name \*.cpp`; \
 	if test -n "$$LIST"; then \
 	 $(XGETTEXT) $$LIST -o $(podir)/kwordquiz.pot; \
 	fi
diff --git a/libtdeedu/Makefile.am b/libtdeedu/Makefile.am
index 5eeda1f1..cf639a19 100644
--- a/libtdeedu/Makefile.am
+++ b/libtdeedu/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = tdeeducore tdeeduui tdeeduplot extdate
 
 messages:
-	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/libtdeedu.pot 
+	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/libtdeedu.pot 
 
 include ../admin/Doxyfile.am
diff --git a/libtdeedu/extdate/CMakeLists.txt b/libtdeedu/extdate/CMakeLists.txt
index 8bc22f35..0da1b9b9 100644
--- a/libtdeedu/extdate/CMakeLists.txt
+++ b/libtdeedu/extdate/CMakeLists.txt
@@ -39,7 +39,7 @@ tde_add_library( extdate SHARED AUTOMOC
 tde_add_check_executable( test_extdate AUTOMOC
 
   SOURCES
-        test_extdate.cc
+        test_extdate.cpp
   LINK
      tdecore-shared
      tdeui-shared
diff --git a/libtdeedu/extdate/Makefile.am b/libtdeedu/extdate/Makefile.am
index e9fe3c61..a06b2eca 100644
--- a/libtdeedu/extdate/Makefile.am
+++ b/libtdeedu/extdate/Makefile.am
@@ -9,7 +9,7 @@ libextdate_la_SOURCES = extdatetime.cpp extcalendarsystem.cpp extcalendarsystemg
 libextdate_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
 libextdate_la_LIBADD = $(LIB_TDEUI) $(LIB_QT) $(LIB_TDECORE)
 
-test_extdate_SOURCES = test_extdate.cc
+test_extdate_SOURCES = test_extdate.cpp
 test_extdate_LDADD = libextdate.la
 test_extdate_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor
 
diff --git a/libtdeedu/extdate/test_extdate.cc b/libtdeedu/extdate/test_extdate.cpp
index d70d3e94..d70d3e94 100644
--- a/libtdeedu/extdate/test_extdate.cc
+++ b/libtdeedu/extdate/test_extdate.cpp