summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2013-12-06 15:17:54 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-12-06 20:27:14 +0100
commitf4ce2e7360bd87ea9d6edcb5d5b4a0fa98fb823b (patch)
tree2876368e12abe87979a0e09de6ebb2e7645d4d45
parente27f9d232f38e13307ac99284fdd954932f9554a (diff)
downloadqtenginio-f4ce2e7360bd87ea9d6edcb5d5b4a0fa98fb823b.tar.gz
Doc fixes
Change-Id: I57856a9240edcd5de437633bba66b1de475e7b36 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
-rw-r--r--examples/enginio/widgets/cloudaddressbook/doc/src/cloudaddressbook.qdoc2
-rw-r--r--src/enginio_client/enginiomodel.cpp10
-rw-r--r--src/enginio_plugin/enginioqmlmodel.cpp4
3 files changed, 8 insertions, 8 deletions
diff --git a/examples/enginio/widgets/cloudaddressbook/doc/src/cloudaddressbook.qdoc b/examples/enginio/widgets/cloudaddressbook/doc/src/cloudaddressbook.qdoc
index 94d79de..58d99ad 100644
--- a/examples/enginio/widgets/cloudaddressbook/doc/src/cloudaddressbook.qdoc
+++ b/examples/enginio/widgets/cloudaddressbook/doc/src/cloudaddressbook.qdoc
@@ -85,7 +85,7 @@
\snippet cloudaddressbook/addressbookmodel.h Roles
\snippet cloudaddressbook/addressbookmodel.cpp Roles
- and as always \l{EnginioModel::data}{data()} \l{EnginioModel::setData}{setData()} functions have to be overridden
+ and as always \l{EnginioModel::data()}{data()} \l{EnginioModel::setData}{setData()} functions have to be overridden
to provide Qt::DisplayRole in the way it is needed to nicely cooperate with QTableView.
\snippet cloudaddressbook/addressbookmodel.cpp data
diff --git a/src/enginio_client/enginiomodel.cpp b/src/enginio_client/enginiomodel.cpp
index f24819d..e603283 100644
--- a/src/enginio_client/enginiomodel.cpp
+++ b/src/enginio_client/enginiomodel.cpp
@@ -75,16 +75,16 @@ const int EnginioBaseModelPrivate::IncrementalModelUpdate = -2;
\endcode
Assigning such a query to the model results in downloading of all objects from the "objects.fruits"
- collection. It is possible to \l{EnginioModel::append}{append} new objects, to
- \l{EnginioModel::setProperty}{modify} or to \l{EnginioModel::remove}{remove} them.
+ collection. It is possible to \l{EnginioModel::append()}{append} new objects, to
+ \l{EnginioModel::setProperty()}{modify} or to \l{EnginioModel::remove()}{remove} them.
The query has to result in a list of objects, each object becomes an item in the model. Properties
of the items are used as role names.
- There are a few predefined role names that will always be available (\l{EnginioModel::Roles}{Roles}).
+ There are a few predefined role names that will always be available (\l{Enginio::Role}{Role}).
The operations are executed asynchronously, which means that user interface is not
blocked while the model is initialized and updated. Every modification is divided in
- two steps; request and confirmation. For example when \l{EnginioModel::append}{append}
+ two steps; request and confirmation. For example when \l{EnginioModel::append()}{append}
is called EnginioModel returns immediately as if the operation had succeeded. In
the background it waits for confirmation from the backend and only then the operation is
really finished. It may happen that operation fails, for example
@@ -95,7 +95,7 @@ const int EnginioBaseModelPrivate::IncrementalModelUpdate = -2;
indicates whether the item is successfully updated on the server.
This role can for example meant to be used for a busy indicator while a property is being updated.
Alternatively the status of each \l{EnginioReply}{EnginioReply} returned by EnginioModel can be tracked.
- The operation is confirmed when the reply is \l{EnginioReply::isFinished}{finished} without \l{EnginioReply::isError}{error}.
+ The operation is confirmed when the reply is \l{EnginioReply::isFinished()}{finished} without \l{EnginioReply::isError()}{error}.
When a reply is finished it is the user's responsibility to delete it, it can be done
by connecting the \l{EnginioReply::finished}{finished} signal to \l{QObject::deleteLater()}{deleteLater}.
diff --git a/src/enginio_plugin/enginioqmlmodel.cpp b/src/enginio_plugin/enginioqmlmodel.cpp
index fc58837..7d2f091 100644
--- a/src/enginio_plugin/enginioqmlmodel.cpp
+++ b/src/enginio_plugin/enginioqmlmodel.cpp
@@ -83,8 +83,8 @@ QT_BEGIN_NAMESPACE
*/
/*!
- \qmlproperty Enginio1::EnginioClient Enginio1::EnginioModel::client
- The instance of \l Enginio1::EnginioClient used for this model.
+ \qmlproperty EnginioClient EnginioModel::client
+ The instance of \l EnginioClient used for this model.
*/
/*!