diff options
| author | David Robillard <d@drobilla.net> | 2020-12-15 21:55:52 +0100 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2020-12-15 21:57:03 +0100 |
| commit | b3ca2717dd0ad4c2a7db65145f6a0dc890e42b72 (patch) | |
| tree | 5d530ad89b32da4c90caca69cc07a6c3afe7722c | |
| parent | 05c2afbac933296bdcb1e4f06fd52cbc087cdb47 (diff) | |
| download | suil-b3ca2717dd0ad4c2a7db65145f6a0dc890e42b72.tar.gz suil-b3ca2717dd0ad4c2a7db65145f6a0dc890e42b72.tar.bz2 suil-b3ca2717dd0ad4c2a7db65145f6a0dc890e42b72.zip | |
Clean up includes
| -rw-r--r-- | .clant.json | 4 | ||||
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/gtk2_in_qt5.cpp | 4 | ||||
| -rw-r--r-- | src/qt5_in_gtk.cpp | 13 | ||||
| -rw-r--r-- | src/suil_internal.h | 6 | ||||
| -rw-r--r-- | src/x11_in_qt5.cpp | 4 | ||||
| -rw-r--r-- | suil/suil.h | 1 | ||||
| -rw-r--r-- | wscript | 2 |
8 files changed, 28 insertions, 12 deletions
diff --git a/.clant.json b/.clant.json new file mode 100644 index 0000000..6f11716 --- /dev/null +++ b/.clant.json @@ -0,0 +1,4 @@ +{ + "version": "1.0.0", + "mapping_files": ["qt5_11.imp"] +} @@ -1,3 +1,9 @@ +suil (0.10.9) unstable; + + * Clean up minor code issues + + -- David Robillard <d@drobilla.net> Tue, 15 Dec 2020 20:55:16 +0000 + suil (0.10.8) stable; * Fix X11 in Gtk size regressions (thanks Robin Gareus) diff --git a/src/gtk2_in_qt5.cpp b/src/gtk2_in_qt5.cpp index f6bf48e..8fb7be7 100644 --- a/src/gtk2_in_qt5.cpp +++ b/src/gtk2_in_qt5.cpp @@ -33,10 +33,10 @@ #include <gdk/gdk.h> #include <glib-object.h> #include <glib.h> -#include <gtk/gtk.h> #include <gobject/gclosure.h> +#include <gtk/gtk.h> -#include <stdlib.h> +#include <cstdlib> extern "C" { diff --git a/src/qt5_in_gtk.cpp b/src/qt5_in_gtk.cpp index 6d0c001..5ce395d 100644 --- a/src/qt5_in_gtk.cpp +++ b/src/qt5_in_gtk.cpp @@ -17,30 +17,31 @@ #include "suil_internal.h" -#include "suil/suil.h" -#include "lv2/options/options.h" -#include "lv2/urid/urid.h" #include "lv2/core/lv2.h" +#include "lv2/options/options.h" #include "lv2/ui/ui.h" +#include "lv2/urid/urid.h" +#include "suil/suil.h" #include <QVBoxLayout> #include <QWidget> #include <QWindow> +#include <Qt> #include <QtGui> #undef signals -#include <gtk/gtk.h> #include <glib-object.h> #include <glib.h> #include <gobject/gclosure.h> +#include <gtk/gtk.h> #if GTK_MAJOR_VERSION == 3 #include <gtk/gtkx.h> #endif -#include <stdlib.h> -#include <string.h> +#include <cstdlib> +#include <cstring> extern "C" { diff --git a/src/suil_internal.h b/src/suil_internal.h index c55e2ee..bc67bf3 100644 --- a/src/suil_internal.h +++ b/src/suil_internal.h @@ -20,10 +20,14 @@ #include "dylib.h" #include "suil_config.h" +#include "lv2/core/lv2.h" #include "lv2/ui/ui.h" #include "suil/suil.h" -#include <assert.h> +#ifndef _WIN32 +# include <dlfcn.h> +#endif + #include <stdio.h> #include <stdlib.h> #include <string.h> diff --git a/src/x11_in_qt5.cpp b/src/x11_in_qt5.cpp index 8b96d50..87ddc2b 100644 --- a/src/x11_in_qt5.cpp +++ b/src/x11_in_qt5.cpp @@ -31,8 +31,8 @@ #include <X11/Xlib.h> #include <X11/Xutil.h> -#include <stdint.h> -#include <stdlib.h> +#include <cstdint> +#include <cstdlib> #undef signals diff --git a/suil/suil.h b/suil/suil.h index 48b418e..8cdafd6 100644 --- a/suil/suil.h +++ b/suil/suil.h @@ -24,6 +24,7 @@ #include "lv2/core/lv2.h" #include <stdbool.h> +#include <stdint.h> #ifdef _WIN32 # define SUIL_LIB_IMPORT __declspec(dllimport) @@ -4,7 +4,7 @@ from waflib import Build, Logs, Options, TaskGen from waflib.extras import autowaf # Semver package/library version -SUIL_VERSION = '0.10.8' +SUIL_VERSION = '0.10.9' SUIL_MAJOR_VERSION = SUIL_VERSION[0:SUIL_VERSION.find('.')] # Mandatory waf variables |