Renaming of files in preparation for code style tools.

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

111 files changed, 186 insertions, 186 deletions

diff --git a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
index 7fb622e1..812df4fe 100644
--- a/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
+++ b/kopete/protocols/groupwise/libgroupwise/CMakeLists.txt
@@ -37,7 +37,7 @@ tde_add_library( groupwise STATIC_PIC AUTOMOC
     gwclientstream.cpp gwerror.cpp gwfield.cpp gwglobal.cpp
     inputprotocolbase.cpp privacymanager.cpp qcatlshandler.cpp
     request.cpp requestfactory.cpp response.cpp responseprotocol.cpp
-    rtf.cc safedelete.cpp securestream.cpp stream.cpp task.cpp
+    rtf.cpp safedelete.cpp securestream.cpp stream.cpp task.cpp
     tlshandler.cpp transfer.cpp transferbase.cpp userdetailsmanager.cpp
     usertransfer.cpp
 )
diff --git a/kopete/protocols/groupwise/libgroupwise/Makefile.am b/kopete/protocols/groupwise/libgroupwise/Makefile.am
index bf57f0e3..d21369c2 100644
--- a/kopete/protocols/groupwise/libgroupwise/Makefile.am
+++ b/kopete/protocols/groupwise/libgroupwise/Makefile.am
@@ -22,7 +22,7 @@ libgroupwise_la_COMPILE_FIRST = securestream.moc
 libgroupwise_la_SOURCES = bytestream.cpp chatroommanager.cpp client.cpp \
 	connector.cpp coreprotocol.cpp eventprotocol.cpp eventtransfer.cpp gwclientstream.cpp \
 	gwerror.cpp gwfield.cpp gwglobal.cpp inputprotocolbase.cpp privacymanager.cpp \
-	qcatlshandler.cpp request.cpp requestfactory.cpp response.cpp responseprotocol.cpp rtf.cc \
+	qcatlshandler.cpp request.cpp requestfactory.cpp response.cpp responseprotocol.cpp rtf.cpp \
 	safedelete.cpp securestream.cpp stream.cpp task.cpp tlshandler.cpp transfer.cpp \
 	transferbase.cpp userdetailsmanager.cpp usertransfer.cpp
 libgroupwise_la_LDFLAGS = -no-undefined $(all_libraries)
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.cc b/kopete/protocols/groupwise/libgroupwise/rtf.cpp
index d14fb46b..ecae28de 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.cc
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.cpp
@@ -1,6 +1,6 @@
-#line 2 "rtf.cc"
+#line 2 "rtf.cpp"
 
-#line 4 "rtf.cc"
+#line 4 "rtf.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -479,9 +479,9 @@ char *rtftext;
     *                                                                       *
     *************************************************************************
 
-update rtf.cc:
+update rtf.cpp:
 flex -olex.yy.c  `test -f rtf.ll || echo './'`rtf.ll
-sed '/^#/ s|lex.yy\.c|rtf.cc|' lex.yy.c >rtf.cc
+sed '/^#/ s|lex.yy\.c|rtf.cpp|' lex.yy.c >rtf.cpp
 rm -f lex.yy.c
 
 */
@@ -501,7 +501,7 @@ rm -f lex.yy.c
 #define YY_ALWAYS_INTERACTIVE	0
 #define YY_MAIN			0
 
-#line 505 "rtf.cc"
+#line 505 "rtf.cpp"
 
 #define INITIAL 0
 
@@ -653,7 +653,7 @@ YY_DECL
 #line 46 "rtf.ll"
 
 
-#line 657 "rtf.cc"
+#line 657 "rtf.cpp"
 
 	if ( (yy_init) )
 		{
@@ -788,7 +788,7 @@ YY_RULE_SETUP
 #line 57 "rtf.ll"
 ECHO;
 	YY_BREAK
-#line 792 "rtf.cc"
+#line 792 "rtf.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
diff --git a/kopete/protocols/groupwise/libgroupwise/rtf.ll b/kopete/protocols/groupwise/libgroupwise/rtf.ll
index 67e9f5f5..ba2a6c55 100644
--- a/kopete/protocols/groupwise/libgroupwise/rtf.ll
+++ b/kopete/protocols/groupwise/libgroupwise/rtf.ll
@@ -15,9 +15,9 @@
     *                                                                       *
     *************************************************************************
 
-update rtf.cc:
+update rtf.cpp:
 flex -olex.yy.c  `test -f rtf.ll || echo './'`rtf.ll
-sed '/^#/ s|lex.yy\.c|rtf.cc|' lex.yy.c >rtf.cc
+sed '/^#/ s|lex.yy\.c|rtf.cpp|' lex.yy.c >rtf.cpp
 rm -f lex.yy.c
 
 */
diff --git a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
index 53c8e293..0ad01942 100644
--- a/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
+++ b/kopete/protocols/jabber/jingle/libjingle/libjingle.pro
@@ -15,82 +15,82 @@ OBJECTS_DIR = $$JINGLE_CPP/.obj
 
 # Base
 SOURCES += \
-	$$JINGLE_CPP/talk/base/asyncpacketsocket.cc \
-	$$JINGLE_CPP/talk/base/asynctcpsocket.cc \
-	$$JINGLE_CPP/talk/base/asyncudpsocket.cc \
-	$$JINGLE_CPP/talk/base/base64.cc \
-	$$JINGLE_CPP/talk/base/bytebuffer.cc \
+	$$JINGLE_CPP/talk/base/asyncpacketsocket.cpp \
+	$$JINGLE_CPP/talk/base/asynctcpsocket.cpp \
+	$$JINGLE_CPP/talk/base/asyncudpsocket.cpp \
+	$$JINGLE_CPP/talk/base/base64.cpp \
+	$$JINGLE_CPP/talk/base/bytebuffer.cpp \
 	$$JINGLE_CPP/talk/base/md5c.c \
-	$$JINGLE_CPP/talk/base/messagequeue.cc \
-	$$JINGLE_CPP/talk/base/network.cc \
-	$$JINGLE_CPP/talk/base/physicalsocketserver.cc \
-	$$JINGLE_CPP/talk/base/socketadapters.cc \
-	$$JINGLE_CPP/talk/base/socketaddress.cc \
-	$$JINGLE_CPP/talk/base/task.cc \
-	$$JINGLE_CPP/talk/base/taskrunner.cc \
-	$$JINGLE_CPP/talk/base/thread.cc \
-	$$JINGLE_CPP/talk/base/time.cc
+	$$JINGLE_CPP/talk/base/messagequeue.cpp \
+	$$JINGLE_CPP/talk/base/network.cpp \
+	$$JINGLE_CPP/talk/base/physicalsocketserver.cpp \
+	$$JINGLE_CPP/talk/base/socketadapters.cpp \
+	$$JINGLE_CPP/talk/base/socketaddress.cpp \
+	$$JINGLE_CPP/talk/base/task.cpp \
+	$$JINGLE_CPP/talk/base/taskrunner.cpp \
+	$$JINGLE_CPP/talk/base/thread.cpp \
+	$$JINGLE_CPP/talk/base/time.cpp
 
 # Not needed ?
-#$$JINGLE_CPP/talk/base/socketaddresspair.cc \
-#$$JINGLE_CPP/talk/base/host.cc \
+#$$JINGLE_CPP/talk/base/socketaddresspair.cpp \
+#$$JINGLE_CPP/talk/base/host.cpp \
 
 # P2P Base
 SOURCES += \
-	$$JINGLE_CPP/talk/p2p/base/helpers.cc \
-	$$JINGLE_CPP/talk/p2p/base/p2psocket.cc \
-	$$JINGLE_CPP/talk/p2p/base/port.cc \
-	$$JINGLE_CPP/talk/p2p/base/relayport.cc \
-	$$JINGLE_CPP/talk/p2p/base/session.cc \
-	$$JINGLE_CPP/talk/p2p/base/sessionmanager.cc \
-	$$JINGLE_CPP/talk/p2p/base/socketmanager.cc \
-	$$JINGLE_CPP/talk/p2p/base/stun.cc \
-	$$JINGLE_CPP/talk/p2p/base/stunport.cc \
-	$$JINGLE_CPP/talk/p2p/base/stunrequest.cc \
-	$$JINGLE_CPP/talk/p2p/base/tcpport.cc \
-	$$JINGLE_CPP/talk/p2p/base/udpport.cc
+	$$JINGLE_CPP/talk/p2p/base/helpers.cpp \
+	$$JINGLE_CPP/talk/p2p/base/p2psocket.cpp \
+	$$JINGLE_CPP/talk/p2p/base/port.cpp \
+	$$JINGLE_CPP/talk/p2p/base/relayport.cpp \
+	$$JINGLE_CPP/talk/p2p/base/session.cpp \
+	$$JINGLE_CPP/talk/p2p/base/sessionmanager.cpp \
+	$$JINGLE_CPP/talk/p2p/base/socketmanager.cpp \
+	$$JINGLE_CPP/talk/p2p/base/stun.cpp \
+	$$JINGLE_CPP/talk/p2p/base/stunport.cpp \
+	$$JINGLE_CPP/talk/p2p/base/stunrequest.cpp \
+	$$JINGLE_CPP/talk/p2p/base/tcpport.cpp \
+	$$JINGLE_CPP/talk/p2p/base/udpport.cpp
 	
 # P2P Client
 SOURCES += \
-	$$JINGLE_CPP/talk/p2p/client/basicportallocator.cc \
-	$$JINGLE_CPP/talk/p2p/client/sessionclient.cc \
-	$$JINGLE_CPP/talk/p2p/client/socketmonitor.cc
+	$$JINGLE_CPP/talk/p2p/client/basicportallocator.cpp \
+	$$JINGLE_CPP/talk/p2p/client/sessionclient.cpp \
+	$$JINGLE_CPP/talk/p2p/client/socketmonitor.cpp
 
 
 # XMLLite
 SOURCES += \
-	$$JINGLE_CPP/talk/xmllite/qname.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlbuilder.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlconstants.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlelement.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlnsstack.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlparser.cc \
-	$$JINGLE_CPP/talk/xmllite/xmlprinter.cc
+	$$JINGLE_CPP/talk/xmllite/qname.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlbuilder.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlconstants.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlelement.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlnsstack.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlparser.cpp \
+	$$JINGLE_CPP/talk/xmllite/xmlprinter.cpp
 
 # XMPP
 SOURCES += \
-	$$JINGLE_CPP/talk/xmpp/constants.cc \
-	$$JINGLE_CPP/talk/xmpp/jid.cc \
-	$$JINGLE_CPP/talk/xmpp/saslmechanism.cc \
-	$$JINGLE_CPP/talk/xmpp/xmppclient.cc \
-	$$JINGLE_CPP/talk/xmpp/xmppengineimpl.cc \
-	$$JINGLE_CPP/talk/xmpp/xmppengineimpl_iq.cc \
-	$$JINGLE_CPP/talk/xmpp/xmpplogintask.cc \
-	$$JINGLE_CPP/talk/xmpp/xmppstanzaparser.cc \
-	$$JINGLE_CPP/talk/xmpp/xmpptask.cc
+	$$JINGLE_CPP/talk/xmpp/constants.cpp \
+	$$JINGLE_CPP/talk/xmpp/jid.cpp \
+	$$JINGLE_CPP/talk/xmpp/saslmechanism.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmppclient.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmppengineimpl.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmppengineimpl_iq.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmpplogintask.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmppstanzaparser.cpp \
+	$$JINGLE_CPP/talk/xmpp/xmpptask.cpp
 
 # Session
 SOURCES += \
-		$$JINGLE_CPP/talk/session/phone/call.cc \
-		$$JINGLE_CPP/talk/session/phone/audiomonitor.cc \
-		$$JINGLE_CPP/talk/session/phone/phonesessionclient.cc \
-		$$JINGLE_CPP/talk/session/phone/channelmanager.cc \
-		$$JINGLE_CPP/talk/session/phone/linphonemediaengine.cc \
-		$$JINGLE_CPP/talk/session/phone/voicechannel.cc
+		$$JINGLE_CPP/talk/session/phone/call.cpp \
+		$$JINGLE_CPP/talk/session/phone/audiomonitor.cpp \
+		$$JINGLE_CPP/talk/session/phone/phonesessionclient.cpp \
+		$$JINGLE_CPP/talk/session/phone/channelmanager.cpp \
+		$$JINGLE_CPP/talk/session/phone/linphonemediaengine.cpp \
+		$$JINGLE_CPP/talk/session/phone/voicechannel.cpp
 	
 #contains(DEFINES, HAVE_PORTAUDIO) {
 #	SOURCES += \
-#		$$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cc
+#		$$JINGLE_CPP/talk/session/phone/portaudiomediaengine.cpp
 #}
 
 
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/base/CMakeLists.txt
index 8f037a9a..978eb5bb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/CMakeLists.txt
@@ -25,8 +25,8 @@ include_directories(
 
 tde_add_library( cricketbase STATIC_PIC
   SOURCES
-    socketaddress.cc jtime.cc asyncudpsocket.cc messagequeue.cc
-    thread.cc physicalsocketserver.cc bytebuffer.cc asyncpacketsocket.cc
-    network.cc asynctcpsocket.cc socketadapters.cc md5c.c base64.cc
-    task.cc taskrunner.cc host.cc socketaddresspair.cc
+    socketaddress.cpp jtime.cpp asyncudpsocket.cpp messagequeue.cpp
+    thread.cpp physicalsocketserver.cpp bytebuffer.cpp asyncpacketsocket.cpp
+    network.cpp asynctcpsocket.cpp socketadapters.cpp md5c.c base64.cpp
+    task.cpp taskrunner.cpp host.cpp socketaddresspair.cpp
 )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.am
index 2921049a..ddffd93e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/Makefile.am
@@ -1,23 +1,23 @@
 ## Does not compile with final
 KDE_OPTIONS = nofinal
 
-libcricketbase_la_SOURCES = socketaddress.cc \
-                            jtime.cc \
-                            asyncudpsocket.cc \
-                            messagequeue.cc \
-                            thread.cc \
-                            physicalsocketserver.cc \
-                            bytebuffer.cc \
-                            asyncpacketsocket.cc \
-                            network.cc \
-                            asynctcpsocket.cc \
-                            socketadapters.cc \
+libcricketbase_la_SOURCES = socketaddress.cpp \
+                            jtime.cpp \
+                            asyncudpsocket.cpp \
+                            messagequeue.cpp \
+                            thread.cpp \
+                            physicalsocketserver.cpp \
+                            bytebuffer.cpp \
+                            asyncpacketsocket.cpp \
+                            network.cpp \
+                            asynctcpsocket.cpp \
+                            socketadapters.cpp \
                             md5c.c \
-                            base64.cc \
-                            task.cc \
-                            taskrunner.cc \
-			    host.cc \
-			    socketaddresspair.cc 
+                            base64.cpp \
+                            task.cpp \
+                            taskrunner.cpp \
+                            host.cpp \
+                            socketaddresspair.cpp 
 
 noinst_HEADERS =            asyncfile.h \
                             common.h \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncpacketsocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncpacketsocket.cpp
index 10cfa617..10cfa617 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncpacketsocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncpacketsocket.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cpp
index 8bf66a38..8bf66a38 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cpp
index 5b8c2466..5b8c2466 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cpp
index e0ec1b90..e0ec1b90 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cpp
index e3af08b7..e3af08b7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h
index b21be2f1..b5947037 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/common.h
@@ -214,7 +214,7 @@ inline void operator delete[](void * ptr, const char * fname, int line) { buzz::
 #endif // TRACK_ARRAY_ALLOC_PROBLEM
 
 
-// If you put "#define new TRACK_NEW" in your .cc file after all includes, it should track the calling function name
+// If you put "#define new TRACK_NEW" in your .cpp file after all includes, it should track the calling function name
 
 #define TRACK_NEW new(__FILE__,__LINE__)
 #define TRACK_DEL delete(__FILE__,__LINE__)
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cpp
index f604050f..f604050f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/host.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/jtime.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/jtime.cpp
index 5befe9fd..5befe9fd 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/jtime.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/jtime.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cpp
index f10489f7..f10489f7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp
index 21b3a08f..21b3a08f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/network.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cpp
index 37836302..37836302 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cpp
index 99f663b2..99f663b2 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cpp
index 30d43fc6..30d43fc6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddresspair.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddresspair.cpp
index 2166be09..2166be09 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddresspair.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddresspair.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cpp
index a5a94941..a5a94941 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/task.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cpp
index b5ecc55e..b5ecc55e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc b/kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cpp
index b189e621..b189e621 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am
index 64e09526..9464e252 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = call 
 call_CXXFLAGS = $(AM_CXXFLAGS)
-call_SOURCES = call_main.cc callclient.cc console.cc presencepushtask.cc presenceouttask.cc
+call_SOURCES = call_main.cpp callclient.cpp console.cpp presencepushtask.cpp presenceouttask.cpp
 noinst_HEADERS = callclient.h  console.h  presenceouttask.h  presencepushtask.h  status.h
 call_LDADD =  \
 	       $(srcdir)/../../../talk/examples/login/libcricketexampleslogin.la \
@@ -14,4 +14,4 @@ call_LDADD =  \
 	       $(srcdir)/../../../talk/third_party/ortp/libortp.la \
 	       $(EXPAT_LIBS) -lpthread $(ILBC_LIBS) $(SPEEX_LIBS) $(GLIB_LIBS) -lasound 
 AM_CPPFLAGS  = -DPOSIX
-DEFAULT_INCLUDES = -I$(srcdir)/../../..
\ No newline at end of file
+DEFAULT_INCLUDES = -I$(srcdir)/../../..
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call.pro b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call.pro
index ccf0638b..ee1538e0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call.pro
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call.pro
@@ -6,14 +6,14 @@ include(../../../../../conf.pri)
 
 # Input
 SOURCES += \
-	call_main.cc \
-	callclient.cc \
-	console.cc \
-	presenceouttask.cc \
-	presencepushtask.cc \
-	../login/xmppauth.cc \
-	../login/xmpppump.cc \
-	../login/xmppsocket.cc \
-	../login/xmppthread.cc
+	call_main.cpp \
+	callclient.cpp \
+	console.cpp \
+	presenceouttask.cpp \
+	presencepushtask.cpp \
+	../login/xmppauth.cpp \
+	../login/xmpppump.cpp \
+	../login/xmppsocket.cpp \
+	../login/xmppthread.cpp
 
 LIBS += ../../../liblibjingle.a
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call_main.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call_main.cpp
index 661f2849..661f2849 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call_main.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call_main.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cpp
index 6d818932..6d818932 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/console.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/console.cpp
index 96f5dc96..96f5dc96 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/console.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/console.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cpp
index a15a6c83..a15a6c83 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cpp
index 31d1ae77..31d1ae77 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.am
index 16164fb7..78851923 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/Makefile.am
@@ -1,12 +1,12 @@
 noinst_LTLIBRARIES= libcricketexampleslogin.la
-libcricketexampleslogin_la_SOURCES = xmppsocket.cc \
-				     xmppauth.cc \
-				     xmppthread.cc \
-				     xmpppump.cc 
+libcricketexampleslogin_la_SOURCES = xmppsocket.cpp \
+				     xmppauth.cpp \
+				     xmppthread.cpp \
+				     xmpppump.cpp 
 noinst_HEADERS = xmppauth.h  xmpppump.h  xmppsocket.h  xmppthread.h
 bin_PROGRAMS = login
 login_CXXFLAGS = $(AM_CXXFLAGS)
-login_SOURCES = login_main.cc xmppsocket.cc xmppthread.cc xmpppump.cc xmppauth.cc
+login_SOURCES = login_main.cpp xmppsocket.cpp xmppthread.cpp xmpppump.cpp xmppauth.cpp
 login_LDADD =  $(srcdir)/../../../talk/xmpp/libcricketxmpp.la \
 	       $(srcdir)/../../../talk/xmllite/libcricketxmllite.la \
 	       $(srcdir)/../../../talk/base/libcricketbase.la \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/login_main.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/login_main.cpp
index 2939c79f..2939c79f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/login_main.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/login_main.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cpp
index 66191f12..66191f12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cpp
index 7d966fb3..7d966fb3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppsocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppsocket.cpp
index 33aabf3e..33aabf3e 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppsocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppsocket.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppthread.cc b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppthread.cpp
index 7a1b2a13..7a1b2a13 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppthread.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppthread.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt
index ba05a061..c96bedee 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/CMakeLists.txt
@@ -24,9 +24,9 @@ include_directories(
 
 tde_add_library( cricketp2pbase STATIC_PIC
   SOURCES
-    stun.cc port.cc udpport.cc tcpport.cc helpers.cc sessionmanager.cc
-    session.cc p2psocket.cc relayport.cc stunrequest.cc stunport.cc
-    socketmanager.cc
+    stun.cpp port.cpp udpport.cpp tcpport.cpp helpers.cpp sessionmanager.cpp
+    session.cpp p2psocket.cpp relayport.cpp stunrequest.cpp stunport.cpp
+    socketmanager.cpp
 )
 
 
@@ -34,7 +34,7 @@ tde_add_library( cricketp2pbase STATIC_PIC
 
 tde_add_executable( relayserver
   SOURCES
-    relayserver.cc relayserver_main.cc
+    relayserver.cpp relayserver_main.cpp
   LINK
     cricketbase-static cricketp2pbase-static pthread
   DESTINATION ${BIN_INSTALL_DIR}
@@ -45,7 +45,7 @@ tde_add_executable( relayserver
 
 tde_add_executable( stunserver
   SOURCES
-    stunserver.cc stunserver_main.cc
+    stunserver.cpp stunserver_main.cpp
   LINK
     cricketbase-static cricketp2pbase-static pthread
   DESTINATION ${BIN_INSTALL_DIR}
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.am
index 6cc30f15..3c8e3ab7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/Makefile.am
@@ -1,18 +1,18 @@
 ## Does not compile with final
 KDE_OPTIONS = nofinal
 
-libcricketp2pbase_la_SOURCES = stun.cc \
-			       port.cc \
-			       udpport.cc \
-			       tcpport.cc \
-			       helpers.cc \
-			       sessionmanager.cc \
-			       session.cc \
-			       p2psocket.cc \
-			       relayport.cc \
-			       stunrequest.cc \
-			       stunport.cc \
-			       socketmanager.cc 
+libcricketp2pbase_la_SOURCES = stun.cpp \
+			       port.cpp \
+			       udpport.cpp \
+			       tcpport.cpp \
+			       helpers.cpp \
+			       sessionmanager.cpp \
+			       session.cpp \
+			       p2psocket.cpp \
+			       relayport.cpp \
+			       stunrequest.cpp \
+			       stunport.cpp \
+			       socketmanager.cpp 
 
 noinst_HEADERS =               candidate.h \
                                portallocator.h \
@@ -37,9 +37,9 @@ noinst_HEADERS =               candidate.h \
 AM_CPPFLAGS = -DPOSIX  $(all_includes) -I$(srcdir)/../../..
 
 bin_PROGRAMS = relayserver stunserver
-relayserver_SOURCES = relayserver.cc relayserver_main.cc
+relayserver_SOURCES = relayserver.cpp relayserver_main.cpp
 relayserver_LDADD = ../../base/libcricketbase.la libcricketp2pbase.la -lpthread
-stunserver_SOURCES = stunserver.cc stunserver_main.cc
+stunserver_SOURCES = stunserver.cpp stunserver_main.cpp
 stunserver_LDADD = ../../base/libcricketbase.la libcricketp2pbase.la -lpthread
 
 noinst_LTLIBRARIES = libcricketp2pbase.la
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/helpers.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/helpers.cpp
index 83e02a27..83e02a27 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/helpers.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/helpers.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cpp
index eb53efeb..eb53efeb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cpp
index 14549b5b..14549b5b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cpp
index 4ba12be3..4ba12be3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cpp
index bb52a1d5..bb52a1d5 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.pro b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.pro
index 41bc6b63..ca7426e9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.pro
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.pro
@@ -6,9 +6,9 @@ include(../../../../../conf.pri)
 
 # Input
 SOURCES += \
-	relayserver.cc \
-	relayserver_main.cc \
-	../../base/host.cc \
-	../../base/socketaddresspair.cc
+	relayserver.cpp \
+	relayserver_main.cpp \
+	../../base/host.cpp \
+	../../base/socketaddresspair.cpp
 
 LIBS += ../../../liblibjingle.a
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver_main.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver_main.cpp
index 4dfae42c..4dfae42c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver_main.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver_main.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/session.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/session.cpp
index 73873338..73873338 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/session.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/session.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cpp
index 4c1c09d9..4c1c09d9 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cpp
index 2f0d67b8..2f0d67b8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cpp
index 2d6aa67c..2d6aa67c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cpp
index 6d1dc6b1..6d1dc6b1 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cpp
index 14d64735..14d64735 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cpp
index c6d9f9f8..c6d9f9f8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.pro b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.pro
index dce92ec4..30de4e45 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.pro
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.pro
@@ -6,9 +6,9 @@ include(../../../../../conf.pri)
 
 # Input
 SOURCES += \
-	stunserver.cc \
-	stunserver_main.cc \
-	../../base/host.cc #\
-#	../../base/socketaddresspair.cc
+	stunserver.cpp \
+	stunserver_main.cpp \
+	../../base/host.cpp #\
+#	../../base/socketaddresspair.cpp
 
 LIBS += ../../../liblibjingle.a
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver_main.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver_main.cpp
index bac3e35f..bac3e35f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver_main.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver_main.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/tcpport.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/tcpport.cpp
index a2d2adc6..a2d2adc6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/tcpport.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/tcpport.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/udpport.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/udpport.cpp
index fabbb25b..fabbb25b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/udpport.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/udpport.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/CMakeLists.txt
index 7ede9820..8ccce5f8 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/CMakeLists.txt
@@ -26,5 +26,5 @@ include_directories(
 
 tde_add_library( cricketp2pclient STATIC_PIC
   SOURCES
-    sessionclient.cc basicportallocator.cc socketmonitor.cc
+    sessionclient.cpp basicportallocator.cpp socketmonitor.cpp
 )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.am
index 2bdd95ff..4a461b93 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/Makefile.am
@@ -1,6 +1,6 @@
-libcricketp2pclient_la_SOURCES = sessionclient.cc \
-				 basicportallocator.cc \
-				 socketmonitor.cc
+libcricketp2pclient_la_SOURCES = sessionclient.cpp \
+				 basicportallocator.cpp \
+				 socketmonitor.cpp
 
 noinst_HEADERS =                 basicportallocator.h \
 				 sessionclient.h \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cpp
index 5192595c..5192595c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cpp
index b64c444a..b64c444a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/socketmonitor.cc b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/socketmonitor.cpp
index dd9fa67c..dd9fa67c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/socketmonitor.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/socketmonitor.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/CMakeLists.txt
index 3f22e535..164ce587 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/CMakeLists.txt
@@ -29,6 +29,6 @@ include_directories(
 
 tde_add_library( cricketsessionphone STATIC_PIC
   SOURCES
-    audiomonitor.cc channelmanager.cc voicechannel.cc call.cc
-    phonesessionclient.cc linphonemediaengine.cc
+    audiomonitor.cpp channelmanager.cpp voicechannel.cpp call.cpp
+    phonesessionclient.cpp linphonemediaengine.cpp
 )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am
index aef28293..695fd497 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/Makefile.am
@@ -1,9 +1,9 @@
-libcricketsessionphone_la_SOURCES = audiomonitor.cc \
-				    channelmanager.cc \
-				    voicechannel.cc \
-				    call.cc \
-				    phonesessionclient.cc \
-				    linphonemediaengine.cc 
+libcricketsessionphone_la_SOURCES = audiomonitor.cpp \
+				    channelmanager.cpp \
+				    voicechannel.cpp \
+				    call.cpp \
+				    phonesessionclient.cpp \
+				    linphonemediaengine.cpp 
 
 noinst_HEADERS =                    audiomonitor.h \
 				    channelmanager.h \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/audiomonitor.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/audiomonitor.cpp
index c1b63d1b..c1b63d1b 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/audiomonitor.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/audiomonitor.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cpp
index 31b12e92..31b12e92 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cpp
index 98634b12..98634b12 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp
index 756456d3..756456d3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cpp
index f9eb071c..f9eb071c 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp
index 93cc24c3..93cc24c3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cpp
index 58e1db60..58e1db60 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt
index 8b2e72d4..6c5db1cf 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/CMakeLists.txt
@@ -23,6 +23,6 @@ include_directories(
 
 tde_add_library( cricketxmllite STATIC_PIC
   SOURCES
-    qname.cc xmlbuilder.cc xmlconstants.cc xmlelement.cc xmlnsstack.cc
-    xmlparser.cc xmlprinter.cc
+    qname.cpp xmlbuilder.cpp xmlconstants.cpp xmlelement.cpp xmlnsstack.cpp
+    xmlparser.cpp xmlprinter.cpp
 )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.am
index 1e7abcfd..c7876f77 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/Makefile.am
@@ -1,10 +1,10 @@
-libcricketxmllite_la_SOURCES = qname.cc \
-			       xmlbuilder.cc \
-			       xmlconstants.cc \
- 			       xmlelement.cc \
-			       xmlnsstack.cc \
-			       xmlparser.cc \
-			       xmlprinter.cc
+libcricketxmllite_la_SOURCES = qname.cpp \
+			       xmlbuilder.cpp \
+			       xmlconstants.cpp \
+ 			       xmlelement.cpp \
+			       xmlnsstack.cpp \
+			       xmlparser.cpp \
+			       xmlprinter.cpp
 
 noinst_HEADERS =               qname.h \
 			       xmlbuilder.h \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cpp
index e20b57e3..e20b57e3 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cpp
index 7b1b10f0..7b1b10f0 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlconstants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlconstants.cpp
index 503f832f..503f832f 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlconstants.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlconstants.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cpp
index de0ccddb..de0ccddb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cpp
index d6d4c7b4..d6d4c7b4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cpp
index 41cadb84..41cadb84 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cpp
index e0d2c006..e0d2c006 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/CMakeLists.txt b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/CMakeLists.txt
index c68cc840..09e060a4 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/CMakeLists.txt
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/CMakeLists.txt
@@ -24,6 +24,6 @@ include_directories(
 
 tde_add_library( cricketxmpp STATIC_PIC
   SOURCES
-    constants.cc jid.cc saslmechanism.cc xmppclient.cc xmppengineimpl.cc
-    xmppengineimpl_iq.cc xmpplogintask.cc xmppstanzaparser.cc xmpptask.cc
+    constants.cpp jid.cpp saslmechanism.cpp xmppclient.cpp xmppengineimpl.cpp
+    xmppengineimpl_iq.cpp xmpplogintask.cpp xmppstanzaparser.cpp xmpptask.cpp
 )
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.am b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.am
index 527f7053..6b773af7 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.am
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/Makefile.am
@@ -1,15 +1,15 @@
 ## Does not compile with final
 KDE_OPTIONS = nofinal
 
-libcricketxmpp_la_SOURCES = constants.cc \
-			    jid.cc \
-			    saslmechanism.cc \
-			    xmppclient.cc \
-			    xmppengineimpl.cc \
-			    xmppengineimpl_iq.cc \
-			    xmpplogintask.cc \
-			    xmppstanzaparser.cc \
-			    xmpptask.cc
+libcricketxmpp_la_SOURCES = constants.cpp \
+			    jid.cpp \
+			    saslmechanism.cpp \
+			    xmppclient.cpp \
+			    xmppengineimpl.cpp \
+			    xmppengineimpl_iq.cpp \
+			    xmpplogintask.cpp \
+			    xmppstanzaparser.cpp \
+			    xmpptask.cpp
 
 noinst_HEADERS = asyncsocket.h \
 			    prexmppauth.h \
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cpp
index f89df149..f89df149 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cpp
index b742e03a..b742e03a 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cpp
index 4a6d7c24..4a6d7c24 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cpp
index 959b6f88..959b6f88 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cpp
index 3d363a78..3d363a78 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cpp
index 38304048..38304048 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cpp
index 9b3fe9bc..9b3fe9bc 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppstanzaparser.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppstanzaparser.cpp
index 66ed44fb..66ed44fb 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppstanzaparser.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppstanzaparser.cpp
diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cpp
index c9d86ba6..c9d86ba6 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cpp
diff --git a/kopete/protocols/oscar/liboscar/CMakeLists.txt b/kopete/protocols/oscar/liboscar/CMakeLists.txt
index 6053541f..7479ad3c 100644
--- a/kopete/protocols/oscar/liboscar/CMakeLists.txt
+++ b/kopete/protocols/oscar/liboscar/CMakeLists.txt
@@ -25,7 +25,7 @@ tde_add_library( oscar STATIC_PIC AUTOMOC
   SOURCES
     oscarutils.cpp client.cpp task.cpp connector.cpp
     inputprotocolbase.cpp coreprotocol.cpp flapprotocol.cpp
-    snacprotocol.cpp transfer.cpp rtf.cc bytestream.cpp
+    snacprotocol.cpp transfer.cpp rtf.cpp bytestream.cpp
     oscarclientstream.cpp safedelete.cpp stream.cpp oscarconnector.cpp
     oscarbytestream.cpp buffer.cpp md5.c logintask.cpp aimlogintask.cpp
     icqlogintask.cpp closeconnectiontask.cpp rateclassmanager.cpp
diff --git a/kopete/protocols/oscar/liboscar/Makefile.am b/kopete/protocols/oscar/liboscar/Makefile.am
index ab0def67..21a80276 100644
--- a/kopete/protocols/oscar/liboscar/Makefile.am
+++ b/kopete/protocols/oscar/liboscar/Makefile.am
@@ -6,7 +6,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/kopete/libkopete $(all_includes)
 
 
 liboscar_la_SOURCES = oscarutils.cpp client.cpp task.cpp connector.cpp \
-	inputprotocolbase.cpp coreprotocol.cpp flapprotocol.cpp snacprotocol.cpp transfer.cpp rtf.cc \
+	inputprotocolbase.cpp coreprotocol.cpp flapprotocol.cpp snacprotocol.cpp transfer.cpp rtf.cpp \
 	bytestream.cpp oscarclientstream.cpp safedelete.cpp stream.cpp oscarconnector.cpp \
 	oscarbytestream.cpp buffer.cpp md5.c logintask.cpp aimlogintask.cpp icqlogintask.cpp \
 	closeconnectiontask.cpp rateclassmanager.cpp serverversionstask.cpp rateinfotask.cpp \
diff --git a/kopete/protocols/oscar/liboscar/rtf.cc b/kopete/protocols/oscar/liboscar/rtf.cpp
index 514c9c67..198d7d79 100644
--- a/kopete/protocols/oscar/liboscar/rtf.cc
+++ b/kopete/protocols/oscar/liboscar/rtf.cpp
@@ -16,7 +16,7 @@
 #define yytext rtftext
 #define yywrap rtfwrap
 
-#line 20 "rtf.cc"
+#line 20 "rtf.cpp"
 /* A lexical scanner generated by flex */
 
 /* Scanner skeleton version:
@@ -419,9 +419,9 @@ char *yytext;
     *                                                                       *
     *************************************************************************
 
-update rtf.cc:
+update rtf.cpp:
 flex -olex.yy.c  `test -f rtf.ll || echo './'`rtf.ll
-sed '/^#/ s|lex.yy\.c|rtf.cc|' lex.yy.c >rtf.cc
+sed '/^#/ s|lex.yy\.c|rtf.cpp|' lex.yy.c >rtf.cpp
 rm -f lex.yy.c
 
 */
@@ -443,7 +443,7 @@ rm -f lex.yy.c
 
 #define YY_NO_UNPUT 1
 #define YY_STACK_USED 0
-#line 447 "rtf.cc"
+#line 447 "rtf.cpp"
 
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
@@ -597,7 +597,7 @@ YY_DECL
 #line 46 "rtf.ll"
 
 
-#line 601 "rtf.cc"
+#line 601 "rtf.cpp"
 
 	if ( yy_init )
 		{
@@ -730,7 +730,7 @@ YY_RULE_SETUP
 #line 57 "rtf.ll"
 ECHO;
 	YY_BREAK
-#line 734 "rtf.cc"
+#line 734 "rtf.cpp"
 case YY_STATE_EOF(INITIAL):
 	yyterminate();
 
diff --git a/kopete/protocols/oscar/liboscar/rtf.ll b/kopete/protocols/oscar/liboscar/rtf.ll
index c43aeaea..c9aea7db 100644
--- a/kopete/protocols/oscar/liboscar/rtf.ll
+++ b/kopete/protocols/oscar/liboscar/rtf.ll
@@ -15,9 +15,9 @@
     *                                                                       *
     *************************************************************************
 
-update rtf.cc:
+update rtf.cpp:
 flex -olex.yy.c  `test -f rtf.ll || echo './'`rtf.ll
-sed '/^#/ s|lex.yy\.c|rtf.cc|' lex.yy.c >rtf.cc
+sed '/^#/ s|lex.yy\.c|rtf.cpp|' lex.yy.c >rtf.cpp
 rm -f lex.yy.c
 
 */
diff --git a/kopete/protocols/sms/services/kopete_unix_serial.cpp b/kopete/protocols/sms/services/kopete_unix_serial.cpp
index c40f831b..085b9cd5 100644
--- a/kopete/protocols/sms/services/kopete_unix_serial.cpp
+++ b/kopete/protocols/sms/services/kopete_unix_serial.cpp
@@ -1,7 +1,7 @@
 // *************************************************************************
 // * Taken from the GSM TA/ME library
 // *
-// * File:	  gsm_unix_port.cc
+// * File:	  kopete_unix_serial.cpp
 // *
 // * Purpose: UNIX serial port implementation with extras
 // *
diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt
index dee19034..dbc6649a 100644
--- a/krfb/krfb/CMakeLists.txt
+++ b/krfb/krfb/CMakeLists.txt
@@ -51,8 +51,8 @@ tde_create_translated_desktop(
 
 tde_add_executable( krfb AUTOMOC
   SOURCES
-    rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui
-    krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc
+    rfbcontroller.cpp xupdatescanner.cpp main.cpp connectionwidget.ui
+    krfbifaceimpl.cpp krfbiface.skel trayicon.cpp connectiondialog.cpp
   LINK
     krfbconfig-static vncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES}
   DESTINATION ${BIN_INSTALL_DIR}
@@ -63,7 +63,7 @@ tde_add_executable( krfb AUTOMOC
 
 tde_add_library( krfbconfig STATIC_PIC AUTOMOC
   SOURCES
-    configuration.cc configuration.skel invitedialog.cc invitation.cc
+    configuration.cpp configuration.skel invitedialog.cpp invitation.cpp
     manageinvitations.ui personalinvitewidget.ui invitewidget.ui
-    personalinvitedialog.cc
+    personalinvitedialog.cpp
 )
diff --git a/krfb/krfb/Makefile.am b/krfb/krfb/Makefile.am
index 68b163f9..30326fbf 100644
--- a/krfb/krfb/Makefile.am
+++ b/krfb/krfb/Makefile.am
@@ -3,15 +3,15 @@ KDE_CXXFLAGS = $(USE_THREADS)
 METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libkrfbconfig.la
-libkrfbconfig_la_SOURCES = configuration.cc configuration.skel invitedialog.cc invitation.cc \
+libkrfbconfig_la_SOURCES = configuration.cpp configuration.skel invitedialog.cpp invitation.cpp \
                            manageinvitations.ui personalinvitewidget.ui \
-                           invitewidget.ui personalinvitedialog.cc
+                           invitewidget.ui personalinvitedialog.cpp
 libkrfbconfig_la_LIBADD = ../srvloc/libsrvloc.la $(LIB_TDEUI)
 
 bin_PROGRAMS = krfb
-krfb_SOURCES = rfbcontroller.cc xupdatescanner.cc main.cpp \
-               connectionwidget.ui krfbifaceimpl.cc krfbiface.skel \
-               trayicon.cpp connectiondialog.cc
+krfb_SOURCES = rfbcontroller.cpp xupdatescanner.cpp main.cpp \
+               connectionwidget.ui krfbifaceimpl.cpp krfbiface.skel \
+               trayicon.cpp connectiondialog.cpp
 krfb_LDADD   = libkrfbconfig.la ../libvncserver/libvncserver.la ../srvloc/libsrvloc.la -lXtst $(LIB_TDEUI) $(LIBJPEG) -ltdeio -lDCOP
 krfb_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) -ltdefx
 
@@ -31,4 +31,4 @@ INCLUDES= -I$(top_srcdir)/krfb/libvncserver -I$(top_srcdir)/krfb/srvloc \
            $(all_includes)
 
 messages: rc.cpp
-	$(XGETTEXT) rc.cpp *.cpp *.cc -o $(podir)/krfb.pot
+	$(XGETTEXT) rc.cpp *.cpp *.cpp -o $(podir)/krfb.pot
diff --git a/krfb/krfb/configuration.cc b/krfb/krfb/configuration.cpp
index 069b5696..069b5696 100644
--- a/krfb/krfb/configuration.cc
+++ b/krfb/krfb/configuration.cpp
diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cpp
index 96ad06b9..96ad06b9 100644
--- a/krfb/krfb/connectiondialog.cc
+++ b/krfb/krfb/connectiondialog.cpp
diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cpp
index bb5ebe9d..bb5ebe9d 100644
--- a/krfb/krfb/invitation.cc
+++ b/krfb/krfb/invitation.cpp
diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cpp
index 59d62fb7..59d62fb7 100644
--- a/krfb/krfb/invitedialog.cc
+++ b/krfb/krfb/invitedialog.cpp
diff --git a/krfb/krfb/krfbifaceimpl.cc b/krfb/krfb/krfbifaceimpl.cpp
index a79b1437..a79b1437 100644
--- a/krfb/krfb/krfbifaceimpl.cc
+++ b/krfb/krfb/krfbifaceimpl.cpp
diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cpp
index 2949ba03..2949ba03 100644
--- a/krfb/krfb/personalinvitedialog.cc
+++ b/krfb/krfb/personalinvitedialog.cpp
diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cpp
index 4cd0f7fb..4cd0f7fb 100644
--- a/krfb/krfb/rfbcontroller.cc
+++ b/krfb/krfb/rfbcontroller.cpp
diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h
index d8882b90..adc3e636 100644
--- a/krfb/krfb/rfbcontroller.h
+++ b/krfb/krfb/rfbcontroller.h
@@ -7,7 +7,7 @@
  ***************************************************************************/
 
 /***************************************************************************
- * Contains portions & concept from rfb's x0rfbserver.cc
+ * Contains portions & concept from rfb's x0rfbserver.cpp
  * Copyright (C) 2000 heXoNet Support GmbH, D-66424 Homburg.
  ***************************************************************************/
 
diff --git a/krfb/krfb/xupdatescanner.cc b/krfb/krfb/xupdatescanner.cpp
index 0deb136b..0deb136b 100644
--- a/krfb/krfb/xupdatescanner.cc
+++ b/krfb/krfb/xupdatescanner.cpp
diff --git a/krfb/libvncserver/CMakeLists.txt b/krfb/libvncserver/CMakeLists.txt
index fece6692..a349191d 100644
--- a/krfb/libvncserver/CMakeLists.txt
+++ b/krfb/libvncserver/CMakeLists.txt
@@ -22,7 +22,7 @@ add_definitions( -DHAVE_PTHREADS -DALLOW24BPP )
 
 tde_add_library( vncserver STATIC_PIC AUTOMOC
   SOURCES
-    main.cc rfbserver.c sraRegion.c auth.c sockets.c stats.c corre.c
+    main.cpp rfbserver.c sraRegion.c auth.c sockets.c stats.c corre.c
     hextile.c rre.c translate.c cutpaste.c zlib.c tight.c httpd.c
     cursor.c font.c draw.c selbox.c d3des.c vncauth.c cargs.c
 )
diff --git a/krfb/libvncserver/Makefile.am b/krfb/libvncserver/Makefile.am
index 2203dd7f..de9cd436 100644
--- a/krfb/libvncserver/Makefile.am
+++ b/krfb/libvncserver/Makefile.am
@@ -4,7 +4,7 @@ METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libvncserver.la
 
-libvncserver_la_SOURCES = main.cc rfbserver.c sraRegion.c auth.c sockets.c \
+libvncserver_la_SOURCES = main.cpp rfbserver.c sraRegion.c auth.c sockets.c \
 	stats.c corre.c hextile.c rre.c translate.c cutpaste.c \
 	zlib.c tight.c httpd.c cursor.c font.c \
 	draw.c selbox.c d3des.c vncauth.c cargs.c
diff --git a/krfb/libvncserver/main.cc b/krfb/libvncserver/main.cpp
index 6ecea30d..6ecea30d 100644
--- a/krfb/libvncserver/main.cc
+++ b/krfb/libvncserver/main.cpp
diff --git a/wifi/kwifimanager.cpp b/wifi/kwifimanager.cpp
index 21d19a07..1c3bc57e 100644
--- a/wifi/kwifimanager.cpp
+++ b/wifi/kwifimanager.cpp
@@ -612,7 +612,7 @@ TQStringList usedInterfacesList()
   client->registerAs( "kwifimanager" );
   client->setDefaultObject( "dcop_interface" );
 
-  // shamelessly stolen from tdelibs/tdeio/booksmarks/kbookmarkimporter_crash.cc
+  // shamelessly stolen from tdelibs/tdeio/booksmarks/kbookmarkimporter_crash.cpp
   TQStringList ignoreInterfaces;
   QCStringList apps = client->registeredApplications();
   for ( QCStringList::Iterator it = apps.begin(); it != apps.end(); ++it )