diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -42,7 +42,7 @@ set(KONTACTINTERFACE_LIB_VERSION "5.11.40") set(KPIMTEXTEDIT_LIB_VERSION "5.11.40") -set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.11.40") +set(LIBGRANTLEETHEME_LIB_VERSION_LIB "5.11.41") set(LIBKDEPIM_LIB_VERSION_LIB "5.11.40") set(LIBKLEO_LIB_VERSION_LIB "5.11.40") set(MESSAGELIB_LIB_VERSION_LIB "5.11.40") diff --git a/src/formatter/grantleeviewformatter.h b/src/formatter/grantleeviewformatter.h --- a/src/formatter/grantleeviewformatter.h +++ b/src/formatter/grantleeviewformatter.h @@ -20,17 +20,16 @@ #ifndef GRANTLEEVIEWFORMATTER_H #define GRANTLEEVIEWFORMATTER_H -#include "PimCommon/GenericGrantleeFormatter" +#include #include "article.h" #include "articleformatter.h" #include namespace Akregator { class Folder; -class GrantleeViewFormatter : public PimCommon::GenericGrantleeFormatter +class GrantleeViewFormatter : public GrantleeTheme::GenericFormatter { - Q_OBJECT public: - explicit GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, const QUrl &imageDir, int deviceDpiY, QObject *parent = nullptr); + explicit GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, const QUrl &imageDir, int deviceDpiY); ~GrantleeViewFormatter(); QString formatArticles(const QVector
&article, ArticleFormatter::IconOption icon); diff --git a/src/formatter/grantleeviewformatter.cpp b/src/formatter/grantleeviewformatter.cpp --- a/src/formatter/grantleeviewformatter.cpp +++ b/src/formatter/grantleeviewformatter.cpp @@ -33,8 +33,8 @@ using namespace Akregator; -GrantleeViewFormatter::GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, const QUrl &imageDir, int deviceDpiY, QObject *parent) - : PimCommon::GenericGrantleeFormatter(htmlFileName, themePath, parent) +GrantleeViewFormatter::GrantleeViewFormatter(const QString &htmlFileName, const QString &themePath, const QUrl &imageDir, int deviceDpiY) + : GrantleeTheme::GenericFormatter(htmlFileName, themePath) , mImageDir(imageDir) , mHtmlArticleFileName(htmlFileName) , mGrantleeThemePath(QStringLiteral("file://") + themePath + QLatin1Char('/'))