From 729453a06ac2cc6babbb2153fe67fa5688b287b8 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Fri, 29 Oct 2021 13:01:52 +0200 Subject: [PATCH] make it all work with qt6 --- pri/vars.pri | 6 ++-- .../desktop/com.github.rssguard.appdata.xml | 2 +- src/librssguard/3rd-party/sc/simplecrypt.cpp | 4 +-- src/librssguard/database/databasefactory.cpp | 4 +++ src/librssguard/database/databasequeries.cpp | 2 +- .../gui/dialogs/formmessagefiltersmanager.cpp | 2 +- src/librssguard/gui/messagesview.cpp | 2 +- src/librssguard/gui/settings/settingsgui.cpp | 7 +++- src/librssguard/gui/webbrowser.cpp | 18 ++++++++--- src/librssguard/gui/webviewer.cpp | 32 ++++++++++++++----- src/librssguard/gui/webviewer.h | 2 +- src/librssguard/miscellaneous/application.cpp | 9 ++++++ src/librssguard/miscellaneous/application.h | 11 +++++++ .../miscellaneous/notification.cpp | 28 ++++++++++++++++ .../miscellaneous/regexfactory.cpp | 4 +-- .../network-web/downloadmanager.cpp | 2 +- src/librssguard/network-web/webfactory.cpp | 6 +++- src/librssguard/network-web/webpage.cpp | 4 +++ .../services/abstract/serviceroot.h | 8 +++++ .../services/greader/greadernetwork.cpp | 2 +- .../services/standard/atomparser.cpp | 2 -- .../services/standard/rdfparser.cpp | 2 -- .../services/standard/rssparser.cpp | 2 -- src/rssguard/main.cpp | 7 ++-- 24 files changed, 131 insertions(+), 37 deletions(-) diff --git a/pri/vars.pri b/pri/vars.pri index 347f4feda..0859c5488 100644 --- a/pri/vars.pri +++ b/pri/vars.pri @@ -14,10 +14,10 @@ APP_URL_DOCUMENTATION = "https://github.com/martinrotter/rssguard/blob/m APP_USERAGENT = "RSS Guard/$$APP_VERSION (github.com/martinrotter/rssguard)" APP_DONATE_URL = "https://martinrotter.github.io/donate" -message(rssguard: Welcome RSS Guard qmake script.) +message($$MSG_PREFIX: Welcome RSS Guard qmake script.) -lessThan(QT_MAJOR_VERSION, 5)|lessThan(QT_MINOR_VERSION, 9) { - warning(rssguard: At least Qt \"5.9.0\" is required!!!) +!versionAtLeast(QT_VERSION, 5.9.0) { + warning($$MSG_PREFIX: At least Qt \"5.9.0\" is required!!!) } isEmpty(USE_WEBENGINE) { diff --git a/resources/desktop/com.github.rssguard.appdata.xml b/resources/desktop/com.github.rssguard.appdata.xml index 9ad597772..362f50728 100644 --- a/resources/desktop/com.github.rssguard.appdata.xml +++ b/resources/desktop/com.github.rssguard.appdata.xml @@ -26,7 +26,7 @@ https://github.com/sponsors/martinrotter - + none diff --git a/src/librssguard/3rd-party/sc/simplecrypt.cpp b/src/librssguard/3rd-party/sc/simplecrypt.cpp index 058598f7c..796568540 100644 --- a/src/librssguard/3rd-party/sc/simplecrypt.cpp +++ b/src/librssguard/3rd-party/sc/simplecrypt.cpp @@ -104,7 +104,7 @@ QByteArray SimpleCrypt::encryptToByteArray(QByteArray plaintext) { flags |= CryptoFlagChecksum; QDataStream s(&integrityProtection, QIODevice::WriteOnly); - s << qChecksum(ba.constData(), ba.length()); + s << qChecksum(ba); } else if (m_protectionMode == ProtectionHash) { flags |= CryptoFlagHash; @@ -228,7 +228,7 @@ QByteArray SimpleCrypt::decryptToByteArray(QByteArray cypher) { } ba = ba.mid(2); - quint16 checksum = qChecksum(ba.constData(), ba.length()); + quint16 checksum = qChecksum(ba); integrityOk = (checksum == storedChecksum); } diff --git a/src/librssguard/database/databasefactory.cpp b/src/librssguard/database/databasefactory.cpp index 3e6ab929f..6c1d5eb38 100644 --- a/src/librssguard/database/databasefactory.cpp +++ b/src/librssguard/database/databasefactory.cpp @@ -16,6 +16,7 @@ #include #include #include +#include #include DatabaseFactory::DatabaseFactory(QObject* parent) @@ -82,6 +83,8 @@ DatabaseDriver* DatabaseFactory::driverForType(DatabaseDriver::DriverType d) con QString DatabaseFactory::lastExecutedQuery(const QSqlQuery& query) { QString str = query.lastQuery(); + +#if QT_VERSION_MAJOR == 5 QMapIterator it(query.boundValues()); while (it.hasNext()) { @@ -95,6 +98,7 @@ QString DatabaseFactory::lastExecutedQuery(const QSqlQuery& query) { str.replace(it.key(), it.value().toString()); } } +#endif return str; } diff --git a/src/librssguard/database/databasequeries.cpp b/src/librssguard/database/databasequeries.cpp index fef999a6e..ff7c6c2cf 100644 --- a/src/librssguard/database/databasequeries.cpp +++ b/src/librssguard/database/databasequeries.cpp @@ -1344,7 +1344,7 @@ QPair DatabaseQueries::updateMessages(QSqlDatabase db, for (int i = 0; i < msgs_to_insert.size(); i += 1000) { QStringList vals; - int batch_length = std::min(1000, msgs_to_insert.size() - i); + int batch_length = std::min(1000, int(msgs_to_insert.size()) - i); for (int l = i; l < (i + batch_length); l++) { Message* msg = msgs_to_insert[l]; diff --git a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp index 27908a3f3..21466e898 100644 --- a/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp +++ b/src/librssguard/gui/dialogs/formmessagefiltersmanager.cpp @@ -594,7 +594,7 @@ RootItem* FormMessageFiltersManager::selectedCategoryFeed() const { Message FormMessageFiltersManager::testingMessage() const { Message msg; - msg.m_feedId = NO_PARENT_CATEGORY; + msg.m_feedId = QString::number(NO_PARENT_CATEGORY); msg.m_url = m_ui.m_txtSampleUrl->text(); msg.m_customId = m_ui.m_txtSampleUrl->text(); msg.m_title = m_ui.m_txtSampleTitle->text(); diff --git a/src/librssguard/gui/messagesview.cpp b/src/librssguard/gui/messagesview.cpp index 36ef6cc7c..26ce4873b 100644 --- a/src/librssguard/gui/messagesview.cpp +++ b/src/librssguard/gui/messagesview.cpp @@ -292,7 +292,7 @@ void MessagesView::initializeContextMenu() { for (const ExternalTool& tool : qAsConst(tools)) { QAction* act_tool = new QAction(QFileInfo(tool.executable()).fileName(), menu_ext_tools); - act_tool->setIcon(icon_provider.icon(tool.executable())); + act_tool->setIcon(icon_provider.icon(QFileInfo(tool.executable()))); act_tool->setToolTip(tool.executable()); act_tool->setData(QVariant::fromValue(tool)); menu_ext_tools->addAction(act_tool); diff --git a/src/librssguard/gui/settings/settingsgui.cpp b/src/librssguard/gui/settings/settingsgui.cpp index e971b80e2..00d707190 100644 --- a/src/librssguard/gui/settings/settingsgui.cpp +++ b/src/librssguard/gui/settings/settingsgui.cpp @@ -70,7 +70,12 @@ bool SettingsGui::eventFilter(QObject* obj, QEvent* e) { if (e->type() == QEvent::Type::Drop) { auto* drop_event = static_cast(e); - if (drop_event->keyboardModifiers() != Qt::KeyboardModifier::NoModifier) { +#if QT_VERSION_MAJOR == 6 + if (drop_event->modifiers() != +#else + if (drop_event->keyboardModifiers() != +#endif + Qt::KeyboardModifier::NoModifier) { drop_event->setDropAction(Qt::DropAction::MoveAction); } } diff --git a/src/librssguard/gui/webbrowser.cpp b/src/librssguard/gui/webbrowser.cpp index f4750d593..02a29d50a 100644 --- a/src/librssguard/gui/webbrowser.cpp +++ b/src/librssguard/gui/webbrowser.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include @@ -118,10 +119,10 @@ void WebBrowser::reloadFontSettings() { fon.fromString(qApp->settings()->value(GROUP(Messages), SETTING(Messages::PreviewerFontStandard)).toString()); - QWebEngineSettings::defaultSettings()->setFontFamily(QWebEngineSettings::FontFamily::StandardFont, fon.family()); - QWebEngineSettings::defaultSettings()->setFontFamily(QWebEngineSettings::FontFamily::SerifFont, fon.family()); - QWebEngineSettings::defaultSettings()->setFontFamily(QWebEngineSettings::FontFamily::SansSerifFont, fon.family()); - QWebEngineSettings::defaultSettings()->setFontSize(QWebEngineSettings::DefaultFontSize, fon.pointSize()); + QWebEngineProfile::defaultProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::StandardFont, fon.family()); + QWebEngineProfile::defaultProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SerifFont, fon.family()); + QWebEngineProfile::defaultProfile()->settings()->setFontFamily(QWebEngineSettings::FontFamily::SansSerifFont, fon.family()); + QWebEngineProfile::defaultProfile()->settings()->setFontSize(QWebEngineSettings::DefaultFontSize, fon.pointSize()); } void WebBrowser::increaseZoom() { @@ -215,6 +216,12 @@ void WebBrowser::initializeLayout() { m_actionForward->setText(tr("Forward")); m_actionReload->setText(tr("Reload")); m_actionStop->setText(tr("Stop")); + + m_actionBack->setIcon(qApp->icons()->fromTheme(QSL("go-previous"))); + m_actionForward->setIcon(qApp->icons()->fromTheme(QSL("go-next"))); + m_actionReload->setIcon(qApp->icons()->fromTheme(QSL("reload"))); + m_actionStop->setIcon(qApp->icons()->fromTheme(QSL("process-stop"))); + QWidgetAction* act_discover = new QWidgetAction(this); m_actionOpenInSystemBrowser->setEnabled(false); @@ -228,6 +235,7 @@ void WebBrowser::initializeLayout() { m_toolBar->addAction(m_actionOpenInSystemBrowser); m_toolBar->addAction(act_discover); m_toolBar->addWidget(m_txtLocation); + m_loadingProgress = new QProgressBar(this); m_loadingProgress->setFixedHeight(5); m_loadingProgress->setMinimum(0); @@ -240,7 +248,7 @@ void WebBrowser::initializeLayout() { m_layout->addWidget(m_webView); m_layout->addWidget(m_loadingProgress); m_layout->addWidget(m_searchWidget); - m_layout->setMargin(0); + m_layout->setContentsMargins({ 0, 0, 0, 0 }); m_layout->setSpacing(0); m_searchWidget->hide(); diff --git a/src/librssguard/gui/webviewer.cpp b/src/librssguard/gui/webviewer.cpp index a70ea462d..afc36c601 100644 --- a/src/librssguard/gui/webviewer.cpp +++ b/src/librssguard/gui/webviewer.cpp @@ -16,9 +16,15 @@ #include "network-web/webpage.h" #include -#include #include + +#if QT_VERSION_MAJOR == 6 +#include +#else +#include #include +#endif + #include WebViewer::WebViewer(QWidget* parent) : QWebEngineView(parent), m_root(nullptr) { @@ -186,13 +192,22 @@ void WebViewer::clear() { void WebViewer::contextMenuEvent(QContextMenuEvent* event) { event->accept(); + +#if QT_VERSION_MAJOR == 6 + QMenu* menu = createStandardContextMenu(); + auto* menu_pointer = lastContextMenuRequest(); + QWebEngineContextMenuRequest& menu_data = *menu_pointer; +#else QMenu* menu = page()->createStandardContextMenu(); QWebEngineContextMenuData menu_data = page()->contextMenuData(); +#endif if (menu_data.linkUrl().isValid()) { + QString link_url = menu_data.linkUrl().toString(); + // Add option to open link in external viewe - menu->addAction(qApp->icons()->fromTheme(QSL("document-open")), tr("Open link in external browser"), [menu_data]() { - qApp->web()->openUrlInExternalBrowser(menu_data.linkUrl().toString()); + menu->addAction(qApp->icons()->fromTheme(QSL("document-open")), tr("Open link in external browser"), [link_url]() { + qApp->web()->openUrlInExternalBrowser(link_url); if (qApp->settings()->value(GROUP(Messages), SETTING(Messages::BringAppToFrontAfterMessageOpenedExternally)).toBool()) { QTimer::singleShot(1000, qApp, []() { @@ -203,6 +218,7 @@ void WebViewer::contextMenuEvent(QContextMenuEvent* event) { } if (menu_data.mediaUrl().isValid() || menu_data.linkUrl().isValid()) { + QString media_link = menu_data.mediaUrl().isValid() ? menu_data.mediaUrl().toString() : menu_data.linkUrl().toString(); QFileIconProvider icon_provider; QMenu* menu_ext_tools = new QMenu(tr("Open with external tool"), menu); auto tools = ExternalTool::toolsFromSettings(); @@ -212,13 +228,13 @@ void WebViewer::contextMenuEvent(QContextMenuEvent* event) { for (const ExternalTool& tool : qAsConst(tools)) { QAction* act_tool = new QAction(QFileInfo(tool.executable()).fileName(), menu_ext_tools); - act_tool->setIcon(icon_provider.icon(tool.executable())); + act_tool->setIcon(icon_provider.icon(QFileInfo(tool.executable()))); act_tool->setToolTip(tool.executable()); act_tool->setData(QVariant::fromValue(tool)); menu_ext_tools->addAction(act_tool); - connect(act_tool, &QAction::triggered, this, [this, act_tool, menu_data]() { - openUrlWithExternalTool(act_tool->data().value(), menu_data); + connect(act_tool, &QAction::triggered, this, [this, act_tool, media_link]() { + openUrlWithExternalTool(act_tool->data().value(), media_link); }); } @@ -296,8 +312,8 @@ bool WebViewer::eventFilter(QObject* object, QEvent* event) { return false; } -void WebViewer::openUrlWithExternalTool(ExternalTool tool, const QWebEngineContextMenuData& target) { - tool.run(target.mediaUrl().isValid() ? target.mediaUrl().toString() : target.linkUrl().toString()); +void WebViewer::openUrlWithExternalTool(ExternalTool tool, const QString& target_url) { + tool.run(target_url); } RootItem* WebViewer::root() const { diff --git a/src/librssguard/gui/webviewer.h b/src/librssguard/gui/webviewer.h index b6c38733d..aa08d2915 100644 --- a/src/librssguard/gui/webviewer.h +++ b/src/librssguard/gui/webviewer.h @@ -41,7 +41,7 @@ class WebViewer : public QWebEngineView { virtual bool eventFilter(QObject* object, QEvent* event); private slots: - void openUrlWithExternalTool(ExternalTool tool, const QWebEngineContextMenuData& target); + void openUrlWithExternalTool(ExternalTool tool, const QString& target_url); private: RootItem* m_root; diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index dc9b75847..82ad2106c 100644 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -40,7 +40,12 @@ #include "network-web/adblock/adblockmanager.h" #include "network-web/networkurlinterceptor.h" +#if QT_VERSION_MAJOR == 6 +#include +#else #include +#endif + #include #endif @@ -606,7 +611,11 @@ void Application::restart() { #if defined(USE_WEBENGINE) +#if QT_VERSION_MAJOR == 6 +void Application::downloadRequested(QWebEngineDownloadRequest* download_item) { +#else void Application::downloadRequested(QWebEngineDownloadItem* download_item) { +#endif downloadManager()->download(download_item->url()); download_item->cancel(); download_item->deleteLater(); diff --git a/src/librssguard/miscellaneous/application.h b/src/librssguard/miscellaneous/application.h index fc22a7162..958c295d0 100644 --- a/src/librssguard/miscellaneous/application.h +++ b/src/librssguard/miscellaneous/application.h @@ -33,7 +33,13 @@ class FormMain; class IconFactory; class QAction; class Mutex; + +#if QT_VERSION_MAJOR == 6 +class QWebEngineDownloadRequest; +#else class QWebEngineDownloadItem; +#endif + class WebFactory; class NotificationFactory; @@ -140,7 +146,12 @@ class RSSGUARD_DLLSPEC Application : public SingleApplication { void showMessagesNumber(int unread_messages, bool any_feed_has_unread_messages); #if defined(USE_WEBENGINE) +#if QT_VERSION_MAJOR == 6 + void downloadRequested(QWebEngineDownloadRequest* download_item); +#else void downloadRequested(QWebEngineDownloadItem* download_item); +#endif + void onAdBlockFailure(); #endif diff --git a/src/librssguard/miscellaneous/notification.cpp b/src/librssguard/miscellaneous/notification.cpp index f9f110c6e..eba6229d2 100644 --- a/src/librssguard/miscellaneous/notification.cpp +++ b/src/librssguard/miscellaneous/notification.cpp @@ -8,6 +8,10 @@ #if !defined(Q_OS_OS2) #include + +#if QT_VERSION_MAJOR == 6 +#include +#endif #endif Notification::Notification(Notification::Event event, bool balloon, const QString& sound_path, int volume) @@ -34,6 +38,29 @@ void Notification::playSound(Application* app) const { #if !defined(Q_OS_OS2) QMediaPlayer* play = new QMediaPlayer(app); +#if QT_VERSION_MAJOR == 6 + QAudioOutput* out = new QAudioOutput(app); + + play->setAudioOutput(out); + + QObject::connect(play, &QMediaPlayer::playbackStateChanged, play, [play, out](QMediaPlayer::PlaybackState state) { + if (state == QMediaPlayer::PlaybackState::StoppedState) { + out->deleteLater(); + play->deleteLater(); + } + }); + + if (m_soundPath.startsWith(QSL(":"))) { + play->setSource(QUrl(QSL("qrc") + m_soundPath)); + + } + else { + play->setSource(QUrl::fromLocalFile(QDir::toNativeSeparators(app->replaceDataUserDataFolderPlaceholder(m_soundPath)))); + } + + play->audioOutput()->setVolume((m_volume * 1.0f) / 100.0f); + play->play(); +#else QObject::connect(play, &QMediaPlayer::stateChanged, play, [play](QMediaPlayer::State state) { if (state == QMediaPlayer::State::StoppedState) { play->deleteLater(); @@ -52,6 +79,7 @@ void Notification::playSound(Application* app) const { play->setVolume(m_volume); play->play(); +#endif #endif } } diff --git a/src/librssguard/miscellaneous/regexfactory.cpp b/src/librssguard/miscellaneous/regexfactory.cpp index 8920b2d7a..43cd0ec26 100644 --- a/src/librssguard/miscellaneous/regexfactory.cpp +++ b/src/librssguard/miscellaneous/regexfactory.cpp @@ -51,7 +51,7 @@ QString RegexFactory::wildcardToRegularExpression(const QString& pattern) { int i = 0; const QChar* wc = pattern.unicode(); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) const QLatin1Char nativePathSeparator('\\'); const QLatin1String starEscape("[^/\\\\]*"); const QLatin1String questionMarkEscape("[^/\\\\]"); @@ -74,7 +74,7 @@ QString RegexFactory::wildcardToRegularExpression(const QString& pattern) { break; case '\\': -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) case '/': rx += QLatin1String("[/\\\\]"); break; diff --git a/src/librssguard/network-web/downloadmanager.cpp b/src/librssguard/network-web/downloadmanager.cpp index df85aa6f0..21d1cc922 100644 --- a/src/librssguard/network-web/downloadmanager.cpp +++ b/src/librssguard/network-web/downloadmanager.cpp @@ -582,7 +582,7 @@ void DownloadManager::updateRow(DownloadItem* item) { m_iconProvider.reset(new QFileIconProvider()); } - QIcon icon = m_iconProvider->icon(item->m_output.fileName()); + QIcon icon = m_iconProvider->icon(QFileInfo(item->m_output.fileName())); if (icon.isNull()) { icon = style()->standardIcon(QStyle::StandardPixmap::SP_FileIcon); diff --git a/src/librssguard/network-web/webfactory.cpp b/src/librssguard/network-web/webfactory.cpp index 13b787cd4..a9d5c47f1 100644 --- a/src/librssguard/network-web/webfactory.cpp +++ b/src/librssguard/network-web/webfactory.cpp @@ -17,7 +17,11 @@ #include "network-web/networkurlinterceptor.h" #include "network-web/urlinterceptor.h" +#if QT_VERSION_MAJOR == 6 +#include +#else #include +#endif #include #include #include @@ -163,7 +167,7 @@ QString WebFactory::unescapeHtml(const QString& html) { } else { // Failed to convert to number, leave intact. - output.append(html.midRef(pos, pos_end - pos + 1)); + output.append(html.mid(pos, pos_end - pos + 1)); } pos = pos_end + 1; diff --git a/src/librssguard/network-web/webpage.cpp b/src/librssguard/network-web/webpage.cpp index 627d2f70b..d76b02a3c 100644 --- a/src/librssguard/network-web/webpage.cpp +++ b/src/librssguard/network-web/webpage.cpp @@ -24,7 +24,11 @@ WebPage::WebPage(QObject* parent) : QWebEnginePage(parent) { } WebViewer* WebPage::view() const { +#if QT_VERSION_MAJOR == 6 + return qobject_cast(QWebEngineView::forPage(this)); +#else return qobject_cast(QWebEnginePage::view()); +#endif } void WebPage::hideUnwantedElements() { diff --git a/src/librssguard/services/abstract/serviceroot.h b/src/librssguard/services/abstract/serviceroot.h index 9c2380cd8..78c4e648f 100644 --- a/src/librssguard/services/abstract/serviceroot.h +++ b/src/librssguard/services/abstract/serviceroot.h @@ -289,10 +289,18 @@ class ServiceRoot : public RootItem { QNetworkProxy m_networkProxy; }; +#if QT_VERSION_MAJOR == 6 +inline size_t qHash(ServiceRoot::BagOfMessages key, size_t seed) { + return ::qHash(static_cast(key), seed); +} + +#else inline uint qHash(ServiceRoot::BagOfMessages key, uint seed) { return ::qHash(static_cast(key), seed); } +#endif + ServiceRoot::LabelOperation operator|(ServiceRoot::LabelOperation lhs, ServiceRoot::LabelOperation rhs); ServiceRoot::LabelOperation operator&(ServiceRoot::LabelOperation lhs, ServiceRoot::LabelOperation rhs); diff --git a/src/librssguard/services/greader/greadernetwork.cpp b/src/librssguard/services/greader/greadernetwork.cpp index 3b88352ef..6a8984337 100644 --- a/src/librssguard/services/greader/greadernetwork.cpp +++ b/src/librssguard/services/greader/greadernetwork.cpp @@ -50,7 +50,7 @@ QNetworkReply::NetworkError GreaderNetwork::editLabels(const QString& state, trimmed_ids.append(QSL("i=") + id); } - QStringList working_subset; working_subset.reserve(std::min(GREADER_API_EDIT_TAG_BATCH, trimmed_ids.size())); + QStringList working_subset; working_subset.reserve(std::min(GREADER_API_EDIT_TAG_BATCH, int(trimmed_ids.size()))); // Now, we perform messages update in batches (max X messages per batch). while (!trimmed_ids.isEmpty()) { diff --git a/src/librssguard/services/standard/atomparser.cpp b/src/librssguard/services/standard/atomparser.cpp index 55fc6d1d1..0880052bb 100644 --- a/src/librssguard/services/standard/atomparser.cpp +++ b/src/librssguard/services/standard/atomparser.cpp @@ -73,8 +73,6 @@ Message AtomParser::extractMessage(const QDomElement& msg_element, const QDateTi QString raw_contents; QTextStream str(&raw_contents); - str.setCodec(DEFAULT_FEED_ENCODING); - msg_element.save(str, 0, QDomNode::EncodingPolicy::EncodingFromTextStream); new_message.m_rawContents = raw_contents; diff --git a/src/librssguard/services/standard/rdfparser.cpp b/src/librssguard/services/standard/rdfparser.cpp index 92ca5bda1..a081f8be3 100644 --- a/src/librssguard/services/standard/rdfparser.cpp +++ b/src/librssguard/services/standard/rdfparser.cpp @@ -52,8 +52,6 @@ Message RdfParser::extractMessage(const QDomElement& msg_element, const QDateTim QString raw_contents; QTextStream str(&raw_contents); - str.setCodec(DEFAULT_FEED_ENCODING); - msg_element.save(str, 0, QDomNode::EncodingPolicy::EncodingFromTextStream); new_message.m_rawContents = raw_contents; diff --git a/src/librssguard/services/standard/rssparser.cpp b/src/librssguard/services/standard/rssparser.cpp index 6dae2313e..7a3e28f67 100644 --- a/src/librssguard/services/standard/rssparser.cpp +++ b/src/librssguard/services/standard/rssparser.cpp @@ -86,8 +86,6 @@ Message RssParser::extractMessage(const QDomElement& msg_element, const QDateTim QString raw_contents; QTextStream str(&raw_contents); - str.setCodec(DEFAULT_FEED_ENCODING); - msg_element.save(str, 0, QDomNode::EncodingPolicy::EncodingFromTextStream); new_message.m_rawContents = raw_contents; diff --git a/src/rssguard/main.cpp b/src/rssguard/main.cpp index 8268be9a5..3cf6aa4cf 100644 --- a/src/rssguard/main.cpp +++ b/src/rssguard/main.cpp @@ -9,12 +9,13 @@ #include "services/abstract/label.h" #if defined(Q_OS_WIN) +#if QT_VERSION_MAJOR == 5 #include #endif +#endif #if defined(Q_OS_MACOS) extern void disableWindowTabbing(); - #endif int main(int argc, char* argv[]) { @@ -73,8 +74,10 @@ int main(int argc, char* argv[]) { qApp->reactOnForeignNotifications(); -#ifdef Q_OS_WIN +#if defined(Q_OS_WIN) +#if QT_VERSION_MAJOR == 5 QWindowsWindowFunctions::setWindowActivationBehavior(QWindowsWindowFunctions::AlwaysActivateWindow); +#endif #endif FormMain main_window;