This is a multi-part message in MIME format. --------------030409010702050007070905 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit For review. Based on the fact that only X11 supports custom setting tabs in the print dialog (http://doc.trolltech.com/4.4/qabstractprintdialog.html#setOptionTabs) On non-X11 tagets: - do not build kcupsoptions*.{cpp|ui} and do not instantiate KCupsOptions* objects - reparent widgets from QList customTabs to the dialog even if we don't use them, to avoid leaks Also: - simplify the code by calling one overload of createPrintDialog() from another - add more docs for non-X11 systems and about object ownership -- regards / pozdrawiam, Jaroslaw Staniek Sponsored by OpenOffice Polska (http://www.openoffice.com.pl/en) to work on Kexi & KOffice (http://www.kexi.pl/en, http://www.koffice.org/kexi) KDE Libraries for MS Windows (http://windows.kde.org) --------------030409010702050007070905 Content-Type: text/plain; name="cups_only_on_x11.patch" Content-Transfer-Encoding: base64 Content-Disposition: inline; filename="cups_only_on_x11.patch" SW5kZXg6IGtkZXVpL0NNYWtlTGlzdHMudHh0DQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0ga2RldWkv Q01ha2VMaXN0cy50eHQJKHdlcnNqYSA4MjkyNjMpDQorKysga2RldWkvQ01ha2VMaXN0cy50 eHQJKGtvcGlhIHJvYm9jemEpDQpAQCAtNjUsOSArNjUsNiBAQA0KICBkaWFsb2dzL2thc3Np c3RhbnRkaWFsb2cuY3BwCiAgZGlhbG9ncy9rY29uZmlnZGlhbG9nLmNwcAogIGRpYWxvZ3Mv a2NvbmZpZ2RpYWxvZ21hbmFnZXIuY3BwCi0gZGlhbG9ncy9rY3Vwc29wdGlvbnN3aWRnZXRf cC5jcHAKLSBkaWFsb2dzL2tjdXBzb3B0aW9uc2pvYndpZGdldF9wLmNwcAotIGRpYWxvZ3Mv a2N1cHNvcHRpb25zcGFnZXN3aWRnZXRfcC5jcHAKICBkaWFsb2dzL2tidWdyZXBvcnQuY3Bw CiAgZGlhbG9ncy9rZGVwcmludGRpYWxvZy5jcHAKICBkaWFsb2dzL2tkaWFsb2cuY3BwCkBA IC0yMzYsNyArMjMzLDEwIEBADQogKQogCiBpZiAoUV9XU19YMTEpCi0gICAgc2V0KGtkZXVp X0xJQl9TUkNTICR7a2RldWlfTElCX1NSQ1N9IHV0aWwva2tleXNlcnZlcl94MTEuY3BwICkK KyAgICBzZXQoa2RldWlfTElCX1NSQ1MgJHtrZGV1aV9MSUJfU1JDU30gdXRpbC9ra2V5c2Vy dmVyX3gxMS5jcHAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ZGlhbG9ncy9rY3Vwc29wdGlvbnN3aWRnZXRfcC5jcHAKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgZGlhbG9ncy9rY3Vwc29wdGlvbnNqb2J3aWRnZXRfcC5j cHAKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlhbG9ncy9r Y3Vwc29wdGlvbnNwYWdlc3dpZGdldF9wLmNwcCApCiBlbmRpZiAoUV9XU19YMTEpCiBpZiAo UV9XU19NQUMpCiAgICAgc2V0KGtkZXVpX0xJQl9TUkNTICR7a2RldWlfTElCX1NSQ1N9IHV0 aWwva2tleXNlcnZlcl9tYWMuY3BwICkKQEAgLTI2Nyw4ICsyNjcsNiBAQA0KIGVuZGlmKE1J TkdXKQogCiBzZXQoIGtkZXVpX1VJCi0gICBkaWFsb2dzL2tjdXBzb3B0aW9uc3BhZ2Vzd2lk Z2V0LnVpCi0gICBkaWFsb2dzL2tjdXBzb3B0aW9uc2pvYndpZGdldC51aQogICAgZGlhbG9n cy9rcGFzc3dvcmRkaWFsb2cudWkKICAgIGRpYWxvZ3Mva25ld3Bhc3N3b3JkZGlhbG9nLnVp CiAgICBkaWFsb2dzL2tzaG9ydGN1dHNkaWFsb2cudWkKQEAgLTI3Nyw2ICsyNzUsMTIgQEAN CiAgICBzb25uZXQvY29uZmlndWkudWkKICAgICkKIAoraWYgKFFfV1NfWDExKQorICAgIHNl dCgga2RldWlfVUkgJHtrZGV1aV9VSX0gZGlhbG9ncy9rY3Vwc29wdGlvbnNwYWdlc3dpZGdl dC51aQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZGlhbG9ncy9rY3Vwc29wdGlv bnNqb2J3aWRnZXQudWkKKyAgICApCitlbmRpZiAoUV9XU19YMTEpCisKIGtkZTRfYWRkX3Vp X2ZpbGVzKGtkZXVpX0xJQl9TUkNTICR7a2RldWlfVUl9ICkKIAogCkluZGV4OiBrZGV1aS9k aWFsb2dzL2tkZXByaW50ZGlhbG9nLmNwcA0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQ0KLS0tIGtkZXVpL2Rp YWxvZ3Mva2RlcHJpbnRkaWFsb2cuY3BwCSh3ZXJzamEgODI5MjYzKQ0KKysrIGtkZXVpL2Rp YWxvZ3Mva2RlcHJpbnRkaWFsb2cuY3BwCShrb3BpYSByb2JvY3phKQ0KQEAgLTIxLDggKzIx LDExIEBADQogICoqLwogCiAjaW5jbHVkZSAia2RlcHJpbnRkaWFsb2cuaCIKKyNpZmRlZiBR X1dTX1gxMQogI2luY2x1ZGUgImtjdXBzb3B0aW9uc3BhZ2Vzd2lkZ2V0X3AuaCIKICNpbmNs dWRlICJrY3Vwc29wdGlvbnNqb2J3aWRnZXRfcC5oIgorI2VuZGlmCisKICNpbmNsdWRlICJr ZGVidWcuaCIKICNpbmNsdWRlICJrZGlhbG9nLmgiCiAjaW5jbHVkZSAia2xvY2FsZS5oIgpA QCAtMzEsMjUgKzM0LDI1IEBADQogI2luY2x1ZGUgPFFQcmludERpYWxvZz4KIAogUVByaW50 RGlhbG9nICpLZGVQcmludDo6Y3JlYXRlUHJpbnREaWFsb2coUVByaW50ZXIgKnByaW50ZXIs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbnN0 IFFMaXN0PFFXaWRnZXQqPiAmY3VzdG9tVGFicywKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgUVdpZGdldCAqcGFyZW50KQorICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgUUxpc3Q8UVdpZGdldCo+ICZj dXN0b21UYWJzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UVdpZGdldCAqcGFyZW50KQogewogICAgIFFQcmludERpYWxvZyAqZGlhbG9nID0gbmV3IFFQ cmludERpYWxvZyggcHJpbnRlciwgcGFyZW50ICk7CisjaWZkZWYgUV9XU19YMTEKICAgICBL Q3Vwc09wdGlvbnNQYWdlc1dpZGdldCAqY3Vwc09wdGlvbnNQYWdlc1RhYiA9IG5ldyBLQ3Vw c09wdGlvbnNQYWdlc1dpZGdldCggZGlhbG9nICk7CiAgICAgS0N1cHNPcHRpb25zSm9iV2lk Z2V0ICpjdXBzT3B0aW9uc0pvYlRhYiA9IG5ldyBLQ3Vwc09wdGlvbnNKb2JXaWRnZXQoIGRp YWxvZyApOwogICAgIGRpYWxvZy0+c2V0T3B0aW9uVGFicyggUUxpc3Q8UVdpZGdldCo+KCkg PDwgY3Vwc09wdGlvbnNQYWdlc1RhYiA8PCBjdXBzT3B0aW9uc0pvYlRhYiA8PCBjdXN0b21U YWJzICk7CisjZWxzZQorICAgIGZvcmVhY2goIFFXaWRnZXQqIHcsIGN1c3RvbVRhYnMgKSAv LyByZXBhcmVudCB0byBhdm9pZCBsZWFrcworICAgICAgICB3LT5zZXRQYXJlbnQoIGRpYWxv ZyApOworI2VuZGlmCiAgICAgZGlhbG9nLT5zZXRXaW5kb3dUaXRsZSggS0RpYWxvZzo6bWFr ZVN0YW5kYXJkQ2FwdGlvbiggaTE4bmMoICJAdGl0bGU6d2luZG93IiwgIlByaW50IiApICkg KTsKICAgICByZXR1cm4gZGlhbG9nOwogfQogCiAKIFFQcmludERpYWxvZyAqS2RlUHJpbnQ6 OmNyZWF0ZVByaW50RGlhbG9nKFFQcmludGVyICpwcmludGVyLAotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRV2lkZ2V0ICpwYXJlbnQpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBRV2lkZ2V0ICpwYXJlbnQp CiB7Ci0gICAgUVByaW50RGlhbG9nICpkaWFsb2cgPSBuZXcgUVByaW50RGlhbG9nKCBwcmlu dGVyLCBwYXJlbnQgKTsKLSAgICBLQ3Vwc09wdGlvbnNQYWdlc1dpZGdldCAqY3Vwc09wdGlv bnNQYWdlc1RhYiA9IG5ldyBLQ3Vwc09wdGlvbnNQYWdlc1dpZGdldCggZGlhbG9nICk7Ci0g ICAgS0N1cHNPcHRpb25zSm9iV2lkZ2V0ICpjdXBzT3B0aW9uc0pvYlRhYiA9IG5ldyBLQ3Vw c09wdGlvbnNKb2JXaWRnZXQoIGRpYWxvZyApOwotICAgIGRpYWxvZy0+c2V0T3B0aW9uVGFi cyggUUxpc3Q8UVdpZGdldCo+KCkgPDwgY3Vwc09wdGlvbnNQYWdlc1RhYiA8PCBjdXBzT3B0 aW9uc0pvYlRhYiApOwotICAgIGRpYWxvZy0+c2V0V2luZG93VGl0bGUoIEtEaWFsb2c6Om1h a2VTdGFuZGFyZENhcHRpb24oIGkxOG5jKCAiQHRpdGxlOndpbmRvdyIsICJQcmludCIgKSAp ICk7Ci0gICAgcmV0dXJuIGRpYWxvZzsKKyAgICByZXR1cm4gS2RlUHJpbnQ6OmNyZWF0ZVBy aW50RGlhbG9nKHByaW50ZXIsIFFMaXN0PFFXaWRnZXQqPigpLCBwYXJlbnQpOwogfQpJbmRl eDoga2RldWkvZGlhbG9ncy9rZGVwcmludGRpYWxvZy5oDQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0g a2RldWkvZGlhbG9ncy9rZGVwcmludGRpYWxvZy5oCSh3ZXJzamEgODI5MjYzKQ0KKysrIGtk ZXVpL2RpYWxvZ3Mva2RlcHJpbnRkaWFsb2cuaAkoa29waWEgcm9ib2N6YSkNCkBAIC0zNyw5 ICszNywxMyBAQA0KICAgICAvKioKICAgICAgKiBDcmVhdGVzIGEgcHJpbnRlciBkaWFsb2cg Zm9yIGEgUVByaW50ZXIgd2l0aCB0aGUgZ2l2ZW4gY3VzdG9tIHdpZGdldHMuCiAgICAgICoK LSAgICAgKiBOb3RlIHRoYXQgdGhlIGN1c3RvbSB3aWRnZXRzIHdpbGwgQGIgbm90IGJlIHNo b3duIG9uIFF0IHZlcnNpb25zIHByaW9yIHRvCi0gICAgICogNC4zLjIuCisgICAgICogTm90 ZSB0aGF0IHRoZSBjdXN0b20gd2lkZ2V0cyBhcmUgb25seSBzdXBwb3J0ZWQgb24gWDExCisg ICAgICogYW5kIHdpbGwgQGIgbm90IGJlIHNob3duIG9uIFF0IHZlcnNpb25zIHByaW9yIHRv IDQuMy4yLgorICAgICAqIE9uIG5vbi1YMTEgc3lzdGVtcyBpdCBpcyBwcmVkZXJyZWQgdG8g cHJvdmlkZSB0aGUgd2lkZ2V0cyAKKyAgICAgKiB3aXRoaW4gY29uZmlndXJhdGlvbiBkaWFs b2cgb2YgdGhlIGFwcGxpY2F0aW9uLgogICAgICAqCisgICAgICogU2V0dGluZyB0aGUgd2lk Z2V0cyB3aWxsIHRyYW5zZmVyIHRoZWlyIG93bmVyc2hpcCB0byB0aGUgcHJpbnQgZGlhbG9n CisgICAgICogZXZlbiBvbiBub24tWDExIHN5c3RlbXMuCiAgICAgICogVGhlIGNhbGxlciB0 YWtlcyBvd25lcnNoaXAgb2YgdGhlIGRpYWxvZyBhbmQgaXMgcmVzcG9uc2libGUKICAgICAg KiBmb3IgZGVsZXRpbmcgaXQuCiAgICAgICoKQEAgLTQ4LDEwICs1MiwxMSBAQA0KICAgICAg KiBAcGFyYW0gY3VzdG9tVGFicyBhIGxpc3Qgb2YgY3VzdG9tIHdpZGdldHMgdG8gc2hvdyBh cyB0YWJzLCB0aGUgbmFtZSBwcmludGVkIG9uIHRoZSB0YWIgd2lsbAogICAgICAqICAgICAg YmUgdGFrZW4gZnJvbSB0aGUgd2lkZ2V0cyB3aW5kb3dUaXRsZSgpLgogICAgICAqIEBzZWUg UVdpZGdldDo6c2V0V2luZG93VGl0bGUoKQorICAgICAqIEBzZWUgUUFic3RyYWN0UHJpbnRE aWFsb2c6OnNldE9wdGlvblRhYnMoKQogICAgICAqLwogICAgIEtERVVJX0VYUE9SVCBRUHJp bnREaWFsb2cgKmNyZWF0ZVByaW50RGlhbG9nKFFQcmludGVyICpwcmludGVyLAotICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg UUxpc3Q8UVdpZGdldCo+ICZjdXN0b21UYWJzLAotICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUVdpZGdldCAqcGFyZW50ID0gMCk7Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgY29uc3Qg UUxpc3Q8UVdpZGdldCo+ICZjdXN0b21UYWJzLAorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFFXaWRnZXQgKnBhcmVudCA9IDApOwogCiAgICAg LyoqCiAgICAgICogQ3JlYXRlcyBhIHByaW50ZXIgZGlhbG9nIGZvciBhIFFQcmludGVyCkBA IC02Myw3ICs2OCw3IEBADQogICAgICAqIEBwYXJhbSBwYXJlbnQgdGhlIHBhcmVudCBmb3Ig dGhlIGRpYWxvZwogICAgICAqLwogICAgIEtERVVJX0VYUE9SVCBRUHJpbnREaWFsb2cgKmNy ZWF0ZVByaW50RGlhbG9nKFFQcmludGVyICpwcmludGVyLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgUVdpZGdldCAqcGFyZW50ID0g MCk7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg UVdpZGdldCAqcGFyZW50ID0gMCk7CiB9CiAKIAo= --------------030409010702050007070905--