Renaming of files in preparation for code style tools.

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

144 files changed, 199 insertions, 206 deletions

diff --git a/Makefile.am.in b/Makefile.am.in
index 94e20cf66..9dcc14524 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -51,7 +51,6 @@ messages:
 	fgrep -v "/tests" dirs > dirs.new && mv dirs.new dirs ;\
 	dirs=`cat dirs` ;\
 	find $$dirs -maxdepth 1 -name "*.cpp" -print > files ;\
-	find $$dirs -maxdepth 1 -name "*.cc" -print >> files ;\
 	find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
 	echo ./tdecore/tde-config.cpp.in >> files ;\
 	$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
diff --git a/arts/kde/CMakeLists.txt b/arts/kde/CMakeLists.txt
index 091be3526..211a76924 100644
--- a/arts/kde/CMakeLists.txt
+++ b/arts/kde/CMakeLists.txt
@@ -43,15 +43,15 @@ install( FILES
 set( target artskde )
 
 set( ${target}_SRCS
-  artskde.cc kioinputstream_impl.cpp kplayobject.cc
-  kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc
+  artskde.cpp kioinputstream_impl.cpp kplayobject.cpp
+  kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp
   kaudiorecordstream.cpp kaudioplaystream.cpp kartsserver.cpp
-  kdatarequest_impl.cpp kaudioconverter.cc kvideowidget.cpp
-  kplayobjectcreator.cc kaudiomanagerplay.cpp
+  kdatarequest_impl.cpp kaudioconverter.cpp kvideowidget.cpp
+  kplayobjectcreator.cpp kaudiomanagerplay.cpp
 )
 
 add_custom_command(
-  OUTPUT artskde.cc artskde.h
+  OUTPUT artskde.cpp artskde.h
   COMMAND ${ARTS_MCOPIDL_EXECUTABLE}
     -I${ARTS_INCLUDEDIR} ${CMAKE_CURRENT_SOURCE_DIR}/artskde.idl
   DEPENDS artskde.idl
diff --git a/arts/kde/Makefile.am b/arts/kde/Makefile.am
index 37a86f2ad..394b0a32a 100644
--- a/arts/kde/Makefile.am
+++ b/arts/kde/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES = -I$(top_builddir)/arts/kde \
            -I$(top_srcdir) -I$(includedir)/arts $(all_includes)
 
 lib_LTLIBRARIES = libartskde.la
-libartskde_la_SOURCES = artskde.cc kioinputstream_impl.cpp kplayobject.cc \
-                        kplayobjectfactory.cc kartsfloatwatch.cpp kartsdispatcher.cc \
+libartskde_la_SOURCES = artskde.cpp kioinputstream_impl.cpp kplayobject.cpp \
+                        kplayobjectfactory.cpp kartsfloatwatch.cpp kartsdispatcher.cpp \
                         kaudiorecordstream.cpp kaudioplaystream.cpp \
-                        kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cc \
-                        kvideowidget.cpp kplayobjectcreator.cc \
+                        kartsserver.cpp kdatarequest_impl.cpp kaudioconverter.cpp \
+                        kvideowidget.cpp kplayobjectcreator.cpp \
                         kaudiomanagerplay.cpp
 libartskde_la_LIBADD = $(LIB_TDEIO) -lqtmcop -lsoundserver_idl -lartsflow_idl -lmcop $(LIB_TQT) $(LIB_TDECORE) -lkmedia2_idl -lartsflow $(LIB_TDEUI) $(LIB_X11)
 libartskde_la_LDFLAGS = $(all_libraries) -no-undefined -version-info 3:0:2
@@ -23,15 +23,15 @@ noinst_HEADERS = kplayobjectcreator.h kplayobjectfactory_p.h
 artskde.mcoptype: artskde.h
 artskde.mcopclass: artskde.h
 MCOPINC = -I$(srcdir)
-artskde.cc artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL)
+artskde.cpp artskde.h: $(top_srcdir)/arts/kde/artskde.idl $(MCOPIDL)
 	     $(MCOPIDL) -I$(includedir)/arts -t $(MCOPINC) $(top_srcdir)/arts/kde/artskde.idl
 
-DISTCLEANFILES = artskde.cc artskde.h artskde.mcoptype artskde.mcopclass
+DISTCLEANFILES = artskde.cpp artskde.h artskde.mcoptype artskde.mcopclass
 
 check_PROGRAMS = kiotest kiotestslow kconverttest
-kiotest_SOURCES = kiotest.cc
-kiotestslow_SOURCES = kiotestslow.cc
-kconverttest_SOURCES = kconverttest.cc
+kiotest_SOURCES = kiotest.cpp
+kiotestslow_SOURCES = kiotestslow.cpp
+kconverttest_SOURCES = kconverttest.cpp
 
 kiotest_LDADD = libartskde.la -lqtmcop -lkmedia2 -lsoundserver_idl
 kiotestslow_LDADD = $(kiotest_LDADD)
diff --git a/arts/kde/kartsdispatcher.cc b/arts/kde/kartsdispatcher.cpp
index fa41502f8..fa41502f8 100644
--- a/arts/kde/kartsdispatcher.cc
+++ b/arts/kde/kartsdispatcher.cpp
diff --git a/arts/kde/kaudioconverter.cc b/arts/kde/kaudioconverter.cpp
index 1eb8c20e5..1eb8c20e5 100644
--- a/arts/kde/kaudioconverter.cc
+++ b/arts/kde/kaudioconverter.cpp
diff --git a/arts/kde/kconverttest.cc b/arts/kde/kconverttest.cpp
index 647c2f320..647c2f320 100644
--- a/arts/kde/kconverttest.cc
+++ b/arts/kde/kconverttest.cpp
diff --git a/arts/kde/kiotest.cc b/arts/kde/kiotest.cpp
index ed9a3fadf..ed9a3fadf 100644
--- a/arts/kde/kiotest.cc
+++ b/arts/kde/kiotest.cpp
diff --git a/arts/kde/kiotestslow.cc b/arts/kde/kiotestslow.cpp
index 93bfac388..93bfac388 100644
--- a/arts/kde/kiotestslow.cc
+++ b/arts/kde/kiotestslow.cpp
diff --git a/arts/kde/kplayobject.cc b/arts/kde/kplayobject.cpp
index f11c0eb8f..f11c0eb8f 100644
--- a/arts/kde/kplayobject.cc
+++ b/arts/kde/kplayobject.cpp
diff --git a/arts/kde/kplayobjectcreator.cc b/arts/kde/kplayobjectcreator.cpp
index 039c8a3bc..039c8a3bc 100644
--- a/arts/kde/kplayobjectcreator.cc
+++ b/arts/kde/kplayobjectcreator.cpp
diff --git a/arts/kde/kplayobjectfactory.cc b/arts/kde/kplayobjectfactory.cpp
index 708fe516e..708fe516e 100644
--- a/arts/kde/kplayobjectfactory.cc
+++ b/arts/kde/kplayobjectfactory.cpp
diff --git a/arts/message/CMakeLists.txt b/arts/message/CMakeLists.txt
index 12e91f65e..0a9be01cb 100644
--- a/arts/message/CMakeLists.txt
+++ b/arts/message/CMakeLists.txt
@@ -26,7 +26,7 @@ link_directories(
 set( target artsmessage )
 
 set( ${target}_SRCS
-  artsmessage.cc
+  artsmessage.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/arts/message/Makefile.am b/arts/message/Makefile.am
index 24b7a6d18..363d561df 100644
--- a/arts/message/Makefile.am
+++ b/arts/message/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(all_includes)
 
 bin_PROGRAMS = artsmessage
 
-artsmessage_SOURCES = artsmessage.cc
+artsmessage_SOURCES = artsmessage.cpp
 
 artsmessage_LDADD = ../../tdeui/libtdeui.la
 artsmessage_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(KDE_MT_LDFLAGS)
diff --git a/arts/message/artsmessage.cc b/arts/message/artsmessage.cpp
index eaa5c8e2c..eaa5c8e2c 100644
--- a/arts/message/artsmessage.cc
+++ b/arts/message/artsmessage.cpp
diff --git a/dcop/dcopidl/CMakeLists.txt b/dcop/dcopidl/CMakeLists.txt
index f3a8c5049..989a959be 100644
--- a/dcop/dcopidl/CMakeLists.txt
+++ b/dcop/dcopidl/CMakeLists.txt
@@ -24,7 +24,7 @@ link_directories(
 set( target dcopidl )
 
 set( ${target}_SRCS
-  main.cpp yacc.cc scanner.cc
+  main.cpp yacc.cpp scanner.cpp
 )
 
 tde_add_executable( ${target}
diff --git a/dcop/dcopidl/Makefile.am b/dcop/dcopidl/Makefile.am
index d896a4a34..7b071dd6a 100644
--- a/dcop/dcopidl/Makefile.am
+++ b/dcop/dcopidl/Makefile.am
@@ -7,8 +7,8 @@ AM_CPPFLAGS = -DYYDEBUG
 
 bin_PROGRAMS = dcopidl
 
-dcopidl_SOURCES = main.cpp yacc.cc scanner.cc
-noinst_HEADERS = yacc.cc.h
+dcopidl_SOURCES = main.cpp yacc.cpp scanner.cpp
+noinst_HEADERS = yacc.cpp.h
 
 dcopidl_LDADD = $(LIB_TQT)
 dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
@@ -16,12 +16,12 @@ dcopidl_LDFLAGS = $(KDE_RPATH) $(AM_LDFLAGS)
 ####### Build rules
 
 parser:
-	cd $(srcdir) && flex -B -8 -oscanner.cc scanner.ll  ;\
-	bison -t -d -v -o yacc.cc yacc.yy && mv yacc.hh yacc.cc.h
+	cd $(srcdir) && flex -B -8 -oscanner.cpp scanner.ll  ;\
+	bison -t -d -v -o yacc.cpp yacc.yy && mv yacc.hh yacc.cpp.h
 
 check-local: 
 	$(srcdir)/run_test.sh $(srcdir)
 
 EXTRA_DIST = dcopidl_test.h scanner.ll yacc.yy
 
-MAINTAINERCLEANFILES = yacc.cc.output
+MAINTAINERCLEANFILES = yacc.cpp.output
diff --git a/dcop/dcopidl/scanner.cc b/dcop/dcopidl/scanner.cpp
index 55a20aba3..4ff8d1ac3 100644
--- a/dcop/dcopidl/scanner.cc
+++ b/dcop/dcopidl/scanner.cpp
@@ -1,6 +1,6 @@
-#line 2 "scanner.cc"
+#line 2 "scanner.cpp"
 
-#line 4 "scanner.cc"
+#line 4 "scanner.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -940,7 +940,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
@@ -1026,7 +1026,7 @@ static char translate_char( const char *s )
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
 /*--------------------------------------------------------------------------*/
-#line 1030 "scanner.cc"
+#line 1030 "scanner.cpp"
 
 #define INITIAL 0
 
@@ -1216,7 +1216,7 @@ YY_DECL
 #line 148 "scanner.ll"
 
 
-#line 1220 "scanner.cc"
+#line 1220 "scanner.cpp"
 
 	if ( !(yy_init) )
 		{
@@ -1767,7 +1767,7 @@ YY_RULE_SETUP
 #line 288 "scanner.ll"
 ECHO;
 	YY_BREAK
-#line 1771 "scanner.cc"
+#line 1771 "scanner.cpp"
 			case YY_STATE_EOF(INITIAL):
 				yyterminate();
 
diff --git a/dcop/dcopidl/scanner.ll b/dcop/dcopidl/scanner.ll
index ad0f564e9..302da3e14 100644
--- a/dcop/dcopidl/scanner.ll
+++ b/dcop/dcopidl/scanner.ll
@@ -29,7 +29,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 class TQString;
 
 #ifndef KDE_USE_FINAL
-#include "yacc.cc.h"
+#include "yacc.cpp.h"
 #endif
 
 extern int idl_line_no;
diff --git a/dcop/dcopidl/yacc.cc b/dcop/dcopidl/yacc.cpp
index 615af46ef..4be32edd0 100644
--- a/dcop/dcopidl/yacc.cc
+++ b/dcop/dcopidl/yacc.cpp
@@ -134,7 +134,7 @@ void yyerror( const char *s )
 
 
 /* Line 189 of yacc.c  */
-#line 138 "yacc.cc"
+#line 138 "yacc.cpp"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -245,7 +245,7 @@ typedef union YYSTYPE
 
 
 /* Line 214 of yacc.c  */
-#line 249 "yacc.cc"
+#line 249 "yacc.cpp"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -257,7 +257,7 @@ typedef union YYSTYPE
 
 
 /* Line 264 of yacc.c  */
-#line 261 "yacc.cc"
+#line 261 "yacc.cpp"
 
 #ifdef short
 # undef short
@@ -3167,7 +3167,7 @@ yyreduce:
 
 
 /* Line 1455 of yacc.c  */
-#line 3171 "yacc.cc"
+#line 3171 "yacc.cpp"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
diff --git a/dcop/dcopidl/yacc.cc.h b/dcop/dcopidl/yacc.cpp.h
index 2a6c1b403..2a6c1b403 100644
--- a/dcop/dcopidl/yacc.cc.h
+++ b/dcop/dcopidl/yacc.cpp.h
diff --git a/doc/common/Doxyfile.global b/doc/common/Doxyfile.global
index 67abce073..f7d85dcc7 100644
--- a/doc/common/Doxyfile.global
+++ b/doc/common/Doxyfile.global
@@ -46,13 +46,7 @@ WARN_LOGFILE           =
 INPUT                  = 
 FILE_PATTERNS          = *.h \
                          *.cpp \
-                         *.cc \
-                         *.hpp \
-                         *.dox \
-                         *.c++ \
-                         *.cxx \
-                         *.h++ \
-                         *.hh
+                         *.dox
 RECURSIVE              = YES
 EXCLUDE                = 
 EXCLUDE_SYMLINKS       = NO
diff --git a/interfaces/terminal/test/Makefile.am b/interfaces/terminal/test/Makefile.am
index 03a04301b..414159af1 100644
--- a/interfaces/terminal/test/Makefile.am
+++ b/interfaces/terminal/test/Makefile.am
@@ -1,6 +1,6 @@
 INCLUDES=$(all_includes)
 check_PROGRAMS=test
-test_SOURCES=main.cc
+test_SOURCES=main.cpp
 test_LDADD=$(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio
 test_LDFLAGS=$(all_libraries)
 METASOURCES=AUTO
diff --git a/interfaces/terminal/test/main.cc b/interfaces/terminal/test/main.cpp
index 8130f85d6..8130f85d6 100644
--- a/interfaces/terminal/test/main.cc
+++ b/interfaces/terminal/test/main.cpp
diff --git a/kab/CMakeLists.txt b/kab/CMakeLists.txt
index 76c781467..a4e881466 100644
--- a/kab/CMakeLists.txt
+++ b/kab/CMakeLists.txt
@@ -27,7 +27,7 @@ link_directories(
 set( target kab )
 
 set( ${target}_SRCS
-  kabapi.cc addressbook.cc qconfigDB.cc
+  kabapi.cpp addressbook.cpp qconfigDB.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/kab/ChangeLog b/kab/ChangeLog
index d3e36fcc1..51715a70d 100644
--- a/kab/ChangeLog
+++ b/kab/ChangeLog
@@ -11,7 +11,7 @@ Tue Dec 22 22:56:58 1998  Mirko Boehm  <mirko@kde.org>
 	* businesscard.h (class BusinessCard): Hopefully remove
 	trigraph.
 
-	* datepickerdialog.cc (DateLabel): Removed default value
+	* datepickerdialog.cpp (DateLabel): Removed default value
 	in the implementation.
 
 	* keyvaluemap.h: Removed a default value for a function
diff --git a/kab/Makefile.am b/kab/Makefile.am
index 89e1aab8e..66018aed5 100644
--- a/kab/Makefile.am
+++ b/kab/Makefile.am
@@ -5,9 +5,9 @@ KABVERSION=	4.0.0
 KABPATCH=	0
 
 libkab_la_SOURCES	= \
-	kabapi.cc \
-	addressbook.cc \
-	qconfigDB.cc 
+	kabapi.cpp \
+	addressbook.cpp \
+	qconfigDB.cpp 
 
 libkab_la_LDFLAGS = $(KDE_MT_LDFLAGS) -no-undefined
 libkab_la_LIBADD = ../tdeui/libtdeui.la
diff --git a/kab/addressbook.cc b/kab/addressbook.cpp
index 017621ac7..017621ac7 100644
--- a/kab/addressbook.cc
+++ b/kab/addressbook.cpp
diff --git a/kab/kabapi.cc b/kab/kabapi.cpp
index 62a50f162..62a50f162 100644
--- a/kab/kabapi.cc
+++ b/kab/kabapi.cpp
diff --git a/kab/qconfigDB.cc b/kab/qconfigDB.cpp
index dc77a1e1b..dc77a1e1b 100644
--- a/kab/qconfigDB.cc
+++ b/kab/qconfigDB.cpp
diff --git a/libtdemid/CMakeLists.txt b/libtdemid/CMakeLists.txt
index 21338aac1..0cfce2c70 100644
--- a/libtdemid/CMakeLists.txt
+++ b/libtdemid/CMakeLists.txt
@@ -37,10 +37,10 @@ install( FILES
 set( target tdemid )
 
 set( ${target}_SRCS
-  midiout.cc player.cc track.cc midimapper.cc
-  midfile.cc dattypes.cc midistat.cc deviceman.cc
-  synthout.cc fmout.cc gusout.cc alsaout.cc voiceman.cc
-  mt32togm.cc notearray.cc libtdemid.cc
+  midiout.cpp player.cpp track.cpp midimapper.cpp
+  midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp
+  synthout.cpp fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp
+  mt32togm.cpp notearray.cpp libtdemid.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/libtdemid/Makefile.am b/libtdemid/Makefile.am
index 8cb347b01..2c1baf726 100644
--- a/libtdemid/Makefile.am
+++ b/libtdemid/Makefile.am
@@ -12,10 +12,10 @@ libtdemidinclude_HEADERS = midiout.h player.h track.h midimapper.h \
 	midispec.h libtdemid.h
 
 lib_LTLIBRARIES = libtdemid.la
-libtdemid_la_SOURCES  = midiout.cc player.cc track.cc midimapper.cc \
-	midfile.cc dattypes.cc midistat.cc deviceman.cc synthout.cc \
-	fmout.cc gusout.cc alsaout.cc voiceman.cc mt32togm.cc notearray.cc \
-	libtdemid.cc
+libtdemid_la_SOURCES  = midiout.cpp player.cpp track.cpp midimapper.cpp \
+	midfile.cpp dattypes.cpp midistat.cpp deviceman.cpp synthout.cpp \
+	fmout.cpp gusout.cpp alsaout.cpp voiceman.cpp mt32togm.cpp notearray.cpp \
+	libtdemid.cpp
 
 libtdemid_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
 libtdemid_la_LIBADD = $(LIBASOUND) ../tdecore/libtdecore.la $(LIB_TQT)
diff --git a/libtdemid/alsaout.cc b/libtdemid/alsaout.cpp
index 517852b25..2e1b769f4 100644
--- a/libtdemid/alsaout.cc
+++ b/libtdemid/alsaout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    alsaout.cc   - class AlsaOut which represents an alsa client/port pair
+    alsaout.cpp   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/alsaout.h b/libtdemid/alsaout.h
index 016ca29c6..4dace44ce 100644
--- a/libtdemid/alsaout.h
+++ b/libtdemid/alsaout.h
@@ -1,4 +1,4 @@
-/*  alsaout.cc   - class AlsaOut which represents an alsa client/port pair
+/*  alsaout.cpp   - class AlsaOut which represents an alsa client/port pair
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/dattypes.cc b/libtdemid/dattypes.cpp
index 218591fa4..7ae0aba52 100644
--- a/libtdemid/dattypes.cc
+++ b/libtdemid/dattypes.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  
-    dattypes.cc  - Some always useful definitions and functions
+    dattypes.cpp  - Some always useful definitions and functions
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/deviceman.cc b/libtdemid/deviceman.cpp
index 82f973d3f..18bb9fcc2 100644
--- a/libtdemid/deviceman.cc
+++ b/libtdemid/deviceman.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    deviceman.cc  - The device manager, that hides the use of midiOut
+    deviceman.cpp  - The device manager, that hides the use of midiOut
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/fmout.cc b/libtdemid/fmout.cpp
index 72b3198c9..eb069e51c 100644
--- a/libtdemid/fmout.cc
+++ b/libtdemid/fmout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    fmout.cc   - class fmOut which handles the /dev/sequencer device
+    fmout.cpp   - class fmOut which handles the /dev/sequencer device
 			for fm synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/gusout.cc b/libtdemid/gusout.cpp
index 69aae3927..96c9fb915 100644
--- a/libtdemid/gusout.cc
+++ b/libtdemid/gusout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    gusout.cc  - class GUSOut which implements support for Gravis
+    gusout.cpp  - class GUSOut which implements support for Gravis
          Ultrasound cards through a /dev/sequencer device
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/libtdemid.cc b/libtdemid/libtdemid.cpp
index 04a0dac0d..fcc75d3e5 100644
--- a/libtdemid/libtdemid.cc
+++ b/libtdemid/libtdemid.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
  
-    libtdemid.cc  - class KMidSimpleAPI that makes it easy to use libtdemid
+    libtdemid.cpp  - class KMidSimpleAPI that makes it easy to use libtdemid
                         and a C wrapper.
     This file is part of LibKMid 0.9.5
     Copyright (C) 2000  Antonio Larrosa Jimenez
diff --git a/libtdemid/midfile.cc b/libtdemid/midfile.cpp
index f8222b3f8..bfeb056f0 100644
--- a/libtdemid/midfile.cc
+++ b/libtdemid/midfile.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midfile.cc - function which reads a midi file,and creates the track classes
+    midfile.cpp - function which reads a midi file,and creates the track classes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midimapper.cc b/libtdemid/midimapper.cpp
index 837728410..157ef864f 100644
--- a/libtdemid/midimapper.cc
+++ b/libtdemid/midimapper.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midimapper.cc  - The midi mapper object  
+    midimapper.cpp  - The midi mapper object  
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/midiout.cc b/libtdemid/midiout.cpp
index 24a209cce..c4949b03c 100644
--- a/libtdemid/midiout.cc
+++ b/libtdemid/midiout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midiout.cc   - class midiOut which handles external midi devices
+    midiout.cpp   - class midiOut which handles external midi devices
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/midistat.cc b/libtdemid/midistat.cpp
index 6a6c94b0c..7bd02c95a 100644
--- a/libtdemid/midistat.cc
+++ b/libtdemid/midistat.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    midistat.cc	- class MidiStatus, change it internally and then send it. 
+    midistat.cpp	- class MidiStatus, change it internally and then send it. 
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/mt32togm.cc b/libtdemid/mt32togm.cpp
index a59eb959c..a59eb959c 100644
--- a/libtdemid/mt32togm.cc
+++ b/libtdemid/mt32togm.cpp
diff --git a/libtdemid/notearray.cc b/libtdemid/notearray.cpp
index 9899fd837..d08a5b074 100644
--- a/libtdemid/notearray.cc
+++ b/libtdemid/notearray.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    notearray.cc  - NoteArray class, which holds an array of notes
+    notearray.cpp  - NoteArray class, which holds an array of notes
     This file is part of LibKMid 0.9.5
     Copyright (C) 1998,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/player.cc b/libtdemid/player.cpp
index ff7093496..1596d46f4 100644
--- a/libtdemid/player.cc
+++ b/libtdemid/player.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    player.cc  - class MidiPlayer. Plays a set of tracks
+    player.cpp  - class MidiPlayer. Plays a set of tracks
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html            
diff --git a/libtdemid/synthout.cc b/libtdemid/synthout.cpp
index 6d7ef47a1..6d06e17f2 100644
--- a/libtdemid/synthout.cc
+++ b/libtdemid/synthout.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    synthout.cc   - class synthOut which handles the /dev/sequencer device
+    synthout.cpp   - class synthOut which handles the /dev/sequencer device
 			for synths (as AWE32)
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98  Antonio Larrosa Jimenez and P.J.Leonard
diff --git a/libtdemid/tests/Makefile.am b/libtdemid/tests/Makefile.am
index a00018c62..d70e61547 100644
--- a/libtdemid/tests/Makefile.am
+++ b/libtdemid/tests/Makefile.am
@@ -6,9 +6,9 @@ noinst_PROGRAMS = ctest apitest notesoff
 ctest_SOURCES = ctest.c
 ctest_LDADD = ../libtdemid.la
 
-apitest_SOURCES = apitest.cc
+apitest_SOURCES = apitest.cpp
 apitest_LDADD = ../libtdemid.la
 
-notesoff_SOURCES = notesoff.cc
+notesoff_SOURCES = notesoff.cpp
 notesoff_LDADD = ../libtdemid.la
 
diff --git a/libtdemid/tests/apitest.cc b/libtdemid/tests/apitest.cpp
index 7f370331e..7f370331e 100644
--- a/libtdemid/tests/apitest.cc
+++ b/libtdemid/tests/apitest.cpp
diff --git a/libtdemid/tests/notesoff.cc b/libtdemid/tests/notesoff.cpp
index 15e00bd6c..15e00bd6c 100644
--- a/libtdemid/tests/notesoff.cc
+++ b/libtdemid/tests/notesoff.cpp
diff --git a/libtdemid/track.cc b/libtdemid/track.cpp
index c7c858919..44375b637 100644
--- a/libtdemid/track.cc
+++ b/libtdemid/track.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    track.cc  - class track, which has a midi file track and its events
+    track.cpp  - class track, which has a midi file track and its events
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/libtdemid/voiceman.cc b/libtdemid/voiceman.cpp
index 867ee6024..fddf68f0e 100644
--- a/libtdemid/voiceman.cc
+++ b/libtdemid/voiceman.cpp
@@ -1,6 +1,6 @@
 /**************************************************************************
 
-    voiceman.cc - The VoiceManager class handles a set of voices for synths
+    voiceman.cpp - The VoiceManager class handles a set of voices for synths
     This file is part of LibKMid 0.9.5
     Copyright (C) 1997,98,99,2000  Antonio Larrosa Jimenez
     LibKMid's homepage : http://www.arrakis.es/~rlarrosa/libtdemid.html
diff --git a/tdecert/CMakeLists.txt b/tdecert/CMakeLists.txt
index 75f354c99..3c616fde9 100644
--- a/tdecert/CMakeLists.txt
+++ b/tdecert/CMakeLists.txt
@@ -44,7 +44,7 @@ install( FILES tdecertpart.rc DESTINATION ${DATA_INSTALL_DIR}/tdecertpart )
 set( target libtdecertpart )
 
 set( ${target}_SRCS
-  tdecertpart.cc
+  tdecertpart.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdecert/Makefile.am b/tdecert/Makefile.am
index a98232be6..ebd06ce23 100644
--- a/tdecert/Makefile.am
+++ b/tdecert/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES= -I$(top_srcdir)/tdeio/kssl -I$(top_builddir)/tdeio/kssl -I$(top_srcdir
 
 kde_module_LTLIBRARIES = libtdecertpart.la
 
-libtdecertpart_la_SOURCES	= tdecertpart.cc
+libtdecertpart_la_SOURCES	= tdecertpart.cpp
 
 libtdecertpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
 libtdecertpart_la_LIBADD = $(LIB_TDEPARTS) $(LIB_TQT) $(LIB_TDEUI) $(LIB_TDEFILE) $(LIB_TDECORE)
diff --git a/tdecert/tdecertpart.cc b/tdecert/tdecertpart.cpp
index 02afc9b75..02afc9b75 100644
--- a/tdecert/tdecertpart.cc
+++ b/tdecert/tdecertpart.cpp
diff --git a/tdecore/tdeglobalsettings.h b/tdecore/tdeglobalsettings.h
index 74b0d77a8..7a359b60e 100644
--- a/tdecore/tdeglobalsettings.h
+++ b/tdecore/tdeglobalsettings.h
@@ -238,7 +238,7 @@ class TDECORE_EXPORT TDEGlobalSettings
      * Use TDEIO::trash() to trash files, "trash:/" to list the trash contents.
      */
     static TQString trashPath() { initPaths(); return *s_trashPath; }
-    // KDE4: if you want to remove the above, move it to kdesktop/init.cc, which needs
+    // KDE4: if you want to remove the above, move it to kdesktop/init.cpp, which needs
     // to know the old location of the trash
 
     /**
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp
index 0f57dd97c..081fdad55 100644
--- a/tdecore/tests/kurltest.cpp
+++ b/tdecore/tests/kurltest.cpp
@@ -271,14 +271,14 @@ int main(int argc, char *argv[])
 
 #if 0
 // This URL is broken, '#' should be escaped.
-  u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#";
+  u1 = "file:/home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#";
   url1 = u1;
-  check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#");
+  check("KURL::url()", url1.url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#");
   check("KURL::hasRef()", url1.hasRef() ? "yes" : "no", "no");
   check("KURL::hasHTMLRef()", url1.hasHTMLRef() ? "yes" : "no", "no");
   check("KURL::htmlRef()", url1.htmlRef(), "");
   check("KURL::hasSubURL()", url1.hasSubURL() ? "yes" : "no", "yes");
-  check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cc#");
+  check("KURL::prettyURL()", url1.upURL().url(), "file:///home/dfaure/cdrdao-1.1.5/dao/#CdrDriver.cpp#");
 #endif
 
   u1 = "file:/home/dfaure/my%20tar%20file.tgz#gzip:/#tar:/README";
@@ -382,7 +382,7 @@ int main(int argc, char *argv[])
   check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myfile.txt");
   u2.setFileName( "myotherfile.txt" );
   check("KURL::setFileName()", u2.url(), "file:///home/dfaure/myotherfile.txt");
-  // more tricky, renaming a directory (kpropsdlg.cc, line ~ 238)
+  // more tricky, renaming a directory (kpropsdlg.cpp, line ~ 238)
       TQString tmpurl = "file:/home/dfaure/myolddir/";
       if ( tmpurl.at(tmpurl.length() - 1) == '/')
           // It's a directory, so strip the trailing slash first
diff --git a/tdehtml/CMakeLists.txt b/tdehtml/CMakeLists.txt
index aaf3074d3..187eff352 100644
--- a/tdehtml/CMakeLists.txt
+++ b/tdehtml/CMakeLists.txt
@@ -73,8 +73,8 @@ set( target tdehtml )
 
 set( ${target}_SRCS
   tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp
-  tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp
-  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cc
+  tdehtml_factory.cpp tdehtml_settings.cpp tdehtml_events.cpp
+  tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.cpp
   tdehtml_printsettings.cpp tdehtmlimage.cpp kjserrordlg.ui
   htmlpageinfo.ui tdehtml_iface.skel
 )
diff --git a/tdehtml/ChangeLog b/tdehtml/ChangeLog
index eb70686e1..3a157f8f5 100644
--- a/tdehtml/ChangeLog
+++ b/tdehtml/ChangeLog
@@ -708,7 +708,7 @@
 	from innerHTML() and innerText()
 
 2005-05-14  Ivor Hewitt <ivor@ivor.org>
-        * tdehtml_settings.cc: Support full wildcard expressions in AdblocK
+        * tdehtml_settings.cpp: Support full wildcard expressions in AdblocK
 
 2005-05-12  Luciano Montanaro <mikelima@cirulla.net>
 	* html/html_formimpl.cpp: Make a return keypress activate form
@@ -2500,7 +2500,7 @@
 	repaint handling over here, since TableSections don't inherit RenderBox,
 	but still have a background.
 
-	* tdehtml_settings.cc (init)/html4.css: MediumFontSize up to 12. Form elements
+	* tdehtml_settings.cpp (init)/html4.css: MediumFontSize up to 12. Form elements
 	get font-size: small instead.
 
 2004-02-24  Dirk Mueller  <mueller@kde.org>
@@ -3859,7 +3859,7 @@
 
 2003-10-04  Dirk Mueller  <mueller@kde.org>
 
-	* tdehtml_settings.cc (init): change default for JS debugger to off.
+	* tdehtml_settings.cpp (init): change default for JS debugger to off.
 
 	* html/html_elementimpl.cpp (createContextualFragment): Fix memory
 	leaks. Adjust code style. Adjust return to avoid dangling return leaks.
diff --git a/tdehtml/Makefile.am b/tdehtml/Makefile.am
index 431b0b143..79ecf8a89 100644
--- a/tdehtml/Makefile.am
+++ b/tdehtml/Makefile.am
@@ -32,9 +32,9 @@ lib_LTLIBRARIES = libtdehtml.la
 kde_module_LTLIBRARIES = libtdehtmlpart.la tdehtmlimagepart.la
 
 libtdehtml_la_SOURCES = kjserrordlg.ui tdehtmlview.cpp tdehtml_part.cpp tdehtml_run.cpp\
-			tdehtml_factory.cpp tdehtml_settings.cc tdehtml_events.cpp \
+			tdehtml_factory.cpp tdehtml_settings.cpp tdehtml_events.cpp \
 			tdehtml_ext.cpp tdehtml_pagecache.cpp tdehtml_iface.skel \
-			tdehtml_iface.cc tdehtml_printsettings.cpp htmlpageinfo.ui \
+			tdehtml_iface.cpp tdehtml_printsettings.cpp htmlpageinfo.ui \
 			tdehtmlimage.cpp
 
 libtdehtml_la_METASOURCES = AUTO
diff --git a/tdehtml/tdehtml_iface.cc b/tdehtml/tdehtml_iface.cpp
index 4bb4afd89..4bb4afd89 100644
--- a/tdehtml/tdehtml_iface.cc
+++ b/tdehtml/tdehtml_iface.cpp
diff --git a/tdehtml/tdehtml_settings.cc b/tdehtml/tdehtml_settings.cpp
index 7f799e311..7f799e311 100644
--- a/tdehtml/tdehtml_settings.cc
+++ b/tdehtml/tdehtml_settings.cpp
diff --git a/tdeio/Makefile.am b/tdeio/Makefile.am
index 67a074f2a..b82616c8d 100644
--- a/tdeio/Makefile.am
+++ b/tdeio/Makefile.am
@@ -61,7 +61,7 @@ dummy.cpp:
 
 messages:
 	$(EXTRACTRC) `find . ../tdeioslave -name "*.rc" -o -name "*.ui"` > rc.cpp
-	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.cc" -o -name "*.h"` -o $(podir)/tdeio.pot
+	$(XGETTEXT) `find . ../tdeioslave -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio.pot
 	rm -f rc.cpp
 
 SUFFIXES = .magic .magic.mgc
diff --git a/tdeio/bookmarks/CMakeLists.txt b/tdeio/bookmarks/CMakeLists.txt
index c4ed8c9b2..30ab617a2 100644
--- a/tdeio/bookmarks/CMakeLists.txt
+++ b/tdeio/bookmarks/CMakeLists.txt
@@ -41,11 +41,11 @@ install( FILES
 set( target kbookmarks )
 
 set( ${target}_SRCS
-  kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc
-  kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc
-  kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc
-  kbookmarkimporter_ie.cc kbookmarkimporter_ns.cc
-  kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc
+  kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp
+  kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp
+  kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp
+  kbookmarkimporter_ie.cpp kbookmarkimporter_ns.cpp
+  kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp
   kbookmarkmanager.skel kbookmarknotifier.skel
 )
 
diff --git a/tdeio/bookmarks/Makefile.am b/tdeio/bookmarks/Makefile.am
index e1ec3a8df..d3bf34b93 100644
--- a/tdeio/bookmarks/Makefile.am
+++ b/tdeio/bookmarks/Makefile.am
@@ -31,10 +31,10 @@ include_HEADERS = \
 	kbookmarkimporter_crash.h kbookmarkimporter_opera.h kbookmarkimporter_ie.h \
 	kbookmarkimporter_ns.h kbookmarkimporter_kde1.h kbookmarkdombuilder.h 
 libkbookmarks_la_SOURCES = \
-	kbookmark.cc kbookmarkbar.cc kbookmarkdrag.cc kbookmarkexporter.cc \
-	kbookmarkimporter.cc kbookmarkmanager.cc kbookmarkmenu.cc \
-	kbookmarkimporter_crash.cc kbookmarkimporter_opera.cc kbookmarkimporter_ie.cc \
-	kbookmarkimporter_ns.cc kbookmarkimporter_kde1.cc kbookmarkdombuilder.cc \
+	kbookmark.cpp kbookmarkbar.cpp kbookmarkdrag.cpp kbookmarkexporter.cpp \
+	kbookmarkimporter.cpp kbookmarkmanager.cpp kbookmarkmenu.cpp \
+	kbookmarkimporter_crash.cpp kbookmarkimporter_opera.cpp kbookmarkimporter_ie.cpp \
+	kbookmarkimporter_ns.cpp kbookmarkimporter_kde1.cpp kbookmarkdombuilder.cpp \
 	kbookmarkmanager.skel kbookmarknotifier.skel
 
 include $(top_srcdir)/admin/Doxyfile.am
diff --git a/tdeio/bookmarks/kbookmark.cc b/tdeio/bookmarks/kbookmark.cpp
index 1e8bf8f7a..1e8bf8f7a 100644
--- a/tdeio/bookmarks/kbookmark.cc
+++ b/tdeio/bookmarks/kbookmark.cpp
diff --git a/tdeio/bookmarks/kbookmarkbar.cc b/tdeio/bookmarks/kbookmarkbar.cpp
index 0f8f910c2..0f8f910c2 100644
--- a/tdeio/bookmarks/kbookmarkbar.cc
+++ b/tdeio/bookmarks/kbookmarkbar.cpp
diff --git a/tdeio/bookmarks/kbookmarkdombuilder.cc b/tdeio/bookmarks/kbookmarkdombuilder.cpp
index 5c0882d05..5c0882d05 100644
--- a/tdeio/bookmarks/kbookmarkdombuilder.cc
+++ b/tdeio/bookmarks/kbookmarkdombuilder.cpp
diff --git a/tdeio/bookmarks/kbookmarkdrag.cc b/tdeio/bookmarks/kbookmarkdrag.cpp
index d5cf6cb47..d5cf6cb47 100644
--- a/tdeio/bookmarks/kbookmarkdrag.cc
+++ b/tdeio/bookmarks/kbookmarkdrag.cpp
diff --git a/tdeio/bookmarks/kbookmarkexporter.cc b/tdeio/bookmarks/kbookmarkexporter.cpp
index 7f4dca67f..7f4dca67f 100644
--- a/tdeio/bookmarks/kbookmarkexporter.cc
+++ b/tdeio/bookmarks/kbookmarkexporter.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter.cc b/tdeio/bookmarks/kbookmarkimporter.cpp
index a83e36c78..a83e36c78 100644
--- a/tdeio/bookmarks/kbookmarkimporter.cc
+++ b/tdeio/bookmarks/kbookmarkimporter.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_crash.cc b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
index 44c591ef4..44c591ef4 100644
--- a/tdeio/bookmarks/kbookmarkimporter_crash.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_crash.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_ie.cc b/tdeio/bookmarks/kbookmarkimporter_ie.cpp
index 966775e89..966775e89 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ie.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ie.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_kde1.cc b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp
index 9b59d1e33..9b59d1e33 100644
--- a/tdeio/bookmarks/kbookmarkimporter_kde1.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_kde1.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_ns.cc b/tdeio/bookmarks/kbookmarkimporter_ns.cpp
index 6e27f364b..6e27f364b 100644
--- a/tdeio/bookmarks/kbookmarkimporter_ns.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_ns.cpp
diff --git a/tdeio/bookmarks/kbookmarkimporter_opera.cc b/tdeio/bookmarks/kbookmarkimporter_opera.cpp
index 6f95b399e..6f95b399e 100644
--- a/tdeio/bookmarks/kbookmarkimporter_opera.cc
+++ b/tdeio/bookmarks/kbookmarkimporter_opera.cpp
diff --git a/tdeio/bookmarks/kbookmarkmanager.cc b/tdeio/bookmarks/kbookmarkmanager.cpp
index d36d13151..d36d13151 100644
--- a/tdeio/bookmarks/kbookmarkmanager.cc
+++ b/tdeio/bookmarks/kbookmarkmanager.cpp
diff --git a/tdeio/bookmarks/kbookmarkmenu.cc b/tdeio/bookmarks/kbookmarkmenu.cpp
index fd35736dd..fd35736dd 100644
--- a/tdeio/bookmarks/kbookmarkmenu.cc
+++ b/tdeio/bookmarks/kbookmarkmenu.cpp
diff --git a/tdeio/httpfilter/CMakeLists.txt b/tdeio/httpfilter/CMakeLists.txt
index b40f10fdc..70564652e 100644
--- a/tdeio/httpfilter/CMakeLists.txt
+++ b/tdeio/httpfilter/CMakeLists.txt
@@ -24,7 +24,7 @@ include_directories(
 set( target httpfilter )
 
 set( ${target}_SRCS
-  httpfilter.cc
+  httpfilter.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/tdeio/httpfilter/Makefile.am b/tdeio/httpfilter/Makefile.am
index 2da25d1b6..b80ed9d71 100644
--- a/tdeio/httpfilter/Makefile.am
+++ b/tdeio/httpfilter/Makefile.am
@@ -1,7 +1,7 @@
 AM_CPPFLAGS = $(all_includes)
 METASOURCES = AUTO
 noinst_LTLIBRARIES = libhttpfilter.la
-libhttpfilter_la_SOURCES = httpfilter.cc
+libhttpfilter_la_SOURCES = httpfilter.cpp
 libhttpfilter_la_LIBADD = $(LIBZ)
 libhttpfilter_la_LDFLAGS = $(all_libraries)
 
diff --git a/tdeio/httpfilter/httpfilter.cc b/tdeio/httpfilter/httpfilter.cpp
index 0f6a45790..0f6a45790 100644
--- a/tdeio/httpfilter/httpfilter.cc
+++ b/tdeio/httpfilter/httpfilter.cpp
diff --git a/tdeio/kssl/CMakeLists.txt b/tdeio/kssl/CMakeLists.txt
index a2c9f00d6..bb49a0ea6 100644
--- a/tdeio/kssl/CMakeLists.txt
+++ b/tdeio/kssl/CMakeLists.txt
@@ -42,14 +42,14 @@ install( FILES
 set( target kssl )
 
 set( ${target}_SRCS
-  kssl.cc ksslcertificatehome.cc ksslsettings.cc
-  ksslcertificate.cc ksslconnectioninfo.cc ksslcertificatefactory.cc
-  ksslcertificatecache.cc ksslpeerinfo.cc ksslinfodlg.cc
-  ksslcertdlg.cc ksslutils.cc kopenssl.cc ksslpkcs12.cc
-  ksslcertchain.cc ksslkeygen.cc ksslx509v3.cc
-  ksslsigners.cc ksslpkcs7.cc ksslpemcallback.cc
-  ksslx509map.cc ksslsession.cc keygenwizard.ui
-  keygenwizard2.ui ksmimecrypto.cc ksslcsessioncache.cc
+  kssl.cpp ksslcertificatehome.cpp ksslsettings.cpp
+  ksslcertificate.cpp ksslconnectioninfo.cpp ksslcertificatefactory.cpp
+  ksslcertificatecache.cpp ksslpeerinfo.cpp ksslinfodlg.cpp
+  ksslcertdlg.cpp ksslutils.cpp kopenssl.cpp ksslpkcs12.cpp
+  ksslcertchain.cpp ksslkeygen.cpp ksslx509v3.cpp
+  ksslsigners.cpp ksslpkcs7.cpp ksslpemcallback.cpp
+  ksslx509map.cpp ksslsession.cpp keygenwizard.ui
+  keygenwizard2.ui ksmimecrypto.cpp ksslcsessioncache.cpp
 )
 
 tde_add_library( ${target} STATIC_PIC AUTOMOC
diff --git a/tdeio/kssl/Makefile.am b/tdeio/kssl/Makefile.am
index 5d57ab7ab..1f9038be7 100644
--- a/tdeio/kssl/Makefile.am
+++ b/tdeio/kssl/Makefile.am
@@ -40,31 +40,31 @@ noinst_HEADERS = ksslcsessioncache.h
 
 
 libkssl_la_SOURCES	= \
-			kssl.cc                   \
-			ksslcertificatehome.cc    \
-			ksslsettings.cc           \
-			ksslcertificate.cc        \
-			ksslconnectioninfo.cc     \
-			ksslcertificatefactory.cc \
-			ksslcertificatecache.cc   \
-			ksslpeerinfo.cc           \
-			ksslinfodlg.cc            \
-			ksslcertdlg.cc            \
-			ksslutils.cc              \
-			kopenssl.cc		  \
-			ksslpkcs12.cc		  \
-			ksslcertchain.cc	  \
-			ksslkeygen.cc		  \
-			ksslx509v3.cc		  \
-			ksslsigners.cc		  \
-			ksslpkcs7.cc		  \
-			ksslpemcallback.cc	  \
-			ksslx509map.cc		  \
-			ksslsession.cc		  \
+			kssl.cpp                   \
+			ksslcertificatehome.cpp    \
+			ksslsettings.cpp           \
+			ksslcertificate.cpp        \
+			ksslconnectioninfo.cpp     \
+			ksslcertificatefactory.cpp \
+			ksslcertificatecache.cpp   \
+			ksslpeerinfo.cpp           \
+			ksslinfodlg.cpp            \
+			ksslcertdlg.cpp            \
+			ksslutils.cpp              \
+			kopenssl.cpp		  \
+			ksslpkcs12.cpp		  \
+			ksslcertchain.cpp	  \
+			ksslkeygen.cpp		  \
+			ksslx509v3.cpp		  \
+			ksslsigners.cpp		  \
+			ksslpkcs7.cpp		  \
+			ksslpemcallback.cpp	  \
+			ksslx509map.cpp		  \
+			ksslsession.cpp		  \
 			keygenwizard.ui		  \
 			keygenwizard2.ui	  \
-			ksmimecrypto.cc		  \
-			ksslcsessioncache.cc
+			ksmimecrypto.cpp		  \
+			ksslcsessioncache.cpp
 
 
 SUBDIRS = kssl
diff --git a/tdeio/kssl/kopenssl.cc b/tdeio/kssl/kopenssl.cpp
index a009bd7e9..a009bd7e9 100644
--- a/tdeio/kssl/kopenssl.cc
+++ b/tdeio/kssl/kopenssl.cpp
diff --git a/tdeio/kssl/ksmimecrypto.cc b/tdeio/kssl/ksmimecrypto.cpp
index 92318b9f0..92318b9f0 100644
--- a/tdeio/kssl/ksmimecrypto.cc
+++ b/tdeio/kssl/ksmimecrypto.cpp
diff --git a/tdeio/kssl/kssl.cc b/tdeio/kssl/kssl.cpp
index 0f34a55da..0f34a55da 100644
--- a/tdeio/kssl/kssl.cc
+++ b/tdeio/kssl/kssl.cpp
diff --git a/tdeio/kssl/ksslcertchain.cc b/tdeio/kssl/ksslcertchain.cpp
index 4f14e4be1..4f14e4be1 100644
--- a/tdeio/kssl/ksslcertchain.cc
+++ b/tdeio/kssl/ksslcertchain.cpp
diff --git a/tdeio/kssl/ksslcertdlg.cc b/tdeio/kssl/ksslcertdlg.cpp
index 7431d4c0a..7431d4c0a 100644
--- a/tdeio/kssl/ksslcertdlg.cc
+++ b/tdeio/kssl/ksslcertdlg.cpp
diff --git a/tdeio/kssl/ksslcertificate.cc b/tdeio/kssl/ksslcertificate.cpp
index edf877496..edf877496 100644
--- a/tdeio/kssl/ksslcertificate.cc
+++ b/tdeio/kssl/ksslcertificate.cpp
diff --git a/tdeio/kssl/ksslcertificatecache.cc b/tdeio/kssl/ksslcertificatecache.cpp
index 2eecd66d6..2eecd66d6 100644
--- a/tdeio/kssl/ksslcertificatecache.cc
+++ b/tdeio/kssl/ksslcertificatecache.cpp
diff --git a/tdeio/kssl/ksslcertificatefactory.cc b/tdeio/kssl/ksslcertificatefactory.cpp
index 66e272ced..66e272ced 100644
--- a/tdeio/kssl/ksslcertificatefactory.cc
+++ b/tdeio/kssl/ksslcertificatefactory.cpp
diff --git a/tdeio/kssl/ksslcertificatehome.cc b/tdeio/kssl/ksslcertificatehome.cpp
index 39470c5ab..39470c5ab 100644
--- a/tdeio/kssl/ksslcertificatehome.cc
+++ b/tdeio/kssl/ksslcertificatehome.cpp
diff --git a/tdeio/kssl/ksslconnectioninfo.cc b/tdeio/kssl/ksslconnectioninfo.cpp
index ccc7fc780..ccc7fc780 100644
--- a/tdeio/kssl/ksslconnectioninfo.cc
+++ b/tdeio/kssl/ksslconnectioninfo.cpp
diff --git a/tdeio/kssl/ksslcsessioncache.cc b/tdeio/kssl/ksslcsessioncache.cpp
index d39638717..d39638717 100644
--- a/tdeio/kssl/ksslcsessioncache.cc
+++ b/tdeio/kssl/ksslcsessioncache.cpp
diff --git a/tdeio/kssl/ksslinfodlg.cc b/tdeio/kssl/ksslinfodlg.cpp
index 37e13854e..37e13854e 100644
--- a/tdeio/kssl/ksslinfodlg.cc
+++ b/tdeio/kssl/ksslinfodlg.cpp
diff --git a/tdeio/kssl/ksslkeygen.cc b/tdeio/kssl/ksslkeygen.cpp
index 86fe4717d..86fe4717d 100644
--- a/tdeio/kssl/ksslkeygen.cc
+++ b/tdeio/kssl/ksslkeygen.cpp
diff --git a/tdeio/kssl/ksslpeerinfo.cc b/tdeio/kssl/ksslpeerinfo.cpp
index d1c2d00fc..d1c2d00fc 100644
--- a/tdeio/kssl/ksslpeerinfo.cc
+++ b/tdeio/kssl/ksslpeerinfo.cpp
diff --git a/tdeio/kssl/ksslpemcallback.cc b/tdeio/kssl/ksslpemcallback.cpp
index 584020c0f..584020c0f 100644
--- a/tdeio/kssl/ksslpemcallback.cc
+++ b/tdeio/kssl/ksslpemcallback.cpp
diff --git a/tdeio/kssl/ksslpkcs12.cc b/tdeio/kssl/ksslpkcs12.cpp
index 08bc54a0b..08bc54a0b 100644
--- a/tdeio/kssl/ksslpkcs12.cc
+++ b/tdeio/kssl/ksslpkcs12.cpp
diff --git a/tdeio/kssl/ksslpkcs7.cc b/tdeio/kssl/ksslpkcs7.cpp
index bced75e80..bced75e80 100644
--- a/tdeio/kssl/ksslpkcs7.cc
+++ b/tdeio/kssl/ksslpkcs7.cpp
diff --git a/tdeio/kssl/ksslsession.cc b/tdeio/kssl/ksslsession.cpp
index 3c80233f1..3c80233f1 100644
--- a/tdeio/kssl/ksslsession.cc
+++ b/tdeio/kssl/ksslsession.cpp
diff --git a/tdeio/kssl/ksslsettings.cc b/tdeio/kssl/ksslsettings.cpp
index 090eaef4f..090eaef4f 100644
--- a/tdeio/kssl/ksslsettings.cc
+++ b/tdeio/kssl/ksslsettings.cpp
diff --git a/tdeio/kssl/ksslsigners.cc b/tdeio/kssl/ksslsigners.cpp
index 028ddf555..028ddf555 100644
--- a/tdeio/kssl/ksslsigners.cc
+++ b/tdeio/kssl/ksslsigners.cpp
diff --git a/tdeio/kssl/ksslutils.cc b/tdeio/kssl/ksslutils.cpp
index 2e6e3a303..2e6e3a303 100644
--- a/tdeio/kssl/ksslutils.cc
+++ b/tdeio/kssl/ksslutils.cpp
diff --git a/tdeio/kssl/ksslx509map.cc b/tdeio/kssl/ksslx509map.cpp
index 7896fdfcf..7896fdfcf 100644
--- a/tdeio/kssl/ksslx509map.cc
+++ b/tdeio/kssl/ksslx509map.cpp
diff --git a/tdeio/kssl/ksslx509v3.cc b/tdeio/kssl/ksslx509v3.cpp
index a3310b9db..a3310b9db 100644
--- a/tdeio/kssl/ksslx509v3.cc
+++ b/tdeio/kssl/ksslx509v3.cpp
diff --git a/tdeio/tdefile/tdefiledialog.h b/tdeio/tdefile/tdefiledialog.h
index 55980bfb6..cd94ebe51 100644
--- a/tdeio/tdefile/tdefiledialog.h
+++ b/tdeio/tdefile/tdefiledialog.h
@@ -268,7 +268,7 @@ public:
      * tdefile->setFilter("*.cpp");
      * tdefile->setFilter("*.cpp|Sources (*.cpp)");
      * tdefile->setFilter("*.cpp|" + i18n("Sources (*.cpp)"));
-     * tdefile->setFilter("*.cpp *.cc *.C|C++ Source Files\n*.h *.H|Header files");
+     * tdefile->setFilter("*.cpp|C++ Source Files\n*.h|Header files");
      * \endcode
      *
      * Note: The text to display is not parsed in any way. So, if you
@@ -359,7 +359,7 @@ public:
      * This widget has to inherit TQWidget and it has to implement
      * a slot showPreview(const KURL &); which is called
      * every time the file changes. You may want to look at
-     * koffice/lib/kofficecore/koFilterManager.cc for some hints :)
+     * koffice/lib/kofficecore/koFilterManager.cpp for some hints :)
      *
      * Ownership is transferred to KFileDialog. You need to create the
      * preview-widget with "new", i.e. on the heap.
@@ -811,7 +811,7 @@ signals:
      * or chose one of the predefined set via setFilter().
      *
      * @param filter contains the new filter (only the extension part,
-     * not the explanation), i.e. "*.cpp" or "*.cpp *.cc".
+     * not the explanation), i.e. "*.cpp".
      *
      * @see setFilter()
      * @see currentFilter()
diff --git a/tdeio/tdeio/kmimetypechooser.cpp b/tdeio/tdeio/kmimetypechooser.cpp
index 72fdf925e..758cd4940 100644
--- a/tdeio/tdeio/kmimetypechooser.cpp
+++ b/tdeio/tdeio/kmimetypechooser.cpp
@@ -192,7 +192,7 @@ void KMimeTypeChooser::editMimeType()
   if ( !(d->lvMimeTypes->currentItem() && (d->lvMimeTypes->currentItem())->parent()) )
     return;
   TQString mt = (d->lvMimeTypes->currentItem()->parent())->text( 0 ) + "/" + (d->lvMimeTypes->currentItem())->text( 0 );
-  // thanks to libkonq/konq_operations.cc
+  // thanks to libkonq/konq_operations.cpp
   connect( KSycoca::self(), TQT_SIGNAL(databaseChanged()),
            this, TQT_SLOT(slotSycocaDatabaseChanged()) );
   TQString keditfiletype = TQString::fromLatin1("keditfiletype");
diff --git a/tdeio/tdeio/tdefileitem.cpp b/tdeio/tdeio/tdefileitem.cpp
index 7b4c7ccd3..7af8aae39 100644
--- a/tdeio/tdeio/tdefileitem.cpp
+++ b/tdeio/tdeio/tdefileitem.cpp
@@ -172,7 +172,7 @@ void KFileItem::init( bool _determineMimeTypeOnDemand )
           if ( KDE_stat( path.data(), &buf ) == 0 ) {
               mode = buf.st_mode;
           }
-          else { // link pointing to nowhere (see tdeio/file/file.cc)
+          else { // link pointing to nowhere (see tdeio/file/file.cpp)
               mode = (S_IFMT-1) | S_IRWXU | S_IRWXG | S_IRWXO;
           }
         }
diff --git a/tdeio/tdeio/tdefileitem.h b/tdeio/tdeio/tdefileitem.h
index b0dd9b4b8..171b611e3 100644
--- a/tdeio/tdeio/tdefileitem.h
+++ b/tdeio/tdeio/tdefileitem.h
@@ -30,7 +30,7 @@
 #include <kmimetype.h>
 #include <tdefilemetainfo.h>
 
-#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cc, will be removed for 3.4
+#define TDEFILEITEM_HAS_ISWRITABLE // only used in libkonq/konq_iconviewwidget.cpp, will be removed for 3.4
 
 /**
  * A KFileItem is a generic class to handle a file, local or remote.
diff --git a/tdeio/tests/kurifiltertest.cpp b/tdeio/tests/kurifiltertest.cpp
index dec955156..0b3e6621d 100644
--- a/tdeio/tests/kurifiltertest.cpp
+++ b/tdeio/tests/kurifiltertest.cpp
@@ -270,7 +270,7 @@ int main(int argc, char **argv)
     // a search using the default search engine
     // 'ls' is a bit of a special case though, due to the toplevel domain called 'ls'
     filter( "cp", "http://www.google.com/search?q=cp&ie=UTF-8&oe=UTF-8", KURIFilterData::NET_PROTOCOL,
-            TQStringList(), 0, false /* don't check for executables, see konq_misc.cc */ );
+            TQStringList(), 0, false /* don't check for executables, see konq_misc.cpp */ );
 
     // Executable tests - No IKWS in minicli
     filter( "cp", "cp", KURIFilterData::EXECUTABLE, minicliFilters );
diff --git a/tdeioslave/file/CMakeLists.txt b/tdeioslave/file/CMakeLists.txt
index 6456e962b..0215e1522 100644
--- a/tdeioslave/file/CMakeLists.txt
+++ b/tdeioslave/file/CMakeLists.txt
@@ -44,7 +44,7 @@ tde_create_translated_desktop(
 set( target tdeio_file )
 
 set( ${target}_SRCS
-  file.cc
+  file.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/file/Makefile.am b/tdeioslave/file/Makefile.am
index c7f35b51f..d31b69b41 100644
--- a/tdeioslave/file/Makefile.am
+++ b/tdeioslave/file/Makefile.am
@@ -8,7 +8,7 @@ INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_file.la
 
-tdeio_file_la_SOURCES = file.cc
+tdeio_file_la_SOURCES = file.cpp
 tdeio_file_la_LIBADD = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE) $(ACL_LIBS)
 tdeio_file_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) $(top_builddir)/dcop/libDCOP.la
 noinst_HEADERS = file.h
diff --git a/tdeioslave/file/file.cc b/tdeioslave/file/file.cpp
index fda72f2d5..fda72f2d5 100644
--- a/tdeioslave/file/file.cc
+++ b/tdeioslave/file/file.cpp
diff --git a/tdeioslave/ftp/CMakeLists.txt b/tdeioslave/ftp/CMakeLists.txt
index 7ef877e9d..797c5ae9c 100644
--- a/tdeioslave/ftp/CMakeLists.txt
+++ b/tdeioslave/ftp/CMakeLists.txt
@@ -38,7 +38,7 @@ tde_create_translated_desktop(
 set( target tdeio_ftp )
 
 set( ${target}_SRCS
-  ftp.cc
+  ftp.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/ftp/Makefile.am b/tdeioslave/ftp/Makefile.am
index fef6e168f..816659625 100644
--- a/tdeioslave/ftp/Makefile.am
+++ b/tdeioslave/ftp/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_ftp.la
 
-tdeio_ftp_la_SOURCES = ftp.cc
+tdeio_ftp_la_SOURCES = ftp.cpp
 tdeio_ftp_la_LIBADD  = $(LIB_TDEIO) $(LIB_TQT) $(LIB_TDECORE)
 tdeio_ftp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) 
 
diff --git a/tdeioslave/ftp/ftp.cc b/tdeioslave/ftp/ftp.cpp
index 65f3eedc5..8e0f96b5d 100644
--- a/tdeioslave/ftp/ftp.cc
+++ b/tdeioslave/ftp/ftp.cpp
@@ -100,8 +100,8 @@ namespace TDEIO {
         mimimumMimeSize =     1024
     };
 
-    // JPF: this helper was derived from write_all in file.cc (FileProtocol).
-    static // JPF: in ftp.cc we make it static
+    // JPF: this helper was derived from write_all in file.cpp (FileProtocol).
+    static // JPF: in ftp.cpp we make it static
     /**
      * This helper handles some special issues (blocking and interrupted
      * system call) when writing to a file handle.
diff --git a/tdeioslave/http/CMakeLists.txt b/tdeioslave/http/CMakeLists.txt
index a1a6c296a..a8570d60f 100644
--- a/tdeioslave/http/CMakeLists.txt
+++ b/tdeioslave/http/CMakeLists.txt
@@ -62,7 +62,7 @@ tde_add_tdeinit_executable( ${target} AUTOMOC
 set( target tdeio_http )
 
 set( ${target}_SRCS
-  http.cc
+  http.cpp
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/tdeioslave/http/Makefile.am b/tdeioslave/http/Makefile.am
index 8e2eb4187..f4f4ddc7f 100644
--- a/tdeioslave/http/Makefile.am
+++ b/tdeioslave/http/Makefile.am
@@ -13,7 +13,7 @@ lib_LTLIBRARIES=
 tdeinit_LTLIBRARIES = tdeio_http_cache_cleaner.la
 kde_module_LTLIBRARIES = tdeio_http.la
 
-tdeio_http_la_SOURCES = http.cc
+tdeio_http_la_SOURCES = http.cpp
 tdeio_http_la_METASOURCES = AUTO
 tdeio_http_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/tdeio/httpfilter/libhttpfilter.la $(LIB_TQT) $(LIB_TDECORE) $(LIBZ) $(top_builddir)/dcop/libDCOP.la $(top_builddir)/tdeio/misc/tdentlm/libtdentlm.la
 tdeio_http_la_LDFLAGS = $(all_libraries) $(GSSAPI_RPATH) -module $(KDE_PLUGIN) $(GSSAPI_LIBS)
diff --git a/tdeioslave/http/README.webdav b/tdeioslave/http/README.webdav
index d7f6cca26..e2a0f5d35 100644
--- a/tdeioslave/http/README.webdav
+++ b/tdeioslave/http/README.webdav
@@ -13,7 +13,7 @@ Applications supporting extended webdav features
 [none currently]
 
 Much of the info here is elaborated by rfc #2518; the rest can be understood by reading
-davPropStat() in http.cc, specifically the setMetaData() calls.
+davPropStat() in http.cpp, specifically the setMetaData() calls.
 
 Extended information is transferred via tdeio's metadata system...
 
diff --git a/tdeioslave/http/http.cc b/tdeioslave/http/http.cpp
index 8cd0f7a64..8cd0f7a64 100644
--- a/tdeioslave/http/http.cc
+++ b/tdeioslave/http/http.cpp
diff --git a/tdeioslave/http/http_cache_cleaner.cpp b/tdeioslave/http/http_cache_cleaner.cpp
index aaf94d25a..1f2be7abf 100644
--- a/tdeioslave/http/http_cache_cleaner.cpp
+++ b/tdeioslave/http/http_cache_cleaner.cpp
@@ -77,7 +77,7 @@ public:
 };
 
 // !START OF SYNC!
-// Keep the following in sync with the cache code in http.cc
+// Keep the following in sync with the cache code in http.cpp
 #define CACHE_REVISION "7\n"
 
 FileInfo *readEntry( const TQString &filename)
@@ -158,7 +158,7 @@ FileInfo *readEntry( const TQString &filename)
    unlink( CEF.data());
    return 0;
 }
-// Keep the above in sync with the cache code in http.cc
+// Keep the above in sync with the cache code in http.cpp
 // !END OF SYNC!
 
 void scanDirectory(FileInfoList &fileEntries, const TQString &name, const TQString &strDir)
diff --git a/tdeioslave/iso/Makefile.am b/tdeioslave/iso/Makefile.am
index ed8aaadfa..f0381203a 100644
--- a/tdeioslave/iso/Makefile.am
+++ b/tdeioslave/iso/Makefile.am
@@ -60,7 +60,7 @@ uninstall-local:
 # make messages.po. Move this one to ../po/ and "make merge" in po
 # the -x is for skipping messages already translated in tdelibs
 messages:
-	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 -o -name \*.c`; \
 	if test -n "$$LIST"; then \
 		 $(XGETTEXT) -C -ki18n -x $(kde_includes)/tde.pot $$LIST -o ../po/iso.pot; \
 	fi
diff --git a/tdeioslave/iso/iso.cpp b/tdeioslave/iso/iso.cpp
index 8696b0c67..80e32b415 100644
--- a/tdeioslave/iso/iso.cpp
+++ b/tdeioslave/iso/iso.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
- /* This file is heavily based on tar.cc from tdebase
+ /* This file is heavily based on tar.cpp from tdebase
   * (c) David Faure <faure@kde.org>
   */
 
diff --git a/tderandr/CMakeLists.txt b/tderandr/CMakeLists.txt
index e52da4c17..fd269a65c 100644
--- a/tderandr/CMakeLists.txt
+++ b/tderandr/CMakeLists.txt
@@ -37,7 +37,7 @@ install( FILES
 set( target tderandr )
 
 set( ${target}_SRCS
-  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+  randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tderandr/Makefile.am b/tderandr/Makefile.am
index 9a8e1cf37..433a30c57 100644
--- a/tderandr/Makefile.am
+++ b/tderandr/Makefile.am
@@ -9,7 +9,7 @@ libtderandrincludedir = $(includedir)/libtderandr
 libtderandrinclude_HEADERS = randr.h lowlevel_randr.h ktimerdialog.h libtderandr.h
 
 lib_LTLIBRARIES = libtderandr.la
-libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cc
+libtderandr_la_SOURCES  = randr.cpp lowlevel_randr.c ktimerdialog.cpp libtderandr.cpp
 METASOURCES = AUTO
 
 libtderandr_la_LDFLAGS = $(KDE_MT_LDFLAGS) -version-info 0:95  -no-undefined
diff --git a/tderandr/libtderandr.cc b/tderandr/libtderandr.cpp
index 39e9c5b70..50c7a1673 100644
--- a/tderandr/libtderandr.cc
+++ b/tderandr/libtderandr.cpp
@@ -1,4 +1,4 @@
-/*  libtderandr.cc     - class KRandr that makes it easy to use XRandr in KDE
+/*  libtderandr.cpp     - class KRandr that makes it easy to use XRandr in KDE
     This file is part of KRandr 0.9.5
     Copyright (C) 2010  Timothy Pearson
     LibKRandr's homepage : http://www.trinitydesktop.org
diff --git a/tdeui/ksharedpixmap.h b/tdeui/ksharedpixmap.h
index c87196876..29b7821ff 100644
--- a/tdeui/ksharedpixmap.h
+++ b/tdeui/ksharedpixmap.h
@@ -40,7 +40,7 @@ class TDESharedPixmapPrivate;
  *
  * The server part of shared pixmaps is not implemented here. 
  * That part is provided by KPixmapServer, in the source file:
- * tdebase/kdesktop/pixmapserver.cc.
+ * tdebase/kdesktop/pixmapserver.cpp.
  *
  * An example: copy from a shared pixmap:
  * \code
diff --git a/tdeui/tdetoolbarlabelaction.cpp b/tdeui/tdetoolbarlabelaction.cpp
index c88f68434..07cfbb731 100644
--- a/tdeui/tdetoolbarlabelaction.cpp
+++ b/tdeui/tdetoolbarlabelaction.cpp
@@ -82,7 +82,7 @@ void TDEToolBarLabelAction::init()
 {
   d->m_label = static_cast<TQLabel*>(widget());
   /* these lines were copied from Konqueror's KonqDraggableLabel class in
-     konq_misc.cc */
+     konq_misc.cpp */
   d->m_label->setBackgroundMode(TQt::PaletteButton);
   d->m_label->setAlignment((TQApplication::reverseLayout()
 			 ? Qt::AlignRight : Qt::AlignLeft) |
diff --git a/tdewallet/backend/CMakeLists.txt b/tdewallet/backend/CMakeLists.txt
index 57a1e77ac..db2f66994 100644
--- a/tdewallet/backend/CMakeLists.txt
+++ b/tdewallet/backend/CMakeLists.txt
@@ -30,9 +30,9 @@ link_directories(
 set( target tdewalletbackend )
 
 set( ${target}_SRCS
-  blockcipher.cc blowfish.cc
-  cbc.cc sha1.cc tdewalletentry.cc
-  tdewalletbackend.cc
+  blockcipher.cpp blowfish.cpp
+  cbc.cpp sha1.cpp tdewalletentry.cpp
+  tdewalletbackend.cpp
 )
 
 tde_add_library( ${target} SHARED
diff --git a/tdewallet/backend/Makefile.am b/tdewallet/backend/Makefile.am
index 487385eac..a53a0129f 100644
--- a/tdewallet/backend/Makefile.am
+++ b/tdewallet/backend/Makefile.am
@@ -5,12 +5,12 @@ lib_LTLIBRARIES = libtdewalletbackend.la
 
 libtdewalletbackend_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:0 -no-undefined
 libtdewalletbackend_la_LIBADD = $(LIB_TQT) ../../tdecore/libtdecore.la
-libtdewalletbackend_la_SOURCES = blockcipher.cc		\
-			       blowfish.cc		\
-			       cbc.cc			\
-			       sha1.cc			\
-			       tdewalletentry.cc		\
-			       tdewalletbackend.cc
+libtdewalletbackend_la_SOURCES = blockcipher.cpp		\
+			       blowfish.cpp		\
+			       cbc.cpp			\
+			       sha1.cpp			\
+			       tdewalletentry.cpp		\
+			       tdewalletbackend.cpp
 
 
 libtdewalletbackend_la_METASOURCES = AUTO
diff --git a/tdewallet/backend/blockcipher.cc b/tdewallet/backend/blockcipher.cpp
index 9d770098e..9d770098e 100644
--- a/tdewallet/backend/blockcipher.cc
+++ b/tdewallet/backend/blockcipher.cpp
diff --git a/tdewallet/backend/blowfish.cc b/tdewallet/backend/blowfish.cpp
index c708935de..c708935de 100644
--- a/tdewallet/backend/blowfish.cc
+++ b/tdewallet/backend/blowfish.cpp
diff --git a/tdewallet/backend/blowfishtables.h b/tdewallet/backend/blowfishtables.h
index dae448f96..a41d7a7e3 100644
--- a/tdewallet/backend/blowfishtables.h
+++ b/tdewallet/backend/blowfishtables.h
@@ -17,7 +17,7 @@
    Boston, MA 02110-1301, USA.
 */
 
-// This is also from _Applied_Cryptography_.  See blowfish.cc for more details.
+// This is also from _Applied_Cryptography_.  See blowfish.cpp for more details.
 
 #ifndef __bfdefs_h
 #define __bfdefs_h
diff --git a/tdewallet/backend/cbc.cc b/tdewallet/backend/cbc.cpp
index 7bc5f3891..7bc5f3891 100644
--- a/tdewallet/backend/cbc.cc
+++ b/tdewallet/backend/cbc.cpp
diff --git a/tdewallet/backend/sha1.cc b/tdewallet/backend/sha1.cpp
index 7420b5f16..7420b5f16 100644
--- a/tdewallet/backend/sha1.cc
+++ b/tdewallet/backend/sha1.cpp
diff --git a/tdewallet/backend/tdewalletbackend.cc b/tdewallet/backend/tdewalletbackend.cpp
index 83e37a49a..83e37a49a 100644
--- a/tdewallet/backend/tdewalletbackend.cc
+++ b/tdewallet/backend/tdewalletbackend.cpp
diff --git a/tdewallet/backend/tdewalletentry.cc b/tdewallet/backend/tdewalletentry.cpp
index d6b3aa84e..d6b3aa84e 100644
--- a/tdewallet/backend/tdewalletentry.cc
+++ b/tdewallet/backend/tdewalletentry.cpp
diff --git a/tdewallet/backend/tests/CMakeLists.txt b/tdewallet/backend/tests/CMakeLists.txt
index abc703a7c..129377791 100644
--- a/tdewallet/backend/tests/CMakeLists.txt
+++ b/tdewallet/backend/tests/CMakeLists.txt
@@ -31,8 +31,8 @@ add_test( NAME "tdewallet/backed/backendtest"
     COMMAND sh -x "${CMAKE_CURRENT_SOURCE_DIR}/backendtest.sh" )
 set_tests_properties( "tdewallet/backed/backendtest" PROPERTIES TIMEOUT 30)
 tde_add_check_executable( testbf AUTOMOC
-    SOURCES testbf.cpp ../blockcipher.cc ../blowfish.cc
+    SOURCES testbf.cpp ../blockcipher.cpp ../blowfish.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
 tde_add_check_executable( testsha AUTOMOC
-    SOURCES testsha.cpp ../sha1.cc
+    SOURCES testsha.cpp ../sha1.cpp
     LINK tdewalletbackend-shared tdewalletclient-shared TEST )
diff --git a/tdewallet/client/CMakeLists.txt b/tdewallet/client/CMakeLists.txt
index ac56830e8..87c77132b 100644
--- a/tdewallet/client/CMakeLists.txt
+++ b/tdewallet/client/CMakeLists.txt
@@ -34,7 +34,7 @@ install( FILES
 set( target tdewalletclient )
 
 set( ${target}_SRCS
-  tdewallet.skel tdewallet.cc
+  tdewallet.skel tdewallet.cpp
 )
 
 tde_add_library( ${target} SHARED AUTOMOC
diff --git a/tdewallet/client/Makefile.am b/tdewallet/client/Makefile.am
index 4fe262f76..51fdd4161 100644
--- a/tdewallet/client/Makefile.am
+++ b/tdewallet/client/Makefile.am
@@ -6,7 +6,7 @@ lib_LTLIBRARIES = libtdewalletclient.la
 libtdewalletclient_la_LDFLAGS = $(KDE_RPATH) $(all_libraries) -version-info 1:1 -no-undefined
 libtdewalletclient_la_LIBADD = $(LIB_TDECORE) $(LIB_TQT) $(top_builddir)/dcop/libDCOP.la
 libtdewalletclient_la_SOURCES =   tdewallet.skel \
-				tdewallet.cc
+				tdewallet.cpp
 
 libtdewalletclient_la_METASOURCES = AUTO
 
diff --git a/tdewallet/client/tdewallet.cc b/tdewallet/client/tdewallet.cpp
index c730f10d4..c730f10d4 100644
--- a/tdewallet/client/tdewallet.cc
+++ b/tdewallet/client/tdewallet.cpp
diff --git a/win/common.pro b/win/common.pro
index f5c2f1af7..985c45268 100644
--- a/win/common.pro
+++ b/win/common.pro
@@ -172,7 +172,7 @@ QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EXCEPTIONS_ON # /GX for msvc
 QMAKE_LFLAGS += /FORCE:MULTIPLE
 
 # Specify that filename is a C++ source file, even if it doesn’t have 
-# a .cpp or .cxx extension, thus .cc files are compiled properly with msvc
+# a .cpp or .cxx extension, thus files are compiled properly with msvc
 QMAKE_CXXFLAGS += /TP
 
 INCLUDEPATH	+= moc $(KDELIBS)/win $(KDELIBS)
diff --git a/win/pro_files/dcop/dcopidl/dcopidl.pro b/win/pro_files/dcop/dcopidl/dcopidl.pro
index 2febfaa2c..df3e48a19 100644
--- a/win/pro_files/dcop/dcopidl/dcopidl.pro
+++ b/win/pro_files/dcop/dcopidl/dcopidl.pro
@@ -15,7 +15,7 @@ DEFINES += YY_ALWAYS_INTERACTIVE
 
 SOURCES = \
 main.cpp \
-scanner.cc \
-yacc.cc
+scanner.cpp \
+yacc.cpp
 
 HEADERS		=
diff --git a/win/pro_files/tdeio/tdeio.pro b/win/pro_files/tdeio/tdeio.pro
index 706208b2a..9d92be52c 100644
--- a/win/pro_files/tdeio/tdeio.pro
+++ b/win/pro_files/tdeio/tdeio.pro
@@ -102,19 +102,19 @@ tdeio/statusbarprogress.cpp \
 tdeio/tcpslavebase.cpp \
 tdeio/yacc.c \
 \
-bookmarks/kbookmark.cc \
-bookmarks/kbookmarkbar.cc \
-bookmarks/kbookmarkdombuilder.cc \
-bookmarks/kbookmarkdrag.cc \
-bookmarks/kbookmarkexporter.cc \
-bookmarks/kbookmarkimporter.cc \
-bookmarks/kbookmarkimporter_crash.cc \
-bookmarks/kbookmarkimporter_ie.cc \
-bookmarks/kbookmarkimporter_kde1.cc \
-bookmarks/kbookmarkimporter_ns.cc \
-bookmarks/kbookmarkimporter_opera.cc \
-bookmarks/kbookmarkmanager.cc \
-bookmarks/kbookmarkmenu.cc \
+bookmarks/kbookmark.cpp \
+bookmarks/kbookmarkbar.cpp \
+bookmarks/kbookmarkdombuilder.cpp \
+bookmarks/kbookmarkdrag.cpp \
+bookmarks/kbookmarkexporter.cpp \
+bookmarks/kbookmarkimporter.cpp \
+bookmarks/kbookmarkimporter_crash.cpp \
+bookmarks/kbookmarkimporter_ie.cpp \
+bookmarks/kbookmarkimporter_kde1.cpp \
+bookmarks/kbookmarkimporter_ns.cpp \
+bookmarks/kbookmarkimporter_opera.cpp \
+bookmarks/kbookmarkmanager.cpp \
+bookmarks/kbookmarkmenu.cpp \
 \
 tdefile/kcombiview.cpp \
 tdefile/kcustommenueditor.cpp \
@@ -154,27 +154,27 @@ tdefile/kurlrequesterdlg.cpp \
 \
 misc/uiserver.cpp \
 \
-kssl/ksslcertdlg.cc \
-kssl/ksslinfodlg.cc \
-kssl/ksslcsessioncache.cc \
-kssl/ksslsession.cc \
-kssl/ksslsettings.cc \
-kssl/ksslcertchain.cc \
-kssl/ksslcertificate.cc \
-kssl/ksslcertificatecache.cc \
-kssl/ksslcertificatehome.cc \
-kssl/ksslcertificatefactory.cc \
-kssl/kssl.cc \
-kssl/ksslconnectioninfo.cc \
-kssl/ksslkeygen.cc \
-kssl/ksslpkcs7.cc \
-kssl/ksslpkcs12.cc \
-kssl/ksslx509v3.cc \
-kssl/ksslx509map.cc \
-kssl/ksslsigners.cc \
-kssl/ksslpeerinfo.cc \
-kssl/kopenssl.cc \
-kssl/ksmimecrypto.cc
+kssl/ksslcertdlg.cpp \
+kssl/ksslinfodlg.cpp \
+kssl/ksslcsessioncache.cpp \
+kssl/ksslsession.cpp \
+kssl/ksslsettings.cpp \
+kssl/ksslcertchain.cpp \
+kssl/ksslcertificate.cpp \
+kssl/ksslcertificatecache.cpp \
+kssl/ksslcertificatehome.cpp \
+kssl/ksslcertificatefactory.cpp \
+kssl/kssl.cpp \
+kssl/ksslconnectioninfo.cpp \
+kssl/ksslkeygen.cpp \
+kssl/ksslpkcs7.cpp \
+kssl/ksslpkcs12.cpp \
+kssl/ksslx509v3.cpp \
+kssl/ksslx509map.cpp \
+kssl/ksslsigners.cpp \
+kssl/ksslpeerinfo.cpp \
+kssl/kopenssl.cpp \
+kssl/ksmimecrypto.cpp
 
 #removed tdeio/kautomount.cpp \