From 9a0e17814e40f5cacf3702f997f775d87e07ece9 Mon Sep 17 00:00:00 2001
From: Martin Rotter <rotter.martinos@gmail.com>
Date: Tue, 3 May 2016 08:57:56 +0200
Subject: [PATCH] Refactoring.

---
 src/services/owncloud/owncloudfeed.cpp | 13 +++++++++----
 src/services/owncloud/owncloudfeed.h   |  1 +
 src/services/standard/standardfeed.cpp | 14 +++++++-------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/services/owncloud/owncloudfeed.cpp b/src/services/owncloud/owncloudfeed.cpp
index 891e0e9a9..fb4a89d48 100755
--- a/src/services/owncloud/owncloudfeed.cpp
+++ b/src/services/owncloud/owncloudfeed.cpp
@@ -59,10 +59,7 @@ bool OwnCloudFeed::canBeDeleted() const {
 }
 
 bool OwnCloudFeed::deleteViaGui() {
-  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
-
-  if (serviceRoot()->network()->deleteFeed(customId()) &&
-      DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId())) {
+  if (removeItself()) {
     serviceRoot()->requestItemRemoval(this);
     return true;
   }
@@ -86,6 +83,14 @@ bool OwnCloudFeed::editItself(OwnCloudFeed *new_feed_data) {
   }
 }
 
+bool OwnCloudFeed::removeItself() {
+  QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
+
+  return
+      serviceRoot()->network()->deleteFeed(customId()) &&
+      DatabaseQueries::deleteFeed(database, customId(), serviceRoot()->accountId());
+}
+
 bool OwnCloudFeed::markAsReadUnread(RootItem::ReadStatus status) {
   QStringList ids = getParentServiceRoot()->customIDSOfMessagesForItem(this);
   QNetworkReply::NetworkError response = serviceRoot()->network()->markMessagesRead(status, ids);
diff --git a/src/services/owncloud/owncloudfeed.h b/src/services/owncloud/owncloudfeed.h
index ad3936c18..b13fdec2f 100755
--- a/src/services/owncloud/owncloudfeed.h
+++ b/src/services/owncloud/owncloudfeed.h
@@ -37,6 +37,7 @@ class OwnCloudFeed : public Feed {
     bool deleteViaGui();
 
     bool editItself(OwnCloudFeed *new_feed_data);
+    bool removeItself();
 
     bool markAsReadUnread(ReadStatus status);
     bool cleanMessages(bool clear_only_read);
diff --git a/src/services/standard/standardfeed.cpp b/src/services/standard/standardfeed.cpp
index a28c38782..e4fd6527e 100755
--- a/src/services/standard/standardfeed.cpp
+++ b/src/services/standard/standardfeed.cpp
@@ -383,8 +383,8 @@ bool StandardFeed::addItself(RootItem *parent) {
   QSqlDatabase database = qApp->database()->connection(metaObject()->className(), DatabaseFactory::FromSettings);
   bool ok;
   int new_id = DatabaseQueries::addFeed(database, parent->id(), parent->getParentServiceRoot()->accountId(), title(),
-                                                description(), creationDate(), icon(), encoding(), url(), passwordProtected(),
-                                                username(), password(), autoUpdateType(), autoUpdateInitialInterval(), type(), &ok);
+                                        description(), creationDate(), icon(), encoding(), url(), passwordProtected(),
+                                        username(), password(), autoUpdateType(), autoUpdateInitialInterval(), type(), &ok);
 
   if (!ok) {
     // Query failed.
@@ -405,11 +405,11 @@ bool StandardFeed::editItself(StandardFeed *new_feed_data) {
   RootItem *new_parent = new_feed_data->parent();
 
   if (!DatabaseQueries::editFeed(database, new_parent->id(), original_feed->id(), new_feed_data->title(),
-                                new_feed_data->description(), new_feed_data->icon(),
-                                new_feed_data->encoding(), new_feed_data->url(), new_feed_data->passwordProtected(),
-                                new_feed_data->username(), new_feed_data->password(),
-                                new_feed_data->autoUpdateType(), new_feed_data->autoUpdateInitialInterval(),
-                                new_feed_data->type())) {
+                                 new_feed_data->description(), new_feed_data->icon(),
+                                 new_feed_data->encoding(), new_feed_data->url(), new_feed_data->passwordProtected(),
+                                 new_feed_data->username(), new_feed_data->password(),
+                                 new_feed_data->autoUpdateType(), new_feed_data->autoUpdateInitialInterval(),
+                                 new_feed_data->type())) {
     // Persistent storage update failed, no way to continue now.
     return false;
   }