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/SmileyAdd/src/imagecache.h | 2 +- plugins/SmileyAdd/src/services.h | 2 +- plugins/SmileyAdd/src/smileys.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'plugins/SmileyAdd/src') diff --git a/plugins/SmileyAdd/src/imagecache.h b/plugins/SmileyAdd/src/imagecache.h index cc0ef2cf3b..229af79a27 100644 --- a/plugins/SmileyAdd/src/imagecache.h +++ b/plugins/SmileyAdd/src/imagecache.h @@ -38,7 +38,7 @@ public: virtual void GetSize(SIZE&) {}; virtual int GetFrameCount(void) const { return 0; } virtual int GetFrameDelay(void) const { return 0; } - virtual HICON GetIcon(void) { return NULL; }; + virtual HICON GetIcon(void) { return nullptr; }; virtual void DrawInternal(HDC, int, int, int, int) {}; virtual void SelectFrame(int) {} diff --git a/plugins/SmileyAdd/src/services.h b/plugins/SmileyAdd/src/services.h index 113485429b..6a877d63e8 100644 --- a/plugins/SmileyAdd/src/services.h +++ b/plugins/SmileyAdd/src/services.h @@ -39,7 +39,7 @@ int AccountListChanged(WPARAM wParam, LPARAM lParam); int DbSettingChanged(WPARAM wParam, LPARAM lParam); int ReloadColour(WPARAM, LPARAM); -SmileyPackType* GetSmileyPack(const char* proto, MCONTACT hContact = NULL, SmileyPackCType** smlc = NULL); +SmileyPackType* GetSmileyPack(const char* proto, MCONTACT hContact = NULL, SmileyPackCType** smlc = nullptr); #endif // SMILEYADD_SERVICES_H_ diff --git a/plugins/SmileyAdd/src/smileys.h b/plugins/SmileyAdd/src/smileys.h index c44f1858fb..4f02daed07 100644 --- a/plugins/SmileyAdd/src/smileys.h +++ b/plugins/SmileyAdd/src/smileys.h @@ -143,7 +143,7 @@ public: }; typedef SMOBJLIST SmileyLocVecType; - SmileyLookup() : m_pattern(L"") { m_ind = 0; m_valid = false; m_pattern = NULL; }; + SmileyLookup() : m_pattern(L"") { m_ind = 0; m_valid = false; m_pattern = nullptr; }; SmileyLookup(const CMStringW &str, const bool regexs, const int ind, const CMStringW &smpt); ~SmileyLookup(); @@ -251,7 +251,7 @@ private: bool visible; public: - SmileyCategoryType() { type = smcNone; m_pSmileyPackStore = NULL; visible = true; }; + SmileyCategoryType() { type = smcNone; m_pSmileyPackStore = nullptr; visible = true; }; SmileyCategoryType(SmileyPackListType *pSPS, const CMStringW &name, const CMStringW &displayName, const CMStringW &defaultFilename, SmcType typ); const CMStringW& GetDisplayName(void) const { return m_DisplayName; } -- cgit v1.2.3