aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorJonas Schnelli <dev@jonasschnelli.ch>2017-04-20 09:51:05 +0200
committerJonas Schnelli <dev@jonasschnelli.ch>2017-05-31 10:53:47 +0200
commit7da133772dd18b44316f7f12567e321eceec8838 (patch)
tree1fb23249b492e0b60c72ba806d51317b9b0546bc /src/qt
parent9ac40e853c868b4f7294b708104dc65d2b45c2a2 (diff)
Declare headers height/time cache mutable, re-set the methods const
Diffstat (limited to 'src/qt')
-rw-r--r--src/qt/clientmodel.cpp4
-rw-r--r--src/qt/clientmodel.h8
2 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 9a8af01a32..cbc6ca1296 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -74,7 +74,7 @@ int ClientModel::getNumBlocks() const
return chainActive.Height();
}
-int ClientModel::getHeaderTipHeight()
+int ClientModel::getHeaderTipHeight() const
{
if (cachedBestHeaderHeight == -1) {
// make sure we initially populate the cache via a cs_main lock
@@ -87,7 +87,7 @@ int ClientModel::getHeaderTipHeight()
return cachedBestHeaderHeight;
}
-int64_t ClientModel::getHeaderTipTime()
+int64_t ClientModel::getHeaderTipTime() const
{
if (cachedBestHeaderTime == -1) {
LOCK(cs_main);
diff --git a/src/qt/clientmodel.h b/src/qt/clientmodel.h
index 6f7077dad6..0e6b34fbfd 100644
--- a/src/qt/clientmodel.h
+++ b/src/qt/clientmodel.h
@@ -51,8 +51,8 @@ public:
//! Return number of connections, default is in- and outbound (total)
int getNumConnections(unsigned int flags = CONNECTIONS_ALL) const;
int getNumBlocks() const;
- int getHeaderTipHeight();
- int64_t getHeaderTipTime();
+ int getHeaderTipHeight() const;
+ int64_t getHeaderTipTime() const;
//! Return number of transactions in the mempool
long getMempoolSize() const;
//! Return the dynamic memory usage of the mempool
@@ -82,8 +82,8 @@ public:
QString dataDir() const;
// caches for the best header
- std::atomic<int> cachedBestHeaderHeight;
- std::atomic<int64_t> cachedBestHeaderTime;
+ mutable std::atomic<int> cachedBestHeaderHeight;
+ mutable std::atomic<int64_t> cachedBestHeaderTime;
private:
OptionsModel *optionsModel;