diff options
| author | hjk <hjk@qt.io> | 2023-09-28 15:52:42 +0200 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2023-09-29 11:40:51 +0000 |
| commit | 8ba5174415c582e07b5a7d012e456c7b6242f147 (patch) | |
| tree | 8fd93bf3294676df187b4d8ec21cd17a4e7987ce | |
| parent | 278ce651a23a79a1fe5079d5cbe10cac5f4e13f3 (diff) | |
Utils: Make UnixUtils a namespace
Change-Id: Id60c4165cf88af03d4010ee19cedc4bad39285e5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| -rw-r--r-- | src/libs/utils/unixutils.cpp | 29 | ||||
| -rw-r--r-- | src/libs/utils/unixutils.h | 22 |
2 files changed, 24 insertions, 27 deletions
diff --git a/src/libs/utils/unixutils.cpp b/src/libs/utils/unixutils.cpp index 388f8549fe8..f0a7bbf0a13 100644 --- a/src/libs/utils/unixutils.cpp +++ b/src/libs/utils/unixutils.cpp @@ -9,14 +9,14 @@ #include <QFileInfo> -using namespace Utils; +namespace Utils::UnixUtils { -QString UnixUtils::defaultFileBrowser() +QString defaultFileBrowser() { return QLatin1String("xdg-open %d"); } -QString UnixUtils::fileBrowser(const QtcSettings *settings) +QString fileBrowser(const QtcSettings *settings) { const QString dflt = defaultFileBrowser(); if (!settings) @@ -24,24 +24,23 @@ QString UnixUtils::fileBrowser(const QtcSettings *settings) return settings->value("General/FileBrowser", dflt).toString(); } -void UnixUtils::setFileBrowser(QtcSettings *settings, const QString &term) +void setFileBrowser(QtcSettings *settings, const QString &term) { settings->setValueWithDefault("General/FileBrowser", term, defaultFileBrowser()); } -QString UnixUtils::fileBrowserHelpText() +QString fileBrowserHelpText() { - QString help = Tr::tr("<table border=1 cellspacing=0 cellpadding=3>" - "<tr><th>Variable</th><th>Expands to</th></tr>" - "<tr><td>%d</td><td>directory of current file</td></tr>" - "<tr><td>%f</td><td>file name (with full path)</td></tr>" - "<tr><td>%n</td><td>file name (without path)</td></tr>" - "<tr><td>%%</td><td>%</td></tr>" - "</table>"); - return help; + return Tr::tr("<table border=1 cellspacing=0 cellpadding=3>" + "<tr><th>Variable</th><th>Expands to</th></tr>" + "<tr><td>%d</td><td>directory of current file</td></tr>" + "<tr><td>%f</td><td>file name (with full path)</td></tr>" + "<tr><td>%n</td><td>file name (without path)</td></tr>" + "<tr><td>%%</td><td>%</td></tr>" + "</table>"); } -QString UnixUtils::substituteFileBrowserParameters(const QString &pre, const QString &file) +QString substituteFileBrowserParameters(const QString &pre, const QString &file) { QString cmd; for (int i = 0; i < pre.size(); ++i) { @@ -70,3 +69,5 @@ QString UnixUtils::substituteFileBrowserParameters(const QString &pre, const QSt return cmd; } + +} // Utils::UnixUtils diff --git a/src/libs/utils/unixutils.h b/src/libs/utils/unixutils.h index 2080efa95d1..a2396d5cc2d 100644 --- a/src/libs/utils/unixutils.h +++ b/src/libs/utils/unixutils.h @@ -9,19 +9,15 @@ QT_BEGIN_NAMESPACE class QString; QT_END_NAMESPACE -namespace Utils { +namespace Utils { class QtcSettings; } -class QtcSettings; +namespace Utils::UnixUtils { -class QTCREATOR_UTILS_EXPORT UnixUtils -{ -public: - static QString defaultFileBrowser(); - static QString fileBrowser(const QtcSettings *settings); - static void setFileBrowser(QtcSettings *settings, const QString &term); - static QString fileBrowserHelpText(); - static QString substituteFileBrowserParameters(const QString &command, - const QString &file); -}; +QTCREATOR_UTILS_EXPORT QString defaultFileBrowser(); +QTCREATOR_UTILS_EXPORT QString fileBrowser(const QtcSettings *settings); +QTCREATOR_UTILS_EXPORT void setFileBrowser(QtcSettings *settings, const QString &term); +QTCREATOR_UTILS_EXPORT QString fileBrowserHelpText(); +QTCREATOR_UTILS_EXPORT QString substituteFileBrowserParameters(const QString &command, + const QString &file); -} // Utils +} // Utils::UnixUtils |