Commit 843ea4d0 authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt to new api

parent f1039a89
......@@ -32,7 +32,7 @@ if(${CMAKE_SOURCE_DIR} STREQUAL ${akregator_SOURCE_DIR})
find_package(Grantlee5 "5.0" CONFIG REQUIRED)
set(LIBKLEO_LIB_VERSION_LIB "5.2.40")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.58")
set(MESSAGELIB_LIB_VERSION_LIB "5.2.59")
set(KDEPIMLIBS_LIB_VERSION "5.2.40")
set(KPIMTEXTEDIT_LIB_VERSION "5.2.40")
set(KDEPIM_LIB_VERSION "${KDEPIM_VERSION_NUMBER}")
......
......@@ -27,7 +27,7 @@
#include <kpimtextedit/slidecontainer.h>
#include <MessageViewer/FindBarWebEngineView>
#include <WebEngineViewer/FindBarWebEngineView>
using namespace Akregator;
......@@ -65,9 +65,9 @@ void ArticleViewerWebEngineWidgetNg::initializeLayout(KActionCollection *ac)
mSliderContainer = new KPIMTextEdit::SlideContainer(this);
mSliderContainer->setObjectName(QStringLiteral("slidercontainer"));
mFindBarWebView = new MessageViewer::FindBarWebEngineView(mArticleViewerNg, this);
mFindBarWebView = new WebEngineViewer::FindBarWebEngineView(mArticleViewerNg, this);
mFindBarWebView->setObjectName(QStringLiteral("findbarwebview"));
connect(mFindBarWebView, &MessageViewer::FindBarBase::hideFindBar, mSliderContainer, &KPIMTextEdit::SlideContainer::slideOut);
connect(mFindBarWebView, &WebEngineViewer::FindBarWebEngineView::hideFindBar, mSliderContainer, &KPIMTextEdit::SlideContainer::slideOut);
mSliderContainer->setContent(mFindBarWebView);
layout->addWidget(mSliderContainer);
connect(articleViewerNg(), &ArticleViewerWebEngine::textToSpeech, this, &ArticleViewerWebEngineWidgetNg::slotSpeakText);
......
......@@ -24,7 +24,6 @@
class KActionCollection;
namespace MessageViewer
{
class FindBarWebEngineView;
class ViewerPluginToolManager;
class ViewerPluginInterface;
}
......@@ -35,6 +34,11 @@ class SlideContainer;
class TextToSpeechWidget;
}
namespace WebEngineViewer
{
class FindBarWebEngineView;
}
namespace Akregator
{
class AKREGATOR_EXPORT ArticleViewerWebEngineWidgetNg : public QWidget
......@@ -53,7 +57,7 @@ public Q_SLOTS:
private:
void initializeActions(KActionCollection *ac);
void initializeLayout(KActionCollection *ac);
MessageViewer::FindBarWebEngineView *mFindBarWebView;
WebEngineViewer::FindBarWebEngineView *mFindBarWebView;
ArticleViewerWebEngine *mArticleViewerNg;
KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget;
KPIMTextEdit::SlideContainer *mSliderContainer;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment