Merge lp://staging/~xavi-garcia-mena/unity-scopes-api/utils-qt into lp://staging/unity-scopes-api

Proposed by Xavi Garcia
Status: Merged
Approved by: Michi Henning
Approved revision: 569
Merged at revision: 300
Proposed branch: lp://staging/~xavi-garcia-mena/unity-scopes-api/utils-qt
Merge into: lp://staging/unity-scopes-api
Diff against target: 15841 lines (+14778/-73)
148 files modified
_clang-format (+0/-48)
data/CMakeLists.txt (+4/-0)
data/libunity-scopes-qt.pc.in (+28/-0)
debian/control (+32/-0)
debian/libunity-scopes-dev.install (+4/-2)
debian/libunity-scopes-qt-dev.debhelper.log (+4/-0)
debian/libunity-scopes-qt-dev.install (+3/-0)
debian/libunity-scopes-qt-doc.debhelper.log (+4/-0)
debian/libunity-scopes-qt-doc.install (+1/-0)
debian/libunity-scopes-qt.debhelper.log (+30/-0)
debian/libunity-scopes-qt.install (+1/-0)
debian/libunity-scopes-qt.symbols (+411/-0)
doc/Doxyfile-scopes-qt.in (+1797/-0)
doc/Doxyfile.in (+1/-1)
include/unity/scopes/CMakeLists.txt (+1/-0)
include/unity/scopes/qt/CMakeLists.txt (+3/-0)
include/unity/scopes/qt/HttpAsyncReader.h (+310/-0)
include/unity/scopes/qt/JsonAsyncReader.h (+363/-0)
include/unity/scopes/qt/JsonReader.h (+86/-0)
include/unity/scopes/qt/QActionMetadata.h (+145/-0)
include/unity/scopes/qt/QCannedQuery.h (+155/-0)
include/unity/scopes/qt/QCategorisedResult.h (+92/-0)
include/unity/scopes/qt/QCategory.h (+112/-0)
include/unity/scopes/qt/QColumnLayout.h (+133/-0)
include/unity/scopes/qt/QDepartment.h (+196/-0)
include/unity/scopes/qt/QPreviewQueryBase.h (+136/-0)
include/unity/scopes/qt/QPreviewQueryBaseAPI.h (+127/-0)
include/unity/scopes/qt/QPreviewReply.h (+103/-0)
include/unity/scopes/qt/QPreviewReplyProxy.h (+42/-0)
include/unity/scopes/qt/QPreviewWidget.h (+198/-0)
include/unity/scopes/qt/QResult.h (+264/-0)
include/unity/scopes/qt/QScopeBase.h (+155/-0)
include/unity/scopes/qt/QScopeBaseAPI.h (+116/-0)
include/unity/scopes/qt/QSearchMetadata.h (+168/-0)
include/unity/scopes/qt/QSearchQueryBase.h (+164/-0)
include/unity/scopes/qt/QSearchQueryBaseAPI.h (+126/-0)
include/unity/scopes/qt/QSearchReply.h (+164/-0)
include/unity/scopes/qt/QSearchReplyProxy.h (+42/-0)
include/unity/scopes/qt/QUtils.h (+46/-0)
include/unity/scopes/qt/QVariantBuilder.h (+125/-0)
include/unity/scopes/qt/XmlAsyncReader.h (+311/-0)
include/unity/scopes/qt/XmlReader.h (+86/-0)
include/unity/scopes/qt/internal/QActionMetadataImpl.h (+151/-0)
include/unity/scopes/qt/internal/QCannedQueryImpl.h (+88/-0)
include/unity/scopes/qt/internal/QCategorisedResultImpl.h (+95/-0)
include/unity/scopes/qt/internal/QCategoryImpl.h (+102/-0)
include/unity/scopes/qt/internal/QColumnLayoutImpl.h (+125/-0)
include/unity/scopes/qt/internal/QDepartmentImpl.h (+80/-0)
include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h (+86/-0)
include/unity/scopes/qt/internal/QPreviewReplyImpl.h (+104/-0)
include/unity/scopes/qt/internal/QPreviewWidgetImpl.h (+196/-0)
include/unity/scopes/qt/internal/QResultImpl.h (+263/-0)
include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h (+121/-0)
include/unity/scopes/qt/internal/QScopeBaseImpl.h (+65/-0)
include/unity/scopes/qt/internal/QScopeVariant.h (+88/-0)
include/unity/scopes/qt/internal/QSearchMetadataImpl.h (+170/-0)
include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h (+120/-0)
include/unity/scopes/qt/internal/QSearchReplyImpl.h (+160/-0)
include/unity/scopes/qt/internal/QVariantBuilderImpl.h (+70/-0)
include/unity/scopes/testing/Benchmark.h (+1/-1)
include/unity/scopes/testing/Category.h (+1/-1)
include/unity/scopes/testing/InProcessBenchmark.h (+1/-1)
include/unity/scopes/testing/MockPreviewReply.h (+1/-1)
include/unity/scopes/testing/MockRegistry.h (+1/-1)
include/unity/scopes/testing/MockSearchReply.h (+1/-1)
include/unity/scopes/testing/OutOfProcessBenchmark.h (+1/-1)
include/unity/scopes/testing/Result.h (+1/-1)
include/unity/scopes/testing/ScopeMetadataBuilder.h (+1/-1)
include/unity/scopes/testing/Statistics.h (+1/-1)
include/unity/scopes/testing/TypedScopeFixture.h (+1/-1)
src/scopes/CMakeLists.txt (+1/-0)
src/scopes/qt/CMakeLists.txt (+176/-0)
src/scopes/qt/HttpAsyncReader.cpp (+93/-0)
src/scopes/qt/JsonAsyncReader.cpp (+61/-0)
src/scopes/qt/JsonReader.cpp (+95/-0)
src/scopes/qt/QActionMetadata.cpp (+93/-0)
src/scopes/qt/QCannedQuery.cpp (+118/-0)
src/scopes/qt/QCategorisedResult.cpp (+66/-0)
src/scopes/qt/QCategory.cpp (+70/-0)
src/scopes/qt/QColumnLayout.cpp (+80/-0)
src/scopes/qt/QDepartment.cpp (+121/-0)
src/scopes/qt/QPreviewQueryBase.cpp (+50/-0)
src/scopes/qt/QPreviewQueryBaseAPI.cpp (+159/-0)
src/scopes/qt/QPreviewReply.cpp (+48/-0)
src/scopes/qt/QPreviewWidget.cpp (+110/-0)
src/scopes/qt/QResult.cpp (+164/-0)
src/scopes/qt/QScopeBase.cpp (+44/-0)
src/scopes/qt/QScopeBaseAPI.cpp (+57/-0)
src/scopes/qt/QSearchMetadata.cpp (+97/-0)
src/scopes/qt/QSearchQueryBase.cpp (+90/-0)
src/scopes/qt/QSearchQueryBaseAPI.cpp (+155/-0)
src/scopes/qt/QSearchReply.cpp (+57/-0)
src/scopes/qt/QUtils.cpp (+145/-0)
src/scopes/qt/QVariantBuilder.cpp (+68/-0)
src/scopes/qt/XmlAsyncReader.cpp (+58/-0)
src/scopes/qt/XmlReader.cpp (+96/-0)
src/scopes/qt/internal/QActionMetadataImpl.cpp (+130/-0)
src/scopes/qt/internal/QCannedQueryImpl.cpp (+108/-0)
src/scopes/qt/internal/QCategorisedResultImpl.cpp (+68/-0)
src/scopes/qt/internal/QCategoryImpl.cpp (+75/-0)
src/scopes/qt/internal/QColumnLayoutImpl.cpp (+108/-0)
src/scopes/qt/internal/QDepartmentImpl.cpp (+126/-0)
src/scopes/qt/internal/QPreviewQueryBaseImpl.cpp (+54/-0)
src/scopes/qt/internal/QPreviewReplyImpl.cpp (+66/-0)
src/scopes/qt/internal/QPreviewWidgetImpl.cpp (+123/-0)
src/scopes/qt/internal/QResultImpl.cpp (+247/-0)
src/scopes/qt/internal/QScopeBaseAPIImpl.cpp (+187/-0)
src/scopes/qt/internal/QScopeBaseImpl.cpp (+31/-0)
src/scopes/qt/internal/QScopeVariant.cpp (+133/-0)
src/scopes/qt/internal/QSearchMetadataImpl.cpp (+140/-0)
src/scopes/qt/internal/QSearchQueryBaseImpl.cpp (+91/-0)
src/scopes/qt/internal/QSearchReplyImpl.cpp (+68/-0)
src/scopes/qt/internal/QVariantBuilderImpl.cpp (+77/-0)
src/scopes/qt/unity-scopes-qt.map (+15/-0)
test/gtest/scopes/CMakeLists.txt (+1/-0)
test/gtest/scopes/qt/CMakeLists.txt (+8/-0)
test/gtest/scopes/qt/JsonAsyncReader/CMakeLists.txt (+15/-0)
test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp (+193/-0)
test/gtest/scopes/qt/XmlAsyncReader/CMakeLists.txt (+15/-0)
test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp (+214/-0)
test/gtest/scopes/qt/qt-bindings/CMakeLists.txt (+205/-0)
test/gtest/scopes/qt/qt-bindings/FakeScope.h (+79/-0)
test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp (+78/-0)
test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp (+76/-0)
test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp (+87/-0)
test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp (+72/-0)
test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp (+79/-0)
test/gtest/scopes/qt/qt-bindings/QEventTypeMatcher.h (+57/-0)
test/gtest/scopes/qt/qt-bindings/QMockScope.h (+58/-0)
test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp (+117/-0)
test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp (+69/-0)
test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h (+43/-0)
test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp (+88/-0)
test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp (+69/-0)
test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp (+108/-0)
test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp (+53/-0)
test/gtest/scopes/qt/qt-bindings/TestSetup.h (+83/-0)
test/gtest/scopes/qt/server/queries/json_bad_formed.txt (+1/-0)
test/gtest/scopes/qt/server/queries/json_chart_gettoptracks.txt (+1/-0)
test/gtest/scopes/qt/server/queries/not_found.txt (+9/-0)
test/gtest/scopes/qt/server/queries/xml_bad_formed_chart_gettoptracks.txt (+72/-0)
test/gtest/scopes/qt/server/queries/xml_chart_gettoptracks.txt (+105/-0)
test/gtest/scopes/qt/server/server.py (+81/-0)
test/gtest/scopes/testing/IsolatedScope/scope.h (+1/-1)
test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h (+1/-1)
test/headers/CMakeLists.txt (+19/-4)
test/headers/compile_headers.py (+16/-4)
test/headers/includechecker.py (+2/-1)
To merge this branch: bzr merge lp://staging/~xavi-garcia-mena/unity-scopes-api/utils-qt
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
Pete Woods Pending
Review via email: mp+244953@code.staging.launchpad.net

Commit message

Added library using Qt.
The library is packed in a separated debian package.

It now cointains a few helpers to retrieve json and xml documents from the web.

Description of the change

Added library using Qt.
The library is packed in a separated debian package.

It now cointains a few helpers to retrieve json and xml documents from the web.

To post a comment you must log in.
Revision history for this message
Michi Henning (michihenning) wrote :

Nice job!

I have a few niggles , but I don't think we should let that stop us. Rather, let's deal with the niggles as separate MRs. Otherwise, it'll get too difficult to coddle this branch along and keep it synced.

Looking at the symbols file, there are tons of symbols in there that aren't ours. I'm not totally sure why that's happening just yet. It will need fixing eventually. For now, it's good enough.

We have a naming discrepancy between the namespaces and the directory hierarchy. They need to be the same. The namespaces are unity::scopes::qt (which is fine), but the directories are "scopes/scopes-qt". It should be "scopes/qt" instead. The idea is that we have consistent naming everywhere, so if I see a symbol, I immediately know where in the file system I'll be able to find the source, headers, and tests, without having to run a grep.

Thanks for adding all the doc! I haven't read it in detail yet, but will :-)

One thing about the doc: doxygen spits out a bunch of warnings about undocumented things. I suspect that most of these are bogus. If you look for @cond and @endcond in the existing code, you'll find examples of what we suppress and why.

In general, I want all builds to be completely free of warnings. That's simply because, if we allow warnings to slip through, eventually, we'll miss a new warning that we really should have paid attention to. (I went through this exercise once in a code base that produced 8,500 warnings for the build. I dealt systematically with all of them. Most were harmless and could be avoided with very minor code changes. But it took two days to work though it all. By the end of it, there were five different warnings left. Each of them an absolutely guaranteed core dump. The bugs were never detected because of way insufficient test coverage...)

review: Approve
570. By Xavi Garcia

directories scopes-qt renamed to qt

571. By Xavi Garcia

Documentation warnings removed

572. By Xavi Garcia

Added Qt-bindings classes

573. By Xavi Garcia

Code formated

574. By Xavi Garcia

Updated symbols file

575. By Xavi Garcia

Changed VariantMap to QVariantMap in QResult class

576. By Xavi Garcia

Changed VariantMap to QVariantMap and removed unnecessary includes

577. By Xavi Garcia

Added unit tests for qt bindings, erased codumentation from pimpl classes

578. By Xavi Garcia

Code style script passed, Added qt headers to the headers test

579. By Xavi Garcia

QScopeVariant moved to internal classes

580. By Xavi Garcia

Changed QScopeBaseAPIImpl to call start and stop methods from the main QThread

581. By Xavi Garcia

Client's scope instance moved to the main Qt Thread

582. By Xavi Garcia

Added test to verify that start and stop methods for the client scope are called from the main Qt thread

583. By Xavi Garcia

Added functor to create the user's scope instance from the Qt Thread

584. By Xavi Garcia

Added unit test to check that the user's scope is created in the Qt thread

585. By Xavi Garcia

Typo fixed

586. By Xavi Garcia

Symbols moved to the unity::scopes::qt namespace

587. By Xavi Garcia

Fixed Reply internal copy and using qt emit to launch query

588. By Xavi Garcia

Version in debian symbols file changed to 0replaceme

589. By Xavi Garcia

Removed symbols file because of lots of conflicts with previous one

590. By Xavi Garcia

Symbols file for qt library re-added

591. By Xavi Garcia

Removing file again, as conflicts are still present

592. By Xavi Garcia

Re-added symbols file after completely rebuild it

593. By Xavi Garcia

Changed Thomas Voss surname to not include non-ascii character. The Beta character generates an error when running compile_headers.py in Jenkins

594. By Xavi Garcia

added UTF-8 encoding when opening header files

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: