From b873890ce89b92733ad34e34010543a3d292a00b Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 6 Jan 2015 19:07:59 +0100
Subject: [PATCH] Compile fix.

---
 src/core/feedsmodelcategory.cpp | 10 +++++++--
 src/core/feedsmodelcategory.h   |  3 +++
 src/core/feedsmodelfeed.cpp     | 38 +++++++++++++++++++--------------
 src/core/feedsmodelfeed.h       |  3 +++
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/core/feedsmodelcategory.cpp b/src/core/feedsmodelcategory.cpp
index ae349dd87..918074f32 100755
--- a/src/core/feedsmodelcategory.cpp
+++ b/src/core/feedsmodelcategory.cpp
@@ -28,10 +28,14 @@
 #include <QSqlQuery>
 
 
-FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) {
+void FeedsModelCategory::init() {
   m_kind = FeedsModelRootItem::Category;
 }
 
+FeedsModelCategory::FeedsModelCategory(FeedsModelRootItem *parent_item) : FeedsModelRootItem(parent_item) {
+  init();
+}
+
 FeedsModelCategory::FeedsModelCategory(const FeedsModelCategory &other)
   : FeedsModelRootItem(NULL) {
   m_kind = other.kind();
@@ -141,7 +145,9 @@ bool FeedsModelCategory::removeItself() {
   return query_remove.exec();
 }
 
-FeedsModelCategory::FeedsModelCategory(const QSqlRecord &record) : FeedsModelCategory(NULL) {
+FeedsModelCategory::FeedsModelCategory(const QSqlRecord &record) : FeedsModelRootItem(NULL) {
+  init();
+
   setId(record.value(CAT_DB_ID_INDEX).toInt());
   setTitle(record.value(CAT_DB_TITLE_INDEX).toString());
   setDescription(record.value(CAT_DB_DESCRIPTION_INDEX).toString());
diff --git a/src/core/feedsmodelcategory.h b/src/core/feedsmodelcategory.h
index 59a925d16..00d86e5d8 100755
--- a/src/core/feedsmodelcategory.h
+++ b/src/core/feedsmodelcategory.h
@@ -45,6 +45,9 @@ class FeedsModelCategory : public FeedsModelRootItem {
     // Removes category and all its children from persistent
     // database.
     bool removeItself();
+
+  private:
+    void init();
 };
 
 #endif // FEEDSMODELCLASSICCATEGORY_H
diff --git a/src/core/feedsmodelfeed.cpp b/src/core/feedsmodelfeed.cpp
index ab92a3f78..f7a6f40e9 100755
--- a/src/core/feedsmodelfeed.cpp
+++ b/src/core/feedsmodelfeed.cpp
@@ -36,24 +36,28 @@
 #include <QXmlStreamReader>
 
 
-FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item)
-  : FeedsModelRootItem(parent_item),
-    m_passwordProtected(false),
-    m_username(QString()),
-    m_password(QString()),
-    m_status(Normal),
-    m_networkError(QNetworkReply::NoError),
-    m_type(Rss0X),
-    m_totalCount(0),
-    m_unreadCount(0),
-    m_autoUpdateType(DontAutoUpdate),
-    m_autoUpdateInitialInterval(DEFAULT_AUTO_UPDATE_INTERVAL),
-    m_autoUpdateRemainingInterval(DEFAULT_AUTO_UPDATE_INTERVAL),
-    m_encoding(QString()),
-    m_url(QString()) {
+void FeedsModelFeed::init() {
+  m_passwordProtected = false;
+  m_username = QString();
+  m_password = QString();
+  m_status = Normal;
+  m_networkError = QNetworkReply::NoError;
+  m_type = Rss0X;
+  m_totalCount = 0;
+  m_unreadCount = 0;
+  m_autoUpdateType = DontAutoUpdate;
+  m_autoUpdateInitialInterval = DEFAULT_AUTO_UPDATE_INTERVAL;
+  m_autoUpdateRemainingInterval = DEFAULT_AUTO_UPDATE_INTERVAL;
+  m_encoding = QString();
+  m_url = QString();
   m_kind = FeedsModelRootItem::Feed;
 }
 
+FeedsModelFeed::FeedsModelFeed(FeedsModelRootItem *parent_item)
+  : FeedsModelRootItem(parent_item) {
+  init();
+}
+
 FeedsModelFeed::FeedsModelFeed(const FeedsModelFeed &other)
   : FeedsModelRootItem(NULL) {
   m_passwordProtected = other.passwordProtected();
@@ -577,7 +581,9 @@ QNetworkReply::NetworkError FeedsModelFeed::networkError() const {
 }
 
 
-FeedsModelFeed::FeedsModelFeed(const QSqlRecord &record) : FeedsModelFeed(NULL) {
+FeedsModelFeed::FeedsModelFeed(const QSqlRecord &record) : FeedsModelRootItem(NULL) {
+  init();
+
   setTitle(record.value(FDS_DB_TITLE_INDEX).toString());
   setId(record.value(FDS_DB_ID_INDEX).toInt());
   setDescription(record.value(FDS_DB_DESCRIPTION_INDEX).toString());
diff --git a/src/core/feedsmodelfeed.h b/src/core/feedsmodelfeed.h
index d816aa2bc..db1563133 100755
--- a/src/core/feedsmodelfeed.h
+++ b/src/core/feedsmodelfeed.h
@@ -195,6 +195,9 @@ class FeedsModelFeed : public FeedsModelRootItem {
     void updateMessages(const QList<Message> &messages);
 
   private:
+    void init();
+
+  private:    
     bool m_passwordProtected;
     QString m_username;
     QString m_password;