Mercurial > hg > svgui
diff widgets/ListInputDialog.cpp @ 663:1a0fdad4af4d tonioni
Merge from the default branch
author | Chris Cannam |
---|---|
date | Fri, 12 Jul 2013 13:25:22 +0100 |
parents | d632a1e87018 |
children | 4a578a360011 |
line wrap: on
line diff
--- a/widgets/ListInputDialog.cpp Thu Jun 20 13:47:36 2013 +0100 +++ b/widgets/ListInputDialog.cpp Fri Jul 12 13:25:22 2013 +0100 @@ -25,8 +25,8 @@ ListInputDialog::ListInputDialog(QWidget *parent, const QString &title, const QString &labelText, const QStringList &list, - int current, Qt::WFlags f) : - QDialog(parent, f), + int current) : + QDialog(parent), m_strings(list) { setWindowTitle(title); @@ -89,9 +89,9 @@ QString ListInputDialog::getItem(QWidget *parent, const QString &title, const QString &label, const QStringList &list, - int current, bool *ok, Qt::WFlags f) + int current, bool *ok) { - ListInputDialog dialog(parent, title, label, list, current, f); + ListInputDialog dialog(parent, title, label, list, current); bool accepted = (dialog.exec() == QDialog::Accepted); if (ok) *ok = accepted;