From 68d4243ca79f541dcf7f040e44d74212700f1ddc Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Thu, 22 Feb 2018 00:57:30 +0100 Subject: [PATCH] Ref T258, utility functions --- src/blackmisc/fileutils.cpp | 6 ++++++ src/blackmisc/fileutils.h | 3 +++ src/blackmisc/stringutils.cpp | 8 ++++++++ src/blackmisc/stringutils.h | 3 +++ 4 files changed, 20 insertions(+) diff --git a/src/blackmisc/fileutils.cpp b/src/blackmisc/fileutils.cpp index c659a20de..56a703a8d 100644 --- a/src/blackmisc/fileutils.cpp +++ b/src/blackmisc/fileutils.cpp @@ -406,6 +406,12 @@ namespace BlackMisc return fixedPaths; } + QString CFileUtils::toWindowsLocalPath(const QString &path) + { + QString p = CFileUtils::fixWindowsUncPath(path); + return p.replace('/', '\\'); + } + QString CFileUtils::humanReadableFileSize(qint64 size) { // from https://stackoverflow.com/a/30958189/356726 diff --git a/src/blackmisc/fileutils.h b/src/blackmisc/fileutils.h index 528a8167c..61398fe1a 100644 --- a/src/blackmisc/fileutils.h +++ b/src/blackmisc/fileutils.h @@ -151,6 +151,9 @@ namespace BlackMisc //! Fix UNC file paths static QStringList fixWindowsUncPaths(const QStringList &filePaths); + //! To Windows path using "\" delimiter + static QString toWindowsLocalPath(const QString &path); + //! Human readable (GB, MB, ..) file size static QString humanReadableFileSize(qint64 size); diff --git a/src/blackmisc/stringutils.cpp b/src/blackmisc/stringutils.cpp index fab938dbb..8e4d47494 100644 --- a/src/blackmisc/stringutils.cpp +++ b/src/blackmisc/stringutils.cpp @@ -331,6 +331,14 @@ namespace BlackMisc if (in.isEmpty()) { return ignoreEmpty ? e : ea; } return QStringLiteral("'") % in % QStringLiteral("'"); } + + const QString inQuotes(const QString &in, bool ignoreEmpty) + { + static const QString e; + static const QString ea("\"\""); + if (in.isEmpty()) { return ignoreEmpty ? e : ea; } + return QStringLiteral("\"") % in % QStringLiteral("\""); + } } //! \endcond diff --git a/src/blackmisc/stringutils.h b/src/blackmisc/stringutils.h index 6e480e8f8..459308a89 100644 --- a/src/blackmisc/stringutils.h +++ b/src/blackmisc/stringutils.h @@ -123,6 +123,9 @@ namespace BlackMisc //! Return string in apostrophes BLACKMISC_EXPORT const QString inApostrophes(const QString &in, bool ignoreEmpty = false); + //! Return string in quotes + BLACKMISC_EXPORT const QString inQuotes(const QString &in, bool ignoreEmpty = false); + //! Bool to on/off BLACKMISC_EXPORT const QString &boolToOnOff(bool v);