diff options
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index 01a168e379..66eff6cbce 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -38,6 +38,7 @@ #include <extensionsystem/pluginmanager.h> +#include <utils/environment.h> #include <utils/fileutils.h> #include <QSettings> @@ -149,11 +150,7 @@ static bool keyWordReplacement(const QString &keyWord, return true; } if (keyWord == QLatin1String("%USER%")) { -#ifdef Q_OS_WIN - *value = QString::fromLocal8Bit(qgetenv("USERNAME")); -#else - *value = QString::fromLocal8Bit(qgetenv("USER")); -#endif + *value = Utils::Environment::systemEnvironment().userName(); return true; } // Environment variables (for example '%$EMAIL%'). @@ -322,9 +319,9 @@ CppFileSettingsPage::CppFileSettingsPage(QSharedPointer<CppFileSettings> &settin Core::IOptionsPage(parent), m_settings(settings) { - setId(QLatin1String(Constants::CPP_FILE_SETTINGS_ID)); + setId(Constants::CPP_FILE_SETTINGS_ID); setDisplayName(QCoreApplication::translate("CppTools", Constants::CPP_FILE_SETTINGS_NAME)); - setCategory(QLatin1String(Constants::CPP_SETTINGS_CATEGORY)); + setCategory(Constants::CPP_SETTINGS_CATEGORY); setDisplayCategory(QCoreApplication::translate("CppTools", Constants::CPP_SETTINGS_TR_CATEGORY)); setCategoryIcon(QLatin1String(Constants::SETTINGS_CATEGORY_CPP_ICON)); } |