forked from qt-creator/qt-creator
Help: Remove code paths supporting old filter engine < Qt 5.15
Change-Id: Ie3008ac78294f8831c22e73aa325e1da3b4016f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
@@ -31,13 +31,8 @@
|
||||
#include <QMutex>
|
||||
#include <QObject>
|
||||
#include <QUrl>
|
||||
#ifndef HELP_NEW_FILTER_ENGINE
|
||||
#include <QStandardItemModel>
|
||||
#include <functional>
|
||||
#else
|
||||
QT_FORWARD_DECLARE_CLASS(QHelpFilterEngine)
|
||||
#endif
|
||||
|
||||
QT_FORWARD_DECLARE_CLASS(QHelpFilterEngine)
|
||||
QT_FORWARD_DECLARE_CLASS(QHelpEngine)
|
||||
|
||||
class BookmarkManager;
|
||||
@@ -119,23 +114,12 @@ public:
|
||||
static QByteArray loadErrorMessage(const QUrl &url, const QString &errorString);
|
||||
Q_INVOKABLE static Help::Internal::LocalHelpManager::HelpData helpData(const QUrl &url);
|
||||
|
||||
#ifndef HELP_NEW_FILTER_ENGINE
|
||||
static QAbstractItemModel *filterModel();
|
||||
static void setFilterIndex(int index);
|
||||
static int filterIndex();
|
||||
|
||||
static void updateFilterModel();
|
||||
#else
|
||||
static QHelpFilterEngine *filterEngine();
|
||||
#endif
|
||||
|
||||
static bool canOpenOnlineHelp(const QUrl &url);
|
||||
static bool openOnlineHelp(const QUrl &url);
|
||||
|
||||
signals:
|
||||
#ifndef HELP_NEW_FILTER_ENGINE
|
||||
void filterIndexChanged(int index);
|
||||
#endif
|
||||
void fallbackFontChanged(const QFont &font);
|
||||
void fontZoomChanged(int percentage);
|
||||
void returnOnCloseChanged();
|
||||
@@ -146,12 +130,6 @@ private:
|
||||
static bool m_guiNeedsSetup;
|
||||
static bool m_needsCollectionFile;
|
||||
|
||||
#ifndef HELP_NEW_FILTER_ENGINE
|
||||
static QStandardItemModel *m_filterModel;
|
||||
static QString m_currentFilter;
|
||||
static int m_currentFilterIndex;
|
||||
#endif
|
||||
|
||||
static QMutex m_guiMutex;
|
||||
static QHelpEngine *m_guiEngine;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user