39744 2010-05-26 09:31:28 -0700 [Qt] qt_instance.cpp has coding-style errors 2010-05-27 13:26:23 -0700 1 1 1 Unclassified WebKit WebKit Qt 528+ (Nightly build) PC All RESOLVED FIXED Qt, QtTriaged P2 Normal --- 1 agbakken webkit-unassigned commit-queue levin peojala11 oldest_to_newest 230734 0 agbakken 2010-05-26 09:31:28 -0700 WebCore/bridge/qt/qt_instance.h:20: #ifndef header guard has wrong style, please use: qt_instance_h [build/header_guard] [5] Total errors found: 1 in 1 files dfb-47 [flow:~/dev/WebKit/WebCore/bridge/qt] ../../../WebKitTools/Scripts/check-webkit-style qt_instance.cpp WebCore/bridge/qt/qt_instance.cpp:29: Alphabetical sorting problem. [build/include_order] [4] WebCore/bridge/qt/qt_instance.cpp:31: Alphabetical sorting problem. [build/include_order] [4] WebCore/bridge/qt/qt_instance.cpp:32: Alphabetical sorting problem. [build/include_order] [4] WebCore/bridge/qt/qt_instance.cpp:35: Alphabetical sorting problem. [build/include_order] [4] WebCore/bridge/qt/qt_instance.cpp:37: Alphabetical sorting problem. [build/include_order] [4] WebCore/bridge/qt/qt_instance.cpp:122: Missing space before ( in foreach( [whitespace/parens] [5] WebCore/bridge/qt/qt_instance.cpp:155: Missing space before ( in for( [whitespace/parens] [5] WebCore/bridge/qt/qt_instance.cpp:192: Missing space before ( in foreach( [whitespace/parens] [5] WebCore/bridge/qt/qt_instance.cpp:219: Missing spaces around = [whitespace/operators] [4] WebCore/bridge/qt/qt_instance.cpp:223: One line control clauses should not use braces. [whitespace/braces] [4] WebCore/bridge/qt/qt_instance.cpp:228: Missing space before ( in foreach( [whitespace/parens] [5] WebCore/bridge/qt/qt_instance.cpp:230: One line control clauses should not use braces. [whitespace/braces] [4] WebCore/bridge/qt/qt_instance.cpp:238: One line control clauses should not use braces. [whitespace/braces] [4] WebCore/bridge/qt/qt_instance.cpp:284: Tests for true/false, null/non-null, and zero/non-zero should all be done without equality comparisons. [readability/comparison_to_zero] [5] WebCore/bridge/qt/qt_instance.cpp:335: An else if statement should be written as an if statement when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] WebCore/bridge/qt/qt_instance.cpp:351: An else statement can be removed when the prior "if" concludes with a return, break, continue or goto statement. [readability/control_flow] [4] Total errors found: 16 in 1 files 230742 1 57106 agbakken 2010-05-26 09:52:09 -0700 Created attachment 57106 Patch that fixes the coding style issues 231071 2 peojala11 2010-05-26 21:38:54 -0700 QtTriaged 231433 3 57106 commit-queue 2010-05-27 13:26:18 -0700 Comment on attachment 57106 Patch that fixes the coding style issues Clearing flags on attachment: 57106 Committed r60322: <http://trac.webkit.org/changeset/60322> 231434 4 commit-queue 2010-05-27 13:26:23 -0700 All reviewed patches have been landed. Closing bug. 57106 2010-05-26 09:52:09 -0700 2010-05-27 13:26:17 -0700 Patch that fixes the coding style issues patch.39744 text/plain 5712 agbakken SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2MDI0MSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjEgQEAKKzIwMTAtMDUtMjYgIEFuZGVycyBCYWtrZW4gIDxhZ2Jha2tlbkBnbWFp bC5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg cXRfaW5zdGFuY2UuY3BwIGhhcyBjb2Rpbmctc3R5bGUgZXJyb3JzCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zOTc0NAorCisgICAgICAgIEZpeCB3ZWJr aXQgY29kaW5nIHN0eWxlIGlzc3VlcyBpbiBxdF9pbnN0YW5jZS5jcHAKKworICAgICAgICAqIGJy aWRnZS9xdC9xdF9pbnN0YW5jZS5jcHA6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEluc3Rh bmNlOjpnZXRRdEluc3RhbmNlKToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6 OnJlbW92ZUNhY2hlZE1ldGhvZCk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpRdEluc3RhbmNl OjptYXJrQWdncmVnYXRlKToKKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OlF0SW5zdGFuY2U6Omdl dFByb3BlcnR5TmFtZXMpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRJbnN0YW5jZTo6c3Ry aW5nVmFsdWUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6UXRGaWVsZDo6bmFtZSk6CisgICAg ICAgIChKU0M6OkJpbmRpbmdzOjpRdEZpZWxkOjp2YWx1ZUZyb21JbnN0YW5jZSk6CisKIDIwMTAt MDUtMjYgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXggZm9yIFdpbmRvd3MgKyBjbGVhbiB1cCB0aGUgeGNvZGUgcHJvamVj dC4KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL3F0L3F0X2luc3RhbmNlLmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBXZWJDb3JlL2JyaWRnZS9xdC9xdF9pbnN0YW5jZS5jcHAJKHJldmlzaW9uIDYwMDk1KQorKysg V2ViQ29yZS9icmlkZ2UvcXQvcXRfaW5zdGFuY2UuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0yMSwy MCArMjEsMjAgQEAKICNpbmNsdWRlICJxdF9pbnN0YW5jZS5oIgogCiAjaW5jbHVkZSAiQXJnTGlz dC5oIgorI2luY2x1ZGUgIkVycm9yLmgiCiAjaW5jbHVkZSAiSlNET01CaW5kaW5nLmgiCiAjaW5j bHVkZSAiSlNHbG9iYWxPYmplY3QuaCIKICNpbmNsdWRlICJKU0xvY2suaCIKKyNpbmNsdWRlICJP YmplY3RQcm90b3R5cGUuaCIKKyNpbmNsdWRlICJQcm9wZXJ0eU5hbWVBcnJheS5oIgogI2luY2x1 ZGUgInF0X2NsYXNzLmgiCiAjaW5jbHVkZSAicXRfcnVudGltZS5oIgotI2luY2x1ZGUgIlByb3Bl cnR5TmFtZUFycmF5LmgiCiAjaW5jbHVkZSAicnVudGltZV9vYmplY3QuaCIKLSNpbmNsdWRlICJP YmplY3RQcm90b3R5cGUuaCIKLSNpbmNsdWRlICJFcnJvci5oIgogCi0jaW5jbHVkZSA8cW1ldGFv YmplY3QuaD4KICNpbmNsdWRlIDxxZGVidWcuaD4KLSNpbmNsdWRlIDxxbWV0YXR5cGUuaD4KICNp bmNsdWRlIDxxaGFzaC5oPgorI2luY2x1ZGUgPHFtZXRhb2JqZWN0Lmg+CisjaW5jbHVkZSA8cW1l dGF0eXBlLmg+CiAKIG5hbWVzcGFjZSBKU0MgewogbmFtZXNwYWNlIEJpbmRpbmdzIHsKQEAgLTEx OSw3ICsxMTksNyBAQCBQYXNzUmVmUHRyPFF0SW5zdGFuY2U+IFF0SW5zdGFuY2U6OmdldFF0CiB7 CiAgICAgSlNMb2NrIGxvY2soU2lsZW5jZUFzc2VydGlvbnNPbmx5KTsKIAotICAgIGZvcmVhY2go UXRJbnN0YW5jZSogaW5zdGFuY2UsIGNhY2hlZEluc3RhbmNlcy52YWx1ZXMobykpCisgICAgZm9y ZWFjaCAoUXRJbnN0YW5jZSogaW5zdGFuY2UsIGNhY2hlZEluc3RhbmNlcy52YWx1ZXMobykpCiAg ICAgICAgIGlmIChpbnN0YW5jZS0+cm9vdE9iamVjdCgpID09IHJvb3RPYmplY3QpIHsKICAgICAg ICAgICAgIC8vIFRoZSBnYXJiYWdlIGNvbGxlY3RvciByZW1vdmVzIGluc3RhbmNlcywgYnV0IGl0 IG1heSBoYXBwZW4gdGhhdCB0aGUgd3JhcHBlZAogICAgICAgICAgICAgLy8gUU9iamVjdCBkaWVz IGJlZm9yZSB0aGUgZ2Mga2lja3MgaW4uIFRvIGhhbmRsZSB0aGF0IGNhc2Ugd2UgaGF2ZSB0byBk byBhbiBhZGRpdGlvbmFsCkBAIC0xNTIsNyArMTUyLDcgQEAgdm9pZCBRdEluc3RhbmNlOjpyZW1v dmVDYWNoZWRNZXRob2QoSlNPYgogICAgIGlmIChtX2RlZmF1bHRNZXRob2QgPT0gbWV0aG9kKQog ICAgICAgICBtX2RlZmF1bHRNZXRob2QgPSAwOwogCi0gICAgZm9yKFFIYXNoPFFCeXRlQXJyYXks IEpTT2JqZWN0Kj46Okl0ZXJhdG9yIGl0ID0gbV9tZXRob2RzLmJlZ2luKCksCisgICAgZm9yIChR SGFzaDxRQnl0ZUFycmF5LCBKU09iamVjdCo+OjpJdGVyYXRvciBpdCA9IG1fbWV0aG9kcy5iZWdp bigpLAogICAgICAgICBlbmQgPSBtX21ldGhvZHMuZW5kKCk7IGl0ICE9IGVuZDsgKytpdCkKICAg ICAgICAgaWYgKGl0LnZhbHVlKCkgPT0gbWV0aG9kKSB7CiAgICAgICAgICAgICBtX21ldGhvZHMu ZXJhc2UoaXQpOwpAQCAtMTg5LDcgKzE4OSw3IEBAIHZvaWQgUXRJbnN0YW5jZTo6bWFya0FnZ3Jl Z2F0ZShNYXJrU3RhY2sKIHsKICAgICBpZiAobV9kZWZhdWx0TWV0aG9kKQogICAgICAgICBtYXJr U3RhY2suYXBwZW5kKG1fZGVmYXVsdE1ldGhvZCk7Ci0gICAgZm9yZWFjaChKU09iamVjdCogdmFs LCBtX21ldGhvZHMudmFsdWVzKCkpIHsKKyAgICBmb3JlYWNoIChKU09iamVjdCogdmFsLCBtX21l dGhvZHMudmFsdWVzKCkpIHsKICAgICAgICAgaWYgKHZhbCkKICAgICAgICAgICAgIG1hcmtTdGFj ay5hcHBlbmQodmFsKTsKICAgICB9CkBAIC0yMTYsMjYgKzIxNiwyMyBAQCB2b2lkIFF0SW5zdGFu Y2U6OmdldFByb3BlcnR5TmFtZXMoRXhlY1N0CiAgICAgICAgIGNvbnN0IFFNZXRhT2JqZWN0KiBt ZXRhID0gb2JqLT5tZXRhT2JqZWN0KCk7CiAKICAgICAgICAgaW50IGk7Ci0gICAgICAgIGZvciAo aT0wOyBpIDwgbWV0YS0+cHJvcGVydHlDb3VudCgpOyBpKyspIHsKKyAgICAgICAgZm9yIChpID0g MDsgaSA8IG1ldGEtPnByb3BlcnR5Q291bnQoKTsgaSsrKSB7CiAgICAgICAgICAgICBRTWV0YVBy b3BlcnR5IHByb3AgPSBtZXRhLT5wcm9wZXJ0eShpKTsKLSAgICAgICAgICAgIGlmIChwcm9wLmlz U2NyaXB0YWJsZSgpKSB7CisgICAgICAgICAgICBpZiAocHJvcC5pc1NjcmlwdGFibGUoKSkKICAg ICAgICAgICAgICAgICBhcnJheS5hZGQoSWRlbnRpZmllcihleGVjLCBwcm9wLm5hbWUoKSkpOwot ICAgICAgICAgICAgfQogICAgICAgICB9CiAKICNpZm5kZWYgUVRfTk9fUFJPUEVSVElFUwogICAg ICAgICBRTGlzdDxRQnl0ZUFycmF5PiBkeW5Qcm9wcyA9IG9iai0+ZHluYW1pY1Byb3BlcnR5TmFt ZXMoKTsKLSAgICAgICAgZm9yZWFjaChjb25zdCBRQnl0ZUFycmF5JiBiYSwgZHluUHJvcHMpIHsK KyAgICAgICAgZm9yZWFjaCAoY29uc3QgUUJ5dGVBcnJheSYgYmEsIGR5blByb3BzKQogICAgICAg ICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgYmEuY29uc3REYXRhKCkpKTsKLSAgICAg ICAgfQogI2VuZGlmCiAKICAgICAgICAgY29uc3QgaW50IG1ldGhvZENvdW50ID0gbWV0YS0+bWV0 aG9kQ291bnQoKTsKICAgICAgICAgZm9yIChpID0gMDsgaSA8IG1ldGhvZENvdW50OyBpKyspIHsK ICAgICAgICAgICAgIFFNZXRhTWV0aG9kIG1ldGhvZCA9IG1ldGEtPm1ldGhvZChpKTsKLSAgICAg ICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6OlByaXZhdGUpIHsKKyAg ICAgICAgICAgIGlmIChtZXRob2QuYWNjZXNzKCkgIT0gUU1ldGFNZXRob2Q6OlByaXZhdGUpCiAg ICAgICAgICAgICAgICAgYXJyYXkuYWRkKElkZW50aWZpZXIoZXhlYywgbWV0aG9kLnNpZ25hdHVy ZSgpKSk7Ci0gICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICB9CiB9CkBAIC0yODEsNyArMjc4 LDcgQEAgSlNWYWx1ZSBRdEluc3RhbmNlOjpzdHJpbmdWYWx1ZShFeGVjU3RhdAogICAgICAgICAg ICAgLy8gQ2hlY2sgdG8gc2VlIGhvdyBtdWNoIHdlIGNhbiBjYWxsIGl0CiAgICAgICAgICAgICBp ZiAobS5hY2Nlc3MoKSAhPSBRTWV0YU1ldGhvZDo6UHJpdmF0ZQogICAgICAgICAgICAgICAgICYm IG0ubWV0aG9kVHlwZSgpICE9IFFNZXRhTWV0aG9kOjpTaWduYWwKLSAgICAgICAgICAgICAgICAm JiBtLnBhcmFtZXRlclR5cGVzKCkuY291bnQoKSA9PSAwKSB7CisgICAgICAgICAgICAgICAgJiYg bS5wYXJhbWV0ZXJUeXBlcygpLmlzRW1wdHkoKSkgewogICAgICAgICAgICAgICAgIGNvbnN0IGNo YXIqIHJldHNpZyA9IG0udHlwZU5hbWUoKTsKICAgICAgICAgICAgICAgICBpZiAocmV0c2lnICYm ICpyZXRzaWcpIHsKICAgICAgICAgICAgICAgICAgICAgUVZhcmlhbnQgcmV0KFFNZXRhVHlwZTo6 dHlwZShyZXRzaWcpLCAodm9pZCopMCk7CkBAIC0zMzQsMTAgKzMzMSwxMCBAQCBRQnl0ZUFycmF5 IFF0RmllbGQ6Om5hbWUoKSBjb25zdAogewogICAgIGlmIChtX3R5cGUgPT0gTWV0YVByb3BlcnR5 KQogICAgICAgICByZXR1cm4gbV9wcm9wZXJ0eS5uYW1lKCk7Ci0gICAgZWxzZSBpZiAobV90eXBl ID09IENoaWxkT2JqZWN0ICYmIG1fY2hpbGRPYmplY3QpCisgICAgaWYgKG1fdHlwZSA9PSBDaGls ZE9iamVjdCAmJiBtX2NoaWxkT2JqZWN0KQogICAgICAgICByZXR1cm4gbV9jaGlsZE9iamVjdC0+ b2JqZWN0TmFtZSgpLnRvTGF0aW4xKCk7CiAjaWZuZGVmIFFUX05PX1BST1BFUlRJRVMKLSAgICBl bHNlIGlmIChtX3R5cGUgPT0gRHluYW1pY1Byb3BlcnR5KQorICAgIGlmIChtX3R5cGUgPT0gRHlu YW1pY1Byb3BlcnR5KQogICAgICAgICByZXR1cm4gbV9keW5hbWljUHJvcGVydHk7CiAjZW5kaWYK ICAgICByZXR1cm4gUUJ5dGVBcnJheSgpOyAvLyBkZWxldGVkIGNoaWxkIG9iamVjdApAQCAtMzYy LDEwICszNTksOSBAQCBKU1ZhbHVlIFF0RmllbGQ6OnZhbHVlRnJvbUluc3RhbmNlKEV4ZWNTCiAg ICAgICAgICAgICB2YWwgPSBvYmotPnByb3BlcnR5KG1fZHluYW1pY1Byb3BlcnR5KTsKICNlbmRp ZgogICAgICAgICByZXR1cm4gY29udmVydFFWYXJpYW50VG9WYWx1ZShleGVjLCBpbnN0LT5yb290 T2JqZWN0KCksIHZhbCk7Ci0gICAgfSBlbHNlIHsKLSAgICAgICAgUVN0cmluZyBtc2cgPSBRU3Ry aW5nKFFMYXRpbjFTdHJpbmcoImNhbm5vdCBhY2Nlc3MgbWVtYmVyIGAlMScgb2YgZGVsZXRlZCBR T2JqZWN0IikpLmFyZyhRTGF0aW4xU3RyaW5nKG5hbWUoKSkpOwotICAgICAgICByZXR1cm4gdGhy b3dFcnJvcihleGVjLCBHZW5lcmFsRXJyb3IsIG1zZy50b0xhdGluMSgpLmNvbnN0RGF0YSgpKTsK ICAgICB9CisgICAgUVN0cmluZyBtc2cgPSBRU3RyaW5nKFFMYXRpbjFTdHJpbmcoImNhbm5vdCBh Y2Nlc3MgbWVtYmVyIGAlMScgb2YgZGVsZXRlZCBRT2JqZWN0IikpLmFyZyhRTGF0aW4xU3RyaW5n KG5hbWUoKSkpOworICAgIHJldHVybiB0aHJvd0Vycm9yKGV4ZWMsIEdlbmVyYWxFcnJvciwgbXNn LnRvTGF0aW4xKCkuY29uc3REYXRhKCkpOwogfQogCiB2b2lkIFF0RmllbGQ6OnNldFZhbHVlVG9J bnN0YW5jZShFeGVjU3RhdGUqIGV4ZWMsIGNvbnN0IEluc3RhbmNlKiBpbnN0LCBKU1ZhbHVlIGFW YWx1ZSkgY29uc3QK