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/GmailNotifier/src/notify.cpp | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
(limited to 'plugins/GmailNotifier/src/notify.cpp')
diff --git a/plugins/GmailNotifier/src/notify.cpp b/plugins/GmailNotifier/src/notify.cpp
index 7e90749477..e49421dc5d 100644
--- a/plugins/GmailNotifier/src/notify.cpp
+++ b/plugins/GmailNotifier/src/notify.cpp
@@ -14,7 +14,7 @@ int OpenBrowser(WPARAM hContact, LPARAM)
db_set_w(curAcc->hContact, MODULE_NAME, "Status", ID_STATUS_NONEW);
curAcc->oldResults_num = 0;
DeleteResults(curAcc->results.next);
- curAcc->results.next = NULL;
+ curAcc->results.next = nullptr;
}
mir_forkthread(Login_ThreadFunc, curAcc);
}
@@ -44,7 +44,7 @@ static LRESULT CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPA
case WM_CONTEXTMENU:
PUDeletePopup(hWnd);
- curAcc->popUpHwnd = NULL;
+ curAcc->popUpHwnd = nullptr;
pcli->pfnRemoveEvent(hContact, 1);
}
return DefWindowProc(hWnd, message, wParam, lParam);
@@ -76,7 +76,7 @@ void NotifyUser(Account *curAcc)
dbei.eventType = EVENTTYPE_MESSAGE;
dbei.flags = DBEF_READ;
dbei.szModule = MODULE_NAME;
- dbei.timestamp = time(NULL);
+ dbei.timestamp = time(nullptr);
resultLink *prst = curAcc->results.next;
for (int i = 0; i < newMails; i++) {
@@ -114,7 +114,7 @@ void NotifyUser(Account *curAcc)
ppd.colorBack = opt.popupBgColor;
ppd.colorText = opt.popupTxtColor;
ppd.PluginWindowProc = PopupDlgProc;
- ppd.PluginData = NULL;
+ ppd.PluginData = nullptr;
ppd.iSeconds = opt.popupDuration;
PUDeletePopup(curAcc->popUpHwnd);
PUAddPopup(&ppd);
@@ -124,13 +124,13 @@ void NotifyUser(Account *curAcc)
}
curAcc->oldResults_num = curAcc->results_num;
DeleteResults(curAcc->results.next);
- curAcc->results.next = NULL;
+ curAcc->results.next = nullptr;
}
void DeleteResults(resultLink *prst)
{
- if (prst != NULL) {
- if (prst->next != NULL)
+ if (prst != nullptr) {
+ if (prst->next != nullptr)
DeleteResults(prst->next);
free(prst);
}
@@ -138,7 +138,7 @@ void DeleteResults(resultLink *prst)
void __cdecl Login_ThreadFunc(void *lpParam)
{
- if (lpParam == NULL)
+ if (lpParam == nullptr)
return;
HANDLE hTempFile;
@@ -165,7 +165,7 @@ void __cdecl Login_ThreadFunc(void *lpParam)
GetTempPathA(dwBufSize, buffer);
GetTempFileNameA(buffer, "gmail", 0, szTempName);
- hTempFile = CreateFileA(szTempName, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
+ hTempFile = CreateFileA(szTempName, GENERIC_WRITE, 0, nullptr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
mir_strcpy(buffer, FORMDATA1);
mir_strcat(buffer, curAcc->hosted);
mir_strcat(buffer, FORMDATA2);
@@ -173,12 +173,12 @@ void __cdecl Login_ThreadFunc(void *lpParam)
mir_strcat(buffer, FORMDATA3);
mir_strcat(buffer, "