more nullptr

9 files changed, 22 insertions, 22 deletions

diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h
index 21e3779c30..b322848628 100644
--- a/plugins/TabSRMM/src/contactcache.h
+++ b/plugins/TabSRMM/src/contactcache.h
@@ -104,8 +104,8 @@ struct CContactCache : public MZeroedObject
 	bool     updateNick();

 	void     updateMeta();

 	bool     updateUIN();

-	void     updateStatusMsg(const char *szKey = 0);

-	void     setWindowData(CSrmmWindow *dat = 0);

+	void     updateStatusMsg(const char *szKey = nullptr);

+	void     setWindowData(CSrmmWindow *dat = nullptr);

 	void     resetMeta();

 	void     closeWindow();

 	void     deletedHandler();

diff --git a/plugins/TabSRMM/src/controls.h b/plugins/TabSRMM/src/controls.h
index daf9174c7b..1bd0d75847 100644
--- a/plugins/TabSRMM/src/controls.h
+++ b/plugins/TabSRMM/src/controls.h
@@ -42,7 +42,7 @@ public:
 	const RECT&  getClientRect();

 	void         Resize(WORD wWidth) const

 	{

-		::SetWindowPos(m_hwndToolbar, 0, 4, 0, wWidth, m_size_y, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOREDRAW);

+		::SetWindowPos(m_hwndToolbar, nullptr, 4, 0, wWidth, m_size_y, SWP_NOZORDER | SWP_NOACTIVATE | SWP_NOCOPYBITS | SWP_NOREDRAW);

 	}

 

 	LONG         getHeight() const;

diff --git a/plugins/TabSRMM/src/infopanel.h b/plugins/TabSRMM/src/infopanel.h
index cb9966d9a4..d449b02874 100644
--- a/plugins/TabSRMM/src/infopanel.h
+++ b/plugins/TabSRMM/src/infopanel.h
@@ -75,12 +75,12 @@ public:
 		LEFT_BAR_WIDTH = 20

 	};

 

-	CTip(const HWND hwndParent, const MCONTACT hContact, const wchar_t *pszText = 0, const CInfoPanel *panel = 0);

+	CTip(const HWND hwndParent, const MCONTACT hContact, const wchar_t *pszText = nullptr, const CInfoPanel *panel = nullptr);

 	~CTip()

 	{

 		mir_free(m_pszText);

 	}

-	void						show(const RECT& rc, POINT& pt, const HICON hIcon = 0, const wchar_t *szTitle = 0);

+	void						show(const RECT& rc, POINT& pt, const HICON hIcon = nullptr, const wchar_t *szTitle = nullptr);

 	const HWND					getHwnd() const { return(m_hwnd); }

 

 	static void					registerClass();

diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h
index 91d3b13f67..0aea60b9e5 100644
--- a/plugins/TabSRMM/src/mim.h
+++ b/plugins/TabSRMM/src/mim.h
@@ -84,9 +84,9 @@ public:
 	~CMimAPI() {

 		if (m_haveBufferedPaint)

 			m_pfnBufferedPaintUninit();

-		if (m_hUxTheme != 0)

+		if (m_hUxTheme != nullptr)

 			FreeLibrary(m_hUxTheme);

-		if (m_hDwmApi != 0)

+		if (m_hDwmApi != nullptr)

 			FreeLibrary(m_hDwmApi);

 

 		if (m_hChatLogLock != INVALID_HANDLE_VALUE)

@@ -150,7 +150,7 @@ public:
 	INT_PTR foldersPathChanged();

 

 	void    startTimer();

-	void    stopTimer(const char *szMsg = 0);

+	void    stopTimer(const char *szMsg = nullptr);

 

 	__forceinline __int64 getTimerStart() const { return m_tStart; }

 	__forceinline __int64 getTimerStop() const { return m_tStop; }

diff --git a/plugins/TabSRMM/src/muchighlight.h b/plugins/TabSRMM/src/muchighlight.h
index 340b9e53f6..51bcd3ec79 100644
--- a/plugins/TabSRMM/src/muchighlight.h
+++ b/plugins/TabSRMM/src/muchighlight.h
@@ -41,8 +41,8 @@ public:
 	CMUCHighlight()

 	{

 		m_fInitialized = false;

-		m_TextPatternString = m_NickPatternString = 0;

-		m_NickPatterns = m_TextPatterns = 0;

+		m_TextPatternString = m_NickPatternString = nullptr;

+		m_NickPatterns = m_TextPatterns = nullptr;

 		m_iNickPatterns = m_iTextPatterns = 0;

 		m_dwFlags = 0;

 		m_Valid = true;

diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h
index 4d3cc13762..4380ca0a4f 100644
--- a/plugins/TabSRMM/src/sidebar.h
+++ b/plugins/TabSRMM/src/sidebar.h
@@ -135,7 +135,7 @@ public:
 	void                  updateSession(CTabBaseDlg *dat);

 

 	void                  processScrollerButtons(UINT cmd);

-	void                  Layout(const RECT *rc = 0, bool fOnlyCalc = false);

+	void                  Layout(const RECT *rc = nullptr, bool fOnlyCalc = false);

 	void                  setVisible(bool fNewVisibility);

 	void                  showAll(int showCmd);

 

@@ -180,7 +180,7 @@ public:
 		uLayoutCount = NR_LAYOUTS;

 		return(m_layouts);

 	}

-	void                  scrollIntoView(const CSideBarButton *item = 0);

+	void                  scrollIntoView(const CSideBarButton *item = nullptr);

 	void                  resizeScrollWnd(LONG x, LONG y, LONG width, LONG height) const;

 

 private:

diff --git a/plugins/TabSRMM/src/taskbar.h b/plugins/TabSRMM/src/taskbar.h
index d9a3d7935d..ad29335aed 100644
--- a/plugins/TabSRMM/src/taskbar.h
+++ b/plugins/TabSRMM/src/taskbar.h
@@ -138,14 +138,14 @@ class CTaskbarInteract
 public:

 	CTaskbarInteract()

 	{

-		m_pTaskbarInterface = 0;

+		m_pTaskbarInterface = nullptr;

 		m_IconSize = 0;

 		m_isEnabled = IsWinVer7Plus() ? true : false;

 

 		if (m_isEnabled) {

 			::CoCreateInstance(CLSID_TaskbarList, nullptr, CLSCTX_ALL, IID_ITaskbarList3, (void**)&m_pTaskbarInterface);

 			updateMetrics();

-			if (0 == m_pTaskbarInterface)

+			if (nullptr == m_pTaskbarInterface)

 				m_isEnabled = false;

 		}

 

@@ -165,7 +165,7 @@ public:
 	{

 		if (m_isEnabled && m_pTaskbarInterface) {

 			m_pTaskbarInterface->Release();

-			m_pTaskbarInterface = 0;

+			m_pTaskbarInterface = nullptr;

 			m_isEnabled = false;

 		}

 		::UnregisterClass(PROXYCLASSNAME, g_hInst);

diff --git a/plugins/TabSRMM/src/themes.h b/plugins/TabSRMM/src/themes.h
index 22d61dacf0..a626a1936a 100644
--- a/plugins/TabSRMM/src/themes.h
+++ b/plugins/TabSRMM/src/themes.h
@@ -146,7 +146,7 @@ public:
 	CImageItem(const CImageItem& From)

 	{

 		*this = From;

-		m_nextItem = 0;

+		m_nextItem = nullptr;

 	}

 	CImageItem(const wchar_t *szName)

 	{

@@ -183,8 +183,8 @@ public:
 

 	void			Clear()

 	{

-		m_hdc = 0; m_hbm = 0; m_hbmOld = 0;

-		m_fillBrush = (HBRUSH)0;

+		m_hdc = nullptr; m_hbm = nullptr; m_hbmOld = nullptr;

+		m_fillBrush = nullptr;

 	}

 

 	void			setBitmap(const HBITMAP hbm)

@@ -354,7 +354,7 @@ public:
 	 */

 	const CImageItem*		getGlyphItem() const

 	{

-		return(m_fHaveGlyph ? &m_glyphItem : 0);

+		return(m_fHaveGlyph ? &m_glyphItem : nullptr);

 	}

 	bool					warnToClose() const;

 	COLORREF				getColorKey() const { return(m_ContainerColorKey); }

diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h
index 5b3bf33b18..229c379285 100644
--- a/plugins/TabSRMM/src/utils.h
+++ b/plugins/TabSRMM/src/utils.h
@@ -57,8 +57,8 @@ public:
 	static void     DoubleAmpersands(wchar_t *pszText, size_t len);

 	static void     RTF_CTableInit();

 	static void     RTF_ColorAdd(const wchar_t *tszColname);

-	static int      ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);

-	static int      WriteContainerSettingsToDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = 0);

+	static int      ReadContainerSettingsFromDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = nullptr);

+	static int      WriteContainerSettingsToDB(const MCONTACT hContact, TContainerSettings *cs, const char *szKey = nullptr);

 	static void     SettingsToContainer(TContainerData *pContainer);

 	static void     ContainerToSettings(TContainerData *pContainer);

 	static void     ReadPrivateContainerSettings(TContainerData *pContainer, bool fForce = false);

@@ -154,7 +154,7 @@ public:
 

 public:

 	// static function to construct and show the dialog, returns the user's choice

-	static LRESULT show(const int uId, DWORD dwFlags = 0, const wchar_t* tszTxt = 0);

+	static LRESULT show(const int uId, DWORD dwFlags = 0, const wchar_t* tszTxt = nullptr);

 	static void destroyAll();

 	LRESULT ShowDialog() const;