webkitgtk-2.16.5HEADwebkitgtk-2.16.5master

1 files changed, 17 insertions, 22 deletions

diff --git a/Source/WebCore/xml/XPathPredicate.h b/Source/WebCore/xml/XPathPredicate.h
index c657c8a55..69d15c22f 100644
--- a/Source/WebCore/xml/XPathPredicate.h
+++ b/Source/WebCore/xml/XPathPredicate.h
@@ -24,13 +24,11 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef XPathPredicate_h
-#define XPathPredicate_h
+#pragma once
 
 #include "XPathExpressionNode.h"
 
 namespace WebCore {
-
     namespace XPath {
         
         class Number final : public Expression {
@@ -38,8 +36,8 @@ namespace WebCore {
             explicit Number(double);
 
         private:
-            virtual Value evaluate() const override;
-            virtual Value::Type resultType() const override { return Value::NumberValue; }
+            Value evaluate() const override;
+            Value::Type resultType() const override { return Value::NumberValue; }
 
             Value m_value;
         };
@@ -49,8 +47,8 @@ namespace WebCore {
             explicit StringExpression(String&&);
 
         private:
-            virtual Value evaluate() const override;
-            virtual Value::Type resultType() const override { return Value::StringValue; }
+            Value evaluate() const override;
+            Value::Type resultType() const override { return Value::StringValue; }
 
             Value m_value;
         };
@@ -60,8 +58,8 @@ namespace WebCore {
             explicit Negative(std::unique_ptr<Expression>);
 
         private:
-            virtual Value evaluate() const override;
-            virtual Value::Type resultType() const override { return Value::NumberValue; }
+            Value evaluate() const override;
+            Value::Type resultType() const override { return Value::NumberValue; }
         };
 
         class NumericOp final : public Expression {
@@ -70,8 +68,8 @@ namespace WebCore {
             NumericOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
 
         private:
-            virtual Value evaluate() const override;
-            virtual Value::Type resultType() const override { return Value::NumberValue; }
+            Value evaluate() const override;
+            Value::Type resultType() const override { return Value::NumberValue; }
 
             Opcode m_opcode;
         };
@@ -80,10 +78,10 @@ namespace WebCore {
         public:
             enum Opcode { OP_EQ, OP_NE, OP_GT, OP_LT, OP_GE, OP_LE };
             EqTestOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
-            virtual Value evaluate() const override;
+            Value evaluate() const override;
 
         private:
-            virtual Value::Type resultType() const override { return Value::BooleanValue; }
+            Value::Type resultType() const override { return Value::BooleanValue; }
             bool compare(const Value&, const Value&) const;
 
             Opcode m_opcode;
@@ -95,9 +93,9 @@ namespace WebCore {
             LogicalOp(Opcode, std::unique_ptr<Expression> lhs, std::unique_ptr<Expression> rhs);
 
         private:
-            virtual Value::Type resultType() const override { return Value::BooleanValue; }
+            Value::Type resultType() const override { return Value::BooleanValue; }
             bool shortCircuitOn() const;
-            virtual Value evaluate() const override;
+            Value evaluate() const override;
 
             Opcode m_opcode;
         };
@@ -107,15 +105,12 @@ namespace WebCore {
             Union(std::unique_ptr<Expression>, std::unique_ptr<Expression>);
 
         private:
-            virtual Value evaluate() const override;
-            virtual Value::Type resultType() const override { return Value::NodeSetValue; }
+            Value evaluate() const override;
+            Value::Type resultType() const override { return Value::NodeSetValue; }
         };
 
         bool evaluatePredicate(const Expression&);
         bool predicateIsContextPositionSensitive(const Expression&);
 
-    }
-
-}
-
-#endif // XPathPredicate_h
+    } // namespace XPath
+} // namespace WebCore