diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2012-04-11 23:46:41 +1000 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-13 10:44:28 +0200 |
commit | b317fe2a606e5b79f24b1e4a1b808f5ff66d3621 (patch) | |
tree | 7f831e720d346ad42e2c134fc4d9f009867d58af /src/widgets/widgets/qbuttongroup.cpp | |
parent | 2f4b9b8e4226fe8d1d1f413965c2efcaed98c7d4 (diff) |
Merge the two overloads of QButtonGroup::addButton().
This change is source-compatible, but binary-incompatible.
Task-number: QTBUG-25101
Change-Id: If67aec2ca8dd54ad9315f6497c2dafbbbc0b775f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qbuttongroup.cpp')
-rw-r--r-- | src/widgets/widgets/qbuttongroup.cpp | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/src/widgets/widgets/qbuttongroup.cpp b/src/widgets/widgets/qbuttongroup.cpp index 381e32d96b..a5e96370cf 100644 --- a/src/widgets/widgets/qbuttongroup.cpp +++ b/src/widgets/widgets/qbuttongroup.cpp @@ -175,22 +175,13 @@ */ /*! - \fn void QButtonGroup::addButton(QAbstractButton *button); + \fn void QButtonGroup::addButton(QAbstractButton *button, int id = -1); - Adds the given \a button to the end of the group's internal list - of buttons. An id will be assigned to the button by this - QButtonGroup. Automatically assigned ids are guaranteed to be - negative, starting with -2. If you are also assigning your own - ids, use positive values to avoid conflicts. - - \sa removeButton() buttons() -*/ - -/*! - \fn void QButtonGroup::addButton(QAbstractButton *button, int id); - - Adds the given \a button to the button group, with the given \a - id. It is recommended to assign only positive ids. + Adds the given \a button to the button group. If \a id is -1, + an id will be assigned to the button by this QButtonGroup. + Automatically assigned ids are guaranteed to be negative, + starting with -2. If you are assigning your own ids, use + positive values to avoid conflicts. \sa removeButton() buttons() */ |