more nullptr

6 files changed, 11 insertions, 11 deletions

diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h
index ca632bac41..e09dc23f61 100644
--- a/plugins/Popup/src/common.h
+++ b/plugins/Popup/src/common.h
@@ -42,7 +42,7 @@ inline void GetBmpSize(HBITMAP hbm, SIZE *sz)
 

 inline void DebugMsg(LPTSTR msg){

 	if (PopupOptions.debug){

-		MessageBox(NULL, msg, L"debug", MB_OK);

+		MessageBox(nullptr, msg, L"debug", MB_OK);

 	}

 }

 

diff --git a/plugins/Popup/src/formula.h b/plugins/Popup/src/formula.h
index 6de6ac625d..fdb4612bc1 100644
--- a/plugins/Popup/src/formula.h
+++ b/plugins/Popup/src/formula.h
@@ -36,12 +36,12 @@ public:
 			int value;

 			Item *next;

 

-			Item(char *aName, int aValue, Item *aNext) : value(aValue), next(aNext) { name = aName ? mir_strdup(aName) : 0; }

+			Item(char *aName, int aValue, Item *aNext) : value(aValue), next(aNext) { name = aName ? mir_strdup(aName) : nullptr; }

 			~Item() { if (name) mir_free(name); }

 		};

 		Item *items;

 	public:

-		Args() :items(0){}

+		Args() :items(nullptr){}

 		~Args(){ clear(); }

 		void	add(char *name, int value)

 		{

@@ -83,7 +83,7 @@ public:
 	Formula(wchar_t *s) :m_str(mir_wstrdup(s)) {}

 	~Formula() { mir_free(m_str); }

 	void	set(wchar_t *s){ mir_free(m_str); m_str = mir_wstrdup(s); }

-	int		eval(Args *args, bool *vars = 0) const;

+	int		eval(Args *args, bool *vars = nullptr) const;

 };

 

 #endif // __formula_h__
\ No newline at end of file
diff --git a/plugins/Popup/src/opt_gen.h b/plugins/Popup/src/opt_gen.h
index f97d056306..41e2d245b8 100644
--- a/plugins/Popup/src/opt_gen.h
+++ b/plugins/Popup/src/opt_gen.h
@@ -25,7 +25,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define __opt_gen_h__

 

 void LoadOption_General();

-void Check_ReorderPopups(HWND hwnd = 0);

+void Check_ReorderPopups(HWND hwnd = nullptr);

 INT_PTR CALLBACK DlgProcPopupGeneral(HWND, UINT, WPARAM, LPARAM);

 

 void ErrorMSG(int minValue, int maxValue);

diff --git a/plugins/Popup/src/opttree.h b/plugins/Popup/src/opttree.h
index 3dd63d3e0d..c13087b072 100644
--- a/plugins/Popup/src/opttree.h
+++ b/plugins/Popup/src/opttree.h
@@ -38,8 +38,8 @@ typedef struct {
 } OPTTREE_OPTION;

 

 BOOL OptTree_ProcessMessage(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam, BOOL *result, int idcTree, OPTTREE_OPTION *options, int optionCount);

-DWORD OptTree_GetOptions(HWND hwnd, int idcTree, OPTTREE_OPTION *options, int optionCount, LPTSTR pszSettingName = NULL);

-void OptTree_SetOptions(HWND hwnd, int idcTree, OPTTREE_OPTION *options, int optionCount, DWORD dwOptions, LPTSTR pszSettingName = NULL);

+DWORD OptTree_GetOptions(HWND hwnd, int idcTree, OPTTREE_OPTION *options, int optionCount, LPTSTR pszSettingName = nullptr);

+void OptTree_SetOptions(HWND hwnd, int idcTree, OPTTREE_OPTION *options, int optionCount, DWORD dwOptions, LPTSTR pszSettingName = nullptr);

 

 void OptTree_Translate(HWND hwndTree);

 HTREEITEM OptTree_FindNamedTreeItemAt(HWND hwndTree, HTREEITEM hItem, LPCTSTR name);

diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h
index 57061569ee..bed4bd7ba2 100644
--- a/plugins/Popup/src/popup_wnd2.h
+++ b/plugins/Popup/src/popup_wnd2.h
@@ -107,7 +107,7 @@ private:
 	int        fixActions(POPUPACTION *theActions, int count, int additional);

 

 public:

-	PopupWnd2(POPUPDATA2 *ppd, POPUPOPTIONS *theCustomOptions = NULL, bool renderOnly = false);

+	PopupWnd2(POPUPDATA2 *ppd, POPUPOPTIONS *theCustomOptions = nullptr, bool renderOnly = false);

 	~PopupWnd2();

 

 	void	startThread();

@@ -174,7 +174,7 @@ public:
 		this->m_sz = sz;

 		if (m_hwnd)

 		{

-			SetWindowPos(m_hwnd, 0, 0, 0, sz.cx, sz.cy, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE | SWP_DEFERERASE | SWP_NOSENDCHANGING);

+			SetWindowPos(m_hwnd, nullptr, 0, 0, sz.cx, sz.cy, SWP_NOZORDER | SWP_NOMOVE | SWP_NOACTIVATE | SWP_DEFERERASE | SWP_NOSENDCHANGING);

 			if (!m_customPopup)

 				PopupThreadUpdateWindow(this);

 		}

@@ -189,7 +189,7 @@ public:
 		if (m_bSlide)

 			m_ptPosition1 = pt;

 		else

-			SetWindowPos(m_hwnd, 0, pt.x, pt.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | SWP_DEFERERASE | SWP_NOSENDCHANGING);

+			SetWindowPos(m_hwnd, nullptr, pt.x, pt.y, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE | SWP_DEFERERASE | SWP_NOSENDCHANGING);

 	}

 

 	// Thread-related methods

diff --git a/plugins/Popup/src/skin.h b/plugins/Popup/src/skin.h
index 8c903a9ca8..7b410151db 100644
--- a/plugins/Popup/src/skin.h
+++ b/plugins/Popup/src/skin.h
@@ -124,7 +124,7 @@ private:
 	void	drawActionBar(MyBitmap *bmp, PopupWnd2 *wnd, int x, int y) const;

 

 public:

-	PopupSkin(LPCTSTR aName = 0);

+	PopupSkin(LPCTSTR aName = nullptr);

 	~PopupSkin();

 

 	void	measure(HDC hdc, PopupWnd2 *wnd, int maxw, POPUPOPTIONS *options) const;