From a06e2c2f225d76b67b0058a9880222f75d5495c3 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Wed, 9 Dec 2020 14:11:22 +0900 Subject: [PATCH] Renaming of files in preparation for code style tools. Signed-off-by: Michele Calgaro --- .../groupwise/libgroupwise/CMakeLists.txt | 2 +- .../groupwise/libgroupwise/Makefile.am | 2 +- .../libgroupwise/{rtf.cc => rtf.cpp} | 14 +-- .../protocols/groupwise/libgroupwise/rtf.ll | 4 +- .../jabber/jingle/libjingle/libjingle.pro | 108 +++++++++--------- .../jingle/libjingle/talk/base/CMakeLists.txt | 8 +- .../jingle/libjingle/talk/base/Makefile.am | 32 +++--- ...cpacketsocket.cc => asyncpacketsocket.cpp} | 0 .../{asynctcpsocket.cc => asynctcpsocket.cpp} | 0 .../{asyncudpsocket.cc => asyncudpsocket.cpp} | 0 .../talk/base/{base64.cc => base64.cpp} | 0 .../base/{bytebuffer.cc => bytebuffer.cpp} | 0 .../jingle/libjingle/talk/base/common.h | 2 +- .../libjingle/talk/base/{host.cc => host.cpp} | 0 .../talk/base/{jtime.cc => jtime.cpp} | 0 .../{messagequeue.cc => messagequeue.cpp} | 0 .../talk/base/{network.cc => network.cpp} | 0 ...cketserver.cc => physicalsocketserver.cpp} | 0 .../{socketadapters.cc => socketadapters.cpp} | 0 .../{socketaddress.cc => socketaddress.cpp} | 0 ...etaddresspair.cc => socketaddresspair.cpp} | 0 .../libjingle/talk/base/{task.cc => task.cpp} | 0 .../base/{taskrunner.cc => taskrunner.cpp} | 0 .../talk/base/{thread.cc => thread.cpp} | 0 .../libjingle/talk/examples/call/Makefile.am | 4 +- .../libjingle/talk/examples/call/call.pro | 18 +-- .../call/{call_main.cc => call_main.cpp} | 0 .../call/{callclient.cc => callclient.cpp} | 0 .../examples/call/{console.cc => console.cpp} | 0 ...presenceouttask.cc => presenceouttask.cpp} | 0 ...esencepushtask.cc => presencepushtask.cpp} | 0 .../libjingle/talk/examples/login/Makefile.am | 10 +- .../login/{login_main.cc => login_main.cpp} | 0 .../login/{xmppauth.cc => xmppauth.cpp} | 0 .../login/{xmpppump.cc => xmpppump.cpp} | 0 .../login/{xmppsocket.cc => xmppsocket.cpp} | 0 .../login/{xmppthread.cc => xmppthread.cpp} | 0 .../libjingle/talk/p2p/base/CMakeLists.txt | 10 +- .../libjingle/talk/p2p/base/Makefile.am | 28 ++--- .../talk/p2p/base/{helpers.cc => helpers.cpp} | 0 .../p2p/base/{p2psocket.cc => p2psocket.cpp} | 0 .../talk/p2p/base/{port.cc => port.cpp} | 0 .../p2p/base/{relayport.cc => relayport.cpp} | 0 .../base/{relayserver.cc => relayserver.cpp} | 0 .../libjingle/talk/p2p/base/relayserver.pro | 8 +- ...layserver_main.cc => relayserver_main.cpp} | 0 .../talk/p2p/base/{session.cc => session.cpp} | 0 .../{sessionmanager.cc => sessionmanager.cpp} | 0 .../{socketmanager.cc => socketmanager.cpp} | 0 .../talk/p2p/base/{stun.cc => stun.cpp} | 0 .../p2p/base/{stunport.cc => stunport.cpp} | 0 .../base/{stunrequest.cc => stunrequest.cpp} | 0 .../base/{stunserver.cc => stunserver.cpp} | 0 .../libjingle/talk/p2p/base/stunserver.pro | 8 +- ...stunserver_main.cc => stunserver_main.cpp} | 0 .../talk/p2p/base/{tcpport.cc => tcpport.cpp} | 0 .../talk/p2p/base/{udpport.cc => udpport.cpp} | 0 .../libjingle/talk/p2p/client/CMakeLists.txt | 2 +- .../libjingle/talk/p2p/client/Makefile.am | 6 +- ...ortallocator.cc => basicportallocator.cpp} | 0 .../{sessionclient.cc => sessionclient.cpp} | 0 .../{socketmonitor.cc => socketmonitor.cpp} | 0 .../talk/session/phone/CMakeLists.txt | 4 +- .../libjingle/talk/session/phone/Makefile.am | 12 +- .../{audiomonitor.cc => audiomonitor.cpp} | 0 .../talk/session/phone/{call.cc => call.cpp} | 0 .../{channelmanager.cc => channelmanager.cpp} | 0 ...mediaengine.cc => linphonemediaengine.cpp} | 0 ...essionclient.cc => phonesessionclient.cpp} | 0 ...ediaengine.cc => portaudiomediaengine.cpp} | 0 .../{voicechannel.cc => voicechannel.cpp} | 0 .../libjingle/talk/xmllite/CMakeLists.txt | 4 +- .../jingle/libjingle/talk/xmllite/Makefile.am | 14 +-- .../talk/xmllite/{qname.cc => qname.cpp} | 0 .../xmllite/{xmlbuilder.cc => xmlbuilder.cpp} | 0 .../{xmlconstants.cc => xmlconstants.cpp} | 0 .../xmllite/{xmlelement.cc => xmlelement.cpp} | 0 .../xmllite/{xmlnsstack.cc => xmlnsstack.cpp} | 0 .../xmllite/{xmlparser.cc => xmlparser.cpp} | 0 .../xmllite/{xmlprinter.cc => xmlprinter.cpp} | 0 .../jingle/libjingle/talk/xmpp/CMakeLists.txt | 4 +- .../jingle/libjingle/talk/xmpp/Makefile.am | 18 +-- .../talk/xmpp/{constants.cc => constants.cpp} | 0 .../libjingle/talk/xmpp/{jid.cc => jid.cpp} | 0 .../{saslmechanism.cc => saslmechanism.cpp} | 0 .../xmpp/{xmppclient.cc => xmppclient.cpp} | 0 .../{xmppengineimpl.cc => xmppengineimpl.cpp} | 0 ...engineimpl_iq.cc => xmppengineimpl_iq.cpp} | 0 .../{xmpplogintask.cc => xmpplogintask.cpp} | 0 ...ppstanzaparser.cc => xmppstanzaparser.cpp} | 0 .../talk/xmpp/{xmpptask.cc => xmpptask.cpp} | 0 .../protocols/oscar/liboscar/CMakeLists.txt | 2 +- kopete/protocols/oscar/liboscar/Makefile.am | 2 +- .../oscar/liboscar/{rtf.cc => rtf.cpp} | 12 +- kopete/protocols/oscar/liboscar/rtf.ll | 4 +- .../sms/services/kopete_unix_serial.cpp | 2 +- krfb/krfb/CMakeLists.txt | 8 +- krfb/krfb/Makefile.am | 12 +- .../{configuration.cc => configuration.cpp} | 0 ...nnectiondialog.cc => connectiondialog.cpp} | 0 krfb/krfb/{invitation.cc => invitation.cpp} | 0 .../{invitedialog.cc => invitedialog.cpp} | 0 .../{krfbifaceimpl.cc => krfbifaceimpl.cpp} | 0 ...vitedialog.cc => personalinvitedialog.cpp} | 0 .../{rfbcontroller.cc => rfbcontroller.cpp} | 0 krfb/krfb/rfbcontroller.h | 2 +- .../{xupdatescanner.cc => xupdatescanner.cpp} | 0 wifi/kwifimanager.cpp | 2 +- 108 files changed, 184 insertions(+), 184 deletions(-) rename kopete/protocols/groupwise/libgroupwise/{rtf.cc => rtf.cpp} (99%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{asyncpacketsocket.cc => asyncpacketsocket.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{asynctcpsocket.cc => asynctcpsocket.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{asyncudpsocket.cc => asyncudpsocket.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{base64.cc => base64.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{bytebuffer.cc => bytebuffer.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{host.cc => host.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{jtime.cc => jtime.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{messagequeue.cc => messagequeue.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{network.cc => network.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{physicalsocketserver.cc => physicalsocketserver.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{socketadapters.cc => socketadapters.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{socketaddress.cc => socketaddress.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{socketaddresspair.cc => socketaddresspair.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{task.cc => task.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{taskrunner.cc => taskrunner.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/base/{thread.cc => thread.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/call/{call_main.cc => call_main.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/call/{callclient.cc => callclient.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/call/{console.cc => console.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/call/{presenceouttask.cc => presenceouttask.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/call/{presencepushtask.cc => presencepushtask.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/login/{login_main.cc => login_main.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/login/{xmppauth.cc => xmppauth.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/login/{xmpppump.cc => xmpppump.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/login/{xmppsocket.cc => xmppsocket.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/examples/login/{xmppthread.cc => xmppthread.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{helpers.cc => helpers.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{p2psocket.cc => p2psocket.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{port.cc => port.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{relayport.cc => relayport.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{relayserver.cc => relayserver.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{relayserver_main.cc => relayserver_main.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{session.cc => session.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{sessionmanager.cc => sessionmanager.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{socketmanager.cc => socketmanager.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{stun.cc => stun.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{stunport.cc => stunport.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{stunrequest.cc => stunrequest.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{stunserver.cc => stunserver.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{stunserver_main.cc => stunserver_main.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{tcpport.cc => tcpport.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/{udpport.cc => udpport.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/{basicportallocator.cc => basicportallocator.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/{sessionclient.cc => sessionclient.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/{socketmonitor.cc => socketmonitor.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{audiomonitor.cc => audiomonitor.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{call.cc => call.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{channelmanager.cc => channelmanager.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{linphonemediaengine.cc => linphonemediaengine.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{phonesessionclient.cc => phonesessionclient.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{portaudiomediaengine.cc => portaudiomediaengine.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/session/phone/{voicechannel.cc => voicechannel.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{qname.cc => qname.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlbuilder.cc => xmlbuilder.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlconstants.cc => xmlconstants.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlelement.cc => xmlelement.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlnsstack.cc => xmlnsstack.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlparser.cc => xmlparser.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmllite/{xmlprinter.cc => xmlprinter.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{constants.cc => constants.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{jid.cc => jid.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{saslmechanism.cc => saslmechanism.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmppclient.cc => xmppclient.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmppengineimpl.cc => xmppengineimpl.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmppengineimpl_iq.cc => xmppengineimpl_iq.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmpplogintask.cc => xmpplogintask.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmppstanzaparser.cc => xmppstanzaparser.cpp} (100%) rename kopete/protocols/jabber/jingle/libjingle/talk/xmpp/{xmpptask.cc => xmpptask.cpp} (100%) rename kopete/protocols/oscar/liboscar/{rtf.cc => rtf.cpp} (99%) rename krfb/krfb/{configuration.cc => configuration.cpp} (100%) rename krfb/krfb/{connectiondialog.cc => connectiondialog.cpp} (100%) rename krfb/krfb/{invitation.cc => invitation.cpp} (100%) rename krfb/krfb/{invitedialog.cc => invitedialog.cpp} (100%) rename krfb/krfb/{krfbifaceimpl.cc => krfbifaceimpl.cpp} (100%) rename krfb/krfb/{personalinvitedialog.cc => personalinvitedialog.cpp} (100%) rename krfb/krfb/{rfbcontroller.cc => rfbcontroller.cpp} (100%) rename krfb/krfb/{xupdatescanner.cc => xupdatescanner.cpp} (100%) 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 similarity index 99% rename from kopete/protocols/groupwise/libgroupwise/rtf.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/asyncpacketsocket.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/asynctcpsocket.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/asyncudpsocket.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/base64.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/bytebuffer.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/host.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/jtime.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/messagequeue.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/network.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/physicalsocketserver.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/socketadapters.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddress.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/socketaddresspair.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/task.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/taskrunner.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/base/thread.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/call/call_main.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/call/callclient.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/call/console.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presenceouttask.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/call/presencepushtask.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/login/login_main.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppauth.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmpppump.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppsocket.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/examples/login/xmppthread.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/helpers.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/p2psocket.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/port.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayport.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/relayserver_main.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/session.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/sessionmanager.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/socketmanager.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stun.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunport.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunrequest.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/stunserver_main.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/tcpport.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/base/udpport.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/basicportallocator.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/sessionclient.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/p2p/client/socketmonitor.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/audiomonitor.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/call.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/channelmanager.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/linphonemediaengine.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/phonesessionclient.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/portaudiomediaengine.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/session/phone/voicechannel.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/qname.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlbuilder.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlconstants.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlelement.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlnsstack.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlparser.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmllite/xmlprinter.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/constants.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/jid.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/saslmechanism.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppclient.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppengineimpl_iq.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpplogintask.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmppstanzaparser.cc rename to 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 similarity index 100% rename from kopete/protocols/jabber/jingle/libjingle/talk/xmpp/xmpptask.cc rename to 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 3759a85c..dbdd26a5 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 similarity index 99% rename from kopete/protocols/oscar/liboscar/rtf.cc rename to 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 4c9cc2a9..fe0e6d4c 100644 --- a/krfb/krfb/CMakeLists.txt +++ b/krfb/krfb/CMakeLists.txt @@ -52,8 +52,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 tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} @@ -64,7 +64,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 9c8fcf21..2f375ab5 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_TQT) -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 similarity index 100% rename from krfb/krfb/configuration.cc rename to krfb/krfb/configuration.cpp diff --git a/krfb/krfb/connectiondialog.cc b/krfb/krfb/connectiondialog.cpp similarity index 100% rename from krfb/krfb/connectiondialog.cc rename to krfb/krfb/connectiondialog.cpp diff --git a/krfb/krfb/invitation.cc b/krfb/krfb/invitation.cpp similarity index 100% rename from krfb/krfb/invitation.cc rename to krfb/krfb/invitation.cpp diff --git a/krfb/krfb/invitedialog.cc b/krfb/krfb/invitedialog.cpp similarity index 100% rename from krfb/krfb/invitedialog.cc rename to krfb/krfb/invitedialog.cpp diff --git a/krfb/krfb/krfbifaceimpl.cc b/krfb/krfb/krfbifaceimpl.cpp similarity index 100% rename from krfb/krfb/krfbifaceimpl.cc rename to krfb/krfb/krfbifaceimpl.cpp diff --git a/krfb/krfb/personalinvitedialog.cc b/krfb/krfb/personalinvitedialog.cpp similarity index 100% rename from krfb/krfb/personalinvitedialog.cc rename to krfb/krfb/personalinvitedialog.cpp diff --git a/krfb/krfb/rfbcontroller.cc b/krfb/krfb/rfbcontroller.cpp similarity index 100% rename from krfb/krfb/rfbcontroller.cc rename to krfb/krfb/rfbcontroller.cpp diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h index 3d3cd73c..2c9eb018 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 similarity index 100% rename from krfb/krfb/xupdatescanner.cc rename to krfb/krfb/xupdatescanner.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 )