diff options
| author | Christian Kandeler <christian.kandeler@nokia.com> | 2012-08-31 16:47:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@nokia.com> | 2012-08-31 19:26:16 +0200 |
| commit | b7a1e87cf4377590c4e20d3dfb11f9bfa9ebf19b (patch) | |
| tree | 584e7f07b3c77498d56572a32d3fdc3cb5100241 /src/plugins/cpaster/settings.cpp | |
| parent | b18b458dea84a56dadc4b39fb3322d2a1deef924 (diff) | |
Utils: Add user name accessor to the Environnment class.
Change-Id: Ic67381ab185525552eef948af602d00d3800b653
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/plugins/cpaster/settings.cpp')
| -rw-r--r-- | src/plugins/cpaster/settings.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/cpaster/settings.cpp b/src/plugins/cpaster/settings.cpp index d943147a8c7..aeacddf1c9c 100644 --- a/src/plugins/cpaster/settings.cpp +++ b/src/plugins/cpaster/settings.cpp @@ -31,7 +31,7 @@ #include "settings.h" #include "pastebindotcomprotocol.h" -#include <utils/hostosinfo.h> +#include <utils/environment.h> #include <QVariant> #include <QSettings> @@ -67,8 +67,7 @@ void Settings::toSettings(QSettings *settings) const void Settings::fromSettings(const QSettings *settings) { const QString rootKey = QLatin1String(groupC) + QLatin1Char('/'); - const char * const envKey = Utils::HostOsInfo::isWindowsHost() ? "USERNAME" : "USER"; - const QString defaultUser = QString::fromLocal8Bit(qgetenv(envKey)); + const QString defaultUser = Utils::Environment::systemEnvironment().userName(); username = settings->value(rootKey + QLatin1String(userNameKeyC), defaultUser).toString(); protocol = settings->value(rootKey + QLatin1String(defaultProtocolKeyC), PasteBinDotComProtocol::protocolName()).toString(); copyToClipboard = settings->value(rootKey + QLatin1String(copyToClipboardKeyC), true).toBool(); |