feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Replace 'var' by 'variant' in all Qml files

Browse Source 
45ca7aff2c04c in qt.git replaces 'var' with 'variant'

Reviewed-by: Thomas Hartmann
This commit is contained in:
Kai Koehne
2010-04-13 11:20:39 +02:00
parent 99cbb2f868
commit 5650dbc55d
36 changed files with 117 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
share/qtcreator/qmldesigner/Button.qml
View File

@@ -1,7 +1,7 @@
import Qt 4.6
Rectangle {
property var label: "Button"
property variant label: "Button"
signal clicked
width: 75

4
share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
View File

@@ -5,9 +5,9 @@ QWidget { //This is a special checkBox that does color coding for states
id: checkBox;
property var backendValue;
property variant backendValue;
property var baseStateFlag;
property variant baseStateFlag;
property alias checkable: localCheckBox.checkable
property alias text: localLabel.text

20
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
View File

@@ -4,14 +4,14 @@ import Bauhaus 1.0
QExtGroupBox {
id: colorGroupBox
property var finished;
property var backendColor
property var color: (backendColor === undefined || backendColor.value === undefined) ? "#000000" : backendColor.value
property var oldMaximumHeight;
property variant finished;
property variant backendColor
property variant color: (backendColor === undefined || backendColor.value === undefined) ? "#000000" : backendColor.value
property variant oldMaximumHeight;
property var startupCollapse: selectionChanged === undefined ? false : selectionChanged;
property var firstTime: true;
property var caption: ""
property variant startupCollapse: selectionChanged === undefined ? false : selectionChanged;
property variant firstTime: true;
property variant caption: ""
smooth: false
onFinishedChanged: {
@@ -32,14 +32,14 @@ QExtGroupBox {
}
property var baseStateFlag: isBaseState
property variant baseStateFlag: isBaseState
onBaseStateFlagChanged: {
evaluate();
}
onBackendColorChanged: {
evaluate();
}
property var isEnabled: colorGroupBox.enabled
property variant isEnabled: colorGroupBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -147,7 +147,7 @@ QExtGroupBox {
ColorBox {
id: colorControl;
property var backendColor: colorGroupBox.color;
property variant backendColor: colorGroupBox.color;
color: colorGroupBox.color;
onColorChanged: if (colorGroupBox.color != color) {
colorGroupBox.backendColor.value = color;

12
share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
View File

@@ -3,10 +3,10 @@ import Bauhaus 1.0
Item {
id: colorScheme
property var disabledColor: "gray";
property var defaultColor: "white";
property var boldTextColor: "#dedede";
property var changedBaseColor: "#9999ff";
property var changedStateColor: "#99ccff";
property var optionsColor: "white";
property variant disabledColor: "gray";
property variant defaultColor: "white";
property variant boldTextColor: "#dedede";
property variant changedBaseColor: "#9999ff";
property variant changedStateColor: "#99ccff";
property variant optionsColor: "white";
}

10
share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
View File

@@ -5,8 +5,8 @@ QWidget {
id: comboBox
property var backendValue;
property var baseStateFlag;
property variant backendValue;
property variant baseStateFlag;
property alias enabled: box.enabled;
property alias items: box.items;
@@ -17,7 +17,7 @@ QWidget {
evaluate();
}
property var isEnabled: comboBox.enabled
property variant isEnabled: comboBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -47,7 +47,7 @@ QWidget {
layout: HorizontalLayout {
QComboBox {
id: box
property var backendValue: comboBox.backendValue
property variant backendValue: comboBox.backendValue
onCurrentTextChanged: { backendValue.value = currentText; evaluate(); }
onItemsChanged: {
if (comboBox.backendValue.value == curentText)
@@ -55,7 +55,7 @@ QWidget {
box.setCurrentTextSilent(comboBox.backendValue.value);
}
property var backendValueValue: comboBox.backendValue.value
property variant backendValueValue: comboBox.backendValue.value
onBackendValueValueChanged: {
if (comboBox.backendValue.value == curentText)
return;

4
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
View File

@@ -5,8 +5,8 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
id: doubleSpinBox;
property var backendValue;
property var baseStateFlag;
property variant backendValue;
property variant baseStateFlag;
property alias singleStep: box.singleStep
property alias minimum: box.minimum
property alias maximum: box.maximum

4
share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
View File

@@ -5,8 +5,8 @@ QWidget { //This is a special doubleSpinBox that does color coding for states
id: doubleSpinBox;
property var backendValue;
property var baseStateFlag;
property variant backendValue;
property variant baseStateFlag;
property alias singleStep: box.singleStep
property alias minimum: box.minimum
property alias maximum: box.maximum

2
share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
View File

@@ -8,7 +8,7 @@ QWidget {
width: frame.width - 22
height: 40
property bool active: false
property var backendValue;
property variant backendValue;
onActiveChanged: {

12
share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
View File

@@ -8,8 +8,8 @@ GroupBox {
layout: VerticalLayout{
property var effect: backendValues.effect
property var complexNode: effect.complexNode
property variant effect: backendValues.effect
property variant complexNode: effect.complexNode
QWidget {
maximumHeight: 40;
@@ -19,8 +19,8 @@ GroupBox {
}
QComboBox {
enabled: isBaseState;
property var type: backendValues.effect.complexNode.type
property var dirty;
property variant type: backendValues.effect.complexNode.type
property variant dirty;
id: effectComboBox;
items : { [
"None",
@@ -60,7 +60,7 @@ GroupBox {
}
}// QWidget
property var properties: complexNode == null ? null : complexNode.properties
property variant properties: complexNode == null ? null : complexNode.properties
QWidget {
minimumHeight: 20;
@@ -101,7 +101,7 @@ GroupBox {
visible: effectComboBox.currentText == "Colorize";
layout: QVBoxLayout {
property var colorProp: properties == null ? null : properties.color
property variant colorProp: properties == null ? null : properties.color
ColorLabel {

2
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
View File

@@ -4,7 +4,7 @@ import Bauhaus 1.0
QToolButton {
id: extendedFunctionButton
property var backendValue
property variant backendValue
function setIcon() {
if (backendValue == null)

4
share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
View File

@@ -6,9 +6,9 @@ QFrame {
focusPolicy: "Qt::NoFocus"
id: extendedSwitches;
property bool active: false;
property var backendValue;
property variant backendValue;
styleSheetFile: "switch.css";
property var specialModeIcon;
property variant specialModeIcon;
specialModeIcon: "images/standard.png";
opacity: 0;

8
share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
View File

@@ -5,8 +5,8 @@ QWidget {
id: fontComboBox
property alias currentFont: fontSelector.currentFont
property var backendValue
property var baseStateFlag;
property variant backendValue
property variant baseStateFlag;
property alias enabled: fontSelector.enabled
onBaseStateFlagChanged: {
@@ -17,7 +17,7 @@ QWidget {
evaluate();
}
property var isEnabled: fontComboBox.enabled
property variant isEnabled: fontComboBox.enabled
onIsEnabledChanged: {
evaluate();
}
@@ -59,7 +59,7 @@ QWidget {
id: fontSelector
currentFont.family: backendValue.value
property var fontFamily: currentFont.family
property variant fontFamily: currentFont.family
onFontFamilyChanged: {
if (backendValue === undefined)
return;

2
share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
View File

@@ -4,7 +4,7 @@ import Bauhaus 1.0
GroupBox {
id: fontGroupBox
caption: qsTr("Font")
property var showStyle: false
property variant showStyle: false
layout: VerticalLayout {

6
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
View File

@@ -4,11 +4,11 @@ import Bauhaus 1.0
QExtGroupBox {
id: groupBox;
property var finished;
property variant finished;
property var caption;
property variant caption;
property var oldMaximumHeight;
property variant oldMaximumHeight;
onFinishedChanged: {
checkBox.raise();

6
share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
View File

@@ -4,11 +4,11 @@ import Bauhaus 1.0
QExtGroupBox {
id: groupBoxOption;
property var finished;
property variant finished;
property var caption;
property variant caption;
property var oldMaximumHeight;
property variant oldMaximumHeight;
onFinishedChanged: {
CheckBox.raise();

14
share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
View File

@@ -4,14 +4,14 @@ import Bauhaus 1.0
QWidget {
id: intEditor;
property var backendValue;
property var baseStateFlag;
property variant backendValue;
property variant baseStateFlag;
property var caption;
property variant caption;
property var maximumValue: 99
property var minimumValue: 0
property var step: 1
property variant maximumValue: 99
property variant minimumValue: 0
property variant step: 1
property bool slider: true
property alias alignment: label.alignment
@@ -27,7 +27,7 @@ QWidget {
intEditor.backendValue === null)
? null : intEditor.backendValue;
property var backendValueValue: (intEditor.backendValue === undefined ||
property variant backendValueValue: (intEditor.backendValue === undefined ||
intEditor.backendValue === null)
? null : intEditor.backendValue.value;

2
share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
View File

@@ -9,7 +9,7 @@ GroupBox {
id: layout;
enabled: anchorBackend.hasParent;
property var targetLabelWidth: 90 - 20 - 26
property variant targetLabelWidth: 90 - 20 - 26
property int leftMarginMargin: 16
layout: VerticalLayout {

6
share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
View File

@@ -4,9 +4,9 @@ import Bauhaus 1.0
QWidget {
id: lineEdit
property var backendValue
property variant backendValue
property alias enabled: lineEdit.enabled
property var baseStateFlag
property variant baseStateFlag
property alias text: lineEditWidget.text
property alias readOnly: lineEditWidget.readOnly
@@ -16,7 +16,7 @@ QWidget {
evaluate();
}
property var isEnabled: lineEdit.enabled
property variant isEnabled: lineEdit.enabled
onIsEnabledChanged: {
evaluate();
}

4
share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
View File

@@ -43,7 +43,7 @@ GroupBox {
text: ""
id: opacitySpinBox;
backendValue: backendValues.opacity === undefined ? null : backendValues.opacity
property var backendValueValue: backendValues.opacity.value;
property variant backendValueValue: backendValues.opacity.value;
minimumWidth: 60;
minimum: 0;
maximum: 1;
@@ -97,7 +97,7 @@ GroupBox {
id: scaleSpinBox;
backendValue: backendValues.scale;
property var backendValueValue: backendValues.scale.value;
property variant backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10

2
share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
View File

@@ -4,7 +4,7 @@ import Bauhaus 1.0
QScrollArea {
property var finished;
property variant finished;
onFinishedChanged: {
}

4
share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
View File

@@ -4,11 +4,11 @@ import Bauhaus 1.0
QWidget {
id: sliderWidget
property var value
property variant value
property alias singleStep: localSlider.singleStep
property alias minimum: localSlider.minimum
property alias maximum: localSlider.maximum
property var backendValue
property variant backendValue
QSlider {
orientation: "Qt::Horizontal";

6
share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
View File

@@ -5,8 +5,8 @@ QWidget { //This is a special spinBox that does color coding for states
id: spinBox;
property var backendValue;
property var baseStateFlag;
property variant backendValue;
property variant baseStateFlag;
property alias singleStep: box.singleStep;
property alias minimum: box.minimum
property alias maximum: box.maximum
@@ -22,7 +22,7 @@ QWidget { //This is a special spinBox that does color coding for states
evaluate();
}
property var isEnabled: spinBox.enabled
property variant isEnabled: spinBox.enabled
onIsEnabledChanged: {
evaluate();
}

2
share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
View File

@@ -3,7 +3,7 @@ import Bauhaus 1.0
QFrame {
styleSheetFile: "switch.css";
property var specialModeIcon;
property variant specialModeIcon;
specialModeIcon: "images/standard.png";
maximumWidth: 300;
minimumWidth: 300;

2
share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
View File

@@ -57,7 +57,7 @@ GroupBox {
id: scaleSpinBox;
backendValue: backendValues.scale;
property var backendValueValue: backendValues.scale.value;
property variant backendValueValue: backendValues.scale.value;
minimumWidth: 60;
minimum: 0.01
maximum: 10

2
share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
View File

@@ -22,7 +22,7 @@ GroupBox {
}
}
QWidget {
property var isEnabled: isBaseState
property variant isEnabled: isBaseState
onIsEnabledChanged: idLineEdit.setStyleSheet("color: "+(isEnabled?scheme.defaultColor:scheme.disabledColor));
ColorScheme{ id:scheme }

2
share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
View File

@@ -41,7 +41,7 @@ GroupBox {
text: ""
id: opacitySpinBox;
backendValue: backendValues.opacity
property var backendValueValue: backendValues.opacity.value;
property variant backendValueValue: backendValues.opacity.value;
minimumWidth: 60;
minimum: 0;
maximum: 1;

2
share/qtcreator/qmldesigner/welcomescreen.qml
View File

@@ -2,7 +2,7 @@ import Qt 4.6
Image {
id: screen
property var selectedFile
property variant selectedFile
signal openFile
source: "gradient.png"

2
src/plugins/qmldesigner/components/itemlibrary/qml/Scrollbar.qml
View File

@@ -36,7 +36,7 @@ Item {
// public
property var flickable
property variant flickable
function reset() {
handle.y = 0

4
src/plugins/qmldesigner/components/itemlibrary/qml/SectionView.qml
View File

@@ -36,13 +36,13 @@ Column {
// public
property var itemHighlight
property variant itemHighlight
property int entriesPerRow
property int cellWidth
property int cellHeight
property var currentItem: gridView.currentItem
property variant currentItem: gridView.currentItem
function expand() {
gridFrame.state = ""

2
src/plugins/qmldesigner/components/stateseditor/HorizontalScrollBar.qml
View File

@@ -1,7 +1,7 @@
import Qt 4.6
Item {
property var flickable: this;
property variant flickable: this;
property int viewPosition: 0;
property int viewSize: ( flickable.width>=0 ? flickable.width : 0 );
property int contentSize: ( flickable.contentWidth >= 0 ? flickable.contentWidth : 0 );

10
src/plugins/qmldesigner/components/stateseditor/stateslist.qml
View File

@@ -108,7 +108,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
property var color: parent.isCurrentState?highlightColor:"#4F4F4F";
property variant color: parent.isCurrentState?highlightColor:"#4F4F4F";
}
Item {
@@ -251,7 +251,7 @@ Rectangle {
id: underlay
Item {
anchors.fill:parent
property var color: parent.color
property variant color: parent.color
clip:true
Rectangle {
width:parent.width
@@ -322,7 +322,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
property var color: "#4f4f4f"
property variant color: "#4f4f4f"
}
Rectangle {
@@ -394,7 +394,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
property var color: "#4f4f4f"
property variant color: "#4f4f4f"
}
Rectangle {
@@ -460,7 +460,7 @@ Rectangle {
Loader {
sourceComponent: underlay
anchors.fill: parent
property var color: "#4f4f4f"
property variant color: "#4f4f4f"
}
Rectangle {

2
tests/auto/qml/qmldesigner/coretests/testcore.cpp
View File

@@ -6025,7 +6025,7 @@ void TestCore::loadTestFiles()
QCOMPARE(rootModelNode.nodeListProperty("states").toModelNodeList().count(), 2);
}
QSKIP("See BAUHAUS-539 (component loading is broken)", SkipAll);
QSKIP("Fails because the text editor model doesn't know about components", SkipAll);
{ //usingbutton.qml
QFile file(manualTestPath + "/usingbutton.qml");
QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text));

40
tests/auto/qml/qmleditor/lookup/data/localIdLookup.qml
View File

@@ -12,32 +12,32 @@ Item {
function opacity() {}
function visible() {}
}
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property var opacity: "wrong";
property var visible: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
property variant opacity: "wrong";
property variant visible: "wrong";
Item {
id: y
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property var opacity: "wrong";
property var visible: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
property variant opacity: "wrong";
property variant visible: "wrong";
Item {
id: z
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property var opacity: "wrong";
property var visible: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
property variant opacity: "wrong";
property variant visible: "wrong";
Item {
id: opacity
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property var opacity: "wrong";
property var visible: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
property variant opacity: "wrong";
property variant visible: "wrong";
Item {
id: visible
}

4
tests/auto/qml/qmleditor/lookup/data/localRootLookup.qml
View File

@@ -5,10 +5,10 @@ import Qt 4.6
Rectangle {
id: theRoot
property var prop
property variant prop
Item {
id: theParent
property var prop
property variant prop
Item {
id: theChild
}

6
tests/auto/qml/qmleditor/lookup/data/localScopeLookup.qml
View File

@@ -5,13 +5,13 @@ import Qt 4.6
Item {
id: theRoot
property var prop
property variant prop
Item {
id: theParent
property var prop
property variant prop
Item {
id: theChild
property var prop
property variant prop
}
}
}

18
tests/auto/qml/qmleditor/lookup/data/localScriptMethodLookup.qml
View File

@@ -8,25 +8,25 @@ Item {
Script {
function x() {}
}
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
Item {
id: theParent
Script {
function y() {}
}
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
Item {
id: theChild
Script {
function z() {}
}
property var x: "wrong";
property var y: "wrong";
property var z: "wrong";
property variant x: "wrong";
property variant y: "wrong";
property variant z: "wrong";
}
}
}