From 8ff13bb12903da3306e7709fc8bf6416aa1ca15b Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Thu, 8 Apr 2021 13:55:03 +0200 Subject: Remove unneeded QT_VERSION_CHECKs Change-Id: I96819569024a111deabe8d0022cc1c6455db7d29 Reviewed-by: Kai Koehne Reviewed-by: Friedemann Kleint --- src/assistant/assistant/aboutdialog.cpp | 7 -- src/assistant/assistant/aboutdialog.h | 4 - src/assistant/assistant/helpviewer.h | 4 - src/assistant/assistant/helpviewer_qtb.cpp | 6 -- src/assistant/help/qhelpsearchresultwidget.cpp | 4 - src/designer/src/lib/uilib/abstractformbuilder.cpp | 102 --------------------- src/designer/src/lib/uilib/abstractformbuilder.h | 10 -- 7 files changed, 137 deletions(-) diff --git a/src/assistant/assistant/aboutdialog.cpp b/src/assistant/assistant/aboutdialog.cpp index 774b6fd4b..e522a2855 100644 --- a/src/assistant/assistant/aboutdialog.cpp +++ b/src/assistant/assistant/aboutdialog.cpp @@ -81,17 +81,10 @@ QVariant AboutLabel::loadResource(int type, const QUrl &name) return QVariant(); } - -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -void AboutLabel::setSource(const QUrl &url) -#else void AboutLabel::doSetSource(const QUrl &url, QTextDocument::ResourceType type) -#endif { TRACE_OBJ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) Q_UNUSED(type); -#endif if (url.isValid() && (!HelpViewer::isLocalUrl(url) || !HelpViewer::canOpenPage(url.path()))) { if (!QDesktopServices::openUrl(url)) { diff --git a/src/assistant/assistant/aboutdialog.h b/src/assistant/assistant/aboutdialog.h index 720292d7b..da61e1880 100644 --- a/src/assistant/assistant/aboutdialog.h +++ b/src/assistant/assistant/aboutdialog.h @@ -50,11 +50,7 @@ public: private: QVariant loadResource(int type, const QUrl &name) override; -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - void setSource(const QUrl &url) override; -#else void doSetSource(const QUrl &name, QTextDocument::ResourceType type) override; -#endif QMap m_resourceMap; }; diff --git a/src/assistant/assistant/helpviewer.h b/src/assistant/assistant/helpviewer.h index 84ab800c3..2aa12d0c0 100644 --- a/src/assistant/assistant/helpviewer.h +++ b/src/assistant/assistant/helpviewer.h @@ -82,11 +82,7 @@ public: void setTitle(const QString &title); QUrl source() const; -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - void setSource(const QUrl &url) TEXTBROWSER_OVERRIDE; -#else void doSetSource(const QUrl &url, QTextDocument::ResourceType type) TEXTBROWSER_OVERRIDE; -#endif QString selectedText() const; bool isForwardAvailable() const; diff --git a/src/assistant/assistant/helpviewer_qtb.cpp b/src/assistant/assistant/helpviewer_qtb.cpp index e8eb27338..09607e9a3 100644 --- a/src/assistant/assistant/helpviewer_qtb.cpp +++ b/src/assistant/assistant/helpviewer_qtb.cpp @@ -144,16 +144,10 @@ QUrl HelpViewer::source() const return QTextBrowser::source(); } -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) -void HelpViewer::setSource(const QUrl &url) -#else void HelpViewer::doSetSource(const QUrl &url, QTextDocument::ResourceType type) -#endif { TRACE_OBJ -#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) Q_UNUSED(type); -#endif if (launchWithExternalApp(url)) return; diff --git a/src/assistant/help/qhelpsearchresultwidget.cpp b/src/assistant/help/qhelpsearchresultwidget.cpp index 9c01032ba..513599575 100644 --- a/src/assistant/help/qhelpsearchresultwidget.cpp +++ b/src/assistant/help/qhelpsearchresultwidget.cpp @@ -113,11 +113,7 @@ signals: void requestShowLink(const QUrl &url); private slots: -#if QT_VERSION < QT_VERSION_CHECK(6,0,0) - void setSource(const QUrl & /* name */) override {} -#else void doSetSource(const QUrl & /*name*/, QTextDocument::ResourceType /*type*/) override {} -#endif }; diff --git a/src/designer/src/lib/uilib/abstractformbuilder.cpp b/src/designer/src/lib/uilib/abstractformbuilder.cpp index cbe53f392..417904e46 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.cpp +++ b/src/designer/src/lib/uilib/abstractformbuilder.cpp @@ -2518,34 +2518,6 @@ QMetaEnum QAbstractFormBuilder::toolBarAreaMetaEnum() return metaEnum("toolBarArea"); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - -/*! - \internal - Return paths of an icon. -*/ - -QAbstractFormBuilder::IconPaths QAbstractFormBuilder::iconPaths(const QIcon &icon) const -{ - Q_UNUSED(icon); - qWarning() << "QAbstractFormBuilder::iconPaths() is obsoleted"; - return IconPaths(); -} - -/*! - \internal - Return paths of a pixmap. -*/ - -QAbstractFormBuilder::IconPaths QAbstractFormBuilder::pixmapPaths(const QPixmap &pixmap) const -{ - Q_UNUSED(pixmap); - qWarning() << "QAbstractFormBuilder::pixmapPaths() is obsoleted"; - return IconPaths(); -} - -#endif // < Qt 6 - /*! \internal Set up a DOM property with icon. @@ -2575,22 +2547,6 @@ void QAbstractFormBuilder::setPixmapProperty(DomProperty &p, const IconPaths &ip QFormBuilderExtra::setPixmapProperty(&p, ip); } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - -/*! - \internal - Convenience. Return DOM property for icon; 0 if icon.isNull(). -*/ - -DomProperty* QAbstractFormBuilder::iconToDomProperty(const QIcon &icon) const -{ - Q_UNUSED(icon); - qWarning() << "QAbstractFormBuilder::iconToDomProperty() is obsoleted"; - return nullptr; -} - -#endif // < Qt 6 - /*! \internal \since 4.4 @@ -2642,64 +2598,6 @@ const DomResourcePixmap *QAbstractFormBuilder::domPixmap(const DomProperty* p) { return nullptr; } -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - -/*! - \internal - Create icon from DOM. - From 4.4 - unused -*/ - -QIcon QAbstractFormBuilder::domPropertyToIcon(const DomResourcePixmap *icon) -{ - Q_UNUSED(icon); - qWarning() << "QAbstractFormBuilder::domPropertyToIcon() is obsoleted"; - return QIcon(); -} - -/*! - \internal - Create icon from DOM. Assert if !domPixmap - From 4.4 - unused -*/ - -QIcon QAbstractFormBuilder::domPropertyToIcon(const DomProperty* p) -{ - Q_UNUSED(p); - qWarning() << "QAbstractFormBuilder::domPropertyToIcon() is obsoleted"; - return QIcon(); -} - - -/*! - \internal - Create pixmap from DOM. - From 4.4 - unused -*/ - -QPixmap QAbstractFormBuilder::domPropertyToPixmap(const DomResourcePixmap* pixmap) -{ - Q_UNUSED(pixmap); - qWarning() << "QAbstractFormBuilder::domPropertyToPixmap() is obsoleted"; - return QPixmap(); -} - - -/*! - \internal - Create pixmap from DOM. Assert if !domPixmap - From 4.4 - unused -*/ - -QPixmap QAbstractFormBuilder::domPropertyToPixmap(const DomProperty* p) -{ - Q_UNUSED(p); - qWarning() << "QAbstractFormBuilder::domPropertyToPixmap() is obsoleted"; - return QPixmap(); -} - -#endif // < Qt 6 - /*! \fn void QAbstractFormBuilder::createConnections ( DomConnections *, QWidget * ) \internal diff --git a/src/designer/src/lib/uilib/abstractformbuilder.h b/src/designer/src/lib/uilib/abstractformbuilder.h index d33ceb76c..41982edf0 100644 --- a/src/designer/src/lib/uilib/abstractformbuilder.h +++ b/src/designer/src/lib/uilib/abstractformbuilder.h @@ -237,16 +237,6 @@ protected: static const DomResourcePixmap *domPixmap(const DomProperty* p); -#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) - IconPaths iconPaths(const QIcon &) const; - IconPaths pixmapPaths(const QPixmap &) const; - DomProperty* iconToDomProperty(const QIcon &) const; - QIcon domPropertyToIcon(const DomResourcePixmap *); - QIcon domPropertyToIcon(const DomProperty* p); - QPixmap domPropertyToPixmap(const DomResourcePixmap* p); - QPixmap domPropertyToPixmap(const DomProperty* p); -#endif - private: // // utils -- cgit v1.2.1