Merge lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii into lp://qastaging/u1db-qt

Proposed by Kevin Wright
Status: Merged
Approved by: Cris Dywan
Approved revision: 63
Merged at revision: 61
Proposed branch: lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii
Merge into: lp://qastaging/u1db-qt
Diff against target: 363 lines (+210/-16)
6 files modified
database.cpp (+5/-0)
database.h (+3/-0)
index.cpp (+157/-1)
index.h (+9/-0)
query.cpp (+35/-14)
query.h (+1/-1)
To merge this branch: bzr merge lp://qastaging/~kevin-wright-1/u1db-qt/index-query-april-5-ii
Reviewer Review Type Date Requested Status
Cris Dywan Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+157499@code.qastaging.launchpad.net

Commit message

Created initial index functionality. Modified source for both Index and Query. Within the Index source, QVariantMaps are generated (based on the index expressions), using appropriate data, and put into a QList, which is used by Query::data as its return value. Some known issues: currently will match on any index expression criteria (rather than on all criteria), and will not recognize new databases / documents (but has no problems with existing ones).

Also, fixed index.h and query.h by adding back in some important ifdef Q_DOC conditions that were overwritten. Additionally added back in one qdoc 'inmodule' markup line that was accidently erased in query.cpp.

Description of the change

Created initial index functionality. Modified source for both Index and Query. Within the Index source, QVariantMaps are generated (based on the index expressions), using appropriate data, and put into a QList, which is used by Query::data as its return value. Some known issues: currently will match on any index expression criteria (rather than on all criteria), and will not recognize new databases / documents (but has no problems with existing ones).

Also, fixed index.h and query.h by adding back in some important ifdef Q_DOC conditions that were overwritten. Additionally added back in one qdoc 'inmodule' markup line that was accidently erased in query.cpp.

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
63. By Kevin Wright

Fixed a critical issue with Index and Query where newly created databases / documents were not being realized in the model.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Cris Dywan (kalikiana) wrote :

Nice! Thanks a lot for fixing the qdoc stuff.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: