diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-05-04 19:02:04 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-26 13:30:12 (GMT) |
commit | bd7c123dc88908f41e6c0eccb9b03f9684e5ca27 (patch) | |
tree | 82db3265fb0dd4799dc1ee0853a47b90ff499e31 /src/3rdparty | |
parent | 068cfc2452d4b558f0276e371c67a821bc3bcfbd (diff) | |
download | Qt-bd7c123dc88908f41e6c0eccb9b03f9684e5ca27.zip Qt-bd7c123dc88908f41e6c0eccb9b03f9684e5ca27.tar.gz Qt-bd7c123dc88908f41e6c0eccb9b03f9684e5ca27.tar.bz2 |
Silenced a warning caused by (apparently) a gcc 4.3 bug:
gcc 4.3 and 4.4 keep giving us a warning like:
'function()::type' declared with greater visibility than the type of
its field 'function()::type::subtype'
This seems to be a gcc bug. See the bug report for more information:
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=40145
Diffstat (limited to 'src/3rdparty')
3 files changed, 9 insertions, 11 deletions
diff --git a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp index 6f309a8..be16195 100644 --- a/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp +++ b/src/3rdparty/webkit/WebCore/accessibility/AccessibilityRenderObject.cpp @@ -2112,13 +2112,12 @@ AccessibilityObject* AccessibilityRenderObject::observableObject() const typedef HashMap<String, AccessibilityRole, CaseFoldingHash> ARIARoleMap; +struct RoleEntry { + String ariaRole; + AccessibilityRole webcoreRole; +}; static const ARIARoleMap& createARIARoleMap() { - struct RoleEntry { - String ariaRole; - AccessibilityRole webcoreRole; - }; - const RoleEntry roles[] = { { "button", ButtonRole }, { "checkbox", CheckBoxRole }, diff --git a/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp b/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp index 5a189d4..ab62c09 100644 --- a/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp +++ b/src/3rdparty/webkit/WebCore/editing/EditorCommand.cpp @@ -1247,10 +1247,9 @@ static String valueForeColor(Frame* frame, Event*) // Map of functions +struct CommandEntry { const char* name; EditorInternalCommand command; }; static const CommandMap& createCommandMap() { - struct CommandEntry { const char* name; EditorInternalCommand command; }; - static const CommandEntry commands[] = { { "AlignCenter", { executeJustifyCenter, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, { "AlignJustified", { executeJustifyFull, supportedFromMenuOrKeyBinding, enabledInRichlyEditableText, stateNone, valueNull, notTextInsertion, doNotAllowExecutionWhenDisabled } }, diff --git a/src/3rdparty/webkit/WebCore/xml/XPathFunctions.cpp b/src/3rdparty/webkit/WebCore/xml/XPathFunctions.cpp index da39443..1f1d985 100644 --- a/src/3rdparty/webkit/WebCore/xml/XPathFunctions.cpp +++ b/src/3rdparty/webkit/WebCore/xml/XPathFunctions.cpp @@ -667,12 +667,12 @@ Value FunRound::evaluate() const return round(arg(0)->evaluate().toNumber()); } +struct FunctionMapping { + const char *name; + FunctionRec function; +}; static void createFunctionMap() { - struct FunctionMapping { - const char *name; - FunctionRec function; - }; static const FunctionMapping functions[] = { { "boolean", { &createFunBoolean, 1 } }, { "ceiling", { &createFunCeiling, 1 } }, |