0
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-09 10:43:19 -05:00

Merge #12928: qt: Initialize non-static class members that were previously neither initialized where defined nor in constructor

3fdc5fe Make sure initialization occurs in the constructor (practicalswift)
1e7813e Remove redundant initializations from the constructor (practicalswift)
f131872 Initialize non-static class members where they are defined (practicalswift)
73bc1b7 Initialize editStatus and autoCompleter. Previously not initialized where defined or in constructor. (practicalswift)

Pull request description:

  Initialize variables previously neither defined where defined nor in constructor:
  * `editStatus`
  * `autoCompleter`

  Also; initialize non-static class members where they are defined in accordance with developer notes.

Tree-SHA512: 84f0cb87ec8394ed7641bfa0731be2ec72e6a920e00ae206ff89e2e7c960358f603c52878311b24601a33aa7cba6ea4f9a78a8ade88112dea0f41efb08e84e25
This commit is contained in:
Wladimir J. van der Laan 2018-05-02 16:41:57 +02:00
commit ef006d9284
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
4 changed files with 14 additions and 19 deletions

View file

@ -159,7 +159,7 @@ public:
};
AddressTableModel::AddressTableModel(WalletModel *parent) :
QAbstractTableModel(parent),walletModel(parent),priv(0)
QAbstractTableModel(parent), walletModel(parent)
{
columns << tr("Label") << tr("Address");
priv = new AddressTablePriv(this);

View file

@ -83,10 +83,10 @@ public:
OutputType GetDefaultAddressType() const;
private:
WalletModel *walletModel;
AddressTablePriv *priv;
WalletModel* const walletModel;
AddressTablePriv *priv = nullptr;
QStringList columns;
EditStatus editStatus;
EditStatus editStatus = OK;
/** Look up address book data given an address string. */
bool getAddressData(const QString &address, std::string* name, std::string* purpose) const;

View file

@ -455,12 +455,7 @@ RPCConsole::RPCConsole(interfaces::Node& node, const PlatformStyle *_platformSty
QWidget(parent),
m_node(node),
ui(new Ui::RPCConsole),
clientModel(0),
historyPtr(0),
platformStyle(_platformStyle),
peersTableContextMenu(0),
banTableContextMenu(0),
consoleFontSize(0)
platformStyle(_platformStyle)
{
ui->setupUi(this);
QSettings settings;

View file

@ -145,18 +145,18 @@ private:
};
interfaces::Node& m_node;
Ui::RPCConsole *ui;
ClientModel *clientModel;
Ui::RPCConsole* const ui;
ClientModel *clientModel = nullptr;
QStringList history;
int historyPtr;
int historyPtr = 0;
QString cmdBeforeBrowsing;
QList<NodeId> cachedNodeids;
const PlatformStyle *platformStyle;
RPCTimerInterface *rpcTimerInterface;
QMenu *peersTableContextMenu;
QMenu *banTableContextMenu;
int consoleFontSize;
QCompleter *autoCompleter;
const PlatformStyle* const platformStyle;
RPCTimerInterface *rpcTimerInterface = nullptr;
QMenu *peersTableContextMenu = nullptr;
QMenu *banTableContextMenu = nullptr;
int consoleFontSize = 0;
QCompleter *autoCompleter = nullptr;
QThread thread;
QString m_last_wallet_id;