qt: Use correct conversion function for boost::path datadir

laanwj · luke-jr · commit 5f3a12c97c25 · 2016-12-02T07:41:11.000Z
Fixes bitcoin#9089. Github-Pull: bitcoin#9094 Rebased-From: e760b30
diff --git 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"
@@ -186,7 +187,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
@@ -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;

Original file line number	Diff line number	Diff line change
`@@ -6,6 +6,7 @@`
`6`	`6`
`7`	`7`	`#include "bantablemodel.h"`
`8`	`8`	`#include "guiconstants.h"`
	`9`	`+#include "guiutil.h"`
`9`	`10`	`#include "peertablemodel.h"`
`10`	`11`
`11`	`12`	`#include "chainparams.h"`
`@@ -186,7 +187,7 @@ QString ClientModel::formatClientStartupTime() const`
`186`	`187`
`187`	`188`	`QString ClientModel::dataDir() const`
`188`	`189`	`{`
`189`		`- return QString::fromStdString(GetDataDir().string());`
	`190`	`+ return GUIUtil::boostPathToQString(GetDataDir());`
`190`	`191`	`}`
`191`	`192`
`192`	`193`	`void ClientModel::updateBanlist()`