diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-27 15:26:46 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-01-27 21:15:14 +0100 |
| commit | 663bdbdd593b8bc4fc19ccfecc0b49833e5d67db (patch) | |
| tree | 1f38d3c42957d99451276407f3921234cb7801fa /src/plugins/cpaster/settings.cpp | |
| parent | d2f8baad67bb18d70f42ed2bc62ced778a46ff20 (diff) | |
Codepaster: Compile with QT_NO_CAST_FROM_ASCII.
- Change the diff parsing to use QString reducing the
conversions.
Change-Id: Id4d84947479a14d58b8a60157a98a56db5a89ddb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Diffstat (limited to 'src/plugins/cpaster/settings.cpp')
| -rw-r--r-- | src/plugins/cpaster/settings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/cpaster/settings.cpp b/src/plugins/cpaster/settings.cpp index 837a77985d4..95732790228 100644 --- a/src/plugins/cpaster/settings.cpp +++ b/src/plugins/cpaster/settings.cpp @@ -68,9 +68,9 @@ void Settings::fromSettings(const QSettings *settings) { const QString rootKey = QLatin1String(groupC) + QLatin1Char('/'); #ifdef Q_OS_WIN - const QString defaultUser = qgetenv("USERNAME"); + const QString defaultUser = QString::fromLocal8Bit(qgetenv("USERNAME")); #else - const QString defaultUser = qgetenv("USER"); + const QString defaultUser = QString::fromLocal8Bit(qgetenv("USER")); #endif username = settings->value(rootKey + QLatin1String(userNameKeyC), defaultUser).toString(); protocol = settings->value(rootKey + QLatin1String(defaultProtocolKeyC), PasteBinDotComProtocol::protocolName()).toString(); |