diff options
author | kh1 <karsten.heimrich@digia.com> | 2014-06-06 14:13:06 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@digia.com> | 2014-06-06 14:50:21 +0200 |
commit | d57b04364dade21fd66a6a868b48a03aef6d751b (patch) | |
tree | a29a49d46e54f4747120175510e8d5c82448e069 /src | |
parent | c777742754885c876ebc82f1e49be1a825446657 (diff) |
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>
Diffstat (limited to 'src')
-rw-r--r-- | src/libs/installer/messageboxhandler.cpp | 14 | ||||
-rw-r--r-- | src/libs/installer/messageboxhandler.h | 12 |
2 files changed, 11 insertions, 15 deletions
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(); |