diff --git a/src/librssguard/core/feedsmodel.cpp b/src/librssguard/core/feedsmodel.cpp index ba6dc6470..84dcf8a11 100644 --- a/src/librssguard/core/feedsmodel.cpp +++ b/src/librssguard/core/feedsmodel.cpp @@ -119,7 +119,7 @@ bool FeedsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int // Transferring of items between different accounts is not possible. qApp->showGuiMessage(tr("Cannot perform drag & drop operation"), tr("You can't transfer dragged item into different account, this is not supported."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); qDebugNN << LOGSEC_FEEDMODEL @@ -141,7 +141,7 @@ bool FeedsModel::dropMimeData(const QMimeData* data, Qt::DropAction action, int } Qt::DropActions FeedsModel::supportedDropActions() const { - return Qt::MoveAction; + return Qt::DropAction::MoveAction; } Qt::ItemFlags FeedsModel::flags(const QModelIndex& index) const { diff --git a/src/librssguard/gui/dialogs/formsettings.cpp b/src/librssguard/gui/dialogs/formsettings.cpp index dc996ce1d..67cd04ad3 100644 --- a/src/librssguard/gui/dialogs/formsettings.cpp +++ b/src/librssguard/gui/dialogs/formsettings.cpp @@ -71,7 +71,7 @@ void FormSettings::applySettings() { const QStringList changed_settings_description = panels_for_restart.replaceInStrings(QRegularExpression(QSL("^")), QString::fromUtf8(" • ")); const QMessageBox::StandardButton clicked_button = MessageBox::show(this, - QMessageBox::Question, + QMessageBox::Icon::Question, tr("Critical settings were changed"), tr( "Some critical settings were changed and will be applied after the application gets restarted. " @@ -79,7 +79,9 @@ void FormSettings::applySettings() { tr("Do you want to restart now?"), tr("Changed categories of settings:\n%1.").arg( changed_settings_description.join(QSL(",\n"))), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes); + QMessageBox::StandardButton::Yes | + QMessageBox::StandardButton::No, + QMessageBox::StandardButton::Yes); if (clicked_button == QMessageBox::Yes) { qApp->restart(); @@ -106,13 +108,14 @@ void FormSettings::cancelSettings() { QString::fromUtf8(" • ")); if (MessageBox::show(this, - QMessageBox::Critical, + QMessageBox::Icon::Critical, tr("Some settings are changed and will be lost"), tr("Some settings were changed and by cancelling this dialog, you would lose these changes."), tr("Do you really want to close this dialog without saving any settings?"), tr("Changed categories of settings:\n%1.").arg(changed_settings_description.join(QSL(",\n"))), - QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == - QMessageBox::Yes) { + QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, + QMessageBox::StandardButton::Yes) == + QMessageBox::StandardButton::Yes) { reject(); } } diff --git a/src/librssguard/gui/dialogs/formupdate.cpp b/src/librssguard/gui/dialogs/formupdate.cpp index ff0ee3d43..934eb4afb 100644 --- a/src/librssguard/gui/dialogs/formupdate.cpp +++ b/src/librssguard/gui/dialogs/formupdate.cpp @@ -240,7 +240,7 @@ void FormUpdate::startUpdate() { if (!qApp->web()->openUrlInExternalBrowser(url_file)) { qApp->showGuiMessage(tr("Cannot update application"), tr("Cannot navigate to installation file. Download new installation file manually on project website."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, this, true); } } diff --git a/src/librssguard/gui/discoverfeedsbutton.cpp b/src/librssguard/gui/discoverfeedsbutton.cpp index 875dfcfc6..74764ccd7 100644 --- a/src/librssguard/gui/discoverfeedsbutton.cpp +++ b/src/librssguard/gui/discoverfeedsbutton.cpp @@ -53,7 +53,7 @@ void DiscoverFeedsButton::linkTriggered(QAction* action) { else { qApp->showGuiMessage(tr("Not supported"), tr("Given account does not support adding feeds."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); } } diff --git a/src/librssguard/gui/feedsview.cpp b/src/librssguard/gui/feedsview.cpp index 84fd28876..6f42353ba 100755 --- a/src/librssguard/gui/feedsview.cpp +++ b/src/librssguard/gui/feedsview.cpp @@ -167,7 +167,7 @@ void FeedsView::addFeedIntoSelectedAccount() { else { qApp->showGuiMessage(tr("Not supported"), tr("Selected account does not support adding of new feeds."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); } } @@ -185,7 +185,7 @@ void FeedsView::addCategoryIntoSelectedAccount() { else { qApp->showGuiMessage(tr("Not supported"), tr("Selected account does not support adding of new categories."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); } } @@ -235,7 +235,7 @@ void FeedsView::editSelectedItem() { else { qApp->showGuiMessage(tr("Cannot edit item"), tr("Selected item cannot be edited, this is not (yet?) supported."), - QSystemTrayIcon::Warning, + QSystemTrayIcon::MessageIcon::Warning, qApp->mainFormWidget(), true); } @@ -269,11 +269,12 @@ void FeedsView::deleteSelectedItem() { if (selected_item->canBeDeleted()) { // Ask user first. if (MessageBox::show(qApp->mainFormWidget(), - QMessageBox::Question, + QMessageBox::Icon::Question, tr("Deleting \"%1\"").arg(selected_item->title()), tr("You are about to completely delete item \"%1\".").arg(selected_item->title()), tr("Are you sure?"), - QString(), QMessageBox::Yes | QMessageBox::No, QMessageBox::Yes) == QMessageBox::No) { + QString(), QMessageBox::StandardButton::Yes | QMessageBox::StandardButton::No, + QMessageBox::StandardButton::Yes) == QMessageBox::StandardButton::No) { // User refused. qApp->feedUpdateLock()->unlock(); return; @@ -283,7 +284,7 @@ void FeedsView::deleteSelectedItem() { if (!selected_item->deleteViaGui()) { qApp->showGuiMessage(tr("Cannot delete \"%1\"").arg(selected_item->title()), tr("This item cannot be deleted because something critically failed. Submit bug report."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, qApp->mainFormWidget(), true); } @@ -291,7 +292,7 @@ void FeedsView::deleteSelectedItem() { else { qApp->showGuiMessage(tr("Cannot delete \"%1\"").arg(selected_item->title()), tr("This item cannot be deleted, because it does not support it\nor this functionality is not implemented yet."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, qApp->mainFormWidget(), true); } diff --git a/src/librssguard/gui/messagebox.cpp b/src/librssguard/gui/messagebox.cpp index 474e8383f..58a459f11 100644 --- a/src/librssguard/gui/messagebox.cpp +++ b/src/librssguard/gui/messagebox.cpp @@ -80,7 +80,7 @@ QMessageBox::StandardButton MessageBox::show(QWidget* parent, // Display it. if (msg_box.exec() == -1) { - return QMessageBox::Cancel; + return QMessageBox::StandardButton::Cancel; } else { return msg_box.standardButton(msg_box.clickedButton()); diff --git a/src/librssguard/gui/settings/settingsbrowsermail.cpp b/src/librssguard/gui/settings/settingsbrowsermail.cpp index 74c34e3fe..4beb117e0 100644 --- a/src/librssguard/gui/settings/settingsbrowsermail.cpp +++ b/src/librssguard/gui/settings/settingsbrowsermail.cpp @@ -220,7 +220,7 @@ void SettingsBrowserMail::addExternalTool() { tr("Enter parameters"), tr( "Enter (optional) parameters separated by single space to send to executable when opening URLs."), - QLineEdit::Normal, + QLineEdit::EchoMode::Normal, QString(), &ok); diff --git a/src/librssguard/gui/tabbar.cpp b/src/librssguard/gui/tabbar.cpp index 200041d54..b56c5aae7 100644 --- a/src/librssguard/gui/tabbar.cpp +++ b/src/librssguard/gui/tabbar.cpp @@ -21,7 +21,7 @@ TabBar::~TabBar() { } void TabBar::setTabType(int index, const TabBar::TabType& type) { - const auto button_position = static_cast(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, + const auto button_position = static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, nullptr, this)); @@ -51,7 +51,7 @@ void TabBar::setTabType(int index, const TabBar::TabType& type) { void TabBar::closeTabViaButton() { const auto* close_button = qobject_cast(sender()); - const auto button_position = static_cast(style()->styleHint(QStyle::SH_TabBar_CloseButtonPosition, + const auto button_position = static_cast(style()->styleHint(QStyle::StyleHint::SH_TabBar_CloseButtonPosition, nullptr, this)); diff --git a/src/librssguard/miscellaneous/application.cpp b/src/librssguard/miscellaneous/application.cpp index b4a3b68bc..3211b63ee 100755 --- a/src/librssguard/miscellaneous/application.cpp +++ b/src/librssguard/miscellaneous/application.cpp @@ -143,7 +143,7 @@ void Application::offerChanges() const { if (isFirstRunCurrentVersion()) { qApp->showGuiMessage(QSL(APP_NAME), QObject::tr("Welcome to %1.\n\nPlease, check NEW stuff included in this\n" "version by clicking this popup notification.").arg(APP_LONG_NAME), - QSystemTrayIcon::NoIcon, nullptr, false, [] { + QSystemTrayIcon::MessageIcon::NoIcon, nullptr, false, [] { FormAbout(qApp->mainForm()).exec(); }); } diff --git a/src/librssguard/miscellaneous/databasequeries.cpp b/src/librssguard/miscellaneous/databasequeries.cpp index 34b748513..9ba775d4e 100755 --- a/src/librssguard/miscellaneous/databasequeries.cpp +++ b/src/librssguard/miscellaneous/databasequeries.cpp @@ -927,11 +927,11 @@ int DatabaseQueries::updateMessages(QSqlDatabase db, message.m_url = QString(URI_SCHEME_HTTP) + message.m_url.mid(2); } else if (message.m_url.startsWith(QL1S("/"))) { - QString new_message_url = QUrl(url).toString(QUrl::RemoveUserInfo | - QUrl::RemovePath | - QUrl::RemoveQuery | - QUrl::RemoveFilename | - QUrl::StripTrailingSlash); + QString new_message_url = QUrl(url).toString(QUrl::UrlFormattingOption::RemoveUserInfo | + QUrl::UrlFormattingOption::RemovePath | + QUrl::UrlFormattingOption::RemoveQuery | + QUrl::UrlFormattingOption::RemoveFilename | + QUrl::UrlFormattingOption::StripTrailingSlash); new_message_url += message.m_url; message.m_url = new_message_url; diff --git a/src/librssguard/miscellaneous/iconfactory.cpp b/src/librssguard/miscellaneous/iconfactory.cpp index a9065fb36..3b93dc7eb 100755 --- a/src/librssguard/miscellaneous/iconfactory.cpp +++ b/src/librssguard/miscellaneous/iconfactory.cpp @@ -127,10 +127,10 @@ QStringList IconFactory::installedIconThemes() const { const QDir icon_dir(icon_path); // Iterate all icon themes in this directory. - for (const QFileInfo& icon_theme_path : icon_dir.entryInfoList(QDir::Dirs | QDir::NoDotAndDotDot | - QDir::Readable | QDir::CaseSensitive | - QDir::NoSymLinks, - QDir::Time)) { + for (const QFileInfo& icon_theme_path : icon_dir.entryInfoList(QDir::Filter::Dirs | QDir::Filter::NoDotAndDotDot | + QDir::Filter::Readable | QDir::Filter::CaseSensitive | + QDir::Filter::NoSymLinks, + QDir::SortFlag::Time)) { QDir icon_theme_dir = QDir(icon_theme_path.absoluteFilePath()); if (icon_theme_dir.exists(filters_index.at(0))) { diff --git a/src/librssguard/miscellaneous/skinfactory.cpp b/src/librssguard/miscellaneous/skinfactory.cpp index b2e56e71f..1ab1d6c61 100644 --- a/src/librssguard/miscellaneous/skinfactory.cpp +++ b/src/librssguard/miscellaneous/skinfactory.cpp @@ -165,15 +165,15 @@ Skin SkinFactory::skinInfo(const QString& skin_name, bool* ok) const { QList SkinFactory::installedSkins() const { QList skins; bool skin_load_ok; - QStringList skin_directories = QDir(APP_SKIN_PATH).entryList(QDir::Dirs | - QDir::NoDotAndDotDot | - QDir::NoSymLinks | - QDir::Readable); + QStringList skin_directories = QDir(APP_SKIN_PATH).entryList(QDir::Filter::Dirs | + QDir::Filter::NoDotAndDotDot | + QDir::Filter::NoSymLinks | + QDir::Filter::Readable); - skin_directories.append(QDir(customSkinBaseFolder()).entryList(QDir::Dirs | - QDir::NoDotAndDotDot | - QDir::NoSymLinks | - QDir::Readable)); + skin_directories.append(QDir(customSkinBaseFolder()).entryList(QDir::Filter::Dirs | + QDir::Filter::NoDotAndDotDot | + QDir::Filter::NoSymLinks | + QDir::Filter::Readable)); for (const QString& base_directory : skin_directories) { const Skin skin_info = skinInfo(base_directory, &skin_load_ok); diff --git a/src/librssguard/network-web/adblock/adblockmatcher.cpp b/src/librssguard/network-web/adblock/adblockmatcher.cpp index 358b78c6c..90e157700 100644 --- a/src/librssguard/network-web/adblock/adblockmatcher.cpp +++ b/src/librssguard/network-web/adblock/adblockmatcher.cpp @@ -184,7 +184,7 @@ void AdBlockMatcher::update() { AdBlockRule* copiedRule = originalRule->copy(); - copiedRule->m_options |= AdBlockRule::DomainRestrictedOption; + copiedRule->m_options |= AdBlockRule::RuleOption::DomainRestrictedOption; copiedRule->m_blockedDomains.append(rule->m_allowedDomains); cssRulesHash[rule->cssSelector()] = copiedRule; m_createdRules.append(copiedRule); diff --git a/src/librssguard/network-web/adblock/adblockrule.cpp b/src/librssguard/network-web/adblock/adblockrule.cpp index 7ebff7d51..6d139313d 100644 --- a/src/librssguard/network-web/adblock/adblockrule.cpp +++ b/src/librssguard/network-web/adblock/adblockrule.cpp @@ -289,43 +289,43 @@ bool AdBlockRule::matchThirdParty(const AdblockRequestInfo& request) const { } bool AdBlockRule::matchObject(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeObject; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeObject; return hasException(ObjectOption) ? !match : match; } bool AdBlockRule::matchSubdocument(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeSubFrame; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeSubFrame; return hasException(SubdocumentOption) ? !match : match; } bool AdBlockRule::matchXmlHttpRequest(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeXhr; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeXhr; return hasException(XMLHttpRequestOption) ? !match : match; } bool AdBlockRule::matchImage(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeImage; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeImage; return hasException(ImageOption) ? !match : match; } bool AdBlockRule::matchScript(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeScript; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeScript; return hasException(ScriptOption) ? !match : match; } bool AdBlockRule::matchStyleSheet(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeStylesheet; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeStylesheet; return hasException(StyleSheetOption) ? !match : match; } bool AdBlockRule::matchObjectSubrequest(const AdblockRequestInfo& request) const { - bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceTypeSubResource; + bool match = request.resourceType() == QWebEngineUrlRequestInfo::ResourceType::ResourceTypeSubResource; return hasException(ObjectSubrequestOption) ? !match : match; } @@ -386,55 +386,55 @@ void AdBlockRule::parseFilter() { ++handledOptions; } else if (option == QL1S("match-case")) { - m_caseSensitivity = Qt::CaseSensitive; + m_caseSensitivity = Qt::CaseSensitivity::CaseSensitive; ++handledOptions; } else if (option.endsWith(QL1S("third-party"))) { - setOption(ThirdPartyOption); - setException(ThirdPartyOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::ThirdPartyOption); + setException(RuleOption::ThirdPartyOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("object"))) { - setOption(ObjectOption); - setException(ObjectOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::ObjectOption); + setException(RuleOption::ObjectOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("subdocument"))) { - setOption(SubdocumentOption); - setException(SubdocumentOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::SubdocumentOption); + setException(RuleOption::SubdocumentOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("xmlhttprequest"))) { - setOption(XMLHttpRequestOption); - setException(XMLHttpRequestOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::XMLHttpRequestOption); + setException(RuleOption::XMLHttpRequestOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("image"))) { - setOption(ImageOption); - setException(ImageOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::ImageOption); + setException(RuleOption::ImageOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("script"))) { - setOption(ScriptOption); - setException(ScriptOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::ScriptOption); + setException(RuleOption::ScriptOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("stylesheet"))) { - setOption(StyleSheetOption); - setException(StyleSheetOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::StyleSheetOption); + setException(RuleOption::StyleSheetOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option.endsWith(QL1S("object-subrequest"))) { - setOption(ObjectSubrequestOption); - setException(ObjectSubrequestOption, option.startsWith(QL1C('~'))); + setOption(RuleOption::ObjectSubrequestOption); + setException(RuleOption::ObjectSubrequestOption, option.startsWith(QL1C('~'))); ++handledOptions; } else if (option == QL1S("document") && m_isException) { - setOption(DocumentOption); + setOption(RuleOption::DocumentOption); ++handledOptions; } else if (option == QL1S("elemhide") && m_isException) { - setOption(ElementHideOption); + setOption(RuleOption::ElementHideOption); ++handledOptions; } else if (option == QL1S("collapse")) { @@ -446,7 +446,7 @@ void AdBlockRule::parseFilter() { // If we don't handle all options, it's safer to just disable this rule. if (handledOptions != options.count()) { m_isInternalDisabled = true; - m_type = Invalid; + m_type = RuleType::Invalid; return; } @@ -457,7 +457,7 @@ void AdBlockRule::parseFilter() { if (parsedLine.startsWith(QL1C('/')) && parsedLine.endsWith(QL1C('/'))) { parsedLine = parsedLine.mid(1); parsedLine = parsedLine.left(parsedLine.size() - 1); - m_type = RegExpMatchRule; + m_type = RuleType::RegExpMatchRule; m_regexPattern = parsedLine; matchers = createStringMatchers(parseRegExpFilter(parsedLine)); return; @@ -476,7 +476,7 @@ void AdBlockRule::parseFilter() { if (filterIsOnlyDomain(parsedLine)) { parsedLine = parsedLine.mid(2); parsedLine = parsedLine.left(parsedLine.size() - 1); - m_type = DomainMatchRule; + m_type = RuleType::DomainMatchRule; m_matchString = parsedLine; return; } @@ -484,7 +484,7 @@ void AdBlockRule::parseFilter() { // If rule contains only | at end, we can also use string matching. if (filterIsOnlyEndsMatch(parsedLine)) { parsedLine = parsedLine.left(parsedLine.size() - 1); - m_type = StringEndsMatchRule; + m_type = RuleType::StringEndsMatchRule; m_matchString = parsedLine; return; } @@ -492,14 +492,14 @@ void AdBlockRule::parseFilter() { // If we still find a wildcard (*) or separator (^) or (|) // we must modify parsedLine to comply with SimpleRegExp. if (parsedLine.contains(QL1C('*')) || parsedLine.contains(QL1C('^')) || parsedLine.contains(QL1C('|'))) { - m_type = RegExpMatchRule; + m_type = RuleType::RegExpMatchRule; m_regexPattern = createRegExpFromFilter(parsedLine); matchers = createStringMatchers(parseRegExpFilter(parsedLine)); return; } // We haven't found anything that needs use of regexp, yay! - m_type = StringContainsMatchRule; + m_type = RuleType::StringContainsMatchRule; m_matchString = parsedLine; } @@ -508,7 +508,7 @@ void AdBlockRule::parseDomains(const QString& domains, const QChar& separator) { #if QT_VERSION >= 0x050F00 // Qt >= 5.15.0 Qt::SplitBehaviorFlags::SkipEmptyParts); #else - QString::SkipEmptyParts); + QString::SplitBehavior::SkipEmptyParts); #endif for (const QString& domain : domainsList) { @@ -525,7 +525,7 @@ void AdBlockRule::parseDomains(const QString& domains, const QChar& separator) { } if (!m_blockedDomains.isEmpty() || !m_allowedDomains.isEmpty()) { - setOption(DomainRestrictedOption); + setOption(RuleOption::DomainRestrictedOption); } } @@ -659,16 +659,16 @@ int AdBlockRule::regexMatched(const QString& str, int offset) const { } bool AdBlockRule::stringMatch(const QString& domain, const QString& encodedUrl) const { - if (m_type == StringContainsMatchRule) { + if (m_type == RuleType::StringContainsMatchRule) { return encodedUrl.contains(m_matchString, m_caseSensitivity); } - else if (m_type == DomainMatchRule) { + else if (m_type == RuleType::DomainMatchRule) { return isMatchingDomain(domain, m_matchString); } - else if (m_type == StringEndsMatchRule) { + else if (m_type == RuleType::StringEndsMatchRule) { return encodedUrl.endsWith(m_matchString, m_caseSensitivity); } - else if (m_type == RegExpMatchRule) { + else if (m_type == RuleType::RegExpMatchRule) { if (!isMatchingRegExpStrings(encodedUrl)) { return false; } diff --git a/src/librssguard/network-web/downloader.cpp b/src/librssguard/network-web/downloader.cpp index f9ad50f7d..efcfb06b2 100644 --- a/src/librssguard/network-web/downloader.cpp +++ b/src/librssguard/network-web/downloader.cpp @@ -31,7 +31,7 @@ void Downloader::downloadFile(const QString& url, int timeout, bool protected_co void Downloader::uploadFile(const QString& url, const QByteArray& data, int timeout, bool protected_contents, const QString& username, const QString& password) { - manipulateData(url, QNetworkAccessManager::PostOperation, data, timeout, protected_contents, username, password); + manipulateData(url, QNetworkAccessManager::Operation::PostOperation, data, timeout, protected_contents, username, password); } void Downloader::manipulateData(const QString& url, QNetworkAccessManager::Operation operation, @@ -82,7 +82,7 @@ void Downloader::manipulateData(const QString& url, m_targetUsername = username; m_targetPassword = password; - if (operation == QNetworkAccessManager::PostOperation) { + if (operation == QNetworkAccessManager::Operation::PostOperation) { if (m_inputMultipartData == nullptr) { runPostRequest(request, m_inputData); } @@ -133,7 +133,7 @@ void Downloader::finished() { if (reply_operation == QNetworkAccessManager::GetOperation) { runGetRequest(request); } - else if (reply_operation == QNetworkAccessManager::PostOperation) { + else if (reply_operation == QNetworkAccessManager::Operation::PostOperation) { if (m_inputMultipartData == nullptr) { runPostRequest(request, m_inputData); } diff --git a/src/librssguard/network-web/downloadmanager.cpp b/src/librssguard/network-web/downloadmanager.cpp index ee885228d..7e1150572 100644 --- a/src/librssguard/network-web/downloadmanager.cpp +++ b/src/librssguard/network-web/downloadmanager.cpp @@ -203,7 +203,7 @@ void DownloadItem::openFolder() { if (m_output.exists()) { if (!SystemFactory::openFolderFile(m_output.fileName())) { MessageBox::show(this, - QMessageBox::Warning, + QMessageBox::Icon::Warning, tr("Cannot open directory"), tr("Cannot open output directory. Open it manually."), QString(), @@ -413,7 +413,7 @@ void DownloadItem::finished() { qApp->showGuiMessage(tr("Download finished"), tr("File '%1' is downloaded.\nClick here to open parent directory.").arg(QDir::toNativeSeparators( m_output.fileName())), - QSystemTrayIcon::Information, + QSystemTrayIcon::MessageIcon::Information, nullptr, false, [this] { @@ -781,14 +781,14 @@ bool DownloadModel::removeRows(int row, int count, const QModelIndex& parent) { Qt::ItemFlags DownloadModel::flags(const QModelIndex& index) const { if (index.row() < 0 || index.row() >= rowCount(index.parent())) { - return Qt::NoItemFlags; + return Qt::ItemFlag::NoItemFlags; } Qt::ItemFlags default_flags = QAbstractListModel::flags(index); DownloadItem* item = m_downloadManager->m_downloads.at(index.row()); if (item->downloadedSuccessfully()) { - return default_flags | Qt::ItemIsDragEnabled; + return default_flags | Qt::ItemFlag::ItemIsDragEnabled; } return default_flags; diff --git a/src/librssguard/network-web/networkfactory.cpp b/src/librssguard/network-web/networkfactory.cpp index 1ffc74539..7e73a76fa 100644 --- a/src/librssguard/network-web/networkfactory.cpp +++ b/src/librssguard/network-web/networkfactory.cpp @@ -149,7 +149,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList& u timeout, QByteArray(), icon_data, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, {}, false, {}, @@ -179,7 +179,7 @@ QNetworkReply::NetworkError NetworkFactory::downloadIcon(const QList& u timeout, QByteArray(), icon_data, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, {}, false, {}, diff --git a/src/librssguard/network-web/oauth2service.cpp b/src/librssguard/network-web/oauth2service.cpp index 9e87a2621..d52843ed3 100644 --- a/src/librssguard/network-web/oauth2service.cpp +++ b/src/librssguard/network-web/oauth2service.cpp @@ -77,7 +77,7 @@ QString OAuth2Service::bearer() { if (!isFullyLoggedIn()) { qApp->showGuiMessage(tr("You have to login first"), tr("Click here to login."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, nullptr, false, [this]() { login(); diff --git a/src/librssguard/services/abstract/accountcheckmodel.cpp b/src/librssguard/services/abstract/accountcheckmodel.cpp index 2f855dafb..117a235f6 100644 --- a/src/librssguard/services/abstract/accountcheckmodel.cpp +++ b/src/librssguard/services/abstract/accountcheckmodel.cpp @@ -262,13 +262,13 @@ bool AccountCheckModel::setData(const QModelIndex& index, const QVariant& value, Qt::ItemFlags AccountCheckModel::flags(const QModelIndex& index) const { if (!index.isValid() || (itemForIndex(index)->kind() != RootItem::Kind::Category && itemForIndex(index)->kind() != RootItem::Kind::Feed)) { - return Qt::NoItemFlags; + return Qt::ItemFlag::NoItemFlags; } - Qt::ItemFlags flags = Qt::ItemIsEnabled | Qt::ItemIsSelectable; + Qt::ItemFlags flags = Qt::ItemFlag::ItemIsEnabled | Qt::ItemFlag::ItemIsSelectable; if (index.column() == 0) { - flags |= Qt::ItemIsUserCheckable; + flags |= Qt::ItemFlag::ItemIsUserCheckable; } return flags; diff --git a/src/librssguard/services/abstract/rootitem.cpp b/src/librssguard/services/abstract/rootitem.cpp index 76a7ec6a8..35e1c18d8 100644 --- a/src/librssguard/services/abstract/rootitem.cpp +++ b/src/librssguard/services/abstract/rootitem.cpp @@ -186,7 +186,7 @@ QVariant RootItem::data(int column, int role) const { case Qt::TextAlignmentRole: if (column == FDS_MODEL_COUNTS_INDEX) { - return Qt::AlignCenter; + return Qt::AlignmentFlag::AlignCenter; } else { return QVariant(); @@ -198,7 +198,7 @@ QVariant RootItem::data(int column, int role) const { } Qt::ItemFlags RootItem::additionalFlags() const { - return Qt::NoItemFlags; + return Qt::ItemFlag::NoItemFlags; } bool RootItem::performDragDropChange(RootItem* target_item) { diff --git a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp index cb2531a8f..86abc7076 100644 --- a/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp +++ b/src/librssguard/services/gmail/network/gmailnetworkfactory.cpp @@ -331,7 +331,7 @@ void GmailNetworkFactory::onTokensError(const QString& error, const QString& err qApp->showGuiMessage(tr("Gmail: authentication error"), tr("Click this to login again. Error is: '%1'").arg(error_description), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, nullptr, false, [this]() { m_oauth2->setAccessToken(QString()); @@ -343,7 +343,7 @@ void GmailNetworkFactory::onTokensError(const QString& error, const QString& err void GmailNetworkFactory::onAuthFailed() { qApp->showGuiMessage(tr("Gmail: authorization denied"), tr("Click this to login again."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, nullptr, false, [this]() { m_oauth2->login(); diff --git a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp index e792762c0..a4e681172 100644 --- a/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp +++ b/src/librssguard/services/inoreader/network/inoreadernetworkfactory.cpp @@ -268,7 +268,7 @@ void InoreaderNetworkFactory::onTokensError(const QString& error, const QString& qApp->showGuiMessage(tr("Inoreader: authentication error"), tr("Click this to login again. Error is: '%1'").arg(error_description), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, nullptr, false, [this]() { m_oauth2->setAccessToken(QString()); @@ -280,7 +280,7 @@ void InoreaderNetworkFactory::onTokensError(const QString& error, const QString& void InoreaderNetworkFactory::onAuthFailed() { qApp->showGuiMessage(tr("Inoreader: authorization denied"), tr("Click this to login again."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, nullptr, false, [this]() { m_oauth2->login(); diff --git a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp index 2ab7551e4..d32180cf5 100644 --- a/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp +++ b/src/librssguard/services/owncloud/network/owncloudnetworkfactory.cpp @@ -86,7 +86,7 @@ OwnCloudStatusResponse OwnCloudNetworkFactory::status() { qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), result_raw, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers); OwnCloudStatusResponse status_response(network_reply.first, QString::fromUtf8(result_raw)); @@ -113,7 +113,7 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories() { qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), result_raw, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers); if (network_reply.first != QNetworkReply::NoError) { @@ -130,7 +130,7 @@ OwnCloudGetFeedsCategoriesResponse OwnCloudNetworkFactory::feedsCategories() { qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), result_raw, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers); if (network_reply.first != QNetworkReply::NoError) { @@ -156,7 +156,9 @@ bool OwnCloudNetworkFactory::deleteFeed(const QString& feed_id) { NetworkResult network_reply = NetworkFactory::performNetworkOperation(final_url, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), - QByteArray(), raw_output, QNetworkAccessManager::DeleteOperation, + QByteArray(), + raw_output, + QNetworkAccessManager::Operation::DeleteOperation, headers); if (network_reply.first != QNetworkReply::NoError) { @@ -193,9 +195,9 @@ bool OwnCloudNetworkFactory::createFeed(const QString& url, int parent_id) { NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_urlFeeds, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); if (network_reply.first != QNetworkReply::NoError) { @@ -224,12 +226,12 @@ bool OwnCloudNetworkFactory::renameFeed(const QString& new_name, const QString& NetworkResult network_reply = NetworkFactory::performNetworkOperation( final_url, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, QNetworkAccessManager::PutOperation, headers); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.first != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Renaming of feed failed with error" << QUOTE_W_SPACE_DOT(network_reply.first); @@ -259,7 +261,7 @@ OwnCloudGetMessagesResponse OwnCloudNetworkFactory::getMessages(int feed_id) { qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), result_raw, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers); OwnCloudGetMessagesResponse msgs_response(network_reply.first, QString::fromUtf8(result_raw)); @@ -285,10 +287,10 @@ QNetworkReply::NetworkError OwnCloudNetworkFactory::triggerFeedUpdate(int feed_i qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), raw_output, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers); - if (network_reply.first != QNetworkReply::NoError) { + if (network_reply.first != QNetworkReply::NetworkError::NoError) { qCriticalNN << LOGSEC_NEXTCLOUD << "Feeds update failed with error" << QUOTE_W_SPACE_DOT(network_reply.first); @@ -325,9 +327,9 @@ NetworkResult OwnCloudNetworkFactory::markMessagesRead(RootItem::ReadStatus stat return NetworkFactory::performNetworkOperation(final_url, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), output, - QNetworkAccessManager::PutOperation, + QNetworkAccessManager::Operation::PutOperation, headers); } @@ -365,9 +367,9 @@ NetworkResult OwnCloudNetworkFactory::markMessagesStarred(RootItem::Importance i return NetworkFactory::performNetworkOperation(final_url, qApp->settings()->value(GROUP(Feeds), SETTING(Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), output, - QNetworkAccessManager::PutOperation, + QNetworkAccessManager::Operation::PutOperation, headers); } @@ -398,7 +400,7 @@ bool OwnCloudResponse::isLoaded() const { } QString OwnCloudResponse::toString() const { - return QJsonDocument(m_rawContent).toJson(QJsonDocument::Compact); + return QJsonDocument(m_rawContent).toJson(QJsonDocument::JsonFormat::Compact); } QNetworkReply::NetworkError OwnCloudResponse::networkError() const { @@ -469,7 +471,7 @@ RootItem* OwnCloudGetFeedsCategoriesResponse::feedsCategories(bool obtain_icons) if (NetworkFactory::performNetworkOperation(icon_path, DOWNLOAD_TIMEOUT, QByteArray(), icon_data, QNetworkAccessManager::GetOperation).first == - QNetworkReply::NoError) { + QNetworkReply::NetworkError::NoError) { // Icon downloaded, set it up. QPixmap icon_pixmap; diff --git a/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp b/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp index f971a1602..8d5c82ec8 100644 --- a/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp +++ b/src/librssguard/services/standard/gui/formstandardcategorydetails.cpp @@ -113,7 +113,7 @@ void FormStandardCategoryDetails::apply() { delete new_category; qApp->showGuiMessage(tr("Cannot add category"), tr("Category was not added due to error."), - QSystemTrayIcon::Critical, + QSystemTrayIcon::MessageIcon::Critical, qApp->mainFormWidget(), true); } } diff --git a/src/librssguard/services/standard/gui/formstandardimportexport.cpp b/src/librssguard/services/standard/gui/formstandardimportexport.cpp index 19f37f744..94038a9c4 100644 --- a/src/librssguard/services/standard/gui/formstandardimportexport.cpp +++ b/src/librssguard/services/standard/gui/formstandardimportexport.cpp @@ -187,16 +187,17 @@ void FormStandardImportExport::selectImportFile() { m_ui->m_lblSelectFile->setStatus(WidgetWithStatus::StatusType::Ok, QDir::toNativeSeparators(selected_file), tr("File is selected.")); QMessageBox::StandardButton answer = MessageBox::show(this, - QMessageBox::Warning, + QMessageBox::Icon::Warning, tr("Get online metadata"), tr("Metadata for your feeds can be fetched online. Note that the action " "could take several minutes, depending on number of feeds."), tr("Do you want to fetch feed metadata online?"), QString(), - QMessageBox::Yes | QMessageBox::No, - QMessageBox::Yes); + QMessageBox::StandardButton::Yes | + QMessageBox::StandardButton::No, + QMessageBox::StandardButton::Yes); - parseImportFile(selected_file, answer == QMessageBox::Yes); + parseImportFile(selected_file, answer == QMessageBox::StandardButton::Yes); } } diff --git a/src/librssguard/services/standard/standardfeed.cpp b/src/librssguard/services/standard/standardfeed.cpp index 4d3d86b16..695d5eb83 100644 --- a/src/librssguard/services/standard/standardfeed.cpp +++ b/src/librssguard/services/standard/standardfeed.cpp @@ -32,7 +32,7 @@ StandardFeed::StandardFeed(RootItem* parent_item) : Feed(parent_item) { - m_networkError = QNetworkReply::NoError; + m_networkError = QNetworkReply::NetworkError::NoError; m_type = Type::Rss0X; m_encoding = QString(); } @@ -155,7 +155,7 @@ QPair StandardFeed::guessFeed(const SETTING(Feeds::UpdateTimeout)).toInt(), QByteArray(), feed_contents, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers, false, {}, @@ -234,7 +234,7 @@ QPair StandardFeed::guessFeed(const << "XML of feed" << QUOTE_W_SPACE(url) << "is not valid and cannot be loaded. " << "Error:" << QUOTE_W_SPACE(error_msg) << "(line " << error_line << ", column " << error_column << ")."; - result.second = QNetworkReply::UnknownContentError; + result.second = QNetworkReply::NetworkError::UnknownContentError; // XML is invalid, exit. return result; @@ -311,7 +311,7 @@ QPair StandardFeed::guessFeed(const else { // File was downloaded and it really was XML file // but feed format was NOT recognized. - result.second = QNetworkReply::UnknownContentError; + result.second = QNetworkReply::NetworkError::UnknownContentError; } } @@ -437,14 +437,14 @@ QList StandardFeed::obtainNewMessages(bool* error_during_obtaining) { download_timeout, QByteArray(), feed_contents, - QNetworkAccessManager::GetOperation, + QNetworkAccessManager::Operation::GetOperation, headers, false, {}, {}, getParentServiceRoot()->networkProxy()).first; - if (m_networkError != QNetworkReply::NoError) { + if (m_networkError != QNetworkReply::NetworkError::NoError) { qWarningNN << LOGSEC_CORE << "Error" << QUOTE_W_SPACE(m_networkError) diff --git a/src/librssguard/services/standard/standardserviceroot.cpp b/src/librssguard/services/standard/standardserviceroot.cpp index 85c30e38d..6ad39fac1 100644 --- a/src/librssguard/services/standard/standardserviceroot.cpp +++ b/src/librssguard/services/standard/standardserviceroot.cpp @@ -134,7 +134,7 @@ void StandardServiceRoot::addNewFeed(RootItem* selected_item, const QString& url } Qt::ItemFlags StandardServiceRoot::additionalFlags() const { - return Qt::ItemIsDropEnabled; + return Qt::ItemFlag::ItemIsDropEnabled; } void StandardServiceRoot::loadFromDatabase() { diff --git a/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp b/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp index 3d74dadf5..ab455c814 100644 --- a/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp +++ b/src/librssguard/services/tt-rss/network/ttrssnetworkfactory.cpp @@ -92,9 +92,9 @@ TtRssLoginResponse TtRssNetworkFactory::login() { qApp->settings()->value(GROUP(Feeds), SETTING( Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssLoginResponse login_response(QString::fromUtf8(result_raw)); @@ -128,9 +128,9 @@ TtRssResponse TtRssNetworkFactory::logout() { qApp->settings()->value(GROUP(Feeds), SETTING( Feeds::UpdateTimeout)).toInt(), - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); m_lastError = network_reply.first; @@ -149,7 +149,7 @@ TtRssResponse TtRssNetworkFactory::logout() { else { qWarningNN << LOGSEC_TTRSS << "Cannot logout because session ID is empty."; - m_lastError = QNetworkReply::NoError; + m_lastError = QNetworkReply::NetworkError::NoError; return TtRssResponse(); } } @@ -168,9 +168,9 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels() { headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssGetLabelsResponse result(QString::fromUtf8(result_raw)); @@ -178,9 +178,9 @@ TtRssGetLabelsResponse TtRssNetworkFactory::getLabels() { // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssGetLabelsResponse(QString::fromUtf8(result_raw)); } @@ -209,9 +209,9 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() { headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssGetFeedsCategoriesResponse result(QString::fromUtf8(result_raw)); @@ -219,9 +219,9 @@ TtRssGetFeedsCategoriesResponse TtRssNetworkFactory::getFeedsCategories() { // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssGetFeedsCategoriesResponse(QString::fromUtf8(result_raw)); } @@ -259,9 +259,9 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssGetHeadlinesResponse result(QString::fromUtf8(result_raw)); @@ -269,9 +269,9 @@ TtRssGetHeadlinesResponse TtRssNetworkFactory::getHeadlines(int feed_id, int lim // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssGetHeadlinesResponse(QString::fromUtf8(result_raw)); } @@ -303,9 +303,9 @@ TtRssResponse TtRssNetworkFactory::setArticleLabel(const QStringList& article_id headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssResponse result(QString::fromUtf8(result_raw)); @@ -313,9 +313,9 @@ TtRssResponse TtRssNetworkFactory::setArticleLabel(const QStringList& article_id // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssResponse(QString::fromUtf8(result_raw)); } @@ -349,9 +349,9 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssUpdateArticleResponse result(QString::fromUtf8(result_raw)); @@ -359,9 +359,9 @@ TtRssUpdateArticleResponse TtRssNetworkFactory::updateArticles(const QStringList // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssUpdateArticleResponse(QString::fromUtf8(result_raw)); } @@ -399,9 +399,9 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString& headers << NetworkFactory::generateBasicAuthHeader(m_authUsername, m_authPassword); NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssSubscribeToFeedResponse result(QString::fromUtf8(result_raw)); @@ -409,9 +409,9 @@ TtRssSubscribeToFeedResponse TtRssNetworkFactory::subscribeToFeed(const QString& // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssSubscribeToFeedResponse(QString::fromUtf8(result_raw)); } @@ -441,9 +441,9 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id) { NetworkResult network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, - QJsonDocument(json).toJson(QJsonDocument::Compact), + QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); TtRssUnsubscribeFeedResponse result(QString::fromUtf8(result_raw)); @@ -451,9 +451,9 @@ TtRssUnsubscribeFeedResponse TtRssNetworkFactory::unsubscribeFeed(int feed_id) { // We are not logged in. login(); json["sid"] = m_sessionId; - network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::Compact), + network_reply = NetworkFactory::performNetworkOperation(m_fullUrl, timeout, QJsonDocument(json).toJson(QJsonDocument::JsonFormat::Compact), result_raw, - QNetworkAccessManager::PostOperation, + QNetworkAccessManager::Operation::PostOperation, headers); result = TtRssUnsubscribeFeedResponse(QString::fromUtf8(result_raw)); } @@ -541,7 +541,7 @@ bool TtRssResponse::isNotLoggedIn() const { } QString TtRssResponse::toString() const { - return QJsonDocument(m_rawContent).toJson(QJsonDocument::Compact); + return QJsonDocument(m_rawContent).toJson(QJsonDocument::JsonFormat::Compact); } TtRssLoginResponse::TtRssLoginResponse(const QString& raw_content) : TtRssResponse(raw_content) {}