summaryrefslogtreecommitdiffstats
path: root/src/ui/widget/dock.cpp
diff options
context:
space:
mode:
authorEmmanuel Gil Peyrot <linkmauve@linkmauve.fr>2018-06-15 10:46:15 +0000
committerMarc Jeanmougin <marcjeanmougin@free.fr>2018-06-18 12:27:01 +0000
commitf4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43 (patch)
tree7c6044fd3a17a2665841959dac9b3b2110b27924 /src/ui/widget/dock.cpp
parentRun clang-tidy’s modernize-use-override pass. (diff)
downloadinkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.tar.gz
inkscape-f4349fb3e45bd44cef0e2b69af4c9b4cf35dcf43.zip
Run clang-tidy’s modernize-use-nullptr pass.
This replaces all NULL or 0 with nullptr when assigned to or returned as a pointer.
Diffstat (limited to 'src/ui/widget/dock.cpp')
-rw-r--r--src/ui/widget/dock.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 9c1f0f783..7e90017e8 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -27,7 +27,7 @@ namespace {
void hideCallback(GObject * /*object*/, gpointer dock_ptr)
{
- g_return_if_fail( dock_ptr != NULL );
+ g_return_if_fail( dock_ptr != nullptr );
Dock *dock = static_cast<Dock *>(dock_ptr);
dock->hide();
@@ -35,7 +35,7 @@ void hideCallback(GObject * /*object*/, gpointer dock_ptr)
void unhideCallback(GObject * /*object*/, gpointer dock_ptr)
{
- g_return_if_fail( dock_ptr != NULL );
+ g_return_if_fail( dock_ptr != nullptr );
Dock *dock = static_cast<Dock *>(dock_ptr);
dock->show();
@@ -89,7 +89,7 @@ Dock::Dock(Gtk::Orientation orientation)
static_cast<GdlSwitcherStyle>(prefs->getIntLimited("/options/dock/switcherstyle",
GDL_SWITCHER_STYLE_BOTH, 0, 4));
- GdlDockMaster* master = NULL;
+ GdlDockMaster* master = nullptr;
g_object_get(GDL_DOCK_OBJECT(_gdl_dock),
"master", &master,
@@ -139,7 +139,7 @@ Gtk::Paned *Dock::getParentPaned()
{
g_return_val_if_fail(_dock_box, 0);
Gtk::Container *parent = getWidget().get_parent();
- return (parent != 0 ? dynamic_cast<Gtk::Paned *>(parent) : 0);
+ return (parent != nullptr ? dynamic_cast<Gtk::Paned *>(parent) : nullptr);
}