diff options
| author | David Robillard <d@drobilla.net> | 2021-02-15 10:19:32 -0500 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2021-02-15 10:19:32 -0500 |
| commit | f235528015532bc0885330476f2a3b666c4c9a4a (patch) | |
| tree | 57688e1a1f0169a09fc32cb55c4f65a038851822 /src | |
| parent | 8952dde02d9d6761ae0cae033600f4a220c8e075 (diff) | |
| download | jalv-f235528015532bc0885330476f2a3b666c4c9a4a.tar.gz jalv-f235528015532bc0885330476f2a3b666c4c9a4a.tar.bz2 jalv-f235528015532bc0885330476f2a3b666c4c9a4a.zip | |
Remove Qt4 support
Diffstat (limited to 'src')
| -rw-r--r-- | src/jalv_qt.cpp | 74 |
1 files changed, 29 insertions, 45 deletions
diff --git a/src/jalv_qt.cpp b/src/jalv_qt.cpp index 165ac50..ab528fd 100644 --- a/src/jalv_qt.cpp +++ b/src/jalv_qt.cpp @@ -22,38 +22,34 @@ #include <QtGlobal> -#if QT_VERSION >= 0x050000 -# include <QAction> -# include <QApplication> -# include <QDial> -# include <QFontMetrics> -# include <QGroupBox> -# include <QGuiApplication> -# include <QHBoxLayout> -# include <QKeySequence> -# include <QLabel> -# include <QLayout> -# include <QLayoutItem> -# include <QList> -# include <QMainWindow> -# include <QMenu> -# include <QMenuBar> -# include <QObject> -# include <QPoint> -# include <QRect> -# include <QScreen> -# include <QScrollArea> -# include <QSize> -# include <QSizePolicy> -# include <QString> -# include <QStyle> -# include <QTimer> -# include <QVBoxLayout> -# include <QWidget> -# include <QtCore> -#else -# include <QtGui> -#endif +#include <QAction> +#include <QApplication> +#include <QDial> +#include <QFontMetrics> +#include <QGroupBox> +#include <QGuiApplication> +#include <QHBoxLayout> +#include <QKeySequence> +#include <QLabel> +#include <QLayout> +#include <QLayoutItem> +#include <QList> +#include <QMainWindow> +#include <QMenu> +#include <QMenuBar> +#include <QObject> +#include <QPoint> +#include <QRect> +#include <QScreen> +#include <QScrollArea> +#include <QSize> +#include <QSizePolicy> +#include <QString> +#include <QStyle> +#include <QTimer> +#include <QVBoxLayout> +#include <QWidget> +#include <QtCore> #include <algorithm> #include <cmath> @@ -347,11 +343,7 @@ private: std::map<float, const char*> scaleMap; }; -#if QT_VERSION >= 0x050000 -# include "jalv_qt5_meta.hpp" // IWYU pragma: keep -#else -# include "jalv_qt4_meta.hpp" // IWYU pragma: keep -#endif +#include "jalv_qt5_meta.hpp" // IWYU pragma: keep extern "C" { @@ -367,11 +359,7 @@ jalv_init(int* argc, char*** argv, JalvOptions*) const char* jalv_native_ui_type(void) { -#if QT_VERSION >= 0x050000 return "http://lv2plug.in/ns/extensions/ui#Qt5UI"; -#else - return "http://lv2plug.in/ns/extensions/ui#Qt4UI"; -#endif } void @@ -717,11 +705,7 @@ jalv_discover_ui(Jalv*) float jalv_ui_refresh_rate(Jalv*) { -#if QT_VERSION >= 0x050000 return (float)QGuiApplication::primaryScreen()->refreshRate(); -#else - return 30.0f; -#endif } int |