Skip to content

Commit fac96e6

Browse files
author
MarcoFalke
committed
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.
1 parent fa0f6c5 commit fac96e6

File tree

6 files changed

+19
-11
lines changed

6 files changed

+19
-11
lines changed

src/Makefile.am

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ BITCOIN_CORE_H = \
234234
util/threadnames.h \
235235
util/time.h \
236236
util/translation.h \
237+
util/ui_change_type.h \
237238
util/url.h \
238239
util/vector.h \
239240
validation.h \

src/interfaces/wallet.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#include <script/standard.h>
1414
#include <support/allocators/secure.h>
1515
#include <sync.h>
16-
#include <ui_interface.h>
1716
#include <uint256.h>
1817
#include <util/check.h>
1918
#include <util/ref.h>
2019
#include <util/system.h>
20+
#include <util/ui_change_type.h>
2121
#include <wallet/context.h>
2222
#include <wallet/feebumper.h>
2323
#include <wallet/fees.h>

src/interfaces/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
#include <pubkey.h> // For CKeyID and CScriptID (definitions needed in CTxDestination instantiation)
1010
#include <script/standard.h> // For CTxDestination
1111
#include <support/allocators/secure.h> // For SecureString
12-
#include <ui_interface.h> // For ChangeType
1312
#include <util/message.h>
13+
#include <util/ui_change_type.h>
1414

1515
#include <functional>
1616
#include <map>

src/ui_interface.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,6 @@ class connection;
2020
}
2121
} // namespace boost
2222

23-
/** General change type (added, updated, removed). */
24-
enum ChangeType
25-
{
26-
CT_NEW,
27-
CT_UPDATED,
28-
CT_DELETED
29-
};
30-
3123
/** Signals for UI communication. */
3224
class CClientUIInterface
3325
{

src/util/ui_change_type.h

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
// Copyright (c) 2012-2020 The Bitcoin Core developers
2+
// Distributed under the MIT software license, see the accompanying
3+
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
4+
5+
#ifndef BITCOIN_UTIL_UI_CHANGE_TYPE_H
6+
#define BITCOIN_UTIL_UI_CHANGE_TYPE_H
7+
8+
/** General change type (added, updated, removed). */
9+
enum ChangeType {
10+
CT_NEW,
11+
CT_UPDATED,
12+
CT_DELETED
13+
};
14+
15+
#endif // BITCOIN_UTIL_UI_CHANGE_TYPE_H

src/wallet/wallet.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
#include <policy/feerate.h>
1414
#include <psbt.h>
1515
#include <tinyformat.h>
16-
#include <ui_interface.h>
1716
#include <util/message.h>
1817
#include <util/strencodings.h>
1918
#include <util/string.h>
2019
#include <util/system.h>
20+
#include <util/ui_change_type.h>
2121
#include <validationinterface.h>
2222
#include <wallet/coinselection.h>
2323
#include <wallet/crypter.h>

0 commit comments

Comments
 (0)