~mardy/unity-scopes-api/clientid-1554040

« back to all changes in this revision

Viewing changes to include/unity/scopes/internal/QueryCtrlImpl.h

Committer: CI bot
Author(s): Tarmac
Date: 2014-03-12 16:58:32 UTC
mfrom: (163.45.63 devel)
Revision ID: ps-jenkins@lists.canonical.com-20140312165832-ngmnoud825y533pk

Sync with devel branch - updated scopes API to 0.4.0. See RELEASE_NOTES for list of all changes.

files added:
debian/libunity-scopes0.symbols

demo/scopes/scope-A/scope-A.map

doc/index.html

include/unity/scopes/Object.h

include/unity/scopes/PreviewReply.h

include/unity/scopes/PreviewReplyProxyFwd.h

include/unity/scopes/Registry.h

include/unity/scopes/Scope.h

include/unity/scopes/SearchReply.h

include/unity/scopes/SearchReplyProxyFwd.h

include/unity/scopes/internal/PreviewReplyImpl.h

include/unity/scopes/internal/QueryMetadataImpl.h

include/unity/scopes/internal/SearchReplyImpl.h

include/unity/scopes/testing

include/unity/scopes/testing/Benchmark.h

include/unity/scopes/testing/CMakeLists.txt

include/unity/scopes/testing/Category.h

include/unity/scopes/testing/InProcessBenchmark.h

include/unity/scopes/testing/MockObject.h

include/unity/scopes/testing/MockPreviewReply.h

include/unity/scopes/testing/MockRegistry.h

include/unity/scopes/testing/MockSearchReply.h

include/unity/scopes/testing/OutOfProcessBenchmark.h

include/unity/scopes/testing/Result.h

include/unity/scopes/testing/ScopeMetadataBuilder.h

include/unity/scopes/testing/Statistics.h

include/unity/scopes/testing/TypedScopeFixture.h

src/scopes/PreviewReply.cpp

src/scopes/Registry.cpp

src/scopes/Reply.cpp

src/scopes/SearchReply.cpp

src/scopes/internal/PreviewReplyImpl.cpp

src/scopes/internal/SearchReplyImpl.cpp

src/scopes/testing

src/scopes/testing/Benchmark.cpp

src/scopes/testing/CMakeLists.txt

src/scopes/testing/InProcessBenchmark.cpp

src/scopes/testing/OutOfProcessBenchmark.cpp

src/scopes/testing/Result.cpp

src/scopes/testing/ScopeMetadataBuilder.cpp

src/scopes/testing/Statistics.cpp

test/gtest/scopes/Runtime/PusherScope.cpp

test/gtest/scopes/Runtime/PusherScope.h

test/gtest/scopes/internal/ResultReplyObject

test/gtest/scopes/internal/ResultReplyObject/CMakeLists.txt

test/gtest/scopes/internal/ResultReplyObject/Registry.ini.in

test/gtest/scopes/internal/ResultReplyObject/ResultReplyObject_test.cpp

test/gtest/scopes/internal/ResultReplyObject/Runtime.ini.in

test/gtest/scopes/internal/ResultReplyObject/Zmq.ini.in

test/gtest/scopes/testing

test/gtest/scopes/testing/CMakeLists.txt

test/gtest/scopes/testing/IsolatedScope

test/gtest/scopes/testing/IsolatedScope/CMakeLists.txt

test/gtest/scopes/testing/IsolatedScope/IsolatedScope_test.cpp

test/gtest/scopes/testing/IsolatedScope/scope.cpp

test/gtest/scopes/testing/IsolatedScope/scope.h

test/gtest/scopes/testing/IsolatedScopeBenchmark

test/gtest/scopes/testing/IsolatedScopeBenchmark/CMakeLists.txt

test/gtest/scopes/testing/IsolatedScopeBenchmark/IsolatedScopeBenchmark_test.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/config.h.in

test/gtest/scopes/testing/IsolatedScopeBenchmark/reference_result.xml

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.cpp

test/gtest/scopes/testing/IsolatedScopeBenchmark/scope.h

test/gtest/scopes/testing/Statistics

test/gtest/scopes/testing/Statistics/CMakeLists.txt

test/gtest/scopes/testing/Statistics/Statistics_test.cpp

test/gtest/scopes/testing/Statistics/config.h.in

unity-scopes.map

files removed:
include/unity/scopes/ObjectProxy.h

include/unity/scopes/PreviewReply.h

include/unity/scopes/QueryMetadata.h

include/unity/scopes/Registry.h

include/unity/scopes/Scope.h

include/unity/scopes/SearchReply.h

include/unity/scopes/internal/QueryMetadataImpl.h

smartscopesproxy/sss_test_server

smartscopesproxy/sss_test_server/sss_test_server.py

src/scopes/PreviewReply.cpp

src/scopes/QueryMetadata.cpp

src/scopes/Registry.cpp

src/scopes/ReplyBase.cpp

src/scopes/SearchReply.cpp

test/gtest/libgtest

test/gtest/libgtest/CMakeLists.txt

files renamed:
include/unity/scopes/ActivationListener.h => include/unity/scopes/ActivationListenerBase.h

include/unity/scopes/ActivationBase.h => include/unity/scopes/ActivationQueryBase.h

include/unity/scopes/Query.h => include/unity/scopes/CannedQuery.h

include/unity/scopes/PreviewListener.h => include/unity/scopes/PreviewListenerBase.h

include/unity/scopes/PreviewQuery.h => include/unity/scopes/PreviewQueryBase.h

include/unity/scopes/ReplyBase.h => include/unity/scopes/Reply.h

include/unity/scopes/SearchListener.h => include/unity/scopes/SearchListenerBase.h

include/unity/scopes/SearchQuery.h => include/unity/scopes/SearchQueryBase.h

include/unity/scopes/internal/ActivationBaseImpl.h => include/unity/scopes/internal/ActivationQueryBaseImpl.h

include/unity/scopes/internal/QueryImpl.h => include/unity/scopes/internal/CannedQueryImpl.h

include/unity/scopes/internal/ObjectProxyImpl.h => include/unity/scopes/internal/ObjectImpl.h

src/scopes/ActivationListener.cpp => src/scopes/ActivationListenerBase.cpp

src/scopes/ActivationBase.cpp => src/scopes/ActivationQueryBase.cpp

src/scopes/Query.cpp => src/scopes/CannedQuery.cpp

src/scopes/ObjectProxy.cpp => src/scopes/Object.cpp

src/scopes/PreviewListener.cpp => src/scopes/PreviewListenerBase.cpp

src/scopes/PreviewQuery.cpp => src/scopes/PreviewQueryBase.cpp

src/scopes/SearchListener.cpp => src/scopes/SearchListenerBase.cpp

src/scopes/SearchQuery.cpp => src/scopes/SearchQueryBase.cpp

src/scopes/internal/ActivationBaseImpl.cpp => src/scopes/internal/ActivationQueryBaseImpl.cpp

src/scopes/internal/QueryImpl.cpp => src/scopes/internal/CannedQueryImpl.cpp

src/scopes/internal/ObjectProxyImpl.cpp => src/scopes/internal/ObjectImpl.cpp

test/gtest/scopes/Query/ => test/gtest/scopes/CannedQuery/

test/gtest/scopes/Query/Query_test.cpp => test/gtest/scopes/CannedQuery/CannedQuery_test.cpp

test/gtest/scopes/Runtime/scope.cpp => test/gtest/scopes/Runtime/TestScope.cpp

test/gtest/scopes/Runtime/scope.h => test/gtest/scopes/Runtime/TestScope.h

test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromRun.cpp.THIS => test/gtest/scopes/internal/ScopeLoader/ThrowUnityExFromRun.cpp

files modified:
CMakeLists.txt

HACKING

RELEASE_NOTES.txt

STRUCTS

data/CMakeLists.txt

data/Registry.ini.in

data/SSRegistry.ini.in

data/libunity-scopes.pc.in

data/smart-scopes-proxy.conf.in

debian/changelog

debian/control

debian/libunity-scopes0.install

demo/client.cpp

demo/scopes/scope-A/CMakeLists.txt

demo/scopes/scope-A/scope-A.cpp

demo/scopes/scope-A/scope-A.ini.in

demo/scopes/scope-B/scope-B.cpp

demo/scopes/scope-B/scope-B.ini.in

demo/scopes/scope-C/scope-C.cpp

demo/scopes/scope-C/scope-C.ini.in

demo/scopes/scope-D/scope-D.cpp

demo/scopes/scope-D/scope-D.ini.in

demo/scopes/scope-N/scope-N.cpp

demo/scopes/scope-N/scope-N.ini.in

demo/scopes/scope-S/scope-S.cpp

demo/scopes/scope-S/scope-S.ini.in

demo/stand-alone/stand-alone-client.cpp

doc/Doxyfile-devel.in

doc/Doxyfile.in

doc/tutorial.dox

include/unity/scopes/ActionMetadata.h

include/unity/scopes/ActivationResponse.h

include/unity/scopes/Annotation.h

include/unity/scopes/CMakeLists.txt

include/unity/scopes/CategorisedResult.h

include/unity/scopes/Category.h

include/unity/scopes/CategoryRenderer.h

include/unity/scopes/ColumnLayout.h

include/unity/scopes/Department.h

include/unity/scopes/FilterBase.h

include/unity/scopes/FilterOption.h

include/unity/scopes/FilterState.h

include/unity/scopes/Link.h

include/unity/scopes/ListenerBase.h

include/unity/scopes/ObjectProxyFwd.h

include/unity/scopes/OptionSelectorFilter.h

include/unity/scopes/PreviewWidget.h

include/unity/scopes/QueryBase.h

include/unity/scopes/QueryCtrl.h

include/unity/scopes/QueryCtrlProxyFwd.h

include/unity/scopes/RegistryProxyFwd.h

include/unity/scopes/ReplyProxyFwd.h

include/unity/scopes/Result.h

include/unity/scopes/Runtime.h

include/unity/scopes/ScopeBase.h

include/unity/scopes/ScopeExceptions.h

include/unity/scopes/ScopeMetadata.h

include/unity/scopes/ScopeProxyFwd.h

include/unity/scopes/SearchMetadata.h

include/unity/scopes/Variant.h

include/unity/scopes/VariantBuilder.h

include/unity/scopes/Version.h.in

include/unity/scopes/internal/ActionMetadataImpl.h

include/unity/scopes/internal/ActivationQueryObject.h

include/unity/scopes/internal/ActivationReplyObject.h

include/unity/scopes/internal/ActivationResponseImpl.h

include/unity/scopes/internal/AnnotationImpl.h

include/unity/scopes/internal/CategorisedResultImpl.h

include/unity/scopes/internal/CategoryImpl.h

include/unity/scopes/internal/CategoryRendererImpl.h

include/unity/scopes/internal/ConfigBase.h

include/unity/scopes/internal/DepartmentImpl.h

include/unity/scopes/internal/DynamicLoader.h

include/unity/scopes/internal/FilterBaseImpl.h

include/unity/scopes/internal/FilterOptionImpl.h

include/unity/scopes/internal/LinkImpl.h

include/unity/scopes/internal/MWRegistry.h

include/unity/scopes/internal/MWScope.h

include/unity/scopes/internal/MiddlewareBase.h

include/unity/scopes/internal/OptionSelectorFilterImpl.h

include/unity/scopes/internal/PreviewQueryObject.h

include/unity/scopes/internal/PreviewReplyObject.h

include/unity/scopes/internal/PreviewWidgetImpl.h

include/unity/scopes/internal/QueryBaseImpl.h

include/unity/scopes/internal/QueryCtrlImpl.h

include/unity/scopes/internal/QueryObject.h

include/unity/scopes/internal/QueryObjectBase.h

include/unity/scopes/internal/RegistryException.h

include/unity/scopes/internal/RegistryImpl.h

include/unity/scopes/internal/RegistryObject.h

include/unity/scopes/internal/RegistryObjectBase.h

include/unity/scopes/internal/ReplyImpl.h

include/unity/scopes/internal/ReplyObject.h

include/unity/scopes/internal/ResultImpl.h

include/unity/scopes/internal/ResultReplyObject.h

include/unity/scopes/internal/RuntimeImpl.h

include/unity/scopes/internal/ScopeConfig.h

include/unity/scopes/internal/ScopeImpl.h

include/unity/scopes/internal/ScopeLoader.h

include/unity/scopes/internal/ScopeMetadataImpl.h

include/unity/scopes/internal/ScopeObject.h

include/unity/scopes/internal/ScopeObjectBase.h

include/unity/scopes/internal/SearchMetadataImpl.h

include/unity/scopes/internal/smartscopes/HttpClientInterface.h

include/unity/scopes/internal/smartscopes/HttpClientQt.h

include/unity/scopes/internal/smartscopes/HttpClientQtThread.h

include/unity/scopes/internal/smartscopes/SSQueryObject.h

include/unity/scopes/internal/smartscopes/SSRegistryObject.h

include/unity/scopes/internal/smartscopes/SSScopeObject.h

include/unity/scopes/internal/smartscopes/SmartScope.h

include/unity/scopes/internal/smartscopes/SmartScopesClient.h

include/unity/scopes/internal/zmq_middleware/ScopeI.h

include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h

include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h

include/unity/scopes/internal/zmq_middleware/ZmqScope.h

scoperegistry/scoperegistry.cpp

src/CMakeLists.txt

src/scopes/ActionMetadata.cpp

src/scopes/ActivationResponse.cpp

src/scopes/Annotation.cpp

src/scopes/CMakeLists.txt

src/scopes/CategorisedResult.cpp

src/scopes/Category.cpp

src/scopes/CategoryRenderer.cpp

src/scopes/ColumnLayout.cpp

src/scopes/Department.cpp

src/scopes/FilterBase.cpp

src/scopes/FilterOption.cpp

src/scopes/FilterState.cpp

src/scopes/Link.cpp

src/scopes/PreviewWidget.cpp

src/scopes/QueryBase.cpp

src/scopes/QueryCtrl.cpp

src/scopes/Result.cpp

src/scopes/Runtime.cpp

src/scopes/Scope.cpp

src/scopes/ScopeBase.cpp

src/scopes/ScopeExceptions.cpp

src/scopes/ScopeMetadata.cpp

src/scopes/SearchMetadata.cpp

src/scopes/Variant.cpp

src/scopes/internal/ActionMetadataImpl.cpp

src/scopes/internal/ActivationQueryObject.cpp

src/scopes/internal/ActivationReplyObject.cpp

src/scopes/internal/ActivationResponseImpl.cpp

src/scopes/internal/AnnotationImpl.cpp

src/scopes/internal/CMakeLists.txt

src/scopes/internal/CategorisedResultImpl.cpp

src/scopes/internal/CategoryImpl.cpp

src/scopes/internal/CategoryRendererImpl.cpp

src/scopes/internal/ConfigBase.cpp

src/scopes/internal/DepartmentImpl.cpp

src/scopes/internal/DynamicLoader.cpp

src/scopes/internal/FilterBaseImpl.cpp

src/scopes/internal/LinkImpl.cpp

src/scopes/internal/PreviewQueryObject.cpp

src/scopes/internal/PreviewReplyObject.cpp

src/scopes/internal/PreviewWidgetImpl.cpp

src/scopes/internal/QueryBaseImpl.cpp

src/scopes/internal/QueryCtrlImpl.cpp

src/scopes/internal/QueryObject.cpp

src/scopes/internal/RegistryImpl.cpp

src/scopes/internal/RegistryObject.cpp

src/scopes/internal/ReplyImpl.cpp

src/scopes/internal/ReplyObject.cpp

src/scopes/internal/ResultImpl.cpp

src/scopes/internal/ResultReplyObject.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeConfig.cpp

src/scopes/internal/ScopeImpl.cpp

src/scopes/internal/ScopeLoader.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/ScopeObject.cpp

src/scopes/internal/SearchMetadataImpl.cpp

src/scopes/internal/UniqueID.cpp

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSRegistryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/RegistryI.cpp

src/scopes/internal/zmq_middleware/ScopeI.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

src/scopes/internal/zmq_middleware/capnproto/Registry.capnp

test/CMakeLists.txt

test/gtest/CMakeLists.txt

test/gtest/scopes/Activation/Activation_test.cpp

test/gtest/scopes/Activation/TestScope.h

test/gtest/scopes/ActivationResponse/ActivationResponse_test.cpp

test/gtest/scopes/Annotation/Annotation_test.cpp

test/gtest/scopes/CMakeLists.txt

test/gtest/scopes/CannedQuery/CMakeLists.txt

test/gtest/scopes/CategorisedResult/CategorisedResult_test.cpp

test/gtest/scopes/CategoryRenderer/CategoryRenderer_test.cpp

test/gtest/scopes/ColumnLayout/ColumnLayout_test.cpp

test/gtest/scopes/Department/Department_test.cpp

test/gtest/scopes/Filters/Filters_test.cpp

test/gtest/scopes/Filters/TestScope.h

test/gtest/scopes/OptionSelectorFilter/OptionSelectorFilter_test.cpp

test/gtest/scopes/PreviewWidget/PreviewWidget_test.cpp

test/gtest/scopes/QueryMetadata/QueryMetadata_test.cpp

test/gtest/scopes/Runtime/CMakeLists.txt

test/gtest/scopes/Runtime/Runtime_test.cpp

test/gtest/scopes/ScopeBase/scopelib.cpp

test/gtest/scopes/Variant/Variant_test.cpp

test/gtest/scopes/VariantBuilder/VariantBuilder_test.cpp

test/gtest/scopes/internal/CMakeLists.txt

test/gtest/scopes/internal/JsonNode/JsonNode_test.cpp

test/gtest/scopes/internal/Reaper/Reaper_test.cpp

test/gtest/scopes/internal/ScopeLoader/BadVersion.cpp

test/gtest/scopes/internal/ScopeLoader/MyScope.h

test/gtest/scopes/internal/ScopeLoader/ScopeLoader_test.cpp

test/gtest/scopes/internal/ScopeMetadataImpl/ScopeMetadataImpl_test.cpp

test/gtest/scopes/internal/ThreadSafeQueue/ThreadSafeQueue_test.cpp

test/gtest/scopes/internal/UniqueID/UniqueID_test.cpp

test/gtest/scopes/internal/smartscopes/HttpClient/FakeServer.py

test/gtest/scopes/internal/smartscopes/HttpClient/HttpClient_test.cpp

test/gtest/scopes/internal/smartscopes/RaiiServer.h

test/gtest/scopes/internal/smartscopes/SmartScopesClient/FakeSss.py

test/gtest/scopes/internal/smartscopes/SmartScopesClient/SmartScopesClient_test.cpp

test/gtest/scopes/internal/smartscopes/smartscopesproxy/smartscopesproxy_test.cpp

test/gtest/scopes/internal/zmq_middleware/RegistryI/RegistryI_test.cpp

test/gtest/scopes/internal/zmq_middleware/VariantConverter/VariantConverter_test.cpp

test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/ZmqMiddleware_test.cpp

tsan-suppress

valgrind-suppress

Show diffs side-by-side

added added

removed removed

include/unity/scopes/internal/QueryCtrlImpl.h

#include <unity/scopes/internal/MWQueryCtrlProxyFwd.h>

#include <unity/scopes/internal/MWReplyProxyFwd.h>

#include <unity/scopes/internal/ObjectProxyImpl.h>

#include <unity/scopes/QueryCtrlProxyFwd.h>

#include <unity/scopes/internal/ObjectImpl.h>

#include <unity/scopes/QueryCtrl.h>

namespace unity

{

// Calls to push() after finished() was called are ignored.

// If the proxy goes out of scope before finished was called, it implicitly calls finished().

class QueryCtrlImpl : public virtual ObjectProxyImpl

class QueryCtrlImpl : public virtual unity::scopes::QueryCtrl, public virtual ObjectImpl

{

public:

QueryCtrlImpl(MWQueryCtrlProxy const& ctrl_proxy, MWReplyProxy const& reply_proxy);

virtual ~QueryCtrlImpl();

void cancel();

static QueryCtrlProxy create(MWQueryCtrlProxy const& ctrl_proxy, MWReplyProxy const& reply_proxy);

virtual void cancel() override;

private:

MWQueryCtrlProxy fwd() const;

Older »