Merge pull request #1561

d561f4ad enable clang checks that were disabled (Chris Vickio)
0aefb2f6 remove std::move from return statements (pessimizing-move warning) (Chris Vickio)
629d5b76 change counter from bool to int (deprecated-increment-bool warning) (Chris Vickio)
fb76d439 add extra braces around subobjects (missing-braces warning) (Chris Vickio)
3b6d5f25 make struct/class declarations consistent (mismatched-tags warning) (Chris Vickio)
fcf66925 remove unused fields from network_throttle (unused-private-field warning) (Chris Vickio)
296f8c16 inline unused function (for unused-function warning) (Chris Vickio)

4 files changed, 5 insertions, 7 deletions

diff --git a/src/wallet/api/address_book.h b/src/wallet/api/address_book.h
index 33d06a078..5f72c5860 100644
--- a/src/wallet/api/address_book.h
+++ b/src/wallet/api/address_book.h
@@ -32,8 +32,7 @@
 #include "wallet/wallet2.h"
 
 namespace Monero {
-    
-class AddressBookRow;
+
 class WalletImpl;
 
 class AddressBookImpl : public AddressBook
diff --git a/src/wallet/api/transaction_history.h b/src/wallet/api/transaction_history.h
index bd18e9440..37c9ea0e4 100644
--- a/src/wallet/api/transaction_history.h
+++ b/src/wallet/api/transaction_history.h
@@ -33,7 +33,6 @@
 
 namespace Monero {
 
-class TransactionInfo;
 class WalletImpl;
 
 class TransactionHistoryImpl : public TransactionHistory
diff --git a/src/wallet/api/wallet.h b/src/wallet/api/wallet.h
index e26f30d70..e3df7fd01 100644
--- a/src/wallet/api/wallet.h
+++ b/src/wallet/api/wallet.h
@@ -134,7 +134,7 @@ private:
     friend class PendingTransactionImpl;
     friend class UnsignedTransactionImpl;    
     friend class TransactionHistoryImpl;
-    friend class Wallet2CallbackImpl;
+    friend struct Wallet2CallbackImpl;
     friend class AddressBookImpl;
 
     tools::wallet2 * m_wallet;
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
index ccfe86ee0..8a03b94af 100644
--- a/src/wallet/wallet2.cpp
+++ b/src/wallet/wallet2.cpp
@@ -5150,7 +5150,7 @@ std::string wallet2::encrypt(const std::string &plaintext, const crypto::secret_
     crypto::signature &signature = *(crypto::signature*)&ciphertext[ciphertext.size() - sizeof(crypto::signature)];
     crypto::generate_signature(hash, pkey, skey, signature);
   }
-  return std::move(ciphertext);
+  return ciphertext;
 }
 //----------------------------------------------------------------------------------------------------
 std::string wallet2::encrypt_with_view_secret_key(const std::string &plaintext, bool authenticated) const
@@ -5180,7 +5180,7 @@ std::string wallet2::decrypt(const std::string &ciphertext, const crypto::secret
       error::wallet_internal_error, "Failed to authenticate criphertext");
   }
   crypto::chacha8(ciphertext.data() + sizeof(iv), ciphertext.size() - prefix_size, key, iv, &plaintext[0]);
-  return std::move(plaintext);
+  return plaintext;
 }
 //----------------------------------------------------------------------------------------------------
 std::string wallet2::decrypt_with_view_secret_key(const std::string &ciphertext, bool authenticated) const
@@ -5218,7 +5218,7 @@ std::string wallet2::make_uri(const std::string &address, const std::string &pay
   }
 
   std::string uri = "monero:" + address;
-  bool n_fields = 0;
+  unsigned int n_fields = 0;
 
   if (!payment_id.empty())
   {