Merge lp:~ken-vandine/content-hub/qdoc_fixmes into lp:~content-hub-team/content-hub/trunk

[Ken VanDine]

Filled in the missing docstrings for the QML bindings

Filled in the missing docstrings for the QML bindings

[Sebastien Bacher (seb128)]

Looks fine to me, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:65
http://jenkins.qa.ubuntu.com/job/content-hub-ci/100/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-amd64-ci/3
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/3
        deb: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-armhf-ci/3/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/content-hub-trusty-i386-ci/3

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/content-hub-ci/100/rebuild

review: Approve (continuous-integration)

=== modified file 'import/Ubuntu/Content/contenthub.cpp'
--- import/Ubuntu/Content/contenthub.cpp	2013-10-23 12:30:55 +0000
+++ import/Ubuntu/Content/contenthub.cpp	2013-11-07 20:21:25 +0000
@@ -221,8 +221,6 @@
 
 /*!
  * \qmlmethod ContentHub::restoreImports()
- *
- *  FIXME add documentation
  * \internal
  */
 void ContentHub::restoreImports()
@@ -232,8 +230,6 @@
 
 /*!
  * \qmlproperty list<ContentTransfer> ContentHub::finishedImports
- *
- * FIXME add documentation
  * \internal
  */
 QQmlListProperty<ContentTransfer> ContentHub::finishedImports()

=== modified file 'import/Ubuntu/Content/contenthub.h'
--- import/Ubuntu/Content/contenthub.h	2013-10-22 20:54:47 +0000
+++ import/Ubuntu/Content/contenthub.h	2013-11-07 20:21:25 +0000
@@ -39,10 +39,6 @@
 }
 }
 
-/*!
- * \class ContentHub
- * \brief FIXME documentaion
- */ 
 class ContentHub : public QObject
 {
     Q_OBJECT

=== modified file 'import/Ubuntu/Content/contentitem.cpp'
--- import/Ubuntu/Content/contentitem.cpp	2013-10-21 16:36:02 +0000
+++ import/Ubuntu/Content/contentitem.cpp	2013-11-07 20:21:25 +0000
@@ -22,9 +22,9 @@
  * \qmltype ContentItem
  * \instantiates ContentItem
  * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME add documentation
+ * \brief Content that can be imported or exported from a ContentPeer
  *
- * FIXME add documentation
+ * A ContentItem is an item that can be imported or exported from a ContentPeer
  *
  * See documentation for ContentHub
  */
@@ -39,8 +39,7 @@
 
 /*!
  * \qmlproperty string ContentItem::name
- *
- * FIXME add documentation
+ * \internal
  */
 const QString &ContentItem::name() const
 {

=== modified file 'import/Ubuntu/Content/contentpeer.cpp'
--- import/Ubuntu/Content/contentpeer.cpp	2013-10-23 12:09:07 +0000
+++ import/Ubuntu/Content/contentpeer.cpp	2013-11-07 20:21:25 +0000
@@ -24,9 +24,10 @@
  * \qmltype ContentPeer
  * \instantiates ContentPeer
  * \inqmlmodule Ubuntu.Content 0.1
- * \brief FIXME add documentation
+ * \brief An application that can export or import a ContentType
  *
- * FIXME add documentation
+ * A ContentPeer is an application that is registered in the ContentHub as
+ * a source or destination of a ContentType
  *
  * See documentation for ContentHub
  */