github/electron
1
1
Fork 0
mirror of https://github.com/electron/electron.git synced 2026-05-02 03:00:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

chore: clean up clang-tidy warnings (#50918)

Browse Source 
* chore: use emplace and use it correctly

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: redundant cast to the same type [google-readability-casting]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: do not create objects with +new [google-objc-avoid-nsobject-new]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: default arguments on virtual or override methods are prohibited [google-default-arguments]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: warning: C-style casts are discouraged; use static_cast [google-readability-casting]

CFLocaleGetValue already returns CFTypeRef so that redundant static_cast was removed

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: refactor block to avoid use after move warning from clang-tidy

Looks like clang-tidy couldn't tell these were two mutually exclusive
branches so there was no actual issue, but refactoring is cleaner
anyway since it makes it more DRY.

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: C-style casts are discouraged; use static_cast [google-readability-casting]

No cast needed here, everything is already the correct type

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: C-style casts are discouraged; use static_cast/const_cast/reinterpret_cast [google-readability-casting]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: use '= default' to define a trivial destructor [modernize-use-equals-default]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: use range-based for loop instead [modernize-loop-convert]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: redundant void argument list [modernize-redundant-void-arg]

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: address code review feedback

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* chore: use auto

Co-authored-by: Charles Kerr <charles@charleskerr.com>

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
This commit is contained in:
trop[bot]
2026-04-10 18:21:39 -07:00
committed by GitHub
parent 4affacb4e1
commit 9ecc0670fe
14 changed files with 32 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
shell/browser/api/electron_api_app.cc
View File

@@ -989,17 +989,15 @@ std::string App::GetLocaleCountryCode() {
WCHAR locale_name[LOCALE_NAME_MAX_LENGTH] = {0};
if (GetLocaleInfoEx(LOCALE_NAME_USER_DEFAULT, LOCALE_SISO3166CTRYNAME,
(LPWSTR)&locale_name,
sizeof(locale_name) / sizeof(WCHAR)) ||
locale_name, std::size(locale_name)) ||
GetLocaleInfoEx(LOCALE_NAME_SYSTEM_DEFAULT, LOCALE_SISO3166CTRYNAME,
(LPWSTR)&locale_name,
sizeof(locale_name) / sizeof(WCHAR))) {
locale_name, std::size(locale_name))) {
base::WideToUTF8(locale_name, wcslen(locale_name), &region);
}
#elif BUILDFLAG(IS_MAC)
CFLocaleRef locale = CFLocaleCopyCurrent();
CFStringRef value = CFStringRef(
static_cast<CFTypeRef>(CFLocaleGetValue(locale, kCFLocaleCountryCode)));
auto value =
static_cast<CFStringRef>(CFLocaleGetValue(locale, kCFLocaleCountryCode));
if (value != nil) {
char temporaryCString[3];
const CFIndex kCStringSize = sizeof(temporaryCString);

2
shell/browser/browser_mac.mm
View File

@@ -184,7 +184,7 @@ std::vector<std::string> Browser::GetRecentDocuments() {
std::vector<std::string> documents;
documents.reserve([recentURLs count]);
for (NSURL* url in recentURLs)
documents.push_back(std::string([url.path UTF8String]));
documents.emplace_back([url.path UTF8String]);
return documents;
}

8
shell/browser/browser_process_impl.cc
View File

@@ -455,9 +455,9 @@ void BrowserProcessImpl::CreateOSCryptAsync() {
// The DPAPI key provider requires OSCrypt::Init to have already been called
// to initialize the key storage. This happens in
// BrowserMainPartsWin::PreCreateMainMessageLoop.
providers.emplace_back(std::make_pair(
providers.emplace_back(
/*precedence=*/10u,
std::make_unique<os_crypt_async::DPAPIKeyProvider>(local_state())));
std::make_unique<os_crypt_async::DPAPIKeyProvider>(local_state()));
#endif // BUILDFLAG(IS_WIN)
#if BUILDFLAG(IS_LINUX)
@@ -499,9 +499,9 @@ void BrowserProcessImpl::CreateOSCryptAsync() {
#if BUILDFLAG(IS_MAC)
if (base::FeatureList::IsEnabled(features::kUseKeychainKeyProvider)) {
providers.emplace_back(std::make_pair(
providers.emplace_back(
/*precedence=*/10u,
std::make_unique<os_crypt_async::KeychainKeyProvider>()));
std::make_unique<os_crypt_async::KeychainKeyProvider>());
}
#endif // BUILDFLAG(IS_MAC)

2
shell/browser/mac/electron_application.mm
View File

@@ -208,7 +208,7 @@ inline void dispatch_sync_main(dispatch_block_t block) {
forEventClass:kInternetEventClass
andEventID:kAEGetURL];
handoffLock_ = [NSCondition new];
handoffLock_ = [[NSCondition alloc] init];
}
- (void)handleURLEvent:(NSAppleEventDescriptor*)event

2
shell/browser/native_window.h
View File

@@ -96,7 +96,7 @@ class NativeWindow : public views::WidgetDelegate {
virtual void SetFullScreen(bool fullscreen) = 0;
virtual bool IsFullscreen() const = 0;
virtual void SetBounds(const gfx::Rect& bounds, bool animate = false) = 0;
virtual void SetBounds(const gfx::Rect& bounds, bool animate) = 0;
virtual gfx::Rect GetBounds() const = 0;
void SetShape(const std::vector<gfx::Rect>& rects);
void SetSize(const gfx::Size& size, bool animate = false);

2
shell/browser/native_window_mac.h
View File

@@ -59,7 +59,7 @@ class NativeWindowMac : public NativeWindow,
bool IsMinimized() const override;
void SetFullScreen(bool fullscreen) override;
bool IsFullscreen() const override;
void SetBounds(const gfx::Rect& bounds, bool animate = false) override;
void SetBounds(const gfx::Rect& bounds, bool animate) override;
gfx::Rect GetBounds() const override;
bool IsNormal() const override;
gfx::Rect GetNormalBounds() const override;

8
shell/browser/native_window_views.cc
View File

@@ -1269,7 +1269,7 @@ void NativeWindowViews::SetBackgroundColor(SkColor background_color) {
SetClassLongPtr(GetAcceleratedWidget(), GCLP_HBRBACKGROUND,
reinterpret_cast<LONG_PTR>(brush));
if (previous_brush)
DeleteObject((HBRUSH)previous_brush);
DeleteObject(reinterpret_cast<HBRUSH>(previous_brush));
InvalidateRect(GetAcceleratedWidget(), nullptr, 1);
#endif
SkColor compositor_color = background_color;
@@ -1468,11 +1468,11 @@ void NativeWindowViews::SetParentWindow(NativeWindow* parent) {
// the ::GetWindowLongPtr or ::SetWindowLongPtr functions with "nIndex" set
// to "GWLP_HWNDPARENT" which actually means the window owner.
HWND hwndParent = parent ? parent->GetAcceleratedWidget() : nullptr;
if (hwndParent ==
(HWND)::GetWindowLongPtr(GetAcceleratedWidget(), GWLP_HWNDPARENT))
if (hwndParent == reinterpret_cast<HWND>(::GetWindowLongPtr(
GetAcceleratedWidget(), GWLP_HWNDPARENT)))
return;
::SetWindowLongPtr(GetAcceleratedWidget(), GWLP_HWNDPARENT,
(LONG_PTR)hwndParent);
reinterpret_cast<LONG_PTR>(hwndParent));
// Ensures the visibility
if (IsVisible()) {
WINDOWPLACEMENT wp;

7
shell/browser/ui/cocoa/electron_bundle_mover.mm
View File

@@ -155,10 +155,9 @@ bool AuthorizedInstall(NSString* srcPath, NSString* dstPath, bool* canceled) {
AuthorizationItem myItems = {kAuthorizationRightExecute, 0, nullptr, 0};
AuthorizationRights myRights = {1, &myItems};
AuthorizationFlags myFlags =
(AuthorizationFlags)(kAuthorizationFlagInteractionAllowed |
kAuthorizationFlagExtendRights |
kAuthorizationFlagPreAuthorize);
AuthorizationFlags myFlags = kAuthorizationFlagInteractionAllowed |
kAuthorizationFlagExtendRights |
kAuthorizationFlagPreAuthorize;
err = AuthorizationCopyRights(myAuthorizationRef, &myRights, nullptr, myFlags,
nullptr);

11
shell/browser/ui/cocoa/electron_ns_window.mm
View File

@@ -49,7 +49,7 @@ static StartGridAnimationIMP g_orig_startGridAnimation = nullptr;
static void Patched_startGridAnimation(id self,
SEL _cmd,
id animation,
void (^completionHandler)(void)) {
void (^completionHandler)()) {
if (completionHandler)
completionHandler();
}
@@ -83,8 +83,7 @@ MouseDownImpl g_nsnextstepframe_mousedown;
@implementation SwizzledMethodsClass
- (void)swiz_nsthemeframe_mouseDown:(NSEvent*)event {
if ([self.window respondsToSelector:@selector(shell)]) {
electron::NativeWindowMac* shell =
(electron::NativeWindowMac*)[(id)self.window shell];
electron::NativeWindowMac* shell = [(id)self.window shell];
if (shell && !shell->has_frame())
[self cr_mouseDownOnFrameView:event];
}
@@ -93,8 +92,7 @@ MouseDownImpl g_nsnextstepframe_mousedown;
- (void)swiz_nsnextstepframe_mouseDown:(NSEvent*)event {
if ([self.window respondsToSelector:@selector(shell)]) {
electron::NativeWindowMac* shell =
(electron::NativeWindowMac*)[(id)self.window shell];
electron::NativeWindowMac* shell = [(id)self.window shell];
if (shell && !shell->has_frame()) {
[self cr_mouseDownOnFrameView:event];
}
@@ -104,8 +102,7 @@ MouseDownImpl g_nsnextstepframe_mousedown;
- (void)swiz_nsview_swipeWithEvent:(NSEvent*)event {
if ([self.window respondsToSelector:@selector(shell)]) {
electron::NativeWindowMac* shell =
(electron::NativeWindowMac*)[(id)self.window shell];
electron::NativeWindowMac* shell = [(id)self.window shell];
if (shell) {
if (event.deltaY == 1.0) {
shell->NotifyWindowSwipe("up");

2
shell/browser/ui/message_box_mac.mm
View File

@@ -80,7 +80,7 @@ NSAlert* CreateNSAlert(const MessageBoxSettings& settings) {
// TODO(@codebytere): This behavior violates HIG & should be deprecated.
if (settings.cancel_id == settings.default_id) {
[(NSButton*)[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
[[ns_buttons objectAtIndex:settings.default_id] highlight:YES];
}
}

2
shell/browser/ui/views/win_caption_button_container.cc
View File

@@ -87,7 +87,7 @@ WinCaptionButtonContainer::WinCaptionButtonContainer(WinFrameView* frame_view)
UpdateButtonToolTipsForWindowControlsOverlay();
}
WinCaptionButtonContainer::~WinCaptionButtonContainer() {}
WinCaptionButtonContainer::~WinCaptionButtonContainer() = default;
int WinCaptionButtonContainer::NonClientHitTest(const gfx::Point& point) const {
DCHECK(HitTestPoint(point))

10
shell/browser/ui/win/notify_icon_host.cc
View File

@@ -198,12 +198,10 @@ NotifyIcon* NotifyIconHost::CreateNotifyIcon(std::optional<base::Uuid> guid) {
guid_str = guid_str.substr(1, guid_str.length() - 2);
}
unsigned char* uid_cstr = (unsigned char*)guid_str.c_str();
auto* uid_cstr = reinterpret_cast<unsigned char*>(guid_str.data());
RPC_STATUS result = UuidFromStringA(uid_cstr, &uid);
if (result != RPC_S_INVALID_STRING_UUID) {
for (NotifyIcons::const_iterator i(notify_icons_.begin());
i != notify_icons_.end(); ++i) {
auto* current_win_icon = static_cast<NotifyIcon*>(*i);
for (const NotifyIcon* current_win_icon : notify_icons_) {
if (current_win_icon->guid() == uid) {
LOG(WARNING)
<< "Guid already in use. Existing tray entry will be replaced.";
@@ -256,9 +254,7 @@ LRESULT CALLBACK NotifyIconHost::WndProc(HWND hwnd,
NotifyIcon* win_icon = nullptr;
// Find the selected status icon.
for (NotifyIcons::const_iterator i(notify_icons_.begin());
i != notify_icons_.end(); ++i) {
auto* current_win_icon = static_cast<NotifyIcon*>(*i);
for (NotifyIcon* current_win_icon : notify_icons_) {
if (current_win_icon->icon_id() == wparam) {
win_icon = current_win_icon;
break;

2
shell/common/gin_converters/guid_converter.h
View File

@@ -76,7 +76,7 @@ struct Converter<UUID> {
if (guid[0] == '{' && guid[guid.length() - 1] == '}') {
guid = guid.substr(1, guid.length() - 2);
}
unsigned char* uid_cstr = (unsigned char*)guid.c_str();
auto* uid_cstr = reinterpret_cast<unsigned char*>(guid.data());
RPC_STATUS result = UuidFromStringA(uid_cstr, &uid);
if (result == RPC_S_INVALID_STRING_UUID) {
return false;

10
shell/common/platform_util_mac.mm
View File

@@ -167,13 +167,9 @@ void OpenExternal(const GURL& url,
configuration:configuration
completionHandler:^(NSRunningApplication* _Nullable app,
NSError* _Nullable error) {
if (error) {
runner->PostTask(FROM_HERE, base::BindOnce(std::move(copied_callback),
"Failed to open URL"));
} else {
runner->PostTask(FROM_HERE,
base::BindOnce(std::move(copied_callback), ""));
}
std::string err_msg = error ? "Failed to open URL" : "";
runner->PostTask(FROM_HERE, base::BindOnce(std::move(copied_callback),
std::move(err_msg)));
}];
}