aboutsummaryrefslogtreecommitdiff
path: root/src/qt/clientmodel.cpp
diff options
context:
space:
mode:
authorJonas Schnelli <[email protected]>2016-11-07 14:16:54 +0100
committerJonas Schnelli <[email protected]>2016-11-07 14:20:12 +0100
commit78cdd643d3172f78146c4f60ec9ffcf0beb32a90 (patch)
tree48fad3517899d8b871942eddcb8fe252ffafb484 /src/qt/clientmodel.cpp
parentMerge #8981: Wshadow: Do not shadow argument with a local variable (diff)
parentqt: Use correct conversion function for boost::path datadir (diff)
downloaddiscoin-78cdd643d3172f78146c4f60ec9ffcf0beb32a90.tar.xz
discoin-78cdd643d3172f78146c4f60ec9ffcf0beb32a90.zip
Merge #9094: qt: Use correct conversion function for boost::path datadir
e760b30 qt: Use correct conversion function for boost::path datadir (Wladimir J. van der Laan)
Diffstat (limited to 'src/qt/clientmodel.cpp')
-rw-r--r--src/qt/clientmodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp
index 87704c641..f9caca687 100644
--- a/src/qt/clientmodel.cpp
+++ b/src/qt/clientmodel.cpp
@@ -6,6 +6,7 @@
#include "bantablemodel.h"
#include "guiconstants.h"
+#include "guiutil.h"
#include "peertablemodel.h"
#include "chainparams.h"
@@ -208,7 +209,7 @@ QString ClientModel::formatClientStartupTime() const
QString ClientModel::dataDir() const
{
- return QString::fromStdString(GetDataDir().string());
+ return GUIUtil::boostPathToQString(GetDataDir());
}
void ClientModel::updateBanlist()