From 7ceddff0b9fafff1a0afc6a6519f9370b981e7a2 Mon Sep 17 00:00:00 2001 From: Ghislain MARY Date: Mon, 24 Jul 2017 11:03:01 +0200 Subject: [PATCH] Do not rename files to compile them as C++. --- CMakeLists.txt | 3 + coreapi/CMakeLists.txt | 172 +++++++++--------- .../{AccountCreator.cc => account_creator.c} | 0 ...orService.cc => account_creator_service.c} | 0 coreapi/{Address.cc => address.c} | 0 .../{Authentication.cc => authentication.c} | 0 ...sal_address_impl.cc => sal_address_impl.c} | 0 .../bellesip_sal/{sal_impl.cc => sal_impl.c} | 0 .../{sal_op_call.cc => sal_op_call.c} | 2 +- ...all_transfer.cc => sal_op_call_transfer.c} | 2 +- .../{sal_op_events.cc => sal_op_events.c} | 0 .../{sal_op_impl.cc => sal_op_impl.c} | 0 .../{sal_op_info.cc => sal_op_info.c} | 0 .../{sal_op_message.cc => sal_op_message.c} | 0 .../{sal_op_presence.cc => sal_op_presence.c} | 0 .../{sal_op_publish.cc => sal_op_publish.c} | 0 ..._registration.cc => sal_op_registration.c} | 0 .../bellesip_sal/{sal_sdp.cc => sal_sdp.c} | 0 coreapi/{Buffer.cc => buffer.c} | 0 coreapi/{CallLog.cc => call_log.c} | 0 coreapi/{CallParams.cc => call_params.c} | 0 coreapi/{Callbacks.cc => callbacks.c} | 0 coreapi/{CardDav.cc => carddav.c} | 0 coreapi/{CardDav.h => carddav.h} | 0 coreapi/{Chat.cc => chat.c} | 0 ...atFileTransfer.cc => chat_file_transfer.c} | 0 coreapi/{Conference.cc => conference.cc} | 2 +- .../{Conference.h => conference_private.h} | 0 ...actProvider.h => contact_providers_priv.h} | 0 .../{ContactProvider.cc => contactprovider.c} | 2 +- coreapi/{Content.cc => content.c} | 0 coreapi/{DialPlan.cc => dial_plan.c} | 0 coreapi/{Dict.cc => dict.c} | 0 coreapi/{EcCalibrator.cc => ec-calibrator.c} | 0 coreapi/{EchoTester.cc => echo-tester.c} | 0 coreapi/{Enum.cc => enum.c} | 2 +- coreapi/{Enum.h => enum.h} | 0 coreapi/{ErrorInfo.cc => error_info.c} | 0 coreapi/{Event.cc => event.c} | 0 coreapi/{Factory.cc => factory.c} | 0 coreapi/{Fonis.cc => fonis.c} | 0 coreapi/{Friend.cc => friend.c} | 0 coreapi/{FriendList.cc => friendlist.c} | 0 ...yptionEngine.cc => im_encryption_engine.c} | 0 .../{ImNotifPolicy.cc => im_notif_policy.c} | 0 coreapi/{Info.cc => info.c} | 0 coreapi/{LdapProvider.cc => ldapprovider.c} | 2 +- coreapi/{Lime.cc => lime.c} | 2 +- coreapi/{Lime.h => lime.h} | 0 coreapi/{Tunnel.cc => linphone_tunnel.cc} | 0 ...nnelConfig.cc => linphone_tunnel_config.c} | 0 ...TunnelStubs.cc => linphone_tunnel_stubs.c} | 0 coreapi/{Call.cc => linphonecall.c} | 4 +- coreapi/{Core.cc => linphonecore.c} | 12 +- coreapi/{LocalPlayer.cc => localplayer.c} | 0 coreapi/{Lpc2Xml.cc => lpc2xml.c} | 2 +- coreapi/{Lpc2Xml.h => lpc2xml.h} | 0 coreapi/{Config.cc => lpconfig.c} | 4 +- coreapi/{Lsd.cc => lsd.c} | 0 .../{MessageStorage.cc => message_storage.c} | 0 coreapi/{Misc.cc => misc.c} | 0 coreapi/{NatPolicy.cc => nat_policy.c} | 0 coreapi/{OfferAnswer.cc => offeranswer.c} | 2 +- coreapi/{OfferAnswer.h => offeranswer.h} | 0 coreapi/{PayloadType.cc => payload_type.c} | 0 coreapi/{Player.cc => player.c} | 0 coreapi/{Presence.cc => presence.c} | 0 coreapi/private.h | 6 +- coreapi/{Proxy.cc => proxy.c} | 2 +- ...ualityReporting.cc => quality_reporting.c} | 0 ...QualityReporting.h => quality_reporting.h} | 0 ...eProvisioning.cc => remote_provisioning.c} | 2 +- .../{RingTonePlayer.cc => ringtoneplayer.c} | 0 coreapi/{Sal.cc => sal.c} | 0 coreapi/{SipLogin.cc => siplogin.c} | 0 coreapi/{SipSetup.cc => sipsetup.c} | 0 ...Sqlite3BctbxVfs.cc => sqlite3_bctbx_vfs.c} | 2 +- ...{Sqlite3BctbxVfs.h => sqlite3_bctbx_vfs.h} | 0 coreapi/{Upnp.cc => upnp.c} | 0 coreapi/{UpnpPrivate.h => upnp.h} | 0 coreapi/{Vcard.cc => vcard.cc} | 2 +- coreapi/{Vcard.h => vcard_private.h} | 0 coreapi/{VcardStubs.cc => vcard_stubs.c} | 0 ...{VideoDefinition.cc => video_definition.c} | 0 coreapi/{Vtables.cc => vtables.c} | 0 coreapi/{Xml.cc => xml.c} | 0 coreapi/{Xml2Lpc.cc => xml2lpc.c} | 2 +- coreapi/{Xml2Lpc.h => xml2lpc.h} | 0 coreapi/{XmlRpc.cc => xmlrpc.c} | 0 tester/message_tester.c | 2 +- tester/vcard_tester.c | 2 +- 91 files changed, 117 insertions(+), 116 deletions(-) rename coreapi/{AccountCreator.cc => account_creator.c} (100%) rename coreapi/{AccountCreatorService.cc => account_creator_service.c} (100%) rename coreapi/{Address.cc => address.c} (100%) rename coreapi/{Authentication.cc => authentication.c} (100%) rename coreapi/bellesip_sal/{sal_address_impl.cc => sal_address_impl.c} (100%) rename coreapi/bellesip_sal/{sal_impl.cc => sal_impl.c} (100%) rename coreapi/bellesip_sal/{sal_op_call.cc => sal_op_call.c} (99%) rename coreapi/bellesip_sal/{sal_op_call_transfer.cc => sal_op_call_transfer.c} (99%) rename coreapi/bellesip_sal/{sal_op_events.cc => sal_op_events.c} (100%) rename coreapi/bellesip_sal/{sal_op_impl.cc => sal_op_impl.c} (100%) rename coreapi/bellesip_sal/{sal_op_info.cc => sal_op_info.c} (100%) rename coreapi/bellesip_sal/{sal_op_message.cc => sal_op_message.c} (100%) rename coreapi/bellesip_sal/{sal_op_presence.cc => sal_op_presence.c} (100%) rename coreapi/bellesip_sal/{sal_op_publish.cc => sal_op_publish.c} (100%) rename coreapi/bellesip_sal/{sal_op_registration.cc => sal_op_registration.c} (100%) rename coreapi/bellesip_sal/{sal_sdp.cc => sal_sdp.c} (100%) rename coreapi/{Buffer.cc => buffer.c} (100%) rename coreapi/{CallLog.cc => call_log.c} (100%) rename coreapi/{CallParams.cc => call_params.c} (100%) rename coreapi/{Callbacks.cc => callbacks.c} (100%) rename coreapi/{CardDav.cc => carddav.c} (100%) rename coreapi/{CardDav.h => carddav.h} (100%) rename coreapi/{Chat.cc => chat.c} (100%) rename coreapi/{ChatFileTransfer.cc => chat_file_transfer.c} (100%) rename coreapi/{Conference.cc => conference.cc} (99%) rename coreapi/{Conference.h => conference_private.h} (100%) rename coreapi/{ContactProvider.h => contact_providers_priv.h} (100%) rename coreapi/{ContactProvider.cc => contactprovider.c} (99%) rename coreapi/{Content.cc => content.c} (100%) rename coreapi/{DialPlan.cc => dial_plan.c} (100%) rename coreapi/{Dict.cc => dict.c} (100%) rename coreapi/{EcCalibrator.cc => ec-calibrator.c} (100%) rename coreapi/{EchoTester.cc => echo-tester.c} (100%) rename coreapi/{Enum.cc => enum.c} (99%) rename coreapi/{Enum.h => enum.h} (100%) rename coreapi/{ErrorInfo.cc => error_info.c} (100%) rename coreapi/{Event.cc => event.c} (100%) rename coreapi/{Factory.cc => factory.c} (100%) rename coreapi/{Fonis.cc => fonis.c} (100%) rename coreapi/{Friend.cc => friend.c} (100%) rename coreapi/{FriendList.cc => friendlist.c} (100%) rename coreapi/{ImEncryptionEngine.cc => im_encryption_engine.c} (100%) rename coreapi/{ImNotifPolicy.cc => im_notif_policy.c} (100%) rename coreapi/{Info.cc => info.c} (100%) rename coreapi/{LdapProvider.cc => ldapprovider.c} (99%) rename coreapi/{Lime.cc => lime.c} (99%) rename coreapi/{Lime.h => lime.h} (100%) rename coreapi/{Tunnel.cc => linphone_tunnel.cc} (100%) rename coreapi/{TunnelConfig.cc => linphone_tunnel_config.c} (100%) rename coreapi/{TunnelStubs.cc => linphone_tunnel_stubs.c} (100%) rename coreapi/{Call.cc => linphonecall.c} (99%) rename coreapi/{Core.cc => linphonecore.c} (99%) rename coreapi/{LocalPlayer.cc => localplayer.c} (100%) rename coreapi/{Lpc2Xml.cc => lpc2xml.c} (99%) rename coreapi/{Lpc2Xml.h => lpc2xml.h} (100%) rename coreapi/{Config.cc => lpconfig.c} (99%) rename coreapi/{Lsd.cc => lsd.c} (100%) rename coreapi/{MessageStorage.cc => message_storage.c} (100%) rename coreapi/{Misc.cc => misc.c} (100%) rename coreapi/{NatPolicy.cc => nat_policy.c} (100%) rename coreapi/{OfferAnswer.cc => offeranswer.c} (99%) rename coreapi/{OfferAnswer.h => offeranswer.h} (100%) rename coreapi/{PayloadType.cc => payload_type.c} (100%) rename coreapi/{Player.cc => player.c} (100%) rename coreapi/{Presence.cc => presence.c} (100%) rename coreapi/{Proxy.cc => proxy.c} (99%) rename coreapi/{QualityReporting.cc => quality_reporting.c} (100%) rename coreapi/{QualityReporting.h => quality_reporting.h} (100%) rename coreapi/{RemoteProvisioning.cc => remote_provisioning.c} (99%) rename coreapi/{RingTonePlayer.cc => ringtoneplayer.c} (100%) rename coreapi/{Sal.cc => sal.c} (100%) rename coreapi/{SipLogin.cc => siplogin.c} (100%) rename coreapi/{SipSetup.cc => sipsetup.c} (100%) rename coreapi/{Sqlite3BctbxVfs.cc => sqlite3_bctbx_vfs.c} (99%) rename coreapi/{Sqlite3BctbxVfs.h => sqlite3_bctbx_vfs.h} (100%) rename coreapi/{Upnp.cc => upnp.c} (100%) rename coreapi/{UpnpPrivate.h => upnp.h} (100%) rename coreapi/{Vcard.cc => vcard.cc} (99%) rename coreapi/{Vcard.h => vcard_private.h} (100%) rename coreapi/{VcardStubs.cc => vcard_stubs.c} (100%) rename coreapi/{VideoDefinition.cc => video_definition.c} (100%) rename coreapi/{Vtables.cc => vtables.c} (100%) rename coreapi/{Xml.cc => xml.c} (100%) rename coreapi/{Xml2Lpc.cc => xml2lpc.c} (99%) rename coreapi/{Xml2Lpc.h => xml2lpc.h} (100%) rename coreapi/{XmlRpc.cc => xmlrpc.c} (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57c97cff4..ee5e04180 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -274,6 +274,9 @@ else() if(CMAKE_C_COMPILER_ID STREQUAL "Clang") list(APPEND STRICT_OPTIONS_CPP "-Qunused-arguments" "-Wno-array-bounds") endif() + if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") + list(APPEND STRICT_OPTIONS_CXX "-x c++") + endif() if(APPLE) list(APPEND STRICT_OPTIONS_CPP "-Wno-error=unknown-warning-option" "-Qunused-arguments" "-Wno-tautological-compare" "-Wno-unused-function" "-Wno-array-bounds") endif() diff --git a/coreapi/CMakeLists.txt b/coreapi/CMakeLists.txt index a55dcef32..6bd7665a8 100644 --- a/coreapi/CMakeLists.txt +++ b/coreapi/CMakeLists.txt @@ -36,93 +36,90 @@ endif() set(LINPHONE_PRIVATE_HEADER_FILES bellesip_sal/sal_impl.h - CardDav.h - Conference.h - ContactProvider.h - Enum.h - Lime.h - Lpc2Xml.h - OfferAnswer.h + carddav.h + conference_private.h + contact_providers_priv.h + enum.h + lime.h + lpc2xml.h + offeranswer.h private.h - QualityReporting.h - Sqlite3BctbxVfs.h - Vcard.h - Xml2Lpc.h + quality_reporting.h + sqlite3_bctbx_vfs.h + vcard_private.h + xml2lpc.h ) set(LINPHONE_SOURCE_FILES_C - bellesip_sal/sal_address_impl.cc - bellesip_sal/sal_impl.cc - bellesip_sal/sal_op_call.cc - bellesip_sal/sal_op_call_transfer.cc - bellesip_sal/sal_op_events.cc - bellesip_sal/sal_op_impl.cc - bellesip_sal/sal_op_info.cc - bellesip_sal/sal_op_message.cc - bellesip_sal/sal_op_presence.cc - bellesip_sal/sal_op_publish.cc - bellesip_sal/sal_op_registration.cc - bellesip_sal/sal_sdp.cc + account_creator.c + account_creator_service.c + address.c + authentication.c + bellesip_sal/sal_address_impl.c + bellesip_sal/sal_impl.c + bellesip_sal/sal_op_call.c + bellesip_sal/sal_op_call_transfer.c + bellesip_sal/sal_op_events.c + bellesip_sal/sal_op_impl.c + bellesip_sal/sal_op_info.c + bellesip_sal/sal_op_message.c + bellesip_sal/sal_op_presence.c + bellesip_sal/sal_op_publish.c + bellesip_sal/sal_op_registration.c + bellesip_sal/sal_sdp.c + buffer.c + callbacks.c + call_log.c + call_params.c + carddav.c + chat.c + chat_file_transfer.c + contactprovider.c + content.c + dial_plan.c + dict.c + ec-calibrator.c + echo-tester.c + enum.c + error_info.c + event.c + factory.c + friend.c + friendlist.c + im_notif_policy.c + info.c + ldapprovider.c + lime.c + im_encryption_engine.c + linphonecall.c + linphonecore.c + linphone_tunnel_config.c + localplayer.c + lpc2xml.c + lpconfig.c + lsd.c + message_storage.c + misc.c + nat_policy.c + offeranswer.c + payload_type.c + player.c + presence.c + proxy.c + quality_reporting.c + remote_provisioning.c + ringtoneplayer.c + sal.c + siplogin.c + sipsetup.c + sqlite3_bctbx_vfs.c + video_definition.c + xml2lpc.c + xml.c + xmlrpc.c + vtables.c ) -set(LINPHONE_SOURCE_FILES_CXX - AccountCreator.cc - AccountCreatorService.cc - Address.cc - Authentication.cc - Buffer.cc - Call.cc - Callbacks.cc - CallLog.cc - CallParams.cc - CardDav.cc - Chat.cc - ChatFileTransfer.cc - Conference.cc - Config.cc - ContactProvider.cc - Content.cc - Core.cc - DialPlan.cc - Dict.cc - EcCalibrator.cc - EchoTester.cc - Enum.cc - ErrorInfo.cc - Event.cc - Factory.cc - Friend.cc - FriendList.cc - ImEncryptionEngine.cc - ImNotifPolicy.cc - Info.cc - LdapProvider.cc - Lime.cc - LocalPlayer.cc - Lpc2Xml.cc - Lsd.cc - MessageStorage.cc - Misc.cc - NatPolicy.cc - OfferAnswer.cc - PayloadType.cc - Player.cc - Presence.cc - Proxy.cc - QualityReporting.cc - RemoteProvisioning.cc - RingTonePlayer.cc - Sal.cc - SipLogin.cc - SipSetup.cc - Sqlite3BctbxVfs.cc - TunnelConfig.cc - VideoDefinition.cc - Vtables.cc - Xml.cc - Xml2Lpc.cc - XmlRpc.cc -) - +set(LINPHONE_SOURCE_FILES_CXX conference.cc) if(ANDROID) list(APPEND LINPHONE_SOURCE_FILES_CXX linphonecore_jni.cc) set_source_files_properties(linphonecore_jni.cc PROPERTIES COMPILE_DEFINITIONS "USE_JAVAH") @@ -137,12 +134,12 @@ endif() if(ENABLE_TUNNEL) list(APPEND LINPHONE_SOURCE_FILES_CXX - Tunnel.cc + linphone_tunnel.cc TunnelManager.cc ) add_definitions(-DTUNNEL_ENABLED) else() - list(APPEND LINPHONE_SOURCE_FILES_CXX TunnelStubs.cc) + list(APPEND LINPHONE_SOURCE_FILES_C linphone_tunnel_stubs.c) endif() bc_git_version(liblinphone ${PROJECT_VERSION}) @@ -188,7 +185,7 @@ if(INTL_FOUND) endif() if(BELCARD_FOUND) list(APPEND LIBS ${BELCARD_LIBRARIES}) - list(APPEND LINPHONE_SOURCE_FILES_CXX Vcard.cc) + list(APPEND LINPHONE_SOURCE_FILES_CXX vcard.cc) if(NOT MSVC) list(APPEND STRICT_OPTIONS_CXX "-std=c++11") endif() @@ -196,10 +193,11 @@ if(BELCARD_FOUND) list(APPEND STRICT_OPTIONS_CXX "-stdlib=libc++") endif() else() - list(APPEND LINPHONE_SOURCE_FILES_CXX VcardStubs.c) + list(APPEND LINPHONE_SOURCE_FILES_C vcard_stubs.c) endif() -bc_apply_compile_flags(LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_C) +set_source_files_properties(${LINPHONE_SOURCE_FILES_C} PROPERTIES LANGUAGE CXX) +bc_apply_compile_flags(LINPHONE_SOURCE_FILES_C STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX) bc_apply_compile_flags(LINPHONE_SOURCE_FILES_CXX STRICT_OPTIONS_CPP STRICT_OPTIONS_CXX) bc_apply_compile_flags(LINPHONE_SOURCE_FILES_OBJC STRICT_OPTIONS_CPP STRICT_OPTIONS_OBJC) diff --git a/coreapi/AccountCreator.cc b/coreapi/account_creator.c similarity index 100% rename from coreapi/AccountCreator.cc rename to coreapi/account_creator.c diff --git a/coreapi/AccountCreatorService.cc b/coreapi/account_creator_service.c similarity index 100% rename from coreapi/AccountCreatorService.cc rename to coreapi/account_creator_service.c diff --git a/coreapi/Address.cc b/coreapi/address.c similarity index 100% rename from coreapi/Address.cc rename to coreapi/address.c diff --git a/coreapi/Authentication.cc b/coreapi/authentication.c similarity index 100% rename from coreapi/Authentication.cc rename to coreapi/authentication.c diff --git a/coreapi/bellesip_sal/sal_address_impl.cc b/coreapi/bellesip_sal/sal_address_impl.c similarity index 100% rename from coreapi/bellesip_sal/sal_address_impl.cc rename to coreapi/bellesip_sal/sal_address_impl.c diff --git a/coreapi/bellesip_sal/sal_impl.cc b/coreapi/bellesip_sal/sal_impl.c similarity index 100% rename from coreapi/bellesip_sal/sal_impl.cc rename to coreapi/bellesip_sal/sal_impl.c diff --git a/coreapi/bellesip_sal/sal_op_call.cc b/coreapi/bellesip_sal/sal_op_call.c similarity index 99% rename from coreapi/bellesip_sal/sal_op_call.cc rename to coreapi/bellesip_sal/sal_op_call.c index caf2552d2..c8a06a95b 100644 --- a/coreapi/bellesip_sal/sal_op_call.cc +++ b/coreapi/bellesip_sal/sal_op_call.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sal_impl.h" -#include "OfferAnswer.h" +#include "offeranswer.h" #include diff --git a/coreapi/bellesip_sal/sal_op_call_transfer.cc b/coreapi/bellesip_sal/sal_op_call_transfer.c similarity index 99% rename from coreapi/bellesip_sal/sal_op_call_transfer.cc rename to coreapi/bellesip_sal/sal_op_call_transfer.c index 7b897147f..8fe460314 100644 --- a/coreapi/bellesip_sal/sal_op_call_transfer.cc +++ b/coreapi/bellesip_sal/sal_op_call_transfer.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sal_impl.h" -#include "OfferAnswer.h" +#include "offeranswer.h" diff --git a/coreapi/bellesip_sal/sal_op_events.cc b/coreapi/bellesip_sal/sal_op_events.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_events.cc rename to coreapi/bellesip_sal/sal_op_events.c diff --git a/coreapi/bellesip_sal/sal_op_impl.cc b/coreapi/bellesip_sal/sal_op_impl.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_impl.cc rename to coreapi/bellesip_sal/sal_op_impl.c diff --git a/coreapi/bellesip_sal/sal_op_info.cc b/coreapi/bellesip_sal/sal_op_info.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_info.cc rename to coreapi/bellesip_sal/sal_op_info.c diff --git a/coreapi/bellesip_sal/sal_op_message.cc b/coreapi/bellesip_sal/sal_op_message.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_message.cc rename to coreapi/bellesip_sal/sal_op_message.c diff --git a/coreapi/bellesip_sal/sal_op_presence.cc b/coreapi/bellesip_sal/sal_op_presence.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_presence.cc rename to coreapi/bellesip_sal/sal_op_presence.c diff --git a/coreapi/bellesip_sal/sal_op_publish.cc b/coreapi/bellesip_sal/sal_op_publish.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_publish.cc rename to coreapi/bellesip_sal/sal_op_publish.c diff --git a/coreapi/bellesip_sal/sal_op_registration.cc b/coreapi/bellesip_sal/sal_op_registration.c similarity index 100% rename from coreapi/bellesip_sal/sal_op_registration.cc rename to coreapi/bellesip_sal/sal_op_registration.c diff --git a/coreapi/bellesip_sal/sal_sdp.cc b/coreapi/bellesip_sal/sal_sdp.c similarity index 100% rename from coreapi/bellesip_sal/sal_sdp.cc rename to coreapi/bellesip_sal/sal_sdp.c diff --git a/coreapi/Buffer.cc b/coreapi/buffer.c similarity index 100% rename from coreapi/Buffer.cc rename to coreapi/buffer.c diff --git a/coreapi/CallLog.cc b/coreapi/call_log.c similarity index 100% rename from coreapi/CallLog.cc rename to coreapi/call_log.c diff --git a/coreapi/CallParams.cc b/coreapi/call_params.c similarity index 100% rename from coreapi/CallParams.cc rename to coreapi/call_params.c diff --git a/coreapi/Callbacks.cc b/coreapi/callbacks.c similarity index 100% rename from coreapi/Callbacks.cc rename to coreapi/callbacks.c diff --git a/coreapi/CardDav.cc b/coreapi/carddav.c similarity index 100% rename from coreapi/CardDav.cc rename to coreapi/carddav.c diff --git a/coreapi/CardDav.h b/coreapi/carddav.h similarity index 100% rename from coreapi/CardDav.h rename to coreapi/carddav.h diff --git a/coreapi/Chat.cc b/coreapi/chat.c similarity index 100% rename from coreapi/Chat.cc rename to coreapi/chat.c diff --git a/coreapi/ChatFileTransfer.cc b/coreapi/chat_file_transfer.c similarity index 100% rename from coreapi/ChatFileTransfer.cc rename to coreapi/chat_file_transfer.c diff --git a/coreapi/Conference.cc b/coreapi/conference.cc similarity index 99% rename from coreapi/Conference.cc rename to coreapi/conference.cc index beebdb534..50d1680c7 100644 --- a/coreapi/Conference.cc +++ b/coreapi/conference.cc @@ -25,7 +25,7 @@ #include "linphone/core.h" #include "private.h" -#include "Conference.h" +#include "conference_private.h" #include #include #include diff --git a/coreapi/Conference.h b/coreapi/conference_private.h similarity index 100% rename from coreapi/Conference.h rename to coreapi/conference_private.h diff --git a/coreapi/ContactProvider.h b/coreapi/contact_providers_priv.h similarity index 100% rename from coreapi/ContactProvider.h rename to coreapi/contact_providers_priv.h diff --git a/coreapi/ContactProvider.cc b/coreapi/contactprovider.c similarity index 99% rename from coreapi/ContactProvider.cc rename to coreapi/contactprovider.c index 218af0e49..5c1a36b75 100644 --- a/coreapi/ContactProvider.cc +++ b/coreapi/contactprovider.c @@ -14,7 +14,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#include "ContactProvider.h" +#include "contact_providers_priv.h" #include "linphone/contactprovider.h" #include diff --git a/coreapi/Content.cc b/coreapi/content.c similarity index 100% rename from coreapi/Content.cc rename to coreapi/content.c diff --git a/coreapi/DialPlan.cc b/coreapi/dial_plan.c similarity index 100% rename from coreapi/DialPlan.cc rename to coreapi/dial_plan.c diff --git a/coreapi/Dict.cc b/coreapi/dict.c similarity index 100% rename from coreapi/Dict.cc rename to coreapi/dict.c diff --git a/coreapi/EcCalibrator.cc b/coreapi/ec-calibrator.c similarity index 100% rename from coreapi/EcCalibrator.cc rename to coreapi/ec-calibrator.c diff --git a/coreapi/EchoTester.cc b/coreapi/echo-tester.c similarity index 100% rename from coreapi/EchoTester.cc rename to coreapi/echo-tester.c diff --git a/coreapi/Enum.cc b/coreapi/enum.c similarity index 99% rename from coreapi/Enum.cc rename to coreapi/enum.c index fa71f8945..9b18bc1a0 100644 --- a/coreapi/Enum.cc +++ b/coreapi/enum.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include -#include "Enum.h" +#include "enum.h" #define DNS_ANSWER_MAX_SIZE 2048 diff --git a/coreapi/Enum.h b/coreapi/enum.h similarity index 100% rename from coreapi/Enum.h rename to coreapi/enum.h diff --git a/coreapi/ErrorInfo.cc b/coreapi/error_info.c similarity index 100% rename from coreapi/ErrorInfo.cc rename to coreapi/error_info.c diff --git a/coreapi/Event.cc b/coreapi/event.c similarity index 100% rename from coreapi/Event.cc rename to coreapi/event.c diff --git a/coreapi/Factory.cc b/coreapi/factory.c similarity index 100% rename from coreapi/Factory.cc rename to coreapi/factory.c diff --git a/coreapi/Fonis.cc b/coreapi/fonis.c similarity index 100% rename from coreapi/Fonis.cc rename to coreapi/fonis.c diff --git a/coreapi/Friend.cc b/coreapi/friend.c similarity index 100% rename from coreapi/Friend.cc rename to coreapi/friend.c diff --git a/coreapi/FriendList.cc b/coreapi/friendlist.c similarity index 100% rename from coreapi/FriendList.cc rename to coreapi/friendlist.c diff --git a/coreapi/ImEncryptionEngine.cc b/coreapi/im_encryption_engine.c similarity index 100% rename from coreapi/ImEncryptionEngine.cc rename to coreapi/im_encryption_engine.c diff --git a/coreapi/ImNotifPolicy.cc b/coreapi/im_notif_policy.c similarity index 100% rename from coreapi/ImNotifPolicy.cc rename to coreapi/im_notif_policy.c diff --git a/coreapi/Info.cc b/coreapi/info.c similarity index 100% rename from coreapi/Info.cc rename to coreapi/info.c diff --git a/coreapi/LdapProvider.cc b/coreapi/ldapprovider.c similarity index 99% rename from coreapi/LdapProvider.cc rename to coreapi/ldapprovider.c index e4417f855..02a7bec00 100644 --- a/coreapi/LdapProvider.cc +++ b/coreapi/ldapprovider.c @@ -17,7 +17,7 @@ #include "linphone/ldapprovider.h" #include "private.h" #include "linphone/lpconfig.h" -#include "ContactProvider.h" +#include "contact_providers_priv.h" #include "mediastreamer2/mscommon.h" #include diff --git a/coreapi/Lime.cc b/coreapi/lime.c similarity index 99% rename from coreapi/Lime.cc rename to coreapi/lime.c index ad38ac939..08c976402 100644 --- a/coreapi/Lime.cc +++ b/coreapi/lime.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "Lime.h" +#include "lime.h" #ifdef HAVE_CONFIG_H #include "config.h" #endif diff --git a/coreapi/Lime.h b/coreapi/lime.h similarity index 100% rename from coreapi/Lime.h rename to coreapi/lime.h diff --git a/coreapi/Tunnel.cc b/coreapi/linphone_tunnel.cc similarity index 100% rename from coreapi/Tunnel.cc rename to coreapi/linphone_tunnel.cc diff --git a/coreapi/TunnelConfig.cc b/coreapi/linphone_tunnel_config.c similarity index 100% rename from coreapi/TunnelConfig.cc rename to coreapi/linphone_tunnel_config.c diff --git a/coreapi/TunnelStubs.cc b/coreapi/linphone_tunnel_stubs.c similarity index 100% rename from coreapi/TunnelStubs.cc rename to coreapi/linphone_tunnel_stubs.c diff --git a/coreapi/Call.cc b/coreapi/linphonecall.c similarity index 99% rename from coreapi/Call.cc rename to coreapi/linphonecall.c index 0528e6e71..8a93953ae 100644 --- a/coreapi/Call.cc +++ b/coreapi/linphonecall.c @@ -25,7 +25,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "linphone/sipsetup.h" #include "linphone/lpconfig.h" #include "private.h" -#include "Conference.h" +#include "conference_private.h" #include #include @@ -2733,7 +2733,7 @@ void linphone_call_init_audio_stream(LinphoneCall *call){ framesize=lp_config_get_int(lc->config,"sound","ec_framesize",0); audio_stream_set_echo_canceller_params(audiostream,len,delay,framesize); if (audiostream->ec) { - char *statestr=(char *)ms_malloc0(EC_STATE_MAX_LEN); + char *statestr=reinterpret_cast(ms_malloc0(EC_STATE_MAX_LEN)); if (lp_config_relative_file_exists(lc->config, EC_STATE_STORE) && lp_config_read_relative_file(lc->config, EC_STATE_STORE, statestr, EC_STATE_MAX_LEN) == 0) { ms_filter_call_method(audiostream->ec, MS_ECHO_CANCELLER_SET_STATE_STRING, statestr); diff --git a/coreapi/Core.cc b/coreapi/linphonecore.c similarity index 99% rename from coreapi/Core.cc rename to coreapi/linphonecore.c index 4f439633c..58d565a04 100644 --- a/coreapi/Core.cc +++ b/coreapi/linphonecore.c @@ -22,12 +22,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "linphone/sipsetup.h" #include "linphone/lpconfig.h" #include "private.h" -#include "QualityReporting.h" -#include "Lime.h" -#include "Conference.h" +#include "quality_reporting.h" +#include "lime.h" +#include "conference_private.h" #ifdef SQLITE_STORAGE_ENABLED -#include "Sqlite3BctbxVfs.h" +#include "sqlite3_bctbx_vfs.h" #endif #include @@ -116,8 +116,8 @@ static void linphone_core_uninit(LinphoneCore *lc); static void linphone_core_zrtp_cache_close(LinphoneCore *lc); void linphone_core_zrtp_cache_db_init(LinphoneCore *lc, const char *fileName); -#include "Enum.h" -#include "ContactProvider.h" +#include "enum.h" +#include "contact_providers_priv.h" const char *linphone_core_get_nat_address_resolved(LinphoneCore *lc); diff --git a/coreapi/LocalPlayer.cc b/coreapi/localplayer.c similarity index 100% rename from coreapi/LocalPlayer.cc rename to coreapi/localplayer.c diff --git a/coreapi/Lpc2Xml.cc b/coreapi/lpc2xml.c similarity index 99% rename from coreapi/Lpc2Xml.cc rename to coreapi/lpc2xml.c index 2db832708..b15186027 100644 --- a/coreapi/Lpc2Xml.cc +++ b/coreapi/lpc2xml.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "Lpc2Xml.h" +#include "lpc2xml.h" #include #include #include diff --git a/coreapi/Lpc2Xml.h b/coreapi/lpc2xml.h similarity index 100% rename from coreapi/Lpc2Xml.h rename to coreapi/lpc2xml.h diff --git a/coreapi/Config.cc b/coreapi/lpconfig.c similarity index 99% rename from coreapi/Config.cc rename to coreapi/lpconfig.c index 2e0f7900e..4c496a423 100644 --- a/coreapi/Config.cc +++ b/coreapi/lpconfig.c @@ -27,7 +27,7 @@ #include "private.h" #include "bctoolbox/vfs.h" #include "belle-sip/object.h" -#include "Xml2Lpc.h" +#include "xml2lpc.h" #include #include @@ -59,7 +59,7 @@ #define lp_new0(type,n) (type*)calloc(sizeof(type),n) #include "linphone/lpconfig.h" -#include "Lpc2Xml.h" +#include "lpc2xml.h" typedef struct _LpItem{ char *key; diff --git a/coreapi/Lsd.cc b/coreapi/lsd.c similarity index 100% rename from coreapi/Lsd.cc rename to coreapi/lsd.c diff --git a/coreapi/MessageStorage.cc b/coreapi/message_storage.c similarity index 100% rename from coreapi/MessageStorage.cc rename to coreapi/message_storage.c diff --git a/coreapi/Misc.cc b/coreapi/misc.c similarity index 100% rename from coreapi/Misc.cc rename to coreapi/misc.c diff --git a/coreapi/NatPolicy.cc b/coreapi/nat_policy.c similarity index 100% rename from coreapi/NatPolicy.cc rename to coreapi/nat_policy.c diff --git a/coreapi/OfferAnswer.cc b/coreapi/offeranswer.c similarity index 99% rename from coreapi/OfferAnswer.cc rename to coreapi/offeranswer.c index 3ae8c5938..793f6539d 100644 --- a/coreapi/OfferAnswer.cc +++ b/coreapi/offeranswer.c @@ -18,7 +18,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "sal/sal.h" -#include "OfferAnswer.h" +#include "offeranswer.h" #include "private.h" static bool_t only_telephone_event(const bctbx_list_t *l){ diff --git a/coreapi/OfferAnswer.h b/coreapi/offeranswer.h similarity index 100% rename from coreapi/OfferAnswer.h rename to coreapi/offeranswer.h diff --git a/coreapi/PayloadType.cc b/coreapi/payload_type.c similarity index 100% rename from coreapi/PayloadType.cc rename to coreapi/payload_type.c diff --git a/coreapi/Player.cc b/coreapi/player.c similarity index 100% rename from coreapi/Player.cc rename to coreapi/player.c diff --git a/coreapi/Presence.cc b/coreapi/presence.c similarity index 100% rename from coreapi/Presence.cc rename to coreapi/presence.c diff --git a/coreapi/private.h b/coreapi/private.h index 746d61bfa..73897d995 100644 --- a/coreapi/private.h +++ b/coreapi/private.h @@ -33,10 +33,10 @@ #include "linphone/conference.h" #include "sal/sal.h" #include "linphone/sipsetup.h" -#include "QualityReporting.h" +#include "quality_reporting.h" #include "linphone/ringtoneplayer.h" -#include "Vcard.h" -#include "CardDav.h" +#include "vcard_private.h" +#include "carddav.h" #include "linphone/player.h" #include "bctoolbox/port.h" diff --git a/coreapi/Proxy.cc b/coreapi/proxy.c similarity index 99% rename from coreapi/Proxy.cc rename to coreapi/proxy.c index 547999668..756ad7d76 100644 --- a/coreapi/Proxy.cc +++ b/coreapi/proxy.c @@ -24,7 +24,7 @@ Copyright (C) 2000 Simon MORLAT (simon.morlat@linphone.org) #include "linphone/lpconfig.h" #include "private.h" #include "mediastreamer2/mediastream.h" -#include "Enum.h" +#include "enum.h" #include /*store current config related to server location*/ diff --git a/coreapi/QualityReporting.cc b/coreapi/quality_reporting.c similarity index 100% rename from coreapi/QualityReporting.cc rename to coreapi/quality_reporting.c diff --git a/coreapi/QualityReporting.h b/coreapi/quality_reporting.h similarity index 100% rename from coreapi/QualityReporting.h rename to coreapi/quality_reporting.h diff --git a/coreapi/RemoteProvisioning.cc b/coreapi/remote_provisioning.c similarity index 99% rename from coreapi/RemoteProvisioning.cc rename to coreapi/remote_provisioning.c index 17db625b0..cc036e6f4 100644 --- a/coreapi/RemoteProvisioning.cc +++ b/coreapi/remote_provisioning.c @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ #include "private.h" -#include "Xml2Lpc.h" +#include "xml2lpc.h" #include "linphone/lpconfig.h" #define XML2LPC_CALLBACK_BUFFER_SIZE 1024 diff --git a/coreapi/RingTonePlayer.cc b/coreapi/ringtoneplayer.c similarity index 100% rename from coreapi/RingTonePlayer.cc rename to coreapi/ringtoneplayer.c diff --git a/coreapi/Sal.cc b/coreapi/sal.c similarity index 100% rename from coreapi/Sal.cc rename to coreapi/sal.c diff --git a/coreapi/SipLogin.cc b/coreapi/siplogin.c similarity index 100% rename from coreapi/SipLogin.cc rename to coreapi/siplogin.c diff --git a/coreapi/SipSetup.cc b/coreapi/sipsetup.c similarity index 100% rename from coreapi/SipSetup.cc rename to coreapi/sipsetup.c diff --git a/coreapi/Sqlite3BctbxVfs.cc b/coreapi/sqlite3_bctbx_vfs.c similarity index 99% rename from coreapi/Sqlite3BctbxVfs.cc rename to coreapi/sqlite3_bctbx_vfs.c index 0bcd110c7..e5674e43e 100755 --- a/coreapi/Sqlite3BctbxVfs.cc +++ b/coreapi/sqlite3_bctbx_vfs.c @@ -20,7 +20,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifdef SQLITE_STORAGE_ENABLED #include "private.h" -#include "Sqlite3BctbxVfs.h" +#include "sqlite3_bctbx_vfs.h" #include #ifndef _WIN32_WCE diff --git a/coreapi/Sqlite3BctbxVfs.h b/coreapi/sqlite3_bctbx_vfs.h similarity index 100% rename from coreapi/Sqlite3BctbxVfs.h rename to coreapi/sqlite3_bctbx_vfs.h diff --git a/coreapi/Upnp.cc b/coreapi/upnp.c similarity index 100% rename from coreapi/Upnp.cc rename to coreapi/upnp.c diff --git a/coreapi/UpnpPrivate.h b/coreapi/upnp.h similarity index 100% rename from coreapi/UpnpPrivate.h rename to coreapi/upnp.h diff --git a/coreapi/Vcard.cc b/coreapi/vcard.cc similarity index 99% rename from coreapi/Vcard.cc rename to coreapi/vcard.cc index 2ee5c11ae..c1925e60e 100644 --- a/coreapi/Vcard.cc +++ b/coreapi/vcard.cc @@ -17,7 +17,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "Vcard.h" +#include "vcard_private.h" #include "belcard/belcard.hpp" #include "belcard/belcard_parser.hpp" #include "sal/sal.h" diff --git a/coreapi/Vcard.h b/coreapi/vcard_private.h similarity index 100% rename from coreapi/Vcard.h rename to coreapi/vcard_private.h diff --git a/coreapi/VcardStubs.cc b/coreapi/vcard_stubs.c similarity index 100% rename from coreapi/VcardStubs.cc rename to coreapi/vcard_stubs.c diff --git a/coreapi/VideoDefinition.cc b/coreapi/video_definition.c similarity index 100% rename from coreapi/VideoDefinition.cc rename to coreapi/video_definition.c diff --git a/coreapi/Vtables.cc b/coreapi/vtables.c similarity index 100% rename from coreapi/Vtables.cc rename to coreapi/vtables.c diff --git a/coreapi/Xml.cc b/coreapi/xml.c similarity index 100% rename from coreapi/Xml.cc rename to coreapi/xml.c diff --git a/coreapi/Xml2Lpc.cc b/coreapi/xml2lpc.c similarity index 99% rename from coreapi/Xml2Lpc.cc rename to coreapi/xml2lpc.c index 2bf9d91fd..9cfe6e56e 100644 --- a/coreapi/Xml2Lpc.cc +++ b/coreapi/xml2lpc.c @@ -18,7 +18,7 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#include "Xml2Lpc.h" +#include "xml2lpc.h" #include #include diff --git a/coreapi/Xml2Lpc.h b/coreapi/xml2lpc.h similarity index 100% rename from coreapi/Xml2Lpc.h rename to coreapi/xml2lpc.h diff --git a/coreapi/XmlRpc.cc b/coreapi/xmlrpc.c similarity index 100% rename from coreapi/XmlRpc.cc rename to coreapi/xmlrpc.c diff --git a/tester/message_tester.c b/tester/message_tester.c index f3165719c..972dfd58e 100644 --- a/tester/message_tester.c +++ b/tester/message_tester.c @@ -21,7 +21,7 @@ #include "linphone/core.h" #include "private.h" #include "liblinphone_tester.h" -#include "Lime.h" +#include "lime.h" #include "bctoolbox/crypto.h" #ifdef SQLITE_STORAGE_ENABLED diff --git a/tester/vcard_tester.c b/tester/vcard_tester.c index ea82270fd..d4031715a 100644 --- a/tester/vcard_tester.c +++ b/tester/vcard_tester.c @@ -23,7 +23,7 @@ #include "liblinphone_tester.h" -#include "CardDav.h" +#include "carddav.h" #include #define CARDDAV_SERVER "http://dav.linphone.org/card.php/addressbooks/tester/default"