diff options
author | Lars Knoll <lars.knoll@nokia.com> | 2012-05-17 02:37:23 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-18 22:38:55 +0200 |
commit | 7968543bb0308395226a8847274dc3b836dd7b87 (patch) | |
tree | 9e449b49d0e2f271bdad50008954d735711a1606 /tests/auto/tools/uic/baseline/calculator.ui.h | |
parent | 8df298665a1e637ab6d26d5fcc447d5502afe31a (diff) |
Don't use the deprecated translate() method anymore
The Encoding argument of QCoreApplication::translate()
is deprecated and source code is always assumed to be
encoded in Utf8. Simply remove the encoding argument
from the generated .ui.h files.
Change-Id: If6c40f6df13abd45a0303c863077972c3d1fb685
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/tools/uic/baseline/calculator.ui.h')
-rw-r--r-- | tests/auto/tools/uic/baseline/calculator.ui.h | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/tests/auto/tools/uic/baseline/calculator.ui.h b/tests/auto/tools/uic/baseline/calculator.ui.h index 8a33fcbbd9..6e5f65eea3 100644 --- a/tests/auto/tools/uic/baseline/calculator.ui.h +++ b/tests/auto/tools/uic/baseline/calculator.ui.h @@ -160,34 +160,34 @@ public: void retranslateUi(QWidget *Calculator) { - Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", 0, QApplication::UnicodeUTF8)); - backspaceButton->setText(QApplication::translate("Calculator", "Backspace", 0, QApplication::UnicodeUTF8)); - clearButton->setText(QApplication::translate("Calculator", "Clear", 0, QApplication::UnicodeUTF8)); - clearAllButton->setText(QApplication::translate("Calculator", "Clear All", 0, QApplication::UnicodeUTF8)); - clearMemoryButton->setText(QApplication::translate("Calculator", "MC", 0, QApplication::UnicodeUTF8)); - readMemoryButton->setText(QApplication::translate("Calculator", "MR", 0, QApplication::UnicodeUTF8)); - setMemoryButton->setText(QApplication::translate("Calculator", "MS", 0, QApplication::UnicodeUTF8)); - addToMemoryButton->setText(QApplication::translate("Calculator", "M+", 0, QApplication::UnicodeUTF8)); - sevenButton->setText(QApplication::translate("Calculator", "7", 0, QApplication::UnicodeUTF8)); - eightButton->setText(QApplication::translate("Calculator", "8", 0, QApplication::UnicodeUTF8)); - nineButton->setText(QApplication::translate("Calculator", "9", 0, QApplication::UnicodeUTF8)); - fourButton->setText(QApplication::translate("Calculator", "4", 0, QApplication::UnicodeUTF8)); - fiveButton->setText(QApplication::translate("Calculator", "5", 0, QApplication::UnicodeUTF8)); - sixButton->setText(QApplication::translate("Calculator", "6", 0, QApplication::UnicodeUTF8)); - oneButton->setText(QApplication::translate("Calculator", "1", 0, QApplication::UnicodeUTF8)); - twoButton->setText(QApplication::translate("Calculator", "2", 0, QApplication::UnicodeUTF8)); - threeButton->setText(QApplication::translate("Calculator", "3", 0, QApplication::UnicodeUTF8)); - zeroButton->setText(QApplication::translate("Calculator", "0", 0, QApplication::UnicodeUTF8)); - pointButton->setText(QApplication::translate("Calculator", ".", 0, QApplication::UnicodeUTF8)); - changeSignButton->setText(QApplication::translate("Calculator", "+-", 0, QApplication::UnicodeUTF8)); - plusButton->setText(QApplication::translate("Calculator", "+", 0, QApplication::UnicodeUTF8)); - divisionButton->setText(QApplication::translate("Calculator", "/", 0, QApplication::UnicodeUTF8)); - timesButton->setText(QApplication::translate("Calculator", "*", 0, QApplication::UnicodeUTF8)); - minusButton->setText(QApplication::translate("Calculator", "-", 0, QApplication::UnicodeUTF8)); - squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", 0, QApplication::UnicodeUTF8)); - powerButton->setText(QApplication::translate("Calculator", "x^2", 0, QApplication::UnicodeUTF8)); - reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0, QApplication::UnicodeUTF8)); - equalButton->setText(QApplication::translate("Calculator", "=", 0, QApplication::UnicodeUTF8)); + Calculator->setWindowTitle(QApplication::translate("Calculator", "Calculator", 0)); + backspaceButton->setText(QApplication::translate("Calculator", "Backspace", 0)); + clearButton->setText(QApplication::translate("Calculator", "Clear", 0)); + clearAllButton->setText(QApplication::translate("Calculator", "Clear All", 0)); + clearMemoryButton->setText(QApplication::translate("Calculator", "MC", 0)); + readMemoryButton->setText(QApplication::translate("Calculator", "MR", 0)); + setMemoryButton->setText(QApplication::translate("Calculator", "MS", 0)); + addToMemoryButton->setText(QApplication::translate("Calculator", "M+", 0)); + sevenButton->setText(QApplication::translate("Calculator", "7", 0)); + eightButton->setText(QApplication::translate("Calculator", "8", 0)); + nineButton->setText(QApplication::translate("Calculator", "9", 0)); + fourButton->setText(QApplication::translate("Calculator", "4", 0)); + fiveButton->setText(QApplication::translate("Calculator", "5", 0)); + sixButton->setText(QApplication::translate("Calculator", "6", 0)); + oneButton->setText(QApplication::translate("Calculator", "1", 0)); + twoButton->setText(QApplication::translate("Calculator", "2", 0)); + threeButton->setText(QApplication::translate("Calculator", "3", 0)); + zeroButton->setText(QApplication::translate("Calculator", "0", 0)); + pointButton->setText(QApplication::translate("Calculator", ".", 0)); + changeSignButton->setText(QApplication::translate("Calculator", "+-", 0)); + plusButton->setText(QApplication::translate("Calculator", "+", 0)); + divisionButton->setText(QApplication::translate("Calculator", "/", 0)); + timesButton->setText(QApplication::translate("Calculator", "*", 0)); + minusButton->setText(QApplication::translate("Calculator", "-", 0)); + squareRootButton->setText(QApplication::translate("Calculator", "Sqrt", 0)); + powerButton->setText(QApplication::translate("Calculator", "x^2", 0)); + reciprocalButton->setText(QApplication::translate("Calculator", "1/x", 0)); + equalButton->setText(QApplication::translate("Calculator", "=", 0)); } // retranslateUi }; |