From c9027518b426a134006a7335184df8f9205b2938 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 1 May 2020 18:23:21 +0300 Subject: fixes #2371 (NewStory: add grouping support) --- plugins/NewStory/src/history_array.h | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'plugins/NewStory/src/history_array.h') diff --git a/plugins/NewStory/src/history_array.h b/plugins/NewStory/src/history_array.h index 8b670fce8f..02a2b7f471 100644 --- a/plugins/NewStory/src/history_array.h +++ b/plugins/NewStory/src/history_array.h @@ -10,25 +10,26 @@ struct ItemData ELM_DATA }; - BYTE flags = 0; - MCONTACT hContact = 0; MEVENT hEvent = 0; + bool wtext_del = false; + bool bSelected = false; bool dbeOk = false; - DBEVENTINFO dbe; - bool wtext_del = false; + DBEVENTINFO dbe; wchar_t *wtext = 0; - wchar_t *wszNick = 0; HANDLE data = 0; + ItemData *pPrev = 0; ItemData() { memset(&dbe, 0, sizeof(dbe)); } ~ItemData(); bool load(EventLoadMode mode); + bool isGrouped() const; + inline bool loadInline(EventLoadMode mode) { if (((mode >= ItemData::ELM_INFO) && !dbeOk) || ((mode == ItemData::ELM_DATA) && !dbe.pBlob)) @@ -95,8 +96,6 @@ public: enum { - HIF_SELECTED = 0x01, - FILTER_TIME = 0x01, FILTER_TYPE = 0x02, FILTER_DIRECTION = 0x04, @@ -131,7 +130,7 @@ public: HistoryArray(); ~HistoryArray(); - bool addEvent(MCONTACT hContact, MEVENT hEvent, int count, ItemData::EventLoadMode mode = ItemData::ELM_NOTHING); + bool addEvent(MCONTACT hContact, MEVENT hEvent, int count); void addChatEvent(SESSION_INFO *si, LOGINFO *pEvent); void clear(); int getCount() const; -- cgit v1.2.3