Remove "All rights reserved" line from license headers.

[profile/ivi/qtdeclarative.git] / src / declarative / qml / qdeclarativeinstruction_p.h

diff --git a/src/declarative/qml/qdeclarativeinstruction_p.h b/src/declarative/qml/qdeclarativeinstruction_p.h
index 7b36c9a..49eadad 100644 (file)
--- a/src/declarative/qml/qdeclarativeinstruction_p.h
+++ b/src/declarative/qml/qdeclarativeinstruction_p.h
@@ -1,8 +1,7 @@
 /****************************************************************************
 **
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
+** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/
 **
 ** This file is part of the QtDeclarative module of the Qt Toolkit.
 **
@@ -35,6 +34,7 @@
 **
 **
 **
+**
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
@@ -79,12 +79,20 @@ QT_BEGIN_NAMESPACE
     F(StoreVarDouble, storeDouble) \
     F(StoreVarBool, storeBool) \
     F(StoreString, storeString) \
+    F(StoreStringList, storeString) \
+    F(StoreStringQList, storeString) \
+    F(StoreTrString, storeTrString) \
+    F(StoreTrIdString, storeTrIdString) \
     F(StoreByteArray, storeByteArray) \
     F(StoreUrl, storeUrl) \
+    F(StoreUrlQList, storeUrl) \
     F(StoreFloat, storeFloat) \
     F(StoreDouble, storeDouble) \
+    F(StoreDoubleQList, storeDouble) \
     F(StoreBool, storeBool) \
+    F(StoreBoolQList, storeBool) \
     F(StoreInteger, storeInteger) \
+    F(StoreIntegerQList, storeInteger) \
     F(StoreColor, storeColor) \
     F(StoreDate, storeDate) \
     F(StoreTime, storeTime) \
@@ -211,13 +219,13 @@ union QDeclarativeInstruction
     };
     struct instr_assignValueSource {
         QML_INSTR_HEADER
-        QDeclarativePropertyCache::RawData property;
+        QDeclarativePropertyRawData property;
         int owner;
         int castValue;
     };
     struct instr_assignValueInterceptor {
         QML_INSTR_HEADER
-        QDeclarativePropertyCache::RawData property;
+        QDeclarativePropertyRawData property;
         int owner;
         int castValue;
     };
@@ -235,15 +243,17 @@ union QDeclarativeInstruction
         short owner;
         bool isRoot;
         ushort line;
+        ushort column;
     };
     struct instr_assignBinding {
         QML_INSTR_HEADER
-        QDeclarativePropertyCache::RawData property;
+        QDeclarativePropertyRawData property;
         int value;
         short context;
         short owner;
         bool isRoot;
         ushort line;
+        ushort column;
     };
     struct instr_fetch {
         QML_INSTR_HEADER
@@ -290,6 +300,20 @@ union QDeclarativeInstruction
         int propertyIndex;
         int value;
     };
+    struct instr_storeTrString {
+        QML_INSTR_HEADER
+        int propertyIndex;
+        int context;
+        int text;
+        int comment;
+        int n;
+    };
+    struct instr_storeTrIdString {
+        QML_INSTR_HEADER
+        int propertyIndex;
+        int text;
+        int n;
+    };
     struct instr_storeByteArray {
         QML_INSTR_HEADER
         int propertyIndex;
@@ -302,6 +326,7 @@ union QDeclarativeInstruction
         int scope;
         int bindingId;
         ushort line;
+        ushort column;
     }; 
     struct instr_storeScript {
         QML_INSTR_HEADER
@@ -342,17 +367,10 @@ union QDeclarativeInstruction
         QML_INSTR_HEADER
         int propertyIndex;
         struct QRect {
-#if defined(Q_OS_MAC)
-            int y1;
-            int x1;
-            int y2;
-            int x2;
-#else
             int x1;
             int y1;
             int x2;
             int y2;
-#endif
         } rect;
     };
     struct instr_storeRectF {
@@ -382,8 +400,8 @@ union QDeclarativeInstruction
         int signalIndex;
         int value;
         short context;
-        int name;
         ushort line;
+        ushort column;
     };
     struct instr_assignSignalObject {
         QML_INSTR_HEADER
@@ -487,6 +505,8 @@ union QDeclarativeInstruction
     instr_storeInteger storeInteger;
     instr_storeBool storeBool;
     instr_storeString storeString;
+    instr_storeTrString storeTrString;
+    instr_storeTrIdString storeTrIdString;
     instr_storeByteArray storeByteArray;
     instr_storeScriptString storeScriptString;
     instr_storeScript storeScript;