summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-26 08:36:55 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2020-02-28 19:41:10 +0100
commitfaf3ced146b50e3eb8b20a3d02711c29f9484106 (patch)
tree0fa8672d10ca9c36bb4c9f44e58134cab0d8c2a8
parent856700499a5f3f53c63e69b90f3f41c8b5421d76 (diff)
QHelpFilterSettingsWidget: Fix context of translated messages
The q->tr()-calls ended up in the context QHelpFilterSettingsWidgetPrivate. Use the static invocation to fix this. Change-Id: Iec232532e34cae19fac2f06462207170ba40bdca Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
-rw-r--r--src/assistant/help/qhelpfiltersettingswidget.cpp18
1 files changed, 7 insertions, 11 deletions
diff --git a/src/assistant/help/qhelpfiltersettingswidget.cpp b/src/assistant/help/qhelpfiltersettingswidget.cpp
index 51c66c269..660420f1b 100644
--- a/src/assistant/help/qhelpfiltersettingswidget.cpp
+++ b/src/assistant/help/qhelpfiltersettingswidget.cpp
@@ -174,10 +174,8 @@ void QHelpFilterSettingsWidgetPrivate::versionsChanged(const QStringList &versio
void QHelpFilterSettingsWidgetPrivate::addFilterClicked()
{
- Q_Q(QHelpFilterSettingsWidget);
-
- const QString newFilterName = getUniqueFilterName(q->tr("Add Filter"),
- suggestedNewFilterName(q->tr("New Filter")));
+ const QString newFilterName = getUniqueFilterName(QHelpFilterSettingsWidget::tr("Add Filter"),
+ suggestedNewFilterName(QHelpFilterSettingsWidget::tr("New Filter")));
if (newFilterName.isEmpty())
return;
@@ -186,13 +184,11 @@ void QHelpFilterSettingsWidgetPrivate::addFilterClicked()
void QHelpFilterSettingsWidgetPrivate::renameFilterClicked()
{
- Q_Q(QHelpFilterSettingsWidget);
-
const QString &currentFilter = m_itemToFilter.value(m_ui.filterWidget->currentItem());
if (currentFilter.isEmpty())
return;
- const QString newFilterName = getUniqueFilterName(q->tr("Rename Filter"), currentFilter);
+ const QString newFilterName = getUniqueFilterName(QHelpFilterSettingsWidget::tr("Rename Filter"), currentFilter);
if (newFilterName.isEmpty())
return;
@@ -212,8 +208,8 @@ void QHelpFilterSettingsWidgetPrivate::removeFilterClicked()
if (currentFilter.isEmpty())
return;
- if (QMessageBox::question(q, q->tr("Remove Filter"),
- q->tr("Are you sure you want to remove the \"%1\" filter?")
+ if (QMessageBox::question(q, QHelpFilterSettingsWidget::tr("Remove Filter"),
+ QHelpFilterSettingsWidget::tr("Are you sure you want to remove the \"%1\" filter?")
.arg(currentFilter),
QMessageBox::Yes | QMessageBox::No)
!= QMessageBox::Yes) {
@@ -266,8 +262,8 @@ QString QHelpFilterSettingsWidgetPrivate::getUniqueFilterName(const QString &win
if (!m_filterToItem.contains(newFilterName))
break;
- if (QMessageBox::warning(q, q->tr("Filter Exists"),
- q->tr("The filter \"%1\" already exists.")
+ if (QMessageBox::warning(q, QHelpFilterSettingsWidget::tr("Filter Exists"),
+ QHelpFilterSettingsWidget::tr("The filter \"%1\" already exists.")
.arg(newFilterName),
QMessageBox::Retry | QMessageBox::Cancel)
== QMessageBox::Cancel) {