From a7c24ca48995cf2bf436156302f96b91bf135409 Mon Sep 17 00:00:00 2001 From: Goraf <22941576+Goraf@users.noreply.github.com> Date: Mon, 13 Nov 2017 15:03:31 +0100 Subject: Code modernize ... * replace 0/NULL with nullptr [using clang-tidy] --- plugins/QuickReplies/src/events.cpp | 6 +++--- plugins/QuickReplies/src/options.cpp | 2 +- plugins/QuickReplies/src/quickreplies.cpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) (limited to 'plugins/QuickReplies') diff --git a/plugins/QuickReplies/src/events.cpp b/plugins/QuickReplies/src/events.cpp index 73a8172070..5335379dd1 100644 --- a/plugins/QuickReplies/src/events.cpp +++ b/plugins/QuickReplies/src/events.cpp @@ -78,15 +78,15 @@ int OnButtonPressed(WPARAM wParam, LPARAM lParam) if (value == nullptr) replyList.insert(mir_wstrdup(L"")); else - replyList.insert(variables_parsedup(value, 0, wParam)); + replyList.insert(variables_parsedup(value, nullptr, wParam)); if (!mir_wstrcmp(value, L"---")) - AppendMenu((HMENU)hMenu, MF_SEPARATOR, i + 1, NULL); + AppendMenu((HMENU)hMenu, MF_SEPARATOR, i + 1, nullptr); else AppendMenu((HMENU)hMenu, MF_STRING, i + 1, replyList[i]); } - int index = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, NULL); + int index = TrackPopupMenu(hMenu, TPM_RETURNCMD, cbcd->pt.x, cbcd->pt.y, 0, cbcd->hwndFrom, nullptr); if (index > 0) { if (mir_wstrcmp(replyList[index - 1], L"")) { CallService(MS_MSG_SENDMESSAGEW, cbcd->hContact, (LPARAM)replyList[index - 1]); diff --git a/plugins/QuickReplies/src/options.cpp b/plugins/QuickReplies/src/options.cpp index 157e6a3e85..29477c53a7 100644 --- a/plugins/QuickReplies/src/options.cpp +++ b/plugins/QuickReplies/src/options.cpp @@ -91,7 +91,7 @@ INT_PTR CALLBACK DlgProcOptionsPage(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR if (HIWORD(wParam) == BN_CLICKED) { switch (LOWORD(wParam)) { case IDC_VARIABLES: - variables_showhelp(hwndDlg, IDC_REPLIES, VHF_SIMPLEDLG, NULL, NULL); + variables_showhelp(hwndDlg, IDC_REPLIES, VHF_SIMPLEDLG, nullptr, nullptr); break; case IDC_IMMEDIATELY: diff --git a/plugins/QuickReplies/src/quickreplies.cpp b/plugins/QuickReplies/src/quickreplies.cpp index 69707049fa..cf424fa336 100644 --- a/plugins/QuickReplies/src/quickreplies.cpp +++ b/plugins/QuickReplies/src/quickreplies.cpp @@ -19,7 +19,7 @@ Boston, MA 02111-1307, USA. #include "stdafx.h" -HINSTANCE hInstance = NULL; +HINSTANCE hInstance = nullptr; int hLangpack; PLUGININFOEX pluginInfoEx = { -- cgit v1.2.3