From 1c0172cca4f1e90679321912e20436a7f42f122d Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Sat, 24 Feb 2018 15:32:06 +0100 Subject: more nullptr --- plugins/HistoryStats/src/bandctrl.h | 4 ++-- plugins/HistoryStats/src/column.h | 2 +- plugins/HistoryStats/src/message.h | 2 +- plugins/HistoryStats/src/mu_common.h | 2 +- plugins/HistoryStats/src/optionsctrl.h | 4 ++-- plugins/HistoryStats/src/statistic.h | 6 +++--- plugins/HistoryStats/src/utf8buffer.h | 2 +- plugins/HistoryStats/src/utils.h | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) (limited to 'plugins/HistoryStats/src') diff --git a/plugins/HistoryStats/src/bandctrl.h b/plugins/HistoryStats/src/bandctrl.h index 4917545c87..a94544b358 100644 --- a/plugins/HistoryStats/src/bandctrl.h +++ b/plugins/HistoryStats/src/bandctrl.h @@ -16,7 +16,7 @@ private: HWND m_hBandWnd; public: - explicit BandCtrl(HWND hBandWnd = NULL) : m_hBandWnd(hBandWnd) { } + explicit BandCtrl(HWND hBandWnd = nullptr) : m_hBandWnd(hBandWnd) { } ~BandCtrl() { } public: @@ -25,7 +25,7 @@ public: public: void setLayout(int nLayout); - HANDLE addButton(DWORD dwFlags, HICON hIcon, INT_PTR dwData, const wchar_t* szTooltip = NULL, const wchar_t* szText = NULL); + HANDLE addButton(DWORD dwFlags, HICON hIcon, INT_PTR dwData, const wchar_t* szTooltip = nullptr, const wchar_t* szText = nullptr); bool isButtonChecked(HANDLE hButton); void checkButton(HANDLE hButton, bool bCheck); DWORD getButtonData(HANDLE hButton); diff --git a/plugins/HistoryStats/src/column.h b/plugins/HistoryStats/src/column.h index acd99f933e..6586beacb5 100644 --- a/plugins/HistoryStats/src/column.h +++ b/plugins/HistoryStats/src/column.h @@ -139,7 +139,7 @@ public: Column() : m_bEnabled(true), m_CustomTitle(L""), m_nContactDataSlot(-1), m_nContactDataTransformSlot(-1), - m_pStatistic(NULL), m_pSettings(NULL), m_pCharMapper(NULL), + m_pStatistic(nullptr), m_pSettings(nullptr), m_pCharMapper(nullptr), m_bUsePNG(false) { } diff --git a/plugins/HistoryStats/src/message.h b/plugins/HistoryStats/src/message.h index 686ee103ee..39e8af549e 100644 --- a/plugins/HistoryStats/src/message.h +++ b/plugins/HistoryStats/src/message.h @@ -43,7 +43,7 @@ private: public: explicit Message(bool bStripRawRTF, bool bStripBBCodes) - : m_RawSource(NULL), m_Available(0), + : m_RawSource(nullptr), m_Available(0), m_bStripRawRTF(bStripRawRTF), m_bStripBBCodes(bStripBBCodes), m_bOutgoing(false), m_Timestamp(0), m_nLength(0) { diff --git a/plugins/HistoryStats/src/mu_common.h b/plugins/HistoryStats/src/mu_common.h index 11905e187d..875fbfa01d 100644 --- a/plugins/HistoryStats/src/mu_common.h +++ b/plugins/HistoryStats/src/mu_common.h @@ -13,7 +13,7 @@ namespace mu namespace clist { - HGENMENU addMainMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot = 0); + HGENMENU addMainMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService, HGENMENU hRoot = nullptr); HGENMENU addContactMenuItem(const wchar_t* pszName, DWORD flags, int position, HICON hIcon, const char* pszService); } diff --git a/plugins/HistoryStats/src/optionsctrl.h b/plugins/HistoryStats/src/optionsctrl.h index 629249e99b..13889ed564 100644 --- a/plugins/HistoryStats/src/optionsctrl.h +++ b/plugins/HistoryStats/src/optionsctrl.h @@ -31,7 +31,7 @@ private: const OptionsCtrl& operator =(const OptionsCtrl& other); // no implementation public: - explicit OptionsCtrl(HWND hOptWnd = NULL) : m_hOptWnd(hOptWnd) { } + explicit OptionsCtrl(HWND hOptWnd = nullptr) : m_hOptWnd(hOptWnd) { } ~OptionsCtrl() { } public: @@ -78,7 +78,7 @@ public: void setScrollPos(int nBar, int nPos); bool isDateTimeNone(HANDLE hDateTime); void setDateTimeNone(HANDLE hDateTime); - DWORD getDateTime(HANDLE hDateTime, bool* pbNone = NULL); + DWORD getDateTime(HANDLE hDateTime, bool* pbNone = nullptr); void setDateTime(HANDLE hDateTime, DWORD dwDateTime); ext::string getDateTimeStr(HANDLE hDateTime); void setDateTimeStr(HANDLE hDateTime, const ext::string& strDateTime); diff --git a/plugins/HistoryStats/src/statistic.h b/plugins/HistoryStats/src/statistic.h index b3dbe6fc2a..e05254b5d7 100644 --- a/plugins/HistoryStats/src/statistic.h +++ b/plugins/HistoryStats/src/statistic.h @@ -167,14 +167,14 @@ public: ~Statistic(); public: - static void run(const Settings& settings, InvocationSource invokedFrom, HINSTANCE hInst, HWND hWndParent = NULL); + static void run(const Settings& settings, InvocationSource invokedFrom, HINSTANCE hInst, HWND hWndParent = nullptr); int countContacts() const { return m_Contacts.size(); } const Contact& getContact(int index) const; const Contact& getTotals() const { assert(m_pTotals); return *m_pTotals; } const Contact& getOmitted() const { assert(m_pOmitted); return *m_pOmitted; } - bool hasTotals() const { return (m_pTotals != NULL) && m_Settings.m_CalcTotals; } // MEMO: only makes sense after 'calc totals'-step - bool hasOmitted() const { return (m_pOmitted != NULL) && m_Settings.m_OmitContacts && m_Settings.m_OmittedInExtraRow && m_bActuallyOmitted; } // MEMO: only makes sense after 'omit'-step + bool hasTotals() const { return (m_pTotals != nullptr) && m_Settings.m_CalcTotals; } // MEMO: only makes sense after 'calc totals'-step + bool hasOmitted() const { return (m_pOmitted != nullptr) && m_Settings.m_OmitContacts && m_Settings.m_OmittedInExtraRow && m_bActuallyOmitted; } // MEMO: only makes sense after 'omit'-step DWORD getFirstTime(); // MEMO: only makes sense after 'calc totals'-step DWORD getLastTime(); // MEMO: only makes sense after 'calc totals'-step DWORD getHistoryTime(); // MEMO: only makes sense after 'calc totals'-step diff --git a/plugins/HistoryStats/src/utf8buffer.h b/plugins/HistoryStats/src/utf8buffer.h index 56342adbf7..8f7d3cdddc 100644 --- a/plugins/HistoryStats/src/utf8buffer.h +++ b/plugins/HistoryStats/src/utf8buffer.h @@ -48,7 +48,7 @@ protected: { return _Tr::not_eof(_C); } - else if (pptr() != 0 && pptr() < epptr()) + else if (pptr() != nullptr && pptr() < epptr()) { *pptr() = _Tr::to_char_type(_C); pbump(1); diff --git a/plugins/HistoryStats/src/utils.h b/plugins/HistoryStats/src/utils.h index 884b1c7302..daae031316 100644 --- a/plugins/HistoryStats/src/utils.h +++ b/plugins/HistoryStats/src/utils.h @@ -96,7 +96,7 @@ namespace utils ext::string getGUID(); // window positioning - void centerDialog(HWND hDlg, HWND hParent = NULL); + void centerDialog(HWND hDlg, HWND hParent = nullptr); RECT getWindowRect(HWND hParent, HWND hWnd); inline RECT getWindowRect(HWND hParent, int nID) { return getWindowRect(hParent, GetDlgItem(hParent, nID)); } void moveWindow(HWND hWnd, const RECT& rWnd); -- cgit v1.2.3