diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-03 15:43:50 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-03 15:54:17 +0200 |
commit | 1d500479de36c8d7709a5a029c9bdd57a52c1077 (patch) | |
tree | 477023969dd0810f0c13321b3ceecf811d191e86 /src/designer/src/lib/shared | |
parent | e68cbe6a7d61611dc048edd82cfba716b443a474 (diff) | |
download | qttools-1d500479de36c8d7709a5a029c9bdd57a52c1077.tar.gz |
Change uses of {to,from}Ascii to {to,from}Latin1 [Designer]
This operation should be a no-op anyway, since at this point in time,
the fromAscii and toAscii functions simply call their fromLatin1 and
toLatin1 counterparts.
Task-number: QTBUG-21872
Change-Id: Ifb4b164024dd1e75b2f24962e6d5d1816dca5916
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/designer/src/lib/shared')
-rw-r--r-- | src/designer/src/lib/shared/csshighlighter.cpp | 2 | ||||
-rw-r--r-- | src/designer/src/lib/shared/formlayoutmenu.cpp | 6 | ||||
-rw-r--r-- | src/designer/src/lib/shared/qdesigner_utils.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/designer/src/lib/shared/csshighlighter.cpp b/src/designer/src/lib/shared/csshighlighter.cpp index 56e876573..e020c6349 100644 --- a/src/designer/src/lib/shared/csshighlighter.cpp +++ b/src/designer/src/lib/shared/csshighlighter.cpp @@ -94,7 +94,7 @@ void CssHighlighter::highlightBlock(const QString& text) for (int i = 0; i < text.length(); i++) { int token = ALNUM; const QChar c = text.at(i); - const char a = c.toAscii(); + const char a = c.toLatin1(); if (state == Quote) { if (a == '\\') { diff --git a/src/designer/src/lib/shared/formlayoutmenu.cpp b/src/designer/src/lib/shared/formlayoutmenu.cpp index fd7aa27f4..196d31448 100644 --- a/src/designer/src/lib/shared/formlayoutmenu.cpp +++ b/src/designer/src/lib/shared/formlayoutmenu.cpp @@ -275,19 +275,19 @@ static inline PrefixCharacterKind prefixCharacterKind(const QChar &c) case QChar::Number_DecimalDigit: return PC_Digit; case QChar::Letter_Lowercase: { - const char a = c.toAscii(); + const char a = c.toLatin1(); if (a >= 'a' && a <= 'z') return PC_LowerCaseLetter; } break; case QChar::Letter_Uppercase: { - const char a = c.toAscii(); + const char a = c.toLatin1(); if (a >= 'A' && a <= 'Z') return PC_UpperCaseLetter; } break; case QChar::Punctuation_Connector: - if (c.toAscii() == '_') + if (c.toLatin1() == '_') return PC_Other; break; default: diff --git a/src/designer/src/lib/shared/qdesigner_utils.cpp b/src/designer/src/lib/shared/qdesigner_utils.cpp index 186dc07d8..c50116692 100644 --- a/src/designer/src/lib/shared/qdesigner_utils.cpp +++ b/src/designer/src/lib/shared/qdesigner_utils.cpp @@ -753,7 +753,7 @@ namespace qdesigner_internal return false; } if (uic.exitCode()) { - errorMessage = QString::fromAscii(uic.readAllStandardError()); + errorMessage = QString::fromLatin1(uic.readAllStandardError()); return false; } ba = uic.readAllStandardOutput(); |