diff options
| author | Goraf <22941576+Goraf@users.noreply.github.com> | 2017-11-13 15:03:31 +0100 |
|---|---|---|
| committer | Goraf <22941576+Goraf@users.noreply.github.com> | 2017-11-13 15:07:33 +0100 |
| commit | a7c24ca48995cf2bf436156302f96b91bf135409 (patch) | |
| tree | 953835509ff1b778833e78fd7b74b05e05e77c84 /plugins/SecureIM/src/loadicons.cpp | |
| parent | 591ec17b1c99db7f120c22ca9fb20ae05fe78325 (diff) | |
Code modernize ...
* replace 0/NULL with nullptr [using clang-tidy]
Diffstat (limited to 'plugins/SecureIM/src/loadicons.cpp')
| -rw-r--r-- | plugins/SecureIM/src/loadicons.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp index ceb5a545cd..756a235b4c 100644 --- a/plugins/SecureIM/src/loadicons.cpp +++ b/plugins/SecureIM/src/loadicons.cpp @@ -45,11 +45,11 @@ static icons[] = HINSTANCE LoadIconsPack(const char* szIconsPack)
{
HINSTANCE hNewIconInst = LoadLibrary(szIconsPack);
- if (hNewIconInst != NULL) {
+ if (hNewIconInst != nullptr) {
for (int i = ID_FIRSTICON; i <= ID_LASTICON; i++)
- if (LoadIcon(hNewIconInst, MAKEINTRESOURCE(i)) == NULL) {
+ if (LoadIcon(hNewIconInst, MAKEINTRESOURCE(i)) == nullptr) {
FreeLibrary(hNewIconInst);
- hNewIconInst = NULL;
+ hNewIconInst = nullptr;
break;
}
}
@@ -73,22 +73,22 @@ int ReloadIcons(WPARAM wParam, LPARAM lParam) void InitIcons(void)
{
- HINSTANCE hNewIconInst = NULL;
+ HINSTANCE hNewIconInst = nullptr;
if (g_hFolders) {
char pathname[MAX_PATH];
FoldersGetCustomPath(g_hFolders, pathname, MAX_PATH, "icons\\");
- if (hNewIconInst == NULL)
+ if (hNewIconInst == nullptr)
hNewIconInst = LoadIconsPack(pathname);
}
- if (hNewIconInst == NULL)
+ if (hNewIconInst == nullptr)
hNewIconInst = LoadIconsPack("icons\\secureim_icons.dll");
- if (hNewIconInst == NULL)
+ if (hNewIconInst == nullptr)
hNewIconInst = LoadIconsPack("plugins\\secureim_icons.dll");
- if (hNewIconInst == NULL)
+ if (hNewIconInst == nullptr)
g_hIconInst = g_hInst;
else
g_hIconInst = hNewIconInst;
@@ -96,7 +96,7 @@ void InitIcons(void) char tszPath[MAX_PATH];
GetModuleFileName(g_hIconInst, tszPath, _countof(tszPath));
- SKINICONDESC sid = { 0 };
+ SKINICONDESC sid = {};
sid.section.a = "SecureIM";
sid.defaultFile.a = tszPath;
|