From 1388f80152473d031cb748c72ce5b680e9c6a43e Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 21 Jul 2020 20:22:14 +0200 Subject: Use modern casts in C++ --- src/jalv_gtkmm2.cpp | 8 +++++--- src/jalv_qt.cpp | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/jalv_gtkmm2.cpp b/src/jalv_gtkmm2.cpp index 382a8e7..065b971 100644 --- a/src/jalv_gtkmm2.cpp +++ b/src/jalv_gtkmm2.cpp @@ -74,14 +74,16 @@ jalv_open_ui(Jalv* jalv) } if (jalv->ui_instance) { - GtkWidget* widget = (GtkWidget*)suil_instance_get_widget( - jalv->ui_instance); + GtkWidget* widget = static_cast( + suil_instance_get_widget(jalv->ui_instance)); + Gtk::Widget* widgetmm = Glib::wrap(widget); window->add(*Gtk::manage(widgetmm)); widgetmm->show_all(); g_timeout_add(1000 / jalv->ui_update_hz, - (GSourceFunc)jalv_update, jalv); + reinterpret_cast(jalv_update), + jalv); } else { Gtk::Button* button = Gtk::manage(new Gtk::Button("Close")); window->add(*Gtk::manage(button)); diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp index 647c57b..7005e91 100644 --- a/src/jalv_qt.cpp +++ b/src/jalv_qt.cpp @@ -715,8 +715,8 @@ jalv_open_ui(Jalv* jalv) QWidget* controlWidget = build_control_widget(jalv); widget = new QScrollArea(); - ((QScrollArea*)widget)->setWidget(controlWidget); - ((QScrollArea*)widget)->setWidgetResizable(true); + static_cast(widget)->setWidget(controlWidget); + static_cast(widget)->setWidgetResizable(true); widget->setMinimumWidth(800); widget->setMinimumHeight(600); } -- cgit v1.2.1