From 70feb08f8495eabbb44c3fae3064aaa5c836638e Mon Sep 17 00:00:00 2001 From: Paul Betts Date: Fri, 24 Jul 2015 03:30:23 -0700 Subject: [PATCH] Fix linting issues --- atom/browser/ui/win/notify_icon.cc | 7 +++++-- atom/browser/ui/win/notify_icon.h | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/atom/browser/ui/win/notify_icon.cc b/atom/browser/ui/win/notify_icon.cc index e9b153b49ab6..787982d04dbf 100644 --- a/atom/browser/ui/win/notify_icon.cc +++ b/atom/browser/ui/win/notify_icon.cc @@ -40,7 +40,7 @@ NotifyIcon::NotifyIcon(NotifyIconHost* host, base::MD5Sum(explicit_app_id, sizeof(wchar_t) * wcslen(explicit_app_id), (base::MD5Digest*)&tray_app_id_hash_); - + CoTaskMemFree(explicit_app_id); } @@ -179,7 +179,10 @@ void NotifyIcon::InitIconData(NOTIFYICONDATA* icon_data) { icon_data->cbSize = sizeof(NOTIFYICONDATA); icon_data->hWnd = window_; icon_data->uID = icon_id_; - memcpy((void*)&icon_data->guidItem, &tray_app_id_hash_, sizeof(GUID)); + + memcpy(reinterpret_cast(&icon_data->guidItem), + &tray_app_id_hash_, + sizeof(GUID)); } } // namespace atom diff --git a/atom/browser/ui/win/notify_icon.h b/atom/browser/ui/win/notify_icon.h index 56b4b4f09be8..a52388d56298 100644 --- a/atom/browser/ui/win/notify_icon.h +++ b/atom/browser/ui/win/notify_icon.h @@ -75,7 +75,7 @@ class NotifyIcon : public TrayIcon { // The context menu. ui::SimpleMenuModel* menu_model_; - + // A hash of the app model ID GUID tray_app_id_hash_;