diff --git a/kdevplatform/documentation/documentationview.h b/kdevplatform/documentation/documentationview.h --- a/kdevplatform/documentation/documentationview.h +++ b/kdevplatform/documentation/documentationview.h @@ -41,15 +41,13 @@ public: DocumentationView(QWidget* parent, ProvidersModel* m); - void showDocumentation(const KDevelop::IDocumentation::Ptr& doc); - public: QList contextMenuActions() const; public Q_SLOTS: void initialize(); - void addHistory(const KDevelop::IDocumentation::Ptr& doc); + void showDocumentation(const KDevelop::IDocumentation::Ptr& doc); void emptyHistory(); void browseForward(); diff --git a/kdevplatform/documentation/documentationview.cpp b/kdevplatform/documentation/documentationview.cpp --- a/kdevplatform/documentation/documentationview.cpp +++ b/kdevplatform/documentation/documentationview.cpp @@ -132,11 +132,6 @@ { mProviders->setModel(mProvidersModel); connect(mProviders, static_cast(&QComboBox::activated), this, &DocumentationView::changedProvider); - foreach (IDocumentationProvider* p, mProvidersModel->providers()) { - // can't use new signal/slot syntax here, IDocumentation is not a QObject - connect(dynamic_cast(p), SIGNAL(addHistory(KDevelop::IDocumentation::Ptr)), - this, SLOT(addHistory(KDevelop::IDocumentation::Ptr))); - } connect(mProvidersModel, &ProvidersModel::providersChanged, this, &DocumentationView::emptyHistory); const bool hasProviders = (mProviders->count() > 0); @@ -210,12 +205,6 @@ { qCDebug(DOCUMENTATION) << "showing" << doc->name(); - addHistory(doc); - updateView(); -} - -void DocumentationView::addHistory(const IDocumentation::Ptr& doc) -{ mBack->setEnabled(!mHistory.isEmpty()); mForward->setEnabled(false); @@ -236,6 +225,8 @@ if (mIdentifiers->completer()->model() == (*mCurrent)->provider()->indexModel()) { mIdentifiers->setText((*mCurrent)->name()); } + + updateView(); } void DocumentationView::emptyHistory() diff --git a/kdevplatform/interfaces/idocumentationprovider.h b/kdevplatform/interfaces/idocumentationprovider.h --- a/kdevplatform/interfaces/idocumentationprovider.h +++ b/kdevplatform/interfaces/idocumentationprovider.h @@ -53,9 +53,6 @@ /** @returns a documentation item where we can show some home page information such a context index. */ virtual IDocumentation::Ptr homePage() const = 0; - -Q_SIGNALS: - virtual void addHistory(const KDevelop::IDocumentation::Ptr& doc) = 0; }; } diff --git a/plugins/cmake/cmakedocumentation.h b/plugins/cmake/cmakedocumentation.h --- a/plugins/cmake/cmakedocumentation.h +++ b/plugins/cmake/cmakedocumentation.h @@ -55,9 +55,6 @@ KDevelop::IDocumentation::Ptr homePage() const override; QString descriptionForIdentifier(const QString& identifier, Type t) const; - - Q_SIGNALS: - void addHistory(const KDevelop::IDocumentation::Ptr& doc) override; private: CMakeCommandsContents* m_index; diff --git a/plugins/manpage/manpageplugin.h b/plugins/manpage/manpageplugin.h --- a/plugins/manpage/manpageplugin.h +++ b/plugins/manpage/manpageplugin.h @@ -49,9 +49,6 @@ ManPageModel* model() const; QProgressBar* progressBar() const; -Q_SIGNALS: - void addHistory(const KDevelop::IDocumentation::Ptr& doc) override; - private: KDevelop::IDocumentation::Ptr documentationForIdentifier(const QString& identifier) const; diff --git a/plugins/qthelp/qthelpdocumentation.cpp b/plugins/qthelp/qthelpdocumentation.cpp --- a/plugins/qthelp/qthelpdocumentation.cpp +++ b/plugins/qthelp/qthelpdocumentation.cpp @@ -292,8 +292,6 @@ { Q_ASSERT(lastView); m_provider->jumpedTo(newUrl); - setUserStyleSheet(lastView, newUrl); - lastView->load(newUrl); } IDocumentationProvider* QtHelpDocumentation::provider() const diff --git a/plugins/qthelp/qthelpproviderabstract.h b/plugins/qthelp/qthelpproviderabstract.h --- a/plugins/qthelp/qthelpproviderabstract.h +++ b/plugins/qthelp/qthelpproviderabstract.h @@ -51,8 +51,6 @@ HelpNetworkAccessManager* networkAccess() const; public Q_SLOTS: void jumpedTo(const QUrl& newUrl); -Q_SIGNALS: - void addHistory(const KDevelop::IDocumentation::Ptr& doc) override; protected: QHelpEngine m_engine; HelpNetworkAccessManager* const m_nam; diff --git a/plugins/qthelp/qthelpproviderabstract.cpp b/plugins/qthelp/qthelpproviderabstract.cpp --- a/plugins/qthelp/qthelpproviderabstract.cpp +++ b/plugins/qthelp/qthelpproviderabstract.cpp @@ -26,6 +26,9 @@ #include +#include +#include + #include #include #include @@ -97,7 +100,7 @@ QMap info; info.insert(newUrl.toString(), newUrl); IDocumentation::Ptr doc(new QtHelpDocumentation(newUrl.toString(), info)); - emit addHistory(doc); + ICore::self()->documentationController()->showDocumentation(doc); } IDocumentation::Ptr QtHelpProviderAbstract::homePage() const