From e13d629c7bcbacba10dee9ca43435affa1b53478 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 22 Dec 2020 16:09:01 +0100 Subject: Use "nullptr" in more C++ code --- src/gtk2_in_qt4.cpp | 4 ++-- src/qt4_in_gtk2.cpp | 20 ++++++++++---------- src/qt5_in_gtk.cpp | 2 +- src/win_in_gtk2.cpp | 28 ++++++++++++++-------------- src/x11_in_qt4.cpp | 4 ++-- src/x11_in_qt5.cpp | 8 ++++---- 6 files changed, 33 insertions(+), 33 deletions(-) diff --git a/src/gtk2_in_qt4.cpp b/src/gtk2_in_qt4.cpp index 3e2e256..c13561e 100644 --- a/src/gtk2_in_qt4.cpp +++ b/src/gtk2_in_qt4.cpp @@ -122,9 +122,9 @@ suil_wrapper_new(SuilHost* host, if (!host->gtk_lib) { SUIL_ERRORF("Failed to open %s (%s)\n", SUIL_GTK2_LIB_NAME, dylib_error()); - return NULL; + return nullptr; } - gtk_init(NULL, NULL); + gtk_init(nullptr, nullptr); } /* Create wrapper implementation. */ diff --git a/src/qt4_in_gtk2.cpp b/src/qt4_in_gtk2.cpp index cc8c040..bba1a03 100644 --- a/src/qt4_in_gtk2.cpp +++ b/src/qt4_in_gtk2.cpp @@ -55,14 +55,14 @@ suil_qt_wrapper_finalize(GObject* gobject) if (self->instance->handle) { self->instance->descriptor->cleanup(self->instance->handle); - self->instance->handle = NULL; + self->instance->handle = nullptr; } delete self->qembed; - self->qembed = NULL; - self->app = NULL; - self->wrapper->impl = NULL; + self->qembed = nullptr; + self->app = nullptr; + self->wrapper->impl = nullptr; G_OBJECT_CLASS(suil_qt_wrapper_parent_class)->finalize(gobject); } @@ -78,9 +78,9 @@ suil_qt_wrapper_class_init(SuilQtWrapperClass* klass) static void suil_qt_wrapper_init(SuilQtWrapper* self) { - self->app = NULL; - self->qembed = NULL; - self->instance = NULL; + self->app = nullptr; + self->qembed = nullptr; + self->instance = nullptr; } static void @@ -110,7 +110,7 @@ wrapper_wrap(SuilWrapper* wrapper, qwidget->setParent(wrap->qembed); g_signal_connect_after(G_OBJECT(wrap), "realize", - G_CALLBACK(suil_qt_wrapper_realize), NULL); + G_CALLBACK(suil_qt_wrapper_realize), nullptr); instance->host_widget = GTK_WIDGET(wrap); @@ -139,7 +139,7 @@ suil_wrapper_new(SuilHost* host, wrapper->free = wrapper_free; SuilQtWrapper* const wrap = SUIL_QT_WRAPPER( - g_object_new(SUIL_TYPE_QT_WRAPPER, NULL)); + g_object_new(SUIL_TYPE_QT_WRAPPER, nullptr)); if (qApp) { wrap->app = qApp; @@ -147,7 +147,7 @@ suil_wrapper_new(SuilHost* host, wrap->app = new QApplication(host->argc, host->argv, true); } - wrap->wrapper = NULL; + wrap->wrapper = nullptr; wrapper->impl = wrap; return wrapper; diff --git a/src/qt5_in_gtk.cpp b/src/qt5_in_gtk.cpp index 38f285a..6ef50f6 100644 --- a/src/qt5_in_gtk.cpp +++ b/src/qt5_in_gtk.cpp @@ -163,7 +163,7 @@ wrapper_wrap(SuilWrapper* wrapper, wrap->qembed->setLayout(layout); g_signal_connect_after(G_OBJECT(wrap), "realize", - G_CALLBACK(suil_qt_wrapper_realize), NULL); + G_CALLBACK(suil_qt_wrapper_realize), nullptr); instance->host_widget = GTK_WIDGET(wrap); diff --git a/src/win_in_gtk2.cpp b/src/win_in_gtk2.cpp index 1475862..c1953eb 100644 --- a/src/win_in_gtk2.cpp +++ b/src/win_in_gtk2.cpp @@ -62,8 +62,8 @@ suil_win_wrapper_finalize(GObject* gobject) { SuilWinWrapper* const self = SUIL_WIN_WRAPPER(gobject); - self->wrapper->impl = NULL; - self->instance = NULL; + self->wrapper->impl = nullptr; + self->instance = nullptr; G_OBJECT_CLASS(suil_win_wrapper_parent_class)->finalize(gobject); } @@ -72,7 +72,7 @@ static void suil_win_size_allocate(GtkWidget* widget, GtkAllocation* allocation) { SuilWinWrapper* const self = SUIL_WIN_WRAPPER(widget); - g_return_if_fail(self != NULL); + g_return_if_fail(self != nullptr); widget->allocation = *allocation; if (gtk_widget_get_realized(widget)) { @@ -104,9 +104,9 @@ suil_win_wrapper_class_init(SuilWinWrapperClass* klass) static void suil_win_wrapper_init(SuilWinWrapper* self) { - self->instance = NULL; - self->flt_win = NULL; - self->idle_iface = NULL; + self->instance = nullptr; + self->flt_win = nullptr; + self->idle_iface = nullptr; self->idle_ms = 1000 / 30; // 30 Hz default } @@ -135,7 +135,7 @@ wrapper_wrap(SuilWrapper* wrapper, wrap->wrapper = wrapper; wrap->instance = instance; - const LV2UI_Idle_Interface* idle_iface = NULL; + const LV2UI_Idle_Interface* idle_iface = nullptr; if (instance->descriptor->extension_data) { idle_iface = (const LV2UI_Idle_Interface*) instance->descriptor->extension_data(LV2_UI__idleInterface); @@ -189,7 +189,7 @@ suil_wrapper_new(SuilHost* host, LV2_Feature*** features, unsigned n_features) { - GtkWidget* parent = NULL; + GtkWidget* parent = nullptr; for (unsigned i = 0; i < n_features; ++i) { if (!strcmp((*features)[i]->URI, LV2_UI__parent)) { parent = (GtkWidget*)(*features)[i]->data; @@ -199,7 +199,7 @@ suil_wrapper_new(SuilHost* host, if (!GTK_CONTAINER(parent)) { SUIL_ERRORF("No GtkContainer parent given for %s UI\n", ui_type_uri); - return NULL; + return nullptr; } SuilWrapper* wrapper = (SuilWrapper*)calloc(1, sizeof(SuilWrapper)); @@ -207,9 +207,9 @@ suil_wrapper_new(SuilHost* host, wrapper->free = wrapper_free; SuilWinWrapper* const wrap = SUIL_WIN_WRAPPER( - g_object_new(SUIL_TYPE_WIN_WRAPPER, NULL)); + g_object_new(SUIL_TYPE_WIN_WRAPPER, nullptr)); - wrap->wrapper = NULL; + wrap->wrapper = nullptr; wrapper->impl = wrap; wrapper->resize.handle = wrap; @@ -228,11 +228,11 @@ suil_wrapper_new(SuilHost* host, HWND parent_window = (HWND)GDK_WINDOW_HWND(window); suil_add_feature(features, &n_features, LV2_UI__parent, parent_window); suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize); - suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL); + suil_add_feature(features, &n_features, LV2_UI__idleInterface, nullptr); // Scan for URID map and options - LV2_URID_Map* map = NULL; - LV2_Options_Option* options = NULL; + LV2_URID_Map* map = nullptr; + LV2_Options_Option* options = nullptr; for (LV2_Feature** f = *features; *f && (!map || !options); ++f) { if (!strcmp((*f)->URI, LV2_OPTIONS__options)) { options = (LV2_Options_Option *)(*f)->data; diff --git a/src/x11_in_qt4.cpp b/src/x11_in_qt4.cpp index e1e1378..6437d57 100644 --- a/src/x11_in_qt4.cpp +++ b/src/x11_in_qt4.cpp @@ -94,7 +94,7 @@ static int wrapper_wrap(SuilWrapper* wrapper, SuilInstance* instance) { - const LV2UI_Idle_Interface* idle_iface = NULL; + const LV2UI_Idle_Interface* idle_iface = nullptr; if (instance->descriptor->extension_data) { idle_iface = (const LV2UI_Idle_Interface*) instance->descriptor->extension_data(LV2_UI__idleInterface); @@ -144,7 +144,7 @@ suil_wrapper_new(SuilHost* host, const intptr_t parent_id = (intptr_t)ew->winId(); suil_add_feature(features, &n_features, LV2_UI__parent, (void*)parent_id); suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize); - suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL); + suil_add_feature(features, &n_features, LV2_UI__idleInterface, nullptr); return wrapper; } diff --git a/src/x11_in_qt5.cpp b/src/x11_in_qt5.cpp index 297bfc7..9298afe 100644 --- a/src/x11_in_qt5.cpp +++ b/src/x11_in_qt5.cpp @@ -43,8 +43,8 @@ class SuilQX11Widget : public QWidget public: SuilQX11Widget(QWidget* parent, Qt::WindowFlags wflags) : QWidget(parent, wflags) - , _instance(NULL) - , _idle_iface(NULL) + , _instance(nullptr) + , _idle_iface(nullptr) , _window(0) , _ui_timer(0) {} @@ -220,7 +220,7 @@ suil_wrapper_new(SuilHost*, wrapper->wrap = wrapper_wrap; wrapper->free = wrapper_free; - SuilQX11Widget* const ew = new SuilQX11Widget(NULL, Qt::Window); + SuilQX11Widget* const ew = new SuilQX11Widget(nullptr, Qt::Window); impl->parent = ew; @@ -231,7 +231,7 @@ suil_wrapper_new(SuilHost*, void* parent_id = (void*)(intptr_t)ew->winId(); suil_add_feature(features, &n_features, LV2_UI__parent, parent_id); suil_add_feature(features, &n_features, LV2_UI__resize, &wrapper->resize); - suil_add_feature(features, &n_features, LV2_UI__idleInterface, NULL); + suil_add_feature(features, &n_features, LV2_UI__idleInterface, nullptr); return wrapper; } -- cgit v1.2.1