summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Craig <ext-chris.craig@nokia.com>2012-03-23 16:52:18 -0400
committerAlexei Rousskikh <ext-alexei.rousskikh@nokia.com>2012-03-23 21:57:26 +0100
commit7d55c34c407965d2d0aec4fe6895f63fe24f815b (patch)
treedd70411d0c423b35c18224ea4b1af184c3deacab
parentcc4e1a955a9566b1a2f66d47f0ca05a0926dc98e (diff)
doc cleanup
- Removed obsolete note about qtbinaryjson - Added a few missing method descriptions Change-Id: I3cf7464a880a71c25267fe13aec2bddf10d7ae4c Reviewed-by: Alexei Rousskikh <ext-alexei.rousskikh@nokia.com>
-rw-r--r--doc/src/index.qdoc8
-rw-r--r--src/qtjsonschema/schemaerror.cpp20
2 files changed, 19 insertions, 9 deletions
diff --git a/doc/src/index.qdoc b/doc/src/index.qdoc
index 7f66704..879c943 100644
--- a/doc/src/index.qdoc
+++ b/doc/src/index.qdoc
@@ -45,14 +45,6 @@ The JSON Stream classes implement a client/server framework.
\li \l{Authority notes}
\endlist
-The JSON Stream classes depend on the Qt Json experimental JSON module.
-This module may be found at http://codreview.qt-project.org under "playground/qtbinaryjson".
-After you download and compile this module, it may be used in any Qt project by adding a
-\code
-QT += json
-\endcode
-line to your .pro file.
-
\section1 Interfaces
Conceptually, the JSON Stream classes are divided into a generic client (JsonClient),
diff --git a/src/qtjsonschema/schemaerror.cpp b/src/qtjsonschema/schemaerror.cpp
index 9bfe2a2..4f1ed62 100644
--- a/src/qtjsonschema/schemaerror.cpp
+++ b/src/qtjsonschema/schemaerror.cpp
@@ -76,7 +76,25 @@ const QString SchemaError::kErrorPrefixStr = QString::fromLatin1("::");
*/
/*!
- Creates SchemaError object with specified error code and message.
+ \fn SchemaError::SchemaError()
+
+ Creates an empty schema error object.
+*/
+
+/*!
+ \fn SchemaError::SchemaError(const QJsonObject & data)
+
+ Creates an schema error object pertaining to the JSON object \a data.
+*/
+
+/*!
+ \fn QJsonObject SchemaError::object() const
+
+ Returns the object that the error pertains to.
+*/
+
+/*!
+ Creates SchemaError object with specified error \a code and \a message.
*/
SchemaError::SchemaError(ErrorCode code, const QString & message)
{