kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #5306 

d227011 MOVEONLY: core/ -> primitives/ (Luke Dashjr)
0.10
Wladimir J. van der Laan 10 years ago
parent
c2d7c6134e d227011184
commit
a0417b8cc8
30 changed files with 44 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      src/Makefile.am
  2. 2
      src/bitcoin-tx.cpp
  3. 2
      src/bloom.cpp
  4. 2
      src/chain.h
  5. 2
      src/chainparams.h
  6. 2
      src/coincontrol.h
  7. 2
      src/compressor.h
  8. 4
      src/core_read.cpp
  9. 2
      src/core_write.cpp
  10. 4
      src/main.h
  11. 4
      src/miner.cpp
  12. 2
      src/net.cpp
  13. 2
      src/pow.cpp
  14. 2
      src/primitives/block.cpp
  15. 8
      src/primitives/block.h
  16. 2
      src/primitives/transaction.cpp
  17. 6
      src/primitives/transaction.h
  18. 2
      src/qt/bitcoinunits.cpp
  19. 2
      src/qt/guiutil.cpp
  20. 4
      src/rest.cpp
  21. 2
      src/rpcrawtransaction.cpp
  22. 2
      src/script/bitcoinconsensus.cpp
  23. 2
      src/script/interpreter.cpp
  24. 2
      src/script/sign.cpp
  25. 2
      src/test/main_tests.cpp
  26. 2
      src/test/util_tests.cpp
  27. 2
      src/txmempool.h
  28. 2
      src/undo.h
  29. 2
      src/utilmoneystr.cpp
  30. 4
      src/wallet.h

10
src/Makefile.am
Unescape View File

@ -87,8 +87,8 @@ BITCOIN_CORE_H = \
coins.h \ coins.h \
compat.h \ compat.h \
compressor.h \ compressor.h \
core/block.h \ primitives/block.h \
core/transaction.h \ primitives/transaction.h \
core_io.h \ core_io.h \
crypter.h \ crypter.h \
db.h \ db.h \
@ -235,8 +235,8 @@ libbitcoin_common_a_SOURCES = \
chainparams.cpp \ chainparams.cpp \
coins.cpp \ coins.cpp \
compressor.cpp \ compressor.cpp \
core/block.cpp \ primitives/block.cpp \
core/transaction.cpp \ primitives/transaction.cpp \
core_read.cpp \ core_read.cpp \
core_write.cpp \ core_write.cpp \
eccryptoverify.cpp \ eccryptoverify.cpp \
@ -350,7 +350,7 @@ bitcoin_cli_LDFLAGS = $(RELDFLAGS) $(AM_LDFLAGS) $(LIBTOOL_APP_LDFLAGS)
if BUILD_BITCOIN_LIBS if BUILD_BITCOIN_LIBS
include_HEADERS = script/bitcoinconsensus.h include_HEADERS = script/bitcoinconsensus.h
libbitcoinconsensus_la_SOURCES = \ libbitcoinconsensus_la_SOURCES = \
core/transaction.cpp \ primitives/transaction.cpp \
crypto/hmac_sha512.cpp \ crypto/hmac_sha512.cpp \
crypto/sha1.cpp \ crypto/sha1.cpp \
crypto/sha256.cpp \ crypto/sha256.cpp \

2
src/bitcoin-tx.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "base58.h" #include "base58.h"
#include "clientversion.h" #include "clientversion.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "core_io.h" #include "core_io.h"
#include "keystore.h" #include "keystore.h"
#include "main.h" // for MAX_BLOCK_SIZE #include "main.h" // for MAX_BLOCK_SIZE

2
src/bloom.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "bloom.h" #include "bloom.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "hash.h" #include "hash.h"
#include "script/script.h" #include "script/script.h"
#include "script/standard.h" #include "script/standard.h"

2
src/chain.h
Unescape View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_CHAIN_H #ifndef BITCOIN_CHAIN_H
#define BITCOIN_CHAIN_H #define BITCOIN_CHAIN_H
#include "core/block.h" #include "primitives/block.h"
#include "pow.h" #include "pow.h"
#include "tinyformat.h" #include "tinyformat.h"
#include "uint256.h" #include "uint256.h"

2
src/chainparams.h
Unescape View File

@ -8,7 +8,7 @@
#include "chainparamsbase.h" #include "chainparamsbase.h"
#include "checkpoints.h" #include "checkpoints.h"
#include "core/block.h" #include "primitives/block.h"
#include "protocol.h" #include "protocol.h"
#include "uint256.h" #include "uint256.h"

2
src/coincontrol.h
Unescape View File

@ -5,7 +5,7 @@
#ifndef BITCOIN_COINCONTROL_H #ifndef BITCOIN_COINCONTROL_H
#define BITCOIN_COINCONTROL_H #define BITCOIN_COINCONTROL_H
#include "core/transaction.h" #include "primitives/transaction.h"
/** Coin Control Features. */ /** Coin Control Features. */
class CCoinControl class CCoinControl

2
src/compressor.h
Unescape View File

@ -6,7 +6,7 @@
#ifndef BITCOIN_COMPRESSOR_H #ifndef BITCOIN_COMPRESSOR_H
#define BITCOIN_COMPRESSOR_H #define BITCOIN_COMPRESSOR_H
#include "core/transaction.h" #include "primitives/transaction.h"
#include "script/script.h" #include "script/script.h"
#include "serialize.h" #include "serialize.h"

4
src/core_read.cpp
Unescape View File

@ -4,8 +4,8 @@
#include "core_io.h" #include "core_io.h"
#include "core/block.h" #include "primitives/block.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "script/script.h" #include "script/script.h"
#include "serialize.h" #include "serialize.h"
#include "streams.h" #include "streams.h"

2
src/core_write.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "core_io.h" #include "core_io.h"
#include "base58.h" #include "base58.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "script/script.h" #include "script/script.h"
#include "script/standard.h" #include "script/standard.h"
#include "serialize.h" #include "serialize.h"

4
src/main.h
Unescape View File

@ -14,8 +14,8 @@
#include "chain.h" #include "chain.h"
#include "chainparams.h" #include "chainparams.h"
#include "coins.h" #include "coins.h"
#include "core/block.h" #include "primitives/block.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "net.h" #include "net.h"
#include "pow.h" #include "pow.h"
#include "script/script.h" #include "script/script.h"

4
src/miner.cpp
Unescape View File

@ -6,8 +6,8 @@
#include "miner.h" #include "miner.h"
#include "amount.h" #include "amount.h"
#include "core/block.h" #include "primitives/block.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "hash.h" #include "hash.h"
#include "main.h" #include "main.h"
#include "net.h" #include "net.h"

2
src/net.cpp
Unescape View File

@ -12,7 +12,7 @@
#include "addrman.h" #include "addrman.h"
#include "chainparams.h" #include "chainparams.h"
#include "clientversion.h" #include "clientversion.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "ui_interface.h" #include "ui_interface.h"
#ifdef WIN32 #ifdef WIN32

2
src/pow.cpp
Unescape View File

@ -7,7 +7,7 @@
#include "chain.h" #include "chain.h"
#include "chainparams.h" #include "chainparams.h"
#include "core/block.h" #include "primitives/block.h"
#include "uint256.h" #include "uint256.h"
#include "util.h" #include "util.h"

2
src/core/block.cpp → src/primitives/block.cpp
Unescape View File

@ -3,7 +3,7 @@
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core/block.h" #include "primitives/block.h"
#include "hash.h" #include "hash.h"
#include "tinyformat.h" #include "tinyformat.h"

8
src/core/block.h → src/primitives/block.h
Unescape View File

@ -3,10 +3,10 @@
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_CORE_BLOCK_H #ifndef BITCOIN_PRIMITIVES_BLOCK_H
#define BITCOIN_CORE_BLOCK_H #define BITCOIN_PRIMITIVES_BLOCK_H
#include "core/transaction.h" #include "primitives/transaction.h"
#include "serialize.h" #include "serialize.h"
#include "uint256.h" #include "uint256.h"
@ -165,4 +165,4 @@ struct CBlockLocator
} }
}; };
#endif // BITCOIN_CORE_BLOCK_H #endif // BITCOIN_PRIMITIVES_BLOCK_H

2
src/core/transaction.cpp → src/primitives/transaction.cpp
Unescape View File

@ -3,7 +3,7 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core/transaction.h" #include "primitives/transaction.h"
#include "hash.h" #include "hash.h"
#include "tinyformat.h" #include "tinyformat.h"

6
src/core/transaction.h → src/primitives/transaction.h
Unescape View File

@ -3,8 +3,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_CORE_TRANSACTION_H #ifndef BITCOIN_PRIMITIVES_TRANSACTION_H
#define BITCOIN_CORE_TRANSACTION_H #define BITCOIN_PRIMITIVES_TRANSACTION_H
#include "amount.h" #include "amount.h"
#include "script/script.h" #include "script/script.h"
@ -273,4 +273,4 @@ struct CMutableTransaction
uint256 GetHash() const; uint256 GetHash() const;
}; };
#endif // BITCOIN_CORE_TRANSACTION_H #endif // BITCOIN_PRIMITIVES_TRANSACTION_H

2
src/qt/bitcoinunits.cpp
Unescape View File

@ -4,7 +4,7 @@
#include "bitcoinunits.h" #include "bitcoinunits.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include <QStringList> #include <QStringList>

2
src/qt/guiutil.cpp
Unescape View File

@ -9,7 +9,7 @@
#include "qvalidatedlineedit.h" #include "qvalidatedlineedit.h"
#include "walletmodel.h" #include "walletmodel.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "init.h" #include "init.h"
#include "main.h" #include "main.h"
#include "protocol.h" #include "protocol.h"

4
src/rest.cpp
Unescape View File

@ -3,8 +3,8 @@
// Distributed under the MIT software license, see the accompanying // Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core/block.h" #include "primitives/block.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "main.h" #include "main.h"
#include "rpcserver.h" #include "rpcserver.h"
#include "streams.h" #include "streams.h"

2
src/rpcrawtransaction.cpp
Unescape View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "base58.h" #include "base58.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "core_io.h" #include "core_io.h"
#include "init.h" #include "init.h"
#include "keystore.h" #include "keystore.h"

2
src/script/bitcoinconsensus.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "bitcoinconsensus.h" #include "bitcoinconsensus.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "script/interpreter.h" #include "script/interpreter.h"
#include "version.h" #include "version.h"

2
src/script/interpreter.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "interpreter.h" #include "interpreter.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "crypto/ripemd160.h" #include "crypto/ripemd160.h"
#include "crypto/sha1.h" #include "crypto/sha1.h"
#include "crypto/sha256.h" #include "crypto/sha256.h"

2
src/script/sign.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "script/sign.h" #include "script/sign.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "key.h" #include "key.h"
#include "keystore.h" #include "keystore.h"
#include "script/standard.h" #include "script/standard.h"

2
src/test/main_tests.cpp
Unescape View File

@ -2,7 +2,7 @@
// Distributed under the MIT/X11 software license, see the accompanying // Distributed under the MIT/X11 software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include "core/transaction.h" #include "primitives/transaction.h"
#include "main.h" #include "main.h"
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>

2
src/test/util_tests.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "util.h" #include "util.h"
#include "clientversion.h" #include "clientversion.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "random.h" #include "random.h"
#include "sync.h" #include "sync.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

2
src/txmempool.h
Unescape View File

@ -10,7 +10,7 @@
#include "amount.h" #include "amount.h"
#include "coins.h" #include "coins.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "sync.h" #include "sync.h"
class CAutoFile; class CAutoFile;

2
src/undo.h
Unescape View File

@ -7,7 +7,7 @@
#define BITCOIN_UNDO_H #define BITCOIN_UNDO_H
#include "compressor.h" #include "compressor.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "serialize.h" #include "serialize.h"
/** Undo information for a CTxIn /** Undo information for a CTxIn

2
src/utilmoneystr.cpp
Unescape View File

@ -5,7 +5,7 @@
#include "utilmoneystr.h" #include "utilmoneystr.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "tinyformat.h" #include "tinyformat.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"

4
src/wallet.h
Unescape View File

@ -7,8 +7,8 @@
#define BITCOIN_WALLET_H #define BITCOIN_WALLET_H
#include "amount.h" #include "amount.h"
#include "core/block.h" #include "primitives/block.h"
#include "core/transaction.h" #include "primitives/transaction.h"
#include "crypter.h" #include "crypter.h"
#include "key.h" #include "key.h"
#include "keystore.h" #include "keystore.h"

Write Preview
Loading…
Cancel
Save