FreshRSS/rssguard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Work on custom ids.

Browse Source
This commit is contained in:
Martin Rotter 2017-09-22 22:48:03 +02:00
parent 2711b6b457
commit de90b5a99b
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/miscellaneous/application.cpp
View File

@ -74,9 +74,8 @@ Application::Application(const QString& id, int& argc, char** argv)
QWebEngineProfile::defaultProfile()->setRequestInterceptor(m_urlInterceptor); QWebEngineProfile::defaultProfile()->setRequestInterceptor(m_urlInterceptor);
m_urlInterceptor->loadSettings(); m_urlInterceptor->loadSettings();
QWebEngineProfile::defaultProfile()->installUrlSchemeHandler( QWebEngineProfile::defaultProfile()->installUrlSchemeHandler(QByteArray(APP_LOW_NAME),
QByteArray(APP_LOW_NAME), new RssGuardSchemeHandler(QWebEngineProfile::defaultProfile()));
new RssGuardSchemeHandler(QWebEngineProfile::defaultProfile()));
#endif #endif
} }

2
src/services/inoreader/network/inoreadernetworkfactory.cpp
View File

@ -143,7 +143,7 @@ RootItem* InoreaderNetworkFactory::feedsCategories(bool obtain_icons) {
QEventLoop loop; QEventLoop loop;
RootItem* result = nullptr; RootItem* result = nullptr;
connect(reply, &QNetworkReply::finished, [&, this]() { connect(reply, &QNetworkReply::finished, [&]() {
if (reply->error() == QNetworkReply::NoError) { if (reply->error() == QNetworkReply::NoError) {
QByteArray repl_data = reply->readAll(); QByteArray repl_data = reply->readAll();
QJsonArray json = QJsonDocument::fromJson(repl_data).object()["tags"].toArray(); QJsonArray json = QJsonDocument::fromJson(repl_data).object()["tags"].toArray();

2
src/services/owncloud/gui/formowncloudfeeddetails.cpp
View File

@ -45,7 +45,7 @@ void FormOwnCloudFeedDetails::apply() {
if (m_ui->m_txtTitle->lineEdit()->text() != m_editableFeed->title()) { if (m_ui->m_txtTitle->lineEdit()->text() != m_editableFeed->title()) {
if (!qobject_cast<OwnCloudServiceRoot*>(m_serviceRoot)->network()->renameFeed(m_ui->m_txtTitle->lineEdit()->text(), if (!qobject_cast<OwnCloudServiceRoot*>(m_serviceRoot)->network()->renameFeed(m_ui->m_txtTitle->lineEdit()->text(),
m_editableFeed->customId())) { m_editableFeed->customId())) {
qWarning("ownCloud: Došlo k problému při prejmenování kanálu s ownCloud ID '%d'.", m_editableFeed->customId()); qWarning("ownCloud: Problem with feed renaming ID '%s'.", qPrintable(m_editableFeed->customId()));
} }
else { else {
renamed = true; renamed = true;