refactor: run clang-tidy (#20231)

* refactor: clang-tidy modernize-use-nullptr

* refactor: clang-tidy modernize-use-equals-default

* refactor: clang-tidy modernize-make-unique

* refactor: omit nullptr arg from unique_ptr.reset()

As per comment by @miniak
This commit is contained in:
Charles Kerr 2019-09-16 18:12:00 -04:00 committed by GitHub
parent 660e566201
commit 2b316f3843
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
93 changed files with 261 additions and 223 deletions

View file

@ -17,7 +17,7 @@ bool AtomMenuModel::Delegate::GetAcceleratorForCommandId(
AtomMenuModel::AtomMenuModel(Delegate* delegate)
: ui::SimpleMenuModel(delegate), delegate_(delegate) {}
AtomMenuModel::~AtomMenuModel() {}
AtomMenuModel::~AtomMenuModel() = default;
void AtomMenuModel::SetToolTip(int index, const base::string16& toolTip) {
int command_id = GetCommandIdAt(index);

View file

@ -3,6 +3,8 @@
// found in the LICENSE file.
#include <algorithm>
#include <memory>
#include <utility>
#include <vector>
@ -79,7 +81,7 @@ void AutofillPopup::CreateView(content::RenderFrameHost* frame_host,
}
auto* osr_rwhv = static_cast<OffScreenRenderWidgetHostView*>(rwhv);
view_->view_proxy_.reset(new OffscreenViewProxy(view_));
view_->view_proxy_ = std::make_unique<OffscreenViewProxy>(view_);
osr_rwhv->AddViewProxy(view_->view_proxy_.get());
}
#endif

View file

@ -92,9 +92,9 @@ void DevToolsManagerDelegate::StartHttpHandler() {
CreateSocketFactory(), user_dir, base::FilePath());
}
DevToolsManagerDelegate::DevToolsManagerDelegate() {}
DevToolsManagerDelegate::DevToolsManagerDelegate() = default;
DevToolsManagerDelegate::~DevToolsManagerDelegate() {}
DevToolsManagerDelegate::~DevToolsManagerDelegate() = default;
void DevToolsManagerDelegate::Inspect(content::DevToolsAgentHost* agent_host) {}

View file

@ -54,8 +54,8 @@ std::string GetMimeTypeForPath(const std::string& path) {
class BundledDataSource : public content::URLDataSource {
public:
BundledDataSource() {}
~BundledDataSource() override {}
BundledDataSource() = default;
~BundledDataSource() override = default;
// content::URLDataSource implementation.
std::string GetSource() override { return kChromeUIDevToolsHost; }

View file

@ -2,6 +2,8 @@
// Use of this source code is governed by the MIT license that can be
// found in the LICENSE file.
#include <memory>
#include "shell/browser/ui/file_dialog.h"
#include "shell/browser/ui/util_gtk.h"
@ -57,7 +59,7 @@ class FileChooserDialog {
confirm_text = gtk_util::kSaveLabel;
dialog_ = gtk_file_chooser_dialog_new(
settings.title.c_str(), NULL, action, gtk_util::kCancelLabel,
settings.title.c_str(), nullptr, action, gtk_util::kCancelLabel,
GTK_RESPONSE_CANCEL, confirm_text, GTK_RESPONSE_ACCEPT, NULL);
if (parent_) {
parent_->SetEnabled(false);
@ -140,15 +142,17 @@ class FileChooserDialog {
void RunSaveAsynchronous(
electron::util::Promise<gin_helper::Dictionary> promise) {
save_promise_.reset(new electron::util::Promise<gin_helper::Dictionary>(
std::move(promise)));
save_promise_ =
std::make_unique<electron::util::Promise<gin_helper::Dictionary>>(
std::move(promise));
RunAsynchronous();
}
void RunOpenAsynchronous(
electron::util::Promise<gin_helper::Dictionary> promise) {
open_promise_.reset(new electron::util::Promise<gin_helper::Dictionary>(
std::move(promise)));
open_promise_ =
std::make_unique<electron::util::Promise<gin_helper::Dictionary>>(
std::move(promise));
RunAsynchronous();
}
@ -162,7 +166,7 @@ class FileChooserDialog {
std::vector<base::FilePath> GetFileNames() const {
std::vector<base::FilePath> paths;
auto* filenames = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(dialog_));
for (auto* iter = filenames; iter != NULL; iter = iter->next) {
for (auto* iter = filenames; iter != nullptr; iter = iter->next) {
auto* filename = static_cast<char*>(iter->data);
paths.emplace_back(filename);
g_free(filename);

View file

@ -8,9 +8,9 @@ namespace electron {
TrayIcon::BalloonOptions::BalloonOptions() = default;
TrayIcon::TrayIcon() {}
TrayIcon::TrayIcon() = default;
TrayIcon::~TrayIcon() {}
TrayIcon::~TrayIcon() = default;
void TrayIcon::SetPressedImage(ImageType image) {}

View file

@ -13,9 +13,9 @@
namespace electron {
TrayIconGtk::TrayIconGtk() {}
TrayIconGtk::TrayIconGtk() = default;
TrayIconGtk::~TrayIconGtk() {}
TrayIconGtk::~TrayIconGtk() = default;
void TrayIconGtk::SetImage(const gfx::Image& image) {
if (icon_) {

View file

@ -30,9 +30,9 @@ bool IsDesktopEnvironmentUnity() {
namespace electron {
ViewsDelegate::ViewsDelegate() {}
ViewsDelegate::ViewsDelegate() = default;
ViewsDelegate::~ViewsDelegate() {}
ViewsDelegate::~ViewsDelegate() = default;
void ViewsDelegate::SaveWindowPlacement(const views::Widget* window,
const std::string& window_name,
@ -70,13 +70,13 @@ bool ViewsDelegate::IsWindowInMetro(gfx::NativeWindow window) const {
#elif defined(OS_LINUX) && !defined(OS_CHROMEOS)
gfx::ImageSkia* ViewsDelegate::GetDefaultWindowIcon() const {
return NULL;
return nullptr;
}
#endif
views::NonClientFrameView* ViewsDelegate::CreateDefaultNonClientFrameView(
views::Widget* widget) {
return NULL;
return nullptr;
}
void ViewsDelegate::AddRef() {}

View file

@ -245,7 +245,7 @@ void AutofillPopupView::OnPaint(gfx::Canvas* canvas) {
if (view_proxy_.get()) {
bitmap.allocN32Pixels(popup_->popup_bounds_in_view().width(),
popup_->popup_bounds_in_view().height(), true);
paint_canvas.reset(new cc::SkiaPaintCanvas(bitmap));
paint_canvas = std::make_unique<cc::SkiaPaintCanvas>(bitmap);
draw_canvas = new gfx::Canvas(paint_canvas.get(), 1.0);
}
#endif

View file

@ -22,9 +22,9 @@ const int kResizeAreaCornerSize = 16;
// static
const char FramelessView::kViewClassName[] = "FramelessView";
FramelessView::FramelessView() {}
FramelessView::FramelessView() = default;
FramelessView::~FramelessView() {}
FramelessView::~FramelessView() = default;
void FramelessView::Init(NativeWindowViews* window, views::Widget* frame) {
window_ = window;

View file

@ -58,21 +58,21 @@ namespace {
// Retrieved functions from libdbusmenu-glib.
// DbusmenuMenuItem methods:
dbusmenu_menuitem_new_func menuitem_new = NULL;
dbusmenu_menuitem_new_with_id_func menuitem_new_with_id = NULL;
dbusmenu_menuitem_get_id_func menuitem_get_id = NULL;
dbusmenu_menuitem_get_children_func menuitem_get_children = NULL;
dbusmenu_menuitem_get_children_func menuitem_take_children = NULL;
dbusmenu_menuitem_child_append_func menuitem_child_append = NULL;
dbusmenu_menuitem_property_set_func menuitem_property_set = NULL;
dbusmenu_menuitem_new_func menuitem_new = nullptr;
dbusmenu_menuitem_new_with_id_func menuitem_new_with_id = nullptr;
dbusmenu_menuitem_get_id_func menuitem_get_id = nullptr;
dbusmenu_menuitem_get_children_func menuitem_get_children = nullptr;
dbusmenu_menuitem_get_children_func menuitem_take_children = nullptr;
dbusmenu_menuitem_child_append_func menuitem_child_append = nullptr;
dbusmenu_menuitem_property_set_func menuitem_property_set = nullptr;
dbusmenu_menuitem_property_set_variant_func menuitem_property_set_variant =
NULL;
dbusmenu_menuitem_property_set_bool_func menuitem_property_set_bool = NULL;
dbusmenu_menuitem_property_set_int_func menuitem_property_set_int = NULL;
nullptr;
dbusmenu_menuitem_property_set_bool_func menuitem_property_set_bool = nullptr;
dbusmenu_menuitem_property_set_int_func menuitem_property_set_int = nullptr;
// DbusmenuServer methods:
dbusmenu_server_new_func server_new = NULL;
dbusmenu_server_set_root_func server_set_root = NULL;
dbusmenu_server_new_func server_new = nullptr;
dbusmenu_server_set_root_func server_set_root = nullptr;
// Properties that we set on menu items:
const char kPropertyEnabled[] = "enabled";
@ -141,7 +141,7 @@ AtomMenuModel* ModelForMenuItem(DbusmenuMenuitem* item) {
bool GetMenuItemID(DbusmenuMenuitem* item, int* id) {
gpointer id_ptr = g_object_get_data(G_OBJECT(item), "menu-id");
if (id_ptr != NULL) {
if (id_ptr != nullptr) {
*id = GPOINTER_TO_INT(id_ptr) - 1;
return true;
}
@ -326,7 +326,7 @@ void GlobalMenuBarX11::OnSubMenuShow(DbusmenuMenuitem* item) {
// Clear children.
GList* children = menuitem_take_children(item);
g_list_foreach(children, reinterpret_cast<GFunc>(g_object_unref), NULL);
g_list_foreach(children, reinterpret_cast<GFunc>(g_object_unref), nullptr);
g_list_free(children);
// Build children.

View file

@ -4,6 +4,8 @@
#include "shell/browser/ui/views/inspectable_web_contents_view_views.h"
#include <memory>
#include <utility>
#include "base/strings/utf_string_conversions.h"
@ -36,7 +38,7 @@ class DevToolsWindowDelegate : public views::ClientView,
if (shell->GetDelegate())
icon_ = shell->GetDelegate()->GetDevToolsWindowIcon();
}
~DevToolsWindowDelegate() override {}
~DevToolsWindowDelegate() override = default;
// views::WidgetDelegate:
void DeleteDelegate() override { delete this; }
@ -154,7 +156,7 @@ void InspectableWebContentsViewViews::CloseDevTools() {
devtools_window_delegate_ = nullptr;
} else {
devtools_web_view_->SetVisible(false);
devtools_web_view_->SetWebContents(NULL);
devtools_web_view_->SetWebContents(nullptr);
Layout();
}
}
@ -176,8 +178,8 @@ void InspectableWebContentsViewViews::SetIsDocked(bool docked, bool activate) {
CloseDevTools();
if (!docked) {
devtools_window_.reset(new views::Widget);
devtools_window_web_view_ = new views::WebView(NULL);
devtools_window_ = std::make_unique<views::Widget>();
devtools_window_web_view_ = new views::WebView(nullptr);
devtools_window_delegate_ = new DevToolsWindowDelegate(
this, devtools_window_web_view_, devtools_window_.get());

View file

@ -39,7 +39,7 @@ const char MenuBar::kViewClassName[] = "ElectronMenuBar";
MenuBarColorUpdater::MenuBarColorUpdater(MenuBar* menu_bar)
: menu_bar_(menu_bar) {}
MenuBarColorUpdater::~MenuBarColorUpdater() {}
MenuBarColorUpdater::~MenuBarColorUpdater() = default;
void MenuBarColorUpdater::OnDidChangeFocus(views::View* focused_before,
views::View* focused_now) {

View file

@ -4,6 +4,8 @@
#include "shell/browser/ui/views/menu_delegate.h"
#include <memory>
#include "base/task/post_task.h"
#include "content/public/browser/browser_task_traits.h"
#include "content/public/browser/browser_thread.h"
@ -19,7 +21,7 @@ namespace electron {
MenuDelegate::MenuDelegate(MenuBar* menu_bar)
: menu_bar_(menu_bar), id_(-1), hold_first_switch_(false) {}
MenuDelegate::~MenuDelegate() {}
MenuDelegate::~MenuDelegate() = default;
void MenuDelegate::RunMenu(AtomMenuModel* model,
views::Button* button,
@ -35,14 +37,13 @@ void MenuDelegate::RunMenu(AtomMenuModel* model,
}
id_ = button->tag();
adapter_.reset(new MenuModelAdapter(model));
adapter_ = std::make_unique<MenuModelAdapter>(model);
views::MenuItemView* item = new views::MenuItemView(this);
static_cast<MenuModelAdapter*>(adapter_.get())->BuildMenu(item);
menu_runner_.reset(new views::MenuRunner(
item,
views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS));
menu_runner_ = std::make_unique<views::MenuRunner>(
item, views::MenuRunner::CONTEXT_MENU | views::MenuRunner::HAS_MNEMONICS);
menu_runner_->RunMenuAt(
button->GetWidget()->GetTopLevelWidget(),
static_cast<views::MenuButton*>(button)->button_controller(), bounds,

View file

@ -9,7 +9,7 @@ namespace electron {
MenuModelAdapter::MenuModelAdapter(AtomMenuModel* menu_model)
: views::MenuModelAdapter(menu_model), menu_model_(menu_model) {}
MenuModelAdapter::~MenuModelAdapter() {}
MenuModelAdapter::~MenuModelAdapter() = default;
bool MenuModelAdapter::GetAccelerator(int id,
ui::Accelerator* accelerator) const {

View file

@ -4,6 +4,8 @@
#include "shell/browser/ui/views/root_view.h"
#include <memory>
#include "content/public/browser/native_web_keyboard_event.h"
#include "shell/browser/native_window.h"
#include "shell/browser/ui/views/menu_bar.h"
@ -41,7 +43,7 @@ RootView::RootView(NativeWindow* window)
set_owned_by_client();
}
RootView::~RootView() {}
RootView::~RootView() = default;
void RootView::SetMenu(AtomMenuModel* menu_model) {
if (menu_model == nullptr) {
@ -60,7 +62,7 @@ void RootView::SetMenu(AtomMenuModel* menu_model) {
return;
if (!menu_bar_) {
menu_bar_.reset(new MenuBar(this));
menu_bar_ = std::make_unique<MenuBar>(this);
menu_bar_->set_owned_by_client();
if (!menu_bar_autohide_)
SetMenuBarVisibility(true);

View file

@ -22,8 +22,9 @@ namespace electron {
SubmenuButton::SubmenuButton(const base::string16& title,
views::MenuButtonListener* menu_button_listener,
const SkColor& background_color)
: views::MenuButton(gfx::RemoveAcceleratorChar(title, '&', NULL, NULL),
menu_button_listener),
: views::MenuButton(
gfx::RemoveAcceleratorChar(title, '&', nullptr, nullptr),
menu_button_listener),
background_color_(background_color) {
#if defined(OS_LINUX)
// Dont' use native style border.
@ -40,7 +41,7 @@ SubmenuButton::SubmenuButton(const base::string16& title,
color_utils::BlendTowardMaxContrast(background_color_, 0x81));
}
SubmenuButton::~SubmenuButton() {}
SubmenuButton::~SubmenuButton() = default;
std::unique_ptr<views::InkDropRipple> SubmenuButton::CreateInkDropRipple()
const {

View file

@ -8,9 +8,9 @@
namespace electron {
EventDisabler::EventDisabler() {}
EventDisabler::EventDisabler() = default;
EventDisabler::~EventDisabler() {}
EventDisabler::~EventDisabler() = default;
ui::EventRewriteStatus EventDisabler::RewriteEvent(
const ui::Event& event,

View file

@ -70,7 +70,7 @@ bool ShouldUseGlobalMenuBar() {
}
dbus::MessageReader reader(response.get());
dbus::MessageReader array_reader(NULL);
dbus::MessageReader array_reader(nullptr);
if (!reader.PopArray(&array_reader)) {
bus->ShutdownAndBlock();
return false;