Merge lp:~michihenning/unity-scopes-api/qt-coverage-2 into lp:unity-scopes-api

[Michi Henning]

Improved documentation in HACKING.
Fixed incorrect path in CMakeLists.txt for the header tests.
Added suppressions for header compilation tests for valgrind for qt and utility namespaces.
Fixed leak in QPreviewQueryBaseAPI test.
Fixed leak in QScopeBaseAPIImpl.
Style fixes. Doc fixes.
Fixed race condition in mock scope.
Removed QScopeBaseAPIImpl constructor for tests and added tests to use the real constructor.
Added QPreviewWidget coverage.
Removed unnecessary friend declarations.
Fixed leak in QActionMetadata and QPreviewWidget constructors.
Stripped doc comments from internal headers.
Removed unnecessary QResult default constructor.
Added coverage for QResult and QResultImpl.
Fixed segfault in QResultImpl.
Fixed symbols file.

Improved documentation in HACKING.
Fixed incorrect path in CMakeLists.txt for the header tests.
Added suppressions for header compilation tests for valgrind for qt and utility namespaces.
Fixed leak in QPreviewQueryBaseAPI test.
Fixed leak in QScopeBaseAPIImpl.
Style fixes. Doc fixes.
Fixed race condition in mock scope.
Removed QScopeBaseAPIImpl constructor for tests and added tests to use the real constructor.
Added QPreviewWidget coverage.
Removed unnecessary friend declarations.
Fixed leak in QActionMetadata and QPreviewWidget constructors.
Stripped doc comments from internal headers.
Removed unnecessary QResult default constructor.
Added coverage for QResult and QResultImpl.
Fixed segfault in QResultImpl.
Fixed symbols file.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/590/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/124
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/115
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/115/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/116

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

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

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/595/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/129
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/120
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/120/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/121

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

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:338
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/598/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/132
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/123
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/123/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/124

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

review: Approve (continuous-integration)

[lp:~michihenning/unity-scopes-api/qt-coverage-2]

339. By Michi Henning on 2015-02-25

Added coverage for result. Fixed segfault caused by incorrect QResultImpl constructor.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:339
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/601/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/135/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/126/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/127/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/unity-scopes-api/qt-coverage-2]

340. By Michi Henning on 2015-02-25

Fixed whitespace.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/602/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/136
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/127/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/128

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

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:340
http://jenkins.qa.ubuntu.com/job/unity-scopes-api-ci/603/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-amd64-ci/137
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/128
        deb: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-armhf-ci/128/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-scopes-api-vivid-i386-ci/129

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

review: Approve (continuous-integration)

Unmerged revisions

=== modified file 'CTestCustom.cmake.in'
--- CTestCustom.cmake.in	2014-07-25 05:54:44 +0000
+++ CTestCustom.cmake.in	2015-02-25 12:37:38 +0000
@@ -12,8 +12,14 @@
     stand-alone-unity-scopes-headers
     stand-alone-unity-scopes-internal-headers
     stand-alone-unity-scopes-testing-headers
+    stand-alone-unity-scopes-utility-headers
+    stand-alone-unity-scopes-utility-internal-headers
+    stand-alone-unity-scopes-qt-headers
+    stand-alone-unity-scopes-qt-internal-headers
     clean-public-unity-scopes-headers
     clean-public-unity-scopes-testing-headers
+    clean-public-unity-scopes-utility-headers
+    clean-public-unity-scopes-qt-headers
     IsolatedScopeBenchmark                      # Runs too slowly and crashes valgrind 3.10.0 with g++-4.9
     copyright
     whitespace)

=== modified file 'HACKING'
--- HACKING	2015-01-27 09:38:24 +0000
+++ HACKING	2015-02-25 12:37:38 +0000
@@ -49,6 +49,31 @@
 
     $ make valgrind
 
+It doesn't make sense for some tests to run them with valgrind. For
+example, the header compilation tests don't need valgrind because
+we'd just be testing that Python doesn't leak. There are also some
+tests that run too slow and time out under valgrind and, occasionally,
+valgrind crashes for a particular test.
+
+There are two ways to suppress tests:
+
+You can add a test name to CTestCustom.cmake.in to suppress that
+test completely. That makes sense for the header compilation tests,
+for example.
+
+If a specific test case in a test program causes a valgrind problem,
+you can selectively disable a section of code like this:
+
+    #include <valgrind/valgrind.h>
+
+    if (!RUNNING_ON_VALGRIND)
+    {
+        // Code here crashes valgrind...
+    }
+
+That way, the test will still be run as part of the normal "make test"
+target, but will be ommitted when running "make valgrind".
+
 Coverage
 --------
 
@@ -143,6 +168,17 @@
 
     $ TSAN_OPTIONS="suppressions=../tsan-suppress" make test
 
+If a test runs too slowly under address sanitizer, you can
+hide a section of code from address sanitzer with:
+
+#if defined(__has_feature)
+    #if !__has_feature(address_sanitizer)
+
+    // Code here takes forever under address sanitizer...
+
+    #endif
+#endif
+
 Updating symbols file
 ---------------------
 

=== modified file 'debian/libunity-scopes-qt.symbols'
--- debian/libunity-scopes-qt.symbols	2015-02-25 12:37:37 +0000
+++ debian/libunity-scopes-qt.symbols	2015-02-25 12:37:38 +0000
@@ -191,7 +191,6 @@
  (c++)"unity::scopes::qt::QResult::operator=(unity::scopes::qt::QResult&&)@Base" 0.6.13+15.04.20150205.1
  (c++)"unity::scopes::qt::QResult::operator=(unity::scopes::qt::QResult const&)@Base" 0.6.13+15.04.20150205.1
  (c++)"unity::scopes::qt::QResult::~QResult()@Base" 0.6.13+15.04.20150205.1
- (c++)"unity::scopes::qt::QResult::QResult()@Base" 0.6.13+15.04.20150205.1
  (c++)"unity::scopes::qt::QResult::QResult(QMap<QString, QVariant> const&)@Base" 0.6.13+15.04.20150205.1
  (c++)"unity::scopes::qt::QResult::QResult(unity::scopes::qt::internal::QResultImpl*)@Base" 0.6.13+15.04.20150205.1
  (c++)"unity::scopes::qt::QResult::QResult(unity::scopes::qt::QResult&&)@Base" 0.6.13+15.04.20150205.1

=== modified file 'include/unity/scopes/ScopeBase.h'
--- include/unity/scopes/ScopeBase.h	2015-01-26 08:10:59 +0000
+++ include/unity/scopes/ScopeBase.h	2015-02-25 12:37:38 +0000
@@ -104,8 +104,7 @@
  - a create function that must return a pointer to the derived instance
  - a destroy function that is passed the pointer returned by the create function
 
-Typically, the create and destroy functions will simply call `new` and `delete`, respectively. (However,
-there is no requirement that the derived class instance must be heap-allocated.)
+Typically, the create and destroy functions will simply call `new` and `delete`, respectively.
 If the create function throws an exception, the destroy function will not be called. If the create function returns
 NULL, the destroy function _will_ be called with NULL as its argument.
 
@@ -116,13 +115,13 @@
 unity::scopes::ScopeBase*
 UNITY_SCOPE_CREATE_FUNCTION()
 {
-    return new MyScope; // Example only, heap-allocation is not mandatory
+    return new MyScope;
 }
 
 void
 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope)
 {
-    delete scope;       // Example only, heap-allocation is not mandatory
+    delete scope;
 }
 ~~~
 
@@ -376,8 +375,7 @@
 /**
 \brief The function called by the scopes run time to initialize the scope.
 It must return a pointer to an instance derived from `ScopeBase`. The returned
-instance need not be heap-allocated, but must remain in scope until the
-destroy function is called by the scopes run time.
+instance must remain in scope until the destroy function is called by the scopes run time.
 
 If this function throws an exception, the destroy function will _not_ be called. If this function returns NULL,
 the destroy function _will_ be called with NULL as its argument.

=== modified file 'include/unity/scopes/qt/QActionMetadata.h'
--- include/unity/scopes/qt/QActionMetadata.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QActionMetadata.h	2015-02-25 12:37:38 +0000
@@ -140,7 +140,6 @@
     QActionMetadata(internal::QActionMetadataImpl* impl);
 
     std::unique_ptr<internal::QActionMetadataImpl> p;
-    friend class internal::QActionMetadataImpl;
     friend class internal::QPreviewQueryBaseImpl;
     friend class QPreviewQueryBaseAPI;
     /// @endcond

=== modified file 'include/unity/scopes/qt/QPreviewQueryBase.h'
--- include/unity/scopes/qt/QPreviewQueryBase.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QPreviewQueryBase.h	2015-02-25 12:37:38 +0000
@@ -128,7 +128,6 @@
     void init(QPreviewQueryBaseAPI* query_api);
 
     std::unique_ptr<internal::QPreviewQueryBaseImpl> p;
-    friend class internal::QPreviewQueryBaseImpl;
     friend class QPreviewQueryBaseAPI;
     /// @endcond
 };

=== modified file 'include/unity/scopes/qt/QPreviewReply.h'
--- include/unity/scopes/qt/QPreviewReply.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QPreviewReply.h	2015-02-25 12:37:38 +0000
@@ -98,7 +98,6 @@
 
 private:
     std::unique_ptr<internal::QPreviewReplyImpl> p;
-    friend class internal::QPreviewReplyImpl;
     friend class QPreviewQueryBaseAPI;
     /// @endcond
 };

=== modified file 'include/unity/scopes/qt/QResult.h'
--- include/unity/scopes/qt/QResult.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QResult.h	2015-02-25 12:37:38 +0000
@@ -67,7 +67,6 @@
     UNITY_DEFINES_PTRS(QResult);
     /// @endcond
 
-    QResult();
     /**@name Copy and assignment
     Copy and assignment (move and non-move versions) have the usual value semantics.
     */

=== modified file 'include/unity/scopes/qt/QScopeBase.h'
--- include/unity/scopes/qt/QScopeBase.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QScopeBase.h	2015-02-25 12:37:38 +0000
@@ -54,7 +54,7 @@
 \brief Base class for a scope implementation.
 
 Scopes are accessed by the scopes run time as a shared library (one library per scope).
-Each scope must implement a class that derives from ScopeBase, for example:
+Each scope must implement a class that derives from QScopeBase, for example:
 
 ~~~
 #include <unity/scopes/qt/QScopeBase.h>
@@ -65,9 +65,8 @@
     MyScope();
     virtual ~MyScope();
 
-    virtual void start(QString const& scope_id);   // Optional
+    virtual void start(QString const& scope_id);       // Optional
     virtual void stop();                               // Optional
-    virtual void run();                                // Optional
     // ...
 };
 ~~~
@@ -76,8 +75,6 @@
  - a create function that must return a pointer to the derived instance
  - a destroy function that is passed the pointer returned by the create function
 
-Typically, the create and destroy functions will simply call `new` and `delete`, respectively. (However,
-there is no requirement that the derived class instance must be heap-allocated.)
 If the create function throws an exception, the destroy function will not be called. If the create function returns
 NULL, the destroy function _will_ be called with NULL as its argument.
 
@@ -86,8 +83,9 @@
 
 ~~~
 
-// You must provide a function that creates your own scope
-// That function must have no parameters and return a pointer to QScopeBase
+// You must provide a function that creates your scope on the heap and
+// pass this function to the QScopeBaseAPI constructor.
+
 unity::scopes::qt::QScopeBase *create_my_scope()
 {
     return new MyScope();
@@ -96,23 +94,23 @@
 unity::scopes::ScopeBase*
 UNITY_SCOPE_CREATE_FUNCTION()
 {
-    // Initialize scope. This line is mandatory, you should pass your creation scope function to
-    // the class QScopeBaseAPI, which will instantiate your class in the correct Qt Thread.
+    // You must return a dynamically allocated QScopeBaseAPI instance here.
+    // In turn, that instance calls your creation function to instantiate
+    // your scope in the correct Qt thread.
     return new QScopeBaseAPI(create_my_scope);
 }
 
+// The runtime, once it has stopped your scope, calls the destroy function.
+
 void
 UNITY_SCOPE_DESTROY_FUNCTION(unity::scopes::ScopeBase* scope)
 {
+    delete scope;
 }
 ~~~
 
 After the scopes run time has obtained a pointer to the class instance from the create function, it calls start(),
-which allows the scope to initialize itself. This is followed by a call to run().
-All calls to the methods of this class will be done from the main QThread.
-
-The scope implementation, if it does not return from run(), is expected to return from run() in response to a
-call to stop() in a timely manner.
+which allows the scope to initialize itself.
 */
 class QScopeBase : public QObject
 {
@@ -149,7 +147,6 @@
 
 private:
     std::unique_ptr<internal::QScopeBaseImpl> p;
-    friend class internal::QScopeBaseImpl;
 };
 
 }  // namespace qt

=== modified file 'include/unity/scopes/qt/QScopeBaseAPI.h'
--- include/unity/scopes/qt/QScopeBaseAPI.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QScopeBaseAPI.h	2015-02-25 12:37:38 +0000
@@ -52,10 +52,6 @@
 /**
  * Defines the lifecycle of scope plugin, and acts as a factory
  * for Query and Preview objects.
- *
- * Note that the #preview and #search methods are each called on
- * different threads, so some form of interlocking is required
- * if shared data structures are used.
  */
 class QScopeBaseAPI : public unity::scopes::ScopeBase
 {
@@ -109,7 +105,6 @@
 private:
     /// @cond
     std::unique_ptr<internal::QScopeBaseAPIImpl> p;
-    friend class internal::QScopeBaseAPIImpl;
     /// @endcond
 };
 

=== modified file 'include/unity/scopes/qt/QSearchMetadata.h'
--- include/unity/scopes/qt/QSearchMetadata.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QSearchMetadata.h	2015-02-25 12:37:38 +0000
@@ -164,7 +164,6 @@
 private:
     /// @cond
     std::unique_ptr<internal::QSearchMetadataImpl> p;
-    friend class internal::QSearchMetadataImpl;
     /// @endcond
 };
 

=== modified file 'include/unity/scopes/qt/QSearchQueryBase.h'
--- include/unity/scopes/qt/QSearchQueryBase.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QSearchQueryBase.h	2015-02-25 12:37:38 +0000
@@ -156,7 +156,6 @@
     void init(QSearchQueryBaseAPI* query_api);
 
     std::unique_ptr<internal::QSearchQueryBaseImpl> p;
-    friend class internal::QSearchQueryBaseImpl;
     friend class QSearchQueryBaseAPI;
     ///@endcond
 };

=== modified file 'include/unity/scopes/qt/QSearchReply.h'
--- include/unity/scopes/qt/QSearchReply.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/QSearchReply.h	2015-02-25 12:37:38 +0000
@@ -157,7 +157,6 @@
     QSearchReply(unity::scopes::SearchReplyProxy& reply, QObject* parent = 0);
 
     std::unique_ptr<internal::QSearchReplyImpl> p;
-    friend class internal::QSearchReplyImpl;
     friend class QSearchQueryBaseAPI;
 };
 

=== modified file 'include/unity/scopes/qt/internal/QActionMetadataImpl.h'
--- include/unity/scopes/qt/internal/QActionMetadataImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QActionMetadataImpl.h	2015-02-25 12:37:38 +0000
@@ -43,92 +43,26 @@
 
 class QPreviewQueryBaseImpl;
 
-/**
-\brief Metadata passed to scopes for preview and activation.
-\see unity::scopes::ScopeBase::preview, unity::scopes::ScopeBase::activate, unity::scopes::ScopeBase::perform_action
-*/
 class QActionMetadataImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QActionMetadataImpl);
 
+    QActionMetadataImpl(QString const& locale, QString const& form_factor);
     ~QActionMetadataImpl();
-    /// @endcond
-
-    /**
-    \brief Create ActionMetadata with the given locale and form factor.
-    \param locale locale string, eg. en_EN
-    \param form_factor form factor name, e.g. phone, desktop, phone-version etc.
-    */
-    QActionMetadataImpl(QString const& locale, QString const& form_factor);
-
-    /**
-     \brief Attach arbitrary data to this ActionMetadata.
-     \param data The data value to attach.
-     */
-    void set_scope_data(QVariant const& data);
-
-    /**
-     \brief Get data attached to this ActionMetadata.
-     \return The attached data, or QVariant::null.
-     */
-    QVariant scope_data() const;
-
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
+
     QActionMetadataImpl(QActionMetadataImpl const& other);
     QActionMetadataImpl(QActionMetadataImpl&&);
 
     QActionMetadataImpl& operator=(QActionMetadataImpl const& other);
     QActionMetadataImpl& operator=(QActionMetadataImpl&&);
-    //@}
-
-    /**
-    \brief Sets a hint.
-
-    \param key The name of the hint.
-    \param value Hint value
-    */
+
+    void set_scope_data(QVariant const& data);
+    QVariant scope_data() const;
     void set_hint(QString const& key, QVariant const& value);
-
-    /**
-    \brief Get all hints.
-
-    \return Hints dictionary.
-    \throws unity::NotFoundException if no hints are available.
-    */
     QVariantMap hints() const;
-
-    /**
-    \brief Check if this SearchMetadata has a hint.
-    \param key The hint name.
-    \return True if the hint is set.QScopeVariant
-    */
     bool contains_hint(QString const& key) const;
-
-    /**
-    \brief Returns a reference to a hint.
-
-    This method can be used to read or set hints. Setting a value of an existing hint overwrites
-    its previous value.
-    Referencing a non-existing hint automatically creates it with a default value of QVariant::Type::Null.
-    \param key The name of the hint.
-    \return A reference to the hint.
-    */
     QScopeVariant& operator[](QString const& key);
-
-    /**
-    \brief Returns a const reference to a hint.
-
-    This method can be used for read-only access to hints.
-    Referencing a non-existing hint throws unity::InvalidArgumentException.
-    \param key The name of the hint.
-    \return A const reference to the hint.
-    \throws unity::NotFoundException if no hint with the given name exists.
-    */
     QVariant const& value(QString const& key) const;
 
 private:

=== modified file 'include/unity/scopes/qt/internal/QCategorisedResultImpl.h'
--- include/unity/scopes/qt/internal/QCategorisedResultImpl.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/internal/QCategorisedResultImpl.h	2015-02-25 12:37:38 +0000
@@ -48,37 +48,16 @@
 class QCategorisedResultImpl : public QResultImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QCategorisedResultImpl);
-    /// @endcond
-    /**
-    \brief Creates a CategorisedResult with given category,
-    with all base attributes initially empty.
-    \param category The category for the result.
-    */
+
     explicit QCategorisedResultImpl(QCategory::SCPtr category);
 
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
     QCategorisedResultImpl(QCategorisedResultImpl const& other);
     QCategorisedResultImpl& operator=(QCategorisedResultImpl const& other);
     QCategorisedResultImpl(QCategorisedResultImpl&&);
     QCategorisedResultImpl& operator=(QCategorisedResultImpl&&);
-    //@}
 
-    /**
-    \brief Updates the category of this result.
-    \param category The category for the result.
-    */
     void set_category(QCategory::SCPtr category);
-
-    /**
-    \brief Return category of this result.
-    Get the category instance this result belongs to.
-    \return The category instance.
-    */
     QCategory::SCPtr category() const;
 
 private:

=== modified file 'include/unity/scopes/qt/internal/QCategoryImpl.h'
--- include/unity/scopes/qt/internal/QCategoryImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QCategoryImpl.h	2015-02-25 12:37:38 +0000
@@ -47,46 +47,19 @@
 class QCategoryImpl
 {
 public:
-    /// @cond
     NONCOPYABLE(QCategoryImpl);
     UNITY_DEFINES_PTRS(QCategoryImpl);
 
     QCategoryImpl(unity::scopes::Category::SCPtr category);
 
     virtual ~QCategoryImpl();
-    /// @endcond
 
-    /**
-     \brief Get identifier of this Category
-     \return The category identifier.
-    */
     QString id() const;
-
-    /**
-     \brief Get title of this Category
-     \return The category title.
-    */
     QString title() const;
-
-    /**
-     \brief Get icon of this Category
-     \return The category icon.
-    */
     QString icon() const;
-
-    /**
-     \brief Query to perform when this category is expanded
-     \return The expansion query or nullptr.
-    */
     CannedQuery::SCPtr query() const;
-
-    /**
-     \brief Get renderer template of this Category
-     \return The category renderer template.
-     */
     CategoryRenderer const& renderer_template() const;
 
-    // @cond
     QVariantMap serialize() const;
 
     static std::shared_ptr<QCategory> create(unity::scopes::Category::SCPtr category);

=== modified file 'include/unity/scopes/qt/internal/QColumnLayoutImpl.h'
--- include/unity/scopes/qt/internal/QColumnLayoutImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QColumnLayoutImpl.h	2015-02-25 12:37:38 +0000
@@ -46,65 +46,22 @@
 class QColumnLayoutImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QColumnLayoutImpl);
-    /// @endcond
 
-    /**
-    \brief Creates a layout definition that expects num_of_columns columns to be added with ColumnLayout::add_column.
-    \param num_of_columns The number of columns for the layout.
-    \throws unity::InvalidArgumentException for an invalid number of columns.
-    */
     explicit QColumnLayoutImpl(int num_of_columns);
+    ~QColumnLayoutImpl();
 
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
     QColumnLayoutImpl(QColumnLayoutImpl const& other);
     QColumnLayoutImpl(QColumnLayoutImpl&&);
     QColumnLayoutImpl& operator=(QColumnLayoutImpl const& other);
     QColumnLayoutImpl& operator=(QColumnLayoutImpl&&);
-    //@}
-
-    /// @cond
-    ~QColumnLayoutImpl();
-    /// @endcond
-
-    /**
-    \brief Adds a new column and assigns widgets to it.
-
-    ColumnLayout expects exactly the number of columns passed to the constructor to be created with the
-    add_column method.
-    \throws unity::LogicException if an attempt is made to add more columns than specified in the constructor.
-    \throws unity::LogicException from \link unity::scopes::PreviewReply::register_layout\endlink if a layout
-    has fewer columns than specified in the constructor.
-    */
+
     void add_column(QVector<QString> widget_ids);
-
-    /**
-    \brief Get the current number of columns in this layout.
-    \return The number of columns added with add_column().
-    */
     int size() const noexcept;
-
-    /**
-    \brief Get the number of columns expected by this layout as specified in the constructor.
-    \return The number of columns expected by this layout.
-    */
     int number_of_columns() const noexcept;
-
-    /**
-    \brief Retrieve the list of widgets for given column.
-    \param index The index of a column.
-    \return The widget identifiers for the given column index.
-    \throws unity::InvalidArgumentException if the index is invalid.
-    */
     QVector<QString> column(int index) const;
 
-    /// @cond
     QVariantMap serialize() const;
-    /// @endcond
 
     // added for testing purposes
     static unity::scopes::qt::QColumnLayout create(QColumnLayoutImpl* internal);

=== modified file 'include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h'
--- include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/internal/QPreviewQueryBaseImpl.h	2015-02-25 12:37:38 +0000
@@ -46,26 +46,13 @@
 class QPreviewQueryBaseImpl
 {
 public:
-    /// @cond
     NONCOPYABLE(QPreviewQueryBaseImpl);
     UNITY_DEFINES_PTRS(QPreviewQueryBaseImpl);
-    /// @endcond
 
     QPreviewQueryBaseImpl();
     ~QPreviewQueryBaseImpl() = default;
 
-    /**
-     \brief Get result for this preview request.
-     \throws unity::LogicException if result was not initialized (the default ctor was used).
-     \return result
-     */
     QResult result() const;
-
-    /**
-     \brief Get metadata for this preview request.
-     \return search metadata
-     \throws unity::LogicException if preview metadata was not initialized (the default ctor was used).
-    */
     QActionMetadata action_metadata() const;
 
 protected:

=== modified file 'include/unity/scopes/qt/internal/QPreviewReplyImpl.h'
--- include/unity/scopes/qt/internal/QPreviewReplyImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QPreviewReplyImpl.h	2015-02-25 12:37:38 +0000
@@ -48,49 +48,20 @@
 namespace internal
 {
 
-/**
-\brief Allows the results of a preview to be sent to the preview requester.
-*/
-
 class QPreviewReplyImpl
 {
 public:
-    /// @cond
     NONCOPYABLE(QPreviewReplyImpl);
     UNITY_DEFINES_PTRS(QPreviewReplyImpl);
-    /// @endcond
-    /**
-    \brief Registers a list of column layouts for the current preview.
-
-    Layouts must be registered before pushing a unity::scopes::PreviewWidgetList, and must be
-    registered only once.
-    \return True if the query is still alive, false if the query failed or was cancelled.
-    \throws unity::LogicException register_layout() is called more than once.
-    */
+
+    virtual ~QPreviewReplyImpl();
+
     bool register_layout(QColumnLayoutList const& layouts);
-
-    /**
-    \brief Sends widget definitions to the sender of the preview query.
-
-    This method can be called mutiple times to send widgets in stages.
-    \return True if the query is still alive, false if the query failed or was cancelled.
-    */
     bool push(QPreviewWidgetList const& widget_list);
-
-    /**
-    \brief Sends data for a preview widget attribute.
-    \return True if the query is still alive, false if the query failed or was cancelled.
-    */
     bool push(QString const& key, QVariant const& value);
 
-    /// @cond
-    virtual ~QPreviewReplyImpl();
-    /// @endcond
-
 protected:
-    /// @cond
     QPreviewReplyImpl(unity::scopes::PreviewReplyProxy& reply);
-    /// @endcond
 
 private:
     PreviewReplyProxy api_reply_;

=== modified file 'include/unity/scopes/qt/internal/QPreviewWidgetImpl.h'
--- include/unity/scopes/qt/internal/QPreviewWidgetImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QPreviewWidgetImpl.h	2015-02-25 12:37:38 +0000
@@ -39,9 +39,6 @@
 
 class QPreviewWidget;
 
-/*! \typedef QPreviewWidgetList
-\brief List of preview widgets (see unity::scopes::qt::QPreviewWidget)
-*/
 typedef QList<QPreviewWidget> QPreviewWidgetList;
 
 namespace internal
@@ -52,135 +49,29 @@
 class QPreviewWidgetImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QPreviewWidgetImpl);
-    /// @endcond
 
-    /**
-    \brief Create an empty widget definition with a specific id and type.
-    \param id The unique widget identifier.
-    \param widget_type The type of the widget.
-    */
     QPreviewWidgetImpl(QString const& id, QString const& widget_type);
-
-    /**
-    \brief Create a widget from a JSON definition.
-
-    The JSON definition must be a dictionary that includes widget "id" and all the values of attributes required by
-    desired
-    \link previewwidgets widget type\endlink. For example, a definition of image widget may look as follows:
-    \code{.cpp}
-    PreviewWidget img(R"({"id": "img", "type": "image", "source": "http://imageuri"})");
-    \endcode
-
-    For cases where attribute mappings are to be used instead of direct values, they need to be enclosed in the
-    "components" dictionary, e.g.
-    \code{.cpp}
-    PreviewWidget img(R"({"id": "img", "type": "image", "components": { "source": "screenshot-url" } })");
-    \endcode
-    (this example assumes "screenshot-url" value is either available in the result object that's being previewed, or it
-    will be pushed with
-    unity::scopes::PreviewReply::push() method)
-
-    \note It is recommended to create widgets via unity::scopes::PreviewWidget(QString const&, QString const&)
-    constructor
-    and unity::scopes::PreviewWidget::add_attribute_value() / unity::scopes::PreviewWidget::add_attribute_mapping()
-    methods,
-    rather than via JSON definition.
-
-    \param definition The JSON definition.
-    */
     QPreviewWidgetImpl(QString const& definition);
+    virtual ~QPreviewWidgetImpl();
 
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
     QPreviewWidgetImpl(QPreviewWidgetImpl const& other);
     QPreviewWidgetImpl(QPreviewWidgetImpl&& other);
-    virtual ~QPreviewWidgetImpl();
 
     QPreviewWidgetImpl& operator=(QPreviewWidgetImpl const& other);
     QPreviewWidgetImpl& operator=(QPreviewWidgetImpl&& other);
-    //@}
 
-    /**
-    \brief Adds an attribute definition and its value.
-    \param key The name of the attribute.
-    \param value The value of the attribute.
-    */
     void add_attribute_value(QString const& key, QVariant const& value);
-
-    /**
-    \brief Adds an attribute definition using a component mapping.
-
-    If an attribute value is either not known, or the value is already present
-    in a result field, this method creates a mapping between the attribute
-    name and given the field name.
-
-    If an attribute value is not known, the scope is expected to push the attribute value using
-    unity::scopes::PreviewReply::push(); otherwise, the value is automatically
-    mapped from the result.
-    */
     void add_attribute_mapping(QString const& key, QString const& field_name);
-
-    /**
-      \brief Adds a widget into expandable widget.
-
-      Adds a widget into this widget, which needs to be of 'expandable' type. This method throws
-      if adding a widget into any other widget type. Also, adding an 'expandable' widget into
-      another 'expandable' is not allowed.
-
-      \throws unity::LogicException if type of this widget is other than 'expandable', or when
-      adding 'expandable' to 'expandable'.
-    */
     void add_widget(QPreviewWidget const& widget);
-
-    /**
-    \brief Get the identifier of this widget.
-    \return The widget identifier.
-    */
     QString id() const;
-
-    /**
-    \brief Get type name of this widget.
-    \return The widget type.
-    */
     QString widget_type() const;
-
-    /**
-    \brief Get the components of this widget.
-
-    The returned map is a dictionary of (key, field name) pairs, as defined by calls to add_attribute_mapping().
-    \return The components map.
-    */
     QMap<QString, QString> attribute_mappings() const;
-
-    /**
-    \brief Get the attributes of this widget.
-
-    The returned map is a dictionary of (key, value) pairs, as defined by calls to add_attribute_value().
-    \return The attribute map.
-    */
     QVariantMap attribute_values() const;
-
-    /**
-    \brief Get widgets of 'expandable' widget.
-
-    Returns the list of widget attached to this widget, which must be of 'expandable' type. This list is
-    always empty for other widget types.
-    */
     QPreviewWidgetList widgets() const;
-
-    /**
-    \brief Get a JSON representation of this widget.
-    \return The JSON string.
-    */
     QString data() const;
 
-    /// @cond
     QVariantMap serialize() const;
-    /// @endcond
 
 private:
     std::unique_ptr<PreviewWidget> api_widget_;

=== modified file 'include/unity/scopes/qt/internal/QResultImpl.h'
--- include/unity/scopes/qt/internal/QResultImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QResultImpl.h	2015-02-25 12:37:38 +0000
@@ -54,192 +54,37 @@
 class QResultImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QResultImpl);
-    /// @endcond
 
-    /**@name Copy and assignment
-    Copy and assignment (move and non-move versions) have the usual value semantics.
-    */
-    //{@
     QResultImpl(unity::scopes::Result const& other);
     QResultImpl(QResultImpl const& other);
 
     QResultImpl& operator=(QResultImpl const& other);
     QResultImpl& operator=(QResultImpl&&);
-    //@}
 
-    /**
-    Destructor.
-    */
     virtual ~QResultImpl();
 
-    /**
-    \brief Stores a Result inside this Result instance.
-
-    This method is meant to be used by aggregator scopes which want to modify results they receive, but want
-    to keep a copy of the original result so that they can be correctly handled by the original scopes
-    who created them when it comes to activation or previews.
-    Scopes middleware will automatically pass the correct inner stored result to the activation or preview request
-    handler
-    of a scope which created it.
-    \param other The original result to store within this result.
-    \param intercept_activation True if this scope should receive activation and preview requests.
-    */
     void store(QResult const& other, bool intercept_activation = false);
-
-    /**
-    \brief Check if this Result instance has a stored result.
-    \return True if there is a stored result
-     */
     bool has_stored_result() const;
-
-    /**
-    \brief Get a stored result.
-    \return stored result
-    \throws unity::InvalidArgumentException if no result was stored in this Result instance.
-    */
     QResult retrieve() const;
-
-    /**
-    \brief Set the "uri" attribute of this result.
-    */
     void set_uri(QString const& uri);
-
-    /**
-    \brief Set the "title" attribute of this result.
-
-    Equivalent to calling `result["title"] = title;`
-    */
     void set_title(QString const& title);
-    /**
-    \brief Set the "art" attribute of this result.
-
-    Equivalent to calling `result["art"] = image;`
-    */
     void set_art(QString const& image);
-
-    /**
-    \brief Set the "dnd_uri" attribute of this result.
-
-    Equivalent to calling `result["dnd_uri"] = dnd_uri;`
-    */
     void set_dnd_uri(QString const& dnd_uri);
-
-    /**
-    \brief Indicates to the receiver that this scope should intercept activation requests for this result.
-
-    By default, a scope receives preview requests for the results it creates, but does not receive activation
-    requests (they are handled directly by the shell).
-    Intercepting activation implies intercepting preview requests as well; this is important for scopes that
-    forward results from other scopes and call set_intercept_activation() on these scopes.
-    A scope that sets intercept activation flag for a result should re-implement ScopeBase::activate()
-    and provide an implementation of ActivationQueryBase that handles the actual activation.
-    If not called, the result will be activated directly by the Unity shell whithout involving the scope,
-    assuming an appropriate URI schema handler is present on the system.
-    */
     void set_intercept_activation();
-
-    /**
-    \brief Check if this result should be activated directly by the shell
-           because the scope doesn't handle activation of this result.
-    \return True if this result needs to be activated directly.
-    */
     bool direct_activation() const;
-
-    /**
-    \brief Get the proxy of a scope that handles activation and preview of this result.
-
-    The proxy is available only when receiving this result from a scope, otherwise
-    this method throws LogicException. Activation requests should be sent to a scope
-    returned by this method only if direct_activation() is false.
-    \return The scope proxy.
-    */
     ScopeProxy target_scope_proxy() const;
-
-    /**
-    \brief Returns reference of a Result attribute.
-
-    This method can be used to read or initialize both standard ("uri", "title", "art", "dnd_uri")
-    and custom metadata attributes. Referencing a non-existing attribute automatically creates
-    it with a default value of Variant::Type::Null.
-    \param key The name of the attribute.
-    \return A reference to the attribute.
-    \throws unity::Invalidargument if no attribute with the given name exists.
-    */
     QVariant& operator[](QString const& key);
-
-    /**
-    \brief Returns a const reference to a Result attribute.
-
-    This method can be used for read-only access to both standard ("uri", "title", "art", "dnd_uri")
-    and custom metadata attributes. Referencing a non-existing attribute throws unity::InvalidArgumentException.
-    \param key The name of the attribute.
-    \return A const reference to the attribute.
-    \throws unity::Invalidargument if no attribute with the given name exists.
-    */
     QVariant const& operator[](QString const& key) const;
-
-    /**
-    \brief Get the "uri" property of this Result.
-
-    This method returns an empty string if this attribute is not of type Variant::Type::String (e.g. it was set with
-    operator[]).
-    \return The value of "uri" or the empty string.
-     */
     QString uri() const noexcept;
-
-    /**
-    \brief Get the "title" property of this Result.
-
-    This method returns an empty string if this attribute is not of type Variant::Type::String (e.g. it was set with
-    operator[]).
-    \return The value of "title" or the empty string.
-    */
     QString title() const noexcept;
-
-    /**
-    \brief Get the "art" property of this Result.
-
-    This method returns an empty string if this attribute is not of type Variant::Type::String (e.g. it was set with
-    operator[]).
-    \return The value of "art" or the empty string.
-    */
     QString art() const noexcept;
-
-    /**
-    \brief Get the "dnd_uri" property of this Result.
-
-    This method returns an empty string if this attribute is not of type Variant::Type::String type (e.g. it was set
-    with operator[]).
-    \return The value of "dnd_uri" or the empty string.
-    */
     QString dnd_uri() const noexcept;
-
-    /**
-    \brief Check if this Result has an attribute.
-    \param key The attribute name.
-    \return True if the attribute is set.
-    */
     bool contains(QString const& key) const;
-
-    /**
-    \brief Get the value of an attribute.
-
-    \param key The attribute name.
-    \return The attribute value.
-    \throws unity::InvalidArgumentException if given attribute hasn't been set.
-    */
     QVariant const& value(QString const& key) const;
-
-    /**
-    \brief Returns a dictionary of all attributes of this Result instance.
-    \return All base attributes and custom attributes set with add_metadata().
-    */
     QVariantMap serialize() const;
 
 protected:
-    /// @cond
     explicit QResultImpl(const QVariantMap& variant_map);
     explicit QResultImpl(internal::QResultImpl* impl);
     explicit QResultImpl(unity::scopes::Result* api_result);

=== modified file 'include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h'
--- include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/internal/QScopeBaseAPIImpl.h	2015-02-25 12:37:38 +0000
@@ -52,62 +52,29 @@
 {
     Q_OBJECT
 public:
-    /// @cond
     using FactoryFunc = std::function<QScopeBase*()>;
 
     NONCOPYABLE(QScopeBaseAPIImpl);
     UNITY_DEFINES_PTRS(QScopeBaseAPIImpl);
 
-    QScopeBaseAPIImpl(QScopeBase& qtscope, QObject* parent = 0);
-    QScopeBaseAPIImpl(FactoryFunc const& creator, QObject* parent = 0);
+    QScopeBaseAPIImpl(FactoryFunc const& creator);
     virtual ~QScopeBaseAPIImpl();
 
     bool event(QEvent* e) override;
-    /// @endcond
-
-    /**
-    \brief Called by the scopes run time after the create function completes.
-
-    If start() throws an exception, stop() will _not_ be called.
-
-    The call to start() is made by the same thread that calls the create function.
-
-    \param scope_id The name of the scope as defined by the scope's configuration file.
-    */
     void start(std::string const& scope_id);
-
-    /**
-    \brief Called by the scopes run time when the scope should shut down.
-
-    A scope should deallocate as many resources as possible when stop() is called, for example,
-    deallocate any caches and close network connections. In addition, if the scope implements run()
-    and did not return from run(), it must return from run() in response to the call to stop().
-
-    Exceptions from stop() are ignored.
-
-    The call to stop() is made by the same thread that calls the create function and start().
-    */
     void stop();
-
-    /**
-     * Called each time a new preview is requested
-     */
     unity::scopes::PreviewQueryBase::UPtr preview(const unity::scopes::Result&, const unity::scopes::ActionMetadata&);
-
-    /**
-     * Called each time a new query is requested
-     */
     unity::scopes::SearchQueryBase::UPtr search(unity::scopes::CannedQuery const& q,
                                                 unity::scopes::SearchMetadata const&);
 
 protected:
-    void startQtThread();
+    void start_qt_thread();
 
     std::shared_ptr<QCoreApplication> qtapp_;
     std::unique_ptr<std::thread> qtthread_;
     std::atomic<bool> qtapp_ready_;
-
-    QScopeBase* qtscope_impl_;
+    std::atomic<bool> qtapp_stopped_;
+    std::unique_ptr<QScopeBase> qtscope_impl_;
 
     FactoryFunc qtscope_creator_;
 };

=== modified file 'include/unity/scopes/qt/internal/QScopeBaseImpl.h'
--- include/unity/scopes/qt/internal/QScopeBaseImpl.h	2015-01-20 13:59:36 +0000
+++ include/unity/scopes/qt/internal/QScopeBaseImpl.h	2015-02-25 12:37:38 +0000
@@ -38,21 +38,13 @@
 class QScopeBaseImpl
 {
 public:
-    /// @cond
     NONCOPYABLE(QScopeBaseImpl);
     UNITY_DEFINES_PTRS(QScopeBaseImpl);
 
     QScopeBaseImpl() = default;
     virtual ~QScopeBaseImpl() = default;
-    /// @endcond
-    /**
-     * Called once at startup
-     */
+
     virtual void start(std::string const&);
-
-    /**
-     * Called at shutdown
-     */
     virtual void stop();
 };
 

=== modified file 'include/unity/scopes/qt/internal/QScopeVariant.h'
--- include/unity/scopes/qt/internal/QScopeVariant.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QScopeVariant.h	2015-02-25 12:37:38 +0000
@@ -45,7 +45,6 @@
 class QScopeVariant : public QVariant
 {
 public:
-    //    explicit QScopeVariant() noexcept;
     virtual ~QScopeVariant();
 
     QScopeVariant(QScopeVariant const& other);
@@ -65,9 +64,6 @@
     std::string get_string() const;
 
 private:
-    /**
-    \brief Creates a Variant instance that stores the supplied integer.
-    */
     explicit QScopeVariant(Variant* val) noexcept;
 
     void setInternalVariant(Variant* val);

=== modified file 'include/unity/scopes/qt/internal/QSearchMetadataImpl.h'
--- include/unity/scopes/qt/internal/QSearchMetadataImpl.h	2015-02-06 00:12:18 +0000
+++ include/unity/scopes/qt/internal/QSearchMetadataImpl.h	2015-02-25 12:37:38 +0000
@@ -45,114 +45,27 @@
 class QSearchMetadataImpl
 {
 public:
-    /// @cond
     UNITY_DEFINES_PTRS(QSearchMetadataImpl);
-    /// @endcond
 
-    /**
-    \brief Create SearchMetadata with the given locale and form factor.
-    \param locale locale string, eg. en_EN
-    \param form_factor form factor name, e.g. phone, desktop, phone-version etc.
-    */
     QSearchMetadataImpl(QString const& locale, QString const& form_factor);
-
-    /**
-    \brief Create SearchMetadata with the given cardinality, locale, and form factor.
-    \param cardinality maximum number of search results
-    \param locale locale string, eg. en_EN
-    \param form_factor form factor name, e.g. phone, desktop, phone-version etc.
-    */
     QSearchMetadataImpl(int cardinality, QString const& locale, QString const& form_factor);
+    ~QSearchMetadataImpl();
 
-    /**@name Copy and assignment
-    Copy and assignment operators (move and non-move versions) have the usual value semantics.
-    */
-    //{@
     QSearchMetadataImpl(QSearchMetadataImpl const& other);
     QSearchMetadataImpl(QSearchMetadataImpl&&);
 
     QSearchMetadataImpl& operator=(QSearchMetadataImpl const& other);
     QSearchMetadataImpl& operator=(QSearchMetadataImpl&&);
-    //@}
-
-    /// @cond
-    ~QSearchMetadataImpl();
-    /// @endcond
-
-    /**
-    \brief Set cardinality.
-    \param cardinality The maximum number of search results.
-    */
+
     void set_cardinality(int cardinality);
-
-    /**
-    \brief Get cardinality.
-    \return The maxmium number of search results, or 0 for no limit.
-    */
     int cardinality() const;
-
-    /**
-    \brief Set location.
-    \param location Location data.
-    */
     void set_location(Location const& location);
-
-    /**
-    \brief Get location.
-    \return Location data representing the current location, including attributes such as city and country.
-    \throws unity::NotFoundException if no location data is available.
-    */
     Location location() const;
-
-    /**
-    \brief Does the SearchMetadata have a location.
-    \return True if there is a location property.
-    */
     bool has_location() const;
-
-    /**
-    \brief Sets a hint.
-
-    \param key The name of the hint.
-    \param value Hint value
-    */
     void set_hint(QString const& key, QVariant const& value);
-
-    /**
-    \brief Get all hints.
-
-    \return Hints dictionary.
-    \throws unity::NotFoundException if no hints are available.
-    */
     QVariantMap hints() const;
-
-    /**
-    \brief Check if this SearchMetadata has a hint.
-    \param key The hint name.
-    \return True if the hint is set.
-    */
     bool contains_hint(QString const& key) const;
-
-    /**
-    \brief Returns a reference to a hint.
-
-    This method can be used to read or set hints. Setting a value of an existing hint overwrites
-    its previous value.
-    Referencing a non-existing hint automatically creates it with a default value of Variant::Type::Null.
-    \param key The name of the hint.
-    \return A reference to the hint.
-    */
     QScopeVariant& operator[](QString const& key);
-
-    /**
-    \brief Returns a const reference to a hint.
-
-    This method can be used for read-only access to hints.
-    Referencing a non-existing hint throws unity::InvalidArgumentException.
-    \param key The name of the hint.
-    \return A const reference to the hint.
-    \throws unity::NotFoundException if no hint with the given name exists.
-    */
     QVariant const& value(QString const& key) const;
 
 private:

=== modified file 'include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h'
--- include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h	2015-02-02 07:46:12 +0000
+++ include/unity/scopes/qt/internal/QSearchQueryBaseImpl.h	2015-02-25 12:37:38 +0000
@@ -50,41 +50,15 @@
     friend QSearchQueryBase;
 
 public:
-    /// @cond
     NONCOPYABLE(QSearchQueryBaseImpl);
     UNITY_DEFINES_PTRS(QSearchQueryBaseImpl);
-    /// @endcond
 
     QSearchQueryBaseImpl();
     ~QSearchQueryBaseImpl() = default;
 
-    /**
-     \brief Get a canned query for this search request.
-
-     \return The canned query.
-     \throws unity::LogicException if the canned query was not initialized (was default-constructed).
-     */
     QCannedQuery query() const;
-
-    /**
-     \brief Get metadata for this search request.
-     \return The search metadata.
-     \throws unity::LogicException if search metadata was not initialized (was default-constructed).
-    */
     unity::scopes::SearchMetadata search_metadata() const;
 
-    /** @name Subquery methods
-    The subsearch() methods are for use by aggregating scopes.
-    When an aggregator passes a query to its child scopes, it should
-    use subsearch() instead of the normal Scope::search()
-    that would be called by a client. subsearch() takes care
-    of automatically forwarding query cancellation to child scopes.
-    This means that there is no need for an aggregating scope to
-    explicitly forward cancellation to child scopes
-    when its QueryBase::cancelled() method is called by the scopes
-    run time.
-    */
-    //{@
     QueryCtrlProxy subsearch(ScopeProxy const& scope,
                              std::string const& query_string,
                              SearchListenerBase::SPtr const& reply);

=== modified file 'include/unity/scopes/qt/internal/QSearchReplyImpl.h'
--- include/unity/scopes/qt/internal/QSearchReplyImpl.h	2015-02-02 07:46:12 +0000
+++ include/unity/scopes/qt/internal/QSearchReplyImpl.h	2015-02-25 12:37:38 +0000
@@ -52,96 +52,17 @@
     friend class unity::scopes::qt::QSearchReply;
 
 public:
-    /// @cond
     NONCOPYABLE(QSearchReplyImpl);
     UNITY_DEFINES_PTRS(QSearchReplyImpl);
-    /// @endcond
-    /**
-    \brief Destroys a QSearchReplyImpl.
-    */
+
     virtual ~QSearchReplyImpl();
-
-    /**
-     \brief Register departments for the current search reply and provide the current department.
-
-     Departments are optional. If scope supports departments, it is expected to register departments on every search as
-     follows:
-
-      <ul>
-      <li>create a Department node for current department and attach to it a list of its subdepartments (unless current
-     department is a leaf department) using
-      unity::scopes::Department::set_subdepartments() method. For every subdepartment on the list set
-     "has_subdepartments" flag if applicable.
-      <li>provide an alternate label for current department with unity::scopes::Department::set_alternate_label().
-      <li>create a Department node for parent of current department (if applicable - not when in root department), and
-     attach current Department node to it with
-      unity::scopes::Department::set_subdepartments() method.
-      <li>register the parent department with unity::scopes::SearchReply::register_departments().
-      </ul>
-
-     For example, assuming the user is visiting a "History" department in "Books", and "History" has sub-departments
-     such as "World War Two" and "Ancient", the code
-     that registers departments for current search in "History" may look like this:
-     \code{.cpp}
-     unity::scopes::Department::SPtr books = move(unity::scopes::Department::create("books", query, "Books")); // the
-     parent of "History"
-     unity::scopes::Department::SPtr history = move(unity::scopes::Department::create("history", query, "History"));
-     unity::scopes::DepartmentList history_depts({
-                                                 move(unity::scopes::Department::create("ww2", query, "World War Two")),
-                                                 move(unity::scopes::Department::create("ancient", query, "Ancient"))});
-     history->set_subdepartments(history_depts);
-     books->set_subdepartments({history});
-     reply->register_departments(books);
-     \endcode
-
-     Current department should be the department returned by unity::scopes::CannedQuery::department_id(). Empty
-     department id denotes
-     the root deparment.
-
-     \param parent The parent department of current department, or current one if visiting root department.
-     \throws unity::LogicException if departments are invalid (nullptr passed, current department not present in the
-     parent's tree, duplicated department ids present in the tree).
-     */
     virtual void register_departments(QDepartment::SCPtr const& parent);
-
-    /**
-    \brief Register new category and send it to the source of the query.
-
-    \param id The identifier of the category
-    \param title The title of the category
-    \param icon The icon of the category
-    \param renderer_template The renderer template to be used for results in this category
-
-    \return The category instance
-    \throws unity::scopes::InvalidArgumentException if category with that id has already been registered.
-    */
     QCategory::SCPtr register_category(
         QString const& id,
         QString const& title,
         QString const& icon,
         unity::scopes::CategoryRenderer const& renderer_template = unity::scopes::CategoryRenderer());
-
-    /**
-    \brief Sends a single result to the source of a query.
-
-    Any calls to push() after finished() was called are ignored.
-    \return The return value is true if the result was accepted, false otherwise.
-    A false return value can be due to finished() having been called earlier,
-    or the client that sent the query having cancelled that query. The return
-    value is false also if the query has a cardinality limit and is reached
-    or exceeded. (The return value is false for the last valid push and
-    subsequent pushes.)
-    */
     bool push(QCategorisedResult const& result);
-
-    /**
-    \brief Informs the source of a query that the query was terminated due to an error.
-
-    Multiple calls to error() and calls to finished() after error() was called are ignored.
-    \param ex An exception_ptr indicating the cause of the error. If ex is a `std::exception`,
-              the return value of `what()` is made available to the query source. Otherwise,
-              the query source receives `"unknown exception"`.
-    */
     void error(std::exception_ptr ex);
 
 protected:

=== modified file 'include/unity/scopes/qt/internal/QUtils.h'
--- include/unity/scopes/qt/internal/QUtils.h	2015-02-25 12:37:37 +0000
+++ include/unity/scopes/qt/internal/QUtils.h	2015-02-25 12:37:38 +0000
@@ -18,10 +18,6 @@
 
 #pragma once
 
-#ifndef _ENABLE_QT_EXPERIMENTAL_
-#error You should define _ENABLE_QT_EXPERIMENTAL_ in order to use this experimental header file.
-#endif
-
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
 #include <QtCore/QVariant>

=== modified file 'src/scopes/qt/QActionMetadata.cpp'
--- src/scopes/qt/QActionMetadata.cpp	2015-01-26 15:25:30 +0000
+++ src/scopes/qt/QActionMetadata.cpp	2015-02-25 12:37:38 +0000
@@ -32,7 +32,7 @@
 }
 
 QActionMetadata::QActionMetadata(internal::QActionMetadataImpl* impl)
-    : p(new internal::QActionMetadataImpl(*impl))
+    : p(impl)
 {
 }
 

=== modified file 'src/scopes/qt/QPreviewWidget.cpp'
--- src/scopes/qt/QPreviewWidget.cpp	2015-01-20 14:14:26 +0000
+++ src/scopes/qt/QPreviewWidget.cpp	2015-02-25 12:37:38 +0000
@@ -104,7 +104,7 @@
 }
 
 QPreviewWidget::QPreviewWidget(internal::QPreviewWidgetImpl* widget)
-    : p(new internal::QPreviewWidgetImpl(*widget))
+    : p(widget)
 {
 }
 /// @endcond

=== modified file 'src/scopes/qt/QResult.cpp'
--- src/scopes/qt/QResult.cpp	2015-02-25 12:37:37 +0000
+++ src/scopes/qt/QResult.cpp	2015-02-25 12:37:38 +0000
@@ -24,11 +24,6 @@
 using namespace unity::scopes::qt;
 
 /// @cond
-QResult::QResult()
-    : p(new internal::QResultImpl(QVariantMap()))
-{
-}
-
 QResult::QResult(internal::QResultImpl* impl)
     : p(impl)
 {
@@ -123,7 +118,7 @@
 
 QVariant const& QResult::operator[](QString const& key) const
 {
-    return p->value(key);
+    return (*static_cast<internal::QResultImpl const*>(p.get()))[key];
 }
 
 QString QResult::uri() const noexcept

=== modified file 'src/scopes/qt/internal/QResultImpl.cpp'
--- src/scopes/qt/internal/QResultImpl.cpp	2015-02-25 12:37:37 +0000
+++ src/scopes/qt/internal/QResultImpl.cpp	2015-02-25 12:37:38 +0000
@@ -28,61 +28,19 @@
 using namespace unity::scopes::qt;
 using namespace unity::scopes::qt::internal;
 
-namespace unity
-{
-
-namespace scopes
-{
-
-namespace qt
-{
-
-namespace internal
+namespace
 {
 
 class APIResult : public Result
 {
 public:
-    APIResult(APIResult const& other)
-        : Result(other){};
-
-    APIResult(APIResult&&) = default;
-
-    APIResult& operator=(APIResult const& other)
-    {
-        if (this != &other)
-        {
-            *this = other;
-        }
-        return *this;
-    }
-
-    APIResult& operator=(APIResult&&) = default;
-
     APIResult(const QVariantMap& variant_map)
-        : Result(qvariantmap_to_variantmap(variant_map)){};
-
-    static VariantMap getValidEmptyMap()
+        : Result(qvariantmap_to_variantmap(variant_map))
     {
-        VariantMap retMap;
-        VariantMap emptyMap;
-        VariantMap attrsMap;
-
-        attrsMap["uri"] = Variant(std::string());
-        retMap["internal"] = emptyMap;
-        retMap["attrs"] = attrsMap;
-
-        return retMap;
     }
 };
 
-}  // namespace internal
-
-}  // namespace qt
-
-}  // namespace scopes
-
-}  // namespace unity
+}  // namespace
 
 QResultImpl::QResultImpl(unity::scopes::Result* api_result)
     : api_result_(api_result)
@@ -95,8 +53,9 @@
 }
 
 QResultImpl::QResultImpl(internal::QResultImpl* impl)
-    : api_result_(impl->api_result_.get())
 {
+    impl->sync_values();
+    api_result_.reset(new Result(*(impl->api_result_)));
 }
 
 QResultImpl::QResultImpl(QResultImpl const& other)

=== modified file 'src/scopes/qt/internal/QScopeBaseAPIImpl.cpp'
--- src/scopes/qt/internal/QScopeBaseAPIImpl.cpp	2015-02-25 12:37:37 +0000
+++ src/scopes/qt/internal/QScopeBaseAPIImpl.cpp	2015-02-25 12:37:38 +0000
@@ -78,16 +78,10 @@
 
 }  // namespace unity
 
-QScopeBaseAPIImpl::QScopeBaseAPIImpl(QScopeBase& qtscope, QObject* parent)
-    : QObject(parent)
-    , qtapp_ready_(false)
-    , qtscope_impl_(&qtscope)
-{
-}
-
-QScopeBaseAPIImpl::QScopeBaseAPIImpl(FactoryFunc const& creator, QObject* parent)
-    : QObject(parent)
-    , qtapp_ready_(false)
+QScopeBaseAPIImpl::QScopeBaseAPIImpl(FactoryFunc const& creator)
+    : QObject(nullptr)
+    , qtapp_ready_(false)
+    , qtapp_stopped_(false)
     , qtscope_impl_(nullptr)
     , qtscope_creator_(creator)
 {
@@ -109,11 +103,8 @@
         case Start:
             // create the client's scope in the
             // Qt main thread
-            if (!qtscope_impl_)
-            {
-                qtscope_impl_ = qtscope_creator_();
-                assert(qtscope_impl_);
-            }
+            qtscope_impl_.reset(qtscope_creator_());
+            assert(qtscope_impl_);
             // Move the user's scope to the Qt main thread
             qtscope_impl_->moveToThread(qtapp_->thread());
 
@@ -132,15 +123,14 @@
     return true;
 }
 
-void QScopeBaseAPIImpl::start(std::string const& scope_id)
+void QScopeBaseAPIImpl::start(string const& scope_id)
 {
     // start the QT thread
     // TODO change to make_unique when using C++14
-    qtthread_ = std::unique_ptr<std::thread>(new std::thread(&QScopeBaseAPIImpl::startQtThread, this));
+    qtthread_ = unique_ptr<std::thread>(new std::thread(&QScopeBaseAPIImpl::start_qt_thread, this));
     while (!qtapp_ready_)
     {
-        std::chrono::milliseconds dura(10);
-        std::this_thread::sleep_for(dura);
+        this_thread::sleep_for(chrono::milliseconds(10));
     }
 
     // Move this class to the Qt main thread
@@ -153,7 +143,7 @@
 
 void QScopeBaseAPIImpl::stop()
 {
-    // Post event to initialize the object in the Qt thread
+    // Post event to stop the object in the Qt thread
     qtapp_->postEvent(this, new StopEvent());
 }
 
@@ -176,16 +166,17 @@
     return sc::SearchQueryBase::UPtr(query_api);
 }
 
-void QScopeBaseAPIImpl::startQtThread()
+void QScopeBaseAPIImpl::start_qt_thread()
 {
     if (!QCoreApplication::instance())
     {
         int argc = 0;
         char* argv = NULL;
-        qtapp_ = std::make_shared<QCoreApplication>(argc, &argv);
+        qtapp_ = make_shared<QCoreApplication>(argc, &argv);
         qtapp_ready_ = true;
         qtapp_->exec();
         // delete QtCoreApplication in the same thread it was created
         qtapp_.reset();
+        qtapp_stopped_ = true;
     }
 }

=== modified file 'test/gtest/scopes/qt/qt-bindings/CMakeLists.txt'
--- test/gtest/scopes/qt/qt-bindings/CMakeLists.txt	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/CMakeLists.txt	2015-02-25 12:37:38 +0000
@@ -222,3 +222,22 @@
 qt5_use_modules(QScopeCreation_test Core)
 
 add_test(QScopeCreation QScopeCreation_test)
+
+###################################################
+
+add_executable(
+  QPreviewWidget_test
+  QPreviewWidget_test.cpp)
+
+target_link_libraries(
+    QPreviewWidget_test
+    ${LIBGTEST}
+    ${TESTLIBS_QT}
+    ${TESTLIBS})
+
+find_package(Qt5Core REQUIRED)
+include_directories(${Qt5Core_INCLUDE_DIRS})
+
+qt5_use_modules(QPreviewWidget_test Core)
+
+add_test(QPreviewWidget QPreviewWidget_test)

=== modified file 'test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QCategorisedResult_test.cpp	2015-02-25 12:37:38 +0000
@@ -23,11 +23,15 @@
 
 #include <unity/scopes/qt/internal/QCategorisedResultImpl.h>
 #include <unity/scopes/qt/internal/QCategoryImpl.h>
+#include <unity/scopes/qt/internal/QUtils.h>
 
+#include <unity/scopes/CategorisedResult.h>
 #include <unity/scopes/Category.h>
 #include <unity/scopes/CategoryRenderer.h>
 #include <unity/scopes/internal/CategoryRegistry.h>
 
+#include <unity/UnityExceptions.h>
+
 using namespace unity::scopes;
 using namespace unity::scopes::internal;
 using namespace unity::scopes::qt;
@@ -106,3 +110,115 @@
         EXPECT_EQ("2", ri1.category()->id());
     }
 }
+
+// Tests for QResult base class
+
+TEST(QCategorisedResult, QResult)
+{
+    std::shared_ptr<QCategory const> out_cat = QCategorisedResult_test::create_category("1");
+    std::shared_ptr<QCategory const> in_cat = QCategorisedResult_test::create_category("2");
+
+    QCategorisedResult out_result(out_cat);
+    out_result.set_uri("test_uri1");
+    out_result.set_title("title1");
+    out_result.set_art("art1");
+    out_result.set_dnd_uri("dnd_uri1");
+    out_result["key"] = "value";
+    EXPECT_EQ("test_uri1", out_result.uri());
+    EXPECT_EQ("title1", out_result.title());
+    EXPECT_EQ("art1", out_result.art());
+    EXPECT_EQ("dnd_uri1", out_result.dnd_uri());
+    EXPECT_TRUE(out_result.contains("key"));
+    EXPECT_EQ("value", out_result.value("key"));
+    try
+    {
+        out_result.target_scope_proxy();
+        FAIL();
+    }
+    catch (unity::LogicException const& e)
+    {
+        EXPECT_STREQ("unity::LogicException: Result::target_scope_proxy(): undefined target scope", e.what());
+    }
+
+    EXPECT_TRUE(out_result.direct_activation());
+    out_result.set_intercept_activation();
+    EXPECT_FALSE(out_result.direct_activation());
+
+    // TODO: No way to get JSON from Qvariant at the moment.
+    std::string json = Variant(qt::internal::qvariantmap_to_variantmap(out_result.serialize())).serialize_json();
+    std::string expected = std::string(R"({"attrs":{"art":"art1","dnd_uri":"dnd_uri1","key":"value","title":"title1","uri":"test_uri1"},"internal":{"cat_id":"1","flags":1}})") + "\n";
+    EXPECT_EQ(expected, json);
+
+    QCategorisedResult in_result(in_cat);
+    in_result.set_uri("test_uri2");
+    in_result.set_title("title2");
+
+    EXPECT_FALSE(out_result.has_stored_result());
+    out_result.store(in_result);
+    EXPECT_TRUE(out_result.has_stored_result());
+
+    QResult r = out_result.retrieve();
+    EXPECT_EQ(in_result.uri(), r.uri());  // TODO: Can't use in_result == r here because retrive() slices the class :-(
+                                          //       That's a flaw in the underlying API
+    QResult const qvc(out_result);
+    EXPECT_EQ("value", qvc["key"]);
+
+    // Copy and assignment
+
+    {
+        QResult c(out_result);
+        EXPECT_EQ("title1", c.title());
+    }
+
+    {
+        QResult c(out_result);
+        c = in_result;
+        EXPECT_EQ("title2", c.title());
+        c = c;
+        EXPECT_EQ("title2", c.title());
+    }
+
+    {
+        CategoryRegistry reg;
+        CategoryRenderer rdr;
+        auto cat = reg.register_category("1", "title", "icon", nullptr, rdr);
+        CategorisedResult result(cat);
+        result.set_title("t");
+
+        // QResult construction from Result is protected.
+        struct Tester : public QResult
+        {
+            Tester(Result const& result)
+                : QResult(result)
+            {
+            }
+        };
+
+        Tester t(result);
+        EXPECT_EQ("t", t.title());
+
+        // QResultImpl construction from QResultImpl* is protected.
+        struct ImplTester : public qt::internal::QResultImpl
+        {
+            ImplTester(QResultImpl* qri)
+                : QResultImpl(qri)
+            {
+            }
+
+            ImplTester(Result const& r)
+                : QResultImpl(r)
+            {
+                EXPECT_EQ("t", r.title());
+                qt::internal::QResultImpl* qrip = new QResultImpl(r);
+                EXPECT_EQ("t", qrip->title());
+
+                // This is the real test to see that this constructor works
+                ImplTester copy(qrip);
+                EXPECT_EQ("t", copy.title());
+                delete qrip;
+            }
+        };
+
+        ImplTester it(result);
+    }
+}

=== modified file 'test/gtest/scopes/qt/qt-bindings/QMockScope.h'
--- test/gtest/scopes/qt/qt-bindings/QMockScope.h	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QMockScope.h	2015-02-25 12:37:38 +0000
@@ -24,16 +24,19 @@
 
 #include <QtCore/QThread>
 
+#include <mutex>
+
 class QScopeMock : public QScope
 {
 public:
     QScopeMock()
         : QScope()
-        , qt_thread(nullptr){};
+        , qt_thread_(nullptr){};
 
-    void setQtThread(QThread* thread)
+    void set_qt_thread(QThread* thread)
     {
-        qt_thread = thread;
+        std::lock_guard<std::mutex> lock(mutex_);
+        qt_thread_ = thread;
     }
 
     MOCK_METHOD1(start, void(QString const&));
@@ -41,17 +44,20 @@
     virtual unity::scopes::qt::QPreviewQueryBase::UPtr preview(const unity::scopes::qt::QResult&,
                                                                const unity::scopes::qt::QActionMetadata&) override
     {
-        EXPECT_EQ(QThread::currentThread(), qt_thread);
+        std::lock_guard<std::mutex> lock(mutex_);
+        EXPECT_EQ(QThread::currentThread(), qt_thread_);
         return unity::scopes::qt::QPreviewQueryBase::UPtr(new QPreview());
     }
 
     virtual unity::scopes::qt::QSearchQueryBase::UPtr search(unity::scopes::CannedQuery const&,
                                                              unity::scopes::SearchMetadata const&) override
     {
-        EXPECT_EQ(QThread::currentThread(), qt_thread);
+        std::lock_guard<std::mutex> lock(mutex_);
+        EXPECT_EQ(QThread::currentThread(), qt_thread_);
         return unity::scopes::qt::QSearchQueryBase::UPtr(new QQuery());
     }
 
 protected:
-    QThread* qt_thread;
+    QThread* qt_thread_;
+    std::mutex mutex_;
 };

=== modified file 'test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QPreviewQueryBaseAPI_test.cpp	2015-02-25 12:37:38 +0000
@@ -138,10 +138,10 @@
 {
     QScope scope;
 
-    unity::scopes::internal::ResultImpl* resultImpl = new unity::scopes::internal::ResultImpl();
-    resultImpl->set_uri("test_uri");
+    unity::scopes::internal::ResultImpl resultImpl;
+    resultImpl.set_uri("test_uri");
 
-    unity::scopes::Result result = unity::scopes::internal::ResultImpl::create_result(resultImpl->serialize());
+    unity::scopes::Result result = unity::scopes::internal::ResultImpl::create_result(resultImpl.serialize());
 
     unity::scopes::CannedQuery query("scopeA", "query", "department");
     unity::scopes::ActionMetadata metadata("en", "phone");

=== added file 'test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp	1970-01-01 00:00:00 +0000
+++ test/gtest/scopes/qt/qt-bindings/QPreviewWidget_test.cpp	2015-02-25 12:37:38 +0000
@@ -0,0 +1,117 @@
+/*
+ * Copyright (C) 2015 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]>
+ */
+
+#include <gtest/gtest.h>
+
+#include <unity/scopes/qt/QPreviewWidget.h>
+#include <unity/scopes/qt/internal/QPreviewWidgetImpl.h>
+
+using namespace unity::scopes::qt;
+
+TEST(QPreviewWidget, bindings)
+{
+    {
+        QPreviewWidget qpw("id", "video");
+
+        EXPECT_EQ("id", qpw.id());
+        EXPECT_EQ("video", qpw.widget_type());
+    }
+
+    {
+        QPreviewWidget qpw(R"({"id": "img", "type": "image", "components": { "source": "screenshot-url" } })");
+
+        EXPECT_EQ("img", qpw.id());
+        EXPECT_EQ("image", qpw.widget_type());
+
+        auto am = qpw.attribute_mappings();
+        ASSERT_EQ(1, am.size());
+        EXPECT_EQ("screenshot-url", am.value("source"));
+
+        auto av = qpw.attribute_values();
+        ASSERT_EQ(0, av.size());
+
+        auto widgets = qpw.widgets();
+        ASSERT_EQ(0, widgets.size());
+
+        QPreviewWidget qpw2(qpw);
+
+        EXPECT_EQ("img", qpw2.id());
+        EXPECT_EQ("image", qpw2.widget_type());
+
+        QPreviewWidget qpw3("xxx", "audio");
+        qpw3 = qpw2;
+        EXPECT_EQ("img", qpw3.id());
+        EXPECT_EQ("image", qpw3.widget_type());
+
+        qpw3 = qpw3;
+        EXPECT_EQ("img", qpw3.id());
+        EXPECT_EQ("image", qpw3.widget_type());
+
+        QPreviewWidget parent_widget("parent", "expandable");
+        parent_widget.add_widget(qpw);
+        widgets = parent_widget.widgets();
+        ASSERT_EQ(1, widgets.size());
+        EXPECT_EQ("img", widgets.at(0).id());
+
+        qpw.add_attribute_value("key", "value");
+        av = qpw.attribute_values();
+        ASSERT_EQ(1, av.size());
+        EXPECT_EQ("value", av.value("key"));
+
+        qpw.add_attribute_mapping("attr", "field");
+        am = qpw.attribute_mappings();
+        ASSERT_EQ(2, am.size());
+        EXPECT_EQ("field", am.value("attr"));
+    }
+
+    {
+        QString data = R"({"components":{"source":"screenshot-url"},"id":"img","key":"value","type":"image"})";
+        QPreviewWidget qpw(data);
+        EXPECT_EQ(data + "\n", qpw.data());  // Underlying scopes API appends a newline
+
+        auto vm = qpw.serialize();
+        ASSERT_EQ(4, vm.size());
+        EXPECT_EQ("img", vm.value("id"));
+        EXPECT_EQ("image", vm.value("type"));
+        auto attrs = vm.value("attributes").toMap();
+        ASSERT_EQ(1, attrs.size());
+        EXPECT_EQ("value", attrs.value("key").toString());
+        auto components = vm.value("components").toMap();
+        ASSERT_EQ(1, components.size());
+        EXPECT_EQ("screenshot-url", components.value("source").toString());
+    }
+
+    {
+        internal::QPreviewWidgetImpl i("id", "audio");
+        EXPECT_EQ("id", i.id());
+        EXPECT_EQ("audio", i.widget_type());
+
+        internal::QPreviewWidgetImpl i2(i);
+        EXPECT_EQ("id", i2.id());
+        EXPECT_EQ("audio", i2.widget_type());
+
+        internal::QPreviewWidgetImpl i3("xxx", "video");
+        i = i3;
+        EXPECT_EQ("xxx", i.id());
+        EXPECT_EQ("video", i.widget_type());
+
+        i = i;
+        EXPECT_EQ("xxx", i.id());
+        EXPECT_EQ("video", i.widget_type());
+    }
+}

=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIImpl_test.cpp	2015-02-25 12:37:38 +0000
@@ -35,33 +35,33 @@
 
 TEST(TestSetup, bindings)
 {
-    QScopeMock scope;
+    QScopeMock* scope = new QScopeMock;
 
     // construct the QSearchQueryBaseAPIMock
-    QScopeBaseAPIMock api_scope(scope);
+    QScopeBaseAPIMock api_scope([scope]{ return scope; });
 
     // verify that the event method is called for start event
-    EXPECT_CALL(scope, start(_)).Times(Exactly(1));
+    EXPECT_CALL(*scope, start(_)).Times(Exactly(1));
     api_scope.start("test_scope");
 
-    QThread* qt_thread = api_scope.getQtAppThread();
-    scope.setQtThread(qt_thread);
+    QThread* qt_thread = api_scope.get_qt_app_thread();
+    scope->set_qt_thread(qt_thread);
 
-    auto CheckThread = [qt_thread]() -> void
+    auto check_thread = [qt_thread]() -> void
     {
         EXPECT_EQ(qt_thread, QThread::currentThread());
     };
 
-    unity::scopes::internal::ResultImpl* resultImpl = new unity::scopes::internal::ResultImpl();
-    resultImpl->set_uri("test_uri");
+    unity::scopes::internal::ResultImpl resultImpl;
+    resultImpl.set_uri("test_uri");
 
-    unity::scopes::Result result = unity::scopes::internal::ResultImpl::create_result(resultImpl->serialize());
+    unity::scopes::Result result = unity::scopes::internal::ResultImpl::create_result(resultImpl.serialize());
 
     unity::scopes::CannedQuery query("scopeA", "query", "department");
     unity::scopes::ActionMetadata action_metadata("en", "phone");
 
     // verify that the event method is called for stop event and
     // that the thread is the Qt thread
-    EXPECT_CALL(scope, stop()).Times(Exactly(1)).WillOnce(Invoke(CheckThread));
+    EXPECT_CALL(*scope, stop()).Times(Exactly(1)).WillOnce(Invoke(check_thread));
     api_scope.stop();
 }

=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h'
--- test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QScopeBaseAPIMock.h	2015-02-25 12:37:38 +0000
@@ -29,14 +29,14 @@
 class QScopeBaseAPIMock : public unity::scopes::qt::internal::QScopeBaseAPIImpl
 {
 public:
-    QScopeBaseAPIMock(unity::scopes::qt::QScopeBase& qtscope, QObject* parent = 0)
-        : unity::scopes::qt::internal::QScopeBaseAPIImpl(qtscope, parent)
+    QScopeBaseAPIMock(QScopeBaseAPIImpl::FactoryFunc const& creator)
+        : unity::scopes::qt::internal::QScopeBaseAPIImpl(creator)
     {
     }
 
     virtual ~QScopeBaseAPIMock() = default;
 
-    QThread* getQtAppThread()
+    QThread* get_qt_app_thread()
     {
         return qtapp_->thread();
     }

=== modified file 'test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp'
--- test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp	2015-02-25 12:37:37 +0000
+++ test/gtest/scopes/qt/qt-bindings/QScopeCreation_test.cpp	2015-02-25 12:37:38 +0000
@@ -43,8 +43,8 @@
 class QScopeBaseAPIImplTest : public QScopeBaseAPIImpl
 {
 public:
-    QScopeBaseAPIImplTest(FactoryFunc const& creator, QObject* parent = 0)
-        : QScopeBaseAPIImpl(creator, parent)
+    QScopeBaseAPIImplTest(FactoryFunc const& creator)
+        : QScopeBaseAPIImpl(creator)
     {
     }
 
@@ -52,6 +52,11 @@
     {
         return qtapp_->thread();
     }
+
+    bool qtapp_stopped()
+    {
+        return qtapp_stopped_;
+    }
 };
 
 QScopeBase* create_my_scope()
@@ -85,4 +90,9 @@
 
     // stop the Qt application
     impl.stop();
+
+    while (!impl.qtapp_stopped())
+    {
+        std::this_thread::sleep_for(std::chrono::milliseconds(10));
+    }
 }

=== modified file 'test/headers/CMakeLists.txt'
--- test/headers/CMakeLists.txt	2015-02-05 14:57:01 +0000
+++ test/headers/CMakeLists.txt	2015-02-25 12:37:38 +0000
@@ -5,7 +5,7 @@
 set(root_inc_dir ${CMAKE_SOURCE_DIR}/include)
 
 set(subdirs
-    unity/scopes/
+    unity/scopes
     unity/scopes/qt
     unity/scopes/testing
     unity/scopes/utility
@@ -56,4 +56,4 @@
 
 add_test(cleanincludes ${CMAKE_CURRENT_SOURCE_DIR}/includechecker.py ${CMAKE_SOURCE_DIR}/include)
 add_test(noglobalincludes ${CMAKE_CURRENT_SOURCE_DIR}/check_global_usage.py
-${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)
+         ${CMAKE_SOURCE_DIR}/include ${CMAKE_BINARY_DIR}/include)