summaryrefslogtreecommitdiff
path: root/protocols/JabberG/src/jabber_icolib.cpp
diff options
context:
space:
mode:
authorGoraf <22941576+Goraf@users.noreply.github.com>2017-11-13 15:03:31 +0100
committerGoraf <22941576+Goraf@users.noreply.github.com>2017-11-13 15:07:33 +0100
commita7c24ca48995cf2bf436156302f96b91bf135409 (patch)
tree953835509ff1b778833e78fd7b74b05e05e77c84 /protocols/JabberG/src/jabber_icolib.cpp
parent591ec17b1c99db7f120c22ca9fb20ae05fe78325 (diff)
Code modernize ...
* replace 0/NULL with nullptr [using clang-tidy]
Diffstat (limited to 'protocols/JabberG/src/jabber_icolib.cpp')
-rw-r--r--protocols/JabberG/src/jabber_icolib.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp
index 98957ca5eb..e008da1f0c 100644
--- a/protocols/JabberG/src/jabber_icolib.cpp
+++ b/protocols/JabberG/src/jabber_icolib.cpp
@@ -119,7 +119,7 @@ void CIconPool::RegisterIcon(const char *name, wchar_t *filename, int iconid, wc
item->m_name = mir_strdup(name);
item->m_szIcolibName = mir_strdup(szSettingName);
- SKINICONDESC sid = { 0 };
+ SKINICONDESC sid = {};
sid.defaultFile.w = filename;
sid.pszName = szSettingName;
sid.section.w = szSection;
@@ -201,7 +201,7 @@ static inline wchar_t qtoupper(wchar_t c)
static BOOL WildComparei(const wchar_t *name, const wchar_t *mask)
{
- const wchar_t *last = '\0';
+ const wchar_t *last = nullptr;
for (;; mask++, name++) {
if (*mask != '?' && qtoupper(*mask) != qtoupper(*name))
break;
@@ -285,8 +285,8 @@ static HICON LoadTransportIcon(char *filename, int i, char *IconName, wchar_t *S
if (hi) has_proto_icon = TRUE;
if (hi && nf) DestroyIcon(hi);
if (IconName != nullptr && SectName != nullptr) {
- SKINICONDESC sid = { 0 };
- sid.hDefaultIcon = (has_proto_icon) ? nullptr : Skin_LoadProtoIcon(0, -internalidx);
+ SKINICONDESC sid = {};
+ sid.hDefaultIcon = (has_proto_icon) ? nullptr : Skin_LoadProtoIcon(nullptr, -internalidx);
sid.section.w = SectName;
sid.pszName = IconName;
sid.description.w = Description;