Merge lp:unity-scopes-api/staging into lp:unity-scopes-api

[Paweł Stołowski]

Merge devel changes:
* Added support for ChildScopes scope .ini option.
* Added app_directory() method to ScopeBase.
* Added support for Version attribute in scope.ini file, and added
  version() accessor to ScopeMetadata.
* Added missing methods for settings_definitions(), location_data_needed(),
  and child_scope_ids() to testing::ScopeMetadataBuilder.
* Simplified header guards with pragma once.
* Various other fixes and internal improvements.
* Added support for Tags scope .ini option.

Merge devel changes:
* Added support for ChildScopes scope .ini option.
* Added app_directory() method to ScopeBase.
* Added support for Version attribute in scope.ini file, and added
  version() accessor to ScopeMetadata.
* Added missing methods for settings_definitions(), location_data_needed(),
  and child_scope_ids() to testing::ScopeMetadataBuilder.
* Simplified header guards with pragma once.
* Various other fixes and internal improvements.

[Pete Woods (pete-woods)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:264
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/476/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/1
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/1/artifact/work/output/*zip*/output.zip
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-scopes-api-ci/476/rebuild

review: Needs Fixing (continuous-integration)

[lp:unity-scopes-api/staging]

265. By Paweł Stołowski on 2014-11-27

Merged devel.

266. By Paweł Stołowski on 2014-11-28

Fixed duplicated changelog entry.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-10-22 15:46:36 +0000
+++ CMakeLists.txt	2014-11-28 11:54:53 +0000
@@ -69,6 +69,7 @@
 pkg_check_modules(JSONCPP jsoncpp REQUIRED)
 pkg_check_modules(LIBACCOUNTS REQUIRED libaccounts-glib)
 pkg_check_modules(LIBSIGNON REQUIRED libsignon-glib)
+pkg_check_modules(ZMQLIB libzmq REQUIRED)
 
 find_program(LTTNG_EXECUTABLE lttng)
 if (NOT LTTNG_EXECUTABLE)
@@ -195,17 +196,12 @@
 # API version
 set(UNITY_SCOPES_MAJOR 0)
 set(UNITY_SCOPES_MINOR 6)
-set(UNITY_SCOPES_MICRO 8)
+set(UNITY_SCOPES_MICRO 9)
 set(UNITY_SCOPES_SOVERSION 3)
 
 # Version for testing, with all symbols visible
 set(UNITY_SCOPES_TEST_LIB ${UNITY_SCOPES_LIB}-test)
 
-find_library(ZMQLIB zmq)
-if(NOT ZMQLIB)
-  message(FATAL_ERROR "Zmq lib not found.")
-endif()
-
 find_library(ZMQPPLIB zmqpp)
 if(NOT ZMQPPLIB)
   message(FATAL_ERROR "Zmqpp lib not found.")
@@ -227,6 +223,13 @@
 endif()
 
 
+# Stop complaints during the generation phase about executables depending
+# on Qt5::Core and Qt5::Network. They are bogus because only
+# only smartscopes uses these.
+if(POLICY CMP0028)
+    cmake_policy(SET CMP0028 OLD)
+endif()
+
 # Other libraries we depend on
 set(OTHER_LIBS
     ${OTHER_LIBS}
@@ -234,7 +237,7 @@
     ${JSONCPP_LDFLAGS}
     ${PROCESS_CPP_LDFLAGS}
     ${ZMQPPLIB}
-    ${ZMQLIB}
+    ${ZMQLIB_LDFLAGS}
     ${CAPNPLIB}
     ${KJLIB}
     ${DLLIB}

=== modified file 'CONFIGFILES'
--- CONFIGFILES	2014-10-10 07:01:36 +0000
+++ CONFIGFILES	2014-11-28 11:54:53 +0000
@@ -92,9 +92,9 @@
   config group, otherwise the middleware can prematurely conclude that
   a locate() request failed to start a scope.
 
-- DataDir
+- CacheDir
 
-  The parent directory under which the run time writes scope-specific data files
+  The parent directory under which a scope can write scope-specific data files
   (such as caches).
 
   The default value is $HOME/.local/share/unity-scopes.
@@ -105,6 +105,22 @@
   $HOME/.local/share/unity-scopes/leaf-net/<scope_id>/some_file (for confined scopes)
   and $HOME/.local/share/unity-scopes/unconfined/<scope_id>/some_file (for unconfined scopes).
 
+- AppDir
+
+  The parent directory under which a scope can read data provided by an
+  app that was installed from the same click package.
+
+  The default value is $HOME/.local/share.
+
+  Note that the actual directory is a subdirectory of
+  this directory, for example:
+
+  $HOME/.local/share/<app-pkgname>
+
+  The app has read/write permission for this directory and the files in it,
+  the scope has read-only permission, so communication is from the app to
+  the scope, not vice versa.
+
 - ConfigDir
 
   The parent directory under which the runtime writes the scope configration files.
@@ -116,6 +132,7 @@
 
   $HOME/.config/unity-scopes/<scope_id>/settings.ini
 
+
 Zmq.ini
 -------
 
@@ -311,6 +328,15 @@
 
   The author of the scope (mandatory).
 
+- Version
+
+  A integer describing the scope version. The setting is optional, but we strongly
+  recommend to set it. If the behavior of your scope changes in any way that is
+  visible to the query source (such having added or removed a result attribute),
+  you should increment the version number. This allows an aggregating scope to
+  adjust its behavior according to which version of your scope is installed.
+  If not set, the default value is 0. You can set the value to any integer >= 1.
+
 - Art
 
   Artwork to be shown for the scope. The default value is the empty string.
@@ -327,6 +353,15 @@
 
   The hot key for the scope. The default value is the empty string.
 
+- ChildScopes
+
+  The list of ids of scopes aggregated by this scope (if any). The values in this list
+  must be separated by semicolons. This list is translated to the names of
+  children scopes when in the scopes overview page of the Unity Dash.
+
+  Note: make sure there are no trailing spaces following
+  the ids, as they will be preserved.
+
 - Invisible
 
   Whether the scope is hidden in the UI. The default value is false.
@@ -368,6 +403,14 @@
 
   If not set, the default value is false.
 
+- Tags
+
+  A list of tags this scope falls under (if any). The values in this list must be separated by semicolons.
+
+  E.g. "Tags = music;video"
+
+  Note: make sure there are no trailing spaces following the tags, as they will be preserved.
+
 
 The following keys are recognized in the Appearance group:
 

=== modified file 'HACKING'
--- HACKING	2014-10-07 07:20:54 +0000
+++ HACKING	2014-11-28 11:54:53 +0000
@@ -143,7 +143,7 @@
 ---------------------
 
 To easily spot new/removed/changed symbols in the library, the debian
-package is maintaining a .symbols file which lists all exported symbols
+package maintains a .symbols file that lists all exported symbols
 present in the library .so. If you add new public symbols to the library,
 it's necessary to refresh the symbols file, otherwise the package will
 fail to build. The easiest way to do that is using bzr-builddeb:
@@ -156,28 +156,7 @@
 This creates a diff of the symbols in /tmp/symbols.diff.
 (The demangled symbols from the debian build are in ./new_symbols.)
 
-NOTE: We currently have one architecture-specific symbol:
-
-(c++|arch=amd64)"unity::scopes::internal::RegistryObject::ScopeExecData::ScopeExecData(unity::scopes::internal::RegistryObject::ScopeExecData const&)@Base" 0.6.6+14.10.20140916
-
-We need this because the copy-constructor is inlined on i386 and armhf.
-
-The above script can't cope with the arch tag at the moment. Until we get
-around to fixing this, you need to delete the corresponding change from
-the diff output before applying the diff as a patch. The offending diff
-will look something like this:
-
-@@ -377,7 +378,7 @@
-  (c++)"unity::scopes::internal::RegistryObject::remove_desktop_file(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.6.6+14.10.20140916
-  (c++)"unity::scopes::internal::RegistryObject::remove_local_scope(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
-  (c++)"unity::scopes::internal::RegistryObject::ScopeExecData::~ScopeExecData()@Base" 0.4.2+14.04.20140404.2
-- (c++|arch=amd64)"unity::scopes::internal::RegistryObject::ScopeExecData::ScopeExecData(unity::scopes::internal::RegistryObject::ScopeExecData const&)@Base" 0.6.6+14.10.20140916
-+ (c++)"unity::scopes::internal::RegistryObject::ScopeExecData::ScopeExecData(unity::scopes::internal::RegistryObject::ScopeExecData const&)@Base" 0replaceme
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::clear_handle_unlocked()@Base" 0.4.2+14.04.20140404.2
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::exec(core::posix::ChildProcess::DeathObserver&, std::shared_ptr<unity::scopes::internal::Executor>)@Base" 0.4.3+14.10.20140428
- (c++)"unity::scopes::internal::RegistryObject::ScopeProcess::expand_custom_exec()@Base" 0.5.0+14.10.20140619
-
-Review any other changes in /tmp/symbols.diff. If they are OK:
+Review any changes in /tmp/symbols.diff. If they are OK:
 
     $ cd -
     $ patch -p0 < /tmp/symbols.diff

=== modified file 'RELEASE_NOTES.md'
--- RELEASE_NOTES.md	2014-10-22 15:46:36 +0000
+++ RELEASE_NOTES.md	2014-11-28 11:54:53 +0000
@@ -1,6 +1,18 @@
 Release notes
 =============
 
+Changes in version 0.6.9
+========================
+  - Added support for ChildScopes scope .ini option to list scopes ids of aggregated scopes.
+  - Added support for Version attribute in scope.ini file, and added version() accessor
+    to ScopeMetadata.
+  - Added app_directory() method ScopeBase for scopes that are installed from the same
+    click package as an app. This allows the app to share data with its scope (but
+    not vice versa).
+  - Added missing methods for settings_definitions(), location_data_needed(),
+    and child_scope_ids() to testing::ScopeMetadataBuilder.
+  - Added support for Tags scope .ini option.
+
 Changes in version 0.6.8
 ========================
   - Replaced dbus-send with "list updated" pub/sub to invalidate smart scopes.

=== modified file 'STRUCTS'
--- STRUCTS	2014-09-25 08:33:58 +0000
+++ STRUCTS	2014-11-28 11:54:53 +0000
@@ -77,6 +77,9 @@
  'results_ttl_type'      : int, optional
  'settings_definitions'  : dictionary, optional
  'location_data_needed'  : bool, optional
+ 'child_scopes'          : array of strings, optional
+ 'version'               : int, optional
+ 'tags'                  : array of strings, optional
 
 Query (returned by serialize())
 ===============================

=== modified file 'debian/changelog'
--- debian/changelog	2014-11-19 08:16:39 +0000
+++ debian/changelog	2014-11-28 11:54:53 +0000
@@ -1,3 +1,20 @@
+unity-scopes-api (0.6.9-0ubuntu1) UNRELEASED; urgency=medium
+
+  [ Pawel Stolowski ]
+  * Added support for ChildScopes scope .ini option.
+
+  [ Michi Henning ]
+  * Added app_directory() method to ScopeBase.
+  * Added support for Version attribute in scope.ini file, and added
+    version() accessor to ScopeMetadata.
+  * Added missing methods for settings_definitions(), location_data_needed(),
+    and child_scope_ids() to testing::ScopeMetadataBuilder.
+
+  [ Marcus Tomlinson ]
+  * Added support for Tags scope .ini option.
+
+ -- Marcus Tomlinson <[e-mail]>  Wed, 26 Nov 2014 09:36:56 +0200
+
 unity-scopes-api (0.6.8+15.04.20141119-0ubuntu1) vivid; urgency=medium
 
   [ Marcus Tomlinson ]

=== modified file 'debian/libunity-scopes3.symbols'
--- debian/libunity-scopes3.symbols	2014-11-19 08:16:37 +0000
+++ debian/libunity-scopes3.symbols	2014-11-28 11:54:53 +0000
@@ -396,10 +396,12 @@
  (c++)"unity::scopes::internal::RegistryObject::set_remote_registry(std::shared_ptr<unity::scopes::internal::MWRegistry> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RegistryObject::ss_list_update()@Base" 0.6.8+15.04.20141119
  (c++)"unity::scopes::internal::RegistryObject::state_receiver()@Base" 0.4.2+14.04.20140404.2
+ (c++)"unity::scopes::internal::RuntimeConfig::app_directory() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeConfig::cache_directory() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeConfig::config_directory() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
- (c++)"unity::scopes::internal::RuntimeConfig::data_directory() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::RuntimeConfig::default_app_directory()@Base" 0replaceme
+ (c++)"unity::scopes::internal::RuntimeConfig::default_cache_directory()@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeConfig::default_config_directory()@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
- (c++)"unity::scopes::internal::RuntimeConfig::default_data_directory()@Base" 0.5.2+14.10.20140709.2
  (c++)"unity::scopes::internal::RuntimeConfig::default_middleware_configfile() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeConfig::default_middleware() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::RuntimeConfig::reap_expiry() const@Base" 0.4.5+14.10.20140513
@@ -417,6 +419,7 @@
  (c++)"unity::scopes::internal::RuntimeImpl::demangled_id() const@Base" 0.6.8+15.04.20141119
  (c++)"unity::scopes::internal::RuntimeImpl::destroy()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::factory() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::RuntimeImpl::find_app_dir() const@Base" 0replaceme
  (c++)"unity::scopes::internal::RuntimeImpl::find_cache_dir() const@Base" 0.6.8+15.04.20141119
  (c++)"unity::scopes::internal::RuntimeImpl::find_tmp_dir() const@Base" 0.6.8+15.04.20141119
  (c++)"unity::scopes::internal::RuntimeImpl::future_queue() const@Base" 0.4.3+14.10.20140428
@@ -434,9 +437,11 @@
  (c++)"unity::scopes::internal::RuntimeImpl::ss_registry_identity() const@Base" 0.4.4+14.10.20140508
  (c++)"unity::scopes::internal::RuntimeImpl::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::RuntimeImpl::waiter_thread(std::shared_ptr<unity::scopes::internal::ThreadSafeQueue<std::future<void> > > const&) const@Base" 0.4.3+14.10.20140428
+ (c++)"unity::scopes::internal::safe_strerror(int)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeConfig::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeConfig::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::author() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::ScopeConfig::child_scope_ids() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeConfig::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::ScopeConfig::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::display_name() const@Base" 0.4.0+14.04.20140312.1
@@ -452,6 +457,8 @@
  (c++)"unity::scopes::internal::ScopeConfig::ScopeConfig(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeConfig::scope_runner() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeConfig::search_hint() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::ScopeConfig::tags() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeConfig::version() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeImpl::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::ActivationListenerBase> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::create(std::shared_ptr<unity::scopes::internal::MWScope> const&, unity::scopes::internal::RuntimeImpl*, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeImpl::fwd()@Base" 0.4.3+14.10.20140428
@@ -475,6 +482,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::author() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::child_scope_ids() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::create(std::unique_ptr<unity::scopes::internal::ScopeMetadataImpl, std::default_delete<unity::scopes::internal::ScopeMetadataImpl> >)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::deserialize(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.0+14.04.20140312.1
@@ -496,6 +504,7 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_appearance_attributes(std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > const&)@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_art(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_author(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_child_scope_ids(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_description(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_display_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_hot_key(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
@@ -508,7 +517,11 @@
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_scope_id(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_search_hint(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeMetadataImpl::set_settings_definitions(std::vector<unity::scopes::Variant, std::allocator<unity::scopes::Variant> > const&)@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_tags(std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeMetadataImpl::settings_definitions() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::set_version(int)@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::tags() const@Base" 0replaceme
+ (c++)"unity::scopes::internal::ScopeMetadataImpl::version() const@Base" 0replaceme
  (c++)"unity::scopes::internal::ScopeObject::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::internal::ScopeObject::debug_mode() const@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::internal::ScopeObject::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::shared_ptr<unity::scopes::internal::MWReply> const&, unity::scopes::internal::InvokeInfo const&)@Base" 0.4.0+14.04.20140312.1
@@ -741,6 +754,7 @@
  (c++)"unity::scopes::Runtime::Runtime(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Runtime::string_to_proxy(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::activate(unity::scopes::Result const&, unity::scopes::ActionMetadata const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::ScopeBase::app_directory() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeBase::cache_directory() const@Base" 0.6.0+14.10.20140804.1
  (c++)"unity::scopes::ScopeBase::perform_action(unity::scopes::Result const&, unity::scopes::ActionMetadata const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeBase::registry() const@Base" 0.6.0+14.10.20140804.1
@@ -756,6 +770,7 @@
  (c++)"unity::scopes::ScopeMetadata::appearance_attributes() const@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::ScopeMetadata::art() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::author() const@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::ScopeMetadata::child_scope_ids() const@Base" 0replaceme
  (c++)"unity::scopes::ScopeMetadata::description() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::display_name() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::hot_key() const@Base" 0.4.0+14.04.20140312.1
@@ -775,6 +790,8 @@
  (c++)"unity::scopes::ScopeMetadata::search_hint() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::serialize() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::ScopeMetadata::settings_definitions() const@Base" 0.5.2+14.10.20140709.2
+ (c++)"unity::scopes::ScopeMetadata::tags() const@Base" 0replaceme
+ (c++)"unity::scopes::ScopeMetadata::version() const@Base" 0replaceme
  (c++)"unity::scopes::Scope::~Scope()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::Scope::Scope()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::SearchListenerBase::push(std::list<std::shared_ptr<unity::scopes::FilterBase const>, std::allocator<std::shared_ptr<unity::scopes::FilterBase const> > > const&, unity::scopes::FilterState const&)@Base" 0.4.0+14.04.20140312.1
@@ -846,11 +863,13 @@
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::appearance_attributes(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::map<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, unity::scopes::Variant, std::less<std::basic_string<char, std::char_traits<char>, std::allocator<char> > >, std::allocator<std::pair<std::basic_string<char, std::char_traits<char>, std::allocator<char> > const, unity::scopes::Variant> > > > const&)@Base" 0.5.0+14.10.20140619
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::art(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::author(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.5.0+14.10.20140619
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::child_scope_ids(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::description(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::display_name(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::hot_key(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::icon(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::invisible(unity::scopes::testing::ScopeMetadataBuilder::Optional<bool> const&)@Base" 0.5.0+14.10.20140619
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::location_data_needed(unity::scopes::testing::ScopeMetadataBuilder::Optional<bool> const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::operator()() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::proxy(std::shared_ptr<unity::scopes::Scope> const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::results_ttl_type(unity::scopes::testing::ScopeMetadataBuilder::Optional<unity::scopes::ScopeMetadata::ResultsTtlType> const&)@Base" 0.5.0+14.10.20140619
@@ -859,11 +878,17 @@
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::~ScopeMetadataBuilder()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::ScopeMetadataBuilder()@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::ScopeMetadataBuilder::search_hint(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::settings_definitions(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<unity::scopes::Variant, std::allocator<unity::scopes::Variant> > > const&)@Base" 0replaceme
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::tags(unity::scopes::testing::ScopeMetadataBuilder::Optional<std::vector<std::basic_string<char, std::char_traits<char>, std::allocator<char> >, std::allocator<std::basic_string<char, std::char_traits<char>, std::allocator<char> > > > > const&)@Base" 0replaceme
+ (c++)"unity::scopes::testing::ScopeMetadataBuilder::version(unity::scopes::testing::ScopeMetadataBuilder::Optional<int> const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::StudentsTTest::one_sample(unity::scopes::testing::Sample const&, double, double)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::testing::StudentsTTest::Result::~Result()@Base" 0.4.2+14.04.20140404.2
  (c++)"unity::scopes::testing::StudentsTTest::two_independent_samples(unity::scopes::testing::Sample const&, unity::scopes::testing::Sample const&)@Base" 0.4.0+14.04.20140312.1
+ (c++)"unity::scopes::testing::TypedScopeFixtureHelper::set_app_directory(std::shared_ptr<unity::scopes::ScopeBase> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
+ (c++)"unity::scopes::testing::TypedScopeFixtureHelper::set_cache_directory(std::shared_ptr<unity::scopes::ScopeBase> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::testing::TypedScopeFixtureHelper::set_registry(std::shared_ptr<unity::scopes::ScopeBase> const&, std::shared_ptr<unity::scopes::Registry> const&)@Base" 0.6.2+rtm+rtm+rtm+14.09.20140818
  (c++)"unity::scopes::testing::TypedScopeFixtureHelper::set_scope_directory(std::shared_ptr<unity::scopes::ScopeBase> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0.6.6+14.10.20140916
+ (c++)"unity::scopes::testing::TypedScopeFixtureHelper::set_tmp_directory(std::shared_ptr<unity::scopes::ScopeBase> const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@Base" 0replaceme
  (c++)"unity::scopes::TimeoutException::operator=(unity::scopes::TimeoutException const&)@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::TimeoutException::self() const@Base" 0.4.0+14.04.20140312.1
  (c++)"unity::scopes::TimeoutException::~TimeoutException()@Base" 0.4.0+14.04.20140312.1

=== modified file 'doc/tutorial.dox'
--- doc/tutorial.dox	2014-09-15 12:43:47 +0000
+++ doc/tutorial.dox	2014-11-28 11:54:53 +0000
@@ -188,7 +188,7 @@
 and "Recently Played"; similarly, for a weather scope, the default results could be for the weather
 report for the current location. As the scope author, you need to decide what is most appropriate
 to show in surfacing mode. In the interests of a good user experience, it is important to show _something_
-here (if at all possible), so the user gets to to see at least some results (instead of being confronted with
+here (if at all possible), so the user gets to see at least some results (instead of being confronted with
 a blank screen).
 
 \paragraph querybase Implementing QueryBase
@@ -206,16 +206,15 @@
 and \link unity::scopes::SearchReply::push push()\endlink.
 
 `register_category()` is a factory method that registers new categories for the results of this query (see
-\link unity::scopes::Category\endlink). You can create new categories at any point during query processing, 
-but we recommend to create them in advance, if possible. Categories serve to visually group query results
-in some way; the UI typically renders categories in the same order as you registered them (but may choose
-to override the order for some categories). When you push results for a query, you indicate which
+\link unity::scopes::Category\endlink). You can create new categories at any point during query processing. 
+Categories serve to visually group query results in some way;
+when you push results for a query, you indicate which
 category each particular result belongs to, and the UI renders that result in the corresponding
-visual group.
-
-You can create a new category later, after you have already registered some categories and pushed
-a number of results for them. If you do, the newly created category renders after (or below)
-any of the categories you registered initially.
+visual group. Categories are rendered in the order in which they are encountered by the UI
+as you push your results. If you want to control the order in which categories are rendered
+(for examples, such that a "Breaking News" category always appears first), you may need to
+buffer the results you receive from your back-end data source until you get a result for that
+category, and then push that result, plus any other buffered results.
 
 Pre-registering categories is the preferred approach because it allows the UI to reserve space
 and perform layout chores before any query results arrive. (In turn, this permits the UI to
@@ -761,6 +760,34 @@
 }
 ~~~
 
+\subsection directories File system access
+
+Scopes that are installed from click packages are subject to confinement and are not allowed
+to access most parts of the file system. However, a few locations are available to a scope.
+You can access these paths by calling methods on \link unity::scopes::ScopeBase ScopeBase\endlink.
+
+\note Do not call these methods from the constructor of your `ScopeBase` implementation. If you
+do, these methods throw `LogicException`. Instead, call them from
+\link unity::scopes::ScopeBase::start() start()\endlink or any time thereafter.
+
+\link unity::scopes::ScopeBase::scope_directory() scope_directory()\endlink returns the path of the installation
+directory of the scope. This directory contains the scope's `.so` and `.ini` files, plus whatever other
+files you decide to package with your scope. The scope has read-only permission for this directory.
+
+\link unity::scopes::ScopeBase::cache_directory() cache_directory()\endlink returns the path of a
+directory that is (exclusively) writable for the scope. You can use this directory to store
+persistent information, such as a cache of results.
+
+\link unity::scopes::ScopeBase::app_directory() app_directory()\endlink returns the path of a
+read-only directory. If the scope is packaged together with an app, the app has permission to write
+files in this location, that is, this directory can be used make information provided by the app
+available to the scope (but not vice versa).
+
+\link unity::scopes::ScopeBase::tmp_directory() tmp_directory()\endlink returns the path of a
+read-only directory that is (exclusively) writable for the scope. This directory is periodically
+cleaned of unused files. The exact amount of time may vary, but is on the order of a few hours.
+The directory is also cleaned during reboot.
+
 \subsection online_accounts Online Accounts
 
 A scope may require access to an online account in order to evaluate particular results, perform certain actions, or
@@ -1027,11 +1054,14 @@
     DisplayName = human readable name of scope
     Description = description of scope
     Author = Author
+    Version = 1
     Icon = path to icon representing the scope
     Art = path to screenshot of the scope
     SearchHint = hint text displayed to user when viewing scope
     HotKey =
     ResultsTtlType = None, Small, Medium, or Large
+    ChildScopes =
+    Tags =
 
     [Appearance]
     ForegroundColor = default text color (defaults to theme-provided foreground color)
@@ -1051,6 +1081,13 @@
 
 `Description[de_DE] = Fu&szlig;ballergebnisse`
 
+The `Version` key is optional, but we strongly recommend that you set it.
+If the behavior of your scope changes in any way that is visible to the query source
+(such having added or removed a result attribute), you should increment the version number.
+This allows an aggregating scope to adjust its behavior according to which version of
+your scope is installed.
+If not set, the default value is 0. You can set the value to any integer >= 1.
+
 In addition to allowing the registry to make the scope available, this information controls how the scope appears
 in the "Scopes" scope.
 
@@ -1065,6 +1102,17 @@
 <li>http://remote-server.com/path/to/image</li>
 </ul>
 
+The value of `ChildScopes` key is to be used by aggregator scopes. It must be a semicolon separated list of scope identifiers that
+might be aggregated by this scope, for example:
+
+`ChildScopes = com.foo.bar;com.foo.bar2`
+
+This list of scopes is translated to the names of children scopes when in the scopes overview page of the Unity Dash.
+
+The `Tags` key is optional, but we recommend that you use it. Tags are used by aggregators to collect results from scopes of
+similar type (E.g. The Music scope will aggregate scopes with the tag "music", and so on). The value of `Tags` should specify a
+list of tags your scope falls under. Like `ChildScopes`, this value must be a semicolon separated list (E.g. `Tags = music;video`).
+
 \subsection scopetool The scope tool
 
 The Unity Scope Tool is a stand-alone redering tool that allows you

=== modified file 'include/unity/scopes/AbstractScopeBase.h'
--- include/unity/scopes/AbstractScopeBase.h	2014-08-22 10:09:43 +0000
+++ include/unity/scopes/AbstractScopeBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ABSTRACTSCOPEBASE_H
-#define UNITY_SCOPES_ABSTRACTSCOPEBASE_H
+#pragma once
 
 #include <unity/scopes/ActivationQueryBase.h>
 #include <unity/scopes/PreviewQueryBase.h>
@@ -62,5 +61,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ActionMetadata.h'
--- include/unity/scopes/ActionMetadata.h	2014-09-02 15:47:35 +0000
+++ include/unity/scopes/ActionMetadata.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ACTIONMETADATA_H
-#define UNITY_SCOPES_ACTIONMETADATA_H
+#pragma once
 
 #include <unity/scopes/QueryMetadata.h>
 #include <unity/scopes/Variant.h>
@@ -131,5 +130,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ActivationListenerBase.h'
--- include/unity/scopes/ActivationListenerBase.h	2014-07-28 08:30:35 +0000
+++ include/unity/scopes/ActivationListenerBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ACTIVATIONLISTENERBASE_H
-#define UNITY_SCOPES_ACTIVATIONLISTENERBASE_H
+#pragma once
 
 #include <unity/scopes/ListenerBase.h>
 #include <unity/util/NonCopyable.h>
@@ -71,5 +70,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ActivationQueryBase.h'
--- include/unity/scopes/ActivationQueryBase.h	2014-07-10 23:51:49 +0000
+++ include/unity/scopes/ActivationQueryBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ACTIVATIONQUERYBASE_H
-#define UNITY_SCOPES_ACTIVATIONQUERYBASE_H
+#pragma once
 
 #include <unity/scopes/QueryBase.h>
 #include <unity/util/DefinesPtrs.h>
@@ -125,5 +124,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ActivationResponse.h'
--- include/unity/scopes/ActivationResponse.h	2014-03-10 04:17:09 +0000
+++ include/unity/scopes/ActivationResponse.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ACTIVATIONRESPONSE_H
-#define UNITY_SCOPES_ACTIVATIONRESPONSE_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/CannedQuery.h>
@@ -122,5 +121,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Annotation.h'
--- include/unity/scopes/Annotation.h	2014-06-17 15:07:13 +0000
+++ include/unity/scopes/Annotation.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ANNOTATION_H
-#define UNITY_SCOPES_ANNOTATION_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/Link.h>
@@ -139,5 +138,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/CannedQuery.h'
--- include/unity/scopes/CannedQuery.h	2014-04-11 12:04:41 +0000
+++ include/unity/scopes/CannedQuery.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_CANNEDQUERY_H
-#define UNITY_SCOPES_CANNEDQUERY_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <string>
@@ -143,5 +142,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/CategorisedResult.h'
--- include/unity/scopes/CategorisedResult.h	2014-02-28 01:00:57 +0000
+++ include/unity/scopes/CategorisedResult.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_CATEGORISEDRESULT_H
-#define UNITY_SCOPES_CATEGORISEDRESULT_H
+#pragma once
 
 #include <unity/scopes/Result.h>
 #include <unity/scopes/Category.h>
@@ -86,5 +85,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Category.h'
--- include/unity/scopes/Category.h	2014-07-02 10:08:10 +0000
+++ include/unity/scopes/Category.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_CATEGORY_H
-#define UNITY_SCOPES_CATEGORY_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <unity/util/DefinesPtrs.h>
@@ -109,5 +108,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/CategoryRenderer.h'
--- include/unity/scopes/CategoryRenderer.h	2014-03-06 11:05:22 +0000
+++ include/unity/scopes/CategoryRenderer.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_CATEGORYRENDERER_H
-#define UNITY_SCOPES_CATEGORYRENDERER_H
+#pragma once
 
 #include <string>
 #include <memory>
@@ -134,5 +133,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ColumnLayout.h'
--- include/unity/scopes/ColumnLayout.h	2014-02-28 01:37:46 +0000
+++ include/unity/scopes/ColumnLayout.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_COLUMNLAYOUT_H
-#define UNITY_SCOPES_COLUMNLAYOUT_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <memory>
@@ -114,5 +113,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/CompletionDetails.h'
--- include/unity/scopes/CompletionDetails.h	2014-07-29 05:07:27 +0000
+++ include/unity/scopes/CompletionDetails.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_COMPLETIONDETAILS_H
-#define UNITY_SCOPES_COMPLETIONDETAILS_H
+#pragma once
 
 #include <unity/scopes/OperationInfo.h>
 
@@ -120,5 +119,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Department.h'
--- include/unity/scopes/Department.h	2014-05-28 12:36:06 +0000
+++ include/unity/scopes/Department.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_DEPARTMENT_H
-#define UNITY_SCOPES_DEPARTMENT_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/util/DefinesPtrs.h>
@@ -179,5 +178,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/FilterBase.h'
--- include/unity/scopes/FilterBase.h	2014-05-15 08:12:32 +0000
+++ include/unity/scopes/FilterBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_FILTERBASE_H
-#define UNITY_SCOPES_FILTERBASE_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <unity/scopes/Variant.h>
@@ -108,5 +107,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/FilterOption.h'
--- include/unity/scopes/FilterOption.h	2014-02-26 22:37:01 +0000
+++ include/unity/scopes/FilterOption.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_FILTEROPTION_H
-#define UNITY_SCOPES_FILTEROPTION_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <unity/util/DefinesPtrs.h>
@@ -73,5 +72,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/FilterState.h'
--- include/unity/scopes/FilterState.h	2014-03-10 04:17:09 +0000
+++ include/unity/scopes/FilterState.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_FILTERSTATE_H
-#define UNITY_SCOPES_FILTERSTATE_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/util/DefinesPtrs.h>
@@ -91,5 +90,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Link.h'
--- include/unity/scopes/Link.h	2014-02-28 01:00:57 +0000
+++ include/unity/scopes/Link.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_LINK_H
-#define UNITY_SCOPES_LINK_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/scopes/CannedQuery.h>
@@ -87,5 +86,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ListenerBase.h'
--- include/unity/scopes/ListenerBase.h	2014-07-28 08:30:35 +0000
+++ include/unity/scopes/ListenerBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_LISTENERBASE_H
-#define UNITY_SCOPES_LISTENERBASE_H
+#pragma once
 
 #include <unity/scopes/CompletionDetails.h>
 #include <unity/scopes/OperationInfo.h>
@@ -84,5 +83,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Location.h'
--- include/unity/scopes/Location.h	2014-08-05 05:29:56 +0000
+++ include/unity/scopes/Location.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pete Woods <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_LOCATION_H
-#define UNITY_SCOPES_LOCATION_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/util/DefinesPtrs.h>
@@ -300,5 +299,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Object.h'
--- include/unity/scopes/Object.h	2014-07-10 23:51:49 +0000
+++ include/unity/scopes/Object.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_OBJECT_H
-#define UNITY_SCOPES_OBJECT_H
+#pragma once
 
 #include <unity/scopes/ObjectProxyFwd.h>
 #include <unity/util/NonCopyable.h>
@@ -84,5 +83,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ObjectProxyFwd.h'
--- include/unity/scopes/ObjectProxyFwd.h	2014-03-05 02:42:49 +0000
+++ include/unity/scopes/ObjectProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_OBJECTPROXYFWD_H
-#define UNITY_SCOPES_OBJECTPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -36,5 +35,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/OnlineAccountClient.h'
--- include/unity/scopes/OnlineAccountClient.h	2014-10-10 13:41:06 +0000
+++ include/unity/scopes/OnlineAccountClient.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_ONLINEACCOUNTCLIENT_H
-#define UNITY_SCOPES_ONLINEACCOUNTCLIENT_H
+#pragma once
 
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/PreviewWidget.h>
@@ -169,5 +168,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/OperationInfo.h'
--- include/unity/scopes/OperationInfo.h	2014-07-28 08:30:35 +0000
+++ include/unity/scopes/OperationInfo.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_OPERATIONINFO_H
-#define UNITY_SCOPES_OPERATIONINFO_H
+#pragma once
 
 #include <memory>
 #include <string>
@@ -109,5 +108,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/OptionSelectorFilter.h'
--- include/unity/scopes/OptionSelectorFilter.h	2014-05-19 09:54:37 +0000
+++ include/unity/scopes/OptionSelectorFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_OPTIONSELECTOR_H
-#define UNITY_SCOPES_OPTIONSELECTOR_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 #include <unity/scopes/FilterOption.h>
@@ -121,5 +120,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/PreviewListenerBase.h'
--- include/unity/scopes/PreviewListenerBase.h	2014-07-10 23:51:49 +0000
+++ include/unity/scopes/PreviewListenerBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_PREVIEWLISTENERBASE_H
-#define UNITY_SCOPES_PREVIEWLISTENERBASE_H
+#pragma once
 
 #include <unity/scopes/ListenerBase.h>
 #include <unity/util/DefinesPtrs.h>
@@ -76,5 +75,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/PreviewQueryBase.h'
--- include/unity/scopes/PreviewQueryBase.h	2014-07-29 08:05:11 +0000
+++ include/unity/scopes/PreviewQueryBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_PREVIEWQUERYBASE_H
-#define UNITY_SCOPES_PREVIEWQUERYBASE_H
+#pragma once
 
 #include <unity/scopes/PreviewReplyProxyFwd.h>
 #include <unity/scopes/QueryCtrlProxyFwd.h>
@@ -117,5 +116,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/PreviewReply.h'
--- include/unity/scopes/PreviewReply.h	2014-03-10 05:51:39 +0000
+++ include/unity/scopes/PreviewReply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_PREVIEW_REPLY_H
-#define UNITY_SCOPES_PREVIEW_REPLY_H
+#pragma once
 
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/PreviewReplyProxyFwd.h>
@@ -74,5 +73,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/PreviewReplyProxyFwd.h'
--- include/unity/scopes/PreviewReplyProxyFwd.h	2014-03-05 02:42:49 +0000
+++ include/unity/scopes/PreviewReplyProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_PREVIEWREPLYPROXYFWD_H
-#define UNITY_SCOPES_PREVIEWREPLYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/PreviewWidget.h'
--- include/unity/scopes/PreviewWidget.h	2014-08-21 15:06:12 +0000
+++ include/unity/scopes/PreviewWidget.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_PREVIEW_WIDGET_H
-#define UNITY_SCOPES_PREVIEW_WIDGET_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <unity/util/DefinesPtrs.h>
@@ -182,5 +181,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/QueryBase.h'
--- include/unity/scopes/QueryBase.h	2014-06-24 11:11:11 +0000
+++ include/unity/scopes/QueryBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_QUERYBASE_H
-#define UNITY_SCOPES_QUERYBASE_H
+#pragma once
 
 #include <unity/scopes/QueryCtrlProxyFwd.h>
 #include <unity/scopes/ReplyProxyFwd.h>
@@ -131,5 +130,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/QueryCtrl.h'
--- include/unity/scopes/QueryCtrl.h	2014-03-07 01:31:43 +0000
+++ include/unity/scopes/QueryCtrl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_QUERYCTRL_H
-#define UNITY_SCOPES_QUERYCTRL_H
+#pragma once
 
 #include <unity/scopes/Object.h>
 #include <unity/scopes/QueryCtrlProxyFwd.h>
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/QueryCtrlProxyFwd.h'
--- include/unity/scopes/QueryCtrlProxyFwd.h	2014-02-26 00:00:47 +0000
+++ include/unity/scopes/QueryCtrlProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_QUERYCTRLPROXYFWD_H
-#define UNITY_SCOPES_QUERYCTRLPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -36,5 +35,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/QueryMetadata.h'
--- include/unity/scopes/QueryMetadata.h	2014-07-23 07:12:48 +0000
+++ include/unity/scopes/QueryMetadata.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_QUERYMETADATA_H
-#define UNITY_SCOPES_QUERYMETADATA_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <string>
@@ -103,5 +102,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/RadioButtonsFilter.h'
--- include/unity/scopes/RadioButtonsFilter.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/RadioButtonsFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_RADIOBUTTONSFILTER_H
-#define UNITY_SCOPES_RADIOBUTTONSFILTER_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 #include <unity/scopes/FilterOption.h>
@@ -125,5 +124,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/RangeInputFilter.h'
--- include/unity/scopes/RangeInputFilter.h	2014-08-05 06:42:04 +0000
+++ include/unity/scopes/RangeInputFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_RANGE_INPUT_FILTER_H
-#define UNITY_SCOPES_RANGE_INPUT_FILTER_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 #include <unity/scopes/Variant.h>
@@ -150,5 +149,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/RatingFilter.h'
--- include/unity/scopes/RatingFilter.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/RatingFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_RATINGFILTER_H
-#define UNITY_SCOPES_RATINGFILTER_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 #include <unity/scopes/FilterOption.h>
@@ -181,5 +180,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Registry.h'
--- include/unity/scopes/Registry.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/Registry.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_REGISTRY_H
-#define UNITY_SCOPES_REGISTRY_H
+#pragma once
 
 #include <core/signal.h>
 #include <unity/scopes/Object.h>
@@ -111,5 +110,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/RegistryProxyFwd.h'
--- include/unity/scopes/RegistryProxyFwd.h	2014-03-04 01:38:13 +0000
+++ include/unity/scopes/RegistryProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_REGISTRYPROXYFWD_H
-#define UNITY_SCOPES_REGISTRYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -36,5 +35,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Reply.h'
--- include/unity/scopes/Reply.h	2014-07-28 05:22:59 +0000
+++ include/unity/scopes/Reply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_REPLY_H
-#define UNITY_SCOPES_REPLY_H
+#pragma once
 
 #include <unity/scopes/Object.h>
 #include <unity/scopes/OperationInfo.h>
@@ -93,5 +92,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ReplyProxyFwd.h'
--- include/unity/scopes/ReplyProxyFwd.h	2014-03-07 10:54:15 +0000
+++ include/unity/scopes/ReplyProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_REPLYPROXYFWD_H
-#define UNITY_SCOPES_REPLYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Result.h'
--- include/unity/scopes/Result.h	2014-08-05 06:42:04 +0000
+++ include/unity/scopes/Result.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_RESULT_H
-#define UNITY_SCOPES_RESULT_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/util/DefinesPtrs.h>
@@ -247,5 +246,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Runtime.h'
--- include/unity/scopes/Runtime.h	2014-07-28 23:40:22 +0000
+++ include/unity/scopes/Runtime.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_RUNTIME_H
-#define UNITY_SCOPES_RUNTIME_H
+#pragma once
 
 #include <unity/scopes/ObjectProxyFwd.h>
 #include <unity/scopes/RegistryProxyFwd.h>
@@ -175,5 +174,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Scope.h'
--- include/unity/scopes/Scope.h	2014-03-10 05:51:39 +0000
+++ include/unity/scopes/Scope.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SCOPE_H
-#define UNITY_SCOPES_SCOPE_H
+#pragma once
 
 #include <unity/scopes/ActivationListenerBase.h>
 #include <unity/scopes/Object.h>
@@ -150,5 +149,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ScopeBase.h'
--- include/unity/scopes/ScopeBase.h	2014-09-08 05:55:39 +0000
+++ include/unity/scopes/ScopeBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SCOPEBASE_H
-#define UNITY_SCOPES_SCOPEBASE_H
+#pragma once
 
 #include <unity/scopes/AbstractScopeBase.h>
 #include <unity/scopes/ActionMetadata.h>
@@ -273,10 +272,28 @@
     virtual std::string cache_directory() const final;
 
     /**
+    \brief Returns a directory that is shared with an app in the same click package.
+
+    If a scope and an app share a single click package, this directory and the
+    files in it are writable by the app, and read-only to the scope. This allows
+    the app to write information into the filesystem that can be read by the scope
+    (but not vice versa).
+
+    \note The app directory is available only after this ScopeBase is instantiated; do not
+    call this method from the constructor!
+
+    \return The root directory of a filesystem sub-tree that the scope shares with
+    an application installed from the same click-package.
+    \throws LogicException if called from the constructor of this instance.
+    */
+    virtual std::string app_directory() const final;
+
+    /**
     \brief Returns a tmp directory that is (exclusively) writable for the scope.
 
     This directory is periodically cleaned of unused files. The exact amount of time
-    may vary, but is on the order of a few hours.
+    may vary, but is on the order of a few hours. The directory is also cleaned
+    during reboot.
 
     \note The tmp directory is available only after this ScopeBase is instantiated; do not
     call this method from the constructor!
@@ -375,5 +392,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ScopeExceptions.h'
--- include/unity/scopes/ScopeExceptions.h	2014-08-20 07:58:15 +0000
+++ include/unity/scopes/ScopeExceptions.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SCOPEEXCEPTIONS_H
-#define UNITY_SCOPES_SCOPEEXCEPTIONS_H
+#pragma once
 
 #include <unity/Exception.h>
 
@@ -211,5 +210,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ScopeMetadata.h'
--- include/unity/scopes/ScopeMetadata.h	2014-08-12 09:38:31 +0000
+++ include/unity/scopes/ScopeMetadata.h	2014-11-28 11:54:53 +0000
@@ -16,10 +16,10 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SCOPEMETADATA_H
-#define UNITY_SCOPES_SCOPEMETADATA_H
+#pragma once
 
 #include <unity/scopes/Scope.h>
+#include <vector>
 
 namespace unity
 {
@@ -183,6 +183,36 @@
     */
     bool location_data_needed() const;  // optional (default = false)
 
+    /**
+    \brief Return the list of scope identifiers aggregated by this scope.
+
+    The list returned by this method comes from the .ini file.
+    The scope author must ensure that it contains all scopes that an aggregator
+    might collect results from. This list may contain scopes that are not currently
+    installed and are optional for proper functioning of the aggregator scope.
+
+    \return The list of scopes ids aggregated by this scope.
+    */
+    std::vector<std::string> child_scope_ids() const;
+
+    /**
+    \brief Return the version of the scope.
+
+    \return The version or, if the scope does not define its version,
+    the value `0`.
+    */
+    int version() const;
+
+    /**
+    \brief Return the list of tags specified by this scope.
+
+    The list returned by this method is formulated from the value specified under
+    the "Tags" key in the scope's .ini file.
+
+    \return The list of scope tags specified by this scope.
+    */
+    std::vector<std::string> tags() const;
+
 private:
     ScopeMetadata(std::unique_ptr<internal::ScopeMetadataImpl>);           // Instantiable only by ScopeMetadataImpl
     std::unique_ptr<internal::ScopeMetadataImpl> p;
@@ -193,5 +223,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ScopeProxyFwd.h'
--- include/unity/scopes/ScopeProxyFwd.h	2014-03-05 02:42:49 +0000
+++ include/unity/scopes/ScopeProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SCOPEPROXYFWD_H
-#define UNITY_SCOPES_SCOPEPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SearchListenerBase.h'
--- include/unity/scopes/SearchListenerBase.h	2014-07-30 21:34:13 +0000
+++ include/unity/scopes/SearchListenerBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SEARCHLISTENERBASE_H
-#define UNITY_SCOPES_SEARCHLISTENERBASE_H
+#pragma once
 
 #include <unity/scopes/Annotation.h>
 #include <unity/scopes/CategorisedResult.h>
@@ -110,5 +109,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SearchMetadata.h'
--- include/unity/scopes/SearchMetadata.h	2014-08-05 05:29:56 +0000
+++ include/unity/scopes/SearchMetadata.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SEARCHMETADATA_H
-#define UNITY_SCOPES_SEARCHMETADATA_H
+#pragma once
 
 #include <unity/scopes/QueryMetadata.h>
 #include <unity/scopes/Location.h>
@@ -161,5 +160,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SearchQueryBase.h'
--- include/unity/scopes/SearchQueryBase.h	2014-09-08 03:26:34 +0000
+++ include/unity/scopes/SearchQueryBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SEARCHQUERYBASE_H
-#define UNITY_SCOPES_SEARCHQUERYBASE_H
+#pragma once
 
 #include <unity/scopes/QueryBase.h>
 #include <unity/scopes/QueryCtrlProxyFwd.h>
@@ -159,5 +158,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SearchReply.h'
--- include/unity/scopes/SearchReply.h	2014-07-02 09:36:34 +0000
+++ include/unity/scopes/SearchReply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SEARCHREPLY_H
-#define UNITY_SCOPES_SEARCHREPLY_H
+#pragma once
 
 #include <unity/scopes/Category.h>
 #include <unity/scopes/CategoryRenderer.h>
@@ -175,5 +174,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SearchReplyProxyFwd.h'
--- include/unity/scopes/SearchReplyProxyFwd.h	2014-03-07 10:54:15 +0000
+++ include/unity/scopes/SearchReplyProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SEARCHREPLYPROXYFWD_H
-#define UNITY_SCOPES_SEARCHREPLYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -37,5 +36,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/SwitchFilter.h'
--- include/unity/scopes/SwitchFilter.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/SwitchFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_SWITCHFILTER_H
-#define UNITY_SCOPES_SWITCHFILTER_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 
@@ -100,5 +99,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/ValueSliderFilter.h'
--- include/unity/scopes/ValueSliderFilter.h	2014-08-05 06:42:04 +0000
+++ include/unity/scopes/ValueSliderFilter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_VALUESLIDERFILTER_H
-#define UNITY_SCOPES_VALUESLIDERFILTER_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 
@@ -184,5 +183,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Variant.h'
--- include/unity/scopes/Variant.h	2014-04-02 10:56:52 +0000
+++ include/unity/scopes/Variant.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_VARIANT_H
-#define UNITY_SCOPES_VARIANT_H
+#pragma once
 
 #include <memory>
 #include <string>
@@ -208,5 +207,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/VariantBuilder.h'
--- include/unity/scopes/VariantBuilder.h	2014-02-26 22:37:01 +0000
+++ include/unity/scopes/VariantBuilder.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_VARIANTBUILDER_H
-#define UNITY_SCOPES_VARIANTBUILDER_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <string>
@@ -116,5 +115,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/Version.h.in'
--- include/unity/scopes/Version.h.in	2014-08-19 08:09:34 +0000
+++ include/unity/scopes/Version.h.in	2014-11-28 11:54:53 +0000
@@ -20,8 +20,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_VERSION_H
-#define UNITY_SCOPES_VERSION_H
+#pragma once
 
 #ifndef UNITY_SCOPES_VERSION_MAJOR
 #    define UNITY_SCOPES_VERSION_MAJOR @UNITY_SCOPES_MAJOR@
@@ -107,5 +106,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/AbstractObject.h'
--- include/unity/scopes/internal/AbstractObject.h	2014-01-29 05:57:14 +0000
+++ include/unity/scopes/internal/AbstractObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ABSTRACTOBJECT_H
-#define UNITY_SCOPES_INTERNAL_ABSTRACTOBJECT_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ActionMetadataImpl.h'
--- include/unity/scopes/internal/ActionMetadataImpl.h	2014-06-17 06:55:47 +0000
+++ include/unity/scopes/internal/ActionMetadataImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_ACTIONMETADATAIMPL_H
-#define UNITY_INTERNAL_ACTIONMETADATAIMPL_H
+#pragma once
 
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/internal/QueryMetadataImpl.h>
@@ -65,5 +64,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ActivationQueryBaseImpl.h'
--- include/unity/scopes/internal/ActivationQueryBaseImpl.h	2014-06-13 10:17:24 +0000
+++ include/unity/scopes/internal/ActivationQueryBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ACTIVATIONQUERYBASEIMPL_H
-#define UNITY_SCOPES_INTERNAL_ACTIVATIONQUERYBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/QueryBaseImpl.h>
 #include <unity/scopes/ActivationResponse.h>
@@ -65,5 +64,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ActivationQueryObject.h'
--- include/unity/scopes/internal/ActivationQueryObject.h	2014-02-27 23:29:10 +0000
+++ include/unity/scopes/internal/ActivationQueryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ACTIVATIONQUERYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_ACTIVATIONQUERYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryObject.h>
 #include <unity/scopes/internal/MWQueryCtrlProxyFwd.h>
@@ -50,5 +49,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ActivationReplyObject.h'
--- include/unity/scopes/internal/ActivationReplyObject.h	2014-08-12 09:04:49 +0000
+++ include/unity/scopes/internal/ActivationReplyObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ACTIVATIONREPLYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_ACTIVATIONREPLYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ReplyObject.h>
 #include <unity/scopes/ActivationListenerBase.h>
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ActivationResponseImpl.h'
--- include/unity/scopes/internal/ActivationResponseImpl.h	2014-02-27 16:58:50 +0000
+++ include/unity/scopes/internal/ActivationResponseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ACTIVATIONRESPONSEIMPL_H
-#define UNITY_SCOPES_INTERNAL_ACTIVATIONRESPONSEIMPL_H
+#pragma once
 
 #include <unity/scopes/ActivationResponse.h>
 #include <unity/scopes/CannedQuery.h>
@@ -64,5 +63,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/AnnotationImpl.h'
--- include/unity/scopes/internal/AnnotationImpl.h	2014-06-17 15:07:13 +0000
+++ include/unity/scopes/internal/AnnotationImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ANNOTATIONIMPL_H
-#define UNITY_SCOPES_INTERNAL_ANNOTATIONIMPL_H
+#pragma once
 
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/Variant.h>
@@ -65,5 +64,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/CannedQueryImpl.h'
--- include/unity/scopes/internal/CannedQueryImpl.h	2014-04-17 09:00:46 +0000
+++ include/unity/scopes/internal/CannedQueryImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_CANNEDQUERYIMPL_H
-#define UNITY_SCOPES_INTERNAL_CANNEDQUERYIMPL_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/FilterState.h>
@@ -73,5 +72,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/CategorisedResultImpl.h'
--- include/unity/scopes/internal/CategorisedResultImpl.h	2014-02-14 17:00:04 +0000
+++ include/unity/scopes/internal/CategorisedResultImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_RESULTIMPL_H
-#define UNITY_SCOPES_INTERNAL_RESULTIMPL_H
+#pragma once
 
 #include <string>
 #include <memory>
@@ -59,6 +58,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-
-#endif

=== modified file 'include/unity/scopes/internal/CategoryImpl.h'
--- include/unity/scopes/internal/CategoryImpl.h	2014-07-02 09:36:34 +0000
+++ include/unity/scopes/internal/CategoryImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_CATEGORYIMPL_H
-#define UNITY_SCOPES_INTERNAL_CATEGORYIMPL_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <unity/scopes/CannedQuery.h>
@@ -66,5 +65,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/CategoryRegistry.h'
--- include/unity/scopes/internal/CategoryRegistry.h	2014-07-02 09:36:34 +0000
+++ include/unity/scopes/internal/CategoryRegistry.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_CATEGORYREGISTRY_H
-#define UNITY_SCOPES_INTERNAL_CATEGORYREGISTRY_H
+#pragma once
 
 #include <unity/scopes/Category.h>
 #include <unity/scopes/Variant.h>
@@ -80,5 +79,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/CategoryRendererImpl.h'
--- include/unity/scopes/internal/CategoryRendererImpl.h	2014-02-25 08:50:33 +0000
+++ include/unity/scopes/internal/CategoryRendererImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_CATEGORYRENDERERIMPL_H
-#define UNITY_SCOPES_INTERNAL_CATEGORYRENDERERIMPL_H
+#pragma once
 
 #include <unity/scopes/CategoryRenderer.h>
 #include <string>
@@ -48,5 +47,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ColumnLayoutImpl.h'
--- include/unity/scopes/internal/ColumnLayoutImpl.h	2014-02-04 06:34:33 +0000
+++ include/unity/scopes/internal/ColumnLayoutImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_COLUMNLAYOUTIMPL_H
-#define UNITY_SCOPES_INTERNAL_COLUMNLAYOUTIMPL_H
+#pragma once
 
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/Variant.h>
@@ -59,5 +58,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/CompletionDetailsImpl.h'
--- include/unity/scopes/internal/CompletionDetailsImpl.h	2014-07-29 05:07:27 +0000
+++ include/unity/scopes/internal/CompletionDetailsImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
 */
 
-#ifndef UNITY_INTERNAL_COMPLETIONDETAILSIMPL_H
-#define UNITY_INTERNAL_COMPLETIONDETAILSIMPL_H
+#pragma once
 
 #include <unity/scopes/CompletionDetails.h>
 
@@ -58,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ConfigBase.h'
--- include/unity/scopes/internal/ConfigBase.h	2014-05-15 08:20:14 +0000
+++ include/unity/scopes/internal/ConfigBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_CONFIGBASE_H
-#define UNITY_SCOPES_INTERNAL_CONFIGBASE_H
+#pragma once
 
 #include <unity/util/IniParser.h>
 
@@ -78,5 +77,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/DepartmentImpl.h'
--- include/unity/scopes/internal/DepartmentImpl.h	2014-05-30 08:56:47 +0000
+++ include/unity/scopes/internal/DepartmentImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_DEPARTMENTIMPL_H
-#define UNITY_INTERNAL_DEPARTMENTIMPL_H
+#pragma once
 
 #include <unity/scopes/Department.h>
 #include <unity/scopes/CannedQuery.h>
@@ -75,5 +74,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/DfltConfig.h.in'
--- include/unity/scopes/internal/DfltConfig.h.in	2014-10-10 07:01:36 +0000
+++ include/unity/scopes/internal/DfltConfig.h.in	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michal Hruby <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_DFLTCONFIG_H
-#define UNITY_SCOPES_DFLTCONFIG_H
+#pragma once
 
 namespace unity
 {
@@ -59,5 +58,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/DynamicLoader.h'
--- include/unity/scopes/internal/DynamicLoader.h	2014-07-11 06:28:13 +0000
+++ include/unity/scopes/internal/DynamicLoader.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_DYNAMICLOADER_H
-#define UNITY_SCOPES_INTERNAL_DYNAMICLOADER_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -114,5 +113,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/Executor.h'
--- include/unity/scopes/internal/Executor.h	2014-05-22 08:45:05 +0000
+++ include/unity/scopes/internal/Executor.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pete Woods <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_EXECUTOR_H_
-#define UNITY_SCOPES_INTERNAL_EXECUTOR_H_
+#pragma once
 
 #include <core/posix/exec.h>
 #include <unity/util/DefinesPtrs.h>
@@ -26,8 +25,10 @@
 
 namespace unity
 {
+
 namespace scopes
 {
+
 namespace internal
 {
 
@@ -49,7 +50,7 @@
 };
 
 } // namespace internal
+
 } // namespace scopes
+
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/FilterBaseImpl.h'
--- include/unity/scopes/internal/FilterBaseImpl.h	2014-05-19 09:32:27 +0000
+++ include/unity/scopes/internal/FilterBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_FILTERBASEIMPL_H
-#define UNITY_SCOPES_INTERNAL_FILTERBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/FilterBase.h>
@@ -64,5 +63,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/FilterOptionImpl.h'
--- include/unity/scopes/internal/FilterOptionImpl.h	2014-02-18 05:04:01 +0000
+++ include/unity/scopes/internal/FilterOptionImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_FILTEROPTIONIMPL_H
-#define UNITY_SCOPES_INTERNAL_FILTEROPTIONIMPL_H
+#pragma once
 
 #include <string>
 
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/FilterStateImpl.h'
--- include/unity/scopes/internal/FilterStateImpl.h	2014-02-04 06:34:33 +0000
+++ include/unity/scopes/internal/FilterStateImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_FILTERSTATEIMPL_H
-#define UNITY_SCOPES_INTERNAL_FILTERSTATEIMPL_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <unity/scopes/FilterState.h>
@@ -56,5 +55,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/IniSettingsSchema.h'
--- include/unity/scopes/internal/IniSettingsSchema.h	2014-08-14 07:48:12 +0000
+++ include/unity/scopes/internal/IniSettingsSchema.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_INISETTINGSSCHEMA_H
-#define UNITY_SCOPES_INTERNAL_INISETTINGSSCHEMA_H
+#pragma once
 
 #include <unity/scopes/internal/SettingsSchema.h>
 
@@ -63,5 +62,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/InvokeInfo.h'
--- include/unity/scopes/internal/InvokeInfo.h	2014-01-16 12:18:56 +0000
+++ include/unity/scopes/internal/InvokeInfo.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_INVOKEINFO_H
-#define UNITY_SCOPES_INTERNAL_INVOKEINFO_H
+#pragma once
 
 #include <string>
 
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/JsonCppNode.h'
--- include/unity/scopes/internal/JsonCppNode.h	2014-08-04 06:31:27 +0000
+++ include/unity/scopes/internal/JsonCppNode.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_JSONCPPNODE_H
-#define UNITY_SCOPES_INTERNAL_JSONCPPNODE_H
+#pragma once
 
 #include <unity/scopes/internal/JsonNodeInterface.h>
 #include <jsoncpp/json/value.h>
@@ -72,5 +71,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_JSONCPPNODE_H

=== modified file 'include/unity/scopes/internal/JsonNodeInterface.h'
--- include/unity/scopes/internal/JsonNodeInterface.h	2014-08-04 06:31:27 +0000
+++ include/unity/scopes/internal/JsonNodeInterface.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_JSONNODEINTERFACE_H
-#define UNITY_SCOPES_INTERNAL_JSONNODEINTERFACE_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -76,5 +75,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_JSONNODEINTERFACE_H

=== modified file 'include/unity/scopes/internal/JsonSettingsSchema.h'
--- include/unity/scopes/internal/JsonSettingsSchema.h	2014-08-14 07:48:12 +0000
+++ include/unity/scopes/internal/JsonSettingsSchema.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_JSONSETTINGSSCHEMA_H
-#define UNITY_SCOPES_INTERNAL_JSONSETTINGSSCHEMA_H
+#pragma once
 
 #include <unity/scopes/internal/SettingsSchema.h>
 
@@ -62,5 +61,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/LinkImpl.h'
--- include/unity/scopes/internal/LinkImpl.h	2014-02-27 16:58:50 +0000
+++ include/unity/scopes/internal/LinkImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_HYPERLINKIMPL_H
-#define UNITY_SCOPES_INTERNAL_HYPERLINKIMPL_H
+#pragma once
 
 #include <string>
 #include <memory>
@@ -52,5 +51,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/LocationImpl.h'
--- include/unity/scopes/internal/LocationImpl.h	2014-08-28 00:20:56 +0000
+++ include/unity/scopes/internal/LocationImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pete Woods <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_LOCATIONIMPL_H
-#define UNITY_SCOPES_INTERNAL_LOCATIONIMPL_H
+#pragma once
 
 #include <unity/scopes/Location.h>
 
@@ -104,6 +103,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-
-#endif

=== modified file 'include/unity/scopes/internal/MWObjectProxy.h'
--- include/unity/scopes/internal/MWObjectProxy.h	2014-05-29 15:41:42 +0000
+++ include/unity/scopes/internal/MWObjectProxy.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWOBJECTPROXY_H
-#define UNITY_SCOPES_INTERNAL_MWOBJECTPROXY_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxyFwd.h>
 
@@ -64,5 +63,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWObjectProxyFwd.h'
--- include/unity/scopes/internal/MWObjectProxyFwd.h	2014-01-15 09:22:20 +0000
+++ include/unity/scopes/internal/MWObjectProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWOBJECTPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWOBJECTPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWPublisher.h'
--- include/unity/scopes/internal/MWPublisher.h	2014-08-04 06:31:27 +0000
+++ include/unity/scopes/internal/MWPublisher.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWPUBLISHER_H
-#define UNITY_SCOPES_INTERNAL_MWPUBLISHER_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -53,5 +52,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_MWPUBLISHER_H

=== modified file 'include/unity/scopes/internal/MWQuery.h'
--- include/unity/scopes/internal/MWQuery.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/MWQuery.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWQUERY_H
-#define UNITY_SCOPES_INTERNAL_MWQUERY_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWQueryCtrl.h'
--- include/unity/scopes/internal/MWQueryCtrl.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/MWQueryCtrl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWQUERYCTRL_H
-#define UNITY_SCOPES_INTERNAL_MWQUERYCTRL_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/MWQueryCtrlProxyFwd.h>
@@ -48,5 +47,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWQueryCtrlProxyFwd.h'
--- include/unity/scopes/internal/MWQueryCtrlProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/MWQueryCtrlProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWQUERYCTRLPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWQUERYCTRLPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWQueryProxyFwd.h'
--- include/unity/scopes/internal/MWQueryProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/MWQueryProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWQUERYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWQUERYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWRegistry.h'
--- include/unity/scopes/internal/MWRegistry.h	2014-08-12 05:36:06 +0000
+++ include/unity/scopes/internal/MWRegistry.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWREGISTRY_H
-#define UNITY_SCOPES_INTERNAL_MWREGISTRY_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/MWSubscriber.h>
@@ -63,5 +62,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWRegistryProxyFwd.h'
--- include/unity/scopes/internal/MWRegistryProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/MWRegistryProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWREGISTRYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWREGISTRYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWReply.h'
--- include/unity/scopes/internal/MWReply.h	2014-07-28 07:18:52 +0000
+++ include/unity/scopes/internal/MWReply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWREPLY_H
-#define UNITY_SCOPES_INTERNAL_MWREPLY_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -53,5 +52,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWReplyProxyFwd.h'
--- include/unity/scopes/internal/MWReplyProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/MWReplyProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWREPLYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWREPLYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWScope.h'
--- include/unity/scopes/internal/MWScope.h	2014-08-12 09:04:49 +0000
+++ include/unity/scopes/internal/MWScope.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWSCOPE_H
-#define UNITY_SCOPES_INTERNAL_MWSCOPE_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -55,5 +54,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWScopeProxyFwd.h'
--- include/unity/scopes/internal/MWScopeProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/MWScopeProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWSCOPEPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWSCOPEPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MWStateReceiver.h'
--- include/unity/scopes/internal/MWStateReceiver.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/MWStateReceiver.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWSTATERECEIVER_H
-#define UNITY_SCOPES_INTERNAL_MWSTATERECEIVER_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <unity/scopes/internal/StateReceiverObject.h>
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_MWSTATERECEIVER_H

=== modified file 'include/unity/scopes/internal/MWStateReceiverProxyFwd.h'
--- include/unity/scopes/internal/MWStateReceiverProxyFwd.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/MWStateReceiverProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWSTATERECEIVERPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_MWSTATERECEIVERPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -38,5 +37,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_MWSTATERECEIVERPROXYFWD_H

=== modified file 'include/unity/scopes/internal/MWSubscriber.h'
--- include/unity/scopes/internal/MWSubscriber.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/internal/MWSubscriber.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
-#define UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H
+#pragma once
 
 #include <core/signal.h>
 #include <unity/util/DefinesPtrs.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_MWSUBSCRIBER_H

=== modified file 'include/unity/scopes/internal/MiddlewareBase.h'
--- include/unity/scopes/internal/MiddlewareBase.h	2014-08-08 14:06:59 +0000
+++ include/unity/scopes/internal/MiddlewareBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MIDDLEWAREBASE_H
-#define UNITY_SCOPES_INTERNAL_MIDDLEWAREBASE_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxyFwd.h>
 #include <unity/scopes/internal/MWPublisher.h>
@@ -104,5 +103,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/MiddlewareFactory.h'
--- include/unity/scopes/internal/MiddlewareFactory.h	2014-08-12 05:55:54 +0000
+++ include/unity/scopes/internal/MiddlewareFactory.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_MIDDLEWAREFACTORY_H
-#define UNITY_SCOPES_INTERNAL_MIDDLEWAREFACTORY_H
+#pragma once
 
 #include <unity/scopes/internal/MiddlewareBase.h>
 
@@ -94,5 +93,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ObjectImpl.h'
--- include/unity/scopes/internal/ObjectImpl.h	2014-05-29 15:41:42 +0000
+++ include/unity/scopes/internal/ObjectImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_OBJECTIMPL_H
-#define UNITY_SCOPES_INTERNAL_OBJECTIMPL_H
+#pragma once
 
 #include<unity/scopes/internal/MWObjectProxyFwd.h>
 #include<unity/scopes/Object.h>
@@ -68,5 +67,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/OnlineAccountClientImpl.h'
--- include/unity/scopes/internal/OnlineAccountClientImpl.h	2014-10-13 15:13:12 +0000
+++ include/unity/scopes/internal/OnlineAccountClientImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ONLINEACCOUNTCLIENTIMPL_H
-#define UNITY_SCOPES_INTERNAL_ONLINEACCOUNTCLIENTIMPL_H
+#pragma once
 
 #include <unity/scopes/OnlineAccountClient.h>
 
@@ -127,5 +126,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/OperationInfoImpl.h'
--- include/unity/scopes/internal/OperationInfoImpl.h	2014-07-28 05:22:59 +0000
+++ include/unity/scopes/internal/OperationInfoImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
 */
 
-#ifndef UNITY_INTERNAL_OPERATIONINFOIMPL_H
-#define UNITY_INTERNAL_OPERATIONINFOIMPL_H
+#pragma once
 
 #include <unity/scopes/OperationInfo.h>
 
@@ -55,5 +54,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/OptionSelectorFilterImpl.h'
--- include/unity/scopes/internal/OptionSelectorFilterImpl.h	2014-05-19 09:54:37 +0000
+++ include/unity/scopes/internal/OptionSelectorFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_OPTIONSELECTORFILTERIMPL_H
-#define UNITY_SCOPES_INTERNAL_OPTIONSELECTORFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/FilterBaseImpl.h>
 #include <unity/scopes/OptionSelectorFilter.h>
@@ -69,5 +68,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/PreviewQueryBaseImpl.h'
--- include/unity/scopes/internal/PreviewQueryBaseImpl.h	2014-06-13 15:12:44 +0000
+++ include/unity/scopes/internal/PreviewQueryBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_PREVIEWQUERYBASEIMPL_H
-#define UNITY_INTERNAL_PREVIEWQUERYBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/QueryBaseImpl.h>
 #include <unity/scopes/Result.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/PreviewQueryObject.h'
--- include/unity/scopes/internal/PreviewQueryObject.h	2014-02-27 23:09:51 +0000
+++ include/unity/scopes/internal/PreviewQueryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michal Hruby <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_PREVIEWQUERYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_PREVIEWQUERYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryObject.h>
 #include <unity/scopes/PreviewQueryBase.h>
@@ -51,5 +50,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/PreviewReplyImpl.h'
--- include/unity/scopes/internal/PreviewReplyImpl.h	2014-03-07 10:54:15 +0000
+++ include/unity/scopes/internal/PreviewReplyImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_PREVIEWREPLYIMPL_H
-#define UNITY_SCOPES_INTERNAL_PREVIEWREPLYIMPL_H
+#pragma once
 
 #include <unity/scopes/ColumnLayout.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -55,5 +54,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/PreviewReplyObject.h'
--- include/unity/scopes/internal/PreviewReplyObject.h	2014-08-12 09:04:49 +0000
+++ include/unity/scopes/internal/PreviewReplyObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_PREVIEWREPLYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_PREVIEWREPLYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ReplyObject.h>
 #include <unity/scopes/internal/CategoryRegistry.h>
@@ -52,5 +51,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/PreviewWidgetImpl.h'
--- include/unity/scopes/internal/PreviewWidgetImpl.h	2014-08-20 14:11:00 +0000
+++ include/unity/scopes/internal/PreviewWidgetImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_PREVIEWWIDGETIMPL_H
-#define UNITY_SCOPES_INTERNAL_PREVIEWWIDGETIMPL_H
+#pragma once
 
 #include <unity/scopes/PreviewWidget.h>
 #include <string>
@@ -73,5 +72,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryBaseImpl.h'
--- include/unity/scopes/internal/QueryBaseImpl.h	2014-06-24 11:11:11 +0000
+++ include/unity/scopes/internal/QueryBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYBASEIMPL_H
-#define UNITY_SCOPES_INTERNAL_QUERYBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 
@@ -56,5 +55,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryCtrlImpl.h'
--- include/unity/scopes/internal/QueryCtrlImpl.h	2014-03-11 02:02:23 +0000
+++ include/unity/scopes/internal/QueryCtrlImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYCTRLIMPL_H
-#define UNITY_SCOPES_INTERNAL_QUERYCTRLIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MWQueryCtrlProxyFwd.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryCtrlObject.h'
--- include/unity/scopes/internal/QueryCtrlObject.h	2014-01-24 02:13:35 +0000
+++ include/unity/scopes/internal/QueryCtrlObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYCTRLOBJECT_H
-#define UNITY_SCOPES_INTERNAL_QUERYCTRLOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryCtrlObjectBase.h>
 
@@ -60,5 +59,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryCtrlObjectBase.h'
--- include/unity/scopes/internal/QueryCtrlObjectBase.h	2014-01-24 02:13:35 +0000
+++ include/unity/scopes/internal/QueryCtrlObjectBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYCTRLOBJECTBASE_H
-#define UNITY_SCOPES_INTERNAL_QUERYCTRLOBJECTBASE_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/internal/InvokeInfo.h>
@@ -45,5 +44,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryMetadataImpl.h'
--- include/unity/scopes/internal/QueryMetadataImpl.h	2014-09-02 15:47:35 +0000
+++ include/unity/scopes/internal/QueryMetadataImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_QUERYMETADATAIMPL_H
-#define UNITY_INTERNAL_QUERYMETADATAIMPL_H
+#pragma once
 
 #include <unity/scopes/QueryMetadata.h>
 #include <unity/scopes/Variant.h>
@@ -76,5 +75,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryObject.h'
--- include/unity/scopes/internal/QueryObject.h	2014-04-15 03:29:43 +0000
+++ include/unity/scopes/internal/QueryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_QUERYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryObjectBase.h>
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
@@ -80,5 +79,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/QueryObjectBase.h'
--- include/unity/scopes/internal/QueryObjectBase.h	2014-02-19 04:18:26 +0000
+++ include/unity/scopes/internal/QueryObjectBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_QUERYOBJECTBASE_H
-#define UNITY_SCOPES_INTERNAL_QUERYOBJECTBASE_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/internal/InvokeInfo.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RadioButtonsFilterImpl.h'
--- include/unity/scopes/internal/RadioButtonsFilterImpl.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/internal/RadioButtonsFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_RADIOBUTTONSFILTERIMPL_H
-#define UNITY_INTERNAL_RADIOBUTTONSFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/OptionSelectorFilterImpl.h>
 #include <unity/scopes/RadioButtonsFilter.h>
@@ -48,5 +47,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RangeInputFilterImpl.h'
--- include/unity/scopes/internal/RangeInputFilterImpl.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/internal/RangeInputFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_RANGEINPUTFILTERIMPL_H
-#define UNITY_INTERNAL_RANGEINPUTFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/FilterBaseImpl.h>
 #include <unity/scopes/RangeInputFilter.h>
@@ -74,5 +73,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RatingFilterImpl.h'
--- include/unity/scopes/internal/RatingFilterImpl.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/internal/RatingFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_RATINGFILTERIMPL_H
-#define UNITY_INTERNAL_RATINGFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/RadioButtonsFilterImpl.h>
 #include <unity/scopes/RatingFilter.h>
@@ -62,5 +61,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/Reaper.h'
--- include/unity/scopes/internal/Reaper.h	2014-09-08 03:45:56 +0000
+++ include/unity/scopes/internal/Reaper.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REAPER_H
-#define UNITY_SCOPES_INTERNAL_REAPER_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -212,5 +211,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RegistryConfig.h'
--- include/unity/scopes/internal/RegistryConfig.h	2014-05-08 06:25:40 +0000
+++ include/unity/scopes/internal/RegistryConfig.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REGISTRYCONFIG_H
-#define UNITY_SCOPES_INTERNAL_REGISTRYCONFIG_H
+#pragma once
 
 #include <unity/scopes/internal/ConfigBase.h>
 
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RegistryException.h'
--- include/unity/scopes/internal/RegistryException.h	2014-02-18 05:04:01 +0000
+++ include/unity/scopes/internal/RegistryException.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REGISTRYEXCEPTION_H
-#define UNITY_SCOPES_INTERNAL_REGISTRYEXCEPTION_H
+#pragma once
 
 #include <unity/Exception.h>
 
@@ -46,5 +45,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RegistryImpl.h'
--- include/unity/scopes/internal/RegistryImpl.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/internal/RegistryImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REGISTRYIMPL_H
-#define UNITY_SCOPES_INTERNAL_REGISTRYIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MWRegistryProxyFwd.h>
 #include <unity/scopes/internal/ObjectImpl.h>
@@ -60,5 +59,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RegistryObject.h'
--- include/unity/scopes/internal/RegistryObject.h	2014-10-22 15:33:01 +0000
+++ include/unity/scopes/internal/RegistryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REGISTRYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_REGISTRYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/Executor.h>
 #include <unity/scopes/internal/MiddlewareBase.h>
@@ -156,5 +155,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RegistryObjectBase.h'
--- include/unity/scopes/internal/RegistryObjectBase.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/internal/RegistryObjectBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REGISTRYOBJECTBASE_H
-#define UNITY_SCOPES_INTERNAL_REGISTRYOBJECTBASE_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/Registry.h>
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ReplyImpl.h'
--- include/unity/scopes/internal/ReplyImpl.h	2014-07-28 08:30:35 +0000
+++ include/unity/scopes/internal/ReplyImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REPLYIMPL_H
-#define UNITY_SCOPES_INTERNAL_REPLYIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MWReplyProxyFwd.h>
 #include <unity/scopes/internal/ObjectImpl.h>
@@ -66,5 +65,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ReplyObject.h'
--- include/unity/scopes/internal/ReplyObject.h	2014-08-12 09:04:49 +0000
+++ include/unity/scopes/internal/ReplyObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REPLYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_REPLYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ReplyObjectBase.h>
 #include <unity/scopes/internal/Reaper.h>
@@ -77,5 +76,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ReplyObjectBase.h'
--- include/unity/scopes/internal/ReplyObjectBase.h	2014-07-28 08:30:35 +0000
+++ include/unity/scopes/internal/ReplyObjectBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_REPLYOBJECTBASE_H
-#define UNITY_SCOPES_INTERNAL_REPLYOBJECTBASE_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/ListenerBase.h>
@@ -47,5 +46,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ResultImpl.h'
--- include/unity/scopes/internal/ResultImpl.h	2014-03-07 04:19:32 +0000
+++ include/unity/scopes/internal/ResultImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_RESULTITEMIMPL_H
-#define UNITY_SCOPES_INTERNAL_RESULTITEMIMPL_H
+#pragma once
 
 #include <string>
 #include <memory>
@@ -114,6 +113,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-
-#endif

=== modified file 'include/unity/scopes/internal/ResultReplyObject.h'
--- include/unity/scopes/internal/ResultReplyObject.h	2014-08-12 09:04:49 +0000
+++ include/unity/scopes/internal/ResultReplyObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_RESULTREPLYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_RESULTREPLYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ReplyObject.h>
 #include <unity/scopes/internal/CategoryRegistry.h>
@@ -56,5 +55,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RuntimeConfig.h'
--- include/unity/scopes/internal/RuntimeConfig.h	2014-08-13 17:07:12 +0000
+++ include/unity/scopes/internal/RuntimeConfig.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_RUNTIMECONFIG_H
-#define UNITY_SCOPES_INTERNAL_RUNTIMECONFIG_H
+#pragma once
 
 #include <unity/scopes/internal/ConfigBase.h>
 #include <unity/scopes/Runtime.h>
@@ -45,10 +44,12 @@
     std::string default_middleware_configfile() const;
     int reap_expiry() const;
     int reap_interval() const;
-    std::string data_directory() const;
+    std::string cache_directory() const;
+    std::string app_directory() const;
     std::string config_directory() const;
+    static std::string default_cache_directory();
+    static std::string default_app_directory();
     static std::string default_config_directory();
-    static std::string default_data_directory();
 
 private:
     std::string registry_identity_;
@@ -59,7 +60,8 @@
     std::string default_middleware_configfile_;
     int reap_expiry_;
     int reap_interval_;
-    std::string data_directory_;
+    std::string cache_directory_;
+    std::string app_directory_;
     std::string config_directory_;
 };
 
@@ -68,5 +70,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/RuntimeImpl.h'
--- include/unity/scopes/internal/RuntimeImpl.h	2014-10-10 07:01:36 +0000
+++ include/unity/scopes/internal/RuntimeImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_RUNTIMEIMPL_H
-#define UNITY_SCOPES_INTERNAL_RUNTIMEIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MiddlewareBase.h>
 #include <unity/scopes/internal/MiddlewareFactory.h>
@@ -73,6 +72,7 @@
     bool confined() const;
     std::string confinement_type() const;
     std::string find_cache_dir() const;
+    std::string find_app_dir() const;
     std::string find_tmp_dir() const;
 
     bool destroyed_;
@@ -86,7 +86,8 @@
     mutable std::string ss_registry_identity_;
     int reap_expiry_;
     int reap_interval_;
-    std::string data_dir_;
+    std::string cache_dir_;
+    std::string app_dir_;
     std::string config_dir_;
     std::string tmp_dir_;
     mutable Reaper::SPtr reply_reaper_;
@@ -101,5 +102,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeBaseImpl.h'
--- include/unity/scopes/internal/ScopeBaseImpl.h	2014-07-11 06:28:13 +0000
+++ include/unity/scopes/internal/ScopeBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
-#define UNITY_SCOPES_INTERNAL_SCOPEBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/RegistryProxyFwd.h>
 #include <unity/scopes/Variant.h>
@@ -48,6 +47,9 @@
     void set_cache_directory(std::string const& path);
     std::string cache_directory() const;
 
+    void set_app_directory(std::string const& path);
+    std::string app_directory() const;
+
     void set_tmp_directory(std::string const& path);
     std::string tmp_directory() const;
 
@@ -65,6 +67,9 @@
     std::string cache_directory_;
     bool cache_dir_initialized_;
 
+    std::string app_directory_;
+    bool app_dir_initialized_;
+
     std::string tmp_directory_;
     bool tmp_dir_initialized_;
 
@@ -82,5 +87,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeConfig.h'
--- include/unity/scopes/internal/ScopeConfig.h	2014-08-11 12:08:44 +0000
+++ include/unity/scopes/internal/ScopeConfig.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPECONFIG_H
-#define UNITY_SCOPES_INTERNAL_SCOPECONFIG_H
+#pragma once
 
 #include <unity/scopes/internal/ConfigBase.h>
 #include <unity/scopes/Variant.h>
@@ -53,6 +52,9 @@
     int idle_timeout() const;              // Optional, returns default value if not present
     ScopeMetadata::ResultsTtlType results_ttl_type() const;  // Optional, returns none if not present
     bool debug_mode() const;               // Optional, returns false if not present
+    std::vector<std::string> child_scope_ids() const;  // Optional, returns an empty vector if no ids are present
+    int version() const;                   // Optional, returns 0 if not present
+    std::vector<std::string> tags() const; // Optional, returns an empty vector if no tags are present
 
     VariantMap appearance_attributes() const; // Optional, returns empty map if no attributes are present
 
@@ -73,6 +75,9 @@
     int idle_timeout_;
     ScopeMetadata::ResultsTtlType results_ttl_type_;
     bool debug_mode_;
+    std::vector<std::string> child_scope_ids_;
+    int version_;
+    std::vector<std::string> tags_;
 
     VariantMap appearance_attributes_;
 };
@@ -82,5 +87,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeImpl.h'
--- include/unity/scopes/internal/ScopeImpl.h	2014-03-11 02:02:23 +0000
+++ include/unity/scopes/internal/ScopeImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPEIMPL_H
-#define UNITY_SCOPES_INTERNAL_SCOPEIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MWScopeProxyFwd.h>
 #include <unity/scopes/internal/ObjectImpl.h>
@@ -96,5 +95,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeLoader.h'
--- include/unity/scopes/internal/ScopeLoader.h	2014-07-04 03:52:07 +0000
+++ include/unity/scopes/internal/ScopeLoader.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPELOADER_H
-#define UNITY_SCOPES_INTERNAL_SCOPELOADER_H
+#pragma once
 
 #include <unity/scopes/ScopeBase.h>
 #include <unity/scopes/internal/DynamicLoader.h>
@@ -84,5 +83,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeMetadataImpl.h'
--- include/unity/scopes/internal/ScopeMetadataImpl.h	2014-08-12 09:38:31 +0000
+++ include/unity/scopes/internal/ScopeMetadataImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPEMETADATAIMPL_H
-#define UNITY_SCOPES_INTERNAL_SCOPEMETADATAIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/MWScope.h>
 #include <unity/scopes/ScopeMetadata.h>
@@ -58,6 +57,9 @@
     ScopeMetadata::ResultsTtlType results_ttl_type() const;      // optional (default: none)
     VariantArray settings_definitions() const;                   // optional (default: empty array)
     bool location_data_needed() const;                           // optional (default: false)
+    std::vector<std::string> child_scope_ids() const;            // optional (default: empty array)
+    int version() const;                                         // optional (default: 0)
+    std::vector<std::string> tags() const;                       // optional (default: empty array)
 
     void set_scope_id(std::string const& scope_id);
     void set_proxy(ScopeProxy const& proxy);
@@ -74,6 +76,9 @@
     void set_results_ttl_type(ScopeMetadata::ResultsTtlType results_ttl);
     void set_settings_definitions(VariantArray const& settings_definitions);
     void set_location_data_needed(bool location_data_needed);
+    void set_child_scope_ids(std::vector<std::string> const& ids);
+    void set_version(int v);
+    void set_tags(std::vector<std::string> const& tags);
 
     VariantMap serialize() const;
     void deserialize(VariantMap const& var);
@@ -98,6 +103,9 @@
     ScopeMetadata::ResultsTtlType results_ttl_type_;
     std::unique_ptr<VariantArray> settings_definitions_;  // Optional, hence a pointer
     std::unique_ptr<bool> location_data_needed_;          // Optional, hence a pointer
+    std::vector<std::string> child_scope_ids_;
+    int version_;
+    std::vector<std::string> tags_;
 };
 
 } // namespace internal
@@ -105,6 +113,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeObject.h'
--- include/unity/scopes/internal/ScopeObject.h	2014-08-12 13:26:35 +0000
+++ include/unity/scopes/internal/ScopeObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPEOBJECT_H
-#define UNITY_SCOPES_INTERNAL_SCOPEOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ScopeObjectBase.h>
 #include <unity/scopes/internal/QueryObjectBase.h>
@@ -94,5 +93,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ScopeObjectBase.h'
--- include/unity/scopes/internal/ScopeObjectBase.h	2014-08-12 13:26:35 +0000
+++ include/unity/scopes/internal/ScopeObjectBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SCOPEOBJECTBASE_H
-#define UNITY_SCOPES_INTERNAL_SCOPEOBJECTBASE_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/internal/InvokeInfo.h>
@@ -78,5 +77,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/SearchMetadataImpl.h'
--- include/unity/scopes/internal/SearchMetadataImpl.h	2014-09-05 08:33:13 +0000
+++ include/unity/scopes/internal/SearchMetadataImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_SEARCHMETADATAIMPL_H
-#define UNITY_INTERNAL_SEARCHMETADATAIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/QueryMetadataImpl.h>
 #include <unity/scopes/SearchMetadata.h>
@@ -75,5 +74,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/SearchQueryBaseImpl.h'
--- include/unity/scopes/internal/SearchQueryBaseImpl.h	2014-06-24 11:11:11 +0000
+++ include/unity/scopes/internal/SearchQueryBaseImpl.h	2014-11-28 11:54:53 +0000
@@ -17,8 +17,7 @@
  *              Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_SEARCHQUERYBASEIMPL_H
-#define UNITY_INTERNAL_SEARCHQUERYBASEIMPL_H
+#pragma once
 
 #include <unity/scopes/CannedQuery.h>
 #include <unity/scopes/internal/QueryBaseImpl.h>
@@ -81,5 +80,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/SearchReplyImpl.h'
--- include/unity/scopes/internal/SearchReplyImpl.h	2014-07-02 09:36:34 +0000
+++ include/unity/scopes/internal/SearchReplyImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SEARCHREPLYIMPL_H
-#define UNITY_SCOPES_INTERNAL_SEARCHREPLYIMPL_H
+#pragma once
 
 #include <unity/scopes/Category.h>
 #include <unity/scopes/Department.h>
@@ -89,5 +88,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/SettingsDB.h'
--- include/unity/scopes/internal/SettingsDB.h	2014-08-14 14:39:01 +0000
+++ include/unity/scopes/internal/SettingsDB.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SETTINGSDB_H
-#define UNITY_SCOPES_INTERNAL_SETTINGSDB_H
+#pragma once
 
 #include <unity/scopes/internal/SettingsSchema.h>
 #include <unity/scopes/Variant.h>
@@ -95,5 +94,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/SettingsSchema.h'
--- include/unity/scopes/internal/SettingsSchema.h	2014-08-14 07:48:12 +0000
+++ include/unity/scopes/internal/SettingsSchema.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SETTINGSSCHEMA_H
-#define UNITY_SCOPES_INTERNAL_SETTINGSSCHEMA_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/IniParser.h>
@@ -47,6 +46,9 @@
 
     virtual VariantArray definitions() const = 0;
 
+    // TODO: HACK: See bug #1393438 and the comments in IniSettingsSchema.cpp and
+    //             JsonSettingsSchema.cpp. This method needs to be removed
+    //             once we have fixed this properly.
     virtual void add_location_setting() = 0;
 };
 
@@ -55,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/StateReceiverObject.h'
--- include/unity/scopes/internal/StateReceiverObject.h	2014-08-01 03:19:32 +0000
+++ include/unity/scopes/internal/StateReceiverObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_STATERECEIVEROBJECT_H
-#define UNITY_SCOPES_INTERNAL_STATERECEIVEROBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/AbstractObject.h>
 #include <unity/scopes/internal/InvokeInfo.h>
@@ -64,5 +63,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_STATERECEIVEROBJECT_H

=== modified file 'include/unity/scopes/internal/SwitchFilterImpl.h'
--- include/unity/scopes/internal/SwitchFilterImpl.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/internal/SwitchFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_SWITCHFILTERIMPL_H
-#define UNITY_INTERNAL_SWITCHFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/FilterBaseImpl.h>
 #include <unity/scopes/SwitchFilter.h>
@@ -58,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/TaskWrapper.h'
--- include/unity/scopes/internal/TaskWrapper.h	2014-04-15 23:00:18 +0000
+++ include/unity/scopes/internal/TaskWrapper.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_TASKWRAPPER_H
-#define UNITY_SCOPES_INTERNAL_TASKWRAPPER_H
+#pragma once
 
 #include <memory>
 
@@ -101,5 +100,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ThreadPool.h'
--- include/unity/scopes/internal/ThreadPool.h	2014-09-08 05:55:39 +0000
+++ include/unity/scopes/internal/ThreadPool.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_THREADPOOL_H
-#define UNITY_SCOPES_INTERNAL_THREADPOOL_H
+#pragma once
 
 #include <unity/scopes/internal/ThreadSafeQueue.h>
 #include <unity/scopes/internal/TaskWrapper.h>
@@ -88,5 +87,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ThreadSafeQueue.h'
--- include/unity/scopes/internal/ThreadSafeQueue.h	2014-04-15 23:00:18 +0000
+++ include/unity/scopes/internal/ThreadSafeQueue.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_THREADSAFEQUEUE_H
-#define UNITY_SCOPES_INTERNAL_THREADSAFEQUEUE_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -193,5 +192,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/UniqueID.h'
--- include/unity/scopes/internal/UniqueID.h	2014-01-07 10:33:11 +0000
+++ include/unity/scopes/internal/UniqueID.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_UNIQUEID_H
-#define UNITY_SCOPES_INTERNAL_UNIQUEID_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 
@@ -62,5 +61,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/Utils.h'
--- include/unity/scopes/internal/Utils.h	2014-08-26 04:00:56 +0000
+++ include/unity/scopes/internal/Utils.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_UTILS_H
-#define UNITY_INTERNAL_UTILS_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <string>
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/ValueSliderFilterImpl.h'
--- include/unity/scopes/internal/ValueSliderFilterImpl.h	2014-06-17 10:30:03 +0000
+++ include/unity/scopes/internal/ValueSliderFilterImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_INTERNAL_VALUESLIDERFILTERIMPL_H
-#define UNITY_INTERNAL_VALUESLIDERFILTERIMPL_H
+#pragma once
 
 #include <unity/scopes/internal/FilterBaseImpl.h>
 #include <unity/scopes/ValueSliderFilter.h>
@@ -74,5 +73,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/VariantBuilderImpl.h'
--- include/unity/scopes/internal/VariantBuilderImpl.h	2014-02-04 06:34:33 +0000
+++ include/unity/scopes/internal/VariantBuilderImpl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Pawel Stolowski <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_VARIANTBUILDER_H
-#define UNITY_SCOPES_INTERNAL_VARIANTBUILDER_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <string>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/lttng/SimpleTracepoint.h'
--- include/unity/scopes/internal/lttng/SimpleTracepoint.h	2014-08-28 00:20:56 +0000
+++ include/unity/scopes/internal/lttng/SimpleTracepoint.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef SIMPLETRACEPOINT_H_
-#define SIMPLETRACEPOINT_H_
+#pragma once
 
 #include <lttng/tracepoint.h>
 
@@ -150,5 +149,3 @@
   _TPF( a ) _TPF( b ) _TPF( c ) _TPF( d ) _TPF( e ) _TPF( f ) _TPF( g ) _TPF( h ) _TPF( i )
 #define _STP_FIELDS_10( a, b, c, d, e, f, g, h, i, j )\
   _TPF( a ) _TPF( b ) _TPF( c ) _TPF( d ) _TPF( e ) _TPF( f ) _TPF( g ) _TPF( h ) _TPF( i ) _TPF( j )
-
-#endif /* SIMPLETRACEPOINT_H_ */

=== added file 'include/unity/scopes/internal/safe_strerror.h'
--- include/unity/scopes/internal/safe_strerror.h	1970-01-01 00:00:00 +0000
+++ include/unity/scopes/internal/safe_strerror.h	2014-11-28 11:54:53 +0000
@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Michi Henning <[e-mail]>
+ */
+
+#pragma once
+
+#include <string>
+
+namespace unity
+{
+
+namespace scopes
+{
+
+namespace internal
+{
+
+std::string safe_strerror(int errnum);
+
+} // namespace internal
+
+} // namespace scopes
+
+} // namespace unity

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientInterface.h'
--- include/unity/scopes/internal/smartscopes/HttpClientInterface.h	2014-09-22 13:43:00 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientInterface.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTINTERFACE_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTINTERFACE_H
+#pragma once
 
 #include <unity/util/DefinesPtrs.h>
 #include <unity/util/NonCopyable.h>
@@ -111,5 +110,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTINTERFACE_H

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientQt.h'
--- include/unity/scopes/internal/smartscopes/HttpClientQt.h	2014-09-22 13:43:00 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientQt.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQT_H
+#pragma once
 
 #include <unity/scopes/internal/smartscopes/HttpClientInterface.h>
 #include <map>
@@ -90,5 +89,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQT_H

=== modified file 'include/unity/scopes/internal/smartscopes/HttpClientQtThread.h'
--- include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	2014-09-22 13:43:00 +0000
+++ include/unity/scopes/internal/smartscopes/HttpClientQtThread.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQTTHREAD_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQTTHREAD_H
+#pragma once
 
 // This hack allows unity-scopes-api to be built with
 // clang-3.4+ and versions of Qt before v5.1.1.
@@ -99,5 +98,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_HTTPCLIENTQTTHREAD_H

=== modified file 'include/unity/scopes/internal/smartscopes/SSConfig.h'
--- include/unity/scopes/internal/smartscopes/SSConfig.h	2014-05-08 06:04:29 +0000
+++ include/unity/scopes/internal/smartscopes/SSConfig.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SSCONFIG_H
-#define UNITY_SCOPES_INTERNAL_SSCONFIG_H
+#pragma once
 
 #include <unity/scopes/internal/ConfigBase.h>
 
@@ -58,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/smartscopes/SSQueryCtrlObject.h'
--- include/unity/scopes/internal/smartscopes/SSQueryCtrlObject.h	2014-02-13 07:43:40 +0000
+++ include/unity/scopes/internal/smartscopes/SSQueryCtrlObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYCTRLOBJECT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYCTRLOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryCtrlObjectBase.h>
 
@@ -65,5 +64,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYCTRLOBJECT_H

=== modified file 'include/unity/scopes/internal/smartscopes/SSQueryObject.h'
--- include/unity/scopes/internal/smartscopes/SSQueryObject.h	2014-08-20 07:58:15 +0000
+++ include/unity/scopes/internal/smartscopes/SSQueryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/QueryObjectBase.h>
 #include <unity/scopes/ReplyProxyFwd.h>
@@ -107,5 +106,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSQUERYOBJECT_H

=== modified file 'include/unity/scopes/internal/smartscopes/SSRegistryObject.h'
--- include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-10-22 15:33:01 +0000
+++ include/unity/scopes/internal/smartscopes/SSRegistryObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSREGISTRYOBJECT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSREGISTRYOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/MiddlewareBase.h>
 #include <unity/scopes/internal/RegistryObjectBase.h>
@@ -108,5 +107,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSREGISTRYOBJECT_H

=== modified file 'include/unity/scopes/internal/smartscopes/SSScopeObject.h'
--- include/unity/scopes/internal/smartscopes/SSScopeObject.h	2014-08-20 07:58:15 +0000
+++ include/unity/scopes/internal/smartscopes/SSScopeObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSSCOPEOBJECT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSSCOPEOBJECT_H
+#pragma once
 
 #include <unity/scopes/internal/ScopeObjectBase.h>
 #include <unity/scopes/internal/smartscopes/SSQueryCtrlObject.h>
@@ -99,5 +98,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_SSSCOPEOBJECT_H

=== modified file 'include/unity/scopes/internal/smartscopes/SmartScopesClient.h'
--- include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-09-22 13:43:00 +0000
+++ include/unity/scopes/internal/smartscopes/SmartScopesClient.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_SMARTSCOPES_SMARTSCOPESCLIENT_H
-#define UNITY_SCOPES_INTERNAL_SMARTSCOPES_SMARTSCOPESCLIENT_H
+#pragma once
 
 #include <unity/scopes/FilterBase.h>
 #include <unity/scopes/FilterState.h>
@@ -61,6 +60,8 @@
     std::shared_ptr<std::string> settings;      // optional
     std::shared_ptr<bool> needs_location_data;  // optional
     bool invisible = false;
+    int version;
+    std::vector<std::string> tags;              // optional
 };
 
 struct SearchCategory
@@ -88,6 +89,16 @@
     std::vector<std::shared_ptr<DepartmentInfo>> subdepartments;
 };
 
+struct LocationInfo
+{
+    bool has_location;
+    std::string country_code;
+    double latitude;
+    double longitude;
+
+    LocationInfo(): has_location(false) {}
+};
+
 class SearchHandle
 {
 public:
@@ -173,7 +184,7 @@
                               VariantMap const& settings = VariantMap(),
                               VariantMap const& filter_state = VariantMap(),
                               std::string const& locale = "",
-                              std::string const& country = "",
+                              LocationInfo const& location = LocationInfo(),
                               std::string const& user_agent_hdr = "",
                               const unsigned int limit = 0);
 
@@ -233,5 +244,3 @@
 }  // namespace scopes
 
 }  // namespace unity
-
-#endif  // UNITY_SCOPES_INTERNAL_SMARTSCOPES_SMARTSCOPESCLIENT_H

=== modified file 'include/unity/scopes/internal/zmq_middleware/ConnectionPool.h'
--- include/unity/scopes/internal/zmq_middleware/ConnectionPool.h	2014-10-06 06:33:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ConnectionPool.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_CONNECTIONPOOL_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_CONNECTIONPOOL_H
+#pragma once
 
 #include <unity/scopes/internal/Reaper.h>
 #include <unity/scopes/internal/zmq_middleware/RequestMode.h>
@@ -90,5 +89,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/Current.h'
--- include/unity/scopes/internal/zmq_middleware/Current.h	2014-01-16 12:18:56 +0000
+++ include/unity/scopes/internal/zmq_middleware/Current.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_CURRENT_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_CURRENT_H
+#pragma once
 
 #include <unity/scopes/internal/InvokeInfo.h>
 
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h'
--- include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h	2014-09-11 06:45:13 +0000
+++ include/unity/scopes/internal/zmq_middleware/ObjectAdapter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_OBJECTADAPTER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_OBJECTADAPTER_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 
@@ -138,5 +137,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/QueryCtrlI.h'
--- include/unity/scopes/internal/zmq_middleware/QueryCtrlI.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/QueryCtrlI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_QUERYCTRLI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_QUERYCTRLI_H
+#pragma once
 
 #include <unity/scopes/internal/MWQueryCtrl.h>
 #include <unity/scopes/internal/QueryCtrlObjectBase.h>
@@ -58,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/QueryI.h'
--- include/unity/scopes/internal/zmq_middleware/QueryI.h	2014-01-23 11:28:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/QueryI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_QUERYI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_QUERYI_H
+#pragma once
 
 #include <unity/scopes/internal/MWQuery.h>
 #include <unity/scopes/internal/QueryObjectBase.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/RegistryI.h'
--- include/unity/scopes/internal/zmq_middleware/RegistryI.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/RegistryI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REGISTRYI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REGISTRYI_H
+#pragma once
 
 #include <unity/scopes/internal/MWRegistry.h>
 #include <unity/scopes/internal/RegistryObjectBase.h>
@@ -72,5 +71,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ReplyI.h'
--- include/unity/scopes/internal/zmq_middleware/ReplyI.h	2014-07-24 14:08:45 +0000
+++ include/unity/scopes/internal/zmq_middleware/ReplyI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REPLYI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REPLYI_H
+#pragma once
 
 #include <unity/scopes/internal/MWReply.h>
 #include <unity/scopes/internal/ReplyObjectBase.h>
@@ -60,5 +59,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/RequestMode.h'
--- include/unity/scopes/internal/zmq_middleware/RequestMode.h	2014-01-22 03:29:48 +0000
+++ include/unity/scopes/internal/zmq_middleware/RequestMode.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REQUESTMODE_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_REQUESTMODE_H
+#pragma once
 
 #include <string>
 
@@ -44,5 +43,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/RethrowException.h'
--- include/unity/scopes/internal/zmq_middleware/RethrowException.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/RethrowException.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_RETHROWEXCEPTION_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_RETHROWEXCEPTION_H
+#pragma once
 
 #include <zmqpp/exception.hpp>
 
@@ -44,5 +43,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ScopeI.h'
--- include/unity/scopes/internal/zmq_middleware/ScopeI.h	2014-08-12 13:26:35 +0000
+++ include/unity/scopes/internal/zmq_middleware/ScopeI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_SCOPEI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_SCOPEI_H
+#pragma once
 
 #include <unity/scopes/internal/MWScope.h>
 #include <unity/scopes/internal/ScopeObjectBase.h>
@@ -66,5 +65,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ServantBase.h'
--- include/unity/scopes/internal/zmq_middleware/ServantBase.h	2014-01-23 23:32:10 +0000
+++ include/unity/scopes/internal/zmq_middleware/ServantBase.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_SERVANTBASE_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_SERVANTBASE_H
+#pragma once
 
 #include <capnp/dynamic.h>
 #include <scopes/internal/zmq_middleware/capnproto/Message.capnp.h>
@@ -79,5 +78,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/StateReceiverI.h'
--- include/unity/scopes/internal/zmq_middleware/StateReceiverI.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/zmq_middleware/StateReceiverI.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_STATERECEIVERI_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_STATERECEIVERI_H
+#pragma once
 
 #include <unity/scopes/internal/StateReceiverObject.h>
 #include <unity/scopes/internal/zmq_middleware/ServantBase.h>
@@ -53,5 +52,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_STATERECEIVERI_H

=== modified file 'include/unity/scopes/internal/zmq_middleware/StopPublisher.h'
--- include/unity/scopes/internal/zmq_middleware/StopPublisher.h	2014-08-20 05:24:08 +0000
+++ include/unity/scopes/internal/zmq_middleware/StopPublisher.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_STOPPUBLISHER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_STOPPUBLISHER_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 
@@ -83,5 +82,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/Util.h'
--- include/unity/scopes/internal/zmq_middleware/Util.h	2014-05-20 04:20:46 +0000
+++ include/unity/scopes/internal/zmq_middleware/Util.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_UTIL_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_UTIL_H
+#pragma once
 
 #include <zmqpp/socket.hpp>
 
@@ -46,5 +45,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/VariantConverter.h'
--- include/unity/scopes/internal/zmq_middleware/VariantConverter.h	2014-01-09 13:52:37 +0000
+++ include/unity/scopes/internal/zmq_middleware/VariantConverter.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_VARIANTCONVERTER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_VARIANTCONVERTER_H
+#pragma once
 
 #include <unity/scopes/Variant.h>
 #include <scopes/internal/zmq_middleware/capnproto/ValueDict.capnp.h>
@@ -52,5 +51,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqConfig.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2014-07-14 06:54:43 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqConfig.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQCONFIG_H
-#define UNITY_SCOPES_INTERNAL_ZMQCONFIG_H
+#pragma once
 
 #include <unity/scopes/internal/ConfigBase.h>
 
@@ -57,5 +56,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqException.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqException.h	2014-01-16 12:18:56 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqException.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQEXCEPTION_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQEXCEPTION_H
+#pragma once
 
 #include <capnp/message.h>
 #include <scopes/internal/zmq_middleware/capnproto/Message.capnp.h>
@@ -58,5 +57,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-08-12 06:32:51 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqMiddleware.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQMIDDLEWARE_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQMIDDLEWARE_H
+#pragma once
 
 #include <unity/scopes/internal/MiddlewareBase.h>
 #include <unity/scopes/internal/MWRegistryProxyFwd.h>
@@ -152,5 +151,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h	2014-09-18 05:07:20 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQOBJECTPROXY_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQOBJECTPROXY_H
+#pragma once
 
 #include <unity/scopes/internal/MWObjectProxy.h>
 #include <scopes/internal/zmq_middleware/capnproto/Message.capnp.h>
@@ -112,5 +111,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqObjectProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqObjectProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqObjectProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQOBJECTPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQOBJECTPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h	2014-05-20 04:20:46 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqPublisher.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H
+#pragma once
 
 #include <unity/scopes/internal/MWPublisher.h>
 
@@ -79,5 +78,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQPUBLISHER_H

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqQuery.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqQuery.h	2014-01-23 23:32:10 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqQuery.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERY_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERY_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqQueryProxyFwd.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrl.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrl.h	2014-01-23 23:32:10 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYCTRL_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYCTRL_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqQueryCtrlProxyFwd.h>
@@ -55,5 +54,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrlProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrlProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqQueryCtrlProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYCTRLPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYCTRLPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqQueryProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqQueryProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqQueryProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQQUERYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqReceiver.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqReceiver.h	2014-01-09 12:38:35 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqReceiver.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQRECEIVER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQRECEIVER_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <capnp/common.h>
@@ -68,5 +67,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h	2014-08-12 05:36:06 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqRegistry.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREGISTRY_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREGISTRY_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqRegistryProxyFwd.h>
@@ -63,5 +62,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqRegistryProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqRegistryProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqRegistryProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREGISTRYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREGISTRYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqReply.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqReply.h	2014-07-28 07:18:52 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqReply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREPLY_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREPLY_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqReplyProxyFwd.h>
@@ -56,5 +55,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqReplyProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqReplyProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqReplyProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREPLYPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQREPLYPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqScope.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2014-09-18 05:07:20 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqScope.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSCOPE_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSCOPE_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqScopeProxyFwd.h>
@@ -78,5 +77,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqScopeProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqScopeProxyFwd.h	2013-12-19 14:03:24 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqScopeProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSCOPEPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSCOPEPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqSender.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqSender.h	2014-09-22 04:49:07 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqSender.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSENDER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSENDER_H
+#pragma once
 
 #include <unity/util/NonCopyable.h>
 #include <capnp/common.h>
@@ -62,5 +61,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqStateReceiver.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqStateReceiver.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqStateReceiver.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVER_H
+#pragma once
 
 #include <unity/scopes/internal/zmq_middleware/ZmqObjectProxy.h>
 #include <unity/scopes/internal/zmq_middleware/ZmqStateReceiverProxyFwd.h>
@@ -54,5 +53,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVER_H

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqStateReceiverProxyFwd.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqStateReceiverProxyFwd.h	2014-04-02 09:24:02 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqStateReceiverProxyFwd.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVERPROXYFWD_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVERPROXYFWD_H
+#pragma once
 
 #include <memory>
 
@@ -43,5 +42,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSTATERECEIVERPROXYFWD_H

=== modified file 'include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h'
--- include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/internal/zmq_middleware/ZmqSubscriber.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Marcus Tomlinson <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
-#define UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H
+#pragma once
 
 #include <condition_variable>
 #include <thread>
@@ -77,5 +76,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif // UNITY_SCOPES_INTERNAL_ZMQMIDDLEWARE_ZMQSUBSCRIBER_H

=== modified file 'include/unity/scopes/testing/Benchmark.h'
--- include/unity/scopes/testing/Benchmark.h	2014-03-13 12:19:39 +0000
+++ include/unity/scopes/testing/Benchmark.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_BENCHMARK_H
-#define UNITY_SCOPES_TESTING_BENCHMARK_H
+#pragma once
 
 #include <unity/scopes/ActionMetadata.h>
 #include <unity/scopes/CannedQuery.h>
@@ -354,5 +353,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/Category.h'
--- include/unity/scopes/testing/Category.h	2014-07-02 09:36:34 +0000
+++ include/unity/scopes/testing/Category.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_CATEGORY_H
-#define UNITY_SCOPES_TESTING_CATEGORY_H
+#pragma once
 
 #include <unity/scopes/Category.h>
 
@@ -69,5 +68,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/InProcessBenchmark.h'
--- include/unity/scopes/testing/InProcessBenchmark.h	2014-03-07 04:19:32 +0000
+++ include/unity/scopes/testing/InProcessBenchmark.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_IN_PROCESS_BENCHMARK_H
-#define UNITY_SCOPES_TESTING_IN_PROCESS_BENCHMARK_H
+#pragma once
 
 #include <unity/scopes/testing/Benchmark.h>
 
@@ -75,5 +74,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/MockObject.h'
--- include/unity/scopes/testing/MockObject.h	2014-05-29 15:41:42 +0000
+++ include/unity/scopes/testing/MockObject.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Michi Henning <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_MOCK_OBJECT_H
-#define UNITY_SCOPES_TESTING_MOCK_OBJECT_H
+#pragma once
 
 #include <unity/scopes/Object.h>
 
@@ -53,5 +52,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/MockPreviewReply.h'
--- include/unity/scopes/testing/MockPreviewReply.h	2014-07-25 05:25:22 +0000
+++ include/unity/scopes/testing/MockPreviewReply.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_MOCK_PREVIEW_REPLY_H
-#define UNITY_SCOPES_TESTING_MOCK_PREVIEW_REPLY_H
+#pragma once
 
 #include <unity/scopes/PreviewReply.h>
 
@@ -59,5 +58,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/MockQueryCtrl.h'
--- include/unity/scopes/testing/MockQueryCtrl.h	2014-06-11 05:38:36 +0000
+++ include/unity/scopes/testing/MockQueryCtrl.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: James Henstridge <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_MOCK_QUERYCTRL_H
-#define UNITY_SCOPES_TESTING_MOCK_QUERYCTRL_H
+#pragma once
 
 #include <unity/scopes/QueryCtrl.h>
 
@@ -51,5 +50,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/MockRegistry.h'
--- include/unity/scopes/testing/MockRegistry.h	2014-06-04 17:49:34 +0000
+++ include/unity/scopes/testing/MockRegistry.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@
  * Authored by: Thomas Voß <[e-mail]>
  */
 
-#ifndef UNITY_SCOPES_TESTING_MOCK_REGISTRY_H
-#define UNITY_SCOPES_TESTING_MOCK_REGISTRY_H
+#pragma once
 
 #include <unity/scopes/Registry.h>
 #include <unity/scopes/testing/MockObject.h>
@@ -61,5 +60,3 @@
 } // namespace scopes
 
 } // namespace unity
-
-#endif

=== modified file 'include/unity/scopes/testing/MockScope.h'
--- include/unity/scopes/testing/MockScope.h	2014-05-30 08:08:17 +0000
+++ include/unity/scopes/testing/MockScope.h	2014-11-28 11:54:53 +0000
@@ -16,8 +16,7 @@