From dcd71a08972e9d6de73242ce8073de89a19f7c97 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@digia.com>
Date: Wed, 13 Nov 2013 13:23:09 +0100
Subject: Android: Remove usage of QObject::tr()

Change-Id: I948d9fc36aa52d2d247a84b5d9b2cf949b93387d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---
 .../android/src/qandroidplatformdialoghelpers.cpp  | 57 ++++++++--------------
 1 file changed, 19 insertions(+), 38 deletions(-)

diff --git a/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp b/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
index f9eb34751e..f379402e18 100644
--- a/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
+++ b/src/plugins/platforms/android/src/qandroidplatformdialoghelpers.cpp
@@ -63,64 +63,45 @@ void QAndroidPlatformMessageDialogHelper::exec()
 
 static QString standardButtonText(int sbutton)
 {
-    QString buttonText = 0;
     switch (sbutton) {
     case QMessageDialogOptions::Ok:
-        buttonText = QObject::tr("OK");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("OK");
     case QMessageDialogOptions::Save:
-        buttonText = QObject::tr("Save");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Save");
     case QMessageDialogOptions::Open:
-        buttonText = QObject::tr("Open");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Open");
     case QMessageDialogOptions::Cancel:
-        buttonText = QObject::tr("Cancel");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Cancel");
     case QMessageDialogOptions::Close:
-        buttonText = QObject::tr("Close");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Close");
     case QMessageDialogOptions::Apply:
-        buttonText = QObject::tr("Apply");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Apply");
     case QMessageDialogOptions::Reset:
-        buttonText = QObject::tr("Reset");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Reset");
     case QMessageDialogOptions::Help:
-        buttonText = QObject::tr("Help");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Help");
     case QMessageDialogOptions::Discard:
-        buttonText = QObject::tr("Discard");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Discard");
     case QMessageDialogOptions::Yes:
-        buttonText = QObject::tr("Yes");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Yes");
     case QMessageDialogOptions::YesToAll:
-        buttonText = QObject::tr("Yes to All");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Yes to All");
     case QMessageDialogOptions::No:
-        buttonText = QObject::tr("No");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("No");
     case QMessageDialogOptions::NoToAll:
-        buttonText = QObject::tr("No to All");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("No to All");
     case QMessageDialogOptions::SaveAll:
-        buttonText = QObject::tr("Save All");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Save All");
     case QMessageDialogOptions::Abort:
-        buttonText = QObject::tr("Abort");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Abort");
     case QMessageDialogOptions::Retry:
-        buttonText = QObject::tr("Retry");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Retry");
     case QMessageDialogOptions::Ignore:
-        buttonText = QObject::tr("Ignore");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Ignore");
     case QMessageDialogOptions::RestoreDefaults:
-        buttonText = QObject::tr("Restore Defaults");
-        break;
+        return QAndroidPlatformMessageDialogHelper::tr("Restore Defaults");
     } // switch
-    return buttonText;
+    return QString();
 }
 
 bool QAndroidPlatformMessageDialogHelper::show(Qt::WindowFlags windowFlags
-- 
cgit v1.2.3