From eafd073093e27d6db0d466fd7a3f588a43657e15 Mon Sep 17 00:00:00 2001
From: woodser <woodser@protonmail.com>
Date: Sat, 30 Nov 2019 17:48:09 -0500
Subject: [PATCH] rename tx, transfer, output query deserialize() ->
 deserialize_from_block() because json str is rooted at block

---
 src/wallet/monero_wallet_model.cpp | 6 +++---
 src/wallet/monero_wallet_model.h   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/wallet/monero_wallet_model.cpp b/src/wallet/monero_wallet_model.cpp
index e6e0513..80575ed 100644
--- a/src/wallet/monero_wallet_model.cpp
+++ b/src/wallet/monero_wallet_model.cpp
@@ -345,7 +345,7 @@ namespace monero {
     }
   }
 
-  shared_ptr<monero_tx_query> monero_tx_query::deserialize(const string& tx_query_json) {
+  shared_ptr<monero_tx_query> monero_tx_query::deserialize_from_block(const string& tx_query_json) {
 
     // deserialize tx query string to property rooted at block
     std::istringstream iss = tx_query_json.empty() ? std::istringstream() : std::istringstream(tx_query_json);
@@ -728,7 +728,7 @@ namespace monero {
     }
   }
 
-  shared_ptr<monero_transfer_query> monero_transfer_query::deserialize(const string& transfer_query_json) {
+  shared_ptr<monero_transfer_query> monero_transfer_query::deserialize_from_block(const string& transfer_query_json) {
 
     // deserialize transfer query string to property rooted at block
     std::istringstream iss = transfer_query_json.empty() ? std::istringstream() : std::istringstream(transfer_query_json);
@@ -951,7 +951,7 @@ namespace monero {
     }
   }
 
-  shared_ptr<monero_output_query> monero_output_query::deserialize(const string& output_query_json) {
+  shared_ptr<monero_output_query> monero_output_query::deserialize_from_block(const string& output_query_json) {
 
     // deserialize output query string to property rooted at block
     std::istringstream iss = output_query_json.empty() ? std::istringstream() : std::istringstream(output_query_json);
diff --git a/src/wallet/monero_wallet_model.h b/src/wallet/monero_wallet_model.h
index 8563b64..7c4fcc3 100644
--- a/src/wallet/monero_wallet_model.h
+++ b/src/wallet/monero_wallet_model.h
@@ -192,7 +192,7 @@ namespace monero {
 
     rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
     static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_transfer_query>& transfer_query);
-    static shared_ptr<monero_transfer_query> deserialize(const string& transfer_query_json);
+    static shared_ptr<monero_transfer_query> deserialize_from_block(const string& transfer_query_json);
     shared_ptr<monero_transfer_query> copy(const shared_ptr<monero_transfer>& src, const shared_ptr<monero_transfer>& tgt) const;
     shared_ptr<monero_transfer_query> copy(const shared_ptr<monero_transfer_query>& src, const shared_ptr<monero_transfer_query>& tgt) const;
     boost::optional<bool> is_incoming() const;
@@ -229,7 +229,7 @@ namespace monero {
     //boost::property_tree::ptree to_property_tree() const;
     rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
     static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_output_query>& output_query);
-    static shared_ptr<monero_output_query> deserialize(const string& output_query_json);
+    static shared_ptr<monero_output_query> deserialize_from_block(const string& output_query_json);
     bool is_default() const;
     shared_ptr<monero_output_query> copy(const shared_ptr<monero_output>& src, const shared_ptr<monero_output>& tgt) const;
     shared_ptr<monero_output_query> copy(const shared_ptr<monero_output_wallet>& src, const shared_ptr<monero_output_wallet>& tgt) const; // TODO: necessary to override all super classes?
@@ -286,7 +286,7 @@ namespace monero {
 
     rapidjson::Value to_rapidjson_val(rapidjson::Document::AllocatorType& allocator) const;
     static void from_property_tree(const boost::property_tree::ptree& node, const shared_ptr<monero_tx_query>& tx_query);
-    static shared_ptr<monero_tx_query> deserialize(const string& tx_query_json);
+    static shared_ptr<monero_tx_query> deserialize_from_block(const string& tx_query_json);
     shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx>& src, const shared_ptr<monero_tx>& tgt) const;
     shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx_wallet>& src, const shared_ptr<monero_tx_wallet>& tgt) const; // TODO: necessary to override all super classes?
     shared_ptr<monero_tx_query> copy(const shared_ptr<monero_tx_query>& src, const shared_ptr<monero_tx_query>& tgt) const;