------=_Part_82922_29313903.1161343145528
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

I noticed while preparing the changes locally, that I need one of my
local change for KSelectAction (well only a return change, but the
patch adds a little more).
So I delay the commit for now.

Can someone maintaining KSelectAction review the patch.
What changed with this patch:
- bool setCurrentAction(QAction *, DeselectionMode mode) should be
more safe, checking that the action really belongs to the action group
before activating the action. Also added an extra parameter with
default value to mimic the old behaviour. This extra parameter allow
to not deselect the previous action in case of falure to select the
action.

- bool setCurrent* now use the new setCurrentAction instead of
reinventing the wheel.

Is it ok to commit ? and should I wait for monday ?

Michel

------=_Part_82922_29313903.1161343145528
Content-Type: application/octet-stream; name=kselectaction.diff
Content-Transfer-Encoding: base64
X-Attachment-Id: f_etihmrer
Content-Disposition: attachment; filename="kselectaction.diff"

SW5kZXg6IGtzZWxlY3RhY3Rpb24uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIGtzZWxlY3RhY3Rpb24uY3Bw
CShyZXZpc2lvbiA1OTczOTUpCisrKyBrc2VsZWN0YWN0aW9uLmNwcAkod29ya2luZyBjb3B5KQpA
QCAtMjEzLDcgKzIxMyw3IEBACiAKIFFBY3Rpb24qIEtTZWxlY3RBY3Rpb246OmN1cnJlbnRBY3Rp
b24oKSBjb25zdAogewotICByZXR1cm4gZC0+bV9hY3Rpb25Hcm91cC0+Y2hlY2tlZEFjdGlvbigp
OworICByZXR1cm4gc2VsZWN0YWJsZUFjdGlvbkdyb3VwKCktPmNoZWNrZWRBY3Rpb24oKTsKIH0K
IAogaW50IEtTZWxlY3RBY3Rpb246OmN1cnJlbnRJdGVtKCkgY29uc3QKQEAgLTIyOSwzMSArMjI5
LDMxIEBACiAgIHJldHVybiBRU3RyaW5nKCk7CiB9CiAKLXZvaWQgS1NlbGVjdEFjdGlvbjo6c2V0
Q3VycmVudEFjdGlvbihRQWN0aW9uKiBhY3Rpb24pCitib29sIEtTZWxlY3RBY3Rpb246OnNldEN1
cnJlbnRBY3Rpb24oUUFjdGlvbiogYWN0aW9uLCBEZXNlbGVjdGlvbk1vZGUgbW9kZSkKIHsKLSAg
Ly9rRGVidWcgKDEyOSkgPDwgIktTZWxlY3RBY3Rpb246OnNldEN1cnJlbnRBY3Rpb24oIiA8PCBh
Y3Rpb24gPDwgIikiIDw8IGVuZGw7Ci0gIGlmICghYWN0aW9uKSB7CisgIC8va0RlYnVnICgxMjkp
IDw8ICJLU2VsZWN0QWN0aW9uOjpzZXRDdXJyZW50QWN0aW9uKCIgPDwgYWN0aW9uIDw8ICIsbW9k
ZT0iIDw8IG1vZGUgPDwgIikiIDw8IGVuZGw7CisgIGlmIChhY3Rpb24gJiYgYWN0aW9ucygpLmNv
bnRhaW5zKGFjdGlvbikpIHsKKyAgICBhY3Rpb24tPnNldENoZWNrZWQodHJ1ZSk7CisgICAgcmV0
dXJuIHRydWU7CisgIH0KKworICBzd2l0Y2gobW9kZSkKKyAgeworICBjYXNlIERlc2VsZWN0TW9k
ZToKICAgICBpZiAoY3VycmVudEFjdGlvbigpKQogICAgICAgY3VycmVudEFjdGlvbigpLT5zZXRD
aGVja2VkKGZhbHNlKTsKLQotICB9IGVsc2UgewotICAgIGFjdGlvbi0+c2V0Q2hlY2tlZCh0cnVl
KTsKKyAgICBicmVhazsKKyAgZGVmYXVsdDoKKyAgICAvLyBEbyBub3RoaW5nCisgICAgYnJlYWs7
CiAgIH0KKyAgcmV0dXJuIGZhbHNlOwogfQogCi1ib29sIEtTZWxlY3RBY3Rpb246OnNldEN1cnJl
bnRJdGVtKCBpbnQgaW5kZXggKQorYm9vbCBLU2VsZWN0QWN0aW9uOjpzZXRDdXJyZW50SXRlbSgg
aW50IGluZGV4LCBEZXNlbGVjdGlvbk1vZGUgbW9kZSApCiB7Ci0gIC8va0RlYnVnICgxMjkpIDw8
ICJLU2VsZWN0QWN0aW9uOjpzZXRDdXJyZW50SW5kZXgoIiA8PCBpbmRleCA8PCAiKSIgPDwgZW5k
bDsKLSAgaWYgKFFBY3Rpb24qIGEgPSBhY3Rpb24oaW5kZXgpKSB7Ci0gICAgc2V0Q3VycmVudEFj
dGlvbihhKTsKLSAgICByZXR1cm4gdHJ1ZTsKLSAgfQotCi0gIC8va0RlYnVnICgxMjkpIDw8ICJc
dGRvaW5nIHRoZSBkZXNlbGVjdCIgPDwgZW5kbDsKLSAgaWYgKHNlbGVjdGFibGVBY3Rpb25Hcm91
cCgpLT5jaGVja2VkQWN0aW9uKCkpCi0gICAgc2VsZWN0YWJsZUFjdGlvbkdyb3VwKCktPmNoZWNr
ZWRBY3Rpb24oKS0+c2V0Q2hlY2tlZChmYWxzZSk7Ci0KLSAgcmV0dXJuIGZhbHNlOworICAvL2tE
ZWJ1ZyAoMTI5KSA8PCAiS1NlbGVjdEFjdGlvbjo6c2V0Q3VycmVudEluZGV4KCIgPDwgaW5kZXgg
PDwgIixtb2RlPSIgPDwgbW9kZSA8PCAiKSIgPDwgZW5kbDsKKyAgcmV0dXJuIHNldEN1cnJlbnRB
Y3Rpb24oYWN0aW9uKGluZGV4KSwgbW9kZSk7CiB9CiAKIFFBY3Rpb24gKiBLU2VsZWN0QWN0aW9u
OjphY3Rpb24oIGludCBpbmRleCApIGNvbnN0CkBAIC0yODgsMTYgKzI4OCwxMCBAQAogICByZXR1
cm4gMEw7CiB9CiAKLWJvb2wgS1NlbGVjdEFjdGlvbjo6c2V0Q3VycmVudEFjdGlvbiggY29uc3Qg
UVN0cmluZyAmIHRleHQsIFF0OjpDYXNlU2Vuc2l0aXZpdHkgY3MpCitib29sIEtTZWxlY3RBY3Rp
b246OnNldEN1cnJlbnRBY3Rpb24oIGNvbnN0IFFTdHJpbmcgJiB0ZXh0LCBRdDo6Q2FzZVNlbnNp
dGl2aXR5IGNzLCBEZXNlbGVjdGlvbk1vZGUgbW9kZSkKIHsKLSAgLy9rRGVidWcgKDEyOSkgPDwg
IktTZWxlY3RBY3Rpb246OnNldEN1cnJlbnRBY3Rpb24oIiA8PCB0ZXh0IDw8ICIsY3M9IiA8PCBj
cyA8PCAiKSIgPDwgZW5kbDsKLSAgaWYgKFFBY3Rpb24qIGEgPSBhY3Rpb24odGV4dCwgY3MpKSB7
Ci0gICAgYS0+c2V0Q2hlY2tlZCh0cnVlKTsKLSAgICByZXR1cm4gdHJ1ZTsKLSAgfQotCi0gIC8v
a0RlYnVnICgxMjkpIDw8ICJcdGZhaWxlZCIgPDwgZW5kbDsKLSAgcmV0dXJuIGZhbHNlOworICAv
L2tEZWJ1ZyAoMTI5KSA8PCAiS1NlbGVjdEFjdGlvbjo6c2V0Q3VycmVudEFjdGlvbigiIDw8IHRl
eHQgPDwgIixjcz0iIDw8IGNzIDw8ICIsbW9kZT0iIDw8IG1vZGUgPDwgIikiIDw8IGVuZGw7Cisg
IHJldHVybiBzZXRDdXJyZW50QWN0aW9uKGFjdGlvbih0ZXh0LCBjcyksIG1vZGUpOwogfQogCiB2
b2lkIEtTZWxlY3RBY3Rpb246OnNldENvbWJvV2lkdGgoIGludCB3aWR0aCApCkluZGV4OiBrc2Vs
ZWN0YWN0aW9uLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09
PT09PT09PT09PT09PT09PT09PT09PQotLS0ga3NlbGVjdGFjdGlvbi5oCShyZXZpc2lvbiA1OTcz
OTUpCisrKyBrc2VsZWN0YWN0aW9uLmgJKHdvcmtpbmcgY29weSkKQEAgLTEwLDYgKzEwLDcgQEAK
ICAgICAgICAgICAgICAgKEMpIDIwMDUtMjAwNiBIYW1pc2ggUm9kZGEgPHJvZGRhQGtkZS5vcmc+
CiAgICAgICAgICAgICAgIChDKSAyMDA2IEFsYmVydCBBc3RhbHMgQ2lkIDxhYWNpZEBrZGUub3Jn
PgogICAgICAgICAgICAgICAoQykgMjAwNiBDbGFyZW5jZSBEYW5nIDxkYW5nQGtkZS5vcmc+Cisg
ICAgICAgICAgICAgIChDKSAyMDA2IE1pY2hlbCBIZXJtaWVyIDxtaWNoZWwuaGVybWllckBnbWFp
bC5jb20+CiAKICAgICBUaGlzIGxpYnJhcnkgaXMgZnJlZSBzb2Z0d2FyZTsgeW91IGNhbiByZWRp
c3RyaWJ1dGUgaXQgYW5kL29yCiAgICAgbW9kaWZ5IGl0IHVuZGVyIHRoZSB0ZXJtcyBvZiB0aGUg
R05VIExpYnJhcnkgR2VuZXJhbCBQdWJsaWMKQEAgLTUxLDcgKzUyLDcgQEAKICAgICBRX1BST1BF
UlRZKCBib29sIGVkaXRhYmxlIFJFQUQgaXNFZGl0YWJsZSBXUklURSBzZXRFZGl0YWJsZSApCiAg
ICAgUV9QUk9QRVJUWSggaW50IGNvbWJvV2lkdGggUkVBRCBjb21ib1dpZHRoIFdSSVRFIHNldENv
bWJvV2lkdGggKQogICAgIFFfUFJPUEVSVFkoIFFTdHJpbmcgY3VycmVudFRleHQgUkVBRCBjdXJy
ZW50VGV4dCApCi0gICAgUV9FTlVNUyggVG9vbGJhck1vZGUgKQorICAgIFFfRU5VTVMoIERlc2Vs
ZWN0aW9uTW9kZSBUb29sYmFyTW9kZSApCiAgICAgUV9QUk9QRVJUWSggVG9vbEJhck1vZGUgdG9v
bEJhck1vZGUgUkVBRCB0b29sQmFyTW9kZSBXUklURSBzZXRUb29sQmFyTW9kZSApCiAgICAgUV9Q
Uk9QRVJUWSggUVRvb2xCdXR0b246OlRvb2xCdXR0b25Qb3B1cE1vZGUgdG9vbEJ1dHRvblBvcHVw
TW9kZSBSRUFEIHRvb2xCdXR0b25Qb3B1cE1vZGUgV1JJVEUgc2V0VG9vbEJ1dHRvblBvcHVwTW9k
ZSApCiAgICAgUV9QUk9QRVJUWSggaW50IGN1cnJlbnRJdGVtIFJFQUQgY3VycmVudEl0ZW0gV1JJ
VEUgc2V0Q3VycmVudEl0ZW0gKQpAQCAtMTgyLDYgKzE4MywxMyBAQAogICAgICAqLwogICAgIHZp
cnR1YWwgfktTZWxlY3RBY3Rpb24oKTsKIAorICAgIGVudW0gRGVzZWxlY3Rpb25Nb2RlIHsKKyAg
ICAgIC8vLyBEZXNlbGVjdCBwcmV2aW91c2x5IGNoZWNrZWQgYWN0aW9uLgorICAgICAgRGVzZWxl
Y3RNb2RlLAorICAgICAgLy8vIERvbid0IGRlc2VsZWN0IGFueSBwcmV2aW91c2x5IGNoZWNrZWQg
YWN0aW9uLgorICAgICAgTGV0U2VsZWN0ZWRNb2RlCisgICAgfTsKKwogICAgIGVudW0gVG9vbEJh
ck1vZGUgewogICAgICAgLy8vIENyZWF0ZXMgYSBidXR0b24gd2hpY2ggcG9wcyB1cCBhIG1lbnUg
d2hlbiBpbnRlcmFjdGVkIHdpdGgsIGFzIGRlZmluZWQgYnkgdG9vbEJ1dHRvblBvcHVwTW9kZSgp
LgogICAgICAgTWVudU1vZGUsCkBAIC0yNTYsMTEgKzI2NCwxMyBAQAogICAgIFFBY3Rpb24qIGFj
dGlvbihjb25zdCBRU3RyaW5nJiB0ZXh0LCBRdDo6Q2FzZVNlbnNpdGl2aXR5IGNzID0gUXQ6OkNh
c2VTZW5zaXRpdmUpIGNvbnN0OwogCiAgICAgLyoqCi0gICAgICogIFNldHMgdGhlIGN1cnJlbnRs
eSBjaGVja2VkIGl0ZW0uCisgICAgICogU2V0cyB0aGUgY3VycmVudGx5IGNoZWNrZWQgaXRlbS4K
ICAgICAgKgotICAgICAqICBAcGFyYW0gaXRlbSB0aGUgUUFjdGlvbiB0byBiZWNvbWUgdGhlIGN1
cnJlbnRseSBjaGVja2VkIGl0ZW0uCisgICAgICogQHBhcmFtIGl0ZW0gdGhlIFFBY3Rpb24gdG8g
YmVjb21lIHRoZSBjdXJyZW50bHkgY2hlY2tlZCBpdGVtLgorICAgICAqCisgICAgICogXHJldHVy
biBcZSB0cnVlIGlmIGEgY29ycmVzcG9uZGluZyBhY3Rpb24gd2FzIGZvdW5kIGFuZCBzdWNjZXNz
ZnVsbHkgY2hlY2tlZC4KICAgICAgKi8KLSAgICB2b2lkIHNldEN1cnJlbnRBY3Rpb24oUUFjdGlv
biogYWN0aW9uKTsKKyAgICBib29sIHNldEN1cnJlbnRBY3Rpb24oUUFjdGlvbiogYWN0aW9uLCBE
ZXNlbGVjdGlvbk1vZGUgbW9kZSA9IERlc2VsZWN0TW9kZSk7CiAKICAgICAvKioKICAgICAgKiBc
b3ZlcmxvYWQgc2V0Q3VycmVudEFjdGlvbihRQWN0aW9uKikKQEAgLTI3Myw3ICsyODMsNyBAQAog
ICAgICAqCiAgICAgICogXHJldHVybiBcZSB0cnVlIGlmIGEgY29ycmVzcG9uZGluZyBhY3Rpb24g
d2FzIGZvdW5kIGFuZCB0aHVzIHNldCB0byB0aGUgY3VycmVudCBhY3Rpb24sIG90aGVyd2lzZSBc
ZSBmYWxzZQogICAgICAqLwotICAgIGJvb2wgc2V0Q3VycmVudEl0ZW0oaW50IGluZGV4KTsKKyAg
ICBib29sIHNldEN1cnJlbnRJdGVtKGludCBpbmRleCwgRGVzZWxlY3Rpb25Nb2RlIG1vZGUgPSBE
ZXNlbGVjdE1vZGUpOwogCiAgICAgLyoqCiAgICAgICogXG92ZXJsb2FkIHNldEN1cnJlbnRBY3Rp
b24oUUFjdGlvbiopCkBAIC0yODYsNyArMjk2LDcgQEAKICAgICAgKgogICAgICAqIFxyZXR1cm4g
XGUgdHJ1ZSBpZiBhIGNvcnJlc3BvbmRpbmcgYWN0aW9uIHdhcyBmb3VuZCwgb3RoZXJ3aXNlIFxl
IGZhbHNlCiAgICAgICovCi0gICAgYm9vbCBzZXRDdXJyZW50QWN0aW9uKGNvbnN0IFFTdHJpbmcm
IHRleHQsIFF0OjpDYXNlU2Vuc2l0aXZpdHkgY3MgPSBRdDo6Q2FzZVNlbnNpdGl2ZSk7CisgICAg
Ym9vbCBzZXRDdXJyZW50QWN0aW9uKGNvbnN0IFFTdHJpbmcmIHRleHQsIFF0OjpDYXNlU2Vuc2l0
aXZpdHkgY3MgPSBRdDo6Q2FzZVNlbnNpdGl2ZSwgRGVzZWxlY3Rpb25Nb2RlIG1vZGUgPSBEZXNl
bGVjdE1vZGUpOwogCiAgICAgLyoqCiAgICAgICogQWRkIFxhIGFjdGlvbiB0byB0aGUgbGlzdCBv
ZiBzZWxlY3RhYmxlIGFjdGlvbnMuCg==
------=_Part_82922_29313903.1161343145528--