diff options
| author | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-11-07 14:16:54 +0100 |
|---|---|---|
| committer | Jonas Schnelli <dev@jonasschnelli.ch> | 2016-11-07 14:20:12 +0100 |
| commit | 78cdd643d3172f78146c4f60ec9ffcf0beb32a90 (patch) | |
| tree | 48fad3517899d8b871942eddcb8fe252ffafb484 /src/qt | |
| parent | 0b2322b144a02f933d8806cf7b8a1e4676471711 (diff) | |
| parent | e760b307f6210bee293796d606bcca87f86be200 (diff) | |
| download | bitcoin-78cdd643d3172f78146c4f60ec9ffcf0beb32a90.tar.xz | |
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')
| -rw-r--r-- | src/qt/clientmodel.cpp | 3 | ||||
| -rw-r--r-- | src/qt/paymentserver.cpp | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/qt/clientmodel.cpp b/src/qt/clientmodel.cpp index 87704c641d..f9caca6878 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() diff --git a/src/qt/paymentserver.cpp b/src/qt/paymentserver.cpp index 9f23e77a13..478f5ccf12 100644 --- a/src/qt/paymentserver.cpp +++ b/src/qt/paymentserver.cpp @@ -80,7 +80,7 @@ static QString ipcServerName() // Append a simple hash of the datadir // Note that GetDataDir(true) returns a different path // for -testnet versus main net - QString ddir(QString::fromStdString(GetDataDir(true).string())); + QString ddir(GUIUtil::boostPathToQString(GetDataDir(true))); name.append(QString::number(qHash(ddir))); return name; |