Code modernize ...

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

1 files changed, 56 insertions, 56 deletions

diff --git a/plugins/TipperYM/src/preset_items.cpp b/plugins/TipperYM/src/preset_items.cpp
index e29ca11708..459d5d8465 100644
--- a/plugins/TipperYM/src/preset_items.cpp
+++ b/plugins/TipperYM/src/preset_items.cpp
@@ -22,65 +22,65 @@ Boston, MA 02111-1307, USA.
 

 PRESETITEM presetItems[] = 

 {

-	"account", LPGENW("Account"), LPGENW("Account:"), L"%sys:account%", 0, 0, 0,

+	"account", LPGENW("Account"), LPGENW("Account:"), L"%sys:account%", nullptr, nullptr, nullptr,

 	"birth", LPGENW("Birthday"), LPGENW("Birthday:"), L"%birthday_date% (%birthday_age%) @ Next: %birthday_next%", "birthdate", "birthage", "birthnext",

-	"client", LPGENW("Client"), LPGENW("Client:"), L"%raw:/MirVer%", 0, 0, 0,

-	"email", LPGENW("Email"), LPGENW("Email:"), L"%raw:/e-mail%", 0, 0, 0,

-	"gender", LPGENW("Gender"), LPGENW("Gender:"), L"%gender%", 0, 0, 0,

-	"homepage", LPGENW("Homepage"), LPGENW("Homepage:"), L"%raw:/Homepage%", 0, 0, 0,

-	"id", LPGENW("Identifier"), L"%sys:uidname|UID^!MetaContacts%:", L"%sys:uid%", 0, 0, 0,

-	"idle", LPGENW("Idle"), LPGENW("Idle:"), L"%idle% (%idle_diff% ago)", "idle", "idlediff", 0,

-	"ip", L"IP", L"IP:", L"%ip%", "ip", 0, 0,

-	"ipint", LPGENW("IP internal"), LPGENW("IP internal:"), L"%ip_internal%", "ipint", 0, 0,

-	"lastmsg", LPGENW("Last message"), LPGENW("Last message: (%sys:last_msg_reltime% ago)"), L"%sys:last_msg%", 0, 0, 0,

-	"listening", LPGENW("Listening to"), LPGENW("Listening to:"), L"%raw:/ListeningTo%", 0, 0, 0,

-	"name", LPGENW("Name"), LPGENW("Name:"), L"%raw:/FirstName|% %raw:/LastName%", 0, 0, 0,

-	"received", LPGENW("Number of received messages"), LPGENW("Number of msg [IN]:"), L"%sys:msg_count_in%", 0, 0, 0,

-	"sended", LPGENW("Number of sent messages"), LPGENW("Number of msg [OUT]:"), L"%sys:msg_count_out%", 0, 0, 0,

-	"status", LPGENW("Status"), LPGENW("Status:"), L"%Status%", "status", 0, 0,

-	"statusmsg", LPGENW("Status message"), LPGENW("Status message:"), L"%sys:status_msg%", 0, 0, 0,

-	"time", LPGENW("Contact time"), LPGENW("Time:"), L"%sys:time%", 0, 0, 0,

-	"xtitle", LPGENW("xStatus title"), LPGENW("xStatus title:"), L"%xsname%", "xname", 0, 0,

-	"xtext", LPGENW("xStatus text"), LPGENW("xStatus text:"), L"%raw:/XStatusMsg%", 0, 0, 0,

-	"acttitle", LPGENW("[jabber.dll] Activity title"), LPGENW("Activity title:"), L"%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%", 0, 0, 0,

-	"acttext", LPGENW("[jabber.dll] Activity text"), LPGENW("Activity text:"), L"%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%", 0, 0, 0,

-	"lastseentime", LPGENW("[seenplugin.dll] Last seen time"), LPGENW("Last seen time:"), L"%lastseen_date% @ %lastseen_time%", "lsdate", "lstime", 0,

-	"lastseenstatus", LPGENW("[seenplugin.dll] Last seen status"), LPGENW("Last seen status:"), L"%lastseen_status% (%lastseen_ago% ago)", "lsstatus", "lsago", 0,

-	"cond", LPGENW("[weather.dll] Condition"), LPGENW("Condition:"), L"%raw:Current/Condition%", 0, 0, 0,

-	"humidity", LPGENW("[weather.dll] Humidity"), LPGENW("Humidity:"), L"%raw:Current/Humidity%", 0, 0, 0,

-	"minmaxtemp", LPGENW("[weather.dll] Max/Min temperature"), LPGENW("Max/Min:"), L"%raw:Current/High%/%raw:Current/Low%", 0, 0, 0,

-	"moon", LPGENW("[weather.dll] Moon"), LPGENW("Moon:"), L"%raw:Current/Moon%", 0, 0, 0,

-	"pressure", LPGENW("[weather.dll] Pressure"), LPGENW("Pressure:"), L"%raw:Current/Pressure% (%raw:Current/Pressure Tendency%)", 0, 0, 0,

-	"sunrise", LPGENW("[weather.dll] Sunrise"), LPGENW("Sunrise:"), L"%raw:Current/Sunrise%", 0, 0, 0,

-	"sunset", LPGENW("[weather.dll] Sunset"), LPGENW("Sunset:"), L"%raw:Current/Sunset%", 0, 0, 0,

-	"temp", LPGENW("[weather.dll] Temperature"), LPGENW("Temperature:"), L"%raw:Current/Temperature%", 0, 0, 0,

-	"uptime", LPGENW("[weather.dll] Update time"), LPGENW("Update time:"), L"%raw:Current/Update%", 0, 0, 0,

-	"uvindex", LPGENW("[weather.dll] UV Index"), LPGENW("UV Index:"), L"%raw:Current/UV% - %raw:Current/UVI%", 0, 0, 0,

-	"vis", LPGENW("[weather.dll] Visibility"), LPGENW("Visibility:"), L"%raw:Current/Visibility%", 0, 0, 0,

-	"wind", LPGENW("[weather.dll] Wind"), LPGENW("Wind:"), L"%raw:Current/Wind Direction% (%raw:Current/Wind Direction DEG%)/%raw:Current/Wind Speed%", 0, 0, 0,

-	0, 0, 0, 0, 0, 0, 0	

+	"client", LPGENW("Client"), LPGENW("Client:"), L"%raw:/MirVer%", nullptr, nullptr, nullptr,

+	"email", LPGENW("Email"), LPGENW("Email:"), L"%raw:/e-mail%", nullptr, nullptr, nullptr,

+	"gender", LPGENW("Gender"), LPGENW("Gender:"), L"%gender%", nullptr, nullptr, nullptr,

+	"homepage", LPGENW("Homepage"), LPGENW("Homepage:"), L"%raw:/Homepage%", nullptr, nullptr, nullptr,

+	"id", LPGENW("Identifier"), L"%sys:uidname|UID^!MetaContacts%:", L"%sys:uid%", nullptr, nullptr, nullptr,

+	"idle", LPGENW("Idle"), LPGENW("Idle:"), L"%idle% (%idle_diff% ago)", "idle", "idlediff", nullptr,

+	"ip", L"IP", L"IP:", L"%ip%", "ip", nullptr, nullptr,

+	"ipint", LPGENW("IP internal"), LPGENW("IP internal:"), L"%ip_internal%", "ipint", nullptr, nullptr,

+	"lastmsg", LPGENW("Last message"), LPGENW("Last message: (%sys:last_msg_reltime% ago)"), L"%sys:last_msg%", nullptr, nullptr, nullptr,

+	"listening", LPGENW("Listening to"), LPGENW("Listening to:"), L"%raw:/ListeningTo%", nullptr, nullptr, nullptr,

+	"name", LPGENW("Name"), LPGENW("Name:"), L"%raw:/FirstName|% %raw:/LastName%", nullptr, nullptr, nullptr,

+	"received", LPGENW("Number of received messages"), LPGENW("Number of msg [IN]:"), L"%sys:msg_count_in%", nullptr, nullptr, nullptr,

+	"sended", LPGENW("Number of sent messages"), LPGENW("Number of msg [OUT]:"), L"%sys:msg_count_out%", nullptr, nullptr, nullptr,

+	"status", LPGENW("Status"), LPGENW("Status:"), L"%Status%", "status", nullptr, nullptr,

+	"statusmsg", LPGENW("Status message"), LPGENW("Status message:"), L"%sys:status_msg%", nullptr, nullptr, nullptr,

+	"time", LPGENW("Contact time"), LPGENW("Time:"), L"%sys:time%", nullptr, nullptr, nullptr,

+	"xtitle", LPGENW("xStatus title"), LPGENW("xStatus title:"), L"%xsname%", "xname", nullptr, nullptr,

+	"xtext", LPGENW("xStatus text"), LPGENW("xStatus text:"), L"%raw:/XStatusMsg%", nullptr, nullptr, nullptr,

+	"acttitle", LPGENW("[jabber.dll] Activity title"), LPGENW("Activity title:"), L"%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/title%", nullptr, nullptr, nullptr,

+	"acttext", LPGENW("[jabber.dll] Activity text"), LPGENW("Activity text:"), L"%raw:AdvStatus/?dbsetting(%subject%,Protocol,p)/activity/text%", nullptr, nullptr, nullptr,

+	"lastseentime", LPGENW("[seenplugin.dll] Last seen time"), LPGENW("Last seen time:"), L"%lastseen_date% @ %lastseen_time%", "lsdate", "lstime", nullptr,

+	"lastseenstatus", LPGENW("[seenplugin.dll] Last seen status"), LPGENW("Last seen status:"), L"%lastseen_status% (%lastseen_ago% ago)", "lsstatus", "lsago", nullptr,

+	"cond", LPGENW("[weather.dll] Condition"), LPGENW("Condition:"), L"%raw:Current/Condition%", nullptr, nullptr, nullptr,

+	"humidity", LPGENW("[weather.dll] Humidity"), LPGENW("Humidity:"), L"%raw:Current/Humidity%", nullptr, nullptr, nullptr,

+	"minmaxtemp", LPGENW("[weather.dll] Max/Min temperature"), LPGENW("Max/Min:"), L"%raw:Current/High%/%raw:Current/Low%", nullptr, nullptr, nullptr,

+	"moon", LPGENW("[weather.dll] Moon"), LPGENW("Moon:"), L"%raw:Current/Moon%", nullptr, nullptr, nullptr,

+	"pressure", LPGENW("[weather.dll] Pressure"), LPGENW("Pressure:"), L"%raw:Current/Pressure% (%raw:Current/Pressure Tendency%)", nullptr, nullptr, nullptr,

+	"sunrise", LPGENW("[weather.dll] Sunrise"), LPGENW("Sunrise:"), L"%raw:Current/Sunrise%", nullptr, nullptr, nullptr,

+	"sunset", LPGENW("[weather.dll] Sunset"), LPGENW("Sunset:"), L"%raw:Current/Sunset%", nullptr, nullptr, nullptr,

+	"temp", LPGENW("[weather.dll] Temperature"), LPGENW("Temperature:"), L"%raw:Current/Temperature%", nullptr, nullptr, nullptr,

+	"uptime", LPGENW("[weather.dll] Update time"), LPGENW("Update time:"), L"%raw:Current/Update%", nullptr, nullptr, nullptr,

+	"uvindex", LPGENW("[weather.dll] UV Index"), LPGENW("UV Index:"), L"%raw:Current/UV% - %raw:Current/UVI%", nullptr, nullptr, nullptr,

+	"vis", LPGENW("[weather.dll] Visibility"), LPGENW("Visibility:"), L"%raw:Current/Visibility%", nullptr, nullptr, nullptr,

+	"wind", LPGENW("[weather.dll] Wind"), LPGENW("Wind:"), L"%raw:Current/Wind Direction% (%raw:Current/Wind Direction DEG%)/%raw:Current/Wind Speed%", nullptr, nullptr, nullptr,

+	nullptr, nullptr, nullptr, nullptr, nullptr, nullptr, nullptr	

 };

 

 PRESETSUBST presetSubsts[] = 

 {

-	"gender", L"gender", DVT_PROTODB, NULL, "Gender", 5,

-	"status", L"Status", DVT_PROTODB, NULL, "Status", 1,

-	"ip", L"ip", DVT_PROTODB, NULL, "IP", 7,

-	"ipint", L"ip_internal", DVT_PROTODB, NULL, "RealIP", 7,

-	"idle", L"idle", DVT_PROTODB, NULL, "IdleTS", 2,

-	"idlediff", L"idle_diff", DVT_PROTODB, NULL, "IdleTS", 3,

-	"xname", L"xsname", DVT_PROTODB, NULL, "XStatusName", 17,

-	"lsdate", L"lastseen_date", DVT_DB, "SeenModule", NULL, 8,

-	"lstime", L"lastseen_time", DVT_DB, "SeenModule", NULL, 10,

+	"gender", L"gender", DVT_PROTODB, nullptr, "Gender", 5,

+	"status", L"Status", DVT_PROTODB, nullptr, "Status", 1,

+	"ip", L"ip", DVT_PROTODB, nullptr, "IP", 7,

+	"ipint", L"ip_internal", DVT_PROTODB, nullptr, "RealIP", 7,

+	"idle", L"idle", DVT_PROTODB, nullptr, "IdleTS", 2,

+	"idlediff", L"idle_diff", DVT_PROTODB, nullptr, "IdleTS", 3,

+	"xname", L"xsname", DVT_PROTODB, nullptr, "XStatusName", 17,

+	"lsdate", L"lastseen_date", DVT_DB, "SeenModule", nullptr, 8,

+	"lstime", L"lastseen_time", DVT_DB, "SeenModule", nullptr, 10,

 	"lsstatus", L"lastseen_status", DVT_DB, "SeenModule", "OldStatus", 1,

 	"lsago", L"lastseen_ago", DVT_DB, "SeenModule", "seenTS", 3,

-	"birthdate", L"birthday_date", DVT_PROTODB, NULL, "Birth", 8,

-	"birthage", L"birthday_age", DVT_PROTODB, NULL, "Birth", 9,

-	"birthnext", L"birthday_next", DVT_PROTODB, NULL, "Birth", 12,

-	"logondate", L"logon_date", DVT_PROTODB, NULL, "LogonTS", 15, 

-	"logontime", L"logon_time", DVT_PROTODB, NULL, "LogonTS", 13,

-	"logonago", L"logon_ago", DVT_PROTODB, NULL, "LogonTS", 3,

-	0, 0, DVT_DB, 0, 0, 0

+	"birthdate", L"birthday_date", DVT_PROTODB, nullptr, "Birth", 8,

+	"birthage", L"birthday_age", DVT_PROTODB, nullptr, "Birth", 9,

+	"birthnext", L"birthday_next", DVT_PROTODB, nullptr, "Birth", 12,

+	"logondate", L"logon_date", DVT_PROTODB, nullptr, "LogonTS", 15, 

+	"logontime", L"logon_time", DVT_PROTODB, nullptr, "LogonTS", 13,

+	"logonago", L"logon_ago", DVT_PROTODB, nullptr, "LogonTS", 3,

+	nullptr, nullptr, DVT_DB, nullptr, nullptr, 0

 };

 

 DEFAULTITEM defaultItemList[] = 

@@ -98,7 +98,7 @@ DEFAULTITEM defaultItemList[] =
 	"time",			false,

 	"id",			false,

 	"status",		false,

-	0,0

+	nullptr,0

 };

 

 PRESETITEM *GetPresetItemByName(char *szName)

@@ -109,18 +109,18 @@ PRESETITEM *GetPresetItemByName(char *szName)
 			return &presetItems[i];

 	}

 

-	return NULL;

+	return nullptr;

 }

 

 PRESETSUBST *GetPresetSubstByName(char *szName)

 {

-	if (!szName) return NULL;

+	if (!szName) return nullptr;

 	for (int i = 0; presetSubsts[i].szID; i++)

 	{

 		if (mir_strcmp(presetSubsts[i].szID, szName) == 0)

 			return &presetSubsts[i];

 	}

 

-	return NULL;

+	return nullptr;

 }