Merge lp:~kalikiana/u1db-qt/range2 into lp:u1db-qt

[Cris Dywan]

Remove range property for now, it's not implemented'

Remove range property for now, it's not implemented'

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

FAILED: Continuous integration, rev:80
http://91.189.93.125:8080/job/u1db-qt-ci/16/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-quantal-amd64-ci/16/console
    FAILURE: http://91.189.93.125:8080/job/u1db-qt-raring-amd64-ci/16/console

Click here to trigger a rebuild:
http://91.189.93.125:8080/job/u1db-qt-ci/16/rebuild

review: Needs Fixing (continuous-integration)

[lp:~kalikiana/u1db-qt/range2]

81. By Cris Dywan on 2013-04-23

Fill in documentation for remaining C++ class methods

82. By Cris Dywan on 2013-04-23

Rename the overview - qdoc expects a page titled All Modules

83. By Cris Dywan on 2013-04-23

Fix un-closed comment in concepts.qdoc

84. By Cris Dywan on 2013-04-23

Remove redundant documentCount variable

85. By Cris Dywan on 2013-04-23

Don't bother calling 'assistant', leave it to install

86. By Cris Dywan on 2013-04-23

Remove dataIndexed and documentsAvailable signals

87. By Cris Dywan on 2013-04-23

Sort out documentation of signals and properties

88. By Cris Dywan on 2013-04-23

Merge 'Initial ground work splitting off query tests'

89. By Cris Dywan on 2013-04-23

Document Query::results property

90. By Cris Dywan on 2013-04-23

Mark up Javascript-only snippets as \code not \qml

91. By Cris Dywan on 2013-04-23

Work-around to make build fail if qdoc warns

Unmerged revisions

=== modified file 'src/query.cpp'
--- src/query.cpp	2013-04-22 13:19:33 +0000
+++ src/query.cpp	2013-04-23 12:44:24 +0000
@@ -36,8 +36,7 @@
     \inmodule U1db
     \ingroup modules
 
-    \brief The Query class generates a filtered list of documents based on either
-    a query or a range, and using the given Index.
+    \brief The Query class generates a filtered list of documents based on a query using the given Index.
 
     Query can be used as a QAbstractListModel, delegates will then have access to \a docId and \a contents
     analogous to the properties of Document.
@@ -287,8 +286,8 @@
 }
 
 /*!
-    Sets the Index to use. The index must have a valid name and index expressions,
-    then either a range or query can be set.
+    Sets the Index to use. The index must have a valid name and index expressions.
+    If no query is set, the default is all results of the index.
  */
 void
 Query::setIndex(Index* index)
@@ -321,8 +320,8 @@
 
 
 /*!
-    Sets a range, such as ['match', false].
-    Only one of query and range is used - setting range unsets the query.
+    Sets a query, in one of the allowed forms such as 'value', ['value'] or [{'sub-field': 'value'].
+    The default is equivalent to '*'.
  */
 void
 Query::setQuery(QVariant query)
@@ -330,38 +329,11 @@
     if (m_query == query)
         return;
 
-    if (m_range.isValid())
-        m_range = QVariant();
-
     m_query = query;
     Q_EMIT queryChanged(query);
     onDataInvalidated();
 }
 
-QVariant
-Query::getRange()
-{
-    return m_range;
-}
-
-/*!
-    Sets a range, such as [['a', 'b'], ['*']].
-    Only one of query and range is used - setting range unsets the query.
- */
-void
-Query::setRange(QVariant range)
-{
-    if (m_range == range)
-        return;
-
-    if (m_query.isValid())
-        m_query = QVariant();
-
-    m_range = range;
-    Q_EMIT rangeChanged(range);
-    onDataInvalidated();
-}
-
 QT_END_NAMESPACE_U1DB
 
 #include "moc_query.cpp"

=== modified file 'src/query.h'
--- src/query.h	2013-04-19 11:19:43 +0000
+++ src/query.h	2013-04-23 12:44:24 +0000
@@ -35,7 +35,6 @@
     Q_PROPERTY(QT_PREPEND_NAMESPACE_U1DB(Index*) index READ getIndex WRITE setIndex NOTIFY indexChanged)
 #endif
     Q_PROPERTY(QVariant query READ getQuery WRITE setQuery NOTIFY queryChanged)
-    Q_PROPERTY(QVariant range READ getRange WRITE setRange NOTIFY rangeChanged)
 public:
     Query(QObject* parent = 0);
     ~Query() { }
@@ -49,8 +48,6 @@
     void setIndex(Index* index);
     QVariant getQuery();
     void setQuery(QVariant query);
-    QVariant getRange();
-    void setRange(QVariant range);
 
     void generateQueryResults();
     bool iterateQueryList(QVariant query, QString field, QString value);
@@ -61,13 +58,11 @@
 Q_SIGNALS:
     void indexChanged(Index* index);
     void queryChanged(QVariant query);
-    void rangeChanged(QVariant range);
 private:
     Q_DISABLE_COPY(Query)
     Index* m_index;
     QHash<int, QVariantMap> m_hash;
     QVariant m_query;
-    QVariant m_range;
 
     void onDataInvalidated();
 };