[GObject bindings] Fix the coding style issues in the generated bindings
authormrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Apr 2012 17:10:07 +0000 (17:10 +0000)
committermrobinson@webkit.org <mrobinson@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 6 Apr 2012 17:10:07 +0000 (17:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=82080

Reviewed by Kentaro Hara.

No new tests. This is covered by the binding tests.

* bindings/scripts/CodeGeneratorGObject.pm: Fix most style errors in the generated
  GObject code.
* bindings/scripts/test/GObject: Updated the expected results.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@113450 268f45cc-cd09-0410-ab3c-d52691b4dbfc

35 files changed:
Source/WebCore/ChangeLog
Source/WebCore/bindings/scripts/CodeGeneratorGObject.pm
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64Array.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMFloat64ArrayPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObject.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestActiveDOMObjectPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallback.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCallbackPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetter.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestCustomNamedGetterPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventConstructorPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTarget.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestEventTargetPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestInterfacePrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListener.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestMediaQueryListListenerPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructor.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestNamedConstructorPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObj.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestObjPrivate.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.cpp
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterface.h
Source/WebCore/bindings/scripts/test/GObject/WebKitDOMTestSerializedScriptValueInterfacePrivate.h

index 8764298..1360cab 100644 (file)
@@ -1,3 +1,17 @@
+2012-04-05  Martin Robinson  <mrobinson@igalia.com>
+
+        [GObject bindings] Fix the coding style issues in the generated bindings
+        https://bugs.webkit.org/show_bug.cgi?id=82080
+
+        Reviewed by Kentaro Hara.
+
+        No new tests. This is covered by the binding tests.
+
+        * bindings/scripts/CodeGeneratorGObject.pm: Fix most style errors in the generated
+          GObject code.
+        * bindings/scripts/test/GObject: Updated the expected results.
+
+
 2012-04-06  Adam Klein  <adamk@chromium.org>
 
         Remove bogus assert from ChildListMutationScope
index b48f23e..735221a 100644 (file)
@@ -435,7 +435,7 @@ sub GenerateProperty {
 
     if (grep {$_ eq $attribute} @writeableProperties) {
         push(@txtSetProps, "#if ${conditionalString}\n") if $conditionalString;
-        push(@txtSetProps, "    case ${propEnum}:\n    {\n");
+        push(@txtSetProps, "    case ${propEnum}: {\n");
         push(@txtSetProps, "        WebCore::ExceptionCode ec = 0;\n") if @{$attribute->setterExceptions};
         push(@txtSetProps, "        ${setterFunctionName}(" . join(", ", @setterArguments) . ");\n");
         push(@txtSetProps, "        break;\n    }\n");
@@ -443,7 +443,7 @@ sub GenerateProperty {
     }
 
     push(@txtGetProps, "#if ${conditionalString}\n") if $conditionalString;
-    push(@txtGetProps, "    case ${propEnum}:\n    {\n");
+    push(@txtGetProps, "    case ${propEnum}: {\n");
     push(@txtGetProps, "        WebCore::ExceptionCode ec = 0;\n") if @{$attribute->getterExceptions};
 
     my $postConvertFunction = "";
@@ -534,7 +534,7 @@ EOF
     my $privFunction = GetCoreObject($interfaceName, "coreSelf", "self");
 
     my $txtGetProp = << "EOF";
-static void ${lowerCaseIfaceName}_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void ${lowerCaseIfaceName}_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
 EOF
@@ -548,14 +548,14 @@ EOF
     }
 
     $txtGetProp = << "EOF";
-    switch (prop_id) {
+    switch (propertyId) {
 EOF
     push(@txtGetProps, $txtGetProp);
 
     my @writeableProperties = GetWriteableProperties(\@readableProperties);
 
     my $txtSetProps = << "EOF";
-static void ${lowerCaseIfaceName}_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void ${lowerCaseIfaceName}_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
 EOF
@@ -570,7 +570,7 @@ EOF
     }
 
     $txtSetProps = << "EOF";
-    switch (prop_id) {
+    switch (propertyId) {
 EOF
     push(@txtSetProps, $txtSetProps);
 
@@ -585,7 +585,7 @@ EOF
 
     $txtGetProp = << "EOF";
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -594,7 +594,7 @@ EOF
 
     $txtSetProps = << "EOF";
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -608,15 +608,15 @@ EOF
 static void ${lowerCaseIfaceName}_finalize(GObject* object)
 {
 $conditionGuardStart
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::${interfaceName}* coreObject = static_cast<WebCore::${interfaceName} *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::${interfaceName}* coreObject = static_cast<WebCore::${interfaceName}*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 $conditionGuardEnd
 
@@ -640,7 +640,7 @@ EOF
 
 static void ${lowerCaseIfaceName}_class_init(${className}Class* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = ${lowerCaseIfaceName}_finalize;
     gobjectClass->set_property = ${lowerCaseIfaceName}_set_property;
     gobjectClass->get_property = ${lowerCaseIfaceName}_get_property;
@@ -795,7 +795,7 @@ sub GenerateFunction {
         addIncludeInBody($paramIDLType);
         my $paramType = GetGlibTypeName($paramIDLType);
         my $const = $paramType eq "gchar*" ? "const " : "";
-        my $paramName = decamelize($param->name);
+        my $paramName = $param->name;
 
         $functionSig .= ", ${const}$paramType $paramName";
 
@@ -806,7 +806,7 @@ sub GenerateFunction {
             }
         }
         if ($paramIsGDOMType || ($paramIDLType eq "DOMString") || ($paramIDLType eq "CompareHow")) {
-            $paramName = "converted_" . $paramName;
+            $paramName = "converted" . $codeGenerator->WK_ucfirst($paramName);
         }
         push(@callImplParams, $paramName);
     }
@@ -822,8 +822,8 @@ sub GenerateFunction {
         $implIncludes{"${functionSigType}.h"} = 1;
     }
 
-    if(@{$function->raisesExceptions}) {
-        $functionSig .= ", GError **error";
+    if (@{$function->raisesExceptions}) {
+        $functionSig .= ", GError** error";
     }
 
     # Insert introspection annotations
@@ -835,7 +835,7 @@ sub GenerateFunction {
         my $paramType = GetGlibTypeName($param->type);
         # $paramType can have a trailing * in some cases
         $paramType =~ s/\*$//;
-        my $paramName = decamelize($param->name);
+        my $paramName = $param->name;
         push(@hBody, " * \@${paramName}: A #${paramType}\n");
     }
     if(@{$function->raisesExceptions}) {
@@ -866,12 +866,11 @@ sub GenerateFunction {
 
     push(@cBody, "    WebCore::JSMainThreadNullState state;\n");
 
-    # The WebKit::core implementations check for NULL already; no need to
-    # duplicate effort.
-    push(@cBody, "    WebCore::${interfaceName} * item = WebKit::core(self);\n");
+    # The WebKit::core implementations check for null already; no need to duplicate effort.
+    push(@cBody, "    WebCore::${interfaceName}* item = WebKit::core(self);\n");
 
     foreach my $param (@{$function->parameters}) {
-        my $paramName = decamelize($param->name);
+        my $paramName = $param->name;
         my $paramIDLType = $param->type;
         my $paramTypeIsPrimitive = $codeGenerator->IsPrimitiveType($paramIDLType);
         my $paramIsGDOMType = IsGDOMClassType($paramIDLType);
@@ -892,28 +891,29 @@ sub GenerateFunction {
     $returnParamName = "";
     foreach my $param (@{$function->parameters}) {
         my $paramIDLType = $param->type;
-        my $paramName = decamelize($param->name);
+        my $paramName = $param->name;
 
         my $paramIsGDOMType = IsGDOMClassType($paramIDLType);
+        $convertedParamName = "converted" . $codeGenerator->WK_ucfirst($paramName);
         if ($paramIDLType eq "DOMString") {
-            push(@cBody, "    WTF::String converted_${paramName} = WTF::String::fromUTF8($paramName);\n");
+            push(@cBody, "    WTF::String ${convertedParamName} = WTF::String::fromUTF8($paramName);\n");
         } elsif ($paramIDLType eq "CompareHow") {
-            push(@cBody, "    WebCore::Range::CompareHow converted_${paramName} = static_cast<WebCore::Range::CompareHow>($paramName);\n");
+            push(@cBody, "    WebCore::Range::CompareHow ${convertedParamName} = static_cast<WebCore::Range::CompareHow>($paramName);\n");
         } elsif ($paramIsGDOMType) {
-            push(@cBody, "    WebCore::${paramIDLType} * converted_${paramName} = NULL;\n");
-            push(@cBody, "    if (${paramName} != NULL) {\n");
-            push(@cBody, "        converted_${paramName} = WebKit::core($paramName);\n");
+            push(@cBody, "    WebCore::${paramIDLType}* ${convertedParamName} = 0;\n");
+            push(@cBody, "    if (${paramName}) {\n");
+            push(@cBody, "        ${convertedParamName} = WebKit::core($paramName);\n");
 
             if ($returnType ne "void") {
                 # TODO: return proper default result
-                push(@cBody, "        g_return_val_if_fail(converted_${paramName}, 0);\n");
+                push(@cBody, "        g_return_val_if_fail(${convertedParamName}, 0);\n");
             } else {
-                push(@cBody, "        g_return_if_fail(converted_${paramName});\n");
+                push(@cBody, "        g_return_if_fail(${convertedParamName});\n");
             }
 
             push(@cBody, "    }\n");
         }
-        $returnParamName = "converted_".$paramName if $param->extendedAttributes->{"CustomReturn"};
+        $returnParamName = $convertedParamName if $param->extendedAttributes->{"CustomReturn"};
     }
 
     my $assign = "";
@@ -927,14 +927,14 @@ sub GenerateFunction {
         $functionName eq "webkit_dom_node_insert_before" ||
         $functionName eq "webkit_dom_node_replace_child" ||
         $functionName eq "webkit_dom_node_remove_child";
-        
+         
     if ($returnType ne "void" && !$functionHasCustomReturn) {
         if ($returnValueIsGDOMType) {
-            $assign = "PassRefPtr<WebCore::${functionSigType}> g_res = ";
+            $assign = "RefPtr<WebCore::${functionSigType}> gobjectResult = ";
             $assignPre = "WTF::getPtr(";
             $assignPost = ")";
         } else {
-            $assign = "${returnType} res = ";
+            $assign = "${returnType} result = ";
         }
     }
 
@@ -948,8 +948,8 @@ sub GenerateFunction {
         my $customNodeAppendChild = << "EOF";
     if (ok)
     {
-        ${returnType} res = WebKit::kit($returnParamName);
-        return res;
+        ${returnType} result = WebKit::kit($returnParamName);
+        return result;
     }
 EOF
         push(@cBody, $customNodeAppendChild);
@@ -962,7 +962,7 @@ EOF
 EOF
             push(@cBody, $exceptionHandling);
         }
-        push(@cBody, "return NULL;");
+        push(@cBody, "return 0;");
         push(@cBody, "}\n\n");
         return;
     } elsif ($functionSigType eq "DOMString") {
@@ -1045,13 +1045,13 @@ EOF
     if ($returnType ne "void" && !$functionHasCustomReturn) {
         if ($functionSigType ne "DOMObject") {
             if ($returnValueIsGDOMType) {
-                push(@cBody, "    ${returnType} res = WebKit::kit(g_res.get());\n");
+                push(@cBody, "    ${returnType} result = WebKit::kit(gobjectResult.get());\n");
             }
         }
         if ($functionSigType eq "DOMObject") {
-            push(@cBody, "    return NULL; /* TODO: return canvas object */\n");
+            push(@cBody, "    return 0; // TODO: return canvas object\n");
         } else {
-            push(@cBody, "    return res;\n");
+            push(@cBody, "    return result;\n");
         }
     }
 
@@ -1062,7 +1062,7 @@ EOF
             if ($codeGenerator->IsNonPointerType($functionSigType)) {
                 push(@cBody, "    return static_cast<${returnType}>(0);\n");
             } else {
-                push(@cBody, "    return NULL;\n");
+                push(@cBody, "    return 0;\n");
             }
         }
         push(@cBody, "#endif /* ${conditionalString} */\n");
@@ -1075,7 +1075,7 @@ EOF
             if ($codeGenerator->IsNonPointerType($functionSigType)) {
                 push(@cBody, "    return static_cast<${returnType}>(0);\n");
             } else {
-                push(@cBody, "    return NULL;\n");
+                push(@cBody, "    return 0;\n");
             }
         }
         push(@cBody, "#endif /* ${parentConditionalString} */\n");
@@ -1205,14 +1205,11 @@ ${className}* wrap${interfaceName}(WebCore::${interfaceName}* coreObject)
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_TYPE_DOM_${clsCaps},
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_${clsCaps}(g_object_new(WEBKIT_TYPE_DOM_${clsCaps}, "core-object", coreObject, NULL));
 }
 
 EOF
@@ -1342,7 +1339,7 @@ sub WriteData {
     # Write a private header.
     my $interfaceName = $dataNode->name;
     my $filename = "$outputDir/" . $className . "Private.h";
-    my $guard = uc(decamelize($className)) . "_PRIVATE_H";
+    my $guard = "${className}Private_h";
     my $parentClassName = GetParentClassName($dataNode);
 
     # Add the guard if the 'Conditional' extended attribute exists
@@ -1357,42 +1354,32 @@ sub WriteData {
 #ifndef $guard
 #define $guard
 
+#include "${interfaceName}.h"
 #include <glib-object.h>
 #include <webkit/${parentClassName}.h>
-#include "${interfaceName}.h"
-
 EOF
 
     print PRIVHEADER $text;
     print PRIVHEADER "#if ${conditionalString}\n" if $conditionalString;
     print PRIVHEADER map { "#include \"$_\"\n" } sort keys(%hdrPropIncludes);
-    print PRIVHEADER "\n" if keys(%hdrPropIncludes);
+    print PRIVHEADER "\n";
     $text = << "EOF";
-
 namespace WebKit {
-    ${className} *
-    wrap${interfaceName}(WebCore::${interfaceName} *coreObject);
-
-    WebCore::${interfaceName} *
-    core(${className} *request);
-
+${className}* wrap${interfaceName}(WebCore::${interfaceName}*);
+WebCore::${interfaceName}* core(${className}* request);
 EOF
 
     print PRIVHEADER $text;
 
     if ($className ne "WebKitDOMNode") {
-        $text = << "EOF";
-    ${className}*
-    kit(WebCore::${interfaceName}* node);
-
-EOF
-        print PRIVHEADER $text;
+        print PRIVHEADER "${className}* kit(WebCore::${interfaceName}* node);\n"
     }
 
     $text = << "EOF";
 } // namespace WebKit
 
 EOF
+
     print PRIVHEADER $text;
     print PRIVHEADER "#endif /* ${conditionalString} */\n\n" if $conditionalString;
     print PRIVHEADER "#endif /* ${guard} */\n";
@@ -1403,17 +1390,16 @@ EOF
     $basename =~ s/_//g;
 
     # Write public header.
-    my $hdrFName = "$outputDir/" . $basename . ".h";
-    open(HEADER, ">$hdrFName") or die "Couldn't open file $hdrFName";
+    my $fullHeaderFilename = "$outputDir/" . $basename . ".h";
+    my $installedHeaderFilename = "${basename}.h";
+    open(HEADER, ">$fullHeaderFilename") or die "Couldn't open file $fullHeaderFilename";
 
     print HEADER @hPrefix;
     print HEADER @hPrefixGuard;
-    print HEADER "#include \"webkit/webkitdomdefines.h\"\n";
     print HEADER "#include <glib-object.h>\n";
+    print HEADER map { "#include <$_>\n" } sort keys(%hdrIncludes);
     print HEADER "#include <webkit/webkitdefines.h>\n";
-    print HEADER map { "#include \"$_\"\n" } sort keys(%hdrIncludes);
-    print HEADER "\n" if keys(%hdrIncludes);
-    print HEADER "\n";
+    print HEADER "#include <webkit/webkitdomdefines.h>\n\n";
     print HEADER @hBodyPre;
     print HEADER @hBody;
     print HEADER @hPrefixGuardEnd;
@@ -1425,13 +1411,18 @@ EOF
     open(IMPL, ">$implFileName") or die "Couldn't open file $implFileName";
 
     print IMPL @cPrefix;
+    print IMPL "#include \"config.h\"\n";
+    print IMPL "#include \"$installedHeaderFilename\"\n\n";
+    print IMPL "#if ${conditionalString}\n\n" if $conditionalString;
+
+    # Remove the implementation header from the list of included files.
+    %includesCopy = %implIncludes;
+    delete ($includesCopy{"webkit/$installedHeaderFilename"});
+    print IMPL map { "#include \"$_\"\n" } sort keys(%includesCopy);
+
     print IMPL "#include <glib-object.h>\n";
-    print IMPL "#include \"config.h\"\n\n";
     print IMPL "#include <wtf/GetPtr.h>\n";
-    print IMPL "#include <wtf/RefPtr.h>\n";
-    print IMPL map { "#include \"$_\"\n" } sort keys(%implIncludes);
-    print IMPL "\n" if keys(%implIncludes);
-    print IMPL "#if ${conditionalString}\n\n" if $conditionalString;
+    print IMPL "#include <wtf/RefPtr.h>\n\n";
 
     print IMPL "namespace WebKit {\n\n";
     print IMPL @cBodyPriv;
index 2b6d06f..3ab8d4a 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMFloat64Array.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "Float64Array.h"
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMFloat32Array.h"
 #include "webkit/WebKitDOMFloat32ArrayPrivate.h"
-#include "webkit/WebKitDOMFloat64Array.h"
 #include "webkit/WebKitDOMFloat64ArrayPrivate.h"
 #include "webkit/WebKitDOMInt32Array.h"
 #include "webkit/WebKitDOMInt32ArrayPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -66,14 +66,11 @@ WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array* coreObject)
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_FLOAT64ARRAY(g_object_new(WEBKIT_TYPE_DOM_FLOAT64ARRAY, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -87,38 +84,38 @@ enum {
 static void webkit_dom_float64array_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::Float64Array* coreObject = static_cast<WebCore::Float64Array *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::Float64Array* coreObject = static_cast<WebCore::Float64Array*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_float64array_parent_class)->finalize(object);
 }
 
-static void webkit_dom_float64array_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_float64array_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_float64array_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_float64array_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -133,7 +130,7 @@ static void webkit_dom_float64array_constructed(GObject* object)
 
 static void webkit_dom_float64array_class_init(WebKitDOMFloat64ArrayClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_float64array_finalize;
     gobjectClass->set_property = webkit_dom_float64array_set_property;
     gobjectClass->get_property = webkit_dom_float64array_get_property;
@@ -152,15 +149,15 @@ webkit_dom_float64array_foo(WebKitDOMFloat64Array* self, WebKitDOMFloat32Array*
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::Float64Array * item = WebKit::core(self);
+    WebCore::Float64Array* item = WebKit::core(self);
     g_return_val_if_fail(array, 0);
-    WebCore::Float32Array * converted_array = NULL;
-    if (array != NULL) {
-        converted_array = WebKit::core(array);
-        g_return_val_if_fail(converted_array, 0);
+    WebCore::Float32Array* convertedArray = 0;
+    if (array) {
+        convertedArray = WebKit::core(array);
+        g_return_val_if_fail(convertedArray, 0);
     }
-    PassRefPtr<WebCore::Int32Array> g_res = WTF::getPtr(item->foo(converted_array));
-    WebKitDOMInt32Array* res = WebKit::kit(g_res.get());
-    return res;
+    RefPtr<WebCore::Int32Array> gobjectResult = WTF::getPtr(item->foo(convertedArray));
+    WebKitDOMInt32Array* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
index 0dbc986..addbc85 100644 (file)
 #ifndef WebKitDOMFloat64Array_h
 #define WebKitDOMFloat64Array_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMArrayBufferView.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMArrayBufferView.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_FLOAT64ARRAY            (webkit_dom_float64array_get_type())
index c2a7f77..8fa93b8 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H
-#define WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H
+#ifndef WebKitDOMFloat64ArrayPrivate_h
+#define WebKitDOMFloat64ArrayPrivate_h
 
+#include "Float64Array.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMArrayBufferView.h>
-#include "Float64Array.h"
-
 
 namespace WebKit {
-    WebKitDOMFloat64Array *
-    wrapFloat64Array(WebCore::Float64Array *coreObject);
-
-    WebCore::Float64Array *
-    core(WebKitDOMFloat64Array *request);
-
-    WebKitDOMFloat64Array*
-    kit(WebCore::Float64Array* node);
-
+WebKitDOMFloat64Array* wrapFloat64Array(WebCore::Float64Array*);
+WebCore::Float64Array* core(WebKitDOMFloat64Array* request);
+WebKitDOMFloat64Array* kit(WebCore::Float64Array* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_FLOAT64ARRAY_PRIVATE_H */
+#endif /* WebKitDOMFloat64ArrayPrivate_h */
index 71502c5..cd6ade5 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestActiveDOMObject.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestActiveDOMObject.h"
 #include "webkit/WebKitDOMTestActiveDOMObjectPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -63,14 +63,11 @@ WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObje
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(g_object_new(WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -85,45 +82,44 @@ enum {
 static void webkit_dom_test_active_dom_object_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestActiveDOMObject* coreObject = static_cast<WebCore::TestActiveDOMObject *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestActiveDOMObject* coreObject = static_cast<WebCore::TestActiveDOMObject*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_active_dom_object_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_active_dom_object_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_active_dom_object_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_active_dom_object_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestActiveDOMObject* self = WEBKIT_DOM_TEST_ACTIVE_DOM_OBJECT(object);
     WebCore::TestActiveDOMObject* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_EXCITING_ATTR:
-    {
+    switch (propertyId) {
+    case PROP_EXCITING_ATTR: {
         g_value_set_long(value, coreSelf->excitingAttr());
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -138,7 +134,7 @@ static void webkit_dom_test_active_dom_object_constructed(GObject* object)
 
 static void webkit_dom_test_active_dom_object_class_init(WebKitDOMTestActiveDOMObjectClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_active_dom_object_finalize;
     gobjectClass->set_property = webkit_dom_test_active_dom_object_set_property;
     gobjectClass->get_property = webkit_dom_test_active_dom_object_get_property;
@@ -162,18 +158,18 @@ static void webkit_dom_test_active_dom_object_init(WebKitDOMTestActiveDOMObject*
 }
 
 void
-webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* next_child)
+webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* nextChild)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
-    g_return_if_fail(next_child);
-    WebCore::Node * converted_next_child = NULL;
-    if (next_child != NULL) {
-        converted_next_child = WebKit::core(next_child);
-        g_return_if_fail(converted_next_child);
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
+    g_return_if_fail(nextChild);
+    WebCore::Node* convertedNextChild = 0;
+    if (nextChild) {
+        convertedNextChild = WebKit::core(nextChild);
+        g_return_if_fail(convertedNextChild);
     }
-    item->excitingFunction(converted_next_child);
+    item->excitingFunction(convertedNextChild);
 }
 
 void
@@ -181,10 +177,10 @@ webkit_dom_test_active_dom_object_post_message(WebKitDOMTestActiveDOMObject* sel
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
     g_return_if_fail(message);
-    WTF::String converted_message = WTF::String::fromUTF8(message);
-    item->postMessage(converted_message);
+    WTF::String convertedMessage = WTF::String::fromUTF8(message);
+    item->postMessage(convertedMessage);
 }
 
 glong
@@ -192,8 +188,8 @@ webkit_dom_test_active_dom_object_get_exciting_attr(WebKitDOMTestActiveDOMObject
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestActiveDOMObject * item = WebKit::core(self);
-    glong res = item->excitingAttr();
-    return res;
+    WebCore::TestActiveDOMObject* item = WebKit::core(self);
+    glong result = item->excitingAttr();
+    return result;
 }
 
index f3cfdb3..42594a0 100644 (file)
 #ifndef WebKitDOMTestActiveDOMObject_h
 #define WebKitDOMTestActiveDOMObject_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_ACTIVE_DOM_OBJECT            (webkit_dom_test_active_dom_object_get_type())
@@ -49,13 +48,13 @@ webkit_dom_test_active_dom_object_get_type (void);
 /**
  * webkit_dom_test_active_dom_object_exciting_function:
  * @self: A #WebKitDOMTestActiveDOMObject
- * @next_child: A #WebKitDOMNode
+ * @nextChild: A #WebKitDOMNode
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* next_child);
+webkit_dom_test_active_dom_object_exciting_function(WebKitDOMTestActiveDOMObject* self, WebKitDOMNode* nextChild);
 
 /**
  * webkit_dom_test_active_dom_object_post_message:
index 25b5455..547cdaa 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H
-#define WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H
+#ifndef WebKitDOMTestActiveDOMObjectPrivate_h
+#define WebKitDOMTestActiveDOMObjectPrivate_h
 
+#include "TestActiveDOMObject.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestActiveDOMObject.h"
-
 
 namespace WebKit {
-    WebKitDOMTestActiveDOMObject *
-    wrapTestActiveDOMObject(WebCore::TestActiveDOMObject *coreObject);
-
-    WebCore::TestActiveDOMObject *
-    core(WebKitDOMTestActiveDOMObject *request);
-
-    WebKitDOMTestActiveDOMObject*
-    kit(WebCore::TestActiveDOMObject* node);
-
+WebKitDOMTestActiveDOMObject* wrapTestActiveDOMObject(WebCore::TestActiveDOMObject*);
+WebCore::TestActiveDOMObject* core(WebKitDOMTestActiveDOMObject* request);
+WebKitDOMTestActiveDOMObject* kit(WebCore::TestActiveDOMObject* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_ACTIVE_DOM_OBJECT_PRIVATE_H */
+#endif /* WebKitDOMTestActiveDOMObjectPrivate_h */
index 417fc49..9b17e1b 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestCallback.h"
+
+#if ENABLE(SQL_DATABASE)
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "webkit/WebKitDOMClass3Private.h"
 #include "webkit/WebKitDOMDOMStringList.h"
 #include "webkit/WebKitDOMDOMStringListPrivate.h"
-#include "webkit/WebKitDOMTestCallback.h"
 #include "webkit/WebKitDOMTestCallbackPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
-
-#if ENABLE(SQL_DATABASE)
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -71,14 +71,11 @@ WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback* coreObject)
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_CALLBACK(g_object_new(WEBKIT_TYPE_DOM_TEST_CALLBACK, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -94,38 +91,38 @@ enum {
 static void webkit_dom_test_callback_finalize(GObject* object)
 {
 #if ENABLE(SQL_DATABASE)
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestCallback* coreObject = static_cast<WebCore::TestCallback*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 #endif // ENABLE(SQL_DATABASE)
 
     G_OBJECT_CLASS(webkit_dom_test_callback_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_callback_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_callback_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_callback_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_callback_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -140,7 +137,7 @@ static void webkit_dom_test_callback_constructed(GObject* object)
 
 static void webkit_dom_test_callback_class_init(WebKitDOMTestCallbackClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_callback_finalize;
     gobjectClass->set_property = webkit_dom_test_callback_set_property;
     gobjectClass->get_property = webkit_dom_test_callback_get_property;
@@ -160,9 +157,9 @@ webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    gboolean res = item->callbackWithNoParam();
-    return res;
+    WebCore::TestCallback* item = WebKit::core(self);
+    gboolean result = item->callbackWithNoParam();
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<gboolean>(0);
@@ -170,20 +167,20 @@ webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self)
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param)
+webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param)
 {
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail(class1param, 0);
-    WebCore::Class1 * converted_class1param = NULL;
-    if (class1param != NULL) {
-        converted_class1param = WebKit::core(class1param);
-        g_return_val_if_fail(converted_class1param, 0);
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(class1Param, 0);
+    WebCore::Class1* convertedClass1Param = 0;
+    if (class1Param) {
+        convertedClass1Param = WebKit::core(class1Param);
+        g_return_val_if_fail(convertedClass1Param, 0);
     }
-    gboolean res = item->callbackWithClass1Param(converted_class1param);
-    return res;
+    gboolean result = item->callbackWithClass1Param(convertedClass1Param);
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<gboolean>(0);
@@ -191,22 +188,22 @@ webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self,
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg)
+webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg)
 {
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail(class2param, 0);
-    g_return_val_if_fail(str_arg, 0);
-    WebCore::Class2 * converted_class2param = NULL;
-    if (class2param != NULL) {
-        converted_class2param = WebKit::core(class2param);
-        g_return_val_if_fail(converted_class2param, 0);
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(class2Param, 0);
+    g_return_val_if_fail(strArg, 0);
+    WebCore::Class2* convertedClass2Param = 0;
+    if (class2Param) {
+        convertedClass2Param = WebKit::core(class2Param);
+        g_return_val_if_fail(convertedClass2Param, 0);
     }
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    gboolean res = item->callbackWithClass2Param(converted_class2param, converted_str_arg);
-    return res;
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    gboolean result = item->callbackWithClass2Param(convertedClass2Param, convertedStrArg);
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<gboolean>(0);
@@ -214,20 +211,20 @@ webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self,
 }
 
 glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param)
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param)
 {
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail(class3param, 0);
-    WebCore::Class3 * converted_class3param = NULL;
-    if (class3param != NULL) {
-        converted_class3param = WebKit::core(class3param);
-        g_return_val_if_fail(converted_class3param, 0);
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(class3Param, 0);
+    WebCore::Class3* convertedClass3Param = 0;
+    if (class3Param) {
+        convertedClass3Param = WebKit::core(class3Param);
+        g_return_val_if_fail(convertedClass3Param, 0);
     }
-    glong res = item->callbackWithNonBoolReturnType(converted_class3param);
-    return res;
+    glong result = item->callbackWithNonBoolReturnType(convertedClass3Param);
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<glong>(0);
@@ -235,20 +232,20 @@ webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallbac
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* list_param)
+webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam)
 {
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    g_return_val_if_fail(list_param, 0);
-    WebCore::DOMStringList * converted_list_param = NULL;
-    if (list_param != NULL) {
-        converted_list_param = WebKit::core(list_param);
-        g_return_val_if_fail(converted_list_param, 0);
+    WebCore::TestCallback* item = WebKit::core(self);
+    g_return_val_if_fail(listParam, 0);
+    WebCore::DOMStringList* convertedListParam = 0;
+    if (listParam) {
+        convertedListParam = WebKit::core(listParam);
+        g_return_val_if_fail(convertedListParam, 0);
     }
-    gboolean res = item->callbackWithStringList(converted_list_param);
-    return res;
+    gboolean result = item->callbackWithStringList(convertedListParam);
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<gboolean>(0);
@@ -256,14 +253,14 @@ webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self,
 }
 
 gboolean
-webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean bool_param)
+webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam)
 {
 #if ENABLE(SQL_DATABASE)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCallback * item = WebKit::core(self);
-    gboolean res = item->callbackWithBoolean(bool_param);
-    return res;
+    WebCore::TestCallback* item = WebKit::core(self);
+    gboolean result = item->callbackWithBoolean(boolParam);
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("SQL Database")
     return static_cast<gboolean>(0);
index c0d7434..d9fffef 100644 (file)
 #ifndef WebKitDOMTestCallback_h
 #define WebKitDOMTestCallback_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_CALLBACK            (webkit_dom_test_callback_get_type())
@@ -59,58 +58,58 @@ webkit_dom_test_callback_callback_with_no_param(WebKitDOMTestCallback* self);
 /**
  * webkit_dom_test_callback_callback_with_class1param:
  * @self: A #WebKitDOMTestCallback
- * @class1param: A #WebKitDOMClass1
+ * @class1Param: A #WebKitDOMClass1
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1param);
+webkit_dom_test_callback_callback_with_class1param(WebKitDOMTestCallback* self, WebKitDOMClass1* class1Param);
 
 /**
  * webkit_dom_test_callback_callback_with_class2param:
  * @self: A #WebKitDOMTestCallback
- * @class2param: A #WebKitDOMClass2
- * @str_arg: A #gchar
+ * @class2Param: A #WebKitDOMClass2
+ * @strArg: A #gchar
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2param, const gchar* str_arg);
+webkit_dom_test_callback_callback_with_class2param(WebKitDOMTestCallback* self, WebKitDOMClass2* class2Param, const gchar* strArg);
 
 /**
  * webkit_dom_test_callback_callback_with_non_bool_return_type:
  * @self: A #WebKitDOMTestCallback
- * @class3param: A #WebKitDOMClass3
+ * @class3Param: A #WebKitDOMClass3
  *
  * Returns:
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3param);
+webkit_dom_test_callback_callback_with_non_bool_return_type(WebKitDOMTestCallback* self, WebKitDOMClass3* class3Param);
 
 /**
  * webkit_dom_test_callback_callback_with_string_list:
  * @self: A #WebKitDOMTestCallback
- * @list_param: A #WebKitDOMDOMStringList
+ * @listParam: A #WebKitDOMDOMStringList
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* list_param);
+webkit_dom_test_callback_callback_with_string_list(WebKitDOMTestCallback* self, WebKitDOMDOMStringList* listParam);
 
 /**
  * webkit_dom_test_callback_callback_with_boolean:
  * @self: A #WebKitDOMTestCallback
- * @bool_param: A #gboolean
+ * @boolParam: A #gboolean
  *
  * Returns:
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean bool_param);
+webkit_dom_test_callback_callback_with_boolean(WebKitDOMTestCallback* self, gboolean boolParam);
 
 G_END_DECLS
 
index 897d664..358da2d 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H
-#define WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H
+#ifndef WebKitDOMTestCallbackPrivate_h
+#define WebKitDOMTestCallbackPrivate_h
 
+#include "TestCallback.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestCallback.h"
-
 #if ENABLE(SQL_DATABASE)
 
 namespace WebKit {
-    WebKitDOMTestCallback *
-    wrapTestCallback(WebCore::TestCallback *coreObject);
-
-    WebCore::TestCallback *
-    core(WebKitDOMTestCallback *request);
-
-    WebKitDOMTestCallback*
-    kit(WebCore::TestCallback* node);
-
+WebKitDOMTestCallback* wrapTestCallback(WebCore::TestCallback*);
+WebCore::TestCallback* core(WebKitDOMTestCallback* request);
+WebKitDOMTestCallback* kit(WebCore::TestCallback* node);
 } // namespace WebKit
 
 #endif /* ENABLE(SQL_DATABASE) */
 
-#endif /* WEB_KIT_DOM_TEST_CALLBACK_PRIVATE_H */
+#endif /* WebKitDOMTestCallbackPrivate_h */
index 1fb627c..306baea 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestCustomNamedGetter.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestCustomNamedGetter.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestCustomNamedGetter.h"
 #include "webkit/WebKitDOMTestCustomNamedGetterPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -61,14 +61,11 @@ WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNam
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_CUSTOM_NAMED_GETTER(g_object_new(WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -82,38 +79,38 @@ enum {
 static void webkit_dom_test_custom_named_getter_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestCustomNamedGetter* coreObject = static_cast<WebCore::TestCustomNamedGetter*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_custom_named_getter_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_custom_named_getter_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -128,7 +125,7 @@ static void webkit_dom_test_custom_named_getter_constructed(GObject* object)
 
 static void webkit_dom_test_custom_named_getter_class_init(WebKitDOMTestCustomNamedGetterClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_custom_named_getter_finalize;
     gobjectClass->set_property = webkit_dom_test_custom_named_getter_set_property;
     gobjectClass->get_property = webkit_dom_test_custom_named_getter_get_property;
@@ -147,9 +144,9 @@ webkit_dom_test_custom_named_getter_another_function(WebKitDOMTestCustomNamedGet
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestCustomNamedGetter * item = WebKit::core(self);
+    WebCore::TestCustomNamedGetter* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->anotherFunction(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->anotherFunction(convertedStr);
 }
 
index 956a254..f016e3f 100644 (file)
 #ifndef WebKitDOMTestCustomNamedGetter_h
 #define WebKitDOMTestCustomNamedGetter_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_CUSTOM_NAMED_GETTER            (webkit_dom_test_custom_named_getter_get_type())
index 54835a4..2e882cd 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
-#define WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H
+#ifndef WebKitDOMTestCustomNamedGetterPrivate_h
+#define WebKitDOMTestCustomNamedGetterPrivate_h
 
+#include "TestCustomNamedGetter.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestCustomNamedGetter.h"
-
 
 namespace WebKit {
-    WebKitDOMTestCustomNamedGetter *
-    wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter *coreObject);
-
-    WebCore::TestCustomNamedGetter *
-    core(WebKitDOMTestCustomNamedGetter *request);
-
-    WebKitDOMTestCustomNamedGetter*
-    kit(WebCore::TestCustomNamedGetter* node);
-
+WebKitDOMTestCustomNamedGetter* wrapTestCustomNamedGetter(WebCore::TestCustomNamedGetter*);
+WebCore::TestCustomNamedGetter* core(WebKitDOMTestCustomNamedGetter* request);
+WebKitDOMTestCustomNamedGetter* kit(WebCore::TestCustomNamedGetter* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_CUSTOM_NAMED_GETTER_PRIVATE_H */
+#endif /* WebKitDOMTestCustomNamedGetterPrivate_h */
index 7f62362..8b3e980 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestEventConstructor.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestEventConstructor.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestEventConstructor.h"
 #include "webkit/WebKitDOMTestEventConstructorPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -61,14 +61,11 @@ WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstr
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -84,50 +81,48 @@ enum {
 static void webkit_dom_test_event_constructor_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestEventConstructor* coreObject = static_cast<WebCore::TestEventConstructor *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestEventConstructor* coreObject = static_cast<WebCore::TestEventConstructor*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_event_constructor_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_event_constructor_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_event_constructor_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestEventConstructor* self = WEBKIT_DOM_TEST_EVENT_CONSTRUCTOR(object);
     WebCore::TestEventConstructor* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_ATTR1:
-    {
+    switch (propertyId) {
+    case PROP_ATTR1: {
         g_value_take_string(value, convertToUTF8String(coreSelf->attr1()));
         break;
     }
-    case PROP_ATTR2:
-    {
+    case PROP_ATTR2: {
         g_value_take_string(value, convertToUTF8String(coreSelf->attr2()));
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -142,7 +137,7 @@ static void webkit_dom_test_event_constructor_constructed(GObject* object)
 
 static void webkit_dom_test_event_constructor_class_init(WebKitDOMTestEventConstructorClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_event_constructor_finalize;
     gobjectClass->set_property = webkit_dom_test_event_constructor_set_property;
     gobjectClass->get_property = webkit_dom_test_event_constructor_get_property;
@@ -175,9 +170,9 @@ webkit_dom_test_event_constructor_get_attr1(WebKitDOMTestEventConstructor* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestEventConstructor * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->attr1());
-    return res;
+    WebCore::TestEventConstructor* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->attr1());
+    return result;
 }
 
 gchar*
@@ -185,8 +180,8 @@ webkit_dom_test_event_constructor_get_attr2(WebKitDOMTestEventConstructor* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestEventConstructor * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->attr2());
-    return res;
+    WebCore::TestEventConstructor* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->attr2());
+    return result;
 }
 
index 2f337fb..c2f4055 100644 (file)
 #ifndef WebKitDOMTestEventConstructor_h
 #define WebKitDOMTestEventConstructor_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_EVENT_CONSTRUCTOR            (webkit_dom_test_event_constructor_get_type())
index 250abc5..e7fc018 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H
-#define WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H
+#ifndef WebKitDOMTestEventConstructorPrivate_h
+#define WebKitDOMTestEventConstructorPrivate_h
 
+#include "TestEventConstructor.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestEventConstructor.h"
-
 
 namespace WebKit {
-    WebKitDOMTestEventConstructor *
-    wrapTestEventConstructor(WebCore::TestEventConstructor *coreObject);
-
-    WebCore::TestEventConstructor *
-    core(WebKitDOMTestEventConstructor *request);
-
-    WebKitDOMTestEventConstructor*
-    kit(WebCore::TestEventConstructor* node);
-
+WebKitDOMTestEventConstructor* wrapTestEventConstructor(WebCore::TestEventConstructor*);
+WebCore::TestEventConstructor* core(WebKitDOMTestEventConstructor* request);
+WebKitDOMTestEventConstructor* kit(WebCore::TestEventConstructor* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_EVENT_CONSTRUCTOR_PRIVATE_H */
+#endif /* WebKitDOMTestEventConstructorPrivate_h */
index 1a2e5e3..0233cdf 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestEventTarget.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "GObjectEventListener.h"
 #include "webkit/WebKitDOMEventPrivate.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestEventTarget.h"
 #include "webkit/WebKitDOMTestEventTargetPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -69,14 +69,11 @@ WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget* coreObje
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_EVENT_TARGET(g_object_new(WEBKIT_TYPE_DOM_TEST_EVENT_TARGET, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -122,38 +119,38 @@ enum {
 static void webkit_dom_test_event_target_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestEventTarget* coreObject = static_cast<WebCore::TestEventTarget*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_event_target_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_event_target_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_target_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_event_target_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_event_target_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -168,7 +165,7 @@ static void webkit_dom_test_event_target_constructed(GObject* object)
 
 static void webkit_dom_test_event_target_class_init(WebKitDOMTestEventTargetClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_event_target_finalize;
     gobjectClass->set_property = webkit_dom_test_event_target_set_property;
     gobjectClass->get_property = webkit_dom_test_event_target_get_property;
@@ -187,30 +184,30 @@ webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestEventTarget * item = WebKit::core(self);
-    PassRefPtr<WebCore::Node> g_res = WTF::getPtr(item->item(index));
-    WebKitDOMNode* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestEventTarget* item = WebKit::core(self);
+    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(item->item(index));
+    WebKitDOMNode* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 gboolean
-webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError **error)
+webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestEventTarget * item = WebKit::core(self);
+    WebCore::TestEventTarget* item = WebKit::core(self);
     g_return_val_if_fail(evt, 0);
-    WebCore::Event * converted_evt = NULL;
-    if (evt != NULL) {
-        converted_evt = WebKit::core(evt);
-        g_return_val_if_fail(converted_evt, 0);
+    WebCore::Event* convertedEvt = 0;
+    if (evt) {
+        convertedEvt = WebKit::core(evt);
+        g_return_val_if_fail(convertedEvt, 0);
     }
     WebCore::ExceptionCode ec = 0;
-    gboolean res = item->dispatchEvent(converted_evt, ec);
+    gboolean result = item->dispatchEvent(convertedEvt, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    return res;
+    return result;
 }
 
index c10635b..80f9d52 100644 (file)
 #ifndef WebKitDOMTestEventTarget_h
 #define WebKitDOMTestEventTarget_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_EVENT_TARGET            (webkit_dom_test_event_target_get_type())
@@ -67,7 +66,7 @@ webkit_dom_test_event_target_item(WebKitDOMTestEventTarget* self, gulong index);
  *
 **/
 WEBKIT_API gboolean
-webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError **error);
+webkit_dom_test_event_target_dispatch_event(WebKitDOMTestEventTarget* self, WebKitDOMEvent* evt, GError** error);
 
 G_END_DECLS
 
index 0908ce1..1cac5f7 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H
-#define WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H
+#ifndef WebKitDOMTestEventTargetPrivate_h
+#define WebKitDOMTestEventTargetPrivate_h
 
+#include "TestEventTarget.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestEventTarget.h"
-
 
 namespace WebKit {
-    WebKitDOMTestEventTarget *
-    wrapTestEventTarget(WebCore::TestEventTarget *coreObject);
-
-    WebCore::TestEventTarget *
-    core(WebKitDOMTestEventTarget *request);
-
-    WebKitDOMTestEventTarget*
-    kit(WebCore::TestEventTarget* node);
-
+WebKitDOMTestEventTarget* wrapTestEventTarget(WebCore::TestEventTarget*);
+WebCore::TestEventTarget* core(WebKitDOMTestEventTarget* request);
+WebKitDOMTestEventTarget* kit(WebCore::TestEventTarget* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_EVENT_TARGET_PRIVATE_H */
+#endif /* WebKitDOMTestEventTargetPrivate_h */
index 082f8f2..01ab2b3 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestInterface.h"
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "gobject/ConvertToUTF8String.h"
 #include "webkit/WebKitDOMNode.h"
 #include "webkit/WebKitDOMNodePrivate.h"
-#include "webkit/WebKitDOMTestInterface.h"
 #include "webkit/WebKitDOMTestInterfacePrivate.h"
 #include "webkit/WebKitDOMTestObj.h"
 #include "webkit/WebKitDOMTestObjPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
-
-#if ENABLE(Condition1) || ENABLE(Condition2)
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -70,14 +70,11 @@ WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface* coreObject)
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_INTERFACE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -102,71 +99,67 @@ enum {
 static void webkit_dom_test_interface_finalize(GObject* object)
 {
 #if ENABLE(Condition1) || ENABLE(Condition2)
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestInterface* coreObject = static_cast<WebCore::TestInterface*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 #endif // ENABLE(Condition1) || ENABLE(Condition2)
 
     G_OBJECT_CLASS(webkit_dom_test_interface_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_interface_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
     WebCore::TestInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
+    switch (propertyId) {
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR2:
-    {
+    case PROP_SUPPLEMENTAL_STR2: {
         WebCore::TestSupplemental::setSupplementalStr2(coreSelf, WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_interface_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestInterface* self = WEBKIT_DOM_TEST_INTERFACE(object);
     WebCore::TestInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
+    switch (propertyId) {
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR1:
-    {
+    case PROP_SUPPLEMENTAL_STR1: {
         g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(coreSelf)));
         break;
     }
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_STR2:
-    {
+    case PROP_SUPPLEMENTAL_STR2: {
         g_value_take_string(value, convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(coreSelf)));
         break;
     }
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #if ENABLE(Condition11) || ENABLE(Condition12)
-    case PROP_SUPPLEMENTAL_NODE:
-    {
+    case PROP_SUPPLEMENTAL_NODE: {
         RefPtr<WebCore::Node> ptr = WebCore::TestSupplemental::supplementalNode(coreSelf);
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -181,7 +174,7 @@ static void webkit_dom_test_interface_constructed(GObject* object)
 
 static void webkit_dom_test_interface_class_init(WebKitDOMTestInterfaceClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_interface_finalize;
     gobjectClass->set_property = webkit_dom_test_interface_set_property;
     gobjectClass->get_property = webkit_dom_test_interface_get_property;
@@ -229,7 +222,7 @@ webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
+    WebCore::TestInterface* item = WebKit::core(self);
     WebCore::TestSupplemental::supplementalMethod1(item);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
@@ -242,38 +235,38 @@ webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self)
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error)
+webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error)
 {
 #if ENABLE(Condition1) || ENABLE(Condition2)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestInterface* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(item, converted_str_arg, converted_obj_arg, ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalMethod2(item, convertedStrArg, convertedObjArg, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -284,7 +277,7 @@ webkit_dom_test_interface_supplemental_method4(WebKitDOMTestInterface* self)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
+    WebCore::TestInterface* item = WebKit::core(self);
     WebCore::TestSupplemental::supplementalMethod4(item);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
@@ -303,18 +296,18 @@ webkit_dom_test_interface_get_supplemental_str1(WebKitDOMTestInterface* self)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(item));
-    return res;
+    WebCore::TestInterface* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(WebCore::TestSupplemental::supplementalStr1(item));
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -325,18 +318,18 @@ webkit_dom_test_interface_get_supplemental_str2(WebKitDOMTestInterface* self)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(item));
-    return res;
+    WebCore::TestInterface* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(WebCore::TestSupplemental::supplementalStr2(item));
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -347,10 +340,10 @@ webkit_dom_test_interface_set_supplemental_str2(WebKitDOMTestInterface* self, co
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
+    WebCore::TestInterface* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    WebCore::TestSupplemental::setSupplementalStr2(item, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    WebCore::TestSupplemental::setSupplementalStr2(item, convertedValue);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
@@ -368,19 +361,19 @@ webkit_dom_test_interface_get_supplemental_node(WebKitDOMTestInterface* self)
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::Node> g_res = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(item));
-    WebKitDOMNode* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestInterface* item = WebKit::core(self);
+    RefPtr<WebCore::Node> gobjectResult = WTF::getPtr(WebCore::TestSupplemental::supplementalNode(item));
+    WebKitDOMNode* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition11) || ENABLE(Condition12) */
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -391,14 +384,14 @@ webkit_dom_test_interface_set_supplemental_node(WebKitDOMTestInterface* self, We
 #if ENABLE(Condition11) || ENABLE(Condition12)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestInterface * item = WebKit::core(self);
+    WebCore::TestInterface* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::Node * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::Node* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    WebCore::TestSupplemental::setSupplementalNode(item, converted_value);
+    WebCore::TestSupplemental::setSupplementalNode(item, convertedValue);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition11")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition12")
index 0b68892..c5461e9 100644 (file)
 #ifndef WebKitDOMTestInterface_h
 #define WebKitDOMTestInterface_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_INTERFACE            (webkit_dom_test_interface_get_type())
@@ -59,15 +58,15 @@ webkit_dom_test_interface_supplemental_method1(WebKitDOMTestInterface* self);
 /**
  * webkit_dom_test_interface_supplemental_method2:
  * @self: A #WebKitDOMTestInterface
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  * @error: #GError
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error);
+webkit_dom_test_interface_supplemental_method2(WebKitDOMTestInterface* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
 
 /**
  * webkit_dom_test_interface_supplemental_method4:
index 1020e02..12a6c77 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H
-#define WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H
+#ifndef WebKitDOMTestInterfacePrivate_h
+#define WebKitDOMTestInterfacePrivate_h
 
+#include "TestInterface.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestInterface.h"
-
 #if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
-    WebKitDOMTestInterface *
-    wrapTestInterface(WebCore::TestInterface *coreObject);
-
-    WebCore::TestInterface *
-    core(WebKitDOMTestInterface *request);
-
-    WebKitDOMTestInterface*
-    kit(WebCore::TestInterface* node);
-
+WebKitDOMTestInterface* wrapTestInterface(WebCore::TestInterface*);
+WebCore::TestInterface* core(WebKitDOMTestInterface* request);
+WebKitDOMTestInterface* kit(WebCore::TestInterface* node);
 } // namespace WebKit
 
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 
-#endif /* WEB_KIT_DOM_TEST_INTERFACE_PRIVATE_H */
+#endif /* WebKitDOMTestInterfacePrivate_h */
index b516863..b5cbdff 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestMediaQueryListListener.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestMediaQueryListListener.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestMediaQueryListListener.h"
 #include "webkit/WebKitDOMTestMediaQueryListListenerPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -61,14 +61,11 @@ WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::Tes
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER(g_object_new(WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -82,38 +79,38 @@ enum {
 static void webkit_dom_test_media_query_list_listener_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestMediaQueryListListener* coreObject = static_cast<WebCore::TestMediaQueryListListener *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestMediaQueryListListener* coreObject = static_cast<WebCore::TestMediaQueryListListener*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_media_query_list_listener_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_media_query_list_listener_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_media_query_list_listener_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_media_query_list_listener_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_media_query_list_listener_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -128,7 +125,7 @@ static void webkit_dom_test_media_query_list_listener_constructed(GObject* objec
 
 static void webkit_dom_test_media_query_list_listener_class_init(WebKitDOMTestMediaQueryListListenerClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_media_query_list_listener_finalize;
     gobjectClass->set_property = webkit_dom_test_media_query_list_listener_set_property;
     gobjectClass->get_property = webkit_dom_test_media_query_list_listener_get_property;
index 612439b..9061127 100644 (file)
 #ifndef WebKitDOMTestMediaQueryListListener_h
 #define WebKitDOMTestMediaQueryListListener_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_MEDIA_QUERY_LIST_LISTENER            (webkit_dom_test_media_query_list_listener_get_type())
index ac27088..5562a4f 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H
-#define WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H
+#ifndef WebKitDOMTestMediaQueryListListenerPrivate_h
+#define WebKitDOMTestMediaQueryListListenerPrivate_h
 
+#include "TestMediaQueryListListener.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestMediaQueryListListener.h"
-
 
 namespace WebKit {
-    WebKitDOMTestMediaQueryListListener *
-    wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener *coreObject);
-
-    WebCore::TestMediaQueryListListener *
-    core(WebKitDOMTestMediaQueryListListener *request);
-
-    WebKitDOMTestMediaQueryListListener*
-    kit(WebCore::TestMediaQueryListListener* node);
-
+WebKitDOMTestMediaQueryListListener* wrapTestMediaQueryListListener(WebCore::TestMediaQueryListListener*);
+WebCore::TestMediaQueryListListener* core(WebKitDOMTestMediaQueryListListener* request);
+WebKitDOMTestMediaQueryListListener* kit(WebCore::TestMediaQueryListListener* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_MEDIA_QUERY_LIST_LISTENER_PRIVATE_H */
+#endif /* WebKitDOMTestMediaQueryListListenerPrivate_h */
index efd528f..bba7b73 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestNamedConstructor.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "TestNamedConstructor.h"
 #include "WebKitDOMBinding.h"
 #include "gobject/ConvertToUTF8String.h"
-#include "webkit/WebKitDOMTestNamedConstructor.h"
 #include "webkit/WebKitDOMTestNamedConstructorPrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -61,14 +61,11 @@ WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstr
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_NAMED_CONSTRUCTOR(g_object_new(WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -82,38 +79,38 @@ enum {
 static void webkit_dom_test_named_constructor_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestNamedConstructor* coreObject = static_cast<WebCore::TestNamedConstructor *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestNamedConstructor* coreObject = static_cast<WebCore::TestNamedConstructor*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_named_constructor_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_named_constructor_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_named_constructor_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_named_constructor_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_named_constructor_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -128,7 +125,7 @@ static void webkit_dom_test_named_constructor_constructed(GObject* object)
 
 static void webkit_dom_test_named_constructor_class_init(WebKitDOMTestNamedConstructorClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_named_constructor_finalize;
     gobjectClass->set_property = webkit_dom_test_named_constructor_set_property;
     gobjectClass->get_property = webkit_dom_test_named_constructor_get_property;
index b0f9c27..cc05bef 100644 (file)
 #ifndef WebKitDOMTestNamedConstructor_h
 #define WebKitDOMTestNamedConstructor_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_NAMED_CONSTRUCTOR            (webkit_dom_test_named_constructor_get_type())
index 5bad70b..dc7344d 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H
-#define WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H
+#ifndef WebKitDOMTestNamedConstructorPrivate_h
+#define WebKitDOMTestNamedConstructorPrivate_h
 
+#include "TestNamedConstructor.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestNamedConstructor.h"
-
 
 namespace WebKit {
-    WebKitDOMTestNamedConstructor *
-    wrapTestNamedConstructor(WebCore::TestNamedConstructor *coreObject);
-
-    WebCore::TestNamedConstructor *
-    core(WebKitDOMTestNamedConstructor *request);
-
-    WebKitDOMTestNamedConstructor*
-    kit(WebCore::TestNamedConstructor* node);
-
+WebKitDOMTestNamedConstructor* wrapTestNamedConstructor(WebCore::TestNamedConstructor*);
+WebCore::TestNamedConstructor* core(WebKitDOMTestNamedConstructor* request);
+WebKitDOMTestNamedConstructor* kit(WebCore::TestNamedConstructor* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_NAMED_CONSTRUCTOR_PRIVATE_H */
+#endif /* WebKitDOMTestNamedConstructorPrivate_h */
index ca42d38..1dc94ff 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestObj.h"
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "Document.h"
 #include "ExceptionCode.h"
@@ -43,7 +41,6 @@
 #include "webkit/WebKitDOMSVGPointPrivate.h"
 #include "webkit/WebKitDOMSerializedScriptValue.h"
 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
-#include "webkit/WebKitDOMTestObj.h"
 #include "webkit/WebKitDOMTestObjPrivate.h"
 #include "webkit/WebKitDOMa.h"
 #include "webkit/WebKitDOMaPrivate.h"
@@ -60,6 +57,9 @@
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -87,14 +87,11 @@ WebKitDOMTestObj* wrapTestObj(WebCore::TestObj* coreObject)
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_OBJ(g_object_new(WEBKIT_TYPE_DOM_TEST_OBJ, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -158,416 +155,348 @@ enum {
 static void webkit_dom_test_obj_finalize(GObject* object)
 {
 
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestObj* coreObject = static_cast<WebCore::TestObj *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestObj* coreObject = static_cast<WebCore::TestObj*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 
 
     G_OBJECT_CLASS(webkit_dom_test_obj_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_obj_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_obj_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
     WebCore::TestObj* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_UNSIGNED_SHORT_ATTR:
-    {
+    switch (propertyId) {
+    case PROP_UNSIGNED_SHORT_ATTR: {
         coreSelf->setUnsignedShortAttr((g_value_get_uint(value)));
         break;
     }
-    case PROP_INT_ATTR:
-    {
+    case PROP_INT_ATTR: {
         coreSelf->setIntAttr((g_value_get_long(value)));
         break;
     }
-    case PROP_UNSIGNED_LONG_LONG_ATTR:
-    {
+    case PROP_UNSIGNED_LONG_LONG_ATTR: {
         coreSelf->setUnsignedLongLongAttr((g_value_get_uint64(value)));
         break;
     }
-    case PROP_STRING_ATTR:
-    {
+    case PROP_STRING_ATTR: {
         coreSelf->setStringAttr(WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_CREATE:
-    {
+    case PROP_CREATE: {
         coreSelf->setCreate((g_value_get_boolean(value)));
         break;
     }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
+    case PROP_REFLECTED_STRING_ATTR: {
         coreSelf->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_REFLECTED_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_INTEGRAL_ATTR: {
         coreSelf->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, (g_value_get_long(value)));
         break;
     }
-    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
         coreSelf->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, (g_value_get_ulong(value)));
         break;
     }
-    case PROP_REFLECTED_BOOLEAN_ATTR:
-    {
+    case PROP_REFLECTED_BOOLEAN_ATTR: {
         coreSelf->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, (g_value_get_boolean(value)));
         break;
     }
-    case PROP_REFLECTED_URL_ATTR:
-    {
+    case PROP_REFLECTED_URL_ATTR: {
         coreSelf->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
+    case PROP_REFLECTED_STRING_ATTR: {
         coreSelf->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
         coreSelf->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, (g_value_get_long(value)));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
         coreSelf->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, (g_value_get_boolean(value)));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_URL_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_URL_ATTR: {
         coreSelf->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, WTF::String::fromUTF8(g_value_get_string(value)));
         break;
     }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
-    {
+    case PROP_ATTR_WITH_GETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         coreSelf->setAttrWithGetterException((g_value_get_long(value)), ec);
         break;
     }
-    case PROP_ATTR_WITH_SETTER_EXCEPTION:
-    {
+    case PROP_ATTR_WITH_SETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         coreSelf->setAttrWithSetterException((g_value_get_long(value)), ec);
         break;
     }
-    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
-    {
+    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         coreSelf->setStringAttrWithGetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
         break;
     }
-    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
-    {
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         coreSelf->setStringAttrWithSetterException(WTF::String::fromUTF8(g_value_get_string(value)), ec);
         break;
     }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
         coreSelf->setWithScriptStateAttribute((g_value_get_long(value)));
         break;
     }
 #if ENABLE(Condition1)
-    case PROP_CONDITIONAL_ATTR1:
-    {
+    case PROP_CONDITIONAL_ATTR1: {
         coreSelf->setConditionalAttr1((g_value_get_long(value)));
         break;
     }
 #endif /* ENABLE(Condition1) */
 #if ENABLE(Condition1) && ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR2:
-    {
+    case PROP_CONDITIONAL_ATTR2: {
         coreSelf->setConditionalAttr2((g_value_get_long(value)));
         break;
     }
 #endif /* ENABLE(Condition1) && ENABLE(Condition2) */
 #if ENABLE(Condition1) || ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR3:
-    {
+    case PROP_CONDITIONAL_ATTR3: {
         coreSelf->setConditionalAttr3((g_value_get_long(value)));
         break;
     }
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    case PROP_STRICT_FLOAT:
-    {
+    case PROP_STRICT_FLOAT: {
         coreSelf->setStrictFloat((g_value_get_float(value)));
         break;
     }
-    case PROP_ID:
-    {
+    case PROP_ID: {
         coreSelf->setId((g_value_get_long(value)));
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_obj_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_obj_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestObj* self = WEBKIT_DOM_TEST_OBJ(object);
     WebCore::TestObj* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_READ_ONLY_INT_ATTR:
-    {
+    switch (propertyId) {
+    case PROP_READ_ONLY_INT_ATTR: {
         g_value_set_long(value, coreSelf->readOnlyIntAttr());
         break;
     }
-    case PROP_READ_ONLY_STRING_ATTR:
-    {
+    case PROP_READ_ONLY_STRING_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->readOnlyStringAttr()));
         break;
     }
-    case PROP_READ_ONLY_TEST_OBJ_ATTR:
-    {
+    case PROP_READ_ONLY_TEST_OBJ_ATTR: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->readOnlyTestObjAttr();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_SHORT_ATTR:
-    {
+    case PROP_SHORT_ATTR: {
         g_value_set_int(value, coreSelf->shortAttr());
         break;
     }
-    case PROP_UNSIGNED_SHORT_ATTR:
-    {
+    case PROP_UNSIGNED_SHORT_ATTR: {
         g_value_set_uint(value, coreSelf->unsignedShortAttr());
         break;
     }
-    case PROP_INT_ATTR:
-    {
+    case PROP_INT_ATTR: {
         g_value_set_long(value, coreSelf->intAttr());
         break;
     }
-    case PROP_LONG_LONG_ATTR:
-    {
+    case PROP_LONG_LONG_ATTR: {
         g_value_set_int64(value, coreSelf->longLongAttr());
         break;
     }
-    case PROP_UNSIGNED_LONG_LONG_ATTR:
-    {
+    case PROP_UNSIGNED_LONG_LONG_ATTR: {
         g_value_set_uint64(value, coreSelf->unsignedLongLongAttr());
         break;
     }
-    case PROP_STRING_ATTR:
-    {
+    case PROP_STRING_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->stringAttr()));
         break;
     }
-    case PROP_TEST_OBJ_ATTR:
-    {
+    case PROP_TEST_OBJ_ATTR: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->testObjAttr();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_XML_OBJ_ATTR:
-    {
+    case PROP_XML_OBJ_ATTR: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->xmlObjAttr();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_CREATE:
-    {
+    case PROP_CREATE: {
         g_value_set_boolean(value, coreSelf->isCreate());
         break;
     }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
+    case PROP_REFLECTED_STRING_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr)));
         break;
     }
-    case PROP_REFLECTED_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_INTEGRAL_ATTR: {
         g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr));
         break;
     }
-    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_UNSIGNED_INTEGRAL_ATTR: {
         g_value_set_ulong(value, coreSelf->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr));
         break;
     }
-    case PROP_REFLECTED_BOOLEAN_ATTR:
-    {
+    case PROP_REFLECTED_BOOLEAN_ATTR: {
         g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr));
         break;
     }
-    case PROP_REFLECTED_URL_ATTR:
-    {
+    case PROP_REFLECTED_URL_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr)));
         break;
     }
-    case PROP_REFLECTED_STRING_ATTR:
-    {
+    case PROP_REFLECTED_STRING_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr)));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_INTEGRAL_ATTR: {
         g_value_set_long(value, coreSelf->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_BOOLEAN_ATTR: {
         g_value_set_boolean(value, coreSelf->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr));
         break;
     }
-    case PROP_REFLECTED_CUSTOM_URL_ATTR:
-    {
+    case PROP_REFLECTED_CUSTOM_URL_ATTR: {
         g_value_take_string(value, convertToUTF8String(coreSelf->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr)));
         break;
     }
-    case PROP_ATTR_WITH_GETTER_EXCEPTION:
-    {
+    case PROP_ATTR_WITH_GETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         g_value_set_long(value, coreSelf->attrWithGetterException(ec));
         break;
     }
-    case PROP_ATTR_WITH_SETTER_EXCEPTION:
-    {
+    case PROP_ATTR_WITH_SETTER_EXCEPTION: {
         g_value_set_long(value, coreSelf->attrWithSetterException());
         break;
     }
-    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION:
-    {
+    case PROP_STRING_ATTR_WITH_GETTER_EXCEPTION: {
         WebCore::ExceptionCode ec = 0;
         g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithGetterException(ec)));
         break;
     }
-    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION:
-    {
+    case PROP_STRING_ATTR_WITH_SETTER_EXCEPTION: {
         g_value_take_string(value, convertToUTF8String(coreSelf->stringAttrWithSetterException()));
         break;
     }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE: {
         g_value_set_long(value, coreSelf->withScriptStateAttribute());
         break;
     }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttribute();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES:
-    {
+    case PROP_WITH_SCRIPT_STATE_ATTRIBUTE_RAISES: {
         WebCore::ExceptionCode ec = 0;
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptStateAttributeRaises(ec);
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES:
-    {
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_ATTRIBUTE_RAISES: {
         WebCore::ExceptionCode ec = 0;
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAttributeRaises(ec);
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttribute();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES:
-    {
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_ATTRIBUTE_RAISES: {
         WebCore::ExceptionCode ec = 0;
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateAttributeRaises(ec);
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_EXECUTION_CONTEXT_AND_SCRIPT_STATE_WITH_SPACES_ATTRIBUTE: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptExecutionContextAndScriptStateWithSpacesAttribute();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE:
-    {
+    case PROP_WITH_SCRIPT_ARGUMENTS_AND_CALL_STACK_ATTRIBUTE: {
         RefPtr<WebCore::TestObj> ptr = coreSelf->withScriptArgumentsAndCallStackAttribute();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
 #if ENABLE(Condition1)
-    case PROP_CONDITIONAL_ATTR1:
-    {
+    case PROP_CONDITIONAL_ATTR1: {
         g_value_set_long(value, coreSelf->conditionalAttr1());
         break;
     }
 #endif /* ENABLE(Condition1) */
 #if ENABLE(Condition1) && ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR2:
-    {
+    case PROP_CONDITIONAL_ATTR2: {
         g_value_set_long(value, coreSelf->conditionalAttr2());
         break;
     }
 #endif /* ENABLE(Condition1) && ENABLE(Condition2) */
 #if ENABLE(Condition1) || ENABLE(Condition2)
-    case PROP_CONDITIONAL_ATTR3:
-    {
+    case PROP_CONDITIONAL_ATTR3: {
         g_value_set_long(value, coreSelf->conditionalAttr3());
         break;
     }
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
-    case PROP_CONTENT_DOCUMENT:
-    {
+    case PROP_CONTENT_DOCUMENT: {
         RefPtr<WebCore::Document> ptr = coreSelf->contentDocument();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_MUTABLE_POINT:
-    {
+    case PROP_MUTABLE_POINT: {
         RefPtr<WebCore::SVGPoint> ptr = coreSelf->mutablePoint();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_IMMUTABLE_POINT:
-    {
+    case PROP_IMMUTABLE_POINT: {
         RefPtr<WebCore::SVGPoint> ptr = coreSelf->immutablePoint();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_STRAWBERRY:
-    {
+    case PROP_STRAWBERRY: {
         g_value_set_int(value, coreSelf->blueberry());
         break;
     }
-    case PROP_STRICT_FLOAT:
-    {
+    case PROP_STRICT_FLOAT: {
         g_value_set_float(value, coreSelf->strictFloat());
         break;
     }
-    case PROP_DESCRIPTION:
-    {
+    case PROP_DESCRIPTION: {
         g_value_set_long(value, coreSelf->description());
         break;
     }
-    case PROP_ID:
-    {
+    case PROP_ID: {
         g_value_set_long(value, coreSelf->id());
         break;
     }
-    case PROP_HASH:
-    {
+    case PROP_HASH: {
         g_value_take_string(value, convertToUTF8String(coreSelf->hash()));
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -582,7 +511,7 @@ static void webkit_dom_test_obj_constructed(GObject* object)
 
 static void webkit_dom_test_obj_class_init(WebKitDOMTestObjClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_obj_finalize;
     gobjectClass->set_property = webkit_dom_test_obj_set_property;
     gobjectClass->get_property = webkit_dom_test_obj_get_property;
@@ -953,25 +882,25 @@ webkit_dom_test_obj_void_method(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->voidMethod();
 }
 
 void
-webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail(str_arg);
-    g_return_if_fail(obj_arg);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_if_fail(converted_obj_arg);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_if_fail(strArg);
+    g_return_if_fail(objArg);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_if_fail(convertedObjArg);
     }
-    item->voidMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
+    item->voidMethodWithArgs(intArg, convertedStrArg, convertedObjArg);
 }
 
 glong
@@ -979,27 +908,27 @@ webkit_dom_test_obj_int_method(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->intMethod();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->intMethod();
+    return result;
 }
 
 glong
-webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
-    glong res = item->intMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg);
-    return res;
+    glong result = item->intMethodWithArgs(intArg, convertedStrArg, convertedObjArg);
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -1007,68 +936,68 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethod());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethod());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg)
+webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->objMethodWithArgs(int_arg, converted_str_arg, converted_obj_arg));
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->objMethodWithArgs(intArg, convertedStrArg, convertedObjArg));
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error)
+webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_val_if_fail(str_arg, 0);
-    g_return_val_if_fail(obj_arg, 0);
-    WTF::String converted_str_arg = WTF::String::fromUTF8(str_arg);
-    WebCore::TestObj * converted_obj_arg = NULL;
-    if (obj_arg != NULL) {
-        converted_obj_arg = WebKit::core(obj_arg);
-        g_return_val_if_fail(converted_obj_arg, 0);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_val_if_fail(strArg, 0);
+    g_return_val_if_fail(objArg, 0);
+    WTF::String convertedStrArg = WTF::String::fromUTF8(strArg);
+    WebCore::TestObj* convertedObjArg = 0;
+    if (objArg) {
+        convertedObjArg = WebKit::core(objArg);
+        g_return_val_if_fail(convertedObjArg, 0);
     }
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(converted_str_arg, converted_obj_arg, ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->methodThatRequiresAllArgsAndThrows(convertedStrArg, convertedObjArg, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg)
+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    g_return_if_fail(serialized_arg);
-    WebCore::SerializedScriptValue * converted_serialized_arg = NULL;
-    if (serialized_arg != NULL) {
-        converted_serialized_arg = WebKit::core(serialized_arg);
-        g_return_if_fail(converted_serialized_arg);
+    WebCore::TestObj* item = WebKit::core(self);
+    g_return_if_fail(serializedArg);
+    WebCore::SerializedScriptValue* convertedSerializedArg = 0;
+    if (serializedArg) {
+        convertedSerializedArg = WebKit::core(serializedArg);
+        g_return_if_fail(convertedSerializedArg);
     }
-    item->serializedValue(converted_serialized_arg);
+    item->serializedValue(convertedSerializedArg);
 }
 
 void
@@ -1076,14 +1005,14 @@ webkit_dom_test_obj_idb_key(WebKitDOMTestObj* self, WebKitDOMIDBKey* key)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(key);
-    WebCore::IDBKey * converted_key = NULL;
-    if (key != NULL) {
-        converted_key = WebKit::core(key);
-        g_return_if_fail(converted_key);
+    WebCore::IDBKey* convertedKey = 0;
+    if (key) {
+        convertedKey = WebKit::core(key);
+        g_return_if_fail(convertedKey);
     }
-    item->idbKey(converted_key);
+    item->idbKey(convertedKey);
 }
 
 void
@@ -1091,28 +1020,28 @@ webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(oo);
     g_return_if_fail(ooo);
-    WebCore::Dictionary * converted_oo = NULL;
-    if (oo != NULL) {
-        converted_oo = WebKit::core(oo);
-        g_return_if_fail(converted_oo);
+    WebCore::Dictionary* convertedOo = 0;
+    if (oo) {
+        convertedOo = WebKit::core(oo);
+        g_return_if_fail(convertedOo);
     }
-    WebCore::Dictionary * converted_ooo = NULL;
-    if (ooo != NULL) {
-        converted_ooo = WebKit::core(ooo);
-        g_return_if_fail(converted_ooo);
+    WebCore::Dictionary* convertedOoo = 0;
+    if (ooo) {
+        convertedOoo = WebKit::core(ooo);
+        g_return_if_fail(convertedOoo);
     }
-    item->optionsObject(converted_oo, converted_ooo);
+    item->optionsObject(convertedOo, convertedOoo);
 }
 
 void
-webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->methodWithException(ec);
     if (ec) {
@@ -1126,7 +1055,7 @@ webkit_dom_test_obj_with_script_state_void(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptStateVoid();
 }
 
@@ -1135,18 +1064,18 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObj());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateObj());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->withScriptStateVoidException(ec);
     if (ec) {
@@ -1156,19 +1085,19 @@ webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GEr
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateObjException(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateObjException(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1176,7 +1105,7 @@ webkit_dom_test_obj_with_script_execution_context(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptExecutionContext();
 }
 
@@ -1185,24 +1114,24 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state(WebKitDOMTest
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->withScriptExecutionContextAndScriptState();
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateObjException(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateObjException(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -1210,10 +1139,10 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state_with_spaces(W
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpaces());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpaces());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1221,26 +1150,26 @@ webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->methodWithOptionalArg(opt);
 }
 
 void
-webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt)
+webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong nonOpt, glong opt)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    item->methodWithNonOptionalArgAndOptionalArg(non_opt, opt);
+    WebCore::TestObj* item = WebKit::core(self);
+    item->methodWithNonOptionalArgAndOptionalArg(nonOpt, opt);
 }
 
 void
-webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2)
+webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong nonOpt, glong opt1, glong opt2)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    item->methodWithNonOptionalArgAndTwoOptionalArgs(non_opt, opt1, opt2);
+    WebCore::TestObj* item = WebKit::core(self);
+    item->methodWithNonOptionalArgAndTwoOptionalArgs(nonOpt, opt1, opt2);
 }
 
 void
@@ -1248,10 +1177,10 @@ webkit_dom_test_obj_method_with_optional_string(WebKitDOMTestObj* self, const gc
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalString(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalString(convertedStr);
 }
 
 void
@@ -1259,10 +1188,10 @@ webkit_dom_test_obj_method_with_optional_string_is_undefined(WebKitDOMTestObj* s
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalStringIsUndefined(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalStringIsUndefined(convertedStr);
 }
 
 void
@@ -1270,10 +1199,10 @@ webkit_dom_test_obj_method_with_optional_string_is_null_string(WebKitDOMTestObj*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(str);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
-    item->methodWithOptionalStringIsNullString(converted_str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
+    item->methodWithOptionalStringIsNullString(convertedStr);
 }
 
 gchar*
@@ -1282,12 +1211,12 @@ webkit_dom_test_obj_conditional_method1(WebKitDOMTestObj* self)
 #if ENABLE(Condition1)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->conditionalMethod1());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->conditionalMethod1());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) */
 }
 
@@ -1297,7 +1226,7 @@ webkit_dom_test_obj_conditional_method2(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->conditionalMethod2();
 #else
 #if !ENABLE(Condition1)
@@ -1315,7 +1244,7 @@ webkit_dom_test_obj_conditional_method3(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->conditionalMethod3();
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -1328,7 +1257,7 @@ webkit_dom_test_obj_class_method(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->classMethod();
 }
 
@@ -1337,9 +1266,9 @@ webkit_dom_test_obj_class_method_with_optional(WebKitDOMTestObj* self, glong arg
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->classMethodWithOptional(arg);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->classMethodWithOptional(arg);
+    return result;
 }
 
 void
@@ -1348,7 +1277,7 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, glong arg)
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->overloadedMethod1(arg);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -1361,10 +1290,10 @@ webkit_dom_test_obj_overloaded_method1(WebKitDOMTestObj* self, const gchar* type
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(type);
-    WTF::String converted_type = WTF::String::fromUTF8(type);
-    item->overloadedMethod1(converted_type);
+    WTF::String convertedType = WTF::String::fromUTF8(type);
+    item->overloadedMethod1(convertedType);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
 #endif /* ENABLE(Condition1) */
@@ -1375,14 +1304,14 @@ webkit_dom_test_obj_convert1(WebKitDOMTestObj* self, WebKitDOMa* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::a * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::a* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert1(converted_);
+    item->convert1(converted);
 }
 
 void
@@ -1390,14 +1319,14 @@ webkit_dom_test_obj_convert2(WebKitDOMTestObj* self, WebKitDOMb* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::b * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::b* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert2(converted_);
+    item->convert2(converted);
 }
 
 void
@@ -1405,14 +1334,14 @@ webkit_dom_test_obj_convert3(WebKitDOMTestObj* self, WebKitDOMc* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::c * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::c* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert3(converted_);
+    item->convert3(converted);
 }
 
 void
@@ -1420,14 +1349,14 @@ webkit_dom_test_obj_convert4(WebKitDOMTestObj* self, WebKitDOMd* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::d * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::d* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert4(converted_);
+    item->convert4(converted);
 }
 
 void
@@ -1435,14 +1364,14 @@ webkit_dom_test_obj_convert5(WebKitDOMTestObj* self, WebKitDOMe* )
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail();
-    WebCore::e * converted_ = NULL;
-    if ( != NULL) {
-        converted_ = WebKit::core();
-        g_return_if_fail(converted_);
+    WebCore::e* converted = 0;
+    if () {
+        converted = WebKit::core();
+        g_return_if_fail(converted);
     }
-    item->convert5(converted_);
+    item->convert5(converted);
 }
 
 WebKitDOMSVGPoint*
@@ -1450,10 +1379,10 @@ webkit_dom_test_obj_mutable_point_function(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->mutablePointFunction());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->mutablePointFunction());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMSVGPoint*
@@ -1461,10 +1390,10 @@ webkit_dom_test_obj_immutable_point_function(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->immutablePointFunction());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->immutablePointFunction());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1472,26 +1401,26 @@ webkit_dom_test_obj_orange(WebKitDOMTestObj* self)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->orange();
 }
 
 WebKitDOMbool*
-webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError **error)
+webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_val_if_fail(str, 0);
-    WTF::String converted_str = WTF::String::fromUTF8(str);
+    WTF::String convertedStr = WTF::String::fromUTF8(str);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::bool> g_res = WTF::getPtr(item->strictFunction(converted_str, a, b, ec));
+    RefPtr<WebCore::bool> gobjectResult = WTF::getPtr(item->strictFunction(convertedStr, a, b, ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMbool* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMbool* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 glong
@@ -1499,9 +1428,9 @@ webkit_dom_test_obj_get_read_only_int_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->readOnlyIntAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->readOnlyIntAttr();
+    return result;
 }
 
 gchar*
@@ -1509,9 +1438,9 @@ webkit_dom_test_obj_get_read_only_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->readOnlyStringAttr());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->readOnlyStringAttr());
+    return result;
 }
 
 WebKitDOMTestObj*
@@ -1519,10 +1448,10 @@ webkit_dom_test_obj_get_read_only_test_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->readOnlyTestObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->readOnlyTestObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 gshort
@@ -1530,9 +1459,9 @@ webkit_dom_test_obj_get_short_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gshort res = item->shortAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gshort result = item->shortAttr();
+    return result;
 }
 
 void
@@ -1540,7 +1469,7 @@ webkit_dom_test_obj_set_short_attr(WebKitDOMTestObj* self, gshort value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setShortAttr(value);
 }
 
@@ -1549,9 +1478,9 @@ webkit_dom_test_obj_get_unsigned_short_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gushort res = item->unsignedShortAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gushort result = item->unsignedShortAttr();
+    return result;
 }
 
 void
@@ -1559,7 +1488,7 @@ webkit_dom_test_obj_set_unsigned_short_attr(WebKitDOMTestObj* self, gushort valu
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedShortAttr(value);
 }
 
@@ -1568,9 +1497,9 @@ webkit_dom_test_obj_get_int_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->intAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->intAttr();
+    return result;
 }
 
 void
@@ -1578,7 +1507,7 @@ webkit_dom_test_obj_set_int_attr(WebKitDOMTestObj* self, glong value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntAttr(value);
 }
 
@@ -1587,9 +1516,9 @@ webkit_dom_test_obj_get_long_long_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gint64 res = item->longLongAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gint64 result = item->longLongAttr();
+    return result;
 }
 
 void
@@ -1597,7 +1526,7 @@ webkit_dom_test_obj_set_long_long_attr(WebKitDOMTestObj* self, gint64 value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setLongLongAttr(value);
 }
 
@@ -1606,9 +1535,9 @@ webkit_dom_test_obj_get_unsigned_long_long_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    guint64 res = item->unsignedLongLongAttr();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    guint64 result = item->unsignedLongLongAttr();
+    return result;
 }
 
 void
@@ -1616,7 +1545,7 @@ webkit_dom_test_obj_set_unsigned_long_long_attr(WebKitDOMTestObj* self, guint64
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedLongLongAttr(value);
 }
 
@@ -1625,9 +1554,9 @@ webkit_dom_test_obj_get_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->stringAttr());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->stringAttr());
+    return result;
 }
 
 void
@@ -1635,10 +1564,10 @@ webkit_dom_test_obj_set_string_attr(WebKitDOMTestObj* self, const gchar* value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setStringAttr(converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setStringAttr(convertedValue);
 }
 
 WebKitDOMTestObj*
@@ -1646,10 +1575,10 @@ webkit_dom_test_obj_get_test_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->testObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->testObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1657,14 +1586,14 @@ webkit_dom_test_obj_set_test_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setTestObjAttr(converted_value);
+    item->setTestObjAttr(convertedValue);
 }
 
 WebKitDOMTestObj*
@@ -1672,10 +1601,10 @@ webkit_dom_test_obj_get_xml_obj_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->xmlObjAttr());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->xmlObjAttr());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -1683,14 +1612,14 @@ webkit_dom_test_obj_set_xml_obj_attr(WebKitDOMTestObj* self, WebKitDOMTestObj* v
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setXMLObjAttr(converted_value);
+    item->setXMLObjAttr(convertedValue);
 }
 
 gboolean
@@ -1698,9 +1627,9 @@ webkit_dom_test_obj_get_create(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->isCreate();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->isCreate();
+    return result;
 }
 
 void
@@ -1708,7 +1637,7 @@ webkit_dom_test_obj_set_create(WebKitDOMTestObj* self, gboolean value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setCreate(value);
 }
 
@@ -1717,9 +1646,9 @@ webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::reflectedstringattrAttr));
+    return result;
 }
 
 void
@@ -1727,10 +1656,10 @@ webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gcha
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedstringattrAttr, convertedValue);
 }
 
 glong
@@ -1738,9 +1667,9 @@ webkit_dom_test_obj_get_reflected_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->getIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr);
+    return result;
 }
 
 void
@@ -1748,7 +1677,7 @@ webkit_dom_test_obj_set_reflected_integral_attr(WebKitDOMTestObj* self, glong va
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntegralAttribute(WebCore::HTMLNames::reflectedintegralattrAttr, value);
 }
 
@@ -1757,9 +1686,9 @@ webkit_dom_test_obj_get_reflected_unsigned_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gulong res = item->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gulong result = item->getUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr);
+    return result;
 }
 
 void
@@ -1767,7 +1696,7 @@ webkit_dom_test_obj_set_reflected_unsigned_integral_attr(WebKitDOMTestObj* self,
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setUnsignedIntegralAttribute(WebCore::HTMLNames::reflectedunsignedintegralattrAttr, value);
 }
 
@@ -1776,9 +1705,9 @@ webkit_dom_test_obj_get_reflected_boolean_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->hasAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr);
+    return result;
 }
 
 void
@@ -1786,7 +1715,7 @@ webkit_dom_test_obj_set_reflected_boolean_attr(WebKitDOMTestObj* self, gboolean
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setBooleanAttribute(WebCore::HTMLNames::reflectedbooleanattrAttr, value);
 }
 
@@ -1795,9 +1724,9 @@ webkit_dom_test_obj_get_reflected_url_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::reflectedurlattrAttr));
+    return result;
 }
 
 void
@@ -1805,10 +1734,10 @@ webkit_dom_test_obj_set_reflected_url_attr(WebKitDOMTestObj* self, const gchar*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::reflectedurlattrAttr, convertedValue);
 }
 
 gchar*
@@ -1816,9 +1745,9 @@ webkit_dom_test_obj_get_reflected_string_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getAttribute(WebCore::HTMLNames::customContentStringAttrAttr));
+    return result;
 }
 
 void
@@ -1826,10 +1755,10 @@ webkit_dom_test_obj_set_reflected_string_attr(WebKitDOMTestObj* self, const gcha
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentStringAttrAttr, convertedValue);
 }
 
 glong
@@ -1837,9 +1766,9 @@ webkit_dom_test_obj_get_reflected_custom_integral_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->getIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr);
+    return result;
 }
 
 void
@@ -1847,7 +1776,7 @@ webkit_dom_test_obj_set_reflected_custom_integral_attr(WebKitDOMTestObj* self, g
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setIntegralAttribute(WebCore::HTMLNames::customContentIntegralAttrAttr, value);
 }
 
@@ -1856,9 +1785,9 @@ webkit_dom_test_obj_get_reflected_custom_boolean_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gboolean res = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gboolean result = item->hasAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr);
+    return result;
 }
 
 void
@@ -1866,7 +1795,7 @@ webkit_dom_test_obj_set_reflected_custom_boolean_attr(WebKitDOMTestObj* self, gb
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setBooleanAttribute(WebCore::HTMLNames::customContentBooleanAttrAttr, value);
 }
 
@@ -1875,9 +1804,9 @@ webkit_dom_test_obj_get_reflected_custom_url_attr(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->getURLAttribute(WebCore::HTMLNames::customContentURLAttrAttr));
+    return result;
 }
 
 void
@@ -1885,33 +1814,33 @@ webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
-    item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, converted_value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
+    item->setAttribute(WebCore::HTMLNames::customContentURLAttrAttr, convertedValue);
 }
 
 glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    glong res = item->attrWithGetterException(ec);
+    glong result = item->attrWithGetterException(ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    return res;
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->setAttrWithGetterException(value, ec);
     if (ec) {
@@ -1925,17 +1854,17 @@ webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->attrWithSetterException();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->attrWithSetterException();
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error)
+webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
     item->setAttrWithSetterException(value, ec);
     if (ec) {
@@ -1945,26 +1874,26 @@ webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong
 }
 
 gchar*
-webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    gchar* res = convertToUTF8String(item->stringAttrWithGetterException(ec));
-    return res;
+    gchar* result = convertToUTF8String(item->stringAttrWithGetterException(ec));
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error)
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
     WebCore::ExceptionCode ec = 0;
-    item->setStringAttrWithGetterException(converted_value, ec);
+    item->setStringAttrWithGetterException(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -1976,21 +1905,21 @@ webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->stringAttrWithSetterException());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->stringAttrWithSetterException());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error)
+webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WTF::String converted_value = WTF::String::fromUTF8(value);
+    WTF::String convertedValue = WTF::String::fromUTF8(value);
     WebCore::ExceptionCode ec = 0;
-    item->setStringAttrWithSetterException(converted_value, ec);
+    item->setStringAttrWithSetterException(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -2002,9 +1931,9 @@ webkit_dom_test_obj_get_with_script_state_attribute(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->withScriptStateAttribute();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->withScriptStateAttribute();
+    return result;
 }
 
 void
@@ -2012,7 +1941,7 @@ webkit_dom_test_obj_set_with_script_state_attribute(WebKitDOMTestObj* self, glon
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setWithScriptStateAttribute(value);
 }
 
@@ -2021,10 +1950,10 @@ webkit_dom_test_obj_get_with_script_execution_context_attribute(WebKitDOMTestObj
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -2032,46 +1961,46 @@ webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAttribute(converted_value);
+    item->setWithScriptExecutionContextAttribute(convertedValue);
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptStateAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptStateAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptStateAttributeRaises(converted_value, ec);
+    item->setWithScriptStateAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -2079,35 +2008,35 @@ webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* sel
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptExecutionContextAttributeRaises(converted_value, ec);
+    item->setWithScriptExecutionContextAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -2119,10 +2048,10 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -2130,46 +2059,46 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAndScriptStateAttribute(converted_value);
+    item->setWithScriptExecutionContextAndScriptStateAttribute(convertedValue);
 }
 
 WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error)
+webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     WebCore::ExceptionCode ec = 0;
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttributeRaises(ec));
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateAttributeRaises(ec));
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
     }
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
-webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error)
+webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
     WebCore::ExceptionCode ec = 0;
-    item->setWithScriptExecutionContextAndScriptStateAttributeRaises(converted_value, ec);
+    item->setWithScriptExecutionContextAndScriptStateAttributeRaises(convertedValue, ec);
     if (ec) {
         WebCore::ExceptionCodeDescription ecdesc(ec);
         g_set_error_literal(error, g_quark_from_string("WEBKIT_DOM"), ecdesc.code, ecdesc.name);
@@ -2181,10 +2110,10 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spac
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::TestObj> g_res = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpacesAttribute());
-    WebKitDOMTestObj* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::TestObj> gobjectResult = WTF::getPtr(item->withScriptExecutionContextAndScriptStateWithSpacesAttribute());
+    WebKitDOMTestObj* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -2192,14 +2121,14 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_with_spac
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::TestObj * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::TestObj* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(converted_value);
+    item->setWithScriptExecutionContextAndScriptStateWithSpacesAttribute(convertedValue);
 }
 
 glong
@@ -2208,9 +2137,9 @@ webkit_dom_test_obj_get_conditional_attr1(WebKitDOMTestObj* self)
 #if ENABLE(Condition1)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr1();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr1();
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     return static_cast<glong>(0);
@@ -2223,7 +2152,7 @@ webkit_dom_test_obj_set_conditional_attr1(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr1(value);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -2236,9 +2165,9 @@ webkit_dom_test_obj_get_conditional_attr2(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr2();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr2();
+    return result;
 #else
 #if !ENABLE(Condition1)
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -2256,7 +2185,7 @@ webkit_dom_test_obj_set_conditional_attr2(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1) && ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr2(value);
 #else
 #if !ENABLE(Condition1)
@@ -2274,9 +2203,9 @@ webkit_dom_test_obj_get_conditional_attr3(WebKitDOMTestObj* self)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->conditionalAttr3();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->conditionalAttr3();
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
@@ -2290,7 +2219,7 @@ webkit_dom_test_obj_set_conditional_attr3(WebKitDOMTestObj* self, glong value)
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setConditionalAttr3(value);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
@@ -2303,10 +2232,10 @@ webkit_dom_test_obj_get_content_document(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::Document> g_res = WTF::getPtr(item->contentDocument());
-    WebKitDOMDocument* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::Document> gobjectResult = WTF::getPtr(item->contentDocument());
+    WebKitDOMDocument* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 WebKitDOMSVGPoint*
@@ -2314,10 +2243,10 @@ webkit_dom_test_obj_get_mutable_point(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->mutablePoint());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->mutablePoint());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -2325,14 +2254,14 @@ webkit_dom_test_obj_set_mutable_point(WebKitDOMTestObj* self, WebKitDOMSVGPoint*
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SVGPoint * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SVGPoint* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setMutablePoint(converted_value);
+    item->setMutablePoint(convertedValue);
 }
 
 WebKitDOMSVGPoint*
@@ -2340,10 +2269,10 @@ webkit_dom_test_obj_get_immutable_point(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    PassRefPtr<WebCore::SVGPoint> g_res = WTF::getPtr(item->immutablePoint());
-    WebKitDOMSVGPoint* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    RefPtr<WebCore::SVGPoint> gobjectResult = WTF::getPtr(item->immutablePoint());
+    WebKitDOMSVGPoint* result = WebKit::kit(gobjectResult.get());
+    return result;
 }
 
 void
@@ -2351,14 +2280,14 @@ webkit_dom_test_obj_set_immutable_point(WebKitDOMTestObj* self, WebKitDOMSVGPoin
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SVGPoint * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SVGPoint* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setImmutablePoint(converted_value);
+    item->setImmutablePoint(convertedValue);
 }
 
 gint
@@ -2366,9 +2295,9 @@ webkit_dom_test_obj_get_strawberry(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gint res = item->blueberry();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gint result = item->blueberry();
+    return result;
 }
 
 void
@@ -2376,7 +2305,7 @@ webkit_dom_test_obj_set_strawberry(WebKitDOMTestObj* self, gint value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setBlueberry(value);
 }
 
@@ -2385,9 +2314,9 @@ webkit_dom_test_obj_get_strict_float(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gfloat res = item->strictFloat();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gfloat result = item->strictFloat();
+    return result;
 }
 
 void
@@ -2395,7 +2324,7 @@ webkit_dom_test_obj_set_strict_float(WebKitDOMTestObj* self, gfloat value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setStrictFloat(value);
 }
 
@@ -2404,9 +2333,9 @@ webkit_dom_test_obj_get_description(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->description();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->description();
+    return result;
 }
 
 glong
@@ -2414,9 +2343,9 @@ webkit_dom_test_obj_get_id(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    glong res = item->id();
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    glong result = item->id();
+    return result;
 }
 
 void
@@ -2424,7 +2353,7 @@ webkit_dom_test_obj_set_id(WebKitDOMTestObj* self, glong value)
 {
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
+    WebCore::TestObj* item = WebKit::core(self);
     item->setId(value);
 }
 
@@ -2433,8 +2362,8 @@ webkit_dom_test_obj_get_hash(WebKitDOMTestObj* self)
 {
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestObj * item = WebKit::core(self);
-    gchar* res = convertToUTF8String(item->hash());
-    return res;
+    WebCore::TestObj* item = WebKit::core(self);
+    gchar* result = convertToUTF8String(item->hash());
+    return result;
 }
 
index 11faba7..9fa9aad 100644 (file)
 #ifndef WebKitDOMTestObj_h
 #define WebKitDOMTestObj_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_OBJ            (webkit_dom_test_obj_get_type())
@@ -59,15 +58,15 @@ webkit_dom_test_obj_void_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_void_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_void_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_int_method:
@@ -82,15 +81,15 @@ webkit_dom_test_obj_int_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_int_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns:
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_int_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_obj_method:
@@ -105,39 +104,39 @@ webkit_dom_test_obj_obj_method(WebKitDOMTestObj* self);
 /**
  * webkit_dom_test_obj_obj_method_with_args:
  * @self: A #WebKitDOMTestObj
- * @int_arg: A #glong
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @intArg: A #glong
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong int_arg, const gchar* str_arg, WebKitDOMTestObj* obj_arg);
+webkit_dom_test_obj_obj_method_with_args(WebKitDOMTestObj* self, glong intArg, const gchar* strArg, WebKitDOMTestObj* objArg);
 
 /**
  * webkit_dom_test_obj_method_that_requires_all_args_and_throws:
  * @self: A #WebKitDOMTestObj
- * @str_arg: A #gchar
- * @obj_arg: A #WebKitDOMTestObj
+ * @strArg: A #gchar
+ * @objArg: A #WebKitDOMTestObj
  * @error: #GError
  *
  * Returns: (transfer none):
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* str_arg, WebKitDOMTestObj* obj_arg, GError **error);
+webkit_dom_test_obj_method_that_requires_all_args_and_throws(WebKitDOMTestObj* self, const gchar* strArg, WebKitDOMTestObj* objArg, GError** error);
 
 /**
  * webkit_dom_test_obj_serialized_value:
  * @self: A #WebKitDOMTestObj
- * @serialized_arg: A #WebKitDOMSerializedScriptValue
+ * @serializedArg: A #WebKitDOMSerializedScriptValue
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serialized_arg);
+webkit_dom_test_obj_serialized_value(WebKitDOMTestObj* self, WebKitDOMSerializedScriptValue* serializedArg);
 
 /**
  * webkit_dom_test_obj_idb_key:
@@ -171,7 +170,7 @@ webkit_dom_test_obj_options_object(WebKitDOMTestObj* self, WebKitDOMDictionary*
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_method_with_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_state_void:
@@ -202,7 +201,7 @@ webkit_dom_test_obj_with_script_state_obj(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_state_obj_exception:
@@ -213,7 +212,7 @@ webkit_dom_test_obj_with_script_state_void_exception(WebKitDOMTestObj* self, GEr
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_state_obj_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_execution_context:
@@ -244,7 +243,7 @@ webkit_dom_test_obj_with_script_execution_context_and_script_state(WebKitDOMTest
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_with_script_execution_context_and_script_state_obj_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_with_script_execution_context_and_script_state_with_spaces:
@@ -270,19 +269,19 @@ webkit_dom_test_obj_method_with_optional_arg(WebKitDOMTestObj* self, glong opt);
 /**
  * webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg:
  * @self: A #WebKitDOMTestObj
- * @non_opt: A #glong
+ * @nonOpt: A #glong
  * @opt: A #glong
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong non_opt, glong opt);
+webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestObj* self, glong nonOpt, glong opt);
 
 /**
  * webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args:
  * @self: A #WebKitDOMTestObj
- * @non_opt: A #glong
+ * @nonOpt: A #glong
  * @opt1: A #glong
  * @opt2: A #glong
  *
@@ -290,7 +289,7 @@ webkit_dom_test_obj_method_with_non_optional_arg_and_optional_arg(WebKitDOMTestO
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong non_opt, glong opt1, glong opt2);
+webkit_dom_test_obj_method_with_non_optional_arg_and_two_optional_args(WebKitDOMTestObj* self, glong nonOpt, glong opt1, glong opt2);
 
 /**
  * webkit_dom_test_obj_method_with_optional_string:
@@ -495,7 +494,7 @@ webkit_dom_test_obj_orange(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API WebKitDOMbool*
-webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError **error);
+webkit_dom_test_obj_strict_function(WebKitDOMTestObj* self, const gchar* str, gfloat a, gint b, GError** error);
 
 /**
  * webkit_dom_test_obj_get_read_only_int_attr:
@@ -914,7 +913,7 @@ webkit_dom_test_obj_set_reflected_custom_url_attr(WebKitDOMTestObj* self, const
  *
 **/
 WEBKIT_API glong
-webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_attr_with_getter_exception:
@@ -926,7 +925,7 @@ webkit_dom_test_obj_get_attr_with_getter_exception(WebKitDOMTestObj* self, GErro
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError **error);
+webkit_dom_test_obj_set_attr_with_getter_exception(WebKitDOMTestObj* self, glong value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_attr_with_setter_exception:
@@ -948,7 +947,7 @@ webkit_dom_test_obj_get_attr_with_setter_exception(WebKitDOMTestObj* self);
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError **error);
+webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_string_attr_with_getter_exception:
@@ -959,7 +958,7 @@ webkit_dom_test_obj_set_attr_with_setter_exception(WebKitDOMTestObj* self, glong
  *
 **/
 WEBKIT_API gchar*
-webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_string_attr_with_getter_exception:
@@ -971,7 +970,7 @@ webkit_dom_test_obj_get_string_attr_with_getter_exception(WebKitDOMTestObj* self
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);
+webkit_dom_test_obj_set_string_attr_with_getter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_string_attr_with_setter_exception:
@@ -993,7 +992,7 @@ webkit_dom_test_obj_get_string_attr_with_setter_exception(WebKitDOMTestObj* self
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError **error);
+webkit_dom_test_obj_set_string_attr_with_setter_exception(WebKitDOMTestObj* self, const gchar* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_state_attribute:
@@ -1046,7 +1045,7 @@ webkit_dom_test_obj_set_with_script_execution_context_attribute(WebKitDOMTestObj
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_state_attribute_raises:
@@ -1058,7 +1057,7 @@ webkit_dom_test_obj_get_with_script_state_attribute_raises(WebKitDOMTestObj* sel
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_attribute_raises:
@@ -1069,7 +1068,7 @@ webkit_dom_test_obj_set_with_script_state_attribute_raises(WebKitDOMTestObj* sel
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_execution_context_attribute_raises:
@@ -1081,7 +1080,7 @@ webkit_dom_test_obj_get_with_script_execution_context_attribute_raises(WebKitDOM
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_execution_context_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute:
@@ -1113,7 +1112,7 @@ webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute
  *
 **/
 WEBKIT_API WebKitDOMTestObj*
-webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError **error);
+webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, GError** error);
 
 /**
  * webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises:
@@ -1125,7 +1124,7 @@ webkit_dom_test_obj_get_with_script_execution_context_and_script_state_attribute
  *
 **/
 WEBKIT_API void
-webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError **error);
+webkit_dom_test_obj_set_with_script_execution_context_and_script_state_attribute_raises(WebKitDOMTestObj* self, WebKitDOMTestObj* value, GError** error);
 
 /**
  * webkit_dom_test_obj_get_with_script_execution_context_and_script_state_with_spaces_attribute:
index 2f7ae2a..98e4a31 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_OBJ_PRIVATE_H
-#define WEB_KIT_DOM_TEST_OBJ_PRIVATE_H
+#ifndef WebKitDOMTestObjPrivate_h
+#define WebKitDOMTestObjPrivate_h
 
+#include "TestObj.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestObj.h"
-
 
 namespace WebKit {
-    WebKitDOMTestObj *
-    wrapTestObj(WebCore::TestObj *coreObject);
-
-    WebCore::TestObj *
-    core(WebKitDOMTestObj *request);
-
-    WebKitDOMTestObj*
-    kit(WebCore::TestObj* node);
-
+WebKitDOMTestObj* wrapTestObj(WebCore::TestObj*);
+WebCore::TestObj* core(WebKitDOMTestObj* request);
+WebKitDOMTestObj* kit(WebCore::TestObj* node);
 } // namespace WebKit
 
-#endif /* WEB_KIT_DOM_TEST_OBJ_PRIVATE_H */
+#endif /* WebKitDOMTestObjPrivate_h */
index da959dd..be6a381 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#include <glib-object.h>
 #include "config.h"
+#include "WebKitDOMTestSerializedScriptValueInterface.h"
+
+#if ENABLE(Condition1) || ENABLE(Condition2)
 
-#include <wtf/GetPtr.h>
-#include <wtf/RefPtr.h>
 #include "DOMObjectCache.h"
 #include "ExceptionCode.h"
 #include "JSMainThreadExecState.h"
 #include "webkit/WebKitDOMArrayPrivate.h"
 #include "webkit/WebKitDOMSerializedScriptValue.h"
 #include "webkit/WebKitDOMSerializedScriptValuePrivate.h"
-#include "webkit/WebKitDOMTestSerializedScriptValueInterface.h"
 #include "webkit/WebKitDOMTestSerializedScriptValueInterfacePrivate.h"
 #include "webkitdefines.h"
 #include "webkitglobalsprivate.h"
 #include "webkitmarshal.h"
-
-#if ENABLE(Condition1) || ENABLE(Condition2)
+#include <glib-object.h>
+#include <wtf/GetPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebKit {
 
@@ -68,14 +68,11 @@ WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterf
 {
     g_return_val_if_fail(coreObject, 0);
 
-    /* We call ref() rather than using a C++ smart pointer because we can't store a C++ object
-     * in a C-allocated GObject structure.  See the finalize() code for the
-     * matching deref().
-     */
+    // We call ref() rather than using a C++ smart pointer because we can't store a C++ object
+    // in a C-allocated GObject structure. See the finalize() code for the matching deref().
     coreObject->ref();
 
-    return  WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE,
-                                               "core-object", coreObject, NULL));
+    return WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(g_object_new(WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE, "core-object", coreObject, NULL));
 }
 
 } // namespace WebKit
@@ -95,64 +92,60 @@ enum {
 static void webkit_dom_test_serialized_script_value_interface_finalize(GObject* object)
 {
 #if ENABLE(Condition1) || ENABLE(Condition2)
-    WebKitDOMObject* dom_object = WEBKIT_DOM_OBJECT(object);
+    WebKitDOMObject* domObject = WEBKIT_DOM_OBJECT(object);
     
-    if (dom_object->coreObject) {
-        WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface *>(dom_object->coreObject);
+    if (domObject->coreObject) {
+        WebCore::TestSerializedScriptValueInterface* coreObject = static_cast<WebCore::TestSerializedScriptValueInterface*>(domObject->coreObject);
 
         WebKit::DOMObjectCache::forget(coreObject);
         coreObject->deref();
 
-        dom_object->coreObject = NULL;
+        domObject->coreObject = 0;
     }
 #endif // ENABLE(Condition1) || ENABLE(Condition2)
 
     G_OBJECT_CLASS(webkit_dom_test_serialized_script_value_interface_parent_class)->finalize(object);
 }
 
-static void webkit_dom_test_serialized_script_value_interface_set_property(GObject* object, guint prop_id, const GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_serialized_script_value_interface_set_property(GObject* object, guint propertyId, const GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
-    switch (prop_id) {
+    switch (propertyId) {
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
 
 
-static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint prop_id, GValue* value, GParamSpec* pspec)
+static void webkit_dom_test_serialized_script_value_interface_get_property(GObject* object, guint propertyId, GValue* value, GParamSpec* pspec)
 {
     WebCore::JSMainThreadNullState state;
     WebKitDOMTestSerializedScriptValueInterface* self = WEBKIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE(object);
     WebCore::TestSerializedScriptValueInterface* coreSelf = WebKit::core(self);
-    switch (prop_id) {
-    case PROP_VALUE:
-    {
+    switch (propertyId) {
+    case PROP_VALUE: {
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->value();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_READONLY_VALUE:
-    {
+    case PROP_READONLY_VALUE: {
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->readonlyValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_CACHED_VALUE:
-    {
+    case PROP_CACHED_VALUE: {
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
-    case PROP_CACHED_READONLY_VALUE:
-    {
+    case PROP_CACHED_READONLY_VALUE: {
         RefPtr<WebCore::SerializedScriptValue> ptr = coreSelf->cachedReadonlyValue();
         g_value_set_object(value, WebKit::kit(ptr.get()));
         break;
     }
     default:
-        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+        G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propertyId, pspec);
         break;
     }
 }
@@ -167,7 +160,7 @@ static void webkit_dom_test_serialized_script_value_interface_constructed(GObjec
 
 static void webkit_dom_test_serialized_script_value_interface_class_init(WebKitDOMTestSerializedScriptValueInterfaceClass* requestClass)
 {
-    GObjectClass *gobjectClass = G_OBJECT_CLASS(requestClass);
+    GObjectClassgobjectClass = G_OBJECT_CLASS(requestClass);
     gobjectClass->finalize = webkit_dom_test_serialized_script_value_interface_finalize;
     gobjectClass->set_property = webkit_dom_test_serialized_script_value_interface_set_property;
     gobjectClass->get_property = webkit_dom_test_serialized_script_value_interface_get_property;
@@ -210,25 +203,25 @@ static void webkit_dom_test_serialized_script_value_interface_init(WebKitDOMTest
 }
 
 void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transfer_list)
+webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList)
 {
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     g_return_if_fail(data);
-    g_return_if_fail(transfer_list);
-    WebCore::SerializedScriptValue * converted_data = NULL;
-    if (data != NULL) {
-        converted_data = WebKit::core(data);
-        g_return_if_fail(converted_data);
+    g_return_if_fail(transferList);
+    WebCore::SerializedScriptValue* convertedData = 0;
+    if (data) {
+        convertedData = WebKit::core(data);
+        g_return_if_fail(convertedData);
     }
-    WebCore::Array * converted_transfer_list = NULL;
-    if (transfer_list != NULL) {
-        converted_transfer_list = WebKit::core(transfer_list);
-        g_return_if_fail(converted_transfer_list);
+    WebCore::Array* convertedTransferList = 0;
+    if (transferList) {
+        convertedTransferList = WebKit::core(transferList);
+        g_return_if_fail(convertedTransferList);
     }
-    item->acceptTransferList(converted_data, converted_transfer_list);
+    item->acceptTransferList(convertedData, convertedTransferList);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
@@ -241,32 +234,32 @@ webkit_dom_test_serialized_script_value_interface_multi_transfer_list(WebKitDOMT
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     g_return_if_fail(first);
     g_return_if_fail(tx);
     g_return_if_fail(second);
     g_return_if_fail(txx);
-    WebCore::SerializedScriptValue * converted_first = NULL;
-    if (first != NULL) {
-        converted_first = WebKit::core(first);
-        g_return_if_fail(converted_first);
+    WebCore::SerializedScriptValue* convertedFirst = 0;
+    if (first) {
+        convertedFirst = WebKit::core(first);
+        g_return_if_fail(convertedFirst);
     }
-    WebCore::Array * converted_tx = NULL;
-    if (tx != NULL) {
-        converted_tx = WebKit::core(tx);
-        g_return_if_fail(converted_tx);
+    WebCore::Array* convertedTx = 0;
+    if (tx) {
+        convertedTx = WebKit::core(tx);
+        g_return_if_fail(convertedTx);
     }
-    WebCore::SerializedScriptValue * converted_second = NULL;
-    if (second != NULL) {
-        converted_second = WebKit::core(second);
-        g_return_if_fail(converted_second);
+    WebCore::SerializedScriptValue* convertedSecond = 0;
+    if (second) {
+        convertedSecond = WebKit::core(second);
+        g_return_if_fail(convertedSecond);
     }
-    WebCore::Array * converted_txx = NULL;
-    if (txx != NULL) {
-        converted_txx = WebKit::core(txx);
-        g_return_if_fail(converted_txx);
+    WebCore::Array* convertedTxx = 0;
+    if (txx) {
+        convertedTxx = WebKit::core(txx);
+        g_return_if_fail(convertedTxx);
     }
-    item->multiTransferList(converted_first, converted_tx, converted_second, converted_txx);
+    item->multiTransferList(convertedFirst, convertedTx, convertedSecond, convertedTxx);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
@@ -279,14 +272,14 @@ webkit_dom_test_serialized_script_value_interface_get_value(WebKitDOMTestSeriali
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->value());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->value());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -296,14 +289,14 @@ webkit_dom_test_serialized_script_value_interface_set_value(WebKitDOMTestSeriali
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SerializedScriptValue * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SerializedScriptValue* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setValue(converted_value);
+    item->setValue(convertedValue);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
@@ -316,14 +309,14 @@ webkit_dom_test_serialized_script_value_interface_get_readonly_value(WebKitDOMTe
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->readonlyValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->readonlyValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -333,14 +326,14 @@ webkit_dom_test_serialized_script_value_interface_get_cached_value(WebKitDOMTest
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->cachedValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
@@ -350,14 +343,14 @@ webkit_dom_test_serialized_script_value_interface_set_cached_value(WebKitDOMTest
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_if_fail(self);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
     g_return_if_fail(value);
-    WebCore::SerializedScriptValue * converted_value = NULL;
-    if (value != NULL) {
-        converted_value = WebKit::core(value);
-        g_return_if_fail(converted_value);
+    WebCore::SerializedScriptValue* convertedValue = 0;
+    if (value) {
+        convertedValue = WebKit::core(value);
+        g_return_if_fail(convertedValue);
     }
-    item->setCachedValue(converted_value);
+    item->setCachedValue(convertedValue);
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
@@ -370,14 +363,14 @@ webkit_dom_test_serialized_script_value_interface_get_cached_readonly_value(WebK
 #if ENABLE(Condition1) || ENABLE(Condition2)
     g_return_val_if_fail(self, 0);
     WebCore::JSMainThreadNullState state;
-    WebCore::TestSerializedScriptValueInterface * item = WebKit::core(self);
-    PassRefPtr<WebCore::SerializedScriptValue> g_res = WTF::getPtr(item->cachedReadonlyValue());
-    WebKitDOMSerializedScriptValue* res = WebKit::kit(g_res.get());
-    return res;
+    WebCore::TestSerializedScriptValueInterface* item = WebKit::core(self);
+    RefPtr<WebCore::SerializedScriptValue> gobjectResult = WTF::getPtr(item->cachedReadonlyValue());
+    WebKitDOMSerializedScriptValue* result = WebKit::kit(gobjectResult.get());
+    return result;
 #else
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition1")
     WEBKIT_WARN_FEATURE_NOT_PRESENT("Condition2")
-    return NULL;
+    return 0;
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 }
 
index 5d15cd3..34fc8eb 100644 (file)
 #ifndef WebKitDOMTestSerializedScriptValueInterface_h
 #define WebKitDOMTestSerializedScriptValueInterface_h
 
-#include "webkit/webkitdomdefines.h"
 #include <glib-object.h>
+#include <webkit/WebKitDOMObject.h>
 #include <webkit/webkitdefines.h>
-#include "webkit/WebKitDOMObject.h"
-
+#include <webkit/webkitdomdefines.h>
 
 G_BEGIN_DECLS
 #define WEBKIT_TYPE_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE            (webkit_dom_test_serialized_script_value_interface_get_type())
@@ -50,13 +49,13 @@ webkit_dom_test_serialized_script_value_interface_get_type (void);
  * webkit_dom_test_serialized_script_value_interface_accept_transfer_list:
  * @self: A #WebKitDOMTestSerializedScriptValueInterface
  * @data: A #WebKitDOMSerializedScriptValue
- * @transfer_list: A #WebKitDOMArray
+ * @transferList: A #WebKitDOMArray
  *
  * Returns:
  *
 **/
 WEBKIT_API void
-webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transfer_list);
+webkit_dom_test_serialized_script_value_interface_accept_transfer_list(WebKitDOMTestSerializedScriptValueInterface* self, WebKitDOMSerializedScriptValue* data, WebKitDOMArray* transferList);
 
 /**
  * webkit_dom_test_serialized_script_value_interface_multi_transfer_list:
index 3533c26..fcbea07 100644 (file)
     Boston, MA 02110-1301, USA.
 */
 
-#ifndef WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H
-#define WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H
+#ifndef WebKitDOMTestSerializedScriptValueInterfacePrivate_h
+#define WebKitDOMTestSerializedScriptValueInterfacePrivate_h
 
+#include "TestSerializedScriptValueInterface.h"
 #include <glib-object.h>
 #include <webkit/WebKitDOMObject.h>
-#include "TestSerializedScriptValueInterface.h"
-
 #if ENABLE(Condition1) || ENABLE(Condition2)
 
 namespace WebKit {
-    WebKitDOMTestSerializedScriptValueInterface *
-    wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface *coreObject);
-
-    WebCore::TestSerializedScriptValueInterface *
-    core(WebKitDOMTestSerializedScriptValueInterface *request);
-
-    WebKitDOMTestSerializedScriptValueInterface*
-    kit(WebCore::TestSerializedScriptValueInterface* node);
-
+WebKitDOMTestSerializedScriptValueInterface* wrapTestSerializedScriptValueInterface(WebCore::TestSerializedScriptValueInterface*);
+WebCore::TestSerializedScriptValueInterface* core(WebKitDOMTestSerializedScriptValueInterface* request);
+WebKitDOMTestSerializedScriptValueInterface* kit(WebCore::TestSerializedScriptValueInterface* node);
 } // namespace WebKit
 
 #endif /* ENABLE(Condition1) || ENABLE(Condition2) */
 
-#endif /* WEB_KIT_DOM_TEST_SERIALIZED_SCRIPT_VALUE_INTERFACE_PRIVATE_H */
+#endif /* WebKitDOMTestSerializedScriptValueInterfacePrivate_h */