diff options
| author | Wladimir J. van der Laan <[email protected]> | 2015-03-03 16:30:29 +0100 |
|---|---|---|
| committer | Wladimir J. van der Laan <[email protected]> | 2015-03-03 16:57:30 +0100 |
| commit | 3dfcdf46c2c1a322b6649f04e8c9ca7636c5baf3 (patch) | |
| tree | fba09eb236db25663005b91b68e2b57152ea5b54 /src/qt/clientmodel.cpp | |
| parent | Merge pull request #5819 (diff) | |
| parent | [Qt] remove unused getNumBlocksAtStartup() from ClientModel (diff) | |
| download | discoin-3dfcdf46c2c1a322b6649f04e8c9ca7636c5baf3.tar.xz discoin-3dfcdf46c2c1a322b6649f04e8c9ca7636c5baf3.zip | |
Merge pull request #5775
deda3e1 [Qt] remove unused getNumBlocksAtStartup() from ClientModel (Philip Kaufmann)
47ee8cf [Qt] use qint64 in BitcoinGUI::setNumBlocks (Philip Kaufmann)
Diffstat (limited to 'src/qt/clientmodel.cpp')
| -rw-r--r-- | src/qt/clientmodel.cpp | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 03d94f2e1..729eb84a1 100644 --- a/src/qt/clientmodel.cpp +++ b/src/qt/clientmodel.cpp @@ -29,8 +29,9 @@ ClientModel::ClientModel(OptionsModel *optionsModel, QObject *parent) : optionsModel(optionsModel), peerTableModel(0), cachedNumBlocks(0), - cachedReindexing(0), cachedImporting(0), - numBlocksAtStartup(-1), pollTimer(0) + cachedReindexing(0), + cachedImporting(0), + pollTimer(0) { peerTableModel = new PeerTableModel(this); pollTimer = new QTimer(this); @@ -65,12 +66,6 @@ int ClientModel::getNumBlocks() const return chainActive.Height(); } -int ClientModel::getNumBlocksAtStartup() -{ - if (numBlocksAtStartup == -1) numBlocksAtStartup = getNumBlocks(); - return numBlocksAtStartup; -} - quint64 ClientModel::getTotalBytesRecv() const { return CNode::GetTotalBytesRecv(); |