feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Utils: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I5cd5607fcd3311915217a1615b948587ef808cfa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-04 17:34:08 +01:00
parent 5a31b0067d
commit ac54974b32
20 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/filenamevalidatinglineedit.cpp
View File

@@ -109,10 +109,11 @@ bool FileNameValidatingLineEdit::validateFileName(const QString &name,
for (const char *c = notAllowedChars; *c; c++)
if (name.contains(QLatin1Char(*c))) {
if (errorMessage) {
if (QChar(*c).isSpace()) {
const QChar qc = QLatin1Char(*c);
if (qc.isSpace()) {
*errorMessage = tr("Name contains white space.");
} else {
*errorMessage = tr("Invalid character '%1'.").arg(*c);
*errorMessage = tr("Invalid character '%1'.").arg(qc);
}
}
return false;
@@ -164,7 +165,7 @@ bool FileNameValidatingLineEdit::validateFileNameExtension(const QString &fileNa
if (requiredExtensions.count() == 1) {
*errorMessage = tr("File extension %1 is required:").arg(requiredExtensions.first());
} else {
*errorMessage = tr("File extensions %1 are required:").arg(requiredExtensions.join(", "));
*errorMessage = tr("File extensions %1 are required:").arg(requiredExtensions.join(QLatin1String(", ")));
}
}