diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-21 12:07:50 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-21 12:09:32 +0200 |
| commit | ec87de9b8b6c7f6690f830086da542770537d4f7 (patch) | |
| tree | 61ba49e3ffdcbf50e63cd29da1fafd2f9494f954 /src/designer/src/uitools | |
| parent | 99d73216071af0f8f85535375d463d42053f4fd9 (diff) | |
| download | qttools-ec87de9b8b6c7f6690f830086da542770537d4f7.tar.gz | |
QtTools: Fix usage of deprecated QCoreApplication::translate.
Change-Id: I7208cfd337c779f9f274315cf87dbc8853afcbaf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/designer/src/uitools')
| -rw-r--r-- | src/designer/src/uitools/quiloader.cpp | 32 |
1 files changed, 12 insertions, 20 deletions
diff --git a/src/designer/src/uitools/quiloader.cpp b/src/designer/src/uitools/quiloader.cpp index 7deb50bf8..5e158b330 100644 --- a/src/designer/src/uitools/quiloader.cpp +++ b/src/designer/src/uitools/quiloader.cpp @@ -118,8 +118,7 @@ QVariant TranslatingTextBuilder::toNativeValue(const QVariant &value) const if (!m_trEnabled) return QString::fromUtf8(tsv.value().data()); return QVariant::fromValue( - QApplication::translate(m_className, tsv.value(), tsv.comment(), - QCoreApplication::UnicodeUTF8)); + QCoreApplication::translate(m_className, tsv.value(), tsv.comment())); } if (value.canConvert<QString>()) return QVariant::fromValue(qvariant_cast<QString>(value)); @@ -151,9 +150,8 @@ static void recursiveReTranslate(QTreeWidgetItem *item, const QByteArray &class_ QVariant v = item->data(i, irs[j].shadowRole); if (v.isValid()) { QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v); - const QString text = QApplication::translate(class_name, - tsv.value(), tsv.comment(), - QCoreApplication::UnicodeUTF8); + const QString text = + QCoreApplication::translate(class_name, tsv.value(), tsv.comment()); item->setData(i, irs[j].realRole, text); } } @@ -173,9 +171,8 @@ static void reTranslateWidgetItem(T *item, const QByteArray &class_name) QVariant v = item->data(irs[j].shadowRole); if (v.isValid()) { QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v); - const QString text = QApplication::translate(class_name, - tsv.value(), tsv.comment(), - QCoreApplication::UnicodeUTF8); + const QString text = QCoreApplication::translate(class_name, + tsv.value(), tsv.comment()); item->setData(irs[j].realRole, text); } } @@ -192,9 +189,8 @@ static void reTranslateTableItem(QTableWidgetItem *item, const QByteArray &class QVariant v = mainWidget->widget(i)->property(propName); \ if (v.isValid()) { \ QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v); \ - const QString text = QApplication::translate(m_className, \ - tsv.value(), tsv.comment(), \ - QCoreApplication::UnicodeUTF8); \ + const QString text = QCoreApplication::translate(m_className, \ + tsv.value(), tsv.comment()); \ mainWidget->setter(i, text); \ } \ } while (0) @@ -218,9 +214,8 @@ public: const QByteArray propName = prop.mid(sizeof(PROP_GENERIC_PREFIX) - 1); const QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(o->property(prop)); - const QString text = QApplication::translate(m_className, - tsv.value(), tsv.comment(), - QCoreApplication::UnicodeUTF8); + const QString text = QCoreApplication::translate(m_className, + tsv.value(), tsv.comment()); o->setProperty(propName, text); } } @@ -274,9 +269,8 @@ public: const QVariant v = combow->itemData(i, Qt::DisplayPropertyRole); if (v.isValid()) { QUiTranslatableStringValue tsv = qvariant_cast<QUiTranslatableStringValue>(v); - const QString text = QApplication::translate(m_className, - tsv.value(), tsv.comment(), - QCoreApplication::UnicodeUTF8); + const QString text = QCoreApplication::translate(m_className, + tsv.value(), tsv.comment()); combow->setItemText(i, text); } } @@ -402,9 +396,7 @@ static QString convertTranslatable(const DomProperty *p, const QByteArray &class strVal->setComment(dom_str->attributeComment().toUtf8()); if (strVal->value().isEmpty() && strVal->comment().isEmpty()) return QString(); - return QApplication::translate(className, - strVal->value(), strVal->comment(), - QCoreApplication::UnicodeUTF8); + return QCoreApplication::translate(className, strVal->value(), strVal->comment()); } void FormBuilderPrivate::applyProperties(QObject *o, const QList<DomProperty*> &properties) |