summaryrefslogtreecommitdiffstats
path: root/src/ui/view
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/view
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/view')
-rw-r--r--src/ui/view/view-widget.cpp12
-rw-r--r--src/ui/view/view.cpp10
2 files changed, 11 insertions, 11 deletions
diff --git a/src/ui/view/view-widget.cpp b/src/ui/view/view-widget.cpp
index 671a4afe6..fec18845b 100644
--- a/src/ui/view/view-widget.cpp
+++ b/src/ui/view/view-widget.cpp
@@ -34,7 +34,7 @@ static void sp_view_widget_class_init(SPViewWidgetClass *vwc)
*/
static void sp_view_widget_init(SPViewWidget *vw)
{
- vw->view = NULL;
+ vw->view = nullptr;
}
/**
@@ -49,7 +49,7 @@ static void sp_view_widget_dispose(GObject *object)
if (vw->view) {
vw->view->close();
Inkscape::GC::release(vw->view);
- vw->view = NULL;
+ vw->view = nullptr;
}
if (G_OBJECT_CLASS(sp_view_widget_parent_class)->dispose) {
@@ -61,11 +61,11 @@ static void sp_view_widget_dispose(GObject *object)
void sp_view_widget_set_view(SPViewWidget *vw, Inkscape::UI::View::View *view)
{
- g_return_if_fail(vw != NULL);
+ g_return_if_fail(vw != nullptr);
g_return_if_fail(SP_IS_VIEW_WIDGET(vw));
- g_return_if_fail(view != NULL);
+ g_return_if_fail(view != nullptr);
- g_return_if_fail(vw->view == NULL);
+ g_return_if_fail(vw->view == nullptr);
vw->view = view;
Inkscape::GC::anchor(view);
@@ -77,7 +77,7 @@ void sp_view_widget_set_view(SPViewWidget *vw, Inkscape::UI::View::View *view)
bool sp_view_widget_shutdown(SPViewWidget *vw)
{
- g_return_val_if_fail(vw != NULL, TRUE);
+ g_return_val_if_fail(vw != nullptr, TRUE);
g_return_val_if_fail(SP_IS_VIEW_WIDGET(vw), TRUE);
if (((SPViewWidgetClass *) G_OBJECT_GET_CLASS(vw))->shutdown) {
diff --git a/src/ui/view/view.cpp b/src/ui/view/view.cpp
index 47e2a1e0d..21fe10f4a 100644
--- a/src/ui/view/view.cpp
+++ b/src/ui/view/view.cpp
@@ -58,7 +58,7 @@ _onDocumentResized (double x, double y, View* v)
//--------------------------------------------------------------------
View::View()
-: _doc(0)
+: _doc(nullptr)
{
_message_stack = GC::release(new Inkscape::MessageStack());
_tips_message_context = new Inkscape::MessageContext(_message_stack);
@@ -78,9 +78,9 @@ void View::_close() {
_message_changed_connection.disconnect();
delete _tips_message_context;
- _tips_message_context = 0;
+ _tips_message_context = nullptr;
- _message_stack = 0;
+ _message_stack = nullptr;
if (_doc) {
_document_uri_set_connection.disconnect();
@@ -89,7 +89,7 @@ void View::_close() {
// this was the last view of this document, so delete it
delete _doc;
}
- _doc = NULL;
+ _doc = nullptr;
}
Inkscape::Verb::delete_all_view (this);
@@ -106,7 +106,7 @@ void View::requestRedraw()
}
void View::setDocument(SPDocument *doc) {
- g_return_if_fail(doc != NULL);
+ g_return_if_fail(doc != nullptr);
if (_doc) {
_document_uri_set_connection.disconnect();