GlcoinCore/elements
1
0
Fork 0
mirror of https://github.com/ElementsProject/elements.git synced 2026-08-16 13:01:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge e0ae5418cb into merged_master (Bitcoin PR bitcoin-core/gui#523)

Browse source
This commit is contained in:
Byron Hambly 2023-06-19 10:07:12 +00:00
commit ebbc64cef3
6 changed files with 18 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/qt/guiutil.cpp
View file

@ -288,7 +288,7 @@ void LoadFont(const QString& file_name)
QString getDefaultDataDirectory()
{
return boostPathToQString(GetDefaultDataDir());
return PathToQString(GetDefaultDataDir());
}
QString getSaveFileName(QWidget *parent, const QString &caption, const QString &dir,
@ -425,7 +425,7 @@ void openDebugLogfile()
/* Open debug.log with the associated application */
if (fs::exists(pathDebug))
QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathDebug)));
QDesktopServices::openUrl(QUrl::fromLocalFile(PathToQString(pathDebug)));
}
bool openBitcoinConf()
@ -441,11 +441,11 @@ bool openBitcoinConf()
configFile.close();
/* Open bitcoin.conf with the associated application */
bool res = QDesktopServices::openUrl(QUrl::fromLocalFile(boostPathToQString(pathConfig)));
bool res = QDesktopServices::openUrl(QUrl::fromLocalFile(PathToQString(pathConfig)));
#ifdef Q_OS_MAC
// Workaround for macOS-specific behavior; see #15409.
if (!res) {
res = QProcess::startDetached("/usr/bin/open", QStringList{"-t", boostPathToQString(pathConfig)});
res = QProcess::startDetached("/usr/bin/open", QStringList{"-t", PathToQString(pathConfig)});
}
#endif
@ -665,12 +665,12 @@ void setClipboard(const QString& str)
}
}
fs::path qstringToBoostPath(const QString &path)
fs::path QStringToPath(const QString &path)
{
return fs::u8path(path.toStdString());
}
QString boostPathToQString(const fs::path &path)
QString PathToQString(const fs::path &path)
{
return QString::fromStdString(path.u8string());
}