aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2011-09-11 10:49:30 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2011-09-11 10:49:30 +0200
commitd33cc2b5e3779033502fedc3f17aeffb4fa8e01c (patch)
treed168a58d875ec0b3df29fcc6d3691492e046a30a /src/qt
parent78b3bf56f7804f3eb1b7cf8b189c5d567be7ca60 (diff)
downloadbitcoin-d33cc2b5e3779033502fedc3f17aeffb4fa8e01c.tar.xz
clarify function signature (GetNumBlocksOfPeers) and use number of 'frozen' blocks as initial value for number of peer blocks
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/bitcoingui.cpp2
-rw-r--r--src/qt/clientmodel.cpp4
-rw-r--r--src/qt/clientmodel.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp
index 7943684eef..b51fd729cb 100644
--- a/src/qt/bitcoingui.cpp
+++ b/src/qt/bitcoingui.cpp
@@ -346,7 +346,7 @@ void BitcoinGUI::setNumConnections(int count)
void BitcoinGUI::setNumBlocks(int count)
{
int initTotal = clientModel->getNumBlocksAtStartup();
- int total = clientModel->getTotalBlocksEstimate();
+ int total = clientModel->getNumBlocksOfPeers();
QString tooltip;
if(count < total)
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 08abaa6b49..2ed3ce51df 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -67,9 +67,9 @@ bool ClientModel::inInitialBlockDownload() const
return IsInitialBlockDownload();
}
-int ClientModel::getTotalBlocksEstimate() const
+int ClientModel::getNumBlocksOfPeers() const
{
- return GetMaxBlocksOfOtherNodes();
+ return GetNumBlocksOfPeers();
}
OptionsModel *ClientModel::getOptionsModel()
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 8605fb93ab..c68fb0f035 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -32,7 +32,7 @@ public:
// Return true if core is doing initial block download
bool inInitialBlockDownload() const;
// Return conservative estimate of total number of blocks, or 0 if unknown
- int getTotalBlocksEstimate() const;
+ int getNumBlocksOfPeers() const;
QString formatFullVersion() const;