cmdsubmenu patch

[Thomas Günther]

This is a multi-part message in MIME format.

--Multipart_Fri__28_May_2004_01:43:51_+0200_08255a20
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: 8bit

Tobias Grimm wrote:
> Der Patch macht die Methode Add in cListBase virtuell, weshalb der 
> Compiler (-Woverload-virtual) das Überladen in abgeleiteten Klassen 
> bemängelt. Ich bin nicht gerade ein C++-Fan, weshalb mir keine bessere
> Lösung einfiel, als "using" zu verwenden.

Ich denke, using zu verwenden ist hier schon okay. Trotzdem habe ich mal
versucht, den Patch so zu ändern, dass dieses Problem gar nicht erst
auftritt. Bei mir funktioniert er (übersetzt unter Woody). Ich denke, er
müsste genauso mit dem gcc 3.3.3 unter Unstable funktionieren, ohne eine
Warnung zu verursachen. Könnt ihr das, bitte, mal ausprobieren?

Thomas

--Multipart_Fri__28_May_2004_01:43:51_+0200_08255a20
Content-Type: application/octet-stream;
 name="03_cmdsubmenu.dpatch"
Content-Disposition: attachment;
 filename="03_cmdsubmenu.dpatch"
Content-Transfer-Encoding: base64

IyEvYmluL3NoIC1lCiMjIHN1Ym1lbnUgcGF0Y2gKIyMKIyMgQWxsIGxpbmVzIGJlZ2lubmluZyB3
aXRoIGAjIyBEUDonIGFyZSBhIGRlc2NyaXB0aW9uIG9mIHRoZSBwYXRjaC4KIyMgRFA6IGFkZHMg
c3VibWVudXMgd2l0aGluIHRoZSBjb21tYW5kcyBhbmQgcmVjb3JkaW5nIGNvbW1hbmRzIG1lbnUu
CgppZiBbICQjIC1uZSAxIF07IHRoZW4KICAgIGVjaG8gPiYyICJgYmFzZW5hbWUgJDBgOiBzY3Jp
cHQgZXhwZWN0cyAtcGF0Y2h8LXVucGF0Y2ggYXMgYXJndW1lbnQiCiAgICBleGl0IDEKZmkKClsg
LWYgZGViaWFuL3BhdGNoZXMvMDBwYXRjaC1vcHRzIF0gJiYgLiBkZWJpYW4vcGF0Y2hlcy8wMHBh
dGNoLW9wdHMKcGF0Y2hfb3B0cz0iJHtwYXRjaF9vcHRzOi0tZiAtLW5vLWJhY2t1cC1pZi1taXNt
YXRjaH0iCgpjYXNlICIkMSIgaW4KICAgICAgIC1wYXRjaCkgcGF0Y2ggJHBhdGNoX29wdHMgLXAx
IDwgJDA7OwogICAgICAgLXVucGF0Y2gpIHBhdGNoICRwYXRjaF9vcHRzIC1wMSAtUiA8ICQwOzsK
ICAgICAgICAqKQogICAgICAgICAgICAgICAgZWNobyA+JjIgImBiYXNlbmFtZSAkMGA6IHNjcmlw
dCBleHBlY3RzIC1wYXRjaHwtdW5wYXRjaCBhcyBhcmd1bWVudCIKICAgICAgICAgICAgICAgIGV4
aXQgMTs7CmVzYWMKCmV4aXQgMAoKQERQQVRDSEAKZGlmZiAtdXJOYWQgdmRyLTEuMi42Lm9yaWcv
TWFrZWZpbGUgdmRyLTEuMi42L01ha2VmaWxlCi0tLSB2ZHItMS4yLjYub3JpZy9NYWtlZmlsZQlG
cmkgTWF5IDI4IDAwOjM2OjU5IDIwMDQKKysrIHZkci0xLjIuNi9NYWtlZmlsZQlGcmkgTWF5IDI4
IDAwOjM3OjE2IDIwMDQKQEAgLTQ4LDYgKzQ4LDcgQEAKIAogREVGSU5FUyArPSAtRFJFTU9URV8k
KFJFTU9URSkKIAorREVGSU5FUyArPSAtRENNRF9TVUJNRU5VUwogREVGSU5FUyArPSAtRF9HTlVf
U09VUkNFCiAKIERFRklORVMgKz0gLURWSURFT0RJUj1cIiQoVklERU9ESVIpXCIKZGlmZiAtdXJO
YWQgdmRyLTEuMi42Lm9yaWcvY29uZmlnLmMgdmRyLTEuMi42L2NvbmZpZy5jCi0tLSB2ZHItMS4y
LjYub3JpZy9jb25maWcuYwlGcmkgTWF5IDI4IDAwOjM2OjU5IDIwMDQKKysrIHZkci0xLjIuNi9j
b25maWcuYwlGcmkgTWF5IDI4IDAwOjM4OjE0IDIwMDQKQEAgLTI3LDE4ICsyNywyOSBAQAogewog
ICB0aXRsZSA9IGNvbW1hbmQgPSBOVUxMOwogICBjb25maXJtID0gZmFsc2U7CisgIG5JbmRlbnQg
PSAwOworICBjaGlsZHMgPSBOVUxMOwogfQogCiBjQ29tbWFuZDo6fmNDb21tYW5kKCkKIHsKICAg
ZnJlZSh0aXRsZSk7CiAgIGZyZWUoY29tbWFuZCk7CisgIGRlbGV0ZSBjaGlsZHM7CiB9CiAKIGJv
b2wgY0NvbW1hbmQ6OlBhcnNlKGNvbnN0IGNoYXIgKnMpCiB7CiAgIGNvbnN0IGNoYXIgKnAgPSBz
dHJjaHIocywgJzonKTsKICAgaWYgKHApIHsKKyAgICBuSW5kZW50ID0gMDsKKyNpZmRlZiBDTURf
U1VCTUVOVVMKKyAgICB3aGlsZSAoKnMgPT0gJy0nKQorICAgIHsKKyAgICAgIG5JbmRlbnQrKzsK
KyAgICAgIHMrKzsKKyAgICB9CisjZW5kaWYgLy8gQ01EX1NVQk1FTlVTCiAgICAgIGludCBsID0g
cCAtIHM7CiAgICAgIGlmIChsID4gMCkgewogICAgICAgICB0aXRsZSA9IE1BTExPQyhjaGFyLCBs
ICsgMSk7CkBAIC04Myw2ICs5NCw3NiBAQAogICAgICBlc3lzbG9nKCJFUlJPUjogY2FuJ3Qgb3Bl
biBwaXBlIGZvciBjb21tYW5kICclcyciLCBjbWQpOwogICBmcmVlKGNtZGJ1Zik7CiAgIHJldHVy
biByZXN1bHQ7Cit9CisKK2ludCBjQ29tbWFuZDo6Z2V0SW5kZW50ICgpCit7CisgIHJldHVybiBu
SW5kZW50OworfQorCit2b2lkIGNDb21tYW5kOjpzZXRJbmRlbnQgKGludCBuTmV3SW5kZW50KQor
eworICBuSW5kZW50ID0gbk5ld0luZGVudDsKK30KKworYm9vbCBjQ29tbWFuZDo6aGFzQ2hpbGRz
ICgpCit7CisgIGlmICghY2hpbGRzKQorICB7CisgICAgcmV0dXJuIGZhbHNlOworICB9CisgIHJl
dHVybiAoY2hpbGRzLT5Db3VudCAoKSA+IDApOworfQorCitpbnQgY0NvbW1hbmQ6OmdldENoaWxk
Q291bnQgKCkKK3sKKyAgaWYgKCFjaGlsZHMpCisgIHsKKyAgICByZXR1cm4gZmFsc2U7CisgIH0K
KyAgcmV0dXJuIGNoaWxkcy0+Q291bnQgKCk7Cit9CisKK3ZvaWQgY0NvbW1hbmQ6OmFkZENoaWxk
IChjQ29tbWFuZCAqbmV3Q2hpbGQpCit7CisgIGlmICghY2hpbGRzKQorICB7CisgICAgY2hpbGRz
ID0gbmV3IGNDb21tYW5kcyAoKTsKKyAgfQorICBjaGlsZHMtPkFkZCAobmV3Q2hpbGQpOworfQor
CisKK2NDb21tYW5kcyAqY0NvbW1hbmQ6OmdldENoaWxkcyAoKQoreworICByZXR1cm4gY2hpbGRz
OworfQorCisvLyAtLS0gY0NvbW1hbmRzIC0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0KKwordm9pZCBjQ29tbWFuZHM6OkFkZENvbmZpZyhjQ29t
bWFuZCAqT2JqZWN0KQoreworICBjQ29tbWFuZCAqYyA9IChjQ29tbWFuZCAqKSBPYmplY3Q7Cisg
IGNDb21tYW5kICpjUGFyZW50OworICBpbnQgbkluZGVudDsKKyAgaW50IG5JbmRleDsKKworICBp
ZiAoIWMpCisgIHsKKyAgICByZXR1cm47CisgIH0KKyAgbkluZGVudCA9IGMtPmdldEluZGVudCAo
KTsKKyAgLy8gIGlzeXNsb2cgKCJuSW5kZW50ICVkICVzXG4iLCBuSW5kZW50LCBjLT5UaXRsZSAo
KSk7CisgIGZvciAobkluZGV4ID0gQ291bnQgKCkgLSAxOyBuSW5kZXggPj0gMDsgbkluZGV4LS0p
CisgIHsKKyAgICBjUGFyZW50ID0gKGNDb21tYW5kICopIEdldCAobkluZGV4KTsKKyAgICBpZiAo
Y1BhcmVudC0+Z2V0SW5kZW50ICgpIDwgbkluZGVudCkKKyAgICB7CisgICAgICBjUGFyZW50LT5h
ZGRDaGlsZCAoYyk7CisgICAgICByZXR1cm47CisgICAgfQorICB9CisgIGNDb25maWc8Y0NvbW1h
bmQ+OjpBZGQoT2JqZWN0KTsKIH0KIAogLy8gLS0gY1NWRFJQaG9zdCAtLS0tLS0tLS0tLS0tLS0t
LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tCmRpZmYgLXVyTmFk
IHZkci0xLjIuNi5vcmlnL2NvbmZpZy5oIHZkci0xLjIuNi9jb25maWcuaAotLS0gdmRyLTEuMi42
Lm9yaWcvY29uZmlnLmgJRnJpIE1heSAyOCAwMDozNjo1OSAyMDA0CisrKyB2ZHItMS4yLjYvY29u
ZmlnLmgJRnJpIE1heSAyOCAwMDozNzoxNiAyMDA0CkBAIC0zMiwxMSArMzIsMTUgQEAKIAogI2Rl
ZmluZSBNYXhGaWxlTmFtZSAyNTYKIAorY2xhc3MgY0NvbW1hbmRzOworCiBjbGFzcyBjQ29tbWFu
ZCA6IHB1YmxpYyBjTGlzdE9iamVjdCB7CiBwcml2YXRlOgogICBjaGFyICp0aXRsZTsKICAgY2hh
ciAqY29tbWFuZDsKICAgYm9vbCBjb25maXJtOworICBpbnQgbkluZGVudDsKKyAgY0NvbW1hbmRz
ICpjaGlsZHM7CiAgIHN0YXRpYyBjaGFyICpyZXN1bHQ7CiBwdWJsaWM6CiAgIGNDb21tYW5kKHZv
aWQpOwpAQCAtNDUsNiArNDksMTIgQEAKICAgY29uc3QgY2hhciAqVGl0bGUodm9pZCkgeyByZXR1
cm4gdGl0bGU7IH0KICAgYm9vbCBDb25maXJtKHZvaWQpIHsgcmV0dXJuIGNvbmZpcm07IH0KICAg
Y29uc3QgY2hhciAqRXhlY3V0ZShjb25zdCBjaGFyICpQYXJhbWV0ZXJzID0gTlVMTCk7CisgIGlu
dCBnZXRJbmRlbnQgKCk7CisgIHZvaWQgc2V0SW5kZW50IChpbnQgbk5ld0luZGVudCk7CisgIGJv
b2wgaGFzQ2hpbGRzICgpOworICBpbnQgZ2V0Q2hpbGRDb3VudCAoKTsKKyAgY0NvbW1hbmRzICpn
ZXRDaGlsZHMgKCk7CisgIHZvaWQgYWRkQ2hpbGQgKGNDb21tYW5kICpuZXdDaGlsZCk7CiAgIH07
CiAKIHR5cGVkZWYgdWludDMyX3QgaW5fYWRkcl90OyAvL1hYWCBmcm9tIC91c3IvaW5jbHVkZS9u
ZXRpbmV0L2luLmggKGFwcGFyZW50bHkgdGhpcyBpcyBub3QgZGVmaW5lZCBvbiBzeXN0ZW1zIHdp
dGggZ2xpYmMgPCAyLjIpCkBAIC04Nyw2ICs5NywxMCBAQAogICBjQ29uZmlnKHZvaWQpIHsgZmls
ZU5hbWUgPSBOVUxMOyB9CiAgIHZpcnR1YWwgfmNDb25maWcoKSB7IGZyZWUoZmlsZU5hbWUpOyB9
CiAgIGNvbnN0IGNoYXIgKkZpbGVOYW1lKHZvaWQpIHsgcmV0dXJuIGZpbGVOYW1lOyB9CisgIHZp
cnR1YWwgdm9pZCBBZGRDb25maWcoVCAqT2JqZWN0KQorICB7CisgICAgY0xpc3Q8VD46OkFkZChP
YmplY3QpOworICB9CiAgIGJvb2wgTG9hZChjb25zdCBjaGFyICpGaWxlTmFtZSA9IE5VTEwsIGJv
b2wgQWxsb3dDb21tZW50cyA9IGZhbHNlLCBib29sIE11c3RFeGlzdCA9IGZhbHNlKQogICB7CiAg
ICAgQ2xlYXIoKTsKQEAgLTExNCw3ICsxMjgsNyBAQAogICAgICAgICAgICAgICAgIGlmICghaXNl
bXB0eShidWZmZXIpKSB7CiAgICAgICAgICAgICAgICAgICAgVCAqbCA9IG5ldyBUOwogICAgICAg
ICAgICAgICAgICAgIGlmIChsLT5QYXJzZShidWZmZXIpKQotICAgICAgICAgICAgICAgICAgICAg
IEFkZChsKTsKKyAgICAgICAgICAgICAgICAgICAgICBBZGRDb25maWcobCk7CiAgICAgICAgICAg
ICAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgZXN5c2xvZygiRVJST1I6IGVy
cm9yIGluICVzLCBsaW5lICVkXG4iLCBmaWxlTmFtZSwgbGluZSk7CiAgICAgICAgICAgICAgICAg
ICAgICAgZGVsZXRlIGw7CkBAIC0xNTYsNyArMTcwLDEwIEBACiAgIH0KICAgfTsKIAotY2xhc3Mg
Y0NvbW1hbmRzIDogcHVibGljIGNDb25maWc8Y0NvbW1hbmQ+IHt9OworY2xhc3MgY0NvbW1hbmRz
IDogcHVibGljIGNDb25maWc8Y0NvbW1hbmQ+IHsKK3B1YmxpYzoKKyAgdmlydHVhbCB2b2lkIEFk
ZENvbmZpZyhjQ29tbWFuZCAqT2JqZWN0KTsKKyAgfTsKIAogY2xhc3MgY1NWRFJQaG9zdHMgOiBw
dWJsaWMgY0NvbmZpZzxjU1ZEUlBob3N0PiB7CiBwdWJsaWM6CmRpZmYgLXVyTmFkIHZkci0xLjIu
Ni5vcmlnL21lbnUuYyB2ZHItMS4yLjYvbWVudS5jCi0tLSB2ZHItMS4yLjYub3JpZy9tZW51LmMJ
RnJpIE1heSAyOCAwMDozNjo1OSAyMDA0CisrKyB2ZHItMS4yLjYvbWVudS5jCUZyaSBNYXkgMjgg
MDA6Mzc6MTYgMjAwNApAQCAtMTUxOCw2ICsxNTE4LDEyIEBACiAgIGlmIChjb21tYW5kKSB7CiAg
ICAgIGNoYXIgKmJ1ZmZlciA9IE5VTEw7CiAgICAgIGJvb2wgY29uZmlybWVkID0gdHJ1ZTsKKyNp
ZmRlZiBDTURfU1VCTUVOVVMKKyAgICAgaWYgKGNvbW1hbmQtPmhhc0NoaWxkcygpKSB7CisgICAg
ICAgIEFkZFN1Yk1lbnUobmV3IGNNZW51Q29tbWFuZHMoY29tbWFuZC0+VGl0bGUoKSwgY29tbWFu
ZC0+Z2V0Q2hpbGRzKCksIHBhcmFtZXRlcnMpKTsKKyAgICAgICAgcmV0dXJuIG9zQ29udGludWU7
CisgICAgICAgIH0KKyNlbmRpZiAvLyBDTURfU1VCTUVOVVMKICAgICAgaWYgKGNvbW1hbmQtPkNv
bmZpcm0oKSkgewogICAgICAgICBhc3ByaW50ZigmYnVmZmVyLCAiJXM/IiwgY29tbWFuZC0+VGl0
bGUoKSk7CiAgICAgICAgIGNvbmZpcm1lZCA9IEludGVyZmFjZS0+Q29uZmlybShidWZmZXIpOwo=

--Multipart_Fri__28_May_2004_01:43:51_+0200_08255a20--