← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/scopes/Location.cpp

Committer: Michi Henning
Date: 2015-02-25 05:20:57 UTC
mfrom: (163.386.1 devel)
mto: (163.386.2 devel)
mto: This revision was merged to the branch mainline in revision 324.
Revision ID: michi.henning@canonical.com-20150225052057-9p21sge1myzaowcb

Merged devel and resolved conflicts.

files added:
_clang-format

data/libunity-scopes-qt.pc.in

data/libunity-scopes.py

debian/libunity-scopes-qt-dev.debhelper.log

debian/libunity-scopes-qt-dev.install

debian/libunity-scopes-qt-doc.debhelper.log

debian/libunity-scopes-qt-doc.install

debian/libunity-scopes-qt.debhelper.log

debian/libunity-scopes-qt.install

debian/libunity-scopes-qt.symbols

doc/Doxyfile-scopes-qt.in

include/unity/scopes/ChildScope.h

include/unity/scopes/internal/'

include/unity/scopes/internal/ChildScopesRepository.h

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

include/unity/scopes/qt

include/unity/scopes/qt/CMakeLists.txt

include/unity/scopes/qt/HttpAsyncReader.h

include/unity/scopes/qt/JsonAsyncReader.h

include/unity/scopes/qt/JsonReader.h

include/unity/scopes/qt/QActionMetadata.h

include/unity/scopes/qt/QCannedQuery.h

include/unity/scopes/qt/QCategorisedResult.h

include/unity/scopes/qt/QCategory.h

include/unity/scopes/qt/QColumnLayout.h

include/unity/scopes/qt/QDepartment.h

include/unity/scopes/qt/QPreviewQueryBase.h

include/unity/scopes/qt/QPreviewQueryBaseAPI.h

include/unity/scopes/qt/QPreviewReply.h

include/unity/scopes/qt/QPreviewReplyProxy.h

include/unity/scopes/qt/QPreviewWidget.h

include/unity/scopes/qt/QResult.h

include/unity/scopes/qt/QScopeBase.h

include/unity/scopes/qt/QScopeBaseAPI.h

include/unity/scopes/qt/QSearchMetadata.h

include/unity/scopes/qt/QSearchQueryBase.h

include/unity/scopes/qt/QSearchQueryBaseAPI.h

include/unity/scopes/qt/QSearchReply.h

include/unity/scopes/qt/QSearchReplyProxy.h

include/unity/scopes/qt/QUtils.h

include/unity/scopes/qt/QVariantBuilder.h

include/unity/scopes/qt/XmlAsyncReader.h

include/unity/scopes/qt/XmlReader.h

include/unity/scopes/qt/internal

include/unity/scopes/qt/internal/QActionMetadataImpl.h

include/unity/scopes/qt/internal/QCannedQueryImpl.h

include/unity/scopes/qt/internal/QCategorisedResultImpl.h

include/unity/scopes/qt/internal/QCategoryImpl.h

include/unity/scopes/qt/internal/QColumnLayoutImpl.h

include/unity/scopes/qt/internal/QDepartmentImpl.h

include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h

include/unity/scopes/qt/internal/QPreviewReplyImpl.h

include/unity/scopes/qt/internal/QPreviewWidgetImpl.h

include/unity/scopes/qt/internal/QResultImpl.h

include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h

include/unity/scopes/qt/internal/QScopeBaseImpl.h

include/unity/scopes/qt/internal/QScopeVariant.h

include/unity/scopes/qt/internal/QSearchMetadataImpl.h

include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h

include/unity/scopes/qt/internal/QSearchReplyImpl.h

include/unity/scopes/qt/internal/QVariantBuilderImpl.h

src/scopes/AbstractScopeBase.cpp

src/scopes/internal/ChildScopesRepository.cpp

src/scopes/internal/smartscopes/HttpClientNetCpp.cpp

src/scopes/qt

src/scopes/qt/CMakeLists.txt

src/scopes/qt/HttpAsyncReader.cpp

src/scopes/qt/JsonAsyncReader.cpp

src/scopes/qt/JsonReader.cpp

src/scopes/qt/QActionMetadata.cpp

src/scopes/qt/QCannedQuery.cpp

src/scopes/qt/QCategorisedResult.cpp

src/scopes/qt/QCategory.cpp

src/scopes/qt/QColumnLayout.cpp

src/scopes/qt/QDepartment.cpp

src/scopes/qt/QPreviewQueryBase.cpp

src/scopes/qt/QPreviewQueryBaseAPI.cpp

src/scopes/qt/QPreviewReply.cpp

src/scopes/qt/QPreviewWidget.cpp

src/scopes/qt/QResult.cpp

src/scopes/qt/QScopeBase.cpp

src/scopes/qt/QScopeBaseAPI.cpp

src/scopes/qt/QSearchMetadata.cpp

src/scopes/qt/QSearchQueryBase.cpp

src/scopes/qt/QSearchQueryBaseAPI.cpp

src/scopes/qt/QSearchReply.cpp

src/scopes/qt/QUtils.cpp

src/scopes/qt/QVariantBuilder.cpp

src/scopes/qt/XmlAsyncReader.cpp

src/scopes/qt/XmlReader.cpp

src/scopes/qt/internal

src/scopes/qt/internal/QActionMetadataImpl.cpp

src/scopes/qt/internal/QCannedQueryImpl.cpp

src/scopes/qt/internal/QCategorisedResultImpl.cpp

src/scopes/qt/internal/QCategoryImpl.cpp

src/scopes/qt/internal/QColumnLayoutImpl.cpp

src/scopes/qt/internal/QDepartmentImpl.cpp

src/scopes/qt/internal/QPreviewQueryBaseImpl.cpp

src/scopes/qt/internal/QPreviewReplyImpl.cpp

src/scopes/qt/internal/QPreviewWidgetImpl.cpp

src/scopes/qt/internal/QResultImpl.cpp

src/scopes/qt/internal/QScopeBaseAPIImpl.cpp

src/scopes/qt/internal/QScopeBaseImpl.cpp

src/scopes/qt/internal/QScopeVariant.cpp

src/scopes/qt/internal/QSearchMetadataImpl.cpp

src/scopes/qt/internal/QSearchQueryBaseImpl.cpp

src/scopes/qt/internal/QSearchReplyImpl.cpp

src/scopes/qt/internal/QVariantBuilderImpl.cpp

src/scopes/qt/unity-scopes-qt.map

test/gtest/scopes/ChildScopes

test/gtest/scopes/ChildScopes/CMakeLists.txt

test/gtest/scopes/ChildScopes/ChildScopes_test.cpp

test/gtest/scopes/ChildScopes/Registry.ini.in

test/gtest/scopes/ChildScopes/Runtime.ini.in

test/gtest/scopes/ChildScopes/TestScope.h

test/gtest/scopes/ChildScopes/Zmq.ini.in

test/gtest/scopes/LoopDetection

test/gtest/scopes/LoopDetection/CMakeLists.txt

test/gtest/scopes/LoopDetection/LoopDetection_test.cpp

test/gtest/scopes/LoopDetection/LoopScope.cpp

test/gtest/scopes/LoopDetection/LoopScope.h

test/gtest/scopes/LoopDetection/LoopScope.ini.in

test/gtest/scopes/LoopDetection/Runtime.ini.in

test/gtest/scopes/LoopDetection/TestRegistry.ini.in

test/gtest/scopes/LoopDetection/Zmq.ini.in

test/gtest/scopes/ResultCache

test/gtest/scopes/ResultCache/CMakeLists.txt

test/gtest/scopes/ResultCache/CacheScope.cpp

test/gtest/scopes/ResultCache/CacheScope.h

test/gtest/scopes/ResultCache/CacheScope.ini.in

test/gtest/scopes/ResultCache/ResultCache_test.cpp

test/gtest/scopes/ResultCache/Runtime.ini.in

test/gtest/scopes/ResultCache/TestRegistry.ini.in

test/gtest/scopes/ResultCache/Zmq.ini.in

test/gtest/scopes/ResultCache/no_cat_cache

test/gtest/scopes/ResultCache/no_dept_cache

test/gtest/scopes/ResultCache/no_filter_state_cache

test/gtest/scopes/ResultCache/no_filters_cache

test/gtest/scopes/ResultCache/no_results_cache

test/gtest/scopes/ResultCache/unconfined

test/gtest/scopes/ResultCache/unconfined/CacheScope

test/gtest/scopes/ThrowingClient

test/gtest/scopes/ThrowingClient/CMakeLists.txt

test/gtest/scopes/ThrowingClient/EchoScope.cpp

test/gtest/scopes/ThrowingClient/EchoScope.h

test/gtest/scopes/ThrowingClient/EchoScope.ini.in

test/gtest/scopes/ThrowingClient/Runtime.ini.in

test/gtest/scopes/ThrowingClient/TestRegistry.ini.in

test/gtest/scopes/ThrowingClient/ThrowingClient_test.cpp

test/gtest/scopes/ThrowingClient/Zmq.ini.in

test/gtest/scopes/ThrowingScope

test/gtest/scopes/ThrowingScope/CMakeLists.txt

test/gtest/scopes/ThrowingScope/Runtime.ini.in

test/gtest/scopes/ThrowingScope/TestRegistry.ini.in

test/gtest/scopes/ThrowingScope/ThrowingScope.cpp

test/gtest/scopes/ThrowingScope/ThrowingScope.h

test/gtest/scopes/ThrowingScope/ThrowingScope.ini.in

test/gtest/scopes/ThrowingScope/ThrowingScope_test.cpp

test/gtest/scopes/ThrowingScope/Zmq.ini.in

test/gtest/scopes/internal/RuntimeConfig/BadLogDirSize.ini

test/gtest/scopes/internal/RuntimeConfig/BadLogFileSize.ini

test/gtest/scopes/internal/RuntimeConfig/Complete.ini

test/gtest/scopes/internal/RuntimeConfig/LogDir.ini

test/gtest/scopes/internal/RuntimeConfig/NoLogDir.ini

test/gtest/scopes/qt

test/gtest/scopes/qt/CMakeLists.txt

test/gtest/scopes/qt/JsonAsyncReader

test/gtest/scopes/qt/JsonAsyncReader/CMakeLists.txt

test/gtest/scopes/qt/JsonAsyncReader/JsonAsyncReader_test.cpp

test/gtest/scopes/qt/XmlAsyncReader

test/gtest/scopes/qt/XmlAsyncReader/CMakeLists.txt

test/gtest/scopes/qt/XmlAsyncReader/XmlAsyncReader_test.cpp

test/gtest/scopes/qt/qt-bindings

test/gtest/scopes/qt/qt-bindings/CMakeLists.txt

test/gtest/scopes/qt/qt-bindings/FakeScope.h

test/gtest/scopes/qt/qt-bindings/QActionMetadata_test.cpp

test/gtest/scopes/qt/qt-bindings/QCannedQuery_test.cpp

test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp

test/gtest/scopes/qt/qt-bindings/QColumnLayout_test.cpp

test/gtest/scopes/qt/qt-bindings/QDepartment_test.cpp

test/gtest/scopes/qt/qt-bindings/QEventTypeMatcher.h

test/gtest/scopes/qt/qt-bindings/QMockScope.h

test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp

test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp

test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h

test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp

test/gtest/scopes/qt/qt-bindings/QSearchMetadata_test.cpp

test/gtest/scopes/qt/qt-bindings/QSearchQueryBaseAPI_test.cpp

test/gtest/scopes/qt/qt-bindings/QVariantBuilder_test.cpp

test/gtest/scopes/qt/qt-bindings/TestSetup.h

test/gtest/scopes/qt/server

test/gtest/scopes/qt/server/queries

test/gtest/scopes/qt/server/queries/json_bad_formed.txt

test/gtest/scopes/qt/server/queries/json_chart_gettoptracks.txt

test/gtest/scopes/qt/server/queries/not_found.txt

test/gtest/scopes/qt/server/queries/xml_bad_formed_chart_gettoptracks.txt

test/gtest/scopes/qt/server/queries/xml_chart_gettoptracks.txt

test/gtest/scopes/qt/server/server.py

files removed:
_clang-format

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

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

src/scopes/internal/smartscopes/HttpClientQt.cpp

src/scopes/internal/smartscopes/HttpClientQtThread.cpp

tools/zmq-monitor-host.py

tools/zmq-parser.py

files modified:
CMakeLists.txt

CONFIGFILES

HACKING

RELEASE_NOTES.md

STRUCTS

data/CMakeLists.txt

debian/changelog

debian/control

debian/libunity-scopes-dev.install

debian/libunity-scopes3.install

debian/libunity-scopes3.symbols

demo/CMakeLists.txt

demo/client.cpp

demo/scopes/scope-A/CMakeLists.txt

demo/scopes/scope-B/CMakeLists.txt

demo/scopes/scope-C/CMakeLists.txt

demo/scopes/scope-D/CMakeLists.txt

demo/scopes/scope-N/CMakeLists.txt

demo/scopes/scope-S/CMakeLists.txt

demo/stand-alone/CMakeLists.txt

doc/Doxyfile.in

doc/tutorial.dox

include/unity/scopes/AbstractScopeBase.h

include/unity/scopes/CMakeLists.txt

include/unity/scopes/CategorisedResult.h

include/unity/scopes/Category.h

include/unity/scopes/FilterBase.h

include/unity/scopes/FilterState.h

include/unity/scopes/Location.h

include/unity/scopes/OnlineAccountClient.h

include/unity/scopes/PreviewWidget.h

include/unity/scopes/QueryBase.h

include/unity/scopes/QueryMetadata.h

include/unity/scopes/Runtime.h

include/unity/scopes/Scope.h

include/unity/scopes/ScopeBase.h

include/unity/scopes/ScopeMetadata.h

include/unity/scopes/SearchMetadata.h

include/unity/scopes/SearchQueryBase.h

include/unity/scopes/SearchReply.h

include/unity/scopes/internal/ActivationQueryObject.h

include/unity/scopes/internal/CategoryRegistry.h

include/unity/scopes/internal/DfltConfig.h.in

include/unity/scopes/internal/LocationImpl.h

include/unity/scopes/internal/Logger.h

include/unity/scopes/internal/MWScope.h

include/unity/scopes/internal/ObjectImpl.h

include/unity/scopes/internal/PreviewQueryObject.h

include/unity/scopes/internal/PreviewReplyImpl.h

include/unity/scopes/internal/QueryCtrlImpl.h

include/unity/scopes/internal/QueryCtrlObjectBase.h

include/unity/scopes/internal/QueryObject.h

include/unity/scopes/internal/QueryObjectBase.h

include/unity/scopes/internal/RegistryImpl.h

include/unity/scopes/internal/ReplyImpl.h

include/unity/scopes/internal/ReplyObject.h

include/unity/scopes/internal/RuntimeConfig.h

include/unity/scopes/internal/RuntimeImpl.h

include/unity/scopes/internal/ScopeBaseImpl.h

include/unity/scopes/internal/ScopeConfig.h

include/unity/scopes/internal/ScopeImpl.h

include/unity/scopes/internal/ScopeMetadataImpl.h

include/unity/scopes/internal/ScopeObject.h

include/unity/scopes/internal/ScopeObjectBase.h

include/unity/scopes/internal/SearchQueryBaseImpl.h

include/unity/scopes/internal/SearchReplyImpl.h

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

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

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

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

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

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

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

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

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

include/unity/scopes/testing/MockScope.h

include/unity/scopes/testing/MockSearchReply.h

include/unity/scopes/testing/ScopeMetadataBuilder.h

include/unity/scopes/testing/TypedScopeFixture.h

include/unity/scopes/utility/BufferedResultForwarder.h

include/unity/scopes/utility/internal/BufferedResultForwarderImpl.h

include/unity/scopes/utility/internal/BufferedSearchReplyImpl.h

scoperegistry/DirWatcher.cpp

scoperegistry/FindFiles.cpp

scoperegistry/ScopesWatcher.cpp

scoperegistry/scoperegistry.cpp

smartscopesproxy/smartscopesproxy.cpp

src/scopes/CMakeLists.txt

src/scopes/CategoryRenderer.cpp

src/scopes/FilterBase.cpp

src/scopes/FilterState.cpp

src/scopes/Location.cpp

src/scopes/PreviewWidget.cpp

src/scopes/QueryBase.cpp

src/scopes/Runtime.cpp

src/scopes/ScopeBase.cpp

src/scopes/ScopeMetadata.cpp

src/scopes/SearchQueryBase.cpp

src/scopes/internal/ActivationQueryObject.cpp

src/scopes/internal/CMakeLists.txt

src/scopes/internal/CategoryRegistry.cpp

src/scopes/internal/JsonCppNode.cpp

src/scopes/internal/JsonSettingsSchema.cpp

src/scopes/internal/LocationImpl.cpp

src/scopes/internal/Logger.cpp

src/scopes/internal/ObjectImpl.cpp

src/scopes/internal/OnlineAccountClientImpl.cpp

src/scopes/internal/PreviewQueryObject.cpp

src/scopes/internal/PreviewReplyImpl.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/ResultReplyObject.cpp

src/scopes/internal/RuntimeConfig.cpp

src/scopes/internal/RuntimeImpl.cpp

src/scopes/internal/ScopeBaseImpl.cpp

src/scopes/internal/ScopeConfig.cpp

src/scopes/internal/ScopeImpl.cpp

src/scopes/internal/ScopeMetadataImpl.cpp

src/scopes/internal/ScopeObject.cpp

src/scopes/internal/SearchMetadataImpl.cpp

src/scopes/internal/SearchQueryBaseImpl.cpp

src/scopes/internal/SearchReplyImpl.cpp

src/scopes/internal/SettingsDB.cpp

src/scopes/internal/smartscopes/CMakeLists.txt

src/scopes/internal/smartscopes/SSQueryObject.cpp

src/scopes/internal/smartscopes/SSRegistryObject.cpp

src/scopes/internal/smartscopes/SSScopeObject.cpp

src/scopes/internal/smartscopes/SmartScope.cpp

src/scopes/internal/smartscopes/SmartScopesClient.cpp

src/scopes/internal/zmq_middleware/ObjectAdapter.cpp

src/scopes/internal/zmq_middleware/ScopeI.cpp

src/scopes/internal/zmq_middleware/ZmqException.cpp

src/scopes/internal/zmq_middleware/ZmqMiddleware.cpp

src/scopes/internal/zmq_middleware/ZmqObject.cpp

src/scopes/internal/zmq_middleware/ZmqReceiver.cpp

src/scopes/internal/zmq_middleware/ZmqRegistry.cpp

src/scopes/internal/zmq_middleware/ZmqScope.cpp

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

src/scopes/testing/InProcessBenchmark.cpp

src/scopes/testing/ScopeMetadataBuilder.cpp

src/scopes/utility/BufferedResultForwarder.cpp

src/scopes/utility/internal/BufferedResultForwarderImpl.cpp

src/scopes/utility/internal/BufferedSearchReplyImpl.cpp

test/gtest/scopes/Activation/Activation_test.cpp

test/gtest/scopes/Activation/Runtime.ini.in

test/gtest/scopes/CMakeLists.txt

test/gtest/scopes/Filters/Filters_test.cpp

test/gtest/scopes/Filters/Runtime.ini.in

test/gtest/scopes/IdleShutdown/IdleShutdown_test.cpp

test/gtest/scopes/IdleShutdown/Runtime.ini.in

test/gtest/scopes/Invocation/Invocation_test.cpp

test/gtest/scopes/Invocation/Runtime.ini.in

test/gtest/scopes/OnlineAccountClient/OnlineAccountClient_test.cpp

test/gtest/scopes/Registry/Registry_test.cpp

test/gtest/scopes/Registry/Runtime.ini.in

test/gtest/scopes/Registry/scopes/testscopeA/CMakeLists.txt

test/gtest/scopes/Registry/scopes/testscopeB/CMakeLists.txt

test/gtest/scopes/ReplyReaper/ReplyReaper_test.cpp

test/gtest/scopes/ReplyReaper/Runtime.ini.in

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

test/gtest/scopes/Runtime/Runtime_test.cpp

test/gtest/scopes/internal/JsonSettingsSchema/JsonSettingsSchema_test.cpp

test/gtest/scopes/internal/RegistryObject/RegistryObject_test.cpp

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

test/gtest/scopes/internal/RuntimeConfig/CacheDir.ini

test/gtest/scopes/internal/RuntimeConfig/ConfigDir.ini

test/gtest/scopes/internal/RuntimeConfig/RuntimeConfig_test.cpp

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

test/gtest/scopes/internal/ScopeConfig/ScopeConfig_test.cpp

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

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

test/gtest/scopes/internal/SettingsDB/SettingsDB_test.cpp

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/Runtime.ini.in

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

test/gtest/scopes/internal/zmq_middleware/ObjectAdapter/Runtime.ini.in

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

test/gtest/scopes/internal/zmq_middleware/RegistryI/Runtime.ini.in

test/gtest/scopes/internal/zmq_middleware/ZmqMiddleware/Runtime.ini.in

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

test/gtest/scopes/stress/Runtime.ini.in

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

test/headers/CMakeLists.txt

test/headers/compile_headers.py

test/headers/includechecker.py

valgrind-suppress

Show diffs side-by-side

added added

removed removed

src/scopes/Location.cpp

2

2

* Copyright (C) 2014 Canonical Ltd

3

3

*

4

4

* This program is free software: you can redistribute it and/or modify

5

* it under the terms of the Lesser GNU General Public License version 3 as

5

* it under the terms of the GNU Lesser General Public License version 3 as

6

6

* published by the Free Software Foundation.

7

7

*

8

8

* This program is distributed in the hope that it will be useful,

Older »