diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-08-23 15:53:58 +0200 |
|---|---|---|
| committer | hjk <qthjk@ovi.com> | 2012-08-27 17:00:03 +0200 |
| commit | e669f054069c3a1214a31c4c1d7d9269659c31c4 (patch) | |
| tree | d611e865215dc8ee705a640fdf3e35660542632f /src/plugins/cpptools/cppfilesettingspage.cpp | |
| parent | b674b59b3d652fa9c5d74dc4e16380e3a5d23882 (diff) | |
| download | qt-creator-e669f054069c3a1214a31c4c1d7d9269659c31c4.tar.gz | |
Utils: Introduce HostOsInfo class.
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.
Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/plugins/cpptools/cppfilesettingspage.cpp')
| -rw-r--r-- | src/plugins/cpptools/cppfilesettingspage.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/plugins/cpptools/cppfilesettingspage.cpp b/src/plugins/cpptools/cppfilesettingspage.cpp index d2c01d01d6..2f11b68387 100644 --- a/src/plugins/cpptools/cppfilesettingspage.cpp +++ b/src/plugins/cpptools/cppfilesettingspage.cpp @@ -39,6 +39,7 @@ #include <extensionsystem/pluginmanager.h> +#include <utils/hostosinfo.h> #include <utils/fileutils.h> #include <QSettings> @@ -150,11 +151,8 @@ 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 + const char * const envKey = Utils::HostOsInfo::isWindowsHost() ? "USERNAME" : "USER"; + *value = QString::fromLocal8Bit(qgetenv(envKey)); return true; } // Environment variables (for example '%$EMAIL%'). |