diff options
author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-12 13:08:43 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-14 05:26:45 +0200 |
commit | 5f5555f4d3c9a507bfc8fad9a008431257bd1ab3 (patch) | |
tree | 000c7beb1230abf0bf85fa18ba6a90856a32b51a /examples/widgets/calculator | |
parent | dd9bdf5654a02c8bcafd7b26ceb652bd737d9cd5 (diff) |
Fix encoding of non-ASCII strings
tr() only takes UTF-8 as input, so we must recode to UTF-8. But we can
use QLatin1String elsewhere.
Task-number: QTBUG-26086
Change-Id: I5932ddc96fb817dbe01106e5f6f2b10f58472d6b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
Diffstat (limited to 'examples/widgets/calculator')
-rw-r--r-- | examples/widgets/calculator/calculator.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/widgets/calculator/calculator.cpp b/examples/widgets/calculator/calculator.cpp index ef2e8720d4..29503befc5 100644 --- a/examples/widgets/calculator/calculator.cpp +++ b/examples/widgets/calculator/calculator.cpp @@ -73,7 +73,7 @@ Calculator::Calculator(QWidget *parent) } Button *pointButton = createButton(tr("."), SLOT(pointClicked())); - Button *changeSignButton = createButton(tr("\261"), SLOT(changeSignClicked())); + Button *changeSignButton = createButton(tr("\302\261"), SLOT(changeSignClicked())); Button *backspaceButton = createButton(tr("Backspace"), SLOT(backspaceClicked())); Button *clearButton = createButton(tr("Clear"), SLOT(clear())); @@ -84,13 +84,13 @@ Calculator::Calculator(QWidget *parent) Button *setMemoryButton = createButton(tr("MS"), SLOT(setMemory())); Button *addToMemoryButton = createButton(tr("M+"), SLOT(addToMemory())); - Button *divisionButton = createButton(tr("\367"), SLOT(multiplicativeOperatorClicked())); - Button *timesButton = createButton(tr("\327"), SLOT(multiplicativeOperatorClicked())); + Button *divisionButton = createButton(tr("\303\267"), SLOT(multiplicativeOperatorClicked())); + Button *timesButton = createButton(tr("\303\227"), SLOT(multiplicativeOperatorClicked())); Button *minusButton = createButton(tr("-"), SLOT(additiveOperatorClicked())); Button *plusButton = createButton(tr("+"), SLOT(additiveOperatorClicked())); Button *squareRootButton = createButton(tr("Sqrt"), SLOT(unaryOperatorClicked())); - Button *powerButton = createButton(tr("x\262"), SLOT(unaryOperatorClicked())); + Button *powerButton = createButton(tr("x\302\262"), SLOT(unaryOperatorClicked())); Button *reciprocalButton = createButton(tr("1/x"), SLOT(unaryOperatorClicked())); Button *equalButton = createButton(tr("="), SLOT(equalClicked())); //! [4] @@ -165,7 +165,7 @@ void Calculator::unaryOperatorClicked() return; } result = sqrt(operand); - } else if (clickedOperator == tr("x\262")) { + } else if (clickedOperator == tr("x\302\262")) { result = pow(operand, 2.0); } else if (clickedOperator == tr("1/x")) { if (operand == 0.0) { @@ -384,9 +384,9 @@ bool Calculator::calculate(double rightOperand, const QString &pendingOperator) sumSoFar += rightOperand; } else if (pendingOperator == tr("-")) { sumSoFar -= rightOperand; - } else if (pendingOperator == tr("\327")) { + } else if (pendingOperator == tr("\303\227")) { factorSoFar *= rightOperand; - } else if (pendingOperator == tr("\367")) { + } else if (pendingOperator == tr("\303\267")) { if (rightOperand == 0.0) return false; factorSoFar /= rightOperand; |