doc: fix some more typos

[profile/ivi/qtdeclarative.git] / src / qml / qml / qqmlscript_p.h

diff --git a/src/qml/qml/qqmlscript_p.h b/src/qml/qml/qqmlscript_p.h
index 486c573..834abd7 100644 (file)
--- a/src/qml/qml/qqmlscript_p.h
+++ b/src/qml/qml/qqmlscript_p.h
@@ -76,9 +76,9 @@ namespace QQmlScript {
 
 struct Location 
 {
-    Location() : line(-1), column(-1) {}
-    int line;
-    int column;
+    Location() : line(0), column(0) {}
+    quint16 line;
+    quint16 column;
 
     inline bool operator<(const Location &other) {
         return line < other.line || 
@@ -328,7 +328,7 @@ public:
     QQmlPropertyCache *synthCache; // Generated by compiler
 
     Property *getDefaultProperty();
-    // name ptr must be guarenteed to remain valid
+    // name ptr must be guaranteed to remain valid
     Property *getProperty(const QHashedStringRef &name, bool create=true);
     Property *getProperty(const QStringRef &name, bool create=true);
     Property *getProperty(const QString &name, bool create=true);
@@ -381,7 +381,9 @@ public:
         DynamicProperty();
 
         enum Type { Var, Variant, Int, Bool, Real, String, Url, Color,
-                    Time, Date, DateTime, Rect, Alias, Custom, CustomList };
+                    Font, Time, Date, DateTime, Rect, Point, Size,
+                    Vector2D, Vector3D, Vector4D, Matrix4x4, Quaternion,
+                    Alias, Custom, CustomList };
 
         quint32 isDefaultProperty:1;
         quint32 isReadOnly:1;
@@ -407,6 +409,7 @@ public:
 
         QHashedStringRef name;
         QQmlPool::List<DynamicProperty::Type> parameterTypes;
+        QQmlPool::List<QHashedStringRef> parameterTypeNames;
         QQmlPool::List<QHashedStringRef> parameterNames;
 
         // Used by Object::DynamicSignalList
@@ -488,7 +491,7 @@ public:
     };
 
     static QQmlScript::Object::ScriptBlock::Pragmas extractPragmas(QString &);
-    static JavaScriptMetaData extractMetaData(QString &);
+    static JavaScriptMetaData extractMetaData(QString &, QQmlError *error);
 
 
 // ### private: