From 4ccbcbe394d113e724a3de468d0ef51d4494c195 Mon Sep 17 00:00:00 2001 From: Martin Rotter Date: Tue, 19 Jan 2016 07:46:52 +0100 Subject: [PATCH] Some tiny cleanups before 3.0.2. --- src/services/abstract/recyclebin.cpp | 2 -- src/services/standard/standardcategory.cpp | 4 ++-- src/services/standard/standardcategory.h | 2 +- src/services/standard/standardfeed.cpp | 8 +++----- src/services/standard/standardfeed.h | 2 +- src/services/tt-rss/ttrsscategory.cpp | 4 ++-- src/services/tt-rss/ttrsscategory.h | 2 +- src/services/tt-rss/ttrssfeed.cpp | 8 +++----- src/services/tt-rss/ttrssfeed.h | 2 +- 9 files changed, 14 insertions(+), 20 deletions(-) diff --git a/src/services/abstract/recyclebin.cpp b/src/services/abstract/recyclebin.cpp index 840a25e79..604b21ba2 100755 --- a/src/services/abstract/recyclebin.cpp +++ b/src/services/abstract/recyclebin.cpp @@ -98,8 +98,6 @@ QList RecycleBin::undeletedMessages() const { "WHERE is_deleted = 1 AND is_pdeleted = 0 AND account_id = :account_id;"); query_read_msg.bindValue(QSL(":account_id"), account_id); - // FIXME: Fix those const functions, this is fucking ugly. - if (query_read_msg.exec()) { while (query_read_msg.next()) { bool decoded; diff --git a/src/services/standard/standardcategory.cpp b/src/services/standard/standardcategory.cpp index 4757826f2..c876a42e5 100755 --- a/src/services/standard/standardcategory.cpp +++ b/src/services/standard/standardcategory.cpp @@ -54,8 +54,8 @@ StandardCategory::~StandardCategory() { qDebug("Destroying Category instance."); } -StandardServiceRoot *StandardCategory::serviceRoot() { - return static_cast(getParentServiceRoot()); +StandardServiceRoot *StandardCategory::serviceRoot() const { + return qobject_cast(getParentServiceRoot()); } QVariant StandardCategory::data(int column, int role) const { diff --git a/src/services/standard/standardcategory.h b/src/services/standard/standardcategory.h index 91cdc4b86..cd37eff96 100755 --- a/src/services/standard/standardcategory.h +++ b/src/services/standard/standardcategory.h @@ -40,7 +40,7 @@ class StandardCategory : public Category { explicit StandardCategory(const QSqlRecord &record); virtual ~StandardCategory(); - StandardServiceRoot *serviceRoot(); + StandardServiceRoot *serviceRoot() const; // Returns the actual data representation of standard category. QVariant data(int column, int role) const; diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp index 2b594eb6b..09c2fe096 100755 --- a/src/services/standard/standardfeed.cpp +++ b/src/services/standard/standardfeed.cpp @@ -98,8 +98,8 @@ QList StandardFeed::contextMenu() { return serviceRoot()->getContextMenuForFeed(this); } -StandardServiceRoot *StandardFeed::serviceRoot() { - return static_cast(getParentServiceRoot()); +StandardServiceRoot *StandardFeed::serviceRoot() const { + return qobject_cast(getParentServiceRoot()); } bool StandardFeed::editViaGui() { @@ -138,9 +138,7 @@ QList StandardFeed::undeletedMessages() const { "WHERE is_deleted = 0 AND feed = :feed AND account_id = :account_id;"); query_read_msg.bindValue(QSL(":feed"), id()); - query_read_msg.bindValue(QSL(":account_id"), const_cast(this)->serviceRoot()->accountId()); - - // FIXME: Fix those const functions, this is fucking ugly. + query_read_msg.bindValue(QSL(":account_id"), serviceRoot()->accountId()); if (query_read_msg.exec()) { while (query_read_msg.next()) { diff --git a/src/services/standard/standardfeed.h b/src/services/standard/standardfeed.h index 570f663b4..d473b81e9 100755 --- a/src/services/standard/standardfeed.h +++ b/src/services/standard/standardfeed.h @@ -53,7 +53,7 @@ class StandardFeed : public Feed { explicit StandardFeed(const QSqlRecord &record); virtual ~StandardFeed(); - StandardServiceRoot *serviceRoot(); + StandardServiceRoot *serviceRoot() const; // Getters/setters for count of messages. // NOTE: For feeds, counts are stored internally diff --git a/src/services/tt-rss/ttrsscategory.cpp b/src/services/tt-rss/ttrsscategory.cpp index 1f5caa1a5..e05953d8d 100755 --- a/src/services/tt-rss/ttrsscategory.cpp +++ b/src/services/tt-rss/ttrsscategory.cpp @@ -44,11 +44,11 @@ TtRssCategory::~TtRssCategory() { QString TtRssCategory::hashCode() const { return QString::number(kind()) + QL1S("-") + - QString::number(const_cast(this)->getParentServiceRoot()->accountId()) + QL1S("-") + + QString::number(getParentServiceRoot()->accountId()) + QL1S("-") + QString::number(customId()); } -TtRssServiceRoot *TtRssCategory::serviceRoot() { +TtRssServiceRoot *TtRssCategory::serviceRoot() const { return qobject_cast(getParentServiceRoot()); } diff --git a/src/services/tt-rss/ttrsscategory.h b/src/services/tt-rss/ttrsscategory.h index 5535e3cd6..41096bcb3 100755 --- a/src/services/tt-rss/ttrsscategory.h +++ b/src/services/tt-rss/ttrsscategory.h @@ -35,7 +35,7 @@ class TtRssCategory : public Category { QString hashCode() const; - TtRssServiceRoot *serviceRoot(); + TtRssServiceRoot *serviceRoot() const; bool markAsReadUnread(ReadStatus status); bool cleanMessages(bool clear_only_read); diff --git a/src/services/tt-rss/ttrssfeed.cpp b/src/services/tt-rss/ttrssfeed.cpp index 244e6ff3d..779ca1b18 100755 --- a/src/services/tt-rss/ttrssfeed.cpp +++ b/src/services/tt-rss/ttrssfeed.cpp @@ -53,11 +53,11 @@ TtRssFeed::~TtRssFeed() { QString TtRssFeed::hashCode() const { return QString::number(kind()) + QL1S("-") + - QString::number(const_cast(this)->getParentServiceRoot()->accountId()) + QL1S("-") + + QString::number(getParentServiceRoot()->accountId()) + QL1S("-") + QString::number(customId()); } -TtRssServiceRoot *TtRssFeed::serviceRoot() { +TtRssServiceRoot *TtRssFeed::serviceRoot() const { return qobject_cast(getParentServiceRoot()); } @@ -188,7 +188,7 @@ int TtRssFeed::update() { QList TtRssFeed::undeletedMessages() const { QList messages; - int account_id = const_cast(this)->serviceRoot()->accountId(); + int account_id = serviceRoot()->accountId(); QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings); QSqlQuery query_read_msg(database); @@ -200,8 +200,6 @@ QList TtRssFeed::undeletedMessages() const { query_read_msg.bindValue(QSL(":feed"), customId()); query_read_msg.bindValue(QSL(":account_id"), account_id); - // FIXME: Fix those const functions, this is fucking ugly. - if (query_read_msg.exec()) { while (query_read_msg.next()) { bool decoded; diff --git a/src/services/tt-rss/ttrssfeed.h b/src/services/tt-rss/ttrssfeed.h index edcfd52d6..f7cd71d98 100755 --- a/src/services/tt-rss/ttrssfeed.h +++ b/src/services/tt-rss/ttrssfeed.h @@ -35,7 +35,7 @@ class TtRssFeed : public Feed { QString hashCode() const; - TtRssServiceRoot *serviceRoot(); + TtRssServiceRoot *serviceRoot() const; QVariant data(int column, int role) const;