summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Swiften/MUC/MUCBookmarkManager.cpp12
-rw-r--r--Swiften/MUC/MUCBookmarkManager.h2
2 files changed, 7 insertions, 7 deletions
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
@@ -36,3 +36,3 @@ void MUCBookmarkManager::handleBookmarksReceived(std::shared_ptr<Storage> payloa
- storage = payload;
+ storage_ = payload;
@@ -117,9 +117,9 @@ void MUCBookmarkManager::flush() {
}
- 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());
}
@@ -127,3 +127,3 @@ void MUCBookmarkManager::flush() {
// 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
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
@@ -50,3 +50,3 @@ namespace Swift {
IQRouter* iqRouter_;
- std::shared_ptr<Storage> storage;
+ std::shared_ptr<Storage> storage_;
};