diff --git a/src/widgets/availablepagesview.h b/src/widgets/availablepagesview.h --- a/src/widgets/availablepagesview.h +++ b/src/widgets/availablepagesview.h @@ -48,22 +48,22 @@ Q_OBJECT public: typedef QSharedPointer DialogPtr; - typedef std::function DialogFactory; + typedef std::function ProjectDialogFactory; explicit AvailablePagesView(QWidget *parent = Q_NULLPTR); QHash globalActions() const; QObject *model() const; QAbstractItemModel *projectSourcesModel() const; Domain::DataSource::Ptr defaultProjectSource() const; - DialogFactory dialogFactory() const; + ProjectDialogFactory projectDialogFactory() const; public slots: void setModel(QObject *model); void setProjectSourcesModel(QAbstractItemModel *sources); void setDefaultProjectSource(const Domain::DataSource::Ptr &source); - void setDialogFactory(const DialogFactory &factory); + void setProjectDialogFactory(const ProjectDialogFactory &factory); void setMessageBoxInterface(const MessageBoxInterface::Ptr &interface); signals: @@ -83,7 +83,7 @@ QAbstractItemModel *m_sources; Domain::DataSource::Ptr m_defaultSource; QTreeView *m_pagesView; - DialogFactory m_dialogFactory; + ProjectDialogFactory m_projectDialogFactory; MessageBoxInterface::Ptr m_messageBoxInterface; }; diff --git a/src/widgets/availablepagesview.cpp b/src/widgets/availablepagesview.cpp --- a/src/widgets/availablepagesview.cpp +++ b/src/widgets/availablepagesview.cpp @@ -82,7 +82,7 @@ layout->addLayout(actionBarLayout); setLayout(layout); - m_dialogFactory = [] (QWidget *parent) { + m_projectDialogFactory = [] (QWidget *parent) { return DialogPtr(new NewPageDialog(parent)); }; m_messageBoxInterface = MessageBox::Ptr::create(); @@ -127,9 +127,9 @@ return m_defaultSource; } -AvailablePagesView::DialogFactory AvailablePagesView::dialogFactory() const +AvailablePagesView::ProjectDialogFactory AvailablePagesView::projectDialogFactory() const { - return m_dialogFactory; + return m_projectDialogFactory; } void AvailablePagesView::setModel(QObject *model) @@ -165,9 +165,9 @@ m_defaultSource = source; } -void AvailablePagesView::setDialogFactory(const AvailablePagesView::DialogFactory &factory) +void AvailablePagesView::setProjectDialogFactory(const AvailablePagesView::ProjectDialogFactory &factory) { - m_dialogFactory = factory; + m_projectDialogFactory = factory; } void AvailablePagesView::setMessageBoxInterface(const MessageBoxInterface::Ptr &interface) @@ -186,7 +186,7 @@ void AvailablePagesView::onAddTriggered() { - NewPageDialogInterface::Ptr dialog = m_dialogFactory(this); + NewPageDialogInterface::Ptr dialog = m_projectDialogFactory(this); dialog->setDataSourcesModel(m_sources); if (dialog->exec() == QDialog::Accepted) { diff --git a/tests/units/widgets/availablepagesviewtest.cpp b/tests/units/widgets/availablepagesviewtest.cpp --- a/tests/units/widgets/availablepagesviewtest.cpp +++ b/tests/units/widgets/availablepagesviewtest.cpp @@ -167,7 +167,7 @@ auto goNextAction = available.findChild("goNextAction"); QVERIFY(goNextAction); - auto factory = available.dialogFactory(); + auto factory = available.projectDialogFactory(); QVERIFY(factory(&available).dynamicCast()); auto actions = available.globalActions(); @@ -212,7 +212,7 @@ available.setModel(&model); available.setProjectSourcesModel(&sourceModel); available.setDefaultProjectSource(source); - available.setDialogFactory([dialogStub] (QWidget *parent) { + available.setProjectDialogFactory([dialogStub] (QWidget *parent) { dialogStub->parent = parent; dialogStub->setPageType(Widgets::NewPageDialogInterface::Project); return dialogStub; @@ -247,7 +247,7 @@ available.setModel(&model); available.setProjectSourcesModel(&sourceModel); available.setDefaultProjectSource(source); - available.setDialogFactory([dialogStub] (QWidget *parent) { + available.setProjectDialogFactory([dialogStub] (QWidget *parent) { dialogStub->parent = parent; dialogStub->setPageType(Widgets::NewPageDialogInterface::Context); return dialogStub; @@ -280,7 +280,7 @@ available.setModel(&model); available.setProjectSourcesModel(&sourceModel); available.setDefaultProjectSource(source); - available.setDialogFactory([dialogStub] (QWidget *parent) { + available.setProjectDialogFactory([dialogStub] (QWidget *parent) { dialogStub->parent = parent; dialogStub->setPageType(Widgets::NewPageDialogInterface::Tag); return dialogStub;