diff --git a/coreapi/callbacks.c b/coreapi/callbacks.c index 78b2c35cc..e21544b49 100644 --- a/coreapi/callbacks.c +++ b/coreapi/callbacks.c @@ -39,7 +39,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #include "c-wrapper/c-wrapper.h" #include "call/call-p.h" -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" #include "conference/session/call-session.h" #include "conference/session/call-session-p.h" #include "conference/session/media-session.h" diff --git a/coreapi/chat.c b/coreapi/chat.c index d90e76dbf..90d51b3e0 100644 --- a/coreapi/chat.c +++ b/coreapi/chat.c @@ -36,10 +36,10 @@ #include "linphone/wrapper_utils.h" #include "c-wrapper/c-wrapper.h" -#include "chat/basic-chat-room.h" -#include "chat/client-group-chat-room.h" +#include "chat/chat-room/basic-chat-room.h" +#include "chat/chat-room/client-group-chat-room.h" #include "chat/real-time-text-chat-room.h" -#include "chat/real-time-text-chat-room-p.h" +#include "chat/chat-room/real-time-text-chat-room-p.h" #include "content/content-type.h" using namespace std; diff --git a/coreapi/chat_file_transfer.c b/coreapi/chat_file_transfer.c index 7eab33106..d3ded3de2 100644 --- a/coreapi/chat_file_transfer.c +++ b/coreapi/chat_file_transfer.c @@ -26,7 +26,7 @@ #include "private.h" #include "c-wrapper/c-wrapper.h" -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" LinphoneChatMessage *linphone_chat_room_create_file_transfer_message(LinphoneChatRoom *cr, const LinphoneContent *initial_content) { return L_GET_C_BACK_PTR(L_GET_CPP_PTR_FROM_C_OBJECT(cr)->createFileTransferMessage(initial_content)); diff --git a/coreapi/message_storage.c b/coreapi/message_storage.c index ee3b9b2f8..803ab530b 100644 --- a/coreapi/message_storage.c +++ b/coreapi/message_storage.c @@ -22,7 +22,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifdef SQLITE_STORAGE_ENABLED -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" #ifndef _WIN32 #if !defined(__QNXNTO__) && !defined(__ANDROID__) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 701a1339c..6a596c879 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -29,14 +29,16 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES call/call-listener.h call/call-p.h call/call.h - chat/basic-chat-room-p.h - chat/basic-chat-room.h - chat/chat-message-p.h - chat/chat-message.h - chat/chat-room-p.h - chat/chat-room.h - chat/client-group-chat-room-p.h - chat/client-group-chat-room.h + chat/chat-message/chat-message-p.h + chat/chat-message/chat-message.h + chat/chat-room/basic-chat-room-p.h + chat/chat-room/basic-chat-room.h + chat/chat-room/chat-room-p.h + chat/chat-room/chat-room.h + chat/chat-room/client-group-chat-room-p.h + chat/chat-room/client-group-chat-room.h + chat/chat-room/real-time-text-chat-room-p.h + chat/chat-room/real-time-text-chat-room.h chat/cpim/cpim.h chat/cpim/header/cpim-core-headers.h chat/cpim/header/cpim-generic-header.h @@ -51,8 +53,6 @@ set(LINPHONE_CXX_OBJECTS_PRIVATE_HEADER_FILES chat/modifier/cpim-chat-message-modifier.h chat/modifier/encryption-chat-message-modifier.h chat/modifier/multipart-chat-message-modifier.h - chat/real-time-text-chat-room-p.h - chat/real-time-text-chat-room.h conference/conference-listener.h conference/conference.h conference/local-conference-event-handler-p.h @@ -124,10 +124,11 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES c-wrapper/api/c-participant.cpp c-wrapper/internal/c-sal.cpp call/call.cpp - chat/basic-chat-room.cpp - chat/chat-message.cpp - chat/chat-room.cpp - chat/client-group-chat-room.cpp + chat/chat-message/chat-message.cpp + chat/chat-room/basic-chat-room.cpp + chat/chat-room/chat-room.cpp + chat/chat-room/client-group-chat-room.cpp + chat/chat-room/real-time-text-chat-room.cpp chat/cpim/header/cpim-core-headers.cpp chat/cpim/header/cpim-generic-header.cpp chat/cpim/header/cpim-header.cpp @@ -139,7 +140,6 @@ set(LINPHONE_CXX_OBJECTS_SOURCE_FILES chat/modifier/cpim-chat-message-modifier.cpp chat/modifier/encryption-chat-message-modifier.cpp chat/modifier/multipart-chat-message-modifier.cpp - chat/real-time-text-chat-room.cpp conference/conference.cpp conference/local-conference-event-handler.cpp conference/local-conference.cpp diff --git a/src/c-wrapper/api/c-chat-message.cpp b/src/c-wrapper/api/c-chat-message.cpp index 7e28a33ef..0aed719e6 100644 --- a/src/c-wrapper/api/c-chat-message.cpp +++ b/src/c-wrapper/api/c-chat-message.cpp @@ -27,10 +27,10 @@ #include "address/address.h" #include "content/content.h" #include "content/content-type.h" -#include "chat/chat-message-p.h" -#include "chat/chat-message.h" -#include "chat/chat-room-p.h" -#include "chat/real-time-text-chat-room-p.h" +#include "chat/chat-message/chat-message-p.h" +#include "chat/chat-message/chat-message.h" +#include "chat/chat-room/chat-room-p.h" +#include "chat/chat-room/real-time-text-chat-room-p.h" // ============================================================================= diff --git a/src/c-wrapper/api/c-chat-room.cpp b/src/c-wrapper/api/c-chat-room.cpp index f447e0fd2..89e668ee5 100644 --- a/src/c-wrapper/api/c-chat-room.cpp +++ b/src/c-wrapper/api/c-chat-room.cpp @@ -24,9 +24,9 @@ #include "linphone/api/c-chat-room.h" #include "c-wrapper/c-wrapper.h" -#include "chat/basic-chat-room.h" -#include "chat/client-group-chat-room.h" -#include "chat/real-time-text-chat-room-p.h" +#include "chat/chat-room/basic-chat-room.h" +#include "chat/chat-room/client-group-chat-room.h" +#include "chat/chat-room/real-time-text-chat-room-p.h" #include "conference/participant.h" // ============================================================================= diff --git a/src/c-wrapper/api/c-event-log.cpp b/src/c-wrapper/api/c-event-log.cpp index dbcde10a8..4737af3f5 100644 --- a/src/c-wrapper/api/c-event-log.cpp +++ b/src/c-wrapper/api/c-event-log.cpp @@ -22,7 +22,7 @@ #include "c-wrapper/c-wrapper.h" #include "call/call.h" -#include "chat/chat-message.h" +#include "chat/chat-message/chat-message.h" #include "event-log/call-event.h" #include "event-log/chat-message-event.h" #include "event-log/conference-participant-event.h" diff --git a/src/chat/chat-message-p.h b/src/chat/chat-message/chat-message-p.h similarity index 96% rename from src/chat/chat-message-p.h rename to src/chat/chat-message/chat-message-p.h index 2d269865b..57355430f 100644 --- a/src/chat/chat-message-p.h +++ b/src/chat/chat-message/chat-message-p.h @@ -120,11 +120,11 @@ private: Address from; Address to; time_t time = 0; - std::string id = ""; - std::string appData = ""; - std::string fileTransferFilePath = ""; - std::string externalBodyUrl = ""; - std::string rttMessage = ""; + std::string id; + std::string appData; + std::string fileTransferFilePath; + std::string externalBodyUrl; + std::string rttMessage; bool isSecured = false; bool isReadOnly = false; std::list contents; @@ -140,7 +140,7 @@ private: unsigned char currentSendStep = Step::None; // Cache for returned values, used for compatibility with previous C API ContentType cContentType; - std::string cText = ""; + std::string cText; // Used for compatibility with previous C API LinphoneContent *cFileTransferInformation = NULL; diff --git a/src/chat/chat-message.cpp b/src/chat/chat-message/chat-message.cpp similarity index 99% rename from src/chat/chat-message.cpp rename to src/chat/chat-message/chat-message.cpp index 74ca2b62f..3defac18f 100644 --- a/src/chat/chat-message.cpp +++ b/src/chat/chat-message/chat-message.cpp @@ -25,14 +25,14 @@ #include "c-wrapper/c-wrapper.h" #include "address/address.h" -#include "chat-message-p.h" +#include "chat/chat-message/chat-message-p.h" #include "content/content.h" -#include "chat-room-p.h" -#include "real-time-text-chat-room.h" -#include "modifier/cpim-chat-message-modifier.h" -#include "modifier/encryption-chat-message-modifier.h" -#include "modifier/multipart-chat-message-modifier.h" +#include "chat/chat-room/chat-room-p.h" +#include "chat/chat-room/real-time-text-chat-room.h" +#include "chat/modifier/cpim-chat-message-modifier.h" +#include "chat/modifier/encryption-chat-message-modifier.h" +#include "chat/modifier/multipart-chat-message-modifier.h" #include "logger/logger.h" #include "ortp/b64.h" diff --git a/src/chat/chat-message.h b/src/chat/chat-message/chat-message.h similarity index 100% rename from src/chat/chat-message.h rename to src/chat/chat-message/chat-message.h diff --git a/src/chat/basic-chat-room-p.h b/src/chat/chat-room/basic-chat-room-p.h similarity index 97% rename from src/chat/basic-chat-room-p.h rename to src/chat/chat-room/basic-chat-room-p.h index 0d7a736cb..698996b18 100644 --- a/src/chat/basic-chat-room-p.h +++ b/src/chat/chat-room/basic-chat-room-p.h @@ -24,7 +24,7 @@ #include "private.h" #include "basic-chat-room.h" -#include "chat/chat-room-p.h" +#include "chat/chat-room/chat-room-p.h" // ============================================================================= diff --git a/src/chat/basic-chat-room.cpp b/src/chat/chat-room/basic-chat-room.cpp similarity index 100% rename from src/chat/basic-chat-room.cpp rename to src/chat/chat-room/basic-chat-room.cpp diff --git a/src/chat/basic-chat-room.h b/src/chat/chat-room/basic-chat-room.h similarity index 98% rename from src/chat/basic-chat-room.h rename to src/chat/chat-room/basic-chat-room.h index 73b7ed78a..11f6eed79 100644 --- a/src/chat/basic-chat-room.h +++ b/src/chat/chat-room/basic-chat-room.h @@ -20,7 +20,7 @@ #ifndef _BASIC_CHAT_ROOM_H_ #define _BASIC_CHAT_ROOM_H_ -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" // ============================================================================= diff --git a/src/chat/chat-room-p.h b/src/chat/chat-room/chat-room-p.h similarity index 98% rename from src/chat/chat-room-p.h rename to src/chat/chat-room/chat-room-p.h index fe8710a6a..e07889fe3 100644 --- a/src/chat/chat-room-p.h +++ b/src/chat/chat-room/chat-room-p.h @@ -27,8 +27,8 @@ #include "private.h" #include "chat-room.h" -#include "is-composing-listener.h" -#include "is-composing.h" +#include "chat/is-composing-listener.h" +#include "chat/is-composing.h" #include "object/object-p.h" // ============================================================================= diff --git a/src/chat/chat-room.cpp b/src/chat/chat-room/chat-room.cpp similarity index 99% rename from src/chat/chat-room.cpp rename to src/chat/chat-room/chat-room.cpp index d044fb4fd..2e759970d 100644 --- a/src/chat/chat-room.cpp +++ b/src/chat/chat-room/chat-room.cpp @@ -23,10 +23,10 @@ #include "linphone/utils/utils.h" #include "c-wrapper/c-wrapper.h" -#include "chat-room-p.h" -#include "imdn.h" +#include "chat/chat-room/chat-room-p.h" +#include "chat/imdn.h" #include "content/content.h" -#include "chat-message-p.h" +#include "chat/chat-message/chat-message-p.h" #include "chat-room.h" #include "sal/message-op.h" #include "logger/logger.h" diff --git a/src/chat/chat-room.h b/src/chat/chat-room/chat-room.h similarity index 98% rename from src/chat/chat-room.h rename to src/chat/chat-room/chat-room.h index 50b087edb..2e4b6beac 100644 --- a/src/chat/chat-room.h +++ b/src/chat/chat-room/chat-room.h @@ -29,7 +29,7 @@ #include "object/object.h" #include "conference/conference-interface.h" -#include "chat-message.h" +#include "chat/chat-message/chat-message.h" #include "linphone/types.h" diff --git a/src/chat/client-group-chat-room-p.h b/src/chat/chat-room/client-group-chat-room-p.h similarity index 97% rename from src/chat/client-group-chat-room-p.h rename to src/chat/chat-room/client-group-chat-room-p.h index 54e8f9b60..4b8885e85 100644 --- a/src/chat/client-group-chat-room-p.h +++ b/src/chat/chat-room/client-group-chat-room-p.h @@ -24,7 +24,7 @@ #include "private.h" #include "client-group-chat-room.h" -#include "chat/chat-room-p.h" +#include "chat/chat-room/chat-room-p.h" // ============================================================================= diff --git a/src/chat/client-group-chat-room.cpp b/src/chat/chat-room/client-group-chat-room.cpp similarity index 100% rename from src/chat/client-group-chat-room.cpp rename to src/chat/chat-room/client-group-chat-room.cpp diff --git a/src/chat/client-group-chat-room.h b/src/chat/chat-room/client-group-chat-room.h similarity index 98% rename from src/chat/client-group-chat-room.h rename to src/chat/chat-room/client-group-chat-room.h index 200effef1..77121c01d 100644 --- a/src/chat/client-group-chat-room.h +++ b/src/chat/chat-room/client-group-chat-room.h @@ -23,7 +23,7 @@ // From coreapi #include "private.h" -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" #include "conference/remote-conference.h" #include "conference/session/call-session.h" diff --git a/src/chat/real-time-text-chat-room-p.h b/src/chat/chat-room/real-time-text-chat-room-p.h similarity index 94% rename from src/chat/real-time-text-chat-room-p.h rename to src/chat/chat-room/real-time-text-chat-room-p.h index 8c02770a2..f70a16f2d 100644 --- a/src/chat/real-time-text-chat-room-p.h +++ b/src/chat/chat-room/real-time-text-chat-room-p.h @@ -23,8 +23,8 @@ // From coreapi. #include "private.h" -#include "real-time-text-chat-room.h" -#include "chat/chat-room-p.h" +#include "chat/chat-room/real-time-text-chat-room.h" +#include "chat/chat-room/chat-room-p.h" // ============================================================================= diff --git a/src/chat/real-time-text-chat-room.cpp b/src/chat/chat-room/real-time-text-chat-room.cpp similarity index 99% rename from src/chat/real-time-text-chat-room.cpp rename to src/chat/chat-room/real-time-text-chat-room.cpp index d62eb31de..08da5812e 100644 --- a/src/chat/real-time-text-chat-room.cpp +++ b/src/chat/chat-room/real-time-text-chat-room.cpp @@ -22,7 +22,7 @@ #include "linphone/utils/utils.h" #include "real-time-text-chat-room-p.h" -#include "chat-message-p.h" +#include "chat/chat-message/chat-message-p.h" #include "c-wrapper/c-wrapper.h" #include "logger/logger.h" diff --git a/src/chat/real-time-text-chat-room.h b/src/chat/chat-room/real-time-text-chat-room.h similarity index 98% rename from src/chat/real-time-text-chat-room.h rename to src/chat/chat-room/real-time-text-chat-room.h index 52c0993ef..dcc06c7d7 100644 --- a/src/chat/real-time-text-chat-room.h +++ b/src/chat/chat-room/real-time-text-chat-room.h @@ -23,7 +23,7 @@ // From coreapi #include "private.h" -#include "chat/chat-room.h" +#include "chat/chat-room/chat-room.h" #include "linphone/types.h" diff --git a/src/chat/imdn.cpp b/src/chat/imdn.cpp index 28ec399a2..66900cb4c 100644 --- a/src/chat/imdn.cpp +++ b/src/chat/imdn.cpp @@ -19,9 +19,9 @@ #include "logger/logger.h" -#include "imdn.h" -#include "chat/chat-room.h" -#include "chat/chat-message.h" +#include "chat/imdn.h" +#include "chat/chat-room/chat-room.h" +#include "chat/chat-message/chat-message.h" // ============================================================================= diff --git a/src/chat/is-composing.cpp b/src/chat/is-composing.cpp index 9de87f525..93261385b 100644 --- a/src/chat/is-composing.cpp +++ b/src/chat/is-composing.cpp @@ -19,10 +19,10 @@ #include "linphone/utils/utils.h" -#include "chat-room-p.h" +#include "chat/chat-room/chat-room-p.h" #include "logger/logger.h" -#include "is-composing.h" +#include "chat/is-composing.h" // ============================================================================= diff --git a/src/chat/is-composing.h b/src/chat/is-composing.h index 15a2d4e9c..35d281fa3 100644 --- a/src/chat/is-composing.h +++ b/src/chat/is-composing.h @@ -22,7 +22,7 @@ #include "linphone/utils/general.h" -#include "is-composing-listener.h" +#include "chat/is-composing-listener.h" #include "private.h" diff --git a/src/chat/modifier/cpim-chat-message-modifier.cpp b/src/chat/modifier/cpim-chat-message-modifier.cpp index 5f224a950..af0b0568d 100644 --- a/src/chat/modifier/cpim-chat-message-modifier.cpp +++ b/src/chat/modifier/cpim-chat-message-modifier.cpp @@ -18,7 +18,7 @@ */ #include "address/address.h" -#include "chat/chat-message.h" +#include "chat/chat-message/chat-message.h" #include "chat/cpim/cpim.h" #include "content/content-type.h" #include "content/content.h" diff --git a/src/chat/modifier/encryption-chat-message-modifier.cpp b/src/chat/modifier/encryption-chat-message-modifier.cpp index cfda245d2..e6887b35d 100644 --- a/src/chat/modifier/encryption-chat-message-modifier.cpp +++ b/src/chat/modifier/encryption-chat-message-modifier.cpp @@ -19,8 +19,8 @@ #include "address/address.h" #include "c-wrapper/c-wrapper.h" -#include "chat/chat-message.h" -#include "chat/chat-room.h" +#include "chat/chat-message/chat-message.h" +#include "chat/chat-room/chat-room.h" #include "content/content-type.h" #include "content/content.h" diff --git a/src/chat/modifier/multipart-chat-message-modifier.cpp b/src/chat/modifier/multipart-chat-message-modifier.cpp index 89b7c008f..e9c2cd2c3 100644 --- a/src/chat/modifier/multipart-chat-message-modifier.cpp +++ b/src/chat/modifier/multipart-chat-message-modifier.cpp @@ -18,8 +18,8 @@ */ #include "address/address.h" -#include "chat/chat-message.h" -#include "chat/chat-room.h" +#include "chat/chat-message/chat-message.h" +#include "chat/chat-room/chat-room.h" #include "content/content-type.h" #include "logger/logger.h" diff --git a/src/db/events-db.cpp b/src/db/events-db.cpp index f1f7b8844..c385aca21 100644 --- a/src/db/events-db.cpp +++ b/src/db/events-db.cpp @@ -27,7 +27,7 @@ #include "linphone/utils/utils.h" #include "abstract/abstract-db-p.h" -#include "chat/chat-message.h" +#include "chat/chat-message/chat-message.h" #include "conference/participant.h" #include "content/content-type.h" #include "content/content.h" diff --git a/tester/cpim-tester.cpp b/tester/cpim-tester.cpp index fe86d493e..26e9a5a4d 100644 --- a/tester/cpim-tester.cpp +++ b/tester/cpim-tester.cpp @@ -17,8 +17,8 @@ */ #include "address/address.h" -#include "chat/basic-chat-room.h" -#include "chat/chat-message.h" +#include "chat/chat-room/basic-chat-room.h" +#include "chat/chat-message/chat-message.h" #include "chat/cpim/cpim.h" #include "content/content-type.h" diff --git a/tester/multipart-tester.cpp b/tester/multipart-tester.cpp index ba0917de8..b40687c25 100644 --- a/tester/multipart-tester.cpp +++ b/tester/multipart-tester.cpp @@ -17,8 +17,8 @@ */ #include "address/address.h" -#include "chat/basic-chat-room.h" -#include "chat/chat-message.h" +#include "chat/chat-room/basic-chat-room.h" +#include "chat/chat-message/chat-message.h" #include "content/content-type.h" #include "liblinphone_tester.h"