diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-11-28 12:16:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-12-03 12:20:05 +0100 |
| commit | c4776d341d66cc5c7e248d941d02728e5d8adc40 (patch) | |
| tree | f21af30de93537b226b62ebb19638f2293a1aca0 | |
| parent | 0e8596d7271fc0bfbcd33a26cf0f187157c3997a (diff) | |
stop interpreting Tr() and TR() as aliases for tr()
it's completely braindead to do that - qt has no such functions, and the
behavior was undocumented, producing highly unexpected results.
if somebody actually needs that behavior, he can explicitly define
aliases nowadays.
Change-Id: I0afd02b190397b94ec127b6805fd2c593c2766d6
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/linguist/lupdate/cpp.cpp | 2 | ||||
| -rw-r--r-- | src/linguist/lupdate/java.cpp | 5 | ||||
| -rw-r--r-- | src/linguist/lupdate/lupdate.h | 2 |
3 files changed, 0 insertions, 9 deletions
diff --git a/src/linguist/lupdate/cpp.cpp b/src/linguist/lupdate/cpp.cpp index d3a223561..5371cfc73 100644 --- a/src/linguist/lupdate/cpp.cpp +++ b/src/linguist/lupdate/cpp.cpp @@ -777,8 +777,6 @@ uint CppParser::getToken() Tok_translateUtf8, // QT_TRANSLATE_NOOP3_UTF8 Tok_translate, // findMessage Tok_trid, // qtTrId - Tok_tr, // TR - Tok_tr, // Tr Tok_tr, // tr Tok_trUtf8, // trUtf8 Tok_translate, // translate diff --git a/src/linguist/lupdate/java.cpp b/src/linguist/lupdate/java.cpp index 48055c996..f64de80e3 100644 --- a/src/linguist/lupdate/java.cpp +++ b/src/linguist/lupdate/java.cpp @@ -164,11 +164,6 @@ static int getToken() } } switch ( yyIdent.at(0).toLatin1() ) { - case 'T': - // TR() for when all else fails - if ( yyIdent == QLatin1String("TR") ) - return Tok_tr; - break; case 'p': if( yyIdent == QLatin1String("package") ) return Tok_Package; diff --git a/src/linguist/lupdate/lupdate.h b/src/linguist/lupdate/lupdate.h index a464884d4..bc1fa421d 100644 --- a/src/linguist/lupdate/lupdate.h +++ b/src/linguist/lupdate/lupdate.h @@ -99,8 +99,6 @@ bool loadQml(Translator &translator, const QString &filename, ConversionData &cd UNARY_MACRO(QT_TRANSLATE_NOOP3_UTF8) \ UNARY_MACRO(findMessage) /* QTranslator::findMessage() has the same parameters as QApplication::translate() */ \ UNARY_MACRO(qtTrId) \ - UNARY_MACRO(TR) \ - UNARY_MACRO(Tr) \ UNARY_MACRO(tr) \ UNARY_MACRO(trUtf8) \ UNARY_MACRO(translate) \ |