Commit 3dec5f4a authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Adapt class

parent 3bb9072a
......@@ -31,7 +31,7 @@
using namespace Akregator;
ArticleViewerWebEngineWidgetNg::ArticleViewerWebEngineWidgetNg(ArticleViewerNg *customViewer, KActionCollection *ac, QWidget *parent)
ArticleViewerWebEngineWidgetNg::ArticleViewerWebEngineWidgetNg(ArticleViewerWebEngine *customViewer, KActionCollection *ac, QWidget *parent)
: QWidget(parent)
{
mArticleViewerNg = customViewer;
......@@ -77,7 +77,7 @@ ArticleViewerWebEngineWidgetNg::~ArticleViewerWebEngineWidgetNg()
}
ArticleViewerNg *ArticleViewerWebEngineWidgetNg::articleViewerNg() const
ArticleViewerWebEngine *ArticleViewerWebEngineWidgetNg::articleViewerNg() const
{
return mArticleViewerNg;
}
......
......@@ -19,8 +19,8 @@
#define ARTICLEVIEWERWEBENGINEWIDGETNG_H
#include <QWidget>
#include "articleviewerng.h"
#include "akregator_export.h"
#include "articleviewerwebengine.h"
class KActionCollection;
namespace MessageViewer
{
......@@ -39,11 +39,11 @@ class AKREGATOR_EXPORT ArticleViewerWebEngineWidgetNg : public QWidget
{
Q_OBJECT
public:
explicit ArticleViewerWebEngineWidgetNg(ArticleViewerNg *customViewer, KActionCollection *ac, QWidget *parent);
explicit ArticleViewerWebEngineWidgetNg(ArticleViewerWebEngine *customViewer, KActionCollection *ac, QWidget *parent);
explicit ArticleViewerWebEngineWidgetNg(KActionCollection *ac, QWidget *parent = Q_NULLPTR);
~ArticleViewerWebEngineWidgetNg();
ArticleViewerNg *articleViewerNg() const;
ArticleViewerWebEngine *articleViewerNg() const;
public Q_SLOTS:
void slotSpeakText();
......@@ -52,7 +52,7 @@ private:
void initializeActions(KActionCollection *ac);
void initializeLayout(KActionCollection *ac);
MessageViewer::FindBarWebView *mFindBarWebView;
ArticleViewerNg *mArticleViewerNg;
ArticleViewerWebEngine *mArticleViewerNg;
KPIMTextEdit::TextToSpeechWidget *mTextToSpeechWidget;
KPIMTextEdit::SlideContainer *mSliderContainer;
};
......
......@@ -20,6 +20,7 @@
#include <QVBoxLayout>
#include <QAction>
#include <KIO/FavIconRequestJob>
#include <articleviewer-ng/webengine/articleviewerwebenginewidgetng.h>
using namespace Akregator;
WebEngineFrame::WebEngineFrame(KActionCollection *ac, QWidget *parent)
......@@ -29,7 +30,7 @@ WebEngineFrame::WebEngineFrame(KActionCollection *ac, QWidget *parent)
layout->setMargin(0);
setRemovable(true);
Akregator::ArticleViewerWebEngine *viewer = new Akregator::ArticleViewerWebEngine(ac, this);
mArticleViewerWidgetNg = new Akregator::WebEngineViewer(viewer, ac, this);
mArticleViewerWidgetNg = new Akregator::ArticleViewerWebEngineWidgetNg(viewer, ac, this);
connect(mArticleViewerWidgetNg->articleViewerNg(), &ArticleViewerNg::titleChanged, this, &WebEngineFrame::slotTitleChanged);
connect(mArticleViewerWidgetNg->articleViewerNg(), &ArticleViewerNg::loadProgress, this, &WebEngineFrame::slotProgressChanged);
......
......@@ -20,11 +20,11 @@
#include "frame.h"
#include "akregatorpart_export.h"
#include "webengineviewer.h"
#include <QObject>
namespace Akregator
{
class ArticleViewerWebEngineWidgetNg;
class AKREGATORPART_EXPORT WebEngineFrame : public Frame
{
Q_OBJECT
......@@ -69,7 +69,7 @@ private Q_SLOTS:
void slotLoadStarted();
void slotLoadFinished();
private:
Akregator::WebEngineViewer *mArticleViewerWidgetNg;
Akregator::ArticleViewerWebEngineWidgetNg *mArticleViewerWidgetNg;
};
}
......
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