From 65f7574ffc302e2749a922ada3aa2ea9513dd02e Mon Sep 17 00:00:00 2001 From: Tobias Weimer Date: Fri, 6 Nov 2015 20:25:24 +0000 Subject: HistoryStats: Minor cleanup git-svn-id: http://svn.miranda-ng.org/main/trunk@15692 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/HistoryStats/src/canvas.cpp | 12 ++++-------- plugins/HistoryStats/src/colbase_words.cpp | 6 +++--- plugins/HistoryStats/src/column_chatduration.cpp | 6 ++---- plugins/HistoryStats/src/column_timeline.cpp | 6 +++--- plugins/HistoryStats/src/dlgfilterwords.cpp | 3 +-- plugins/HistoryStats/src/message.h | 7 +++---- plugins/HistoryStats/src/settingsserializer.cpp | 2 +- plugins/HistoryStats/src/utils.cpp | 10 ++-------- 8 files changed, 19 insertions(+), 33 deletions(-) (limited to 'plugins/HistoryStats') diff --git a/plugins/HistoryStats/src/canvas.cpp b/plugins/HistoryStats/src/canvas.cpp index 881fbc254f..be0cd3978c 100644 --- a/plugins/HistoryStats/src/canvas.cpp +++ b/plugins/HistoryStats/src/canvas.cpp @@ -29,14 +29,10 @@ void Canvas::updateTrans(BYTE* pData) } } -Canvas::Canvas(int nWidth, int nHeight) : - m_nChannels(4), - m_nWidth(nWidth), - m_nHeight(nHeight), - m_nLineLength((m_nChannels * m_nWidth + 3) & ~0x3), - m_bTransColor(false), - m_TransColor(0), - m_pBMIH(NULL) +Canvas::Canvas(int nWidth, int nHeight) : m_nChannels(4), m_nWidth(nWidth), + m_nHeight(nHeight), m_nLineLength((m_nChannels * m_nWidth + 3) & ~0x3), + m_bTransColor(false), m_TransColor(0), m_pBMIH(NULL), m_hDC(0), + m_hBmp(0), m_hOldBmp(0) {} Canvas::~Canvas() diff --git a/plugins/HistoryStats/src/colbase_words.cpp b/plugins/HistoryStats/src/colbase_words.cpp index e266474d1c..9d771df800 100644 --- a/plugins/HistoryStats/src/colbase_words.cpp +++ b/plugins/HistoryStats/src/colbase_words.cpp @@ -163,9 +163,9 @@ void ColBaseWords::parseMsg(WordMap* pWords, const ext::string& msg, bool bOutgo } } -ColBaseWords::ColBaseWords() - : m_nSource(2), m_nMinLength(1), m_nMaxLength(0), m_bFilterLinks(true), - m_hSource(NULL), m_hMinLength(NULL), m_hMaxLength(NULL), m_hFilterLinks(NULL) +ColBaseWords::ColBaseWords() : m_nSource(2), m_nMinLength(1), m_nMaxLength(0), m_bFilterLinks(true), + m_hSource(NULL), m_hMinLength(NULL), m_hMaxLength(NULL), m_hFilterLinks(NULL), + m_bFilterMessages(false), m_bFilterWords(false) { } diff --git a/plugins/HistoryStats/src/column_chatduration.cpp b/plugins/HistoryStats/src/column_chatduration.cpp index 0d4b7e67fc..7825dadf20 100644 --- a/plugins/HistoryStats/src/column_chatduration.cpp +++ b/plugins/HistoryStats/src/column_chatduration.cpp @@ -4,10 +4,8 @@ /* * ColChatDuration */ - -ColChatDuration::ColChatDuration() - : m_nVisMode(3), m_bGraph(true), m_bDetail(true), - m_hVisMode(NULL), m_hGraph(NULL), m_hDetail(NULL) +ColChatDuration::ColChatDuration() : m_nVisMode(3), m_bGraph(true), m_bDetail(true), + m_hVisMode(NULL), m_hGraph(NULL), m_hDetail(NULL), m_nMaxForGraph(0) { } diff --git a/plugins/HistoryStats/src/column_timeline.cpp b/plugins/HistoryStats/src/column_timeline.cpp index f0e8a166d6..ad59733b61 100644 --- a/plugins/HistoryStats/src/column_timeline.cpp +++ b/plugins/HistoryStats/src/column_timeline.cpp @@ -5,9 +5,9 @@ * ColTimeline */ -ColTimeline::ColTimeline() - : m_nSource(0), m_nSourceType(2), m_nIgnoreOld(0), m_bDetail(true), m_nDays(7), - m_hSource(NULL), m_hIgnoreOld(NULL), m_hDetail(NULL), m_hDays(NULL) +ColTimeline::ColTimeline() : m_nSource(0), m_nSourceType(2), m_nIgnoreOld(0), m_bDetail(true), + m_nDays(7), m_hSource(NULL), m_hIgnoreOld(NULL), m_hDetail(NULL), m_hDays(NULL), + m_nTimelineWidth(0), m_nFirstDay(0), m_nLastDay(0) { } diff --git a/plugins/HistoryStats/src/dlgfilterwords.cpp b/plugins/HistoryStats/src/dlgfilterwords.cpp index 4943be405d..c3e17cfe2e 100644 --- a/plugins/HistoryStats/src/dlgfilterwords.cpp +++ b/plugins/HistoryStats/src/dlgfilterwords.cpp @@ -297,8 +297,7 @@ void DlgFilterWords::clearFilters() m_Filters.clear(); } -DlgFilterWords::DlgFilterWords() : - m_hWnd(NULL), m_bColProvided(false) +DlgFilterWords::DlgFilterWords() : m_hWnd(NULL), m_bColProvided(false) { } diff --git a/plugins/HistoryStats/src/message.h b/plugins/HistoryStats/src/message.h index b355c49056..6dc9e2f28a 100644 --- a/plugins/HistoryStats/src/message.h +++ b/plugins/HistoryStats/src/message.h @@ -43,10 +43,9 @@ private: public: explicit Message(bool bStripRawRTF, bool bStripBBCodes) - : m_RawSource(NULL) - , m_Available(0) - , m_bStripRawRTF(bStripRawRTF) - , m_bStripBBCodes(bStripBBCodes) + : m_RawSource(NULL), m_Available(0), + m_bStripRawRTF(bStripRawRTF), m_bStripBBCodes(bStripBBCodes), + m_bOutgoing(false), m_Timestamp(0), m_nLength(0) { } diff --git a/plugins/HistoryStats/src/settingsserializer.cpp b/plugins/HistoryStats/src/settingsserializer.cpp index 842657fdad..4740994f3b 100644 --- a/plugins/HistoryStats/src/settingsserializer.cpp +++ b/plugins/HistoryStats/src/settingsserializer.cpp @@ -75,7 +75,7 @@ static const char* g_UsedSettings[] = { con::SettWordDelimiters, }; -SettingsSerializer::SettingsSerializer(const char* module) +SettingsSerializer::SettingsSerializer(const char* module) : m_VersionInDB(0) { m_DB.setContact(0); m_DB.setModule(module); diff --git a/plugins/HistoryStats/src/utils.cpp b/plugins/HistoryStats/src/utils.cpp index 6139ee0b35..376593db3a 100644 --- a/plugins/HistoryStats/src/utils.cpp +++ b/plugins/HistoryStats/src/utils.cpp @@ -945,10 +945,7 @@ namespace utils /* * OS */ - -OS::OS() -: m_bIsXPPlus(false), -m_ImageListColor(ILC_COLORDDB) // MEMO: maybe change this to ILC_COLOR{8,16,24} +OS::OS() : m_bIsXPPlus(false), m_ImageListColor(ILC_COLORDDB) // MEMO: maybe change this to ILC_COLOR{8,16,24} { m_SmIcon.cx = 16; // GetSystemMetrics(SM_CXSMICON); m_SmIcon.cy = 16; // GetSystemMetrics(SM_CYSMICON); @@ -971,7 +968,6 @@ OS OS::m_Data; /* * Locale */ - void Locale::init() { m_Data.m_ThousandSep = utils::fromA(localeconv()->thousands_sep).c_str()[0]; @@ -984,9 +980,7 @@ Locale Locale::m_Data; /* * RTFFilter */ - -RTFFilter::RTFFilter() : - m_hRTFConv(NULL) +RTFFilter::RTFFilter() : m_hRTFConv(NULL), m_RTFConvString(0) { } -- cgit v1.2.3