Use int instead of QFlag/Enum values (advised by Simon).

Change-Id: I217205d1256b15432bc3647292bbcbd19077c3e4
Reviewed-by: Niels Weber <niels.weber@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

3 files changed, 14 insertions, 18 deletions

diff --git a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js b/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
index eccf043a4..8a7624435 100644
--- a/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
+++ b/examples/quit_installer/packages/org.qtproject.ifw.example.quitinstaller/meta/installscript.js
@@ -42,9 +42,9 @@
 function Component()
 {
     var result = QMessageBox["question"]("test.quit", "Installer", "Do you want to quit the installer?<br>" +
-        "This message box was created through javascript.", QMessageBox.Yes | QMessageBox.No);
-    if (result == QMessageBox.Yes) {
-        installer.setValue("FinishedText", "<font color='red' size=10>This installer was aborted.</font>");
+        "This message box was created through javascript.", QMessageBox.Ok | QMessageBox.Cancel);
+    if (result == QMessageBox.Ok) {
+        installer.setValue("FinishedText", "<font color='red' size=10>This installer was quit.</font>");
         installer.setDefaultPageVisible(QInstaller.TargetDirectory, false);
         installer.setDefaultPageVisible(QInstaller.ReadyForInstallation, false);
         installer.setDefaultPageVisible(QInstaller.ComponentSelection, false);
diff --git a/src/libs/installer/messageboxhandler.cpp b/src/libs/installer/messageboxhandler.cpp
index 4b5380754..54065b32e 100644
--- a/src/libs/installer/messageboxhandler.cpp
+++ b/src/libs/installer/messageboxhandler.cpp
@@ -228,29 +228,29 @@ QMessageBox::StandardButton MessageBoxHandler::warning(QWidget *parent, const QS
 
 // -- invokable
 
-int MessageBoxHandler::critical(const QString &identifier, const QString &title, const QString &text,
-    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton button) const
+int MessageBoxHandler::critical(const QString &identifier, const QString &title,
+    const QString &text, int buttons, int button) const
 {
     return showMessageBox(criticalType, currentBestSuitParent(), identifier, title, text,
         QMessageBox::StandardButtons(buttons), QMessageBox::StandardButton(button));
 }
 
-int MessageBoxHandler::information(const QString &identifier, const QString &title, const QString &text,
-    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton button) const
+int MessageBoxHandler::information(const QString &identifier, const QString &title,
+    const QString &text, int buttons, int button) const
 {
     return showMessageBox(informationType, currentBestSuitParent(), identifier, title, text,
         QMessageBox::StandardButtons(buttons), QMessageBox::StandardButton(button));
 }
 
-int MessageBoxHandler::question(const QString &identifier, const QString &title, const QString &text,
-    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton button) const
+int MessageBoxHandler::question(const QString &identifier, const QString &title,
+    const QString &text, int buttons, int button) const
 {
     return showMessageBox(questionType, currentBestSuitParent(), identifier, title, text,
         QMessageBox::StandardButtons(buttons), QMessageBox::StandardButton(button));
 }
 
 int MessageBoxHandler::warning(const QString &identifier, const QString &title, const QString &text,
-    QMessageBox::StandardButtons buttons, QMessageBox::StandardButton button) const
+    int buttons, int button) const
 {
     return showMessageBox(warningType, currentBestSuitParent(), identifier, title, text,
         QMessageBox::StandardButtons(buttons), QMessageBox::StandardButton(button));
diff --git a/src/libs/installer/messageboxhandler.h b/src/libs/installer/messageboxhandler.h
index 95935bbde..e9d359625 100644
--- a/src/libs/installer/messageboxhandler.h
+++ b/src/libs/installer/messageboxhandler.h
@@ -92,20 +92,16 @@ public:
         QMessageBox::StandardButton button = QMessageBox::NoButton);
 
     Q_INVOKABLE int critical(const QString &identifier, const QString &title, const QString &text,
-        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
-        QMessageBox::StandardButton button = QMessageBox::NoButton) const;
+        int buttons = QMessageBox::Ok, int button = QMessageBox::NoButton) const;
 
     Q_INVOKABLE int information(const QString &identifier, const QString &title, const QString &text,
-        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
-        QMessageBox::StandardButton button = QMessageBox::NoButton) const;
+        int buttons = QMessageBox::Ok, int button = QMessageBox::NoButton) const;
 
     Q_INVOKABLE int question(const QString &identifier, const QString &title, const QString &text,
-        QMessageBox::StandardButtons buttons = QMessageBox::Yes | QMessageBox::No,
-        QMessageBox::StandardButton button = QMessageBox::NoButton) const;
+        int buttons = QMessageBox::Yes | QMessageBox::No, int button = QMessageBox::NoButton) const;
 
     Q_INVOKABLE int warning(const QString &identifier, const QString &title, const QString &text,
-        QMessageBox::StandardButtons buttons = QMessageBox::Ok,
-        QMessageBox::StandardButton button = QMessageBox::NoButton) const;
+        int buttons = QMessageBox::Ok, int button = QMessageBox::NoButton) const;
 
     static QList<QMessageBox::Button> orderedButtons();