Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Marco Bubke
flatpak-qt-creator
Commits
a50371f2
Commit
a50371f2
authored
Apr 22, 2010
by
Kai Koehne
Browse files
Rename variable from metaProperty to property
parent
75b0d84c
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/plugins/qmldesigner/core/instances/objectnodeinstance.cpp
View file @
a50371f2
...
...
@@ -549,12 +549,12 @@ void ObjectNodeInstance::doResetProperty(const QString &propertyName)
{
m_modelAbstractPropertyHash
.
remove
(
propertyName
);
QDeclarativeProperty
metaP
roperty
(
object
(),
propertyName
,
context
());
QDeclarativeProperty
p
roperty
(
object
(),
propertyName
,
context
());
if
(
!
metaP
roperty
.
isValid
())
if
(
!
p
roperty
.
isValid
())
return
;
QVariant
oldValue
=
metaP
roperty
.
read
();
QVariant
oldValue
=
p
roperty
.
read
();
if
(
oldValue
.
type
()
==
QVariant
::
Url
)
{
QUrl
url
=
oldValue
.
toUrl
();
QString
path
=
url
.
toLocalFile
();
...
...
@@ -563,27 +563,27 @@ void ObjectNodeInstance::doResetProperty(const QString &propertyName)
}
QDeclarativeAbstractBinding
*
binding
=
QDeclarativePropertyPrivate
::
binding
(
metaP
roperty
);
QDeclarativeAbstractBinding
*
binding
=
QDeclarativePropertyPrivate
::
binding
(
p
roperty
);
if
(
binding
)
{
binding
->
setEnabled
(
false
,
0
);
binding
->
destroy
();
}
if
(
metaP
roperty
.
isResettable
())
{
metaP
roperty
.
reset
();
}
else
if
(
metaP
roperty
.
propertyTypeCategory
()
==
QDeclarativeProperty
::
List
)
{
QDeclarativeListReference
list
=
qvariant_cast
<
QDeclarativeListReference
>
(
metaP
roperty
.
read
());
if
(
p
roperty
.
isResettable
())
{
p
roperty
.
reset
();
}
else
if
(
p
roperty
.
propertyTypeCategory
()
==
QDeclarativeProperty
::
List
)
{
QDeclarativeListReference
list
=
qvariant_cast
<
QDeclarativeListReference
>
(
p
roperty
.
read
());
if
(
!
hasFullImplementedListInterface
(
list
))
{
qWarning
()
<<
"Property list interface not fully implemented for Class "
<<
metaP
roperty
.
property
().
typeName
()
<<
" in property "
<<
metaP
roperty
.
name
()
<<
"!"
;
qWarning
()
<<
"Property list interface not fully implemented for Class "
<<
p
roperty
.
property
().
typeName
()
<<
" in property "
<<
p
roperty
.
name
()
<<
"!"
;
return
;
}
list
.
clear
();
}
else
if
(
metaP
roperty
.
isWritable
())
{
if
(
metaP
roperty
.
read
()
==
resetValue
(
propertyName
))
}
else
if
(
p
roperty
.
isWritable
())
{
if
(
p
roperty
.
read
()
==
resetValue
(
propertyName
))
return
;
metaP
roperty
.
write
(
resetValue
(
propertyName
));
p
roperty
.
write
(
resetValue
(
propertyName
));
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment