wallet: Do not include server symbols

ui_interface is in libbitcoin_server and can not be included in the
wallet because the wallet does not link with server symbols.
This commit is contained in:
MarcoFalke 2020-06-19 18:07:18 -04:00
parent fa0f6c58c1
commit fac96e6450
No known key found for this signature in database
GPG key ID: CE2B75697E69A548
6 changed files with 19 additions and 11 deletions

View file

@ -234,6 +234,7 @@ BITCOIN_CORE_H = \
util/threadnames.h \
util/time.h \
util/translation.h \
util/ui_change_type.h \
util/url.h \
util/vector.h \
validation.h \

View file

@ -13,11 +13,11 @@
#include <script/standard.h>
#include <support/allocators/secure.h>
#include <sync.h>
#include <ui_interface.h>
#include <uint256.h>
#include <util/check.h>
#include <util/ref.h>
#include <util/system.h>
#include <util/ui_change_type.h>
#include <wallet/context.h>
#include <wallet/feebumper.h>
#include <wallet/fees.h>

View file

@ -9,8 +9,8 @@
#include <pubkey.h> // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
#include <script/standard.h> // For CTxDestination
#include <support/allocators/secure.h> // For SecureString
#include <ui_interface.h> // For ChangeType
#include <util/message.h>
#include <util/ui_change_type.h>
#include <functional>
#include <map>

View file

@ -20,14 +20,6 @@ class connection;
}
} // namespace boost
/** General change type (added, updated, removed). */
enum ChangeType
{
CT_NEW,
CT_UPDATED,
CT_DELETED
};
/** Signals for UI communication. */
class CClientUIInterface
{

15
src/util/ui_change_type.h Normal file
View file

@ -0,0 +1,15 @@
// Copyright (c) 2012-2020 The Bitcoin Core developers
// Distributed under the MIT software license, see the accompanying
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
#ifndef BITCOIN_UTIL_UI_CHANGE_TYPE_H
#define BITCOIN_UTIL_UI_CHANGE_TYPE_H
/** General change type (added, updated, removed). */
enum ChangeType {
CT_NEW,
CT_UPDATED,
CT_DELETED
};
#endif // BITCOIN_UTIL_UI_CHANGE_TYPE_H

View file

@ -13,11 +13,11 @@
#include <policy/feerate.h>
#include <psbt.h>
#include <tinyformat.h>
#include <ui_interface.h>
#include <util/message.h>
#include <util/strencodings.h>
#include <util/string.h>
#include <util/system.h>
#include <util/ui_change_type.h>
#include <validationinterface.h>
#include <wallet/coinselection.h>
#include <wallet/crypter.h>