forked from qt-creator/qt-creator
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:
@@ -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();
|
||||
|
||||
Reference in New Issue
Block a user