summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorBea Lam <bea.lam@nokia.com>2010-05-20 04:08:41 (GMT)
committerBea Lam <bea.lam@nokia.com>2010-05-20 04:11:51 (GMT)
commit5732a44092e17829985a381400bafccc326a0d1f (patch)
tree49d83690535244d81b421806042a81a0764238d1 /src/declarative/qml
parent91251b69edd966965bf7944aec642321c362af2a (diff)
downloadQt-5732a44092e17829985a381400bafccc326a0d1f.zip
Qt-5732a44092e17829985a381400bafccc326a0d1f.tar.gz
Qt-5732a44092e17829985a381400bafccc326a0d1f.tar.bz2
Rename Component::errorsString() -> errorString() (and also for
QDeclarativeComponent)
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qdeclarativecomponent.cpp8
-rw-r--r--src/declarative/qml/qdeclarativecomponent.h2
2 files changed, 5 insertions, 5 deletions
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index e757675..3f11425 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -246,7 +246,7 @@ QDeclarativeComponent::~QDeclarativeComponent()
\o Component.Ready - the component has been loaded, and can be used to create instances.
\o Component.Loading - the component is currently being loaded
\o Component.Error - an error occurred while loading the component.
- Calling errorsString() will provide a human-readable description of any errors.
+ Calling errorString() will provide a human-readable description of any errors.
\endlist
*/
@@ -492,7 +492,7 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
}
/*!
- \qmlmethod string Component::errorsString()
+ \qmlmethod string Component::errorString()
Returns a human-readable description of any errors.
@@ -504,9 +504,9 @@ QList<QDeclarativeError> QDeclarativeComponent::errors() const
/*!
\internal
- errorsString is only meant as a way to get the errors in script
+ errorString is only meant as a way to get the errors in script
*/
-QString QDeclarativeComponent::errorsString() const
+QString QDeclarativeComponent::errorString() const
{
Q_D(const QDeclarativeComponent);
QString ret;
diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h
index 688e233..1d1fca7 100644
--- a/src/declarative/qml/qdeclarativecomponent.h
+++ b/src/declarative/qml/qdeclarativecomponent.h
@@ -86,7 +86,7 @@ public:
bool isLoading() const;
QList<QDeclarativeError> errors() const;
- Q_INVOKABLE QString errorsString() const;
+ Q_INVOKABLE QString errorString() const;
qreal progress() const;