Commit d1c80c1e authored by Ronan's avatar Ronan

fix(ChatRoom): remove useless includes

parent 8735c553
......@@ -20,9 +20,6 @@
#ifndef _BASIC_CHAT_ROOM_P_H_
#define _BASIC_CHAT_ROOM_P_H_
// From coreapi.
#include "private.h"
#include "basic-chat-room.h"
#include "chat/chat-room/chat-room-p.h"
......
......@@ -20,15 +20,8 @@
#ifndef _CHAT_ROOM_P_H_
#define _CHAT_ROOM_P_H_
#include "linphone/enums/chat-room-enums.h"
#include "linphone/utils/enum-generator.h"
// From coreapi.
#include "private.h"
#include "chat-room.h"
#include "chat/is-composing-listener.h"
#include "chat/is-composing.h"
#include "chat-room.h"
#include "object/object-p.h"
// =============================================================================
......@@ -37,6 +30,7 @@ LINPHONE_BEGIN_NAMESPACE
class ChatRoomPrivate : public ObjectPrivate, public IsComposingListener {
friend class ChatMessagePrivate;
public:
ChatRoomPrivate (LinphoneCore *core);
virtual ~ChatRoomPrivate ();
......@@ -47,9 +41,10 @@ private:
public:
void addTransientMessage (const std::shared_ptr<ChatMessage> &msg);
void addWeakMessage (const std::shared_ptr<ChatMessage> &msg);
std::list<std::shared_ptr<ChatMessage> > getTransientMessages () const {
std::list<std::shared_ptr<ChatMessage>> getTransientMessages () const {
return transientMessages;
}
void moveTransientMessageToWeakMessages (const std::shared_ptr<ChatMessage> &msg);
void removeTransientMessage (const std::shared_ptr<ChatMessage> &msg);
......@@ -69,7 +64,7 @@ protected:
std::shared_ptr<ChatMessage> getWeakMessage (unsigned int storageId) const;
int sqlRequest (sqlite3 *db, const std::string &stmt);
void sqlRequestMessage (sqlite3 *db, const std::string &stmt);
std::list<std::shared_ptr<ChatMessage> > findMessages (const std::string &messageId);
std::list<std::shared_ptr<ChatMessage>> findMessages (const std::string &messageId);
void storeOrUpdateMessage (const std::shared_ptr<ChatMessage> &msg);
public:
......@@ -100,9 +95,9 @@ public:
int unreadCount = -1;
bool isComposing = false;
bool remoteIsComposing = false;
std::list<std::shared_ptr<ChatMessage> > messages;
std::list<std::shared_ptr<ChatMessage> > transientMessages;
std::list<std::weak_ptr<ChatMessage> > weakMessages;
std::list<std::shared_ptr<ChatMessage>> messages;
std::list<std::shared_ptr<ChatMessage>> transientMessages;
std::list<std::weak_ptr<ChatMessage>> weakMessages;
std::list<LinphoneChatMessageCharacter *> receivedRttCharacters;
std::shared_ptr<ChatMessage> pendingMessage = nullptr;
IsComposing isComposingHandler;
......
......@@ -19,16 +19,10 @@
#include <algorithm>
#include "linphone/api/c-chat-message.h"
#include "linphone/utils/utils.h"
#include "c-wrapper/c-wrapper.h"
#include "chat/chat-message/chat-message-p.h"
#include "chat/chat-room/chat-room-p.h"
#include "chat/imdn.h"
#include "content/content.h"
#include "chat/chat-message/chat-message-p.h"
#include "chat-room.h"
#include "sal/message-op.h"
#include "logger/logger.h"
// =============================================================================
......
......@@ -20,18 +20,8 @@
#ifndef _CHAT_ROOM_H_
#define _CHAT_ROOM_H_
#include <list>
// From coreapi
#include "private.h"
#include "address/address.h"
#include "object/object.h"
#include "conference/conference-interface.h"
#include "chat/chat-message/chat-message.h"
#include "linphone/types.h"
#include "conference/conference-interface.h"
// =============================================================================
......@@ -60,18 +50,18 @@ public:
std::shared_ptr<ChatMessage> createMessage ();
void deleteHistory ();
void deleteMessage (const std::shared_ptr<ChatMessage> &msg);
std::shared_ptr<ChatMessage> findMessage (const std::string& messageId);
std::shared_ptr<ChatMessage> findMessage (const std::string &messageId);
std::shared_ptr<ChatMessage> findMessageWithDirection (const std::string &messageId, ChatMessage::Direction direction);
std::list<std::shared_ptr<ChatMessage> > getHistory (int nbMessages);
std::list<std::shared_ptr<ChatMessage>> getHistory (int nbMessages);
int getHistorySize ();
std::list<std::shared_ptr<ChatMessage> > getHistoryRange (int startm, int endm);
std::list<std::shared_ptr<ChatMessage>> getHistoryRange (int startm, int endm);
int getUnreadMessagesCount ();
bool isRemoteComposing () const;
void markAsRead ();
LinphoneCore *getCore () const;
const Address& getPeerAddress () const;
const Address &getPeerAddress () const;
State getState () const;
protected:
......
......@@ -20,18 +20,13 @@
#ifndef _CLIENT_GROUP_CHAT_ROOM_P_H_
#define _CLIENT_GROUP_CHAT_ROOM_P_H_
// From coreapi.
#include "private.h"
#include "client-group-chat-room.h"
#include "chat/chat-room/chat-room-p.h"
#include "client-group-chat-room.h"
// =============================================================================
LINPHONE_BEGIN_NAMESPACE
class CallSession;
class ClientGroupChatRoomPrivate : public ChatRoomPrivate {
public:
ClientGroupChatRoomPrivate (LinphoneCore *core);
......
......@@ -22,11 +22,8 @@
#include "address/address-p.h"
#include "client-group-chat-room-p.h"
#include "c-wrapper/c-wrapper.h"
#include "conference/params/call-session-params-p.h"
#include "conference/session/call-session-p.h"
#include "conference/participant-p.h"
#include "content/content.h"
#include "hacks/hacks.h"
#include "logger/logger.h"
#include "sal/refer-op.h"
......@@ -36,8 +33,7 @@ using namespace std;
LINPHONE_BEGIN_NAMESPACE
ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core)
: ChatRoomPrivate(core) {}
ClientGroupChatRoomPrivate::ClientGroupChatRoomPrivate (LinphoneCore *core) : ChatRoomPrivate(core) {}
// -----------------------------------------------------------------------------
......
......@@ -20,14 +20,8 @@
#ifndef _CLIENT_GROUP_CHAT_ROOM_H_
#define _CLIENT_GROUP_CHAT_ROOM_H_
// From coreapi
#include "private.h"
#include "chat/chat-room/chat-room.h"
#include "conference/remote-conference.h"
#include "conference/session/call-session.h"
#include "linphone/types.h"
// =============================================================================
......
......@@ -20,11 +20,8 @@
#ifndef _REAL_TIME_TEXT_CHAT_ROOM_P_H_
#define _REAL_TIME_TEXT_CHAT_ROOM_P_H_
// From coreapi.
#include "private.h"
#include "chat/chat-room/real-time-text-chat-room.h"
#include "chat/chat-room/chat-room-p.h"
#include "chat/chat-room/real-time-text-chat-room.h"
// =============================================================================
......@@ -36,7 +33,10 @@ public:
virtual ~RealTimeTextChatRoomPrivate ();
public:
void setCall (LinphoneCall *call) { this->call = call; }
void setCall (LinphoneCall *call) {
this->call = call;
}
void realtimeTextReceived (uint32_t character, LinphoneCall *call);
void sendMessage (const std::shared_ptr<ChatMessage> &msg) override;
......
......@@ -17,14 +17,10 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include <algorithm>
#include "linphone/utils/utils.h"
#include "real-time-text-chat-room-p.h"
#include "chat/chat-message/chat-message-p.h"
#include "c-wrapper/c-wrapper.h"
#include "chat/chat-message/chat-message-p.h"
#include "logger/logger.h"
#include "real-time-text-chat-room-p.h"
// =============================================================================
......
......@@ -20,13 +20,8 @@
#ifndef _REAL_TIME_TEXT_CHAT_ROOM_H_
#define _REAL_TIME_TEXT_CHAT_ROOM_H_
// From coreapi
#include "private.h"
#include "chat/chat-room/chat-room.h"
#include "linphone/types.h"
// =============================================================================
LINPHONE_BEGIN_NAMESPACE
......
......@@ -17,6 +17,9 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
// TODO: Remove me later.
#include "private.h"
#include "address/address.h"
#include "chat/chat-message/chat-message.h"
#include "chat/chat-room/chat-room.h"
......
......@@ -17,10 +17,11 @@
*/
#include "address/address.h"
#include "chat/chat-room/basic-chat-room.h"
#include "chat/chat-message/chat-message.h"
#include "chat/chat-room/basic-chat-room.h"
#include "chat/cpim/cpim.h"
#include "content/content-type.h"
#include "content/content.h"
#include "liblinphone_tester.h"
......
......@@ -17,9 +17,10 @@
*/
#include "address/address.h"
#include "chat/chat-room/basic-chat-room.h"
#include "chat/chat-message/chat-message.h"
#include "chat/chat-room/basic-chat-room.h"
#include "content/content-type.h"
#include "content/content.h"
#include "liblinphone_tester.h"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment