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>
This commit is contained in:
Friedemann Kleint
2012-01-27 15:26:46 +01:00
parent d2f8baad67
commit 663bdbdd59
10 changed files with 48 additions and 48 deletions

View File

@@ -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();