summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2022-06-27 16:28:51 -0400
committerDavid Robillard <d@drobilla.net>2022-07-17 17:40:35 -0400
commitb4c5465d221ea35b6144b15b44cda72e8ac1d822 (patch)
treee929268bedf7a709cfc52af2525452e3f406c1c5
parent5b0b9b70de78f91d6bbdf5d756b058e33801b3c5 (diff)
downloadsuil-b4c5465d221ea35b6144b15b44cda72e8ac1d822.tar.gz
suil-b4c5465d221ea35b6144b15b44cda72e8ac1d822.tar.bz2
suil-b4c5465d221ea35b6144b15b44cda72e8ac1d822.zip
Remove dead Qt4 support code
-rw-r--r--NEWS3
-rw-r--r--src/instance.c25
2 files changed, 2 insertions, 26 deletions
diff --git a/NEWS b/NEWS
index c413feb..9798959 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,9 @@
suil (0.10.13) unstable;
* Fix MacOS build
+ * Remove dead Qt4 support code
- -- David Robillard <d@drobilla.net> Sun, 29 May 2022 18:58:06 +0000
+ -- David Robillard <d@drobilla.net> Fri, 17 Jun 2022 00:38:46 +0000
suil (0.10.12) stable;
diff --git a/src/instance.c b/src/instance.c
index 05357b2..6ad2fac 100644
--- a/src/instance.c
+++ b/src/instance.c
@@ -29,7 +29,6 @@
#define GTK2_UI_URI LV2_UI__GtkUI
#define GTK3_UI_URI LV2_UI__Gtk3UI
-#define QT4_UI_URI LV2_UI__Qt4UI
#define QT5_UI_URI LV2_UI__Qt5UI
#define X11_UI_URI LV2_UI__X11UI
#define WIN_UI_URI LV2_UI_PREFIX "WindowsUI"
@@ -50,11 +49,7 @@ suil_ui_supported(const char* host_type_uri, const char* ui_type_uri)
}
if ((!strcmp(host_type_uri, GTK2_UI_URI) &&
- !strcmp(ui_type_uri, QT4_UI_URI)) ||
- (!strcmp(host_type_uri, GTK2_UI_URI) &&
!strcmp(ui_type_uri, QT5_UI_URI)) ||
- (!strcmp(host_type_uri, QT4_UI_URI) &&
- !strcmp(ui_type_uri, GTK2_UI_URI)) ||
(!strcmp(host_type_uri, QT5_UI_URI) &&
!strcmp(ui_type_uri, GTK2_UI_URI)) ||
(!strcmp(host_type_uri, GTK2_UI_URI) &&
@@ -67,8 +62,6 @@ suil_ui_supported(const char* host_type_uri, const char* ui_type_uri)
!strcmp(ui_type_uri, WIN_UI_URI)) ||
(!strcmp(host_type_uri, GTK2_UI_URI) &&
!strcmp(ui_type_uri, COCOA_UI_URI)) ||
- (!strcmp(host_type_uri, QT4_UI_URI) &&
- !strcmp(ui_type_uri, X11_UI_URI)) ||
(!strcmp(host_type_uri, QT5_UI_URI) &&
!strcmp(ui_type_uri, X11_UI_URI)) ||
(!strcmp(host_type_uri, QT5_UI_URI) &&
@@ -88,24 +81,11 @@ open_wrapper(SuilHost* host,
{
const char* module_name = NULL;
- if (!strcmp(container_type_uri, QT4_UI_URI) &&
- !strcmp(ui_type_uri, GTK2_UI_URI)) {
- module_name = "suil_gtk2_in_qt4";
- }
-
-
if (!strcmp(container_type_uri, QT5_UI_URI) &&
!strcmp(ui_type_uri, GTK2_UI_URI)) {
module_name = "suil_gtk2_in_qt5";
}
-
- if (!strcmp(container_type_uri, GTK2_UI_URI) &&
- !strcmp(ui_type_uri, QT4_UI_URI)) {
- module_name = "suil_qt4_in_gtk2";
- }
-
-
if (!strcmp(container_type_uri, GTK2_UI_URI) &&
!strcmp(ui_type_uri, QT5_UI_URI)) {
module_name = "suil_qt5_in_gtk2";
@@ -136,11 +116,6 @@ open_wrapper(SuilHost* host,
module_name = "suil_cocoa_in_gtk2";
}
- if (!strcmp(container_type_uri, QT4_UI_URI) &&
- !strcmp(ui_type_uri, X11_UI_URI)) {
- module_name = "suil_x11_in_qt4";
- }
-
if (!strcmp(container_type_uri, QT5_UI_URI) &&
!strcmp(ui_type_uri, X11_UI_URI)) {
module_name = "suil_x11_in_qt5";