feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Help: Do not use specific model where abstract model is enough

Browse Source 
Change-Id: I1cbdd5d3ce1cf4735cff8bdfa71ea336a507c28a
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2019-09-02 14:03:05 +02:00
parent 758986ea0e
commit 142fa65ce1
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/help/openpagesswitcher.cpp
View File

@@ -26,7 +26,6 @@
#include "openpagesswitcher.h" #include "openpagesswitcher.h"
#include "centralwidget.h" #include "centralwidget.h"
#include "openpagesmodel.h"
#include "openpageswidget.h" #include "openpageswidget.h"
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
@@ -41,7 +40,7 @@ using namespace Help::Internal;
const int gWidth = 300; const int gWidth = 300;
const int gHeight = 200; const int gHeight = 200;
OpenPagesSwitcher::OpenPagesSwitcher(OpenPagesModel *model) OpenPagesSwitcher::OpenPagesSwitcher(QAbstractItemModel *model)
: QFrame(nullptr, Qt::Popup) : QFrame(nullptr, Qt::Popup)
, m_openPagesModel(model) , m_openPagesModel(model)
{ {

10
src/plugins/help/openpagesswitcher.h
View File

@@ -27,12 +27,14 @@
#include <QFrame> #include <QFrame>
QT_FORWARD_DECLARE_CLASS(QModelIndex) QT_BEGIN_NAMESPACE
class QAbstractItemModel;
class QModelIndex;
QT_END_NAMESPACE
namespace Help { namespace Help {
namespace Internal { namespace Internal {
class OpenPagesModel;
class OpenPagesWidget; class OpenPagesWidget;
class OpenPagesSwitcher : public QFrame class OpenPagesSwitcher : public QFrame
@@ -40,7 +42,7 @@ class OpenPagesSwitcher : public QFrame
Q_OBJECT Q_OBJECT
public: public:
OpenPagesSwitcher(OpenPagesModel *model); OpenPagesSwitcher(QAbstractItemModel *model);
~OpenPagesSwitcher() override; ~OpenPagesSwitcher() override;
void gotoNextPage(); void gotoNextPage();
@@ -61,7 +63,7 @@ private:
void selectPageUpDown(int summand); void selectPageUpDown(int summand);
private: private:
OpenPagesModel *m_openPagesModel = nullptr; QAbstractItemModel *m_openPagesModel = nullptr;
OpenPagesWidget *m_openPagesWidget = nullptr; OpenPagesWidget *m_openPagesWidget = nullptr;
}; };

3
src/plugins/help/openpageswidget.cpp
View File

@@ -26,7 +26,6 @@
#include "openpageswidget.h" #include "openpageswidget.h"
#include "centralwidget.h" #include "centralwidget.h"
#include "openpagesmodel.h"
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <utils/stringutils.h> #include <utils/stringutils.h>
@@ -39,7 +38,7 @@ using namespace Help::Internal;
// -- OpenPagesWidget // -- OpenPagesWidget
OpenPagesWidget::OpenPagesWidget(OpenPagesModel *sourceModel, QWidget *parent) OpenPagesWidget::OpenPagesWidget(QAbstractItemModel *sourceModel, QWidget *parent)
: OpenDocumentsTreeView(parent) : OpenDocumentsTreeView(parent)
, m_allowContextMenu(true) , m_allowContextMenu(true)
{ {

4
src/plugins/help/openpageswidget.h
View File

@@ -30,14 +30,12 @@
namespace Help { namespace Help {
namespace Internal { namespace Internal {
class OpenPagesModel;
class OpenPagesWidget : public Core::OpenDocumentsTreeView class OpenPagesWidget : public Core::OpenDocumentsTreeView
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit OpenPagesWidget(OpenPagesModel *model, QWidget *parent = nullptr); explicit OpenPagesWidget(QAbstractItemModel *model, QWidget *parent = nullptr);
~OpenPagesWidget() override; ~OpenPagesWidget() override;
void selectCurrentPage(); void selectCurrentPage();