diff --git a/resources/binaries b/resources/binaries index e9833a2e4..d44aacc99 160000 --- a/resources/binaries +++ b/resources/binaries @@ -1 +1 @@ -Subproject commit e9833a2e45d8d3241f662d3a03ed19d3446386ce +Subproject commit d44aacc99fdc997648c924f0d5444566164f142e diff --git a/rssguard.pro b/rssguard.pro index 9f81a30ff..11b4c137b 100755 --- a/rssguard.pro +++ b/rssguard.pro @@ -335,8 +335,8 @@ HEADERS += src/core/feeddownloader.h \ src/services/inoreader/definitions.h \ src/services/inoreader/inoreaderentrypoint.h \ src/services/inoreader/network/inoreadernetworkfactory.h \ - src/services/inoreader/inoreaderserviceroot.h \ - src/services/inoreader/gui/formeditinoreaderaccount.h + src/services/inoreader/inoreaderserviceroot.h \ + src/services/inoreader/gui/formeditinoreaderaccount.h SOURCES += src/core/feeddownloader.cpp \ src/core/feedsmodel.cpp \ @@ -461,8 +461,8 @@ SOURCES += src/core/feeddownloader.cpp \ src/miscellaneous/externaltool.cpp \ src/services/inoreader/inoreaderentrypoint.cpp \ src/services/inoreader/network/inoreadernetworkfactory.cpp \ - src/services/inoreader/inoreaderserviceroot.cpp \ - src/services/inoreader/gui/formeditinoreaderaccount.cpp + src/services/inoreader/inoreaderserviceroot.cpp \ + src/services/inoreader/gui/formeditinoreaderaccount.cpp OBJECTIVE_SOURCES += src/miscellaneous/disablewindowtabbing.mm @@ -490,7 +490,7 @@ FORMS += src/gui/toolbareditor.ui \ src/gui/settings/settingsfeedsmessages.ui \ src/gui/settings/settingsdownloads.ui \ src/services/tt-rss/gui/formeditttrssaccount.ui \ - src/services/inoreader/gui/formeditinoreaderaccount.ui + src/services/inoreader/gui/formeditinoreaderaccount.ui equals(USE_WEBENGINE, true) { HEADERS += src/gui/locationlineedit.h \ diff --git a/src/services/abstract/rootitem.cpp b/src/services/abstract/rootitem.cpp index 0f7ce0753..5718ef2ad 100755 --- a/src/services/abstract/rootitem.cpp +++ b/src/services/abstract/rootitem.cpp @@ -452,6 +452,10 @@ QString RootItem::customId() const { return m_customId; } +int RootItem::customNumericId() const { + return customId().toInt(); +} + void RootItem::setCustomId(const QString& custom_id) { m_customId = custom_id; } diff --git a/src/services/abstract/rootitem.h b/src/services/abstract/rootitem.h index d4964c5f6..065b66aad 100755 --- a/src/services/abstract/rootitem.h +++ b/src/services/abstract/rootitem.h @@ -211,6 +211,7 @@ class RootItem : public QObject { // NOTE: For standard feed/category, this WILL equal to id(). QString customId() const; + int customNumericId() const; void setCustomId(const QString& custom_id); // Converters