From 589c08bc8b805fc5bbc7de96219802218514a567 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter@praktik.cz>
Date: Tue, 26 Sep 2017 07:36:36 +0200
Subject: [PATCH] Fix false inlines.

---
 src/services/abstract/feed.cpp       | 28 +---------------------------
 src/services/standard/standardfeed.h | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/src/services/abstract/feed.cpp b/src/services/abstract/feed.cpp
index 47263c8e4..5a80b1251 100755
--- a/src/services/abstract/feed.cpp
+++ b/src/services/abstract/feed.cpp
@@ -63,38 +63,12 @@ QVariant Feed::data(int column, int role) const {
   switch (role) {
     case Qt::ToolTipRole:
       if (column == FDS_MODEL_TITLE_INDEX) {
-        QString auto_update_string;
-
-        switch (autoUpdateType()) {
-          case DontAutoUpdate:
-
-            //: Describes feed auto-update status.
-            auto_update_string = tr("does not use auto-update");
-            break;
-
-          case DefaultAutoUpdate:
-
-            //: Describes feed auto-update status.
-            auto_update_string = tr("uses global settings");
-            break;
-
-          case SpecificAutoUpdate:
-          default:
-
-            //: Describes feed auto-update status.
-            auto_update_string = tr("uses specific settings "
-                                    "(%n minute(s) to next auto-update)",
-                                    0,
-                                    autoUpdateRemainingInterval());
-            break;
-        }
-
         //: Tooltip for feed.
         return tr("%1"
                   "%2\n\n"
                   "Auto-update status: %3").arg(title(),
                                                 description().isEmpty() ? QString() : QString('\n') + description(),
-                                                auto_update_string);
+                                                getAutoUpdateStatusDescription());
       }
       else {
         return RootItem::data(column, role);
diff --git a/src/services/standard/standardfeed.h b/src/services/standard/standardfeed.h
index e4a7bc240..5de440762 100755
--- a/src/services/standard/standardfeed.h
+++ b/src/services/standard/standardfeed.h
@@ -72,16 +72,16 @@ class StandardFeed : public Feed {
     bool editItself(StandardFeed* new_feed_data);
 
     // Other getters/setters.
-    inline Type type() const;
-    inline void setType(Type type);
-    inline bool passwordProtected() const;
-    inline void setPasswordProtected(bool passwordProtected);
-    inline QString username() const;
-    inline void setUsername(const QString& username);
-    inline QString password() const;
-    inline void setPassword(const QString& password);
-    inline QString encoding() const;
-    inline void setEncoding(const QString& encoding);
+    Type type() const;
+    void setType(Type type);
+    bool passwordProtected() const;
+    void setPasswordProtected(bool passwordProtected);
+    QString username() const;
+    void setUsername(const QString& username);
+    QString password() const;
+    void setPassword(const QString& password);
+    QString encoding() const;
+    void setEncoding(const QString& encoding);
 
     QNetworkReply::NetworkError networkError() const;