Renaming of files in preparation for code style tools.

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

187 files changed, 265 insertions, 265 deletions

diff --git a/drkonqi/CMakeLists.txt b/drkonqi/CMakeLists.txt
index a2b643909..ae1be3a87 100644
--- a/drkonqi/CMakeLists.txt
+++ b/drkonqi/CMakeLists.txt
@@ -33,7 +33,7 @@ tde_add_executable( drkonqi AUTOMOC
   SOURCES
     krashdcopinterface.skel main.cpp debugger.cpp
     bugdescription.cpp bugdescriptiondialog.cpp
-    sha1.cc krashconf.cpp drbugreport.cpp
+    sha1.cpp krashconf.cpp drbugreport.cpp
     backtrace.cpp toplevel.cpp
   LINK tdeio-shared ${LIBR_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/drkonqi/sha1.cc b/drkonqi/sha1.cpp
index 86dd30a99..86dd30a99 100644
--- a/drkonqi/sha1.cc
+++ b/drkonqi/sha1.cpp
diff --git a/kcontrol/background/CMakeLists.txt b/kcontrol/background/CMakeLists.txt
index a62259b8d..5e3670616 100644
--- a/kcontrol/background/CMakeLists.txt
+++ b/kcontrol/background/CMakeLists.txt
@@ -29,7 +29,7 @@ if( BUILD_KCONTROL OR BUILD_KDESKTOP OR BUILD_TDM )
   ##### bgnd (static) #############################
 
   tde_add_library( bgnd STATIC_PIC AUTOMOC
-    SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cc
+    SOURCES bgrender.cpp bgsettings.cpp KCrossBGRender.cpp
     LINK ${LIBART_LIBRARIES}
   )
 
diff --git a/kcontrol/background/KCrossBGRender.cc b/kcontrol/background/KCrossBGRender.cpp
index 489e98d1b..489e98d1b 100644
--- a/kcontrol/background/KCrossBGRender.cc
+++ b/kcontrol/background/KCrossBGRender.cpp
diff --git a/kcontrol/background/bgdialog.cpp b/kcontrol/background/bgdialog.cpp
index f82ccdd8a..754a2ba9d 100644
--- a/kcontrol/background/bgdialog.cpp
+++ b/kcontrol/background/bgdialog.cpp
@@ -474,7 +474,7 @@ void BGDialog::initUI()
 
    loadWallpaperFilesList();
 
-   // Wallpaper tilings: again they must match the ones from bgrender.cc
+   // Wallpaper tilings: again they must match the ones from bgrender.cpp
    m_comboWallpaperPos->insertItem(i18n("Centered"));
    m_comboWallpaperPos->insertItem(i18n("Tiled"));
    m_comboWallpaperPos->insertItem(i18n("Center Tiled"));
@@ -484,7 +484,7 @@ void BGDialog::initUI()
    m_comboWallpaperPos->insertItem(i18n("Centered Auto Fit"));
    m_comboWallpaperPos->insertItem(i18n("Scale & Crop"));
 
-   // Blend modes: make sure these match with kdesktop/bgrender.cc !!
+   // Blend modes: make sure these match with kdesktop/bgrender.cpp !!
    m_comboBlend->insertItem(i18n("No Blending"));
    m_comboBlend->insertItem(i18n("Flat"));
    m_comboBlend->insertItem(i18n("Horizontal"));
diff --git a/kdesktop/CMakeLists.txt b/kdesktop/CMakeLists.txt
index a4714ce59..5ee2746cc 100644
--- a/kdesktop/CMakeLists.txt
+++ b/kdesktop/CMakeLists.txt
@@ -81,13 +81,13 @@ tde_add_executable( kcheckrunning
 ##### kdesktop (tdeinit) ########################
 
 set( target kdesktop )
-set_property( SOURCE lockeng.cc APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
+set_property( SOURCE lockeng.cpp APPEND PROPERTY COMPILE_DEFINITIONS KDE_CONFDIR="${TDE_CONFIG_DIR}" )
 
 set( ${target}_SRCS
-  main.cc krootwm.cc xautolock.cc kdiconview.cc init.cc
-  desktop.cc lockeng.cc KDesktopIface.skel bgmanager.cc
+  main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp init.cpp
+  desktop.cpp lockeng.cpp KDesktopIface.skel bgmanager.cpp
   KScreensaverIface.skel minicli.cpp KBackgroundIface.skel
-  pixmapserver.cc kcustommenu.cc startupid.cpp minicli_ui.ui
+  pixmapserver.cpp kcustommenu.cpp startupid.cpp minicli_ui.ui
   xautolock_diy.c xautolock_engine.c kshadowengine.cpp
   kshadowsettings.cpp kdesktopshadowsettings.cpp
   tdefileividesktop.cpp kdesktopapp.cpp
diff --git a/kdesktop/Makefile.am b/kdesktop/Makefile.am
index bef2d3884..393b3c760 100644
--- a/kdesktop/Makefile.am
+++ b/kdesktop/Makefile.am
@@ -17,10 +17,10 @@ libkdesktopsettings_la_LDFLAGS = $(all_libraries) -no-undefined
 libkdesktopsettings_la_LIBADD = $(LIB_TDECORE)
 libkdesktopsettings_la_SOURCES = kdesktopsettings.kcfgc tdelaunchsettings.kcfgc 
 
-kdesktop_la_SOURCES = main.cc krootwm.cc xautolock.cc kdiconview.cc desktop.cc \
-	lockeng.cc KDesktopIface.skel \
-	bgmanager.cc init.cc KScreensaverIface.skel \
-	minicli.cpp KBackgroundIface.skel pixmapserver.cc kcustommenu.cc \
+kdesktop_la_SOURCES = main.cpp krootwm.cpp xautolock.cpp kdiconview.cpp desktop.cpp \
+	lockeng.cpp KDesktopIface.skel \
+	bgmanager.cpp init.cpp KScreensaverIface.skel \
+	minicli.cpp KBackgroundIface.skel pixmapserver.cpp kcustommenu.cpp \
 	startupid.cpp minicli_ui.ui xautolock_diy.c xautolock_engine.c \
 	kshadowengine.cpp kshadowsettings.cpp \
 	kdesktopshadowsettings.cpp tdefileividesktop.cpp \
@@ -59,7 +59,7 @@ startupid.lo: tdelaunchsettings.h
 
 messages: rc.cpp
 	$(EXTRACTRC) lock/*.ui >> rc.cpp
-	$(XGETTEXT) lock/*.cc *.cc *.cpp *.h -o $(podir)/kdesktop.pot
+	$(XGETTEXT) lock/*.cpp *.cpp *.h -o $(podir)/kdesktop.pot
 
 menu_DATA = kdesktop_custom_menu1 kdesktop_custom_menu2
 menudir = $(kde_confdir)
diff --git a/kdesktop/bgmanager.cc b/kdesktop/bgmanager.cpp
index 7e90e8fca..7e90e8fca 100644
--- a/kdesktop/bgmanager.cc
+++ b/kdesktop/bgmanager.cpp
diff --git a/kdesktop/desktop.cc b/kdesktop/desktop.cpp
index 2732bff08..2732bff08 100644
--- a/kdesktop/desktop.cc
+++ b/kdesktop/desktop.cpp
diff --git a/kdesktop/init.cc b/kdesktop/init.cpp
index 6bf87f333..6bf87f333 100644
--- a/kdesktop/init.cc
+++ b/kdesktop/init.cpp
diff --git a/kdesktop/kcustommenu.cc b/kdesktop/kcustommenu.cpp
index 2e825c0d9..2e825c0d9 100644
--- a/kdesktop/kcustommenu.cc
+++ b/kdesktop/kcustommenu.cpp
diff --git a/kdesktop/kdesktop.kcfg b/kdesktop/kdesktop.kcfg
index 53a1cc781..5df427c71 100644
--- a/kdesktop/kdesktop.kcfg
+++ b/kdesktop/kdesktop.kcfg
@@ -52,7 +52,7 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- init.cc:138 -->
+      <!-- init.cpp:138 -->
       <!--     if (!config->readBoolEntry("CopyDesktopLinks", true)) -->
     </entry>
     <entry key="AutoLineUpIcons" type="Bool">
@@ -64,9 +64,9 @@
       <default>false</default>
       <label>Sort directories first</label>
       <whatsthis></whatsthis>
-      <!-- krootwm.cc:251 -->
+      <!-- krootwm.cpp:251 -->
       <!--         aSortDirsFirst->setChecked( tdeconfig->readBoolEntry("SortDirectoriesFirst", true)); -->
-      <!-- krootwm.cc:496 -->
+      <!-- krootwm.cpp:496 -->
       <!--     config->writeEntry( "SortDirectoriesFirst", b ); -->
     </entry>
 		<entry key="TerminalApplication" type="Path">
@@ -85,7 +85,7 @@
       <default>Forward</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- desktop.cc:397 -->
+      <!-- desktop.cpp:397 -->
       <!--             (config->readEntry("WheelDirection", default_dir_string) == forward_string) ? Forward : Reverse; -->
     </entry>
     <entry key="Left" type="String">
@@ -190,7 +190,7 @@
       <default></default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:254 -->
+      <!-- kdiconview.cpp:254 -->
       <!--     m_itemsAlwaysFirst = config->readListEntry("AlwaysFirstItems"); // Distributor plug-in -->
     </entry>
   </group>
@@ -199,14 +199,14 @@
       <default>true</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:258 -->
+      <!-- kdiconview.cpp:258 -->
       <!--         m_enableMedia=config->readBoolEntry("enabled",false); -->
     </entry>
     <entry key="exclude" type="String">
       <default>media/nfs_mounted,media/nfs_unmounted,media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted</default>
       <label>Device Types to exclude</label>
       <whatsthis>The device types which you do not want to see on the desktop.</whatsthis>
-      <!-- kdiconview.cc:261 -->
+      <!-- kdiconview.cpp:261 -->
       <!--     TQString tmpList=config->readEntry("exclude","media/hdd_mounted,media/hdd_unmounted,media/floppy_unmounted,media/cdrom_unmounted,media/floppy5_unmounted"); -->
     </entry>
     <entry name="MediaFreeSpaceDisplayEnabled" key="FreeSpaceDisplayEnabled" type="Bool">
diff --git a/kdesktop/kdiconview.cc b/kdesktop/kdiconview.cpp
index 86737ce3c..86737ce3c 100644
--- a/kdesktop/kdiconview.cc
+++ b/kdesktop/kdiconview.cpp
diff --git a/kdesktop/krootwm.cc b/kdesktop/krootwm.cpp
index 9c68fc740..e5b4b76e0 100644
--- a/kdesktop/krootwm.cc
+++ b/kdesktop/krootwm.cpp
@@ -1,5 +1,5 @@
 /*
- * krootwm.cc Part of the KDE project.
+ * krootwm.cpp Part of the KDE project.
  *
  * Copyright (C) 1997 Matthias Ettrich
  *           (C) 1997 Torben Weis, weis@kde.org
diff --git a/kdesktop/krootwm.h b/kdesktop/krootwm.h
index 8fb5af8b9..264f3eadb 100644
--- a/kdesktop/krootwm.h
+++ b/kdesktop/krootwm.h
@@ -80,7 +80,7 @@ public:
   static KRootWm * self() { return s_rootWm; }
 
   /**
-   * share this with desktop.cc
+   * share this with desktop.cpp
    */
   KNewMenu * newMenu() const { return menuNew; }
 
diff --git a/kdesktop/kwebdesktop/kwebdesktop.kcfg b/kdesktop/kwebdesktop/kwebdesktop.kcfg
index b0920f410..b9a1edbb5 100644
--- a/kdesktop/kwebdesktop/kwebdesktop.kcfg
+++ b/kdesktop/kwebdesktop/kwebdesktop.kcfg
@@ -11,7 +11,7 @@
       <default>http://www.kde.org/</default>
       <label></label>
       <whatsthis></whatsthis>
-      <!-- kdiconview.cc:1103 -->
+      <!-- kdiconview.cpp:1103 -->
       <!--                  cfg.readEntry( "URL" ) == "trash:/" ) { -->
     </entry>
   </group>
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 2bbe4b289..a394932e5 100644
--- a/kdesktop/lock/CMakeLists.txt
+++ b/kdesktop/lock/CMakeLists.txt
@@ -31,8 +31,8 @@ link_directories(
 set( target kdesktop_lock )
 
 set( ${target}_SRCS
-  lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc sakdlg.cc
-  securedlg.cc autologout.cc main.cc
+  lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp sakdlg.cpp
+  securedlg.cpp autologout.cpp main.cpp
 )
 
 tde_add_executable( ${target} AUTOMOC
diff --git a/kdesktop/lock/Makefile.am b/kdesktop/lock/Makefile.am
index 7713707e9..fd1bc1259 100644
--- a/kdesktop/lock/Makefile.am
+++ b/kdesktop/lock/Makefile.am
@@ -8,7 +8,7 @@ kdesktop_lock_LDADD    = ../libkdesktopsettings.la ../../tdmlib/libdmctl.la $(LI
 
 bin_PROGRAMS = kdesktop_lock
 
-kdesktop_lock_SOURCES = lockprocess.cc lockdlg.cc infodlg.cc querydlg.cc autologout.cc main.cc
+kdesktop_lock_SOURCES = lockprocess.cpp lockdlg.cpp infodlg.cpp querydlg.cpp autologout.cpp main.cpp
 
 noinst_HEADERS = lockprocess.h lockdlg.h infodlg.h querydlg.h autologout.h main.h
 
diff --git a/kdesktop/lock/autologout.cc b/kdesktop/lock/autologout.cpp
index 7d6bf6ff1..7d6bf6ff1 100644
--- a/kdesktop/lock/autologout.cc
+++ b/kdesktop/lock/autologout.cpp
diff --git a/kdesktop/lock/infodlg.cc b/kdesktop/lock/infodlg.cpp
index d248d7bd0..d248d7bd0 100644
--- a/kdesktop/lock/infodlg.cc
+++ b/kdesktop/lock/infodlg.cpp
diff --git a/kdesktop/lock/lockdlg.cc b/kdesktop/lock/lockdlg.cpp
index 763d7bf95..763d7bf95 100644
--- a/kdesktop/lock/lockdlg.cc
+++ b/kdesktop/lock/lockdlg.cpp
diff --git a/kdesktop/lock/lockprocess.cc b/kdesktop/lock/lockprocess.cpp
index 67492ea3c..67492ea3c 100644
--- a/kdesktop/lock/lockprocess.cc
+++ b/kdesktop/lock/lockprocess.cpp
diff --git a/kdesktop/lock/main.cc b/kdesktop/lock/main.cpp
index c5993f4ac..c5993f4ac 100644
--- a/kdesktop/lock/main.cc
+++ b/kdesktop/lock/main.cpp
diff --git a/kdesktop/lock/querydlg.cc b/kdesktop/lock/querydlg.cpp
index 7618a5062..7618a5062 100644
--- a/kdesktop/lock/querydlg.cc
+++ b/kdesktop/lock/querydlg.cpp
diff --git a/kdesktop/lock/sakdlg.cc b/kdesktop/lock/sakdlg.cpp
index a062fb0fe..a062fb0fe 100644
--- a/kdesktop/lock/sakdlg.cc
+++ b/kdesktop/lock/sakdlg.cpp
diff --git a/kdesktop/lock/securedlg.cc b/kdesktop/lock/securedlg.cpp
index b38378f2e..b38378f2e 100644
--- a/kdesktop/lock/securedlg.cc
+++ b/kdesktop/lock/securedlg.cpp
diff --git a/kdesktop/lockeng.cc b/kdesktop/lockeng.cpp
index 52826bf24..52826bf24 100644
--- a/kdesktop/lockeng.cc
+++ b/kdesktop/lockeng.cpp
diff --git a/kdesktop/main.cc b/kdesktop/main.cpp
index b54c03cb7..b54c03cb7 100644
--- a/kdesktop/main.cc
+++ b/kdesktop/main.cpp
diff --git a/kdesktop/pixmapserver.cc b/kdesktop/pixmapserver.cpp
index 56224f37a..56224f37a 100644
--- a/kdesktop/pixmapserver.cc
+++ b/kdesktop/pixmapserver.cpp
diff --git a/kdesktop/xautolock.cc b/kdesktop/xautolock.cpp
index 3c7e62670..3c7e62670 100644
--- a/kdesktop/xautolock.cc
+++ b/kdesktop/xautolock.cpp
diff --git a/kicker/applets/run/runapplet.cpp b/kicker/applets/run/runapplet.cpp
index c5d3e972a..aaadfc33d 100644
--- a/kicker/applets/run/runapplet.cpp
+++ b/kicker/applets/run/runapplet.cpp
@@ -233,7 +233,7 @@ void RunApplet::run_command(const TQString& command)
 	    bool shutdown = kapp->requestShutDown();
 	    if( !shutdown )
             {
-                // This i18n string is in kdesktop/desktop.cc as well. Maybe we should DCOP to kdesktop instead ?
+                // This i18n string is in kdesktop/desktop.cpp as well. Maybe we should DCOP to kdesktop instead ?
 		KMessageBox::error( 0, i18n("Unable to log out properly.\nThe session manager cannot "
 					    "be contacted. You can try to force a shutdown by pressing "
 					    "Ctrl+Alt+Backspace. Note, however, that your current "
diff --git a/kicker/menuext/tom/Makefile.am b/kicker/menuext/tom/Makefile.am
index 0f9f7c081..16a46a9dc 100644
--- a/kicker/menuext/tom/Makefile.am
+++ b/kicker/menuext/tom/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = -I$(srcdir)/../../libkicker -I$(srcdir)/../../ui -I$(srcdir)/../../co
 
 kde_module_LTLIBRARIES = kickermenu_tom.la
 
-kickermenu_tom_la_SOURCES = tom.cc
+kickermenu_tom_la_SOURCES = tom.cpp
 kickermenu_tom_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kickermenu_tom_la_LIBADD = $(LIB_TDEUI)
 #$(top_builddir)/kicker/ui/libkicker_ui.la 
@@ -16,4 +16,4 @@ tomdata_DATA = destinations
 tomdatadir = $(kde_datadir)/kicker/tom
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/libkickermenu_tom.pot
+	$(XGETTEXT) *.cpp -o $(podir)/libkickermenu_tom.pot
diff --git a/kicker/menuext/tom/README b/kicker/menuext/tom/README
index 926ae0e81..7fe6eb332 100644
--- a/kicker/menuext/tom/README
+++ b/kicker/menuext/tom/README
@@ -60,6 +60,6 @@ What should be the default task entry format be:
     c) App Name (Task Name)  <-- silly option =)
 Should "Run A Command..." be replaced by an inline combobox?
     Pros: It's more obvious and will work even if kdesktop is gone. The widget
-          is already written (in tom.cc)
+          is already written (in tom.cpp)
     Cons: It makes it stand out too much over other entries, takes up more room
           and isn't as powerful as the full minicli
diff --git a/kicker/menuext/tom/tom.cc b/kicker/menuext/tom/tom.cpp
index 0fa85a1e3..0fa85a1e3 100644
--- a/kicker/menuext/tom/tom.cc
+++ b/kicker/menuext/tom/tom.cpp
diff --git a/konqueror/CMakeLists.txt b/konqueror/CMakeLists.txt
index bd6f9d974..aa6091502 100644
--- a/konqueror/CMakeLists.txt
+++ b/konqueror/CMakeLists.txt
@@ -141,13 +141,13 @@ tde_add_library( ${target} STATIC_PIC
 set( target konqueror )
 
 set( ${target}_SRCS
-  konq_main.cc KonquerorIface.cc KonquerorIface.skel
-  KonqMainWindowIface.cc KonqMainWindowIface.skel
-  KonqViewIface.cc KonqViewIface.skel konq_guiclients.cc
-  konq_run.cc konq_view.cc konq_viewmgr.cc konq_misc.cc
-  konq_frame.cc konq_tabs.cc konq_actions.cc konq_profiledlg.cc
-  konq_factory.cc konq_combo.cc	konq_browseriface.cc
-  delayedinitializer.cc konq_mainwindow.cc konq_extensionmanager.cc
+  konq_main.cpp KonquerorIface.cpp KonquerorIface.skel
+  KonqMainWindowIface.cpp KonqMainWindowIface.skel
+  KonqViewIface.cpp KonqViewIface.skel konq_guiclients.cpp
+  konq_run.cpp konq_view.cpp konq_viewmgr.cpp konq_misc.cpp
+  konq_frame.cpp konq_tabs.cpp konq_actions.cpp konq_profiledlg.cpp
+  konq_factory.cpp konq_combo.cpp	konq_browseriface.cpp
+  delayedinitializer.cpp konq_mainwindow.cpp konq_extensionmanager.cpp
 )
 
 tde_add_tdeinit_executable( ${target} AUTOMOC
diff --git a/konqueror/ChangeLog b/konqueror/ChangeLog
index bdd198606..a6b8bed4c 100644
--- a/konqueror/ChangeLog
+++ b/konqueror/ChangeLog
@@ -5,14 +5,14 @@
 
 2001-05-05  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc: Set WDestructiveClose again when going
+	* konq_mainwindow.cpp: Set WDestructiveClose again when going
 	to fullscreen mode (Qt bug), to prevent Alt+F4 from crashing.
-	* konq_misc.cc: Only abort full-screen mode for windows on the
+	* konq_misc.cpp: Only abort full-screen mode for windows on the
 	current desktop.
 
 2001-05-01  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc : moved the connect and disconnect calls
+	* konq_mainwindow.cpp : moved the connect and disconnect calls
 	to/from the highlighting signals of the actioncollections into
 	two separate methods, for cleanup, and use the qt child deletion
 	mechanism to delete the bookmark actioncollection
@@ -26,11 +26,11 @@
 	starts flickering like mad, when the window width is getting
 	small than the length of the url in the combobox.
 	
-	* konq_mainwindow.cc (initActions): use KonqGoURLAction
+	* konq_mainwindow.cpp (initActions): use KonqGoURLAction
 
 2001-04-27  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (goURL): new slot, sending a fake key
+	* konq_mainwindow.cpp (goURL): new slot, sending a fake key
 	event to the lineedit, acting like the user pressing return
 	(initActions): allocate a "Go" action and connect it to the
 	new goURL slot
@@ -39,22 +39,22 @@
 
 2001-04-07  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (slotReload): call m_currentView->lockHistory(),
+	* konq_mainwindow.cpp (slotReload): call m_currentView->lockHistory(),
 	to fix #23818
-	* konq_view.cc/h (reload): removed obsolete method
+	* konq_view.cpp/h (reload): removed obsolete method
 
 2001-03-31  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc(slotRunFinished): Stop wheel animation when a 
+	* konq_mainwindow.cpp(slotRunFinished): Stop wheel animation when a 
 	konqrun fails and we have no view.
 
 2001-03-25  Simon Hausmann  <simon@kde.org>
 
-	* iconview/konq_iconview.cc (KonqKfmIconView): specify a status text for
+	* iconview/konq_iconview.cpp (KonqKfmIconView): specify a status text for
 	some actions. Likewise for some actions in KonqDirPart. Also call
 	setHighlightingEnabled in the KonqDirPart constructor
 
-	* konq_mainwindow.cc (slotShowMenuBar): call saveMainWindowSettings and
+	* konq_mainwindow.cpp (slotShowMenuBar): call saveMainWindowSettings and
 	TDEGlobal::config()->sync() after toggling the visiblity of the menubar,
 	just like it is done for toolbars.
 	(slotPartActivated): connect and disconnect to/from the actionStatusText
@@ -62,25 +62,25 @@
 
 2001-03-02  Simon Hausmann  <simon@kde.org>
 
-	* konq_view.cc, konq_browseriface.cc/h: Utilize and implement the newly
+	* konq_view.cpp, konq_browseriface.cpp/h: Utilize and implement the newly
 	  added KParts::BrowserInterface
 
 2001-02-06  Simon Hausmann  <simon@kde.org>
 	
-	* konq_mainwindow.cc (openBookmarkURL): Patch by 
+	* konq_mainwindow.cpp (openBookmarkURL): Patch by 
 	Marco Krohn <Marco.Krohn@stud.uni-hannover.de> to call openFilteredURL
 	instead of openURL. Allows environment variables in bookmarks and
 	other sugar.
 
 2001-01-28  Stephan Kulow  <coolo@kde.org>
 
-	* konq_mainwindow.cc (initActions): Plug the actions into a TDEAccel to
+	* konq_mainwindow.cpp (initActions): Plug the actions into a TDEAccel to
 	fix short cuts in full screen mode
 
 2001-01-16  Simon Hausmann  <simon@kde.org>
 
-	* konq_actions.cc (fillHistoryPopup),
-	  libkonq/kbookmarkmenu.cc (fillBookmarkMenu): When a Website has
+	* konq_actions.cpp (fillHistoryPopup),
+	  libkonq/kbookmarkmenu.cpp (fillBookmarkMenu): When a Website has
 	"&" in the Title, make sure to transform it into "&&" before
 	inserting it into a QPopupMenu (for history or for bookmarks) , to
 	avoid QPopupMenu interpreting it as accelerator.
@@ -88,30 +88,30 @@
 
 2001-01-15  David Faure  <faure@kde.org>
 
-	* konq_aboutpage.cc, konq_mainwindow.cc: Support for "about:konqueror".
+	* konq_aboutpage.cpp, konq_mainwindow.cpp: Support for "about:konqueror".
 	Credits to Simon for the part, and Torsten for the icons.
 
 2001-01-14  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc (loadItem): Use openView instead of view->openURL,
+	* konq_viewmgr.cpp (loadItem): Use openView instead of view->openURL,
 	so that "view-follows-view" is also applied on startup. Fixes #17679.
 
-	* konq_mainwindow.cc etc.: Lock to current location doesn't make the
+	* konq_mainwindow.cpp etc.: Lock to current location doesn't make the
 	view passive anymore. This allows to e.g. change the view mode.
 
-	* konq_frame.cc: Added Lock / Unlock to view statusbar's popupmenu.
+	* konq_frame.cpp: Added Lock / Unlock to view statusbar's popupmenu.
 
 2001-01-13  David Faure  <faure@kde.org>
 
-	* konq_dirpart.cc etc.: Always paste to current directory, even
+	* konq_dirpart.cpp etc.: Always paste to current directory, even
 	when an item is selected.
 
 2001-01-12  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc (loadViewProfile): Set active part before loading
+	* konq_viewmgr.cpp (loadViewProfile): Set active part before loading
 	URL, so that the URL appears in the location bar.
 
-	* konq_mainwindow.cc, konq_dirpart.cc: Store find part into history,
+	* konq_mainwindow.cpp, konq_dirpart.cpp: Store find part into history,
 	in order to restore it when pressing back.
 
 2001-01-11  David Faure  <faure@kde.org>
@@ -132,7 +132,7 @@
 
 2001-01-08  Simon Hausmann  <simon@kde.org>
 
-	* KonquerorIface.cc (openBrowserWindow),
+	* KonquerorIface.cpp (openBrowserWindow),
 	(createNewWindow),
 	(createNewWindow), 
 	(createBrowserWindowFromProfile),
@@ -150,14 +150,14 @@
 	
 2000-12-28  Simon Hausmann  <simon@kde.org>
 
-	* konq_viewmgr.cc (loadViewProfile): When loading an empty profile
+	* konq_viewmgr.cpp (loadViewProfile): When loading an empty profile
 	(in particular the webbrowsing one) , activate the clear_location
 	action. This gives the focus to the location bar -> the user can
 	type in an url right away when loading the webbrowsing profile
 
 2000-12-27  Simon Hausmann  <simon@kde.org>
 
-	* konq_mainwindow.cc (enableAllActions): for iterating over all actions
+	* konq_mainwindow.cpp (enableAllActions): for iterating over all actions
 	don't use the action( int index ) method of TDEActionCollection but instead
 	retrieve a QValueList<TDEAction *> and iterate over that, as the =+(int)
 	operator of QDictIterator isn't really fast
@@ -166,16 +166,16 @@
 	
 2000-12-12  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: Fixed saving of profiles containing views
+	* konq_viewmgr.cpp: Fixed saving of profiles containing views
 	"locked to their current location". The attribute was missing from 
 	the profile.
 
-	* konq_mainwindow.cc: Save and restore the preferred service in for 
+	* konq_mainwindow.cpp: Save and restore the preferred service in for 
 	each toolbar 'viewmode' button.
 
 2000-12-10  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc, konq_view.*, browserextension.*: Fixed
+	* konq_mainwindow.cpp, konq_view.*, browserextension.*: Fixed
 	the initial state of the common actions (cut,copy,paste etc.).
 	Had to move all the handling of the action states to browserextension.
 
@@ -203,7 +203,7 @@
 
 2000-12-08  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc (openURL): Support for about:blank
+	* konq_mainwindow.cpp (openURL): Support for about:blank
 	Fix for severe problems with the activation of the standard actions.
 	The state of the action is now stored in each KonqView.
 	
@@ -220,77 +220,77 @@
 
 2000-12-06  Matthias Elter <elter@kde.org>
 
-	* konq_mainwindow.cc: Turned the Configure submenu into a single dialog.
+	* konq_mainwindow.cpp: Turned the Configure submenu into a single dialog.
 
 2000-12-02  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc (slotToolFind): "Find Files" now embeds the kfind
+	* konq_mainwindow.cpp (slotToolFind): "Find Files" now embeds the kfind
 	part, and the result of the search is connected to the current directory
 	part. "Close" or opening any other URL closes the 'find' part.
 	Thanks to Eric Coquelle for the kfind classes, and to jpmartin for 
 	pushing us to do this :)
 
-	* konq_viewmgr.cc: Support for suicidal passive views, more arguments 
+	* konq_viewmgr.cpp: Support for suicidal passive views, more arguments 
 	to splitView and splitWindow.
 
-	* konq_guiclients.cc: Duplicated code removed, uses splitWindow now.
+	* konq_guiclients.cpp: Duplicated code removed, uses splitWindow now.
 
 2000-11-30  David Faure  <faure@kde.org>
 
-	* konq_mainwindow.cc: Use current profile in "New Window" to fix #16283.
+	* konq_mainwindow.cpp: Use current profile in "New Window" to fix #16283.
 
 2000-11-28  David Faure  <faure@kde.org>
 
-	* konq_actions.cc: Accel (Alt+O in English) to give focus to location bar,
+	* konq_actions.cpp: Accel (Alt+O in English) to give focus to location bar,
 	shown by the label.
 
-	* konq_profiledlg.cc: Ported to TDEListView to fix problems with selection.
+	* konq_profiledlg.cpp: Ported to TDEListView to fix problems with selection.
 
 2000-11-26  David Faure  <faure@kde.org>
 
-	* konq_misc.cc, kfmclient.cc, KonquerorIface.cc: Speed up for URLs opened
+	* konq_misc.cpp, kfmclient.cpp, KonquerorIface.cpp: Speed up for URLs opened
 	from another process using KRun (e.g. kdesktop's Minicli), by passing the
 	mimetype through to konqueror.
 
 2000-11-25  David Faure  <faure@kde.org>
 
-	* konq_misc.cc: Fixed location bar not showing the URL asap.
+	* konq_misc.cpp: Fixed location bar not showing the URL asap.
 	
-	* konq_mainwindow.cc : Icons for the configure submenu.
+	* konq_mainwindow.cpp : Icons for the configure submenu.
 
-	* konq_actions.cc : KonqHistoryAction turned into TDEToolBarPopupAction.
+	* konq_actions.cpp : KonqHistoryAction turned into TDEToolBarPopupAction.
 	Drag the "Location" label to start a drag with the current URL.
 
 2000-11-25  Simon Hausmann  <simon@kde.org>
 
-	* konq_view.cc (connectPart): Install new url event filter for plain
+	* konq_view.cpp (connectPart): Install new url event filter for plain
 	krops and for browserviews with the enableURLDropHandling property enabled
 	(eventFilter): New eventfilter which listens for url drop events
 
 Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
-	* konq_mainwindow.cc: Completion handling overhauled. We have
+	* konq_mainwindow.cpp: Completion handling overhauled. We have
 	one KonqHistoryManager, which holds a TDECompletion object and syncs
 	the history with the completion.
 
-	* konq_view.cc: 
+	* konq_view.cpp: 
 	set m_bAborted before calling slotCompleted in 	slotCanceled()
 	feed the history manager
 
-	* konq_actions.cc: use KonqHistoryCombo that doesn't mess with the
+	* konq_actions.cpp: use KonqHistoryCombo that doesn't mess with the
 	competion-object, we do our own synchronization now.
 	
 	* libkonq/ added konq_history*
 	
 2000-11-22  David Faure  <faure@kde.org>
 
-	* konq_listview.cc: Added "Default" Icon Size, which corresponds to 
+	* konq_listview.cpp: Added "Default" Icon Size, which corresponds to 
 	TDEIcon::Small (but when switching to icon view, it becomes whatever's 
 	configured for the "Desktop" group).
 
 2000-11-21  David Faure  <faure@kde.org>
 
-	* konq_listview.cc: Case Insensitive Sort option, on by default.
+	* konq_listview.cpp: Case Insensitive Sort option, on by default.
 
 	* Views: Major rework of the "delayed mimetypes determination" feature,
 	to make it available to the list view. This makes the list view
@@ -303,30 +303,30 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-11-17  David Faure  <faure@kde.org>
 
-	* konq_profiledlg.cc: Made checkbox states persistent (saved to config)
+	* konq_profiledlg.cpp: Made checkbox states persistent (saved to config)
 
-	* konq_run.cc: Check that when we call KRun from KonqRun, it's not going
+	* konq_run.cpp: Check that when we call KRun from KonqRun, it's not going
 	to launch another konqueror.
-	* konq_guiclients.cc: Build toggle-view actions in the actioncollection 
+	* konq_guiclients.cpp: Build toggle-view actions in the actioncollection 
 	of the mainwindow, so that it's possible to assign them a shortcut.
 
 2000-11-16  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: Patch by Keunwoo Lee <klee@cs.washington.edu> to
+	* konq_viewmgr.cpp: Patch by Keunwoo Lee <klee@cs.washington.edu> to
 	implement dynamic accels for the profile submenu.
 
 2000-11-15  David Faure  <faure@kde.org>
 
-	* konq_drag.cc: Export URLs as text/plain as well.
+	* konq_drag.cpp: Export URLs as text/plain as well.
 
-	* konq_mainwindow.cc: Implemented auto-saving of toolbars (TDEMainWindow),
+	* konq_mainwindow.cpp: Implemented auto-saving of toolbars (TDEMainWindow),
 	removed "Save Settings".
 	Fixed "clicking on directory in dirtree uses wrong view mode for dirs".
-	* konq_iconview.cc: Added +/- buttons for changing the icon size.
+	* konq_iconview.cpp: Added +/- buttons for changing the icon size.
 
 2000-11-06  David Faure  <faure@kde.org>
 
-	* konq_operations.cc: statURL, calls a slot when it stat'ed
+	* konq_operations.cpp: statURL, calls a slot when it stat'ed
 	the url and created a tdefileitem for it.
 	Used in doDrop when the destination's tdefileitem is unknown. Fixes #14739.
 	Also, KPropsDlg now does a similar thing when called with a KURL.
@@ -336,30 +336,30 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 	* konqueror.rc: Moved the "open with" actions to the Location menu,
 	and added a separator to the action list.
 
-	* konq_view.cc (connectPart): moved call to setSaveViewPropertiesLocally
+	* konq_view.cpp (connectPart): moved call to setSaveViewPropertiesLocally
 	(used to be in various places in KonqMW) so that the flag is
 	also correct when switching views.
 
-	* konq_dirpart.cc and directory views: apply background color and pixmap
+	* konq_dirpart.cpp and directory views: apply background color and pixmap
 	to the viewport(), and updated konq_iconview to do the same. This fixes
 	many inconsistencies, and makes resizing a window much faster & smoother.
 	Note that it has to be the viewport and not the widget, otherwise in the
 	listview, the box between the scrollbars appears colored/pixmap-ed.
 
-	* konq_mainwindow.cc: action renamed View Properties Saved In Directory
+	* konq_mainwindow.cpp: action renamed View Properties Saved In Directory
 
 2000-11-04  David Faure  <faure@kde.org>
 
-	* konq_viewmgr.cc: now takes care of enableAllActions.
+	* konq_viewmgr.cpp: now takes care of enableAllActions.
 	Show led and active statusbar even in the tree+icon configuration
 	(the rule is now "more than one view", not "more than one activeable 
 	view"). This should remove some confusion.
 
-	* konq_frame.cc: "Remove View" in RMB on statusbar.
+	* konq_frame.cpp: "Remove View" in RMB on statusbar.
 	Don't try to activate passive views when clicking statusbar.
 	Different background color on statusbar for active view.
 
-	* konq_mainwindow.cc: Fixes for "Remove Active View" enabling,
+	* konq_mainwindow.cpp: Fixes for "Remove Active View" enabling,
 	to avoid ending up with a lonely embedded konsole, and some
 	cleanup of code for enabling other view-related actions.
 	Introducing updateViewActions for common code between enableAllActions
@@ -393,10 +393,10 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-10-22  David Faure  <faure@kde.org>
 
-	* dirtree/konq_dirtree.cc: Fixed support for devices in the directory 
+	* dirtree/konq_dirtree.cpp: Fixed support for devices in the directory 
 	tree. It currently requires MountPoint in the device desktop file.
 
-	* listview/konq_textviewwidget.cc: Only the Name column is now
+	* listview/konq_textviewwidget.cpp: Only the Name column is now
 	selected, and used as a drop area - like in other listviews.
 	This requires the fix in TDEListView to work properly.
 
@@ -406,7 +406,7 @@ Sat Nov 25 17:38:27 2000  Carsten Pfeiffer  <pfeiffer@kde.org>
 
 2000-10-20  David Faure  <faure@kde.org>
 
-	* konq_misc.cc: Use webbrowsing profile for *.html *.htm as well.
+	* konq_misc.cpp: Use webbrowsing profile for *.html *.htm as well.
 
 2000-10-20  Simon Hausmann  <hausmann@kde.org>
 
diff --git a/konqueror/KonqMainWindowIface.cc b/konqueror/KonqMainWindowIface.cpp
index a18301a2f..a18301a2f 100644
--- a/konqueror/KonqMainWindowIface.cc
+++ b/konqueror/KonqMainWindowIface.cpp
diff --git a/konqueror/KonqViewIface.cc b/konqueror/KonqViewIface.cpp
index 77bfbb61c..77bfbb61c 100644
--- a/konqueror/KonqViewIface.cc
+++ b/konqueror/KonqViewIface.cpp
diff --git a/konqueror/KonquerorIface.cc b/konqueror/KonquerorIface.cpp
index cd3ed7591..6a164b160 100644
--- a/konqueror/KonquerorIface.cc
+++ b/konqueror/KonquerorIface.cpp
@@ -254,7 +254,7 @@ bool KonquerorIface::processCanBeReused( int screen )
     if( allowed_parts.count() == 1 && allowed_parts.first() == TQString::fromLatin1( "SAFE" ))
     {
         allowed_parts.clear();
-        // is duplicated in client/kfmclient.cc
+        // is duplicated in client/kfmclient.cpp
         allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
                       << TQString::fromLatin1( "konq_multicolumnview.desktop" )
                       << TQString::fromLatin1( "konq_sidebartng.desktop" )
diff --git a/konqueror/Makefile.am b/konqueror/Makefile.am
index e84ddffcf..a81cabe84 100644
--- a/konqueror/Makefile.am
+++ b/konqueror/Makefile.am
@@ -22,23 +22,23 @@ METASOURCES = AUTO
 include_HEADERS = KonquerorIface.h
 
 libkonqueror_intern_la_SOURCES = konq_settingsxt.kcfgc
-konqueror_la_SOURCES = konq_main.cc \
-	    KonquerorIface.cc KonquerorIface.skel \
-	    KonqMainWindowIface.cc KonqMainWindowIface.skel \
-	    KonqViewIface.cc KonqViewIface.skel \
-	    konq_guiclients.cc \
-	    konq_run.cc konq_view.cc konq_viewmgr.cc \
-	    konq_misc.cc \
-	    konq_frame.cc \
-	    konq_tabs.cc \
-	    konq_actions.cc \
-	    konq_profiledlg.cc \
-	    konq_factory.cc \
-	    konq_combo.cc	\
-	    konq_browseriface.cc \
-	    delayedinitializer.cc \
-	    konq_mainwindow.cc  \
-	    konq_extensionmanager.cc
+konqueror_la_SOURCES = konq_main.cpp \
+	    KonquerorIface.cpp KonquerorIface.skel \
+	    KonqMainWindowIface.cpp KonqMainWindowIface.skel \
+	    KonqViewIface.cpp KonqViewIface.skel \
+	    konq_guiclients.cpp \
+	    konq_run.cpp konq_view.cpp konq_viewmgr.cpp \
+	    konq_misc.cpp \
+	    konq_frame.cpp \
+	    konq_tabs.cpp \
+	    konq_actions.cpp \
+	    konq_profiledlg.cpp \
+	    konq_factory.cpp \
+	    konq_combo.cpp	\
+	    konq_browseriface.cpp \
+	    delayedinitializer.cpp \
+	    konq_mainwindow.cpp  \
+	    konq_extensionmanager.cpp
 
 konqueror_la_PCH = AUTO
 
@@ -59,14 +59,14 @@ konqueror_la_LIBADD = ../libkonq/libkonq.la libkonqueror_intern.la $(LIBMALLOC)
 # and make clean ; make konqueror_static in here.
 #check_PROGRAMS = konqueror_static
 #
-#konqueror_static_SOURCES = dummy.cc
+#konqueror_static_SOURCES = dummy.cpp
 #konqueror_static_LDADD = konqueror.la *view/*.la dirtree/*.la $(libdir)/libtdehtml.la
 #konqueror_static_LDFLAGS = $(all_libraries) -static
 
 messages: rc.cpp
 	$(EXTRACTRC) *.rc */*.rc >> rc.cpp
 	$(EXTRACTRC) sidebar/trees/history_module/history_dlg.ui >> rc.cpp
-	$(XGETTEXT) -kaliasLocal rc.cpp *.h *.cc *view/*h *view/*cc  kedit*/*.h kedit*/*.cpp about/*.h about/*.cc remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot
+	$(XGETTEXT) -kaliasLocal rc.cpp *.h *.cpp *view/*h *view/*.cpp  kedit*/*.h kedit*/*.cpp about/*.h about/*.cpp remoteencodingplugin/*.cpp remoteencodingplugin/*.h shellcmdplugin/*.cpp -o `find sidebar -name "*.cpp"` `find sidebar -name "*.h"` -o $(podir)/konqueror.pot
 
 xdg_apps_DATA = kfmclient.desktop kfmclient_dir.desktop kfmclient_html.desktop \
 	kfmclient_war.desktop konqbrowser.desktop konquerorsu.desktop Home.desktop
diff --git a/konqueror/about/CMakeLists.txt b/konqueror/about/CMakeLists.txt
index 9d77c04be..ffa5d4b96 100644
--- a/konqueror/about/CMakeLists.txt
+++ b/konqueror/about/CMakeLists.txt
@@ -47,7 +47,7 @@ install( FILES
 set( target konq_aboutpage )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_aboutpage.cc
+  SOURCES konq_aboutpage.cpp
   LINK tdehtml-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/about/Makefile.am b/konqueror/about/Makefile.am
index 0a33f9bb7..f4ede2182 100644
--- a/konqueror/about/Makefile.am
+++ b/konqueror/about/Makefile.am
@@ -1,7 +1,7 @@
 kde_module_LTLIBRARIES = konq_aboutpage.la
 
 INCLUDES = -I$(srcdir)/.. -I$(top_srcdir)/libkonq $(all_includes)
-konq_aboutpage_la_SOURCES = konq_aboutpage.cc
+konq_aboutpage_la_SOURCES = konq_aboutpage.cpp
 konq_aboutpage_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_aboutpage_la_LIBADD = $(LIB_TDEHTML)
 
diff --git a/konqueror/about/konq_aboutpage.cc b/konqueror/about/konq_aboutpage.cpp
index cb2149f90..cb2149f90 100644
--- a/konqueror/about/konq_aboutpage.cc
+++ b/konqueror/about/konq_aboutpage.cpp
diff --git a/konqueror/client/CMakeLists.txt b/konqueror/client/CMakeLists.txt
index 3ae477d32..fe45ce141 100644
--- a/konqueror/client/CMakeLists.txt
+++ b/konqueror/client/CMakeLists.txt
@@ -32,7 +32,7 @@ install( PROGRAMS kfmclient_3_2_update.sh DESTINATION ${DATA_INSTALL_DIR}/tdecon
 set( target kfmclient )
 
 set( ${target}_SRCS
-  kfmclient.cc
+  kfmclient.cpp
   ${CMAKE_SOURCE_DIR}/konqueror/KonquerorIface.stub
   ${CMAKE_SOURCE_DIR}/kdesktop/KDesktopIface.stub
 )
diff --git a/konqueror/client/Makefile.am b/konqueror/client/Makefile.am
index feef3b720..c146b520b 100644
--- a/konqueror/client/Makefile.am
+++ b/konqueror/client/Makefile.am
@@ -7,7 +7,7 @@ tdeinit_LTLIBRARIES = kfmclient.la
 INCLUDES= -I.. $(all_includes)
 kfmclient_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kfmclient_la_LIBADD =  $(LIB_TDEIO)
-kfmclient_la_SOURCES = kfmclient.cc KonquerorIface.stub KDesktopIface.stub
+kfmclient_la_SOURCES = kfmclient.cpp KonquerorIface.stub KDesktopIface.stub
 
 noinst_HEADERS = kfmclient.h
 METASOURCES = AUTO
@@ -16,7 +16,7 @@ KonquerorIface_DIR =  $(srcdir)/..
 KDesktopIface_DIR = $(top_srcdir)/kdesktop
 
 messages:
-	$(XGETTEXT) -kaliasLocal *.h *.cc -o $(podir)/kfmclient.pot
+	$(XGETTEXT) -kaliasLocal *.h *.cpp -o $(podir)/kfmclient.pot
 
 updatedir = $(kde_datadir)/tdeconf_update
 update_DATA = kfmclient_3_2.upd
diff --git a/konqueror/client/kfmclient.cc b/konqueror/client/kfmclient.cpp
index c0f0c5c69..efc858f61 100644
--- a/konqueror/client/kfmclient.cc
+++ b/konqueror/client/kfmclient.cpp
@@ -181,7 +181,7 @@ static bool startNewKonqueror( TQString url, TQString mimetype, const TQString&
     TDEConfig cfg( TQString::fromLatin1( "konquerorrc" ), true );
     cfg.setGroup( "Reusing" );
     TQStringList allowed_parts;
-    // is duplicated in ../KonquerorIface.cc
+    // is duplicated in ../KonquerorIface.cpp
     allowed_parts << TQString::fromLatin1( "konq_iconview.desktop" )
                   << TQString::fromLatin1( "konq_multicolumnview.desktop" )
                   << TQString::fromLatin1( "konq_sidebartng.desktop" )
diff --git a/konqueror/delayedinitializer.cc b/konqueror/delayedinitializer.cpp
index e30db3d21..e30db3d21 100644
--- a/konqueror/delayedinitializer.cc
+++ b/konqueror/delayedinitializer.cpp
diff --git a/konqueror/iconview/CMakeLists.txt b/konqueror/iconview/CMakeLists.txt
index e88884b47..f308f226a 100644
--- a/konqueror/iconview/CMakeLists.txt
+++ b/konqueror/iconview/CMakeLists.txt
@@ -39,7 +39,7 @@ install( FILES konq_iconview.rc konq_multicolumnview.rc DESTINATION ${DATA_INSTA
 set( target konq_iconview )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES konq_iconview.cc
+  SOURCES konq_iconview.cpp
   LINK konq-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/konqueror/iconview/Makefile.am b/konqueror/iconview/Makefile.am
index bc685d997..34b4f31a8 100644
--- a/konqueror/iconview/Makefile.am
+++ b/konqueror/iconview/Makefile.am
@@ -5,7 +5,7 @@ kde_module_LTLIBRARIES = konq_iconview.la
 
 METASOURCES = AUTO
 
-konq_iconview_la_SOURCES = konq_iconview.cc
+konq_iconview_la_SOURCES = konq_iconview.cpp
 konq_iconview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
 konq_iconview_la_LIBADD = $(top_builddir)/libkonq/libkonq.la
 
diff --git a/konqueror/iconview/konq_iconview.cc b/konqueror/iconview/konq_iconview.cpp
index 288984fe3..288984fe3 100644
--- a/konqueror/iconview/konq_iconview.cc
+++ b/konqueror/iconview/konq_iconview.cpp
diff --git a/konqueror/konq_actions.cc b/konqueror/konq_actions.cpp
index 934c326f7..934c326f7 100644
--- a/konqueror/konq_actions.cc
+++ b/konqueror/konq_actions.cpp
diff --git a/konqueror/konq_browseriface.cc b/konqueror/konq_browseriface.cpp
index ebec2ef04..ebec2ef04 100644
--- a/konqueror/konq_browseriface.cc
+++ b/konqueror/konq_browseriface.cpp
diff --git a/konqueror/konq_combo.cc b/konqueror/konq_combo.cpp
index 17075a529..850859b58 100644
--- a/konqueror/konq_combo.cc
+++ b/konqueror/konq_combo.cpp
@@ -651,7 +651,7 @@ void KonqCombo::setPageSecurity( int pageSecurity )
 
 bool KonqCombo::hasSufficientContrast(const TQColor &c1, const TQColor &c2)
 {
-    // Taken from tdehtml/misc/helper.cc
+    // Taken from tdehtml/misc/helper.cpp
 #define HUE_DISTANCE 40
 #define CONTRAST_DISTANCE 10
 
diff --git a/konqueror/konq_extensionmanager.cc b/konqueror/konq_extensionmanager.cpp
index 4ddfb8870..b00522252 100644
--- a/konqueror/konq_extensionmanager.cc
+++ b/konqueror/konq_extensionmanager.cpp
@@ -1,5 +1,5 @@
 /*
-    konq_extensionmanager.cc - Extension Manager for Konqueror
+    konq_extensionmanager.cpp - Extension Manager for Konqueror
 
     Copyright (c) 2003      by Martijn Klingens      <klingens@kde.org>
     Copyright (c) 2004      by Arend van Beelen jr.  <arend@auton.nl>
diff --git a/konqueror/konq_factory.cc b/konqueror/konq_factory.cpp
index d89cbf9a6..d89cbf9a6 100644
--- a/konqueror/konq_factory.cc
+++ b/konqueror/konq_factory.cpp
diff --git a/konqueror/konq_frame.cc b/konqueror/konq_frame.cpp
index 0acf39b49..0acf39b49 100644
--- a/konqueror/konq_frame.cc
+++ b/konqueror/konq_frame.cpp
diff --git a/konqueror/konq_guiclients.cc b/konqueror/konq_guiclients.cpp
index 31647b0c3..31647b0c3 100644
--- a/konqueror/konq_guiclients.cc
+++ b/konqueror/konq_guiclients.cpp
diff --git a/konqueror/konq_main.cc b/konqueror/konq_main.cpp
index ee1fc71db..ee1fc71db 100644
--- a/konqueror/konq_main.cc
+++ b/konqueror/konq_main.cpp
diff --git a/konqueror/konq_mainwindow.cc b/konqueror/konq_mainwindow.cpp
index 193d2ebca..67bf27abf 100644
--- a/konqueror/konq_mainwindow.cc
+++ b/konqueror/konq_mainwindow.cpp
@@ -2131,7 +2131,7 @@ void KonqMainWindow::applyKonqMainWindowSettings()
 void KonqMainWindow::slotSetStatusBarText( const TQString & )
 {
    // Reimplemented to disable KParts::MainWindow default behaviour
-   // Does nothing here, see konq_frame.cc
+   // Does nothing here, see konq_frame.cpp
 }
 
 void KonqMainWindow::slotViewCompleted( KonqView * view )
diff --git a/konqueror/konq_misc.cc b/konqueror/konq_misc.cpp
index b2f0ad47f..b2f0ad47f 100644
--- a/konqueror/konq_misc.cc
+++ b/konqueror/konq_misc.cpp
diff --git a/konqueror/konq_misc.h b/konqueror/konq_misc.h
index ada1712c5..762d72d19 100644
--- a/konqueror/konq_misc.h
+++ b/konqueror/konq_misc.h
@@ -21,7 +21,7 @@
 #define _konq_misc_h
 
 // This file can hold every global class for konqueror that used to pollute
-// konq_main.cc
+// konq_main.cpp
 
 #include <krun.h>
 #include <tdeparts/browserextension.h>
diff --git a/konqueror/konq_profiledlg.cc b/konqueror/konq_profiledlg.cpp
index f7241713b..f7241713b 100644
--- a/konqueror/konq_profiledlg.cc
+++ b/konqueror/konq_profiledlg.cpp
diff --git a/konqueror/konq_run.cc b/konqueror/konq_run.cpp
index 8c2a91329..8c2a91329 100644
--- a/konqueror/konq_run.cc
+++ b/konqueror/konq_run.cpp
diff --git a/konqueror/konq_tabs.cc b/konqueror/konq_tabs.cpp
index 868b8edc9..868b8edc9 100644
--- a/konqueror/konq_tabs.cc
+++ b/konqueror/konq_tabs.cpp
diff --git a/konqueror/konq_view.cc b/konqueror/konq_view.cpp
index 72810d6ae..72810d6ae 100644
--- a/konqueror/konq_view.cc
+++ b/konqueror/konq_view.cpp
diff --git a/konqueror/konq_viewmgr.cc b/konqueror/konq_viewmgr.cpp
index 495d267e8..495d267e8 100644
--- a/konqueror/konq_viewmgr.cc
+++ b/konqueror/konq_viewmgr.cpp
diff --git a/konqueror/konqueror.kcfg b/konqueror/konqueror.kcfg
index ec4728e03..4049e8791 100644
--- a/konqueror/konqueror.kcfg
+++ b/konqueror/konqueror.kcfg
@@ -158,14 +158,14 @@
       <whatsthis></whatsthis>
       <!-- checked -->
     </entry>
-<!-- konq_settings.cc --> 
+<!-- konq_settings.cpp --> 
     <entry key="WordWrapText" type="Bool"> <!--LIBKONQ-->
       <default>true</default> 
       <label></label>
       <whatsthis></whatsthis>
       <!-- no writeEntry -->
     </entry>
-<!-- konq_tabs.cc --> 
+<!-- konq_tabs.cpp --> 
     <entry key="MouseMiddleClickClosesTab" type="Bool">
       <default>false</default> 
       <label></label>
@@ -282,7 +282,7 @@
       <whatsthis></whatsthis>
       <!-- checked -->
     </entry>
-<!-- konq_view.cc -->
+<!-- konq_view.cpp -->
     <entry key="EnableFavicon" type="Bool">
       <default>true</default> 
       <label></label>
@@ -502,7 +502,7 @@ PATH_JAVA
   </group>
    
   <group name="ModeToolBarServices" >
-<!-- konq_mainwindow.cc -->
+<!-- konq_mainwindow.cpp -->
     <entry key="konq_iconview" type="String">
       <label></label>
       <whatsthis></whatsthis>
@@ -526,7 +526,7 @@ PATH_JAVA
   </group>
   
   <group name="Notification Messages" >
-<!-- advancedTabDialog.cpp konq_mainwindow.cc -->
+<!-- advancedTabDialog.cpp konq_mainwindow.cpp -->
     <entry key="MultipleTabConfirm" type="Bool">
       <default>false</default> 
       <label></label>
diff --git a/konqueror/listview/CMakeLists.txt b/konqueror/listview/CMakeLists.txt
index dd60407da..01fc5f0ec 100644
--- a/konqueror/listview/CMakeLists.txt
+++ b/konqueror/listview/CMakeLists.txt
@@ -45,10 +45,10 @@ install( FILES konq_listview.kcfg DESTINATION ${KCFG_INSTALL_DIR} )
 set( target konq_listview )
 
 set( ${target}_SRCS
-  konq_listview.cc konq_listviewwidget.cc konq_listviewitems.cc
-  konq_treeviewwidget.cc konq_treeviewitem.cc konq_textviewwidget.cc
-  konq_textviewitem.cc konq_infolistviewwidget.cc
-  konq_infolistviewitem.cc konq_listviewsettings.kcfgc
+  konq_listview.cpp konq_listviewwidget.cpp konq_listviewitems.cpp
+  konq_treeviewwidget.cpp konq_treeviewitem.cpp konq_textviewwidget.cpp
+  konq_textviewitem.cpp konq_infolistviewwidget.cpp
+  konq_infolistviewitem.cpp konq_listviewsettings.kcfgc
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/konqueror/listview/Makefile.am b/konqueror/listview/Makefile.am
index 91dd33a10..c190de7df 100644
--- a/konqueror/listview/Makefile.am
+++ b/konqueror/listview/Makefile.am
@@ -5,11 +5,11 @@ kde_module_LTLIBRARIES = konq_listview.la
 
 METASOURCES = AUTO
 
-konq_listview_la_SOURCES = konq_listview.cc \
-                          konq_listviewwidget.cc konq_listviewitems.cc \
-                          konq_treeviewwidget.cc konq_treeviewitem.cc \
-                          konq_textviewwidget.cc konq_textviewitem.cc \
-                          konq_infolistviewwidget.cc konq_infolistviewitem.cc \
+konq_listview_la_SOURCES = konq_listview.cpp \
+                          konq_listviewwidget.cpp konq_listviewitems.cpp \
+                          konq_treeviewwidget.cpp konq_treeviewitem.cpp \
+                          konq_textviewwidget.cpp konq_textviewitem.cpp \
+                          konq_infolistviewwidget.cpp konq_infolistviewitem.cpp \
                           konq_listviewsettings.kcfgc 
                              
 konq_listview_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
diff --git a/konqueror/listview/konq_infolistviewitem.cc b/konqueror/listview/konq_infolistviewitem.cpp
index 18efb3f8f..18efb3f8f 100644
--- a/konqueror/listview/konq_infolistviewitem.cc
+++ b/konqueror/listview/konq_infolistviewitem.cpp
diff --git a/konqueror/listview/konq_infolistviewwidget.cc b/konqueror/listview/konq_infolistviewwidget.cpp
index e835f1cb3..e835f1cb3 100644
--- a/konqueror/listview/konq_infolistviewwidget.cc
+++ b/konqueror/listview/konq_infolistviewwidget.cpp
diff --git a/konqueror/listview/konq_listview.cc b/konqueror/listview/konq_listview.cpp
index 67da49c6d..67da49c6d 100644
--- a/konqueror/listview/konq_listview.cc
+++ b/konqueror/listview/konq_listview.cpp
diff --git a/konqueror/listview/konq_listviewitems.cc b/konqueror/listview/konq_listviewitems.cpp
index 45ff99c1c..45ff99c1c 100644
--- a/konqueror/listview/konq_listviewitems.cc
+++ b/konqueror/listview/konq_listviewitems.cpp
diff --git a/konqueror/listview/konq_listviewwidget.cc b/konqueror/listview/konq_listviewwidget.cpp
index 4d7866f64..4d7866f64 100644
--- a/konqueror/listview/konq_listviewwidget.cc
+++ b/konqueror/listview/konq_listviewwidget.cpp
diff --git a/konqueror/listview/konq_textviewitem.cc b/konqueror/listview/konq_textviewitem.cpp
index 1076e10af..1076e10af 100644
--- a/konqueror/listview/konq_textviewitem.cc
+++ b/konqueror/listview/konq_textviewitem.cpp
diff --git a/konqueror/listview/konq_textviewwidget.cc b/konqueror/listview/konq_textviewwidget.cpp
index ab227899a..ab227899a 100644
--- a/konqueror/listview/konq_textviewwidget.cc
+++ b/konqueror/listview/konq_textviewwidget.cpp
diff --git a/konqueror/listview/konq_treeviewitem.cc b/konqueror/listview/konq_treeviewitem.cpp
index 12953c401..12953c401 100644
--- a/konqueror/listview/konq_treeviewitem.cc
+++ b/konqueror/listview/konq_treeviewitem.cpp
diff --git a/konqueror/listview/konq_treeviewwidget.cc b/konqueror/listview/konq_treeviewwidget.cpp
index 77adc4b61..77adc4b61 100644
--- a/konqueror/listview/konq_treeviewwidget.cc
+++ b/konqueror/listview/konq_treeviewwidget.cpp
diff --git a/konqueror/preloader/CMakeLists.txt b/konqueror/preloader/CMakeLists.txt
index 90e72194b..f5610a0ae 100644
--- a/konqueror/preloader/CMakeLists.txt
+++ b/konqueror/preloader/CMakeLists.txt
@@ -42,7 +42,7 @@ tde_create_translated_desktop(
 set( target kded_konqy_preloader )
 
 set( ${target}_SRCS
-  preloader.cc preloader.skel
+  preloader.cpp preloader.skel
 )
 
 tde_add_kpart( ${target} AUTOMOC
diff --git a/konqueror/preloader/Makefile.am b/konqueror/preloader/Makefile.am
index efe0413bd..6b27b7fef 100644
--- a/konqueror/preloader/Makefile.am
+++ b/konqueror/preloader/Makefile.am
@@ -3,7 +3,7 @@ AM_CPPFLAGS = -DQT_NO_CAST_ASCII
 kde_module_LTLIBRARIES = kded_konqy_preloader.la
 
 INCLUDES= -I.. $(all_includes)
-kded_konqy_preloader_la_SOURCES = preloader.cc preloader.skel
+kded_konqy_preloader_la_SOURCES = preloader.cpp preloader.skel
 kded_konqy_preloader_la_LDFLAGS = $(all_libraries) -module -avoid-version
 kded_konqy_preloader_la_LIBADD = ../libkonqueror_intern.la $(LIB_TDESYCOCA) $(LIB_TDECORE)
 
diff --git a/konqueror/preloader/configure.in.in b/konqueror/preloader/configure.in.in
index 315b23c97..a581917cb 100644
--- a/konqueror/preloader/configure.in.in
+++ b/konqueror/preloader/configure.in.in
@@ -1,5 +1,5 @@
 dnl check whether mallinfo() is available and which fields to use to find out memory usage
-dnl it's used in konq_mainwindow.cc
+dnl it's used in konq_mainwindow.cpp
 dnl warning, ugly code ahead
 dnl some implementations have mallinfo() in stdlib.h, others in malloc.h
 dnl fields showing memory usage should be hblkhd, uordblks and usmblks,
diff --git a/konqueror/preloader/preloader.cc b/konqueror/preloader/preloader.cpp
index 5d87a8b07..5d87a8b07 100644
--- a/konqueror/preloader/preloader.cc
+++ b/konqueror/preloader/preloader.cpp
diff --git a/kpersonalizer/Makefile.am b/kpersonalizer/Makefile.am
index 304d5503b..f799bd10a 100644
--- a/kpersonalizer/Makefile.am
+++ b/kpersonalizer/Makefile.am
@@ -46,7 +46,7 @@ kpersonalizer_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDE
 #rc_DATA = kpersonalizerui.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)/kpersonalizer.pot; \
 	fi
diff --git a/ksysguard/gui/CMakeLists.txt b/ksysguard/gui/CMakeLists.txt
index 504fbeb5b..a21e21c0c 100644
--- a/ksysguard/gui/CMakeLists.txt
+++ b/ksysguard/gui/CMakeLists.txt
@@ -51,7 +51,7 @@ tde_create_translated_desktop(
 ##### sysguard_panelapplet (module) #############
 
 tde_add_kpart( sysguard_panelapplet AUTOMOC
-  SOURCES KSysGuardApplet.cc KSGAppletSettings.cc
+  SOURCES KSysGuardApplet.cpp KSGAppletSettings.cpp
   LINK sensordisplays-static ksgrd-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
@@ -61,8 +61,8 @@ tde_add_kpart( sysguard_panelapplet AUTOMOC
 
 tde_add_executable( ksysguard AUTOMOC
   SOURCES
-    SensorBrowser.cc WorkSheet.cc WorkSheetSettings.cc
-    Workspace.cc ksysguard.cc ksysguard.skel
+    SensorBrowser.cpp WorkSheet.cpp WorkSheetSettings.cpp
+    Workspace.cpp ksysguard.cpp ksysguard.skel
   LINK sensordisplays-static ksgrd-shared tdednssd-shared
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/ksysguard/gui/KSGAppletSettings.cc b/ksysguard/gui/KSGAppletSettings.cpp
index 01b2e0b1a..01b2e0b1a 100644
--- a/ksysguard/gui/KSGAppletSettings.cc
+++ b/ksysguard/gui/KSGAppletSettings.cpp
diff --git a/ksysguard/gui/KSysGuardApplet.cc b/ksysguard/gui/KSysGuardApplet.cpp
index ae31d4a60..ae31d4a60 100644
--- a/ksysguard/gui/KSysGuardApplet.cc
+++ b/ksysguard/gui/KSysGuardApplet.cpp
diff --git a/ksysguard/gui/Makefile.am b/ksysguard/gui/Makefile.am
index 69066d230..3a9484e4c 100644
--- a/ksysguard/gui/Makefile.am
+++ b/ksysguard/gui/Makefile.am
@@ -22,11 +22,11 @@ bin_PROGRAMS = ksysguard kpm
 
 # Which sources should be compiled for ksysguard.
 ksysguard_SOURCES = \
-	SensorBrowser.cc \
-	WorkSheet.cc \
-	WorkSheetSettings.cc \
-	Workspace.cc \
-	ksysguard.cc ksysguard.skel
+	SensorBrowser.cpp \
+	WorkSheet.cpp \
+	WorkSheetSettings.cpp \
+	Workspace.cpp \
+	ksysguard.cpp ksysguard.skel
 
 ksysguard_LDADD = \
 	ksgrd/libksgrd.la \
@@ -43,8 +43,8 @@ appdata_DATA = ProcessTable.sgrd SystemLoad.sgrd KSysGuardApplet.xml
 kde_module_LTLIBRARIES = sysguard_panelapplet.la
 
 sysguard_panelapplet_la_SOURCES = \
-	KSysGuardApplet.cc \
-	KSGAppletSettings.cc
+	KSysGuardApplet.cpp \
+	KSGAppletSettings.cpp
 
 sysguard_panelapplet_la_LIBADD = \
 	ksgrd/libksgrd.la \
@@ -60,4 +60,4 @@ METASOURCES = AUTO
 messages: rc.cpp
 	$(EXTRACTRC) `find . -name "*.ui"` >> rc.cpp
 	extractattr --attr=display,title SystemLoad.sgrd KSysGuardApplet.xml >> rc.cpp
-	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.cc"` -o $(podir)/ksysguard.pot
+	$(XGETTEXT) `find . -name "*.cpp"` -o $(podir)/ksysguard.pot
diff --git a/ksysguard/gui/SensorBrowser.cc b/ksysguard/gui/SensorBrowser.cpp
index 801091d98..801091d98 100644
--- a/ksysguard/gui/SensorBrowser.cc
+++ b/ksysguard/gui/SensorBrowser.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/BarGraph.cc b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
index 8d2b5e302..8d2b5e302 100644
--- a/ksysguard/gui/SensorDisplayLib/BarGraph.cc
+++ b/ksysguard/gui/SensorDisplayLib/BarGraph.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
index 0fe416a0b..6fe370076 100644
--- a/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
+++ b/ksysguard/gui/SensorDisplayLib/CMakeLists.txt
@@ -28,12 +28,12 @@ link_directories(
 
 tde_add_library( sensordisplays STATIC_PIC AUTOMOC
   SOURCES
-    SensorDisplay.cc BarGraph.cc DancingBars.cc DancingBarsSettings.cc
-    DummyDisplay.cc FancyPlotter.cc FancyPlotterSettings.cc
-    ListView.cc LogFile.cc MultiMeter.cc MultiMeterSettings.cc
-    ProcessController.cc ProcessList.cc ReniceDlg.cc
-    SensorLogger.cc SensorLoggerDlg.cc SensorLoggerSettings.cc
-    ListViewSettings.cc SignalPlotter.cc ListViewSettingsWidget.ui
+    SensorDisplay.cpp BarGraph.cpp DancingBars.cpp DancingBarsSettings.cpp
+    DummyDisplay.cpp FancyPlotter.cpp FancyPlotterSettings.cpp
+    ListView.cpp LogFile.cpp MultiMeter.cpp MultiMeterSettings.cpp
+    ProcessController.cpp ProcessList.cpp ReniceDlg.cpp
+    SensorLogger.cpp SensorLoggerDlg.cpp SensorLoggerSettings.cpp
+    ListViewSettings.cpp SignalPlotter.cpp ListViewSettingsWidget.ui
     LogFileSettings.ui MultiMeterSettingsWidget.ui SensorLoggerDlgWidget.ui
     SensorLoggerSettingsWidget.ui
   LINK ksgrd-shared tdeio-shared
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBars.cc b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
index 5b09addc0..5b09addc0 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBars.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBars.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
index ee03f9e94..ee03f9e94 100644
--- a/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/DancingBarsSettings.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
index 13696c502..13696c502 100644
--- a/ksysguard/gui/SensorDisplayLib/DummyDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/DummyDisplay.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
index 22894afea..22894afea 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotter.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
index ef53bab75..ef53bab75 100644
--- a/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/FancyPlotterSettings.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ListView.cc b/ksysguard/gui/SensorDisplayLib/ListView.cpp
index 5b748e9c0..5b748e9c0 100644
--- a/ksysguard/gui/SensorDisplayLib/ListView.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListView.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp
index a3b1eb3ad..a3b1eb3ad 100644
--- a/ksysguard/gui/SensorDisplayLib/ListViewSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/ListViewSettings.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/LogFile.cc b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
index a8b22569d..a8b22569d 100644
--- a/ksysguard/gui/SensorDisplayLib/LogFile.cc
+++ b/ksysguard/gui/SensorDisplayLib/LogFile.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/Makefile.am b/ksysguard/gui/SensorDisplayLib/Makefile.am
index d3f82a3a7..8ebc4c5ee 100644
--- a/ksysguard/gui/SensorDisplayLib/Makefile.am
+++ b/ksysguard/gui/SensorDisplayLib/Makefile.am
@@ -9,25 +9,25 @@ libsensordisplays_la_LIBADD = ../ksgrd/libksgrd.la $(LIB_TDEIO)
 
 # Which sources should be compiled for the sensor display lib.
 libsensordisplays_la_SOURCES = \
-	SensorDisplay.cc \
-	BarGraph.cc \
-	DancingBars.cc \
-	DancingBarsSettings.cc \
-	DummyDisplay.cc \
-	FancyPlotter.cc \
-	FancyPlotterSettings.cc \
-	ListView.cc \
-	LogFile.cc \
-	MultiMeter.cc \
-	MultiMeterSettings.cc \
-	ProcessController.cc \
-	ProcessList.cc \
-	ReniceDlg.cc \
-	SensorLogger.cc \
-	SensorLoggerDlg.cc \
-	SensorLoggerSettings.cc \
-	ListViewSettings.cc \
-	SignalPlotter.cc \
+	SensorDisplay.cpp \
+	BarGraph.cpp \
+	DancingBars.cpp \
+	DancingBarsSettings.cpp \
+	DummyDisplay.cpp \
+	FancyPlotter.cpp \
+	FancyPlotterSettings.cpp \
+	ListView.cpp \
+	LogFile.cpp \
+	MultiMeter.cpp \
+	MultiMeterSettings.cpp \
+	ProcessController.cpp \
+	ProcessList.cpp \
+	ReniceDlg.cpp \
+	SensorLogger.cpp \
+	SensorLoggerDlg.cpp \
+	SensorLoggerSettings.cpp \
+	ListViewSettings.cpp \
+	SignalPlotter.cpp \
 	ListViewSettingsWidget.ui \
 	LogFileSettings.ui \
 	MultiMeterSettingsWidget.ui \
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
index 111c4787b..111c4787b 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeter.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeter.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp
index 63e8d1d3d..63e8d1d3d 100644
--- a/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/MultiMeterSettings.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessController.cc b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
index 91851d113..91851d113 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessController.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessController.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ProcessList.cc b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
index 9293ef6a0..9293ef6a0 100644
--- a/ksysguard/gui/SensorDisplayLib/ProcessList.cc
+++ b/ksysguard/gui/SensorDisplayLib/ProcessList.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp
index e71c6e0a0..e71c6e0a0 100644
--- a/ksysguard/gui/SensorDisplayLib/ReniceDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/ReniceDlg.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
index 4dfff7957..4dfff7957 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorDisplay.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorDisplay.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
index 88083fca1..88083fca1 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLogger.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLogger.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp
index 64c76f5b8..64c76f5b8 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerDlg.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp
index c2206e092..c2206e092 100644
--- a/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cc
+++ b/ksysguard/gui/SensorDisplayLib/SensorLoggerSettings.cpp
diff --git a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
index bcb0b821b..bcb0b821b 100644
--- a/ksysguard/gui/SensorDisplayLib/SignalPlotter.cc
+++ b/ksysguard/gui/SensorDisplayLib/SignalPlotter.cpp
diff --git a/ksysguard/gui/WorkSheet.cc b/ksysguard/gui/WorkSheet.cpp
index d465a998d..d465a998d 100644
--- a/ksysguard/gui/WorkSheet.cc
+++ b/ksysguard/gui/WorkSheet.cpp
diff --git a/ksysguard/gui/WorkSheetSettings.cc b/ksysguard/gui/WorkSheetSettings.cpp
index 703be57d5..703be57d5 100644
--- a/ksysguard/gui/WorkSheetSettings.cc
+++ b/ksysguard/gui/WorkSheetSettings.cpp
diff --git a/ksysguard/gui/Workspace.cc b/ksysguard/gui/Workspace.cpp
index c5e622248..c5e622248 100644
--- a/ksysguard/gui/Workspace.cc
+++ b/ksysguard/gui/Workspace.cpp
diff --git a/ksysguard/gui/ksgrd/CMakeLists.txt b/ksysguard/gui/ksgrd/CMakeLists.txt
index b1ec7c5f8..daf5a0e37 100644
--- a/ksysguard/gui/ksgrd/CMakeLists.txt
+++ b/ksysguard/gui/ksgrd/CMakeLists.txt
@@ -34,9 +34,9 @@ install( FILES
 
 tde_add_library( ksgrd SHARED AUTOMOC
   SOURCES
-    HostConnector.cc SensorAgent.cc SensorManager.cc
-    SensorShellAgent.cc SensorSocketAgent.cc StyleEngine.cc
-    StyleSettings.cc TimerSettings.cc
+    HostConnector.cpp SensorAgent.cpp SensorManager.cpp
+    SensorShellAgent.cpp SensorSocketAgent.cpp StyleEngine.cpp
+    StyleSettings.cpp TimerSettings.cpp
   VERSION 1.2.0
   LINK tdeui-shared
   DESTINATION ${LIB_INSTALL_DIR}
diff --git a/ksysguard/gui/ksgrd/HostConnector.cc b/ksysguard/gui/ksgrd/HostConnector.cpp
index b6e85b795..b6e85b795 100644
--- a/ksysguard/gui/ksgrd/HostConnector.cc
+++ b/ksysguard/gui/ksgrd/HostConnector.cpp
diff --git a/ksysguard/gui/ksgrd/Makefile.am b/ksysguard/gui/ksgrd/Makefile.am
index 52f5bfd01..4eead4247 100644
--- a/ksysguard/gui/ksgrd/Makefile.am
+++ b/ksysguard/gui/ksgrd/Makefile.am
@@ -9,14 +9,14 @@ libksgrd_la_LIBADD = $(LIB_TDEUI)
 
 # Which sources should be compiled for ksysguard.
 libksgrd_la_SOURCES = \
-	HostConnector.cc \
-	SensorAgent.cc \
-	SensorManager.cc \
-	SensorShellAgent.cc \
-	SensorSocketAgent.cc \
-	StyleEngine.cc \
-	StyleSettings.cc \
-	TimerSettings.cc
+	HostConnector.cpp \
+	SensorAgent.cpp \
+	SensorManager.cpp \
+	SensorShellAgent.cpp \
+	SensorSocketAgent.cpp \
+	StyleEngine.cpp \
+	StyleSettings.cpp \
+	TimerSettings.cpp
 
 ksgrdincludedir = $(includedir)/ksgrd
 ksgrdinclude_HEADERS = \
diff --git a/ksysguard/gui/ksgrd/SensorAgent.cc b/ksysguard/gui/ksgrd/SensorAgent.cpp
index 7f9615985..7f9615985 100644
--- a/ksysguard/gui/ksgrd/SensorAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorAgent.cpp
diff --git a/ksysguard/gui/ksgrd/SensorManager.cc b/ksysguard/gui/ksgrd/SensorManager.cpp
index 237e73b23..237e73b23 100644
--- a/ksysguard/gui/ksgrd/SensorManager.cc
+++ b/ksysguard/gui/ksgrd/SensorManager.cpp
diff --git a/ksysguard/gui/ksgrd/SensorShellAgent.cc b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
index 7e137ad56..7e137ad56 100644
--- a/ksysguard/gui/ksgrd/SensorShellAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorShellAgent.cpp
diff --git a/ksysguard/gui/ksgrd/SensorSocketAgent.cc b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
index 30c0cc7e9..30c0cc7e9 100644
--- a/ksysguard/gui/ksgrd/SensorSocketAgent.cc
+++ b/ksysguard/gui/ksgrd/SensorSocketAgent.cpp
diff --git a/ksysguard/gui/ksgrd/StyleEngine.cc b/ksysguard/gui/ksgrd/StyleEngine.cpp
index ce3e3bd6b..ce3e3bd6b 100644
--- a/ksysguard/gui/ksgrd/StyleEngine.cc
+++ b/ksysguard/gui/ksgrd/StyleEngine.cpp
diff --git a/ksysguard/gui/ksgrd/StyleSettings.cc b/ksysguard/gui/ksgrd/StyleSettings.cpp
index b84d3e407..b84d3e407 100644
--- a/ksysguard/gui/ksgrd/StyleSettings.cc
+++ b/ksysguard/gui/ksgrd/StyleSettings.cpp
diff --git a/ksysguard/gui/ksgrd/TimerSettings.cc b/ksysguard/gui/ksgrd/TimerSettings.cpp
index 43e73ab90..43e73ab90 100644
--- a/ksysguard/gui/ksgrd/TimerSettings.cc
+++ b/ksysguard/gui/ksgrd/TimerSettings.cpp
diff --git a/ksysguard/gui/ksysguard.cc b/ksysguard/gui/ksysguard.cpp
index 937c5fdd1..937c5fdd1 100644
--- a/ksysguard/gui/ksysguard.cc
+++ b/ksysguard/gui/ksysguard.cpp
diff --git a/ksysguard/ksysguardd/Porting-HOWTO b/ksysguard/ksysguardd/Porting-HOWTO
index 4576783bc..f7096b03d 100644
--- a/ksysguard/ksysguardd/Porting-HOWTO
+++ b/ksysguard/ksysguardd/Porting-HOWTO
@@ -112,7 +112,7 @@ COMMAND\nksysguardd> ".
 ksysguardd does not handle native language support. In order to have a
 minimum installation (only a single file) on the monitored machine,
 all translation are handled by the front-end. Please see the files
-gui/ksgrd/SensorManger.cc and gui/SensorDisplayLib/ProcessTable.cc
+gui/ksgrd/SensorManger.cpp and gui/SensorDisplayLib/ProcessTable.cpp
 if you add new strings.
 
 /**
diff --git a/libkonq/CMakeLists.txt b/libkonq/CMakeLists.txt
index 9c8842785..e774a81bb 100644
--- a/libkonq/CMakeLists.txt
+++ b/libkonq/CMakeLists.txt
@@ -65,12 +65,12 @@ tde_create_translated_desktop(
 
 tde_add_library( konq SHARED AUTOMOC
   SOURCES
-    konq_popupmenu.cc knewmenu.cc konq_xmlguiclient.cc tdefileivi.cc
-    konq_iconviewwidget.cc konq_settings.cc konq_drag.cc konq_operations.cc
-    konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc konq_undo.cc
-    konq_undo.skel konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel
-    konq_pixmapprovider.cc kivdirectoryoverlay.cc kivfreespaceoverlay.cc
-    konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc
+    konq_popupmenu.cpp knewmenu.cpp konq_xmlguiclient.cpp tdefileivi.cpp
+    konq_iconviewwidget.cpp konq_settings.cpp konq_drag.cpp konq_operations.cpp
+    konq_dirpart.cpp konq_propsview.cpp konq_events.cpp konq_bgnddlg.cpp konq_undo.cpp
+    konq_undo.skel konq_historymgr.cpp konq_historycomm.cpp konq_historycomm.skel
+    konq_pixmapprovider.cpp kivdirectoryoverlay.cpp kivfreespaceoverlay.cpp
+    konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
   VERSION 4.2.0
   LINK tdeparts-shared
   DESTINATION ${LIB_INSTALL_DIR}
@@ -81,7 +81,7 @@ tde_add_library( konq SHARED AUTOMOC
 
 if( WITH_ARTS )
   tde_add_kpart( konq_sound
-    SOURCES konq_sound.cc
+    SOURCES konq_sound.cpp
     LINK artskde-shared
     DESTINATION ${PLUGIN_INSTALL_DIR} )
 endif( )
diff --git a/libkonq/Makefile.am b/libkonq/Makefile.am
index 131449d7e..3290c3e85 100644
--- a/libkonq/Makefile.am
+++ b/libkonq/Makefile.am
@@ -23,17 +23,17 @@ lib_LTLIBRARIES = libkonq.la
 libkonq_la_LDFLAGS = $(all_libraries) -version-info 6:0:2 -no-undefined
 libkonq_la_LIBADD = $(LIB_TDEPARTS)
 
-libkonq_la_SOURCES = konq_popupmenu.cc knewmenu.cc \
-   konq_xmlguiclient.cc\
-   tdefileivi.cc konq_iconviewwidget.cc konq_settings.cc konq_drag.cc  \
-   konq_operations.cc \
-   konq_dirpart.cc konq_propsview.cc konq_events.cc konq_bgnddlg.cc \
-   konq_undo.cc konq_undo.skel \
-   konq_historymgr.cc konq_historycomm.cc konq_historycomm.skel \
-   konq_pixmapprovider.cc \
-   kivdirectoryoverlay.cc \
-   kivfreespaceoverlay.cc \
-   konq_faviconmgr.cc konq_faviconmgr.skel konq_filetip.cc
+libkonq_la_SOURCES = konq_popupmenu.cpp knewmenu.cpp \
+   konq_xmlguiclient.cpp\
+   tdefileivi.cpp konq_iconviewwidget.cpp konq_settings.cpp konq_drag.cpp  \
+   konq_operations.cpp \
+   konq_dirpart.cpp konq_propsview.cpp konq_events.cpp konq_bgnddlg.cpp \
+   konq_undo.cpp konq_undo.skel \
+   konq_historymgr.cpp konq_historycomm.cpp konq_historycomm.skel \
+   konq_pixmapprovider.cpp \
+   kivdirectoryoverlay.cpp \
+   kivfreespaceoverlay.cpp \
+   konq_faviconmgr.cpp konq_faviconmgr.skel konq_filetip.cpp
 
 directory_DATA = directory_bookmarkbar.desktop 
 directorydir   = $(kde_datadir)/kbookmark
@@ -60,14 +60,14 @@ ARTS_MODULE = konq_sound.la
 endif
 
 kde_module_LTLIBRARIES = $(ARTS_MODULE)
-konq_sound_la_SOURCES = konq_sound.cc
+konq_sound_la_SOURCES = konq_sound.cpp
 konq_sound_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 konq_sound_la_LIBADD = -lsoundserver_idl -lartskde
 
 noinst_HEADERS = konq_sound.h
 
 messages:
-	$(XGETTEXT) *.cc *.h -o $(podir)/libkonq.pot
+	$(XGETTEXT) *.cpp *.h -o $(podir)/libkonq.pot
 
 DOXYGEN_REFERENCES = dcop tdecore tdeio/bookmarks
 include ../admin/Doxyfile.am
diff --git a/libkonq/kivdirectoryoverlay.cc b/libkonq/kivdirectoryoverlay.cpp
index bb1b0d6c2..bb1b0d6c2 100644
--- a/libkonq/kivdirectoryoverlay.cc
+++ b/libkonq/kivdirectoryoverlay.cpp
diff --git a/libkonq/kivfreespaceoverlay.cc b/libkonq/kivfreespaceoverlay.cpp
index 29069cf4f..0343a4ab6 100644
--- a/libkonq/kivfreespaceoverlay.cc
+++ b/libkonq/kivfreespaceoverlay.cpp
@@ -1,6 +1,6 @@
 /*  This file is part of the TDE libraries
     Copyright (C) 2013 Timothy Pearson
-    Based on kivdirectoryoverlay.cc
+    Based on kivdirectoryoverlay.cpp
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Library General Public
diff --git a/libkonq/knewmenu.cc b/libkonq/knewmenu.cpp
index 621b1f614..621b1f614 100644
--- a/libkonq/knewmenu.cc
+++ b/libkonq/knewmenu.cpp
diff --git a/libkonq/konq_bgnddlg.cc b/libkonq/konq_bgnddlg.cpp
index 60f3aa63d..60f3aa63d 100644
--- a/libkonq/konq_bgnddlg.cc
+++ b/libkonq/konq_bgnddlg.cpp
diff --git a/libkonq/konq_dirpart.cc b/libkonq/konq_dirpart.cpp
index 030cc90a9..030cc90a9 100644
--- a/libkonq/konq_dirpart.cc
+++ b/libkonq/konq_dirpart.cpp
diff --git a/libkonq/konq_drag.cc b/libkonq/konq_drag.cpp
index bb05fc8d8..bb05fc8d8 100644
--- a/libkonq/konq_drag.cc
+++ b/libkonq/konq_drag.cpp
diff --git a/libkonq/konq_events.cc b/libkonq/konq_events.cpp
index 17e0f3381..17e0f3381 100644
--- a/libkonq/konq_events.cc
+++ b/libkonq/konq_events.cpp
diff --git a/libkonq/konq_faviconmgr.cc b/libkonq/konq_faviconmgr.cpp
index c5c828ec0..c5c828ec0 100644
--- a/libkonq/konq_faviconmgr.cc
+++ b/libkonq/konq_faviconmgr.cpp
diff --git a/libkonq/konq_filetip.cc b/libkonq/konq_filetip.cpp
index 8ad1e0d6f..8ad1e0d6f 100644
--- a/libkonq/konq_filetip.cc
+++ b/libkonq/konq_filetip.cpp
diff --git a/libkonq/konq_historycomm.cc b/libkonq/konq_historycomm.cpp
index 6cfd9b53f..6cfd9b53f 100644
--- a/libkonq/konq_historycomm.cc
+++ b/libkonq/konq_historycomm.cpp
diff --git a/libkonq/konq_historymgr.cc b/libkonq/konq_historymgr.cpp
index 25cfef345..25cfef345 100644
--- a/libkonq/konq_historymgr.cc
+++ b/libkonq/konq_historymgr.cpp
diff --git a/libkonq/konq_iconviewwidget.cc b/libkonq/konq_iconviewwidget.cpp
index 49c687123..3fe916cad 100644
--- a/libkonq/konq_iconviewwidget.cc
+++ b/libkonq/konq_iconviewwidget.cpp
@@ -1423,7 +1423,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   // This code is currently not used but left in for compatibility reasons.
   // It can be removed in KDE 4.0
   // Saving of desktop icon positions is now done in KDIconView::saveIconPositions()
-  // in tdebase/kdesktop/kdiconview.cc
+  // in tdebase/kdesktop/kdiconview.cpp
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 
   printf("WARNING: Strongly deprecated method KonqIconViewWidget::slotSaveIconPositions() called!\n"); fflush(stdout);
@@ -1473,7 +1473,7 @@ void KonqIconViewWidget::slotSaveIconPositions()
   // This code is currently not used but left in for compatibility reasons.
   // It can be removed in KDE 4.0
   // Saving of desktop icon positions is now done in KDIconView::saveIconPositions()
-  // in tdebase/kdesktop/kdiconview.cc
+  // in tdebase/kdesktop/kdiconview.cpp
   // WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
 }
 
diff --git a/libkonq/konq_operations.cc b/libkonq/konq_operations.cpp
index 4f754681e..4f754681e 100644
--- a/libkonq/konq_operations.cc
+++ b/libkonq/konq_operations.cpp
diff --git a/libkonq/konq_pixmapprovider.cc b/libkonq/konq_pixmapprovider.cpp
index 28d5a9992..28d5a9992 100644
--- a/libkonq/konq_pixmapprovider.cc
+++ b/libkonq/konq_pixmapprovider.cpp
diff --git a/libkonq/konq_popupmenu.cc b/libkonq/konq_popupmenu.cpp
index 82fc4b2af..82fc4b2af 100644
--- a/libkonq/konq_popupmenu.cc
+++ b/libkonq/konq_popupmenu.cpp
diff --git a/libkonq/konq_propsview.cc b/libkonq/konq_propsview.cpp
index f9a69b8f6..f9a69b8f6 100644
--- a/libkonq/konq_propsview.cc
+++ b/libkonq/konq_propsview.cpp
diff --git a/libkonq/konq_propsview.h b/libkonq/konq_propsview.h
index c2759693f..73d8b8e6d 100644
--- a/libkonq/konq_propsview.h
+++ b/libkonq/konq_propsview.h
@@ -174,7 +174,7 @@ private:
 
   /**
    * Private data for KonqPropsView
-   * Implementation in konq_propsview.cc
+   * Implementation in konq_propsview.cpp
    */
   struct Private;
 
diff --git a/libkonq/konq_settings.cc b/libkonq/konq_settings.cpp
index 41460e8ae..41460e8ae 100644
--- a/libkonq/konq_settings.cc
+++ b/libkonq/konq_settings.cpp
diff --git a/libkonq/konq_sound.cc b/libkonq/konq_sound.cpp
index b40c33858..b40c33858 100644
--- a/libkonq/konq_sound.cc
+++ b/libkonq/konq_sound.cpp
diff --git a/libkonq/konq_undo.cc b/libkonq/konq_undo.cpp
index 51d85587d..51d85587d 100644
--- a/libkonq/konq_undo.cc
+++ b/libkonq/konq_undo.cpp
diff --git a/libkonq/konq_xmlguiclient.cc b/libkonq/konq_xmlguiclient.cpp
index c3c7215b9..c3c7215b9 100644
--- a/libkonq/konq_xmlguiclient.cc
+++ b/libkonq/konq_xmlguiclient.cpp
diff --git a/libkonq/tdefileivi.cc b/libkonq/tdefileivi.cpp
index 4cbb6cdca..4cbb6cdca 100644
--- a/libkonq/tdefileivi.cc
+++ b/libkonq/tdefileivi.cpp
diff --git a/libkonq/tdefileivi.h b/libkonq/tdefileivi.h
index 4701fb9c1..3fb7e3734 100644
--- a/libkonq/tdefileivi.h
+++ b/libkonq/tdefileivi.h
@@ -251,7 +251,7 @@ private:
 
     /**
      * Private data for KFileIVI
-     * Implementation in tdefileivi.cc
+     * Implementation in tdefileivi.cpp
      */
     struct Private;
 
diff --git a/tdeioslave/filter/CMakeLists.txt b/tdeioslave/filter/CMakeLists.txt
index 446393d74..4387ab0f5 100644
--- a/tdeioslave/filter/CMakeLists.txt
+++ b/tdeioslave/filter/CMakeLists.txt
@@ -34,7 +34,7 @@ tde_create_translated_desktop(
 set( target tdeio_filter )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES filter.cc
+  SOURCES filter.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/filter/Makefile.am b/tdeioslave/filter/Makefile.am
index 0ccdf55ee..f5f7367b2 100644
--- a/tdeioslave/filter/Makefile.am
+++ b/tdeioslave/filter/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_filter.la
 
-tdeio_filter_la_SOURCES = filter.cc
+tdeio_filter_la_SOURCES = filter.cpp
 tdeio_filter_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_filter_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = filter.h
diff --git a/tdeioslave/filter/filter.cc b/tdeioslave/filter/filter.cpp
index a429103e1..a429103e1 100644
--- a/tdeioslave/filter/filter.cc
+++ b/tdeioslave/filter/filter.cpp
diff --git a/tdeioslave/floppy/tdeio_floppy.cpp b/tdeioslave/floppy/tdeio_floppy.cpp
index c67af0b39..50303f1b7 100644
--- a/tdeioslave/floppy/tdeio_floppy.cpp
+++ b/tdeioslave/floppy/tdeio_floppy.cpp
@@ -1105,7 +1105,7 @@ void FloppyProtocol::put( const KURL& url, int , bool overwrite, bool )
    int bytesRead(0);
    TQByteArray array;
 
-   //from file.cc
+   //from file.cpp
    // Loop until we got 0 (end of data)
    do
    {
diff --git a/tdeioslave/home/Makefile.am b/tdeioslave/home/Makefile.am
index 3bd078852..4176a196a 100644
--- a/tdeioslave/home/Makefile.am
+++ b/tdeioslave/home/Makefile.am
@@ -28,5 +28,5 @@ check: testhome
 	./testhome
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_home.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_home.pot
 
diff --git a/tdeioslave/info/CMakeLists.txt b/tdeioslave/info/CMakeLists.txt
index 6f243ba3f..85937d486 100644
--- a/tdeioslave/info/CMakeLists.txt
+++ b/tdeioslave/info/CMakeLists.txt
@@ -37,7 +37,7 @@ install( PROGRAMS kde-info2html DESTINATION ${DATA_INSTALL_DIR}/tdeio_info )
 set( target tdeio_info )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES info.cc
+  SOURCES info.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/info/Makefile.am b/tdeioslave/info/Makefile.am
index a682f4a77..8f0541c0f 100644
--- a/tdeioslave/info/Makefile.am
+++ b/tdeioslave/info/Makefile.am
@@ -8,7 +8,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_info.la
 
-tdeio_info_la_SOURCES = info.cc
+tdeio_info_la_SOURCES = info.cpp
 tdeio_info_la_LIBADD = $(LIB_TDEIO)
 tdeio_info_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 noinst_HEADERS = info.h
diff --git a/tdeioslave/info/info.cc b/tdeioslave/info/info.cpp
index 83b41dae8..83b41dae8 100644
--- a/tdeioslave/info/info.cc
+++ b/tdeioslave/info/info.cpp
diff --git a/tdeioslave/nfs/tdeio_nfs.cpp b/tdeioslave/nfs/tdeio_nfs.cpp
index 8a7fd94b8..e2908f815 100644
--- a/tdeioslave/nfs/tdeio_nfs.cpp
+++ b/tdeioslave/nfs/tdeio_nfs.cpp
@@ -425,7 +425,7 @@ void NFSProtocol::openConnection()
       hostName=nameBuffer;
       // I have the same problem here as Stefan Westerfeld, that's why I use
       // the getdomainname() from fakes.cpp (renamed to x_getdomainname()), this one works
-      // taken from tdelibs/arts/mcopy/mcoputils.cc
+      // taken from tdelibs/arts/mcopy/mcoputils.cpp
       nameBuffer[0] = '\0';
       if (x_getdomainname(nameBuffer, 1024)==0)
       {
@@ -777,7 +777,7 @@ void NFSProtocol::stat( const KURL & url)
 
 void NFSProtocol::completeAbsoluteLinkUDSEntry(UDSEntry& entry, const TQCString& path)
 {
-   //taken from file.cc
+   //taken from file.cpp
    struct stat buff;
    if ( ::stat( path.data(), &buff ) == -1 ) return;
 
diff --git a/tdeioslave/pop3/CMakeLists.txt b/tdeioslave/pop3/CMakeLists.txt
index e488d5e99..725abcabf 100644
--- a/tdeioslave/pop3/CMakeLists.txt
+++ b/tdeioslave/pop3/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_pop3 )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES pop3.cc
+  SOURCES pop3.cpp
   LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/pop3/Makefile.am b/tdeioslave/pop3/Makefile.am
index 130fb34d8..1dc92b73b 100644
--- a/tdeioslave/pop3/Makefile.am
+++ b/tdeioslave/pop3/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_pop3.la
 
-tdeio_pop3_la_SOURCES = pop3.cc
+tdeio_pop3_la_SOURCES = pop3.cpp
 tdeio_pop3_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS)
 tdeio_pop3_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -14,4 +14,4 @@ kdelnk_DATA = pop3.protocol pop3s.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_pop3.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_pop3.pot
diff --git a/tdeioslave/pop3/pop3.cc b/tdeioslave/pop3/pop3.cpp
index f45f06d60..f45f06d60 100644
--- a/tdeioslave/pop3/pop3.cc
+++ b/tdeioslave/pop3/pop3.cpp
diff --git a/tdeioslave/remote/Makefile.am b/tdeioslave/remote/Makefile.am
index 9505065f3..988016d3c 100644
--- a/tdeioslave/remote/Makefile.am
+++ b/tdeioslave/remote/Makefile.am
@@ -28,5 +28,5 @@ check: testremote
 	./testremote
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_remote.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_remote.pot
 
diff --git a/tdeioslave/settings/CMakeLists.txt b/tdeioslave/settings/CMakeLists.txt
index 04fc4e69f..0b05ff0c1 100644
--- a/tdeioslave/settings/CMakeLists.txt
+++ b/tdeioslave/settings/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_settings )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES tdeio_settings.cc
+  SOURCES tdeio_settings.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/settings/Makefile.am b/tdeioslave/settings/Makefile.am
index b470a7782..5b804af90 100644
--- a/tdeioslave/settings/Makefile.am
+++ b/tdeioslave/settings/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES= $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_settings.la
 
-tdeio_settings_la_SOURCES = tdeio_settings.cc
+tdeio_settings_la_SOURCES = tdeio_settings.cpp
 tdeio_settings_la_LIBADD  = $(LIB_TDESYCOCA)
 tdeio_settings_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -17,5 +17,5 @@ kdelnkdir = $(kde_servicesdir)
 SUBDIRS=. 
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_settings.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_settings.pot
 
diff --git a/tdeioslave/settings/tdeio_settings.cc b/tdeioslave/settings/tdeio_settings.cpp
index 5d1e67a0e..5d1e67a0e 100644
--- a/tdeioslave/settings/tdeio_settings.cc
+++ b/tdeioslave/settings/tdeio_settings.cpp
diff --git a/tdeioslave/smtp/CMakeLists.txt b/tdeioslave/smtp/CMakeLists.txt
index 89ef650ca..d3d476ec4 100644
--- a/tdeioslave/smtp/CMakeLists.txt
+++ b/tdeioslave/smtp/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_smtp )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+  SOURCES smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
   LINK tdeio-shared ${SASL_LIBRARIES}
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/smtp/Makefile.am b/tdeioslave/smtp/Makefile.am
index 5d0ad64c0..7522aed90 100644
--- a/tdeioslave/smtp/Makefile.am
+++ b/tdeioslave/smtp/Makefile.am
@@ -3,7 +3,7 @@ INCLUDES= -I$(srcdir)/../.. -I$(srcdir)/.. $(SSL_INCLUDES) $(all_includes)
 
 kde_module_LTLIBRARIES = tdeio_smtp.la
 
-tdeio_smtp_la_SOURCES = smtp.cc request.cc response.cc capabilities.cc command.cc transactionstate.cc
+tdeio_smtp_la_SOURCES = smtp.cpp request.cpp response.cpp capabilities.cpp command.cpp transactionstate.cpp
 tdeio_smtp_la_LIBADD  = $(LIB_TDEIO) $(SASL2_LIBS)
 tdeio_smtp_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -16,22 +16,22 @@ TESTS = test_headergeneration test_responseparser test_commands
 
 check_PROGRAMS = $(TESTS) interactivesmtpserver
 
-test_headergeneration_SOURCES = test_headergeneration.cc
+test_headergeneration_SOURCES = test_headergeneration.cpp
 test_headergeneration_LDADD =  $(LIB_TDECORE)
 test_headergeneration_LDFLAGS = $(all_libraries)
 
-test_responseparser_SOURCES = test_responseparser.cc
+test_responseparser_SOURCES = test_responseparser.cpp
 test_responseparser_LDADD =  $(LIB_TDECORE)
 test_responseparser_LDFLAGS = $(all_libraries)
 
-test_commands_SOURCES = test_commands.cc
+test_commands_SOURCES = test_commands.cpp
 test_commands_LDADD =  $(tdeio_smtp_la_LIBADD)
 test_commands_LDFLAGS = $(all_libraries)
 
-interactivesmtpserver_SOURCES = interactivesmtpserver.cc
+interactivesmtpserver_SOURCES = interactivesmtpserver.cpp
 interactivesmtpserver_LDADD = $(LIB_QT)
 interactivesmtpserver_LDFLAGS = $(all_libraries)
 interactivesmtpserver_METASOURCES = AUTO
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_smtp.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_smtp.pot
diff --git a/tdeioslave/smtp/capabilities.cc b/tdeioslave/smtp/capabilities.cpp
index f56d7739b..f0815c73e 100644
--- a/tdeioslave/smtp/capabilities.cc
+++ b/tdeioslave/smtp/capabilities.cpp
@@ -1,5 +1,5 @@
 /*
-    capabilities.cc
+    capabilities.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/command.cc b/tdeioslave/smtp/command.cpp
index 4d58a1522..461cf520e 100644
--- a/tdeioslave/smtp/command.cc
+++ b/tdeioslave/smtp/command.cpp
@@ -1,5 +1,5 @@
 /*
-    command.cc
+    command.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/interactivesmtpserver.cc b/tdeioslave/smtp/interactivesmtpserver.cpp
index 337299d26..4055a47a4 100644
--- a/tdeioslave/smtp/interactivesmtpserver.cc
+++ b/tdeioslave/smtp/interactivesmtpserver.cpp
@@ -1,5 +1,5 @@
 /*
-    interactivesmtpserver.cc
+    interactivesmtpserver.cpp
 
     Code based on the serverSocket example by Jesper Pedersen.
 
diff --git a/tdeioslave/smtp/request.cc b/tdeioslave/smtp/request.cpp
index 4e4e2bf84..6d38fdd6e 100644
--- a/tdeioslave/smtp/request.cc
+++ b/tdeioslave/smtp/request.cpp
@@ -1,5 +1,5 @@
 /*
-    request.cc
+    request.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/response.cc b/tdeioslave/smtp/response.cpp
index 3ae5d8aa0..de6b98868 100644
--- a/tdeioslave/smtp/response.cc
+++ b/tdeioslave/smtp/response.cpp
@@ -1,5 +1,5 @@
 /*
-    response.cc
+    response.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/smtp/smtp.cc b/tdeioslave/smtp/smtp.cpp
index 00dff3684..00dff3684 100644
--- a/tdeioslave/smtp/smtp.cc
+++ b/tdeioslave/smtp/smtp.cpp
diff --git a/tdeioslave/smtp/test_commands.cc b/tdeioslave/smtp/test_commands.cpp
index d8a5f0d4e..61181bc35 100644
--- a/tdeioslave/smtp/test_commands.cc
+++ b/tdeioslave/smtp/test_commands.cpp
@@ -723,6 +723,6 @@ void checkSuccessfulTransferCommand( bool error, bool preload, bool ungetLast,
 
 #define NDEBUG
 
-#include "command.cc"
-#include "response.cc"
-#include "transactionstate.cc"
+#include "command.cpp"
+#include "response.cpp"
+#include "transactionstate.cpp"
diff --git a/tdeioslave/smtp/test_headergeneration.cc b/tdeioslave/smtp/test_headergeneration.cpp
index 83d999c4a..9e4cb971f 100644
--- a/tdeioslave/smtp/test_headergeneration.cc
+++ b/tdeioslave/smtp/test_headergeneration.cpp
@@ -82,5 +82,5 @@ int main( int , char ** ) {
   return result == expected ? 0 : 1 ;
 }
 
-#include "request.cc"
+#include "request.cpp"
 
diff --git a/tdeioslave/smtp/test_responseparser.cc b/tdeioslave/smtp/test_responseparser.cpp
index e251aa291..4786bc717 100644
--- a/tdeioslave/smtp/test_responseparser.cc
+++ b/tdeioslave/smtp/test_responseparser.cpp
@@ -104,4 +104,4 @@ int main ( int, char** ) {
   return 0;
 }
 
-#include "response.cc"
+#include "response.cpp"
diff --git a/tdeioslave/smtp/transactionstate.cc b/tdeioslave/smtp/transactionstate.cpp
index c33d6b639..1d96e44b7 100644
--- a/tdeioslave/smtp/transactionstate.cc
+++ b/tdeioslave/smtp/transactionstate.cpp
@@ -1,5 +1,5 @@
 /*
-    transactionstate.cc
+    transactionstate.cpp
 
     This file is part of tdeio_smtp, the KDE SMTP tdeioslave.
     Copyright (c) 2003 Marc Mutz <mutz@kde.org>
diff --git a/tdeioslave/system/Makefile.am b/tdeioslave/system/Makefile.am
index da49adca3..71475c4bc 100644
--- a/tdeioslave/system/Makefile.am
+++ b/tdeioslave/system/Makefile.am
@@ -27,5 +27,5 @@ check: testsystem
 	./testsystem
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_system.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_system.pot
 
diff --git a/tdeioslave/tar/CMakeLists.txt b/tdeioslave/tar/CMakeLists.txt
index 30f2f6b1b..f08ac3aa9 100644
--- a/tdeioslave/tar/CMakeLists.txt
+++ b/tdeioslave/tar/CMakeLists.txt
@@ -35,7 +35,7 @@ tde_create_translated_desktop(
 set( target tdeio_tar )
 
 tde_add_kpart( ${target} AUTOMOC
-  SOURCES tar.cc
+  SOURCES tar.cpp
   LINK tdeio-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
 )
diff --git a/tdeioslave/tar/Makefile.am b/tdeioslave/tar/Makefile.am
index 1388d640d..e1d706b04 100644
--- a/tdeioslave/tar/Makefile.am
+++ b/tdeioslave/tar/Makefile.am
@@ -6,7 +6,7 @@ METASOURCES = AUTO
 
 kde_module_LTLIBRARIES = tdeio_tar.la
 
-tdeio_tar_la_SOURCES = tar.cc
+tdeio_tar_la_SOURCES = tar.cpp
 tdeio_tar_la_LIBADD = $(LIB_TDESYCOCA)
 tdeio_tar_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
 
@@ -21,4 +21,4 @@ kdelnk_DATA = tar.protocol ar.protocol zip.protocol
 kdelnkdir = $(kde_servicesdir)
 
 messages:
-	$(XGETTEXT) *.cc -o $(podir)/tdeio_tar.pot
+	$(XGETTEXT) *.cpp -o $(podir)/tdeio_tar.pot
diff --git a/tdeioslave/tar/tar.cc b/tdeioslave/tar/tar.cpp
index b7ba70687..b7ba70687 100644
--- a/tdeioslave/tar/tar.cc
+++ b/tdeioslave/tar/tar.cpp
diff --git a/tdeioslave/trash/DESIGN b/tdeioslave/trash/DESIGN
index 2bb6f19df..9420c53ce 100644
--- a/tdeioslave/trash/DESIGN
+++ b/tdeioslave/trash/DESIGN
@@ -13,7 +13,7 @@ BUGS
 
 TODO
 ====
-* Clean up konq_popupmenu.cc for Type=Link URL=trash:/   :(
+* Clean up konq_popupmenu.cpp for Type=Link URL=trash:/   :(
 * Also, provide metainfo for trash contents for that desktop link.
 => maybe we need a new mimetype?
  Like application/x-trash-desktop, inheriting application/x-desktop. 
diff --git a/tdeioslave/trash/Makefile.am b/tdeioslave/trash/Makefile.am
index 02b43e90a..3d8a5659c 100644
--- a/tdeioslave/trash/Makefile.am
+++ b/tdeioslave/trash/Makefile.am
@@ -27,5 +27,5 @@ testtrash_LDFLAGS = $(all_libraries)
 TESTS = testtrash
 
 messages:
-	$(XGETTEXT) `find . -name "*.cc" -o -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
+	$(XGETTEXT) `find . -name "*.cpp" -o -name "*.h"` -o $(podir)/tdeio_trash.pot
 
diff --git a/tdeioslave/trash/trashimpl.cpp b/tdeioslave/trash/trashimpl.cpp
index b210f1385..ac1d39c43 100644
--- a/tdeioslave/trash/trashimpl.cpp
+++ b/tdeioslave/trash/trashimpl.cpp
@@ -129,7 +129,7 @@ bool TrashImpl::init()
         return false;
 
     // Check the trash directory and its info and files subdirs
-    // see also kdesktop/init.cc for first time initialization
+    // see also kdesktop/init.cpp for first time initialization
     m_initStatus = InitError;
     // $XDG_DATA_HOME/Trash, i.e. ~/.local/share/Trash by default.
     const TQString xdgDataDir = TDEGlobal::dirs()->localxdgdatadir();
diff --git a/tdeprint/tdeprintfax/Makefile.am b/tdeprint/tdeprintfax/Makefile.am
index eb886bdfe..fd022c306 100644
--- a/tdeprint/tdeprintfax/Makefile.am
+++ b/tdeprint/tdeprintfax/Makefile.am
@@ -16,7 +16,7 @@ private_SCRIPTS = anytops
 privatedir = $(kde_datadir)/tdeprintfax
 
 messages: rc.cpp
-	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp -o -name \*.cc` -o $(podir)/tdeprintfax.pot
+	$(XGETTEXT) `find . -name \*.h -o -name \*.cpp` -o $(podir)/tdeprintfax.pot
 
 KDE_ICON = tdeprintfax
 pic_ICON = abentry
diff --git a/tdm/kfrontend/CMakeLists.txt b/tdm/kfrontend/CMakeLists.txt
index 65b22e86e..b35182688 100644
--- a/tdm/kfrontend/CMakeLists.txt
+++ b/tdm/kfrontend/CMakeLists.txt
@@ -67,7 +67,7 @@ tde_add_executable( tdm_greet AUTOMOC
     tdm_greet.c tdmconfig.cpp tdmclock.cpp kconsole.cpp
     kfdialog.cpp kgdialog.cpp kchooser.cpp kgverify.cpp
     tdmshutdown.cpp tdmadmindialog.cpp kgreeter.cpp
-    kgapp.cpp sakdlg.cc
+    kgapp.cpp sakdlg.cpp
   LINK tdmthemer-static tdeui-shared Xtst ${TDMGREET_OPTIONAL_LINK}
   DESTINATION ${BIN_INSTALL_DIR}
 )
diff --git a/tdm/kfrontend/sakdlg.cc b/tdm/kfrontend/sakdlg.cpp
index 1848c8638..1848c8638 100644
--- a/tdm/kfrontend/sakdlg.cc
+++ b/tdm/kfrontend/sakdlg.cpp