diff options
| -rw-r--r-- | examples/triage/files.h | 6 | ||||
| -rw-r--r-- | ui/action.h | 6 | ||||
| -rw-r--r-- | ui/featuremap.h | 6 | ||||
| -rw-r--r-- | ui/menus.h | 4 | ||||
| -rw-r--r-- | ui/progressindicator.h | 4 | ||||
| -rw-r--r-- | ui/reportwidget.h | 29 | ||||
| -rw-r--r-- | ui/typeview.h | 6 | ||||
| -rw-r--r-- | ui/viewframe.h | 6 |
8 files changed, 5 insertions, 62 deletions
diff --git a/examples/triage/files.h b/examples/triage/files.h index 01d8e75e..d0cfc2ab 100644 --- a/examples/triage/files.h +++ b/examples/triage/files.h @@ -2,11 +2,7 @@ #include <QtWidgets/QWidget> #include <QtWidgets/QTreeView> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWidgets/QFileSystemModel> -#else - #include <QtGui/QFileSystemModel> -#endif +#include <QtGui/QFileSystemModel> #include "action.h" #include "menus.h" diff --git a/ui/action.h b/ui/action.h index 0daad730..593e305c 100644 --- a/ui/action.h +++ b/ui/action.h @@ -3,11 +3,7 @@ #include <QtWidgets/QMenu> #include <QtWidgets/QMenuBar> #include <QtGui/QIcon> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWidgets/QShortcut> -#else - #include <QtGui/QShortcut> -#endif +#include <QtGui/QShortcut> #include <QtCore/QPointer> #include <functional> #include <map> diff --git a/ui/featuremap.h b/ui/featuremap.h index f67d4443..9376aa5d 100644 --- a/ui/featuremap.h +++ b/ui/featuremap.h @@ -1,11 +1,7 @@ #pragma once #include <QtGui/QColor> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWidgets/QAction> -#else - #include <QtGui/QAction> -#endif +#include <QtGui/QAction> #include <QtGui/QImage> #include <QtWidgets/QMenu> #include <QtGui/QPainter> @@ -89,11 +89,7 @@ class BINARYNINJAUIAPI MenuHelper : public QLabel void underMouseTimerEvent(); protected: -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void enterEvent(QEvent* event) override; -#else void enterEvent(QEnterEvent* event) override; -#endif void leaveEvent(QEvent* event) override; void mousePressEvent(QMouseEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override; diff --git a/ui/progressindicator.h b/ui/progressindicator.h index 128f49f4..31eda8ab 100644 --- a/ui/progressindicator.h +++ b/ui/progressindicator.h @@ -106,11 +106,7 @@ class BINARYNINJAUIAPI QProgressIndicator : public QWidget void rightClicked(); protected: -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - void enterEvent(QEvent* event) override; -#else void enterEvent(QEnterEvent* event) override; -#endif void leaveEvent(QEvent* event) override; void mouseReleaseEvent(QMouseEvent* event) override { diff --git a/ui/reportwidget.h b/ui/reportwidget.h index 515cb395..b9b2441b 100644 --- a/ui/reportwidget.h +++ b/ui/reportwidget.h @@ -3,35 +3,10 @@ #include <QtWidgets/QWidget> #include <QtWidgets/QTextBrowser> #include <QtWidgets/QScrollArea> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWebEngineWidgets/QWebEngineView> - #include <QtWebEngineWidgets/QWebEngineScript> - #include <QtWebEngineWidgets/QWebEngineScriptCollection> - #include <QtWebEngineWidgets/QWebEnginePage> - #include <QtWebEngineWidgets/QWebEngineSettings> -#else - #include <QtWidgets/QTextBrowser> -#endif #include "binaryninjaapi.h" #include "action.h" #include "theme.h" -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) -class WebPage2 : public QWebEnginePage -{ - Q_OBJECT - - public: - WebPage2(QObject* parent = nullptr) : QWebEnginePage(parent) {} - - protected: - virtual bool acceptNavigationRequest(const QUrl& url, QWebEnginePage::NavigationType type, bool isMainFrame); - - Q_SIGNALS: - void linkClicked(const QUrl&); -}; -#endif - /*! \defgroup reportwidget @@ -45,11 +20,7 @@ class BINARYNINJAUIAPI ReportWidget : public QScrollArea, public UIActionHandler { Q_OBJECT -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - QWebEngineView* m_contents; -#else QTextBrowser* m_contents; -#endif BinaryViewRef m_view; std::string m_original; std::string m_title; diff --git a/ui/typeview.h b/ui/typeview.h index 1aa89cc8..845bc6bc 100644 --- a/ui/typeview.h +++ b/ui/typeview.h @@ -2,11 +2,7 @@ #include <QtWidgets/QAbstractScrollArea> #include <QtWidgets/QComboBox> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWidgets/QAction> -#else - #include <QtGui/QAction> -#endif +#include <QtGui/QAction> #include <QtCore/QTimer> #include <string> #include <utility> diff --git a/ui/viewframe.h b/ui/viewframe.h index 9803548c..74b87624 100644 --- a/ui/viewframe.h +++ b/ui/viewframe.h @@ -1,11 +1,7 @@ #pragma once #include <QtWidgets/QGestureEvent> -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - #include <QtWidgets/QAction> -#else - #include <QtGui/QAction> -#endif +#include <QtGui/QAction> #include <QtWidgets/QLabel> #include <QtCore/QPointer> #include <QtWidgets/QVBoxLayout> |