From c1e433b717fbc26a74ca395771076b203630a5a2 Mon Sep 17 00:00:00 2001 From: jtimon Date: Sat, 30 Aug 2014 13:40:37 +0200 Subject: [PATCH] Rename scriptutils.o to wallet_ismine.o --- src/Makefile.am | 4 ++-- src/test/multisig_tests.cpp | 2 +- src/test/script_P2SH_tests.cpp | 2 +- src/wallet.h | 2 +- src/{scriptutils.cpp => wallet_ismine.cpp} | 2 +- src/{scriptutils.h => wallet_ismine.h} | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/{scriptutils.cpp => wallet_ismine.cpp} (98%) rename src/{scriptutils.h => wallet_ismine.h} (91%) diff --git a/src/Makefile.am b/src/Makefile.am index 27bcdc7bc..b2071f49e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -103,7 +103,7 @@ BITCOIN_CORE_H = \ script/script.h \ script/sign.h \ script/standard.h \ - scriptutils.h \ + wallet_ismine.h \ serialize.h \ sync.h \ threadsafety.h \ @@ -173,7 +173,7 @@ libbitcoin_wallet_a_SOURCES = \ crypter.cpp \ rpcdump.cpp \ rpcwallet.cpp \ - scriptutils.cpp \ + wallet_ismine.cpp \ wallet.cpp \ walletdb.cpp \ $(BITCOIN_CORE_H) diff --git a/src/test/multisig_tests.cpp b/src/test/multisig_tests.cpp index 427477edc..91dfa3950 100644 --- a/src/test/multisig_tests.cpp +++ b/src/test/multisig_tests.cpp @@ -11,7 +11,7 @@ #include "uint256.h" #ifdef ENABLE_WALLET -#include "scriptutils.h" +#include "wallet_ismine.h" #endif #include diff --git a/src/test/script_P2SH_tests.cpp b/src/test/script_P2SH_tests.cpp index b1c1052de..f99002017 100644 --- a/src/test/script_P2SH_tests.cpp +++ b/src/test/script_P2SH_tests.cpp @@ -9,7 +9,7 @@ #include "script/sign.h" #ifdef ENABLE_WALLET -#include "scriptutils.h" +#include "wallet_ismine.h" #endif #include diff --git a/src/wallet.h b/src/wallet.h index 6788986f8..5c2618673 100644 --- a/src/wallet.h +++ b/src/wallet.h @@ -11,7 +11,7 @@ #include "key.h" #include "keystore.h" #include "main.h" -#include "scriptutils.h" +#include "wallet_ismine.h" #include "ui_interface.h" #include "walletdb.h" diff --git a/src/scriptutils.cpp b/src/wallet_ismine.cpp similarity index 98% rename from src/scriptutils.cpp rename to src/wallet_ismine.cpp index 5099d7515..1c2c117fa 100644 --- a/src/scriptutils.cpp +++ b/src/wallet_ismine.cpp @@ -3,7 +3,7 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#include "scriptutils.h" +#include "wallet_ismine.h" #include "key.h" #include "keystore.h" diff --git a/src/scriptutils.h b/src/wallet_ismine.h similarity index 91% rename from src/scriptutils.h rename to src/wallet_ismine.h index 4e98a1f74..9915e9f7b 100644 --- a/src/scriptutils.h +++ b/src/wallet_ismine.h @@ -3,8 +3,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file COPYING or http://www.opensource.org/licenses/mit-license.php. -#ifndef H_BITCOIN_SCRIPTUTILS -#define H_BITCOIN_SCRIPTUTILS +#ifndef H_BITCOIN_WALLET_ISMINE +#define H_BITCOIN_WALLET_ISMINE #include "key.h" #include "script/script.h"