From 0d3c4298f0818cb377fcfc8409e89fe6327ab036 Mon Sep 17 00:00:00 2001
From: Kevin Smith <git@kismith.co.uk>
Date: Tue, 17 Jul 2018 17:15:11 +0100
Subject: Rename variable for consistency

Everything else in the class uses underscore suffixes already.

Test-Information:
Unit tests pass.

Change-Id: I1263025f18a6e06971610f8c7fc06f47bbbe9c9d

diff --git a/Swiften/MUC/MUCBookmarkManager.cpp b/Swiften/MUC/MUCBookmarkManager.cpp
index 8a7854d..e0922ae 100644
--- a/Swiften/MUC/MUCBookmarkManager.cpp
+++ b/Swiften/MUC/MUCBookmarkManager.cpp
@@ -34,7 +34,7 @@ void MUCBookmarkManager::handleBookmarksReceived(std::shared_ptr<Storage> payloa
     handlingReceivedBookmarks_ = true;
     onBookmarksReady();
 
-    storage = payload;
+    storage_ = payload;
 
     std::vector<MUCBookmark> receivedBookmarks;
     for (const auto& room : payload->getRooms()) {
@@ -115,17 +115,17 @@ void MUCBookmarkManager::flush() {
     if (handlingReceivedBookmarks_) {
         return;
     }
-    if (!storage) {
-        storage = std::make_shared<Storage>();
+    if (!storage_) {
+        storage_ = std::make_shared<Storage>();
     }
     // Update the storage element
-    storage->clearRooms();
+    storage_->clearRooms();
     for (const auto& bookmark : bookmarks_) {
-        storage->addRoom(bookmark.toStorage());
+        storage_->addRoom(bookmark.toStorage());
     }
 
     // Send an iq to save the storage element
-    SetPrivateStorageRequest<Storage>::ref request = SetPrivateStorageRequest<Storage>::create(storage, iqRouter_);
+    SetPrivateStorageRequest<Storage>::ref request = SetPrivateStorageRequest<Storage>::create(storage_, iqRouter_);
     // FIXME: We should care about the result
     //request->onResponse.connect(boost::bind(&MUCBookmarkManager::handleBookmarksSet, this, _1, _2));
     request->send();
diff --git a/Swiften/MUC/MUCBookmarkManager.h b/Swiften/MUC/MUCBookmarkManager.h
index 7f262da..1ef227d 100644
--- a/Swiften/MUC/MUCBookmarkManager.h
+++ b/Swiften/MUC/MUCBookmarkManager.h
@@ -48,6 +48,6 @@ namespace Swift {
             bool handlingReceivedBookmarks_;
             std::vector<MUCBookmark> bookmarks_;
             IQRouter* iqRouter_;
-            std::shared_ptr<Storage> storage;
+            std::shared_ptr<Storage> storage_;
     };
 }
-- 
cgit v0.10.2-6-g49f6