Code modernize ...

* replace 0/NULL with nullptr [using clang-tidy]

3 files changed, 26 insertions, 26 deletions

diff --git a/plugins/XSoundNotify/src/dialog.cpp b/plugins/XSoundNotify/src/dialog.cpp
index 7c8a3e794c..8c1dafa8de 100644
--- a/plugins/XSoundNotify/src/dialog.cpp
+++ b/plugins/XSoundNotify/src/dialog.cpp
@@ -25,7 +25,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			char* szProto = GetContactProto(hContact);

 			PROTOACCOUNT *pa = Proto_GetAccount(szProto);

 			char* szUniqueId = (char*)CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

-			if ((INT_PTR)szUniqueId != CALLSERVICE_NOTFOUND && szUniqueId != NULL) {

+			if ((INT_PTR)szUniqueId != CALLSERVICE_NOTFOUND && szUniqueId != nullptr) {

 				DBVARIANT dbvuid = { 0 };

 				if (!db_get(hContact, pa->szModuleName, szUniqueId, &dbvuid)) {

 					wchar_t uid[MAX_PATH];

@@ -66,7 +66,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			EnableWindow(GetDlgItem(hwndDlg, IDC_CONT_IGNORE_SOUND), TRUE);

 			CheckDlgButton(hwndDlg, IDC_CONT_IGNORE_SOUND, db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0) ? BST_CHECKED : BST_UNCHECKED);

 			p = XSN_Users.find((XSN_Data *)&hContact);

-			if (p == NULL) {

+			if (p == nullptr) {

 				ptrW name(db_get_wsa(hContact, SETTINGSNAME, SETTINGSKEY));

 				if (name != NULL)

 					XSN_Users.insert(new XSN_Data(hContact, name, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0, 1));

@@ -78,7 +78,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 		switch (LOWORD(wParam)) {

 		case IDOK:

 			p = XSN_Users.find((XSN_Data *)&hContact);

-			if (p != NULL) {

+			if (p != nullptr) {

 				if (mir_wstrcmpi(p->path, L"")) {

 					wchar_t shortpath[MAX_PATH];

 					PathToRelativeW(p->path, shortpath);

@@ -104,7 +104,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				else

 					mir_snwprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0);

 				ofn.lpstrFilter = tmp;

-				ofn.hwndOwner = 0;

+				ofn.hwndOwner = nullptr;

 				ofn.lpstrFile = FileName;

 				ofn.nMaxFile = MAX_PATH;

 				ofn.nMaxFileTitle = MAX_PATH;

@@ -116,7 +116,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 				if (GetOpenFileName(&ofn)) {

 					SetDlgItemText(hwndDlg, IDC_CONT_LABEL_SOUND, PathFindFileName(FileName));

 					p = XSN_Users.find((XSN_Data *)&hContact);

-					if (p == NULL)

+					if (p == nullptr)

 						XSN_Users.insert(new XSN_Data(hContact, FileName, IsDlgButtonChecked(hwndDlg, IDC_CONT_IGNORE_SOUND) ? 1 : 0, 1));

 					else {

 						wcsncpy(p->path, FileName, _countof(p->path));

@@ -132,7 +132,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 		case IDC_CONT_BUTTON_TEST_PLAY:

 			p = XSN_Users.find((XSN_Data *)&hContact);

 			isIgnoreSound = 0;

-			if (p == NULL) {

+			if (p == nullptr) {

 				DBVARIANT dbv;

 				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH] = { 0 };

@@ -155,7 +155,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 			SetDlgItemText(hwndDlg, IDC_CONT_LABEL_SOUND, TranslateT("Not set"));

 

 			p = XSN_Users.find((XSN_Data *)&hContact);

-			if (p != NULL) {

+			if (p != nullptr) {

 				XSN_Users.remove(p);

 				delete p;

 			}

@@ -165,7 +165,7 @@ static INT_PTR CALLBACK DlgProcContactsOptions(HWND hwndDlg, UINT msg, WPARAM wP
 

 		case IDC_CONT_IGNORE_SOUND:

 			p = XSN_Users.find((XSN_Data *)&hContact);

-			if (p == NULL) {

+			if (p == nullptr) {

 				DBVARIANT dbv;

 				if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 					wchar_t longpath[MAX_PATH];

@@ -194,7 +194,7 @@ INT_PTR ShowDialog(WPARAM wParam, LPARAM)
 {

 	HWND hChangeSoundDlg = WindowList_Find(hChangeSoundDlgList, wParam);

 	if (!hChangeSoundDlg) {

-		hChangeSoundDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONTACTS), 0, DlgProcContactsOptions, (LPARAM)wParam);

+		hChangeSoundDlg = CreateDialogParam(hInst, MAKEINTRESOURCE(IDD_CONTACTS), nullptr, DlgProcContactsOptions, (LPARAM)wParam);

 		ShowWindow(hChangeSoundDlg, SW_SHOW);

 	}

 	else {

diff --git a/plugins/XSoundNotify/src/options.cpp b/plugins/XSoundNotify/src/options.cpp
index fd5bc06ca8..035772e93d 100644
--- a/plugins/XSoundNotify/src/options.cpp
+++ b/plugins/XSoundNotify/src/options.cpp
@@ -11,7 +11,7 @@ There is no warranty.
 

 bool IsSuitableProto(PROTOACCOUNT *pa)

 {

-	if (pa == NULL)

+	if (pa == nullptr)

 		return false;

 

 	if (pa->bDynDisabled || !pa->bIsEnabled)

@@ -52,12 +52,12 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 

 				SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_SETITEMDATA, SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_ADDSTRING, 0, (LPARAM)TranslateT("All contacts")), cursel);

 				for (MCONTACT hContact = db_find_first(); hContact; hContact = db_find_next(hContact)) {

-					char *szUniqueId = NULL;

+					char *szUniqueId = nullptr;

 					if (db_get_b(hContact, pa->szModuleName, "ChatRoom", 0))

 						szUniqueId = "ChatRoomID";

 					else

 						szUniqueId = (char*)CallProtoService(pa->szModuleName, PS_GETCAPS, PFLAG_UNIQUEIDSETTING, 0);

-					if ((INT_PTR)szUniqueId != CALLSERVICE_NOTFOUND && szUniqueId != NULL) {

+					if ((INT_PTR)szUniqueId != CALLSERVICE_NOTFOUND && szUniqueId != nullptr) {

 						DBVARIANT dbvuid = { 0 };

 						if (!db_get(hContact, pa->szModuleName, szUniqueId, &dbvuid)) {

 							wchar_t uid[MAX_PATH];

@@ -148,7 +148,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			else

 				mir_snwprintf(tmp, L"%s (*.wav)%c*.wav%c%c", TranslateT("WAV files"), 0, 0, 0);

 			ofn.lpstrFilter = tmp;

-			ofn.hwndOwner = 0;

+			ofn.hwndOwner = nullptr;

 			ofn.lpstrFile = FileName;

 			ofn.nMaxFile = MAX_PATH;

 			ofn.nMaxFileTitle = MAX_PATH;

@@ -163,7 +163,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				if (!cursel) {

 					PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_PROTO, CB_GETITEMDATA, cursel, 0);

 					XSN_Data *p = XSN_Users.find((XSN_Data *)&pa->szModuleName);

-					if (p == NULL)

+					if (p == nullptr)

 						XSN_Users.insert(new XSN_Data((LPARAM)pa->szModuleName, FileName, IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0, 0));

 					else

 					{

@@ -177,7 +177,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				else {

 					MCONTACT hContact = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_GETITEMDATA, cursel, 0);

 					XSN_Data *p = XSN_Users.find((XSN_Data *)&hContact);

-					if (p == NULL)

+					if (p == nullptr)

 						XSN_Users.insert(new XSN_Data(hContact, FileName, IsDlgButtonChecked(hwndDlg, IDC_OPT_IGNORE_SOUND) ? 1 : 0, 1));

 					else

 					{

@@ -200,7 +200,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_PROTO, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&pa->szModuleName);

 				isIgnoreSound = 0;

-				if (p == NULL) {

+				if (p == nullptr) {

 					DBVARIANT dbv;

 					if (!db_get_ws(NULL, SETTINGSNAME, pa->szModuleName, &dbv)) {

 						wchar_t longpath[MAX_PATH];

@@ -219,7 +219,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 				MCONTACT hContact = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&hContact);

 				isIgnoreSound = 0;

-				if (p == NULL) {

+				if (p == nullptr) {

 					DBVARIANT dbv;

 					if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 						wchar_t longpath[MAX_PATH];

@@ -247,7 +247,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			if (!cursel) {

 				PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_PROTO, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&pa->szModuleName);

-				if (p != NULL) {

+				if (p != nullptr) {

 					XSN_Users.remove(p);

 					delete p;

 					SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -262,7 +262,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			else {

 				MCONTACT hContact = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&hContact);

-				if (p != NULL) {

+				if (p != nullptr) {

 					XSN_Users.remove(p);

 					delete p;

 					SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0);

@@ -279,7 +279,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			if (!cursel) {

 				PROTOACCOUNT *pa = (PROTOACCOUNT *)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_PROTO, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&pa->szModuleName);

-				if (p == NULL) {

+				if (p == nullptr) {

 					DBVARIANT dbv;

 					if (!db_get_ws(NULL, SETTINGSNAME, pa->szModuleName, &dbv)) {

 						wchar_t longpath[MAX_PATH];

@@ -295,7 +295,7 @@ static INT_PTR CALLBACK OptsProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l
 			else {

 				MCONTACT hContact = (MCONTACT)SendDlgItemMessage(hwndDlg, IDC_OPT_COMBO_USERS, CB_GETITEMDATA, cursel, 0);

 				XSN_Data *p = XSN_Users.find((XSN_Data *)&hContact);

-				if (p == NULL) {

+				if (p == nullptr) {

 					DBVARIANT dbv;

 					if (!db_get_ws(hContact, SETTINGSNAME, SETTINGSKEY, &dbv)) {

 						wchar_t longpath[MAX_PATH];

diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp
index a42bf083c3..79e0d814ab 100644
--- a/plugins/XSoundNotify/src/xsn_main.cpp
+++ b/plugins/XSoundNotify/src/xsn_main.cpp
@@ -12,8 +12,8 @@ There is no warranty.
 HINSTANCE hInst;

 int hLangpack;

 LIST<XSN_Data> XSN_Users(10, NumericKeySortT);

-HGENMENU hChangeSound = NULL;

-MWindowList hChangeSoundDlgList = NULL;

+HGENMENU hChangeSound = nullptr;

+MWindowList hChangeSoundDlgList = nullptr;

 BYTE isIgnoreSound = 0, isOwnSound = 0, isIgnoreAccSound = 0, isAccSound = 0;

 

 CLIST_INTERFACE *pcli;

@@ -68,7 +68,7 @@ void InitSelfSounds()
 {

 	// initializing self sounds for protocols

 	int protoCount = 0;

-	PROTOACCOUNT** protos = 0;

+	PROTOACCOUNT** protos = nullptr;

 

 	Proto_EnumAccounts(&protoCount, &protos);

 	for (int i = 0; i < protoCount; i++) {

@@ -86,7 +86,7 @@ void InitSelfSounds()
 static int ProtoAck(WPARAM, LPARAM lParam)

 {

 	ACKDATA *ack = (ACKDATA*)lParam;

-	if (ack != 0 && ack->szModule && ack->type == ACKTYPE_STATUS && ack->result == ACKRESULT_SUCCESS) {

+	if (ack != nullptr && ack->szModule && ack->type == ACKTYPE_STATUS && ack->result == ACKRESULT_SUCCESS) {

 		for (int i = 0; i < _countof(selfSounds); i++) {

 			if (selfSounds[i].iStatus == ack->lParam) {

 				char buf[128];

@@ -157,7 +157,7 @@ static int ProcessChatEvent(WPARAM, LPARAM lParam)
 	MCONTACT hContact = pci->FindRoom(gce->pszModule, gce->ptszID);

 	if (hContact != 0) {

 		ptrW nick(db_get_wsa(hContact, gce->pszModule, "MyNick"));

-		if (nick == NULL || gce->ptszText == NULL)

+		if (nick == NULL || gce->ptszText == nullptr)

 			return 0;

 		if (wcsstr(gce->ptszText, nick)) {

 			isIgnoreSound = db_get_b(hContact, SETTINGSNAME, SETTINGSIGNOREKEY, 0);