Merge lp:~michihenning/storage-framework/exorcise-v1-api into lp:storage-framework/devel

[Michi Henning]

Removed old Qt client API.

Removed old Qt client API. We'll should merge this once the 0.3 release is done and change the package version to 0.4 then.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:119
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/268/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1833
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1840
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1616/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1616/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1616/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1616/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1616/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1616
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1616/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/268/rebuild

review: Approve (continuous-integration)

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:120
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/269/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1834
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1841
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1617/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1617
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1617/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/269/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/storage-framework/exorcise-v1-api]

120. By Michi Henning on 2017-03-28

Removed old v1 enum definition for overwriting files.

121. By Michi Henning on 2017-03-30

Merged devel and updated changelog.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:121
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/273/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1883
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1890
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1672/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1672/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1672/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1672/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1672/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1672
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1672/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/273/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/storage-framework/exorcise-v1-api]

122. By Michi Henning on 2017-04-06

Merged devel and resolved conflicts.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:122
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/279/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1919
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1926
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1707/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1707
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1707/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/279/rebuild

review: Approve (continuous-integration)

[lp:~michihenning/storage-framework/exorcise-v1-api]

123. By Michi Henning on 2017-04-06

Merged devel and resolved conflicts.

[unity-api-1-bot (unity-api-1-bot)]

PASSED: Continuous integration, rev:123
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/283/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/1928
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1935
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1715/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1715
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1715/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/283/rebuild

review: Approve (continuous-integration)

Unmerged revisions

123. By Michi Henning on 2017-04-06

Merged devel and resolved conflicts.

122. By Michi Henning on 2017-04-06

Merged devel and resolved conflicts.

121. By Michi Henning on 2017-03-30

Merged devel and updated changelog.

120. By Michi Henning on 2017-03-28

Removed old v1 enum definition for overwriting files.

119. By Michi Henning on 2017-03-20

Removed old Qt client API.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-03-30 06:43:01 +0000
+++ CMakeLists.txt	2017-04-06 08:34:29 +0000
@@ -139,14 +139,11 @@
 enable_coverage_report(
     TARGETS
         local-provider-lib
-        qt-client-lib-common
+        registry-static
+        sf-provider-objects
         storage-framework-common-internal
+        storage-framework-provider
         storage-framework-qt-client
-        storage-framework-qt-client-v2
-        storage-framework-qt-local-client
-        sf-provider-objects
-        storage-framework-provider
-        registry-static
         storage-framework-registry
         storage-provider-local
     FILTER

=== modified file 'debian/changelog'
--- debian/changelog	2017-04-06 07:41:50 +0000
+++ debian/changelog	2017-04-06 08:34:29 +0000
@@ -1,6 +1,7 @@
 storage-framework (0.4-0ubuntu2) UNRELEASED; urgency=medium
 
   [ Michi Henning ]
+  * Removed the deprecated v1 client API.
   * Removed dependency on libgio.
   * Added tutorial and provider reference documentation.
 

=== modified file 'debian/control.in'
--- debian/control.in	2017-03-30 06:31:03 +0000
+++ debian/control.in	2017-04-06 08:34:29 +0000
@@ -39,15 +39,6 @@
 Description: Library for Storage Framework providers
  Server-side runtime support for provider implementations.
 
-Package: libstorage-framework-qt-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework (API v1, soon to be removed)
- Runtime support for storage framework clients.
-
 Package: storage-framework-registry
 Architecture: any
 Multi-Arch: foreign
@@ -70,26 +61,12 @@
 Description: Client library for the Storage Framework
  Runtime support for storage framework clients.
 
-Package: libstorage-framework-qt-local-client-1-0
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends},
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-Description: Client library for the Storage Framework backed by the local file system
- A version of the client-side API that implements a local
- file system provider. This is intended mainly for testing;
- it allows application code to use the storage framework
- API without requiring use of DBus and cloud service account.
-
 Package: storage-framework-client-dev
 Section: libdevel
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
-Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
-         libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
-         libstorage-framework-qt-client-2-0 (= ${binary:Version}),
+Depends: libstorage-framework-qt-client-2-0 (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends},
 Description: Header files for the Storage Framework client libraries

=== removed file 'debian/libstorage-framework-qt-client-1-0.install'
--- debian/libstorage-framework-qt-client-1-0.install	2016-09-21 04:41:06 +0000
+++ debian/libstorage-framework-qt-client-1-0.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libstorage-framework-qt-client-1.so.*

=== removed file 'debian/libstorage-framework-qt-client-1-0.shlibs'
--- debian/libstorage-framework-qt-client-1-0.shlibs	2016-11-04 10:27:54 +0000
+++ debian/libstorage-framework-qt-client-1-0.shlibs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-libstorage-framework-qt-client-1 0 libstorage-framework-qt-client-1-0 (>= 0.1)

=== modified file 'include/unity/storage/common.h'
--- include/unity/storage/common.h	2017-03-29 01:01:24 +0000
+++ include/unity/storage/common.h	2017-04-06 08:34:29 +0000
@@ -43,7 +43,6 @@
 {
     error_if_conflict,  /*!< Return an error if the ETag has changed. */
     ignore_conflict,    /*!< Ignore ETag mismatch and overwrite or replace the file. */
-    overwrite = ignore_conflict, // TODO: remove this, it's here only for compatibility with v1 API
 };
 
 /**

=== modified file 'include/unity/storage/qt/CMakeLists.txt'
--- include/unity/storage/qt/CMakeLists.txt	2016-09-08 08:33:59 +0000
+++ include/unity/storage/qt/CMakeLists.txt	2017-04-06 08:34:29 +0000
@@ -1,5 +1,3 @@
-add_subdirectory(client)  # Old (v1) API
-
 set(includeprefix unity/storage/qt)
 file(GLOB public_hdrs *.h)
 set(convenience_hdr ${CMAKE_CURRENT_BINARY_DIR}/client-api.h)

=== removed directory 'include/unity/storage/qt/client'
=== removed file 'include/unity/storage/qt/client/Account.h'
--- include/unity/storage/qt/client/Account.h	2016-11-02 03:20:03 +0000
+++ include/unity/storage/qt/client/Account.h	1970-01-01 00:00:00 +0000
@@ -1,108 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QVector>
-
-#include <memory>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Runtime;
-class Root;
-
-namespace internal
-{
-
-class AccountBase;
-
-namespace local_client
-{
-
-class RuntimeImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class ItemImpl;
-class RuntimeImpl;
-
-}  // namespace remote_client
-}  // namespace internal
-
-/**
-\brief Class that represents an account.
-*/
-class UNITY_STORAGE_EXPORT Account final
-{
-public:
-    /// @cond
-    ~Account();
-    /// @endcond
-
-    Account(Account&&);
-    Account& operator=(Account&&);
-
-    typedef std::shared_ptr<Account> SPtr;
-
-    std::shared_ptr<Runtime> runtime() const;
-
-    QString owner() const;
-    QString owner_id() const;
-    QString description() const;
-
-    // TODO: Will almost certainly need more here. Other details?
-
-    /**
-    \brief Returns the root directories for the account.
-
-    An account can have more than one root directory (for providers that support the concept of multiple drives).
-    */
-    QFuture<QVector<std::shared_ptr<Root>>> roots() const;
-
-private:
-    Account(internal::AccountBase*) UNITY_STORAGE_HIDDEN;
-
-    std::shared_ptr<internal::AccountBase> p_;
-
-    friend class internal::local_client::RuntimeImpl;
-    friend class internal::remote_client::ItemImpl;
-    friend class internal::remote_client::RuntimeImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/CMakeLists.txt'
--- include/unity/storage/qt/client/CMakeLists.txt	2016-09-21 04:41:06 +0000
+++ include/unity/storage/qt/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-set(includeprefix unity/storage/qt/client)
-file(GLOB public_hdrs *.h)
-set(convenience_hdr ${CMAKE_CURRENT_BINARY_DIR}/client-api.h)
-
-add_custom_command(
-    OUTPUT ${convenience_hdr}
-    COMMAND ${CMAKE_SOURCE_DIR}/tools/create_globalheader.py
-        ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
-    DEPENDS ${public_hdrs})
-
-add_custom_target(qt-client-all-headers-v1 ALL DEPENDS ${convenience_hdr})
-
-install(FILES ${public_hdrs} ${convenience_hdr}
-  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-1/${includeprefix})

=== removed file 'include/unity/storage/qt/client/Downloader.h'
--- include/unity/storage/qt/client/Downloader.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/Downloader.h	1970-01-01 00:00:00 +0000
@@ -1,139 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/common.h>
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QLocalSocket>
-
-#include <memory>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class File;
-
-namespace internal
-{
-
-class DownloaderBase;
-
-namespace local_client
-{
-
-class FileImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class DownloaderImpl;
-
-}  // namespace remote_client
-}  // namespace internal
-
-class UNITY_STORAGE_EXPORT Downloader final
-{
-public:
-    /**
-    \brief Destroys the downloader.
-
-    The destructor implicitly calls cancel() if it has not been called already.
-    */
-    ~Downloader();
-
-    Downloader(Downloader&&);
-    Downloader& operator=(Downloader&&);
-
-    /**
-    \brief Convenience type definition.
-    */
-    typedef std::shared_ptr<Downloader> SPtr;
-
-    /**
-    \brief Returns the file for this downloader.
-    */
-    std::shared_ptr<File> file() const;
-
-    /**
-    \brief Returns a socket that is open for reading.
-
-    To download the file contents, read from the returned socket.
-    \return A socket open for reading.
-    */
-    std::shared_ptr<QLocalSocket> socket() const;
-
-    /**
-    \brief Finalizes the download.
-
-    Once the returned socket indicates EOF, you must call finish_download(), which closes
-    the socket. Call `waitForFinished()` on the returned future to check for errors. If an error
-    occurred, `waitForFinished()` throws an exception. If the download was cancelled, `waitForFinished()` throws
-    CancelledException.
-
-    \warning Do not assume that a download completed successfully once you detect EOF on the socket.
-    If something goes wrong during a download on the server side, the socket will return EOF
-    for a partially-downloaded file.
-    */
-    QFuture<void> finish_download();
-
-    /**
-    \brief Cancels a download.
-
-    Calling cancel() informs the provider that the download is no longer needed. The provider
-    will make a best-effort attempt to cancel the download from the remote service.
-
-    You can check whether the cancel was successfully sent by calling `waitForFinished()` on the returned future.
-    If this does not throw an exception, the message was received and acted upon by the provider. However,
-    successful completion does _not_ indicate that the download was actually cancelled. (For example,
-    the download may have completed already by the time the provider received the cancel request, or the provider
-    may not support cancellation.)
-
-    Calling cancel() more than once, or calling cancel() after a call to finish_download() is safe and does nothing.
-    */
-    QFuture<void> cancel();
-
-private:
-    Downloader(internal::DownloaderBase*) UNITY_STORAGE_HIDDEN;
-
-    std::shared_ptr<internal::DownloaderBase> p_;
-
-    friend class internal::local_client::FileImpl;
-    friend class internal::remote_client::DownloaderImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Exceptions.h'
--- include/unity/storage/qt/client/Exceptions.h	2016-08-26 00:15:44 +0000
+++ include/unity/storage/qt/client/Exceptions.h	1970-01-01 00:00:00 +0000
@@ -1,255 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#include <QException>
-#pragma GCC diagnostic pop
-#include <QString>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-/**
-\brief Base exception class for all exceptions returned by the API.
-*/
-class UNITY_STORAGE_EXPORT StorageException : public QException
-{
-public:
-    StorageException(char const* exception_name, QString const& error_message);
-    ~StorageException();
-
-    virtual StorageException* clone() const override = 0;
-    virtual void raise() const override = 0;
-
-    virtual char const* what() const noexcept override;
-
-    QString error_message() const;
-
-private:
-    std::string what_string_;
-    QString error_message_;
-};
-
-/**
-\brief Indicates errors in the communication with the storage provider service.
-*/
-class UNITY_STORAGE_EXPORT LocalCommsException : public StorageException
-{
-public:
-    LocalCommsException(QString const& error_message);
-    ~LocalCommsException();
-
-    virtual LocalCommsException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates errors in the communication between the storage provider and the cloud service.
-*/
-class UNITY_STORAGE_EXPORT RemoteCommsException : public StorageException
-{
-public:
-    RemoteCommsException(QString const& error_message);
-    ~RemoteCommsException();
-
-    virtual RemoteCommsException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates that the caller invoked an operation on a file or folder that was deleted.
-*/
-class UNITY_STORAGE_EXPORT DeletedException : public StorageException
-{
-public:
-    DeletedException(QString const& error_message, QString const& identity_);
-    ~DeletedException();
-
-    virtual DeletedException* clone() const override;
-    virtual void raise() const override;
-
-    QString native_identity() const;
-
-private:
-    QString identity_;
-};
-
-/**
-\brief Indicates that the caller destroyed the runtime.
-*/
-class UNITY_STORAGE_EXPORT RuntimeDestroyedException : public StorageException
-{
-public:
-    RuntimeDestroyedException(QString const& method);
-    ~RuntimeDestroyedException();
-
-    virtual RuntimeDestroyedException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates that an item does not exist or could not be found.
-*/
-class UNITY_STORAGE_EXPORT NotExistsException : public StorageException
-{
-public:
-    NotExistsException(QString const& error_message, QString const& key);
-    ~NotExistsException();
-
-    virtual NotExistsException* clone() const override;
-    virtual void raise() const override;
-
-    QString key() const;
-
-private:
-    QString key_;
-};
-
-/**
-\brief Indicates that an item cannot be created because it exists already.
-*/
-class UNITY_STORAGE_EXPORT ExistsException : public StorageException
-{
-public:
-    ExistsException(QString const& error_message, QString const& identity, QString const& name);
-    ~ExistsException();
-
-    virtual ExistsException* clone() const override;
-    virtual void raise() const override;
-
-    QString native_identity() const;
-    QString name() const;
-
-private:
-    QString identity_;
-    QString name_;
-};
-
-/**
-\brief Indicates that an upload detected a version mismatch.
-*/
-class UNITY_STORAGE_EXPORT ConflictException : public StorageException
-{
-public:
-    ConflictException(QString const& error_message);
-    ~ConflictException();
-
-    virtual ConflictException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates that an operation failed because of a permission problem.
-*/
-class UNITY_STORAGE_EXPORT PermissionException : public StorageException
-{
-public:
-    PermissionException(QString const& error_message);
-    ~PermissionException();
-
-    virtual PermissionException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates that an update failed because the provider ran out of space.
-*/
-class UNITY_STORAGE_EXPORT QuotaException : public StorageException
-{
-public:
-    QuotaException(QString const& error_message);
-    ~QuotaException();
-
-    virtual QuotaException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates that an upload or download was cancelled before it could complete.
-*/
-class UNITY_STORAGE_EXPORT CancelledException : public StorageException
-{
-public:
-    CancelledException(QString const& error_message);
-    ~CancelledException();
-
-    virtual CancelledException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates incorrect use of the API, such as calling methods in the wrong order.
-*/
-class UNITY_STORAGE_EXPORT LogicException : public StorageException
-{
-public:
-    LogicException(QString const& error_message);
-    ~LogicException();
-
-    virtual LogicException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates an invalid parameter, such as a negative value when a positive one was
-expected, or a string that does not parse correctly or is empty when it should be non-empty.
-*/
-class UNITY_STORAGE_EXPORT InvalidArgumentException : public StorageException
-{
-public:
-    InvalidArgumentException(QString const& error_message);
-    ~InvalidArgumentException();
-
-    virtual InvalidArgumentException* clone() const override;
-    virtual void raise() const override;
-};
-
-/**
-\brief Indicates a system error, such as failure to create a file or folder,
-or any other (usually non-recoverable) kind of error that should not arise during normal operation.
-*/
-class UNITY_STORAGE_EXPORT ResourceException : public StorageException
-{
-public:
-    ResourceException(QString const& error_message, int error_code);
-    ~ResourceException();
-
-    virtual ResourceException* clone() const override;
-    virtual void raise() const override;
-
-    int error_code() const noexcept;
-
-private:
-    int error_code_;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/File.h'
--- include/unity/storage/qt/client/File.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/File.h	1970-01-01 00:00:00 +0000
@@ -1,109 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/Item.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Downloader;
-class Uploader;
-namespace internal
-{
-
-class FileBase;
-
-namespace local_client
-{
-
-class FileImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class FileImpl;
-
-}  // namespace remotelocal_client
-}  // namespace internal
-
-/**
-\brief Class that represents a file.
-
-A file is a sequence of bytes.
-*/
-class UNITY_STORAGE_EXPORT File final : public Item
-{
-public:
-    /// @cond
-    virtual ~File();
-    /// @endcond
-
-    File(File&&);
-    File& operator=(File&&);
-
-    /**
-    \brief Convenience type definition.
-    */
-    typedef std::shared_ptr<File> SPtr;
-
-    /**
-    \brief Returns the size of the file in bytes.
-    \throws DestroyedException if the file has been destroyed.
-    */
-    int64_t size() const;
-
-    /**
-    \brief Creates an uploader for the file.
-    \param policy The conflict resolution policy. If set to ConflictPolicy::overwrite,
-    the contents of the file will be overwritten even if the file was modified
-    after this File instance was retrieved. Otherwise, if set to ConflictPolicy::error_if_conflict,
-    an attempt to retrieve the File instance from the future returned by Uploader::finish_upload()
-    throws ConflictException if the file was was modified via some other channel.
-    \param size The size of the upload in bytes.
-    \note The provided file size must match the number of bytes that you write for the upload, otherwise
-    an attampt to retrive the File instance from the future returned by Uploader::finish_upload()
-    throws LogicException.
-    */
-    QFuture<std::shared_ptr<Uploader>> create_uploader(ConflictPolicy policy, int64_t size);
-
-    /**
-    \brief Creates a downloader for the file.
-    */
-    QFuture<std::shared_ptr<Downloader>> create_downloader();
-
-private:
-    File(internal::FileBase*) UNITY_STORAGE_HIDDEN;
-
-    friend class internal::local_client::FileImpl;
-    friend class internal::remote_client::FileImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Folder.h'
--- include/unity/storage/qt/client/Folder.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/Folder.h	1970-01-01 00:00:00 +0000
@@ -1,127 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/File.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-
-class FolderBase;
-
-namespace local_client
-{
-
-class FolderImpl;
-class ItemImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class FolderImpl;
-class ItemImpl;
-
-}  // namespace local_client
-}  // namespace internal
-
-/**
-\brief Class that represents a folder.
-
-A folder is an unordered set of files and/or folders.
-*/
-class UNITY_STORAGE_EXPORT Folder : public Item
-{
-public:
-    /// @cond
-    virtual ~Folder();
-    /// @endcond
-
-    Folder(Folder&&);
-    Folder& operator=(Folder&&);
-
-    typedef std::shared_ptr<Folder> SPtr;
-
-    /**
-    \brief Returns the contents of a folder.
-    \return A vector of items or, if this folder is empty,
-    an empty vector. If there is a large number of items,
-    the returned future may become ready
-    more than once. (See QFutureWatcher for more information.)
-    */
-    QFuture<QVector<Item::SPtr>> list() const;
-
-    /**
-    \brief Returns the item within this folder with the given name.
-    \return The item. If no such item exists, retrieving the result
-    from the future throws an exception.
-    */
-    QFuture<QVector<Item::SPtr>> lookup(QString const& name) const;
-
-    /**
-    \brief Creates a new folder with the current folder as the parent.
-    \param name The name of the new folder. Note that the actual name may be changed
-    by the provider; call Item::name() once the folder is created to get its actual name.
-    \warn Do not rely on create_folder() to fail if an attempt is made to create
-    a folder with the same name as an already existing folder or file. Depending on the cloud
-    provider, it may be possible to have several folders with the same name.
-    // TODO: Explain issues with metacharacters.
-    \return The new folder.
-    */
-    QFuture<Folder::SPtr> create_folder(QString const& name);
-
-    /**
-    \brief Creates a new file with the current folder as the parent.
-
-    Use the returned Uploader to write data to the file. You must call Uploader::finish_upload()
-    for the file to actually be created (whether data was written to the file or not).
-    \param name The name of the new file. Note that the actual name may be changed
-    by the provider; call Item::name() once the file is created to get its actual name.
-    \param size The size of the upload in bytes.
-    \note The provided file size must match the number of bytes that you write for the upload, otherwise
-    an attampt to retrive the File instance from the future returned by Uploader::finish_upload()
-    throws LogicException.
-    \warn Do not rely on create_file() to fail if an attempt is made to create
-    a file with the same name as an already existing file or folder. Depending on the cloud
-    provider, it may be possible to have several files with the same name.
-    // TODO: Explain issues with metacharacters.
-    */
-    QFuture<std::shared_ptr<Uploader>> create_file(QString const& name, int64_t size);
-
-protected:
-    Folder(internal::FolderBase*) UNITY_STORAGE_HIDDEN;
-
-    friend class internal::local_client::FolderImpl;
-    friend class internal::local_client::ItemImpl;
-    friend class internal::remote_client::FolderImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Item.h'
--- include/unity/storage/qt/client/Item.h	2016-07-25 03:45:41 +0000
+++ include/unity/storage/qt/client/Item.h	1970-01-01 00:00:00 +0000
@@ -1,239 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/common.h>
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QDateTime>
-#include <QFuture>
-#pragma GCC diagnostic pop
-
-#include <memory>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Folder;
-class Root;
-
-typedef QMap<QString, QVariant> MetadataMap;
-
-namespace internal
-{
-
-class ItemBase;
-
-namespace local_client
-{
-
-class UploadWorker;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class CopyHandler;
-class ItemImpl;
-class LookupHandler;
-class MetadataHandler;
-
-}  // namespace remote_client
-}  // namespace internal
-
-/**
-\brief Base class for files and folders.
-*/
-class UNITY_STORAGE_EXPORT Item
-{
-public:
-    /// @cond
-    virtual ~Item();
-    /// @endcond
-
-    Item(Item&&);
-    Item& operator=(Item&&);
-
-    /**
-    \brief Convenience type definition.
-    */
-    typedef std::shared_ptr<Item> SPtr;
-
-    /**
-    \brief Returns the native identifier used by the provider.
-    */
-    QString native_identity() const;
-
-    /**
-    \brief Returns the name of the file or folder.
-
-    The returned name may not be the same as the name that was used to create the item because the provider
-    may have changed it in some way (such as converting upper case characters to lower case).
-    */
-    QString name() const;
-
-    /**
-    \brief Returns the root folder for this item.
-
-    If this item is a root, the returned pointer points at this item.
-    */
-    std::shared_ptr<Root> root() const;
-
-    /**
-    \brief Returns the type of the item.
-    */
-    ItemType type() const;
-
-    /**
-    \brief Returns a version identifier for the item.
-
-    The version identifier changes each time the file is updated (possibly
-    via some channel other than this API).
-    */
-    QString etag() const;
-
-    /**
-    \brief Returns metadata for the item.
-
-    TODO: Needs a lot more doc. Explain standard and provider-specific metadata.
-    */
-    QVariantMap metadata() const;
-
-    /**
-    \brief Returns the time at which the item was last modified.
-    */
-    QDateTime last_modified_time() const;
-
-    /**
-    \brief Returns a list of parent folders of this item.
-    \return A vector of parents. For a root, the returned vector is empty.
-    \warn Depending on the provider, a single file or folder may have multiple
-    parents. Do not assume that only a single parent will be returned, or that
-    parents are returned in a particular order.
-    */
-    QFuture<QVector<std::shared_ptr<Folder>>> parents() const;
-
-    /**
-    \brief Returns the native identities of the parents of this item.
-    \return A vector of parent identities. For a root, the returned vector is empty.
-    \warn Depending on the provider, a single file or folder may have multiple
-    parents. Do not assume that only a single parent ID will be returned, or that
-    parent IDs are returned in a particular order.
-    */
-    QVector<QString> parent_ids() const;
-
-    /**
-    \brief Copies this item.
-
-    Copying a folder recursively copies its contents.
-    \param new_parent The new parent folder for the item. If the item is to be copied within
-    its current folder, this parameter must designate the currently existing parent.
-    \param new_name The new name for the file.
-    \warn Do not rely on copy() to fail if an attempt is made to copy
-    a file or folder to a destination name that is the same as that of an already existing file or folder.
-    Depending on the cloud provider, it may be possible to have several folders with the same name.
-    */
-    QFuture<Item::SPtr> copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name);
-
-    /**
-    \brief Renames and/or moves a file or folder.
-    \param new_parent The new parent folder for the item. If the item is to be renamed within
-    its current folder, this parameter must designate the currently existing parent.
-    \param new_name The new name for the item.
-    \warn Do not rely on move() to fail if an attempt is made to move
-    a file or folder to a destination name that is the same as that of an already existing file or folder.
-    Depending on the cloud provider, it may be possible to have several files or folders with the same name.
-    \note It is not possible to move or rename the root folder.
-    */
-    QFuture<Item::SPtr> move(std::shared_ptr<Folder> const& new_parent, QString const& new_name);
-
-    /**
-    \brief Permamently deletes the item.
-    \warning Deleting a folder recursively deletes its contents.
-    */
-    QFuture<void> delete_item();
-
-    /**
-    \brief Returns the time at which an item was created.
-    \return If a provider does not support this method, the returned `QDateTime`'s `isValid()`
-    method returns false.
-    */
-    QDateTime creation_time() const;
-
-    /**
-    \brief Returns provider-specific metadata.
-
-    The contents of the returned map depend on the actual provider. This method is provided
-    to allow applications to use provider-specific features that may not be
-    supported by all providers.
-    \return The returned map may be empty if a provider does not support this feature. If a provider
-    supports it, the following keys are guaranteed to be present:
-        - `native_provider_id` (string)
-          A string that identifies the provider, such as "mCloud".
-        - `native_provider_version` (string)
-          A string that provides a version identifier.
-    \warn Unless you know that your application will only be used with a specific provider,
-    avoid using this method. If you do use provider-specific data, ensure reasonable fallback
-    behavior for your application if it encounters a different provider that does not support
-    a particular metadata item.
-    // TODO: document where to find the list of metadata items for each concrete provider.
-    */
-    MetadataMap native_metadata() const;
-
-    /**
-    \brief Compares two items for equality.
-
-    Equality comparison is deep, that is, it compares the native identities of two items, not
-    their `shared_ptr` values.
-    \note If you retrieve the same item more than once (such as by calling Root::get() twice
-    with the same file ID) and then perform an upload using one of the two file handles, the
-    files still have the same identity after the upload. However, the etag() values of the two
-    file handles differ after the upload. Despite this, equal_to() still returns `true` for
-    the two files, that is, the ETags are ignored for equality comparison.
-    \return `!this->native_identity() == other->native_identity()`
-    \throws DeletedException if `this` or `other` have been deleted.
-    */
-    bool equal_to(Item::SPtr const& other) const noexcept;
-
-protected:
-    Item(internal::ItemBase* p) UNITY_STORAGE_HIDDEN;
-
-    std::shared_ptr<internal::ItemBase> p_;
-
-    friend class internal::local_client::UploadWorker;
-    friend class internal::remote_client::CopyHandler;
-    friend class internal::remote_client::ItemImpl;
-    friend class internal::remote_client::LookupHandler;
-    friend class internal::remote_client::MetadataHandler;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Root.h'
--- include/unity/storage/qt/client/Root.h	2016-07-20 06:58:30 +0000
+++ include/unity/storage/qt/client/Root.h	1970-01-01 00:00:00 +0000
@@ -1,92 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/Folder.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Account;
-class Item;
-
-namespace internal
-{
-
-class RootBase;
-
-namespace local_client
-{
-
-class RootImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class RootImpl;
-
-}  // namespace remote_client
-}  // namespace internal
-
-/**
-\brief Class that represents a root folder.
-*/
-class UNITY_STORAGE_EXPORT Root final : public Folder
-{
-public:
-    // @cond
-    virtual ~Root();
-    /// @endcond
-
-    Root(Root&&);
-    Root& operator=(Root&&);
-
-    typedef std::shared_ptr<Root> SPtr;
-
-    /**
-    \brief Returns the account for this root.
-    */
-    std::shared_ptr<Account> account() const;
-
-    QFuture<int64_t> free_space_bytes() const;
-    QFuture<int64_t> used_space_bytes() const;
-
-    QFuture<Item::SPtr> get(QString native_identity) const;
-
-    // TODO: Do we need a method to get lots of things?
-
-private:
-    Root(internal::RootBase*) UNITY_STORAGE_HIDDEN;
-
-    friend class internal::local_client::RootImpl;
-    friend class internal::remote_client::RootImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Runtime.h'
--- include/unity/storage/qt/client/Runtime.h	2016-08-12 00:32:42 +0000
+++ include/unity/storage/qt/client/Runtime.h	1970-01-01 00:00:00 +0000
@@ -1,122 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-
-#include <memory>
-
-class QDBusConnection;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Account;
-
-namespace internal
-{
-
-class AccountBase;
-class RuntimeBase;
-
-namespace remote_client
-{
-
-class AccountImpl;
-
-}  // namespace remote_client
-
-}  // namespace internal
-
-/**
-TODO
-*/
-class UNITY_STORAGE_EXPORT Runtime final
-{
-public:
-    /**
-    \brief Destroys the runtime.
-
-    The destructor implicitly calls shutdown().
-
-    \warning Do not invoke methods on any other part of the API once the runtime is destroyed;
-    doing so has undefined behavior.
-    */
-    ~Runtime();
-
-    Runtime(Runtime&&);
-    Runtime& operator=(Runtime&&);
-
-    typedef std::shared_ptr<Runtime> SPtr;
-
-    /**
-    \brief Initializes the runtime.
-    */
-    static SPtr create();
-    static SPtr create(QDBusConnection const& bus);
-
-    /**
-    \brief Shuts down the runtime.
-
-    This method shuts down the runtime. Calling shutdown() more than once is safe and does nothing.
-
-    The destructor implicitly calls shutdown(). This method is provided mainly to permit logging of any
-    errors that might arise during shut-down.
-    \throws Various exceptions, depending on the error. TODO
-    */
-    void shutdown();
-
-    QFuture<QVector<std::shared_ptr<Account>>> accounts();
-
-    /// @cond
-    /**
-    \brief Creates an Account object pointing at (bus_name, object_path)
-
-    This method is intended for use in tests, where you want to talk
-    to a provider that has already been set up on the bus.
-    */
-    std::shared_ptr<Account> make_test_account(QString const& bus_name,
-                                               QString const& object_path);
-    /// @endcond
-
-private:
-    Runtime(internal::RuntimeBase* p) UNITY_STORAGE_HIDDEN;
-
-    std::shared_ptr<internal::RuntimeBase> p_;
-
-    friend class internal::AccountBase;
-    friend class internal::remote_client::AccountImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/Uploader.h'
--- include/unity/storage/qt/client/Uploader.h	2016-08-03 03:20:39 +0000
+++ include/unity/storage/qt/client/Uploader.h	1970-01-01 00:00:00 +0000
@@ -1,144 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/visibility.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QLocalSocket>
-
-#include <memory>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class File;
-
-namespace internal
-{
-
-class UploaderBase;
-
-namespace local_client
-{
-
-class FileImpl;
-class FolderImpl;
-
-}  // namespace local_client
-
-namespace remote_client
-{
-
-class UploaderImpl;
-
-}  // namespace remote_client
-}  // namespace internal
-
-class UNITY_STORAGE_EXPORT Uploader final
-{
-public:
-    /**
-    \brief Destroys the uploader.
-
-    The destructor implicitly calls cancel() if it has not been called already.
-    */
-    ~Uploader();
-
-    Uploader(Uploader&&);
-    Uploader& operator=(Uploader&&);
-
-    /**
-    \brief Convenience type definition.
-    */
-    typedef std::shared_ptr<Uploader> SPtr;
-
-    /**
-    \brief Returns a socket that is open for writing.
-
-    To upload the file contents, write to the returned socket.
-    If an operation on the socket returns an error, the file is in an indeterminate state.
-
-    \return A socket open for writing.
-    */
-    std::shared_ptr<QLocalSocket> socket() const;
-
-    /**
-    \brief Returns the size that was passed to Folder::create_file() or File::create_uploader().
-
-    \return The number of bytes that the uploader expects to be written to the `QLocalSocket` returned
-    from socket().
-    */
-    int64_t size() const;
-
-    /**
-    \brief Finalizes the upload.
-
-    Once you have written the file contents to the socket returned by socket(), you must call finish_upload(),
-    which closes the socket. Call `result()` on the returned future to check for errors. If an error
-    occurred, `result()` throws an exception. If the upload was cancelled, `result` throws CancelledException.
-    Otherwise, it returns the File that was uploaded.
-
-    Calling finish_upload() more than once is safe; subsequent calls do nothing and return the future
-    that was returned by the first call.
-    */
-    QFuture<std::shared_ptr<File>> finish_upload();
-
-    /**
-    \brief Cancels an upload.
-
-    Calling cancel() informs the provider that the upload is no longer needed. The provider
-    will make a best-effort attempt to cancel the upload to the remote service.
-
-    You can check whether the cancel was successfully sent by calling `waitForFinished()` on the returned future.
-    If this does not throw an exception, the message was received and acted upon by the provider. However,
-    successful completion does _not_ indicate that the upload was actually cancelled. (For example,
-    the upload may have completed already by the time the provider received the cancel request, or the provider
-    may not support cancellation.)
-
-    Calling cancel() more than once, or calling cancel() after a call to finish_upload() is safe and does nothing.
-    */
-    QFuture<void> cancel();
-
-private:
-    Uploader(internal::UploaderBase*) UNITY_STORAGE_HIDDEN;
-
-    std::shared_ptr<internal::UploaderBase> p_;
-
-    friend class internal::local_client::FileImpl;
-    friend class internal::local_client::FolderImpl;
-    friend class internal::remote_client::UploaderImpl;
-};
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed directory 'include/unity/storage/qt/client/internal'
=== removed file 'include/unity/storage/qt/client/internal/AccountBase.h'
--- include/unity/storage/qt/client/internal/AccountBase.h	2016-07-25 03:45:41 +0000
+++ include/unity/storage/qt/client/internal/AccountBase.h	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QVector>
-
-#include <atomic>
-#include <memory>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Account;
-class Root;
-class Runtime;
-
-namespace internal
-{
-
-class AccountBase
-{
-public:
-    AccountBase(std::weak_ptr<Runtime> const& runtime);
-    virtual ~AccountBase() = default;
-    AccountBase(AccountBase const&) = delete;
-    AccountBase& operator=(AccountBase const&) = delete;
-
-    std::shared_ptr<Runtime> runtime() const;
-    virtual QString owner() const = 0;
-    virtual QString owner_id() const = 0;
-    virtual QString description() const = 0;
-    virtual QFuture<QVector<std::shared_ptr<Root>>> roots() = 0;
-
-    void set_public_instance(std::weak_ptr<Account> const& p);
-
-protected:
-    std::weak_ptr<Runtime> runtime_;          // Immutable once set
-    std::weak_ptr<Account> public_instance_;  // Immutable once set
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/DownloaderBase.h'
--- include/unity/storage/qt/client/internal/DownloaderBase.h	2016-07-22 02:35:12 +0000
+++ include/unity/storage/qt/client/internal/DownloaderBase.h	1970-01-01 00:00:00 +0000
@@ -1,63 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-
-#include <memory>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class File;
-
-namespace internal
-{
-
-class DownloaderBase : public QObject
-{
-public:
-    DownloaderBase(std::weak_ptr<File> file);
-
-    virtual std::shared_ptr<File> file() const = 0;
-    virtual std::shared_ptr<QLocalSocket> socket() const = 0;
-    virtual QFuture<void> finish_download() = 0;
-    virtual QFuture<void> cancel() noexcept = 0;
-
-protected:
-    std::shared_ptr<File> file_;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/FileBase.h'
--- include/unity/storage/qt/client/internal/FileBase.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/internal/FileBase.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/ItemBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Downloader;
-class File;
-class Uploader;
-
-namespace internal
-{
-
-class FileBase : public virtual ItemBase
-{
-public:
-    FileBase(QString const& identity);
-
-    virtual int64_t size() const = 0;
-    virtual QFuture<std::shared_ptr<Uploader>> create_uploader(ConflictPolicy policy, int64_t size) = 0;
-    virtual QFuture<std::shared_ptr<Downloader>> create_downloader() = 0;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/FolderBase.h'
--- include/unity/storage/qt/client/internal/FolderBase.h	2016-07-22 00:17:24 +0000
+++ include/unity/storage/qt/client/internal/FolderBase.h	1970-01-01 00:00:00 +0000
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/ItemBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Uploader;
-
-namespace internal
-{
-
-class FolderBase : public virtual ItemBase
-{
-public:
-    FolderBase(QString const& identity, ItemType type);
-
-    virtual QFuture<QVector<std::shared_ptr<Item>>> list() const = 0;
-    virtual QFuture<QVector<std::shared_ptr<Item>>> lookup(QString const& name) const = 0;
-    virtual QFuture<std::shared_ptr<Folder>> create_folder(QString const& name) = 0;
-    virtual QFuture<std::shared_ptr<Uploader>> create_file(QString const& name, int64_t size) = 0;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/ItemBase.h'
--- include/unity/storage/qt/client/internal/ItemBase.h	2016-08-05 05:37:23 +0000
+++ include/unity/storage/qt/client/internal/ItemBase.h	1970-01-01 00:00:00 +0000
@@ -1,101 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/common.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QDateTime>
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QVariantMap>
-
-#include <memory>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Folder;
-class Item;
-class Root;
-
-typedef QMap<QString, QVariant> MetadataMap;
-
-namespace internal
-{
-
-class ItemImpl;
-
-class ItemBase : public std::enable_shared_from_this<ItemBase>
-{
-public:
-    ItemBase(QString const& identity, ItemType type);
-    virtual ~ItemBase();
-    ItemBase(ItemBase const&) = delete;
-    ItemBase& operator=(ItemBase const&) = delete;
-
-    QString native_identity() const;
-    ItemType type() const;
-    std::shared_ptr<Root> root() const;
-
-    virtual QString name() const = 0;
-    virtual QString etag() const = 0;
-    virtual QVariantMap metadata() const = 0;
-    virtual QDateTime last_modified_time() const = 0;
-
-    virtual QFuture<std::shared_ptr<Item>> copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name) = 0;
-    virtual QFuture<std::shared_ptr<Item>> move(std::shared_ptr<Folder> const& new_parent, QString const& new_name) = 0;
-    virtual QFuture<QVector<std::shared_ptr<Folder>>> parents() const = 0;
-    virtual QVector<QString> parent_ids() const = 0;
-    virtual QFuture<void> delete_item() = 0;
-
-    virtual QDateTime creation_time() const = 0;
-    virtual MetadataMap native_metadata() const = 0;
-
-    virtual bool equal_to(ItemBase const& other) const noexcept = 0;
-
-    void set_root(std::weak_ptr<Root> p);
-    void set_public_instance(std::weak_ptr<Item> p);
-
-protected:
-    std::shared_ptr<Root> get_root() const noexcept;
-    void throw_if_destroyed(QString const& method) const;
-
-    const QString identity_;
-    const ItemType type_;
-    std::weak_ptr<Root> root_;
-    std::weak_ptr<Item> public_instance_;
-    bool deleted_ = false;
-
-    friend class ItemImpl;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/RootBase.h'
--- include/unity/storage/qt/client/internal/RootBase.h	2016-07-20 06:58:30 +0000
+++ include/unity/storage/qt/client/internal/RootBase.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/Root.h>
-#include <unity/storage/qt/client/internal/FolderBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class CopyHandler;
-class ItemImpl;
-class LookupHandler;
-class MetadataHandler;
-
-}  // namespace remote_client
-
-class RootBase : public virtual FolderBase
-{
-public:
-    RootBase(QString const& identity, std::weak_ptr<Account> const& account);
-
-    std::shared_ptr<Account> account() const;
-    virtual QFuture<int64_t> free_space_bytes() const = 0;
-    virtual QFuture<int64_t> used_space_bytes() const = 0;
-    virtual QFuture<Item::SPtr> get(QString native_identity) const = 0;
-
-    static std::shared_ptr<Root> make_root(QString const& identity, std::weak_ptr<Account> const& account);
-
-protected:
-    std::weak_ptr<Account> account_;
-
-    friend class remote_client::CopyHandler;
-    friend class remote_client::ItemImpl;  // TODO: probably no longer needed
-    friend class remote_client::LookupHandler;
-    friend class remote_client::MetadataHandler;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/RuntimeBase.h'
--- include/unity/storage/qt/client/internal/RuntimeBase.h	2016-08-11 23:55:40 +0000
+++ include/unity/storage/qt/client/internal/RuntimeBase.h	1970-01-01 00:00:00 +0000
@@ -1,74 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QVector>
-
-#include <memory>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Account;
-class Runtime;
-
-namespace internal
-{
-
-class AccountBase;
-
-class RuntimeBase : public QObject
-{
-public:
-    RuntimeBase() = default;
-    virtual ~RuntimeBase() = default;
-    RuntimeBase(RuntimeBase const&) = delete;
-    RuntimeBase& operator=(RuntimeBase const&) = delete;
-
-    virtual void shutdown() = 0;
-    virtual QFuture<QVector<std::shared_ptr<Account>>> accounts() = 0;
-    virtual std::shared_ptr<Account> make_test_account(QString const& bus_name,
-                                                       QString const& object_path) = 0;
-
-    void set_public_instance(std::weak_ptr<Runtime> p);
-
-protected:
-    bool destroyed_ = false;
-    QVector<std::shared_ptr<Account>> accounts_;
-    std::weak_ptr<Runtime> public_instance_;      // Immutable once set
-
-    friend class unity::storage::qt::client::internal::AccountBase;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/UploaderBase.h'
--- include/unity/storage/qt/client/internal/UploaderBase.h	2016-08-03 03:20:39 +0000
+++ include/unity/storage/qt/client/internal/UploaderBase.h	1970-01-01 00:00:00 +0000
@@ -1,69 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/common.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#include <QFuture>
-#pragma GCC diagnostic pop
-
-#include <memory>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class File;
-
-namespace internal
-{
-
-class UploaderBase : public QObject
-{
-public:
-    UploaderBase(ConflictPolicy policy, int64_t size);
-    UploaderBase(UploaderBase&) = delete;
-    UploaderBase& operator=(UploaderBase const&) = delete;
-
-    virtual std::shared_ptr<QLocalSocket> socket() const = 0;
-    virtual QFuture<std::shared_ptr<File>> finish_upload() = 0;
-    virtual QFuture<void> cancel() noexcept = 0;
-
-    int64_t size() const;
-
-protected:
-    ConflictPolicy policy_;
-    int64_t size_;
-};
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed directory 'include/unity/storage/qt/client/internal/local_client'
=== removed file 'include/unity/storage/qt/client/internal/local_client/AccountImpl.h'
--- include/unity/storage/qt/client/internal/local_client/AccountImpl.h	2016-07-13 04:19:12 +0000
+++ include/unity/storage/qt/client/internal/local_client/AccountImpl.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/AccountBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class AccountImpl : public virtual AccountBase
-{
-public:
-    AccountImpl(std::weak_ptr<Runtime> const& runtime,
-                QString const& owner,
-                QString const& owner_id,
-                QString const& description);
-
-    virtual QString owner() const override;
-    virtual QString owner_id() const override;
-    virtual QString description() const override;
-    virtual QFuture<QVector<std::shared_ptr<Root>>> roots() override;
-
-private:
-    QString owner_;                           // Immutable
-    QString owner_id_;                        // Immutable
-    QString description_;                     // Immutable
-    QVector<std::shared_ptr<Root>> roots_;    // Immutable
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h	2016-07-18 05:14:09 +0000
+++ include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,120 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/DownloaderBase.h>
-
-#include <QFile>
-#include <QThread>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class DownloadWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    DownloadWorker(int write_fd,
-                   QString const& filename,
-                   QFutureInterface<void>& qf,
-                   QFutureInterface<void>& worker_initialized);
-    void start_downloading() noexcept;
-
-public Q_SLOTS:
-    void do_finish();
-    void do_cancel();
-
-private Q_SLOTS:
-    void on_bytes_written(qint64 bytes);
-    void on_disconnected();
-    void on_error();
-
-private:
-    void read_and_write_chunk();
-    void handle_error(QString const& msg, int error_code);
-
-    enum State { in_progress, finalized, cancelled, error };
-
-    State state_ = in_progress;
-    int write_fd_;
-    std::shared_ptr<QLocalSocket> write_socket_;
-    QString filename_;
-    std::unique_ptr<QFile> input_file_;
-    QFutureInterface<void>& qf_;
-    QFutureInterface<void>& worker_initialized_;
-    qint64 bytes_to_write_;
-    QString error_msg_;
-    int error_code_ = 0;
-};
-
-class DownloadThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    DownloadThread(DownloadWorker* worker);
-    virtual void run() override;
-
-private:
-    DownloadWorker* worker_;
-};
-
-class DownloaderImpl : public DownloaderBase
-{
-    Q_OBJECT
-
-public:
-    DownloaderImpl(std::weak_ptr<File> file);
-    virtual ~DownloaderImpl();
-
-    std::shared_ptr<File> file() const override;
-    std::shared_ptr<QLocalSocket> socket() const override;
-    QFuture<void> finish_download() override;
-    QFuture<void> cancel() noexcept override;
-
-Q_SIGNALS:
-    void do_finish();
-    void do_cancel();
-
-private:
-    std::shared_ptr<QLocalSocket> read_socket_;
-    QFutureInterface<void> qf_;
-    std::unique_ptr<DownloadThread> download_thread_;
-    std::unique_ptr<DownloadWorker> worker_;
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/FileImpl.h'
--- include/unity/storage/qt/client/internal/local_client/FileImpl.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/internal/local_client/FileImpl.h	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/FileBase.h>
-#include <unity/storage/qt/client/internal/local_client/ItemImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class FileImpl : public virtual FileBase, public virtual ItemImpl
-{
-public:
-    FileImpl(QString const& identity);
-
-    virtual QString name() const override;
-    virtual int64_t size() const override;
-    virtual QFuture<std::shared_ptr<Uploader>> create_uploader(ConflictPolicy policy, int64_t size) override;
-    virtual QFuture<std::shared_ptr<Downloader>> create_downloader() override;
-
-    static std::shared_ptr<File> make_file(QString const& identity, std::weak_ptr<Root> root);
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/FolderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/FolderImpl.h	2016-07-25 03:45:41 +0000
+++ include/unity/storage/qt/client/internal/local_client/FolderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/FolderBase.h>
-#include <unity/storage/qt/client/internal/local_client/ItemImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class FolderImpl : public virtual FolderBase, public virtual ItemImpl
-{
-public:
-    FolderImpl(QString const& identity);
-    FolderImpl(QString const& identity, ItemType type);
-
-    virtual QString name() const override;
-    QFuture<QVector<std::shared_ptr<Item>>> list() const override;
-    QFuture<QVector<std::shared_ptr<Item>>> lookup(QString const& name) const override;
-    QFuture<std::shared_ptr<Folder>> create_folder(QString const& name) override;
-    QFuture<std::shared_ptr<Uploader>> create_file(QString const& name, int64_t size) override;
-
-    static std::shared_ptr<Folder> make_folder(QString const& identity, std::weak_ptr<Root> root);
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/ItemImpl.h'
--- include/unity/storage/qt/client/internal/local_client/ItemImpl.h	2016-08-02 04:29:06 +0000
+++ include/unity/storage/qt/client/internal/local_client/ItemImpl.h	1970-01-01 00:00:00 +0000
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/common.h>
-#include <unity/storage/qt/client/Exceptions.h>
-#include <unity/storage/qt/client/internal/ItemBase.h>
-#include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
-
-#include <mutex>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-
-class MetadataImpl;
-
-namespace local_client
-{
-
-class ItemImpl : public virtual ItemBase
-{
-public:
-    ItemImpl(QString const& identity, ItemType type);
-    virtual ~ItemImpl();
-
-    virtual QString etag() const override;
-    virtual QVariantMap metadata() const override;
-    virtual QDateTime last_modified_time() const override;
-    virtual QFuture<std::shared_ptr<Item>> copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name) override;
-    virtual QFuture<std::shared_ptr<Item>> move(std::shared_ptr<Folder> const& new_parent, QString const& new_name) override;
-    virtual QFuture<QVector<std::shared_ptr<Folder>>> parents() const override;
-    virtual QVector<QString> parent_ids() const override;
-    virtual QFuture<void> delete_item() override;
-
-    virtual QDateTime creation_time() const override;
-    virtual MetadataMap native_metadata() const override;
-
-    virtual bool equal_to(ItemBase const& other) const noexcept override;
-
-    void set_timestamps() noexcept;
-    bool has_conflict() const noexcept;
-
-protected:
-    static boost::filesystem::path sanitize(QString const& name, QString const& method);
-    static bool is_reserved_path(boost::filesystem::path const& path) noexcept;
-
-    QString name_;
-    QString etag_;
-    QDateTime modified_time_;
-    QVariantMap metadata_;
-    std::recursive_mutex mutable mutex_;
-
-private:
-    static void copy_recursively(boost::filesystem::path const& source, boost::filesystem::path const& target);
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/RootImpl.h'
--- include/unity/storage/qt/client/internal/local_client/RootImpl.h	2016-07-12 02:22:05 +0000
+++ include/unity/storage/qt/client/internal/local_client/RootImpl.h	1970-01-01 00:00:00 +0000
@@ -1,59 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/RootBase.h>
-#include <unity/storage/qt/client/internal/local_client/FolderImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class RootImpl : public virtual RootBase, public virtual FolderImpl
-{
-public:
-    RootImpl(QString const& identity, std::weak_ptr<Account> const& account);
-
-    virtual QString name() const override;
-    virtual QFuture<QVector<std::shared_ptr<Folder>>> parents() const override;
-    virtual QVector<QString> parent_ids() const override;
-    virtual QFuture<void> delete_item() override;
-
-    virtual QFuture<int64_t> free_space_bytes() const override;
-    virtual QFuture<int64_t> used_space_bytes() const override;
-    virtual QFuture<Item::SPtr> get(QString native_identity) const override;
-
-    static std::shared_ptr<Root> make_root(QString const& identity, std::weak_ptr<Account> const& account);
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h'
--- include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h	2016-08-11 23:55:40 +0000
+++ include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/RuntimeBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-class RuntimeImpl : public virtual RuntimeBase
-{
-public:
-    RuntimeImpl();
-    virtual ~RuntimeImpl();
-
-    virtual void shutdown() override;
-    virtual QFuture<QVector<std::shared_ptr<Account>>> accounts() override;
-    virtual std::shared_ptr<Account> make_test_account(QString const& bus_name,
-                                                       QString const& object_path) override;
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/UploaderImpl.h'
--- include/unity/storage/qt/client/internal/local_client/UploaderImpl.h	2016-07-29 05:56:42 +0000
+++ include/unity/storage/qt/client/internal/local_client/UploaderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,141 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/UploaderBase.h>
-
-#include <QFile>
-#include <QFutureInterface>
-#include <QThread>
-#include <unity/util/ResourcePtr.h>
-
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class File;
-class Root;
-
-namespace internal
-{
-namespace local_client
-{
-
-class UploadWorker : public QObject
-{
-    Q_OBJECT
-
-public:
-    UploadWorker(int read_fd,
-                 std::weak_ptr<File> file,
-                 int64_t size,
-                 QString const& path,
-                 ConflictPolicy policy,
-                 std::weak_ptr<Root> root,
-                 QFutureInterface<std::shared_ptr<File>>& qf,
-                 QFutureInterface<void>& worker_initialized);
-    virtual ~UploadWorker();
-
-    void start_uploading() noexcept;
-
-public Q_SLOTS:
-    void do_finish();
-    void do_cancel();
-
-private Q_SLOTS:
-    void on_bytes_ready();
-    void on_read_channel_finished();
-
-private:
-    void read_and_write_chunk();
-    void finalize();
-    void handle_error(QString const& msg, int error_code);
-
-    enum State { in_progress, finalized, cancelled, error };
-
-    State state_ = in_progress;
-    int read_fd_;
-    std::shared_ptr<QLocalSocket> read_socket_;
-    std::weak_ptr<File> file_;
-    int64_t size_;
-    int64_t bytes_read_;
-    QString path_;
-    std::weak_ptr<Root> root_;
-    std::unique_ptr<QFile> output_file_;
-    unity::util::ResourcePtr<int, std::function<void(int)>> tmp_fd_;
-    ConflictPolicy policy_;
-    QFutureInterface<std::shared_ptr<File>>& qf_;
-    QFutureInterface<void>& worker_initialized_;
-    QString error_msg_;
-    int error_code_ = 0;
-    bool use_linkat_ = true;
-};
-
-class UploadThread : public QThread
-{
-    Q_OBJECT
-
-public:
-    UploadThread(UploadWorker* worker);
-    virtual void run() override;
-
-private:
-    UploadWorker* worker_;
-};
-
-class UploaderImpl : public UploaderBase
-{
-    Q_OBJECT
-
-public:
-    UploaderImpl(std::weak_ptr<File> file,
-                 int64_t size,
-                 QString const& path,
-                 ConflictPolicy policy,
-                 std::weak_ptr<Root> root);
-    virtual ~UploaderImpl();
-
-    virtual std::shared_ptr<QLocalSocket> socket() const override;
-    virtual QFuture<std::shared_ptr<File>> finish_upload() override;
-    virtual QFuture<void> cancel() noexcept override;
-
-Q_SIGNALS:
-    void do_finish();
-    void do_cancel();
-
-private:
-    std::shared_ptr<QLocalSocket> write_socket_;
-    QFutureInterface<std::shared_ptr<File>> qf_;
-    std::unique_ptr<UploadThread> upload_thread_;
-    std::unique_ptr<UploadWorker> worker_;
-};
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/boost_filesystem.h'
--- include/unity/storage/qt/client/internal/local_client/boost_filesystem.h	2016-07-27 02:19:17 +0000
+++ include/unity/storage/qt/client/internal/local_client/boost_filesystem.h	1970-01-01 00:00:00 +0000
@@ -1,29 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <boost/version.hpp>
-
-#if BOOST_VERSION < 105600
-    #define BOOST_NO_CXX11_SCOPED_ENUMS
-    #include <boost/filesystem.hpp>
-    #undef BOOST_NO_CXX11_SCOPED_ENUMS
-#else
-    #include <boost/filesystem.hpp>
-#endif

=== removed file 'include/unity/storage/qt/client/internal/local_client/storage_exception.h'
--- include/unity/storage/qt/client/internal/local_client/storage_exception.h	2016-08-02 05:27:00 +0000
+++ include/unity/storage/qt/client/internal/local_client/storage_exception.h	1970-01-01 00:00:00 +0000
@@ -1,94 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/Exceptions.h>
-#include <unity/storage/qt/client/internal/local_client/boost_filesystem.h>
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wcast-align"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QFutureInterface>
-
-class QString;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace local_client
-{
-
-void throw_storage_exception(QString const& method,
-                             std::exception_ptr ep) __attribute__ ((noreturn));
-
-void throw_storage_exception(QString const& method,
-                             std::exception_ptr ep,
-                             QString const& key) __attribute__ ((noreturn));
-
-template<typename T>
-QFuture<T> make_exceptional_future(QString const& method, std::exception_ptr ep)
-{
-    try
-    {
-        throw_storage_exception(method, ep);
-    }
-    catch (StorageException const& e)
-    {
-        QFutureInterface<T> qf;
-        qf.reportException(e);
-        qf.reportFinished();
-        return qf.future();
-    }
-    abort();  // Impossible.  // LCOV_EXCL_LINE
-}
-
-template<typename T>
-QFuture<T> make_exceptional_future(QString const& method,
-                                   std::exception_ptr ep,
-                                   QString const& key)
-{
-    try
-    {
-        throw_storage_exception(method, ep, key);
-    }
-    catch (StorageException const& e)
-    {
-        QFutureInterface<T> qf;
-        qf.reportException(e);
-        qf.reportFinished();
-        return qf.future();
-    }
-    abort();  // Impossible.  // LCOV_EXCL_LINE
-}
-
-}  // namespace local_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/local_client/tmpfile_prefix.h'
--- include/unity/storage/qt/client/internal/local_client/tmpfile_prefix.h	2016-08-02 05:27:00 +0000
+++ include/unity/storage/qt/client/internal/local_client/tmpfile_prefix.h	1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#define TMPFILE_PREFIX ".storage-framework-"

=== removed file 'include/unity/storage/qt/client/internal/make_future.h'
--- include/unity/storage/qt/client/internal/make_future.h	2016-08-26 04:45:56 +0000
+++ include/unity/storage/qt/client/internal/make_future.h	1970-01-01 00:00:00 +0000
@@ -1,85 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wcast-align"
-#include <QFuture>
-#pragma GCC diagnostic pop
-#include <QFutureInterface>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-
-template<typename T>
-QFuture<T>
-__attribute__ ((warn_unused_result))
-make_ready_future(T const& val)
-{
-    QFutureInterface<T> qf;
-    qf.reportResult(val);
-    qf.reportFinished();
-    return qf.future();
-}
-
-template<typename T = void>
-QFuture<T>
-__attribute__ ((warn_unused_result))
-make_ready_future()
-{
-    QFutureInterface<void> qf;
-    return make_ready_future(qf);
-}
-
-template<typename E>
-QFuture<void>
-__attribute__
-((warn_unused_result)) make_exceptional_future(E const& ex)
-{
-    QFutureInterface<void> qf;
-    qf.reportException(ex);
-    qf.reportFinished();
-    return qf.future();
-}
-
-template<typename T, typename E>
-QFuture<T>
-__attribute__ ((warn_unused_result))
-make_exceptional_future(E const& ex)
-{
-    QFutureInterface<T> qf;
-    qf.reportException(ex);
-    qf.reportFinished();
-    return qf.future();
-}
-
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed directory 'include/unity/storage/qt/client/internal/remote_client'
=== removed file 'include/unity/storage/qt/client/internal/remote_client/AccountImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/AccountImpl.h	2016-08-11 07:34:49 +0000
+++ include/unity/storage/qt/client/internal/remote_client/AccountImpl.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/AccountBase.h>
-
-class ProviderInterface;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class AccountImpl : public QObject, public virtual AccountBase
-{
-public:
-    AccountImpl(std::weak_ptr<Runtime> const& runtime,
-                QString const& bus_name,
-                QString const& object_path,
-                QString const& owner,
-                QString const& owner_id,
-                QString const& description);
-
-    virtual QString owner() const override;
-    virtual QString owner_id() const override;
-    virtual QString description() const override;
-    virtual QFuture<QVector<std::shared_ptr<Root>>> roots() override;
-
-    std::shared_ptr<ProviderInterface> provider() const noexcept;
-
-private:
-    QString owner_;
-    QString owner_id_;
-    QString description_;
-    QVector<std::shared_ptr<Root>> roots_;
-    std::shared_ptr<ProviderInterface> provider_;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/DownloaderImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/DownloaderImpl.h	2016-07-15 03:34:00 +0000
+++ include/unity/storage/qt/client/internal/remote_client/DownloaderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/DownloaderBase.h>
-
-#include <QDBusUnixFileDescriptor>
-
-class ProviderInterface;
-class QLocalSocket;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Downloader;
-
-namespace internal
-{
-namespace remote_client
-{
-
-class DownloaderImpl : public DownloaderBase
-{
-public:
-    DownloaderImpl(QString const& download_id,
-                   QDBusUnixFileDescriptor fd,
-                   std::shared_ptr<File> const& file,
-                   std::shared_ptr<ProviderInterface> const& provider);
-    virtual ~DownloaderImpl();
-
-    virtual std::shared_ptr<File> file() const override;
-    virtual std::shared_ptr<QLocalSocket> socket() const override;
-    virtual QFuture<void> finish_download() override;
-    virtual QFuture<void> cancel() noexcept override;
-
-    static std::shared_ptr<Downloader> make_downloader(QString const& upload_id,
-                                                       QDBusUnixFileDescriptor fd,
-                                                       std::shared_ptr<File> const& file,
-                                                       std::shared_ptr<ProviderInterface> const& provider);
-
-private:
-    QString download_id_;
-    QDBusUnixFileDescriptor fd_;
-    std::shared_ptr<File> file_;
-    std::shared_ptr<ProviderInterface> provider_;
-    std::shared_ptr<QLocalSocket> read_socket_;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/FileImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/FileImpl.h	2016-07-21 12:48:40 +0000
+++ include/unity/storage/qt/client/internal/remote_client/FileImpl.h	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/FileBase.h>
-#include <unity/storage/qt/client/internal/remote_client/ItemImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace internal
-{
-
-struct ItemMetadata;
-
-}  // namespace internal
-
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class FileImpl : public virtual FileBase, public virtual ItemImpl
-{
-public:
-    FileImpl(storage::internal::ItemMetadata const& md);
-
-    virtual int64_t size() const override;
-    virtual QFuture<std::shared_ptr<Uploader>> create_uploader(ConflictPolicy policy, int64_t size) override;
-    virtual QFuture<std::shared_ptr<Downloader>> create_downloader() override;
-
-    static std::shared_ptr<File> make_file(storage::internal::ItemMetadata const& md, std::weak_ptr<Root> root);
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/FolderImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/FolderImpl.h	2016-07-14 00:17:14 +0000
+++ include/unity/storage/qt/client/internal/remote_client/FolderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,56 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/FolderBase.h>
-#include <unity/storage/qt/client/internal/remote_client/ItemImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class FolderImpl : public virtual FolderBase, public virtual ItemImpl
-{
-public:
-    FolderImpl(storage::internal::ItemMetadata const& md);
-    FolderImpl(storage::internal::ItemMetadata const& md, ItemType type);
-
-    QFuture<QVector<std::shared_ptr<Item>>> list() const override;
-    QFuture<QVector<std::shared_ptr<Item>>> lookup(QString const& name) const override;
-    QFuture<std::shared_ptr<Folder>> create_folder(QString const& name) override;
-    QFuture<std::shared_ptr<Uploader>> create_file(QString const& name, int64_t size) override;
-
-    static std::shared_ptr<Folder> make_folder(storage::internal::ItemMetadata const& md, std::weak_ptr<Root> root);
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/Handler.h'
--- include/unity/storage/qt/client/internal/remote_client/Handler.h	2016-08-26 04:45:56 +0000
+++ include/unity/storage/qt/client/internal/remote_client/Handler.h	1970-01-01 00:00:00 +0000
@@ -1,134 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/Exceptions.h>
-#include <unity/storage/qt/client/internal/make_future.h>
-#include <unity/storage/qt/client/internal/remote_client/dbusmarshal.h>
-#include <unity/storage/qt/client/internal/remote_client/HandlerBase.h>
-
-#include <QDBusPendingReply>
-
-#include <cassert>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-template<typename T>
-class Handler : public HandlerBase
-{
-public:
-    template<typename ... DBusArgs>
-    Handler(QObject* parent,
-            QDBusPendingReply<DBusArgs...>& reply,
-            std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure);
-
-    QFuture<T> future();
-
-private:
-    QFutureInterface<T> qf_;
-};
-
-// TODO: HACK: The reply argument really should be passed by const reference, which also
-//             would make the explicit conversion of the call to QDBusPendingReply<QDBusArgs...>
-//             unnecessary. But this doesn't work with gcc 4.9: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
-//             Once we get rid of Vivid, this should be changed back to
-//
-//             Handler<T>::Handler(QObject* parent,
-//                                 QDBusPendingReply<DBusArgs...> const& reply,
-//                                 std::function<void(decltype(reply) const&, QFutureInterface<T>&)> closure)
-
-template<typename T>
-template<typename ... DBusArgs>
-Handler<T>::Handler(QObject* parent,
-                    QDBusPendingReply<DBusArgs...>& reply,
-                    std::function<void(decltype(reply)&, QFutureInterface<T>&)> closure)
-    : HandlerBase(parent,
-                  reply,
-                  [this, closure](QDBusPendingCallWatcher& call)
-                      {
-                          if (call.isError())
-                          {
-                              try
-                              {
-                                  auto ep = unmarshal_exception(call);
-                                  std::rethrow_exception(ep);
-                              }
-                              // We catch some exceptions that are "surprising" so we can log those.
-                              catch (LocalCommsException const& e)
-                              {
-                                  qCritical() << "provider exception:" << e.what();
-                                  qf_.reportException(e);
-                                  qf_.reportFinished();
-                              }
-                              catch (RemoteCommsException const& e)
-                              {
-                                  qCritical() << "provider exception:" << e.what();
-                                  qf_.reportException(e);
-                                  qf_.reportFinished();
-                              }
-                              catch (ResourceException const& e)
-                              {
-                                  qCritical() << "provider exception:" << e.what();
-                                  qf_.reportException(e);
-                                  qf_.reportFinished();
-                              }
-                              catch (StorageException const& e)
-                              {
-                                  qf_.reportException(e);
-                                  qf_.reportFinished();
-                              }
-                              // LCOV_EXCL_START
-                              catch (...)
-                              {
-                                  abort();  // Impossible.
-                              }
-                              // LCOV_EXCL_STOP
-                              return;
-                          }
-                          // TODO: See HACK above. Should just be closure(call, qf_);
-                          QDBusPendingReply<DBusArgs...> r = call;
-                          closure(r, qf_);
-                      })
-{
-    qf_.reportStarted();
-}
-
-template<typename T>
-QFuture<T> Handler<T>::future()
-{
-    return qf_.future();
-}
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/HandlerBase.h'
--- include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	2016-11-01 03:06:07 +0000
+++ include/unity/storage/qt/client/internal/remote_client/HandlerBase.h	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-align"
-#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
-#pragma GCC diagnostic ignored "-Wswitch-default"
-#include <QDBusPendingCallWatcher>
-#pragma GCC diagnostic pop
-#include <QObject>
-
-#include <functional>
-
-class QDBusPendingCall;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class HandlerBase : public QObject
-{
-    Q_OBJECT
-
-public:
-    // TODO: HACK: gcc 4.9 bug: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=60420
-    //             Once we get rid of Vivid, this should be changed back to
-    //
-    //             HandlerBase(QObject* parent,
-    //                         QDBusPendingCall const& call,
-    //                         std::function<void(QDBusPendingCallWatcher const&)> const& closure);
-    HandlerBase(QObject* parent,
-                QDBusPendingCall& call,
-                std::function<void(QDBusPendingCallWatcher&)> const& closure);
-
-public Q_SLOTS:
-    void finished(QDBusPendingCallWatcher* call);
-
-protected:
-    QDBusPendingCallWatcher watcher_;
-
-private:
-    std::function<void(QDBusPendingCallWatcher&)> closure_;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/ItemImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/ItemImpl.h	2016-08-02 04:29:06 +0000
+++ include/unity/storage/qt/client/internal/remote_client/ItemImpl.h	1970-01-01 00:00:00 +0000
@@ -1,79 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/internal/ItemMetadata.h>
-#include <unity/storage/qt/client/Exceptions.h>
-#include <unity/storage/qt/client/internal/ItemBase.h>
-
-#include <memory>
-
-class ProviderInterface;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class DeleteHandler;
-
-class ItemImpl : public virtual ItemBase, public virtual QObject
-{
-public:
-    ItemImpl(storage::internal::ItemMetadata const& md, ItemType type);
-
-    virtual QString name() const override;
-    virtual QString etag() const override;
-    virtual QVariantMap metadata() const override;
-    virtual QDateTime last_modified_time() const override;
-    virtual QFuture<std::shared_ptr<Item>> copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name) override;
-    virtual QFuture<std::shared_ptr<Item>> move(std::shared_ptr<Folder> const& new_parent, QString const& new_name) override;
-    virtual QFuture<QVector<std::shared_ptr<Folder>>> parents() const override;
-    virtual QVector<QString> parent_ids() const override;
-    virtual QFuture<void> delete_item() override;
-
-    virtual QDateTime creation_time() const override;
-    virtual MetadataMap native_metadata() const override;
-
-    virtual bool equal_to(ItemBase const& other) const noexcept override;
-
-    std::shared_ptr<ProviderInterface> provider() const noexcept;
-
-    static std::shared_ptr<Item> make_item(storage::internal::ItemMetadata const& md, std::weak_ptr<Root> root);
-
-protected:
-    storage::internal::ItemMetadata md_;
-
-    friend class DeleteHandler;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/RootImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/RootImpl.h	2016-07-13 04:19:12 +0000
+++ include/unity/storage/qt/client/internal/remote_client/RootImpl.h	1970-01-01 00:00:00 +0000
@@ -1,68 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/RootBase.h>
-#include <unity/storage/qt/client/internal/remote_client/FolderImpl.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace internal
-{
-
-struct ItemMetadata;
-
-}  // namespace internal
-
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-class RootImpl : public virtual RootBase, public virtual FolderImpl
-{
-public:
-    RootImpl(storage::internal::ItemMetadata const& md, std::weak_ptr<Account> const& account);
-
-    virtual QFuture<QVector<std::shared_ptr<Folder>>> parents() const override;
-    virtual QVector<QString> parent_ids() const override;
-    virtual QFuture<void> delete_item() override;
-
-    virtual QFuture<int64_t> free_space_bytes() const override;
-    virtual QFuture<int64_t> used_space_bytes() const override;
-    virtual QFuture<Item::SPtr> get(QString native_identity) const override;
-
-    static std::shared_ptr<Root> make_root(storage::internal::ItemMetadata const& md,
-                                           std::weak_ptr<Account> const& account);
-
-    friend class FolderImpl;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h	2016-08-11 23:55:40 +0000
+++ include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h	1970-01-01 00:00:00 +0000
@@ -1,81 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/RuntimeBase.h>
-
-#include <OnlineAccounts/Manager>
-#include <QDBusConnection>
-#include <QTimer>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Account;
-
-namespace internal
-{
-namespace remote_client
-{
-
-class RuntimeImpl : public RuntimeBase
-{
-    Q_OBJECT
-
-public:
-    RuntimeImpl(QDBusConnection const& bus);
-    virtual ~RuntimeImpl();
-
-    virtual void shutdown() override;
-    virtual QFuture<QVector<std::shared_ptr<Account>>> accounts() override;
-    virtual std::shared_ptr<Account> make_test_account(QString const& bus_name,
-                                                       QString const& object_path) override;
-
-    QDBusConnection& connection();
-
-private Q_SLOTS:
-    virtual void manager_ready();
-    virtual void timeout();
-
-private:
-    std::shared_ptr<Account> make_account(QString const& bus_name,
-                                          QString const& object_path,
-                                          QString const& owner,
-                                          QString const& owner_id,
-                                          QString const& description);
-
-    QDBusConnection conn_;
-    std::unique_ptr<OnlineAccounts::Manager> manager_;  // TODO: Hack until we can use the registry
-    QTimer timer_;
-    QVector<std::shared_ptr<Account>> accounts_;
-    QFutureInterface<QVector<std::shared_ptr<Account>>> qf_;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h'
--- include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h	2016-08-25 23:12:45 +0000
+++ include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h	1970-01-01 00:00:00 +0000
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <unity/storage/qt/client/internal/UploaderBase.h>
-
-#include <QDBusUnixFileDescriptor>
-
-class QLocalSocket;
-class ProviderInterface;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-class Root;
-class Uploader;
-
-namespace internal
-{
-namespace remote_client
-{
-
-class UploaderImpl : public UploaderBase
-{
-public:
-    UploaderImpl(QString const& upload_id,
-                 QDBusUnixFileDescriptor fd,
-                 int64_t size,
-                 QString const& old_etag,
-                 std::weak_ptr<Root> root,
-                 std::shared_ptr<ProviderInterface> const& provider);
-    ~UploaderImpl();
-
-    virtual std::shared_ptr<QLocalSocket> socket() const override;
-    virtual QFuture<std::shared_ptr<File>> finish_upload() override;
-    virtual QFuture<void> cancel() noexcept override;
-
-    static std::shared_ptr<Uploader> make_uploader(QString const& upload_id,
-                                                   QDBusUnixFileDescriptor fd,
-                                                   int64_t size,
-                                                   QString const& old_etag,
-                                                   std::weak_ptr<Root> root,
-                                                   std::shared_ptr<ProviderInterface> const& provider);
-
-private:
-    enum State { uploading, finalized };
-
-    QString upload_id_;
-    QDBusUnixFileDescriptor fd_;
-    QString old_etag_;
-    std::shared_ptr<Root> root_;
-    std::shared_ptr<ProviderInterface> provider_;
-    std::shared_ptr<QLocalSocket> write_socket_;
-    State state_;
-};
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h'
--- include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h	2016-08-11 06:53:25 +0000
+++ include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h	1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <exception>
-
-class QDBusPendingCallWatcher;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-std::exception_ptr unmarshal_exception(QDBusPendingCallWatcher const& call);
-
-}  // namespace remote_client
-}  // namespace internal
-}  // client
-}  // qt
-}  // storage
-}  // unity

=== removed file 'include/unity/storage/qt/client/internal/remote_client/validate.h'
--- include/unity/storage/qt/client/internal/remote_client/validate.h	2016-08-09 02:25:13 +0000
+++ include/unity/storage/qt/client/internal/remote_client/validate.h	1970-01-01 00:00:00 +0000
@@ -1,51 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#pragma once
-
-#include <QString>
-
-namespace unity
-{
-namespace storage
-{
-
-namespace internal
-{
-
-class ItemMetadata;
-
-}  // namespace internal
-
-namespace qt
-{
-namespace client
-{
-namespace internal
-{
-namespace remote_client
-{
-
-void validate(QString const& method, unity::storage::internal::ItemMetadata const& md);
-
-}  // namespace remote_client
-}  // namespace internal
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== modified file 'plugins/Ubuntu/StorageFramework/CMakeLists.txt'
--- plugins/Ubuntu/StorageFramework/CMakeLists.txt	2016-09-29 11:37:05 +0000
+++ plugins/Ubuntu/StorageFramework/CMakeLists.txt	2017-04-06 08:34:29 +0000
@@ -9,7 +9,8 @@
 )
 
 target_link_libraries(storage-framework-qml
-  storage-framework-qt-client-v2
+  storage-framework-qt-client
+  Qt5::DBus
   Qt5::Qml
 )
 

=== modified file 'src/internal/CMakeLists.txt'
--- src/internal/CMakeLists.txt	2016-11-09 03:26:49 +0000
+++ src/internal/CMakeLists.txt	2017-04-06 08:34:29 +0000
@@ -8,7 +8,6 @@
     ${CMAKE_SOURCE_DIR}/include/unity/storage/internal/InactivityTimer.h
 )
 
-
 add_library(storage-framework-common-internal STATIC ${src})
 
 set_target_properties(storage-framework-common-internal PROPERTIES AUTOMOC TRUE)

=== modified file 'src/qt/CMakeLists.txt'
--- src/qt/CMakeLists.txt	2016-11-15 02:05:14 +0000
+++ src/qt/CMakeLists.txt	2017-04-06 08:34:29 +0000
@@ -1,5 +1,3 @@
-add_subdirectory(client)
-
 set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
     CLASSNAME ProviderInterface
     INCLUDE unity/storage/internal/dbusmarshal.h
@@ -23,8 +21,8 @@
     GENERATED TRUE
 )
 
-# Sources for remote client V2 library.
-set(QT_CLIENT_LIB_V2_SRC
+# Sources for client library.
+set(QT_CLIENT_LIB_SRC
     Account.cpp
     AccountsJob.cpp
     Downloader.cpp
@@ -73,29 +71,29 @@
     ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/VoidJobImpl.h
 )
 
-add_library(storage-framework-qt-client-v2 SHARED
-    ${QT_CLIENT_LIB_V2_SRC}
+add_library(storage-framework-qt-client SHARED
+    ${QT_CLIENT_LIB_SRC}
     ${generated_files}
 )
-target_include_directories(storage-framework-qt-client-v2 PRIVATE
+target_include_directories(storage-framework-qt-client PRIVATE
     ${Qt5DBus_INCLUDE_DIRS}
     ${Qt5Network_INCLUDE_DIRS}
 )
-set_target_properties(storage-framework-qt-client-v2 PROPERTIES
+set_target_properties(storage-framework-qt-client PROPERTIES
     AUTOMOC TRUE
     LINK_FLAGS "-Wl,--no-undefined"
     OUTPUT_NAME "storage-framework-qt-client-${SF_CLIENT_API_VERSION}"
     SOVERSION ${SF_CLIENT_SOVERSION}
     VERSION ${SF_CLIENT_LIBVERSION}
 )
-target_link_libraries(storage-framework-qt-client-v2
+target_link_libraries(storage-framework-qt-client
     storage-framework-common-internal
     Qt5::Core
     Qt5::DBus
     Qt5::Network
 )
 install(
-    TARGETS storage-framework-qt-client-v2
+    TARGETS storage-framework-qt-client
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
 )
 

=== removed directory 'src/qt/client'
=== removed file 'src/qt/client/Account.cpp'
--- src/qt/client/Account.cpp	2016-07-20 06:58:30 +0000
+++ src/qt/client/Account.cpp	1970-01-01 00:00:00 +0000
@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Account.h>
-
-#include <unity/storage/qt/client/internal/AccountBase.h>
-
-#include <cassert>
-
-using namespace std;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-Account::Account(internal::AccountBase* p)
-    : p_(p)
-{
-    assert(p != nullptr);
-}
-
-Account::~Account() = default;
-
-shared_ptr<Runtime> Account::runtime() const
-{
-    return p_->runtime();
-}
-
-QString Account::owner() const
-{
-    return p_->owner();
-}
-
-QString Account::owner_id() const
-{
-    return p_->owner_id();
-}
-
-QString Account::description() const
-{
-    return p_->description();
-}
-
-QFuture<QVector<std::shared_ptr<Root>>> Account::roots() const
-{
-    return p_->roots();
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/CMakeLists.txt'
--- src/qt/client/CMakeLists.txt	2016-10-12 08:08:48 +0000
+++ src/qt/client/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,131 +0,0 @@
-# Create an OBJECT library for the files that are used by both
-# local and remote client libraries, so we don't compile them twice.
-
-add_library(qt-client-lib-common OBJECT
-    Account.cpp
-    Downloader.cpp
-    Exceptions.cpp
-    File.cpp
-    Folder.cpp
-    Item.cpp
-    Root.cpp
-    Runtime.cpp
-    Uploader.cpp
-    internal/AccountBase.cpp
-    internal/DownloaderBase.cpp
-    internal/FileBase.cpp
-    internal/FolderBase.cpp
-    internal/ItemBase.cpp
-    internal/RootBase.cpp
-    internal/RuntimeBase.cpp
-    internal/UploaderBase.cpp
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/DownloaderBase.h
-    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/client/internal/UploaderBase.h
-)
-target_include_directories(qt-client-lib-common PRIVATE
-    ${Qt5DBus_INCLUDE_DIRS}
-    ${Qt5Network_INCLUDE_DIRS}
-)
-set_target_properties(qt-client-lib-common PROPERTIES
-    AUTOMOC TRUE
-    POSITION_INDEPENDENT_CODE TRUE
-)
-
-# We build both local and remote client libraries here instead
-# of creating OBJECT libraries for them because cmake 3.0.2 (which
-# is in the Vivid overlay) cannot handle .moc files in OBJECT libraries.
-
-# Descend into the child directories first. The CMakeLists.txt files
-# there set QT_CLIENT_LIB_LOCAL_SRC and QT_CLIENT_LIB_REMOTE_SRC.
-add_subdirectory(internal)
-
-# Build the local loopback client library
-add_library(storage-framework-qt-local-client SHARED
-    $<TARGET_OBJECTS:qt-client-lib-common>
-    ${QT_CLIENT_LIB_LOCAL_SRC}
-)
-target_include_directories(storage-framework-qt-local-client PRIVATE
-    ${GLIB_DEPS_INCLUDE_DIRS}
-)
-set_target_properties(storage-framework-qt-local-client PROPERTIES
-    AUTOMOC TRUE
-    LINK_FLAGS "-Wl,--no-undefined"
-    OUTPUT_NAME "storage-framework-qt-local-client-1"
-    SOVERSION 0
-    VERSION 0.0.1
-)
-target_link_libraries(storage-framework-qt-local-client
-    storage-framework-common-internal
-    Qt5::Concurrent
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Network
-    ${Boost_LIBRARIES}
-    ${GLIB_DEPS_LIBRARIES}
-)
-install(
-    TARGETS storage-framework-qt-local-client
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-configure_file(
-    storage-framework-qt-local-client.pc.in
-    storage-framework-qt-local-client-1.pc
-)
-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-1.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)
-
-# Build the remote client library
-set_source_files_properties(${CMAKE_SOURCE_DIR}/data/provider.xml PROPERTIES
-    CLASSNAME ProviderInterface
-    INCLUDE unity/storage/internal/dbusmarshal.h
-)
-
-qt5_add_dbus_interface(generated_files
-    ${CMAKE_SOURCE_DIR}/data/provider.xml
-    ProviderInterface
-)
-set_source_files_properties(${generated_files} PROPERTIES
-    COMPILE_FLAGS "-Wno-ctor-dtor-privacy -Wno-missing-field-initializers"
-    GENERATED TRUE
-)
-
-add_library(storage-framework-qt-client SHARED
-    $<TARGET_OBJECTS:qt-client-lib-common>
-    ${QT_CLIENT_LIB_REMOTE_SRC}
-    ${generated_files}
-)
-target_include_directories(storage-framework-qt-client PRIVATE
-    ${GLIB_DEPS_INCLUDE_DIRS}
-    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
-)
-set_target_properties(storage-framework-qt-client PROPERTIES
-    AUTOMOC TRUE
-    LINK_FLAGS "-Wl,--no-undefined"
-    OUTPUT_NAME "storage-framework-qt-client-1"
-    SOVERSION 0
-    VERSION 0.0.1
-)
-target_link_libraries(storage-framework-qt-client
-    storage-framework-common-internal
-    Qt5::Concurrent
-    Qt5::Core
-    Qt5::DBus
-    Qt5::Network
-    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
-)
-install(
-    TARGETS storage-framework-qt-client
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-
-configure_file(
-    storage-framework-qt-client-1.pc.in
-    storage-framework-qt-client-1.pc
-)
-install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-1.pc
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
-)

=== removed file 'src/qt/client/Downloader.cpp'
--- src/qt/client/Downloader.cpp	2016-07-12 02:22:05 +0000
+++ src/qt/client/Downloader.cpp	1970-01-01 00:00:00 +0000
@@ -1,62 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Downloader.h>
-
-#include <unity/storage/qt/client/internal/DownloaderBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-Downloader::Downloader(internal::DownloaderBase* p)
-    : p_(p)
-{
-}
-
-Downloader::~Downloader() = default;
-
-std::shared_ptr<File> Downloader::file() const
-{
-    return p_->file();
-}
-
-std::shared_ptr<QLocalSocket> Downloader::socket() const
-{
-    return p_->socket();
-}
-
-QFuture<void> Downloader::finish_download()
-{
-    return p_->finish_download();
-}
-
-QFuture<void> Downloader::cancel()
-{
-    return p_->cancel();
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/Exceptions.cpp'
--- src/qt/client/Exceptions.cpp	2016-08-05 05:37:23 +0000
+++ src/qt/client/Exceptions.cpp	1970-01-01 00:00:00 +0000
@@ -1,304 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Exceptions.h>
-
-using namespace std;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-StorageException::StorageException(char const* exception_name, QString const& error_message)
-    : what_string_(string(exception_name) + ": " + error_message.toStdString())
-    , error_message_(error_message)
-{
-}
-
-StorageException::~StorageException() = default;
-
-char const* StorageException::what() const noexcept
-{
-    return what_string_.c_str();
-}
-
-QString StorageException::error_message() const
-{
-    return error_message_;
-}
-
-LocalCommsException::LocalCommsException(QString const& error_message)
-    : StorageException("LocalCommsException", error_message)
-{
-}
-
-LocalCommsException::~LocalCommsException() = default;
-
-LocalCommsException* LocalCommsException::clone() const
-{
-    return new LocalCommsException(*this);
-}
-
-void LocalCommsException::raise() const
-{
-    throw *this;
-}
-
-RemoteCommsException::RemoteCommsException(QString const& error_message)
-    : StorageException("RemoteCommsException", error_message)
-{
-}
-
-RemoteCommsException::~RemoteCommsException() = default;
-
-RemoteCommsException* RemoteCommsException::clone() const
-{
-    return new RemoteCommsException(*this);
-}
-
-void RemoteCommsException::raise() const
-{
-    throw *this;
-}
-
-DeletedException::DeletedException(QString const& error_message, QString const& identity)
-    : StorageException("DeletedException", error_message)
-    , identity_(identity)
-{
-}
-
-DeletedException::~DeletedException() = default;
-
-DeletedException* DeletedException::clone() const
-{
-    return new DeletedException(*this);
-}
-
-void DeletedException::raise() const
-{
-    throw *this;
-}
-
-QString DeletedException::native_identity() const
-{
-    return identity_;
-}
-
-RuntimeDestroyedException::RuntimeDestroyedException(QString const& method)
-    : StorageException("RuntimeDestroyedException", method + ": runtime was destroyed previously")
-{
-}
-
-RuntimeDestroyedException::~RuntimeDestroyedException() = default;
-
-RuntimeDestroyedException* RuntimeDestroyedException::clone() const
-{
-    return new RuntimeDestroyedException(*this);
-}
-
-void RuntimeDestroyedException::raise() const
-{
-    throw *this;
-}
-
-NotExistsException::NotExistsException(QString const& error_message, QString const& key)
-    : StorageException("NotExistsException", error_message)
-    , key_(key)
-{
-}
-
-NotExistsException::~NotExistsException() = default;
-
-NotExistsException* NotExistsException::clone() const
-{
-    return new NotExistsException(*this);
-}
-
-void NotExistsException::raise() const
-{
-    throw *this;
-}
-
-QString NotExistsException::key() const
-{
-    return key_;
-}
-
-ExistsException::ExistsException(QString const& error_message, QString const& identity, QString const& name)
-    : StorageException("ExistsException", error_message)
-    , identity_(identity)
-    , name_(name)
-{
-}
-
-ExistsException::~ExistsException() = default;
-
-ExistsException* ExistsException::clone() const
-{
-    return new ExistsException(*this);
-}
-
-void ExistsException::raise() const
-{
-    throw *this;
-}
-
-QString ExistsException::native_identity() const
-{
-    return identity_;
-}
-
-QString ExistsException::name() const
-{
-    return name_;
-}
-
-ConflictException::ConflictException(QString const& error_message)
-    : StorageException("ConflictException", error_message)
-{
-}
-
-ConflictException::~ConflictException() = default;
-
-ConflictException* ConflictException::clone() const
-{
-    return new ConflictException(*this);
-}
-
-void ConflictException::raise() const
-{
-    throw *this;
-}
-
-PermissionException::PermissionException(QString const& error_message)
-    : StorageException("PermissionException", error_message)
-{
-}
-
-PermissionException::~PermissionException() = default;
-
-PermissionException* PermissionException::clone() const
-{
-    return new PermissionException(*this);
-}
-
-void PermissionException::raise() const
-{
-    throw *this;
-}
-
-QuotaException::QuotaException(QString const& error_message)
-    : StorageException("QuotaException", error_message)
-{
-}
-
-QuotaException::~QuotaException() = default;
-
-QuotaException* QuotaException::clone() const
-{
-    return new QuotaException(*this);
-}
-
-void QuotaException::raise() const
-{
-    throw *this;
-}
-
-CancelledException::CancelledException(QString const& error_message)
-    : StorageException("CancelledException", error_message)
-{
-}
-
-CancelledException::~CancelledException() = default;
-
-CancelledException* CancelledException::clone() const
-{
-    return new CancelledException(*this);
-}
-
-void CancelledException::raise() const
-{
-    throw *this;
-}
-
-LogicException::LogicException(QString const& error_message)
-    : StorageException("LogicException", error_message)
-{
-}
-
-LogicException::~LogicException() = default;
-
-LogicException* LogicException::clone() const
-{
-    return new LogicException(*this);
-}
-
-void LogicException::raise() const
-{
-    throw *this;
-}
-
-InvalidArgumentException::InvalidArgumentException(QString const& error_message)
-    : StorageException("InvalidArgumentException", error_message)
-{
-}
-
-InvalidArgumentException::~InvalidArgumentException() = default;
-
-InvalidArgumentException* InvalidArgumentException::clone() const
-{
-    return new InvalidArgumentException(*this);
-}
-
-void InvalidArgumentException::raise() const
-{
-    throw *this;
-}
-
-ResourceException::ResourceException(QString const& error_message, int error_code)
-    : StorageException("ResourceException", error_message)
-    , error_code_(error_code)
-{
-}
-
-ResourceException::~ResourceException() = default;
-
-ResourceException* ResourceException::clone() const
-{
-    return new ResourceException(*this);
-}
-
-void ResourceException::raise() const
-{
-    throw *this;
-}
-
-int ResourceException::error_code() const noexcept
-{
-    return error_code_;
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/File.cpp'
--- src/qt/client/File.cpp	2016-07-14 00:17:14 +0000
+++ src/qt/client/File.cpp	1970-01-01 00:00:00 +0000
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/File.h>
-
-#include <unity/storage/qt/client/internal/FileBase.h>
-
-using namespace std;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-using namespace internal;
-
-File::File(FileBase* p)
-    : Item(p)
-{
-}
-
-File::~File() = default;
-
-int64_t File::size() const
-{
-    return dynamic_cast<FileBase*>(p_.get())->size();
-}
-
-QFuture<shared_ptr<Uploader>> File::create_uploader(ConflictPolicy policy, int64_t size)
-{
-    return dynamic_cast<FileBase*>(p_.get())->create_uploader(policy, size);
-}
-
-QFuture<shared_ptr<Downloader>> File::create_downloader()
-{
-    return dynamic_cast<FileBase*>(p_.get())->create_downloader();
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/Folder.cpp'
--- src/qt/client/Folder.cpp	2016-07-14 00:17:14 +0000
+++ src/qt/client/Folder.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Folder.h>
-
-#include <unity/storage/qt/client/internal/FolderBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-using namespace internal;
-using namespace std;
-
-Folder::Folder(FolderBase* p)
-    : Item(p)
-{
-}
-
-Folder::~Folder() = default;
-
-QFuture<QVector<Item::SPtr>> Folder::list() const
-{
-    return dynamic_cast<FolderBase*>(p_.get())->list();
-}
-
-QFuture<QVector<Item::SPtr>> Folder::lookup(QString const& name) const
-{
-    return dynamic_cast<FolderBase*>(p_.get())->lookup(name);
-}
-
-QFuture<Folder::SPtr> Folder::create_folder(QString const& name)
-{
-    return dynamic_cast<FolderBase*>(p_.get())->create_folder(name);
-}
-
-QFuture<shared_ptr<Uploader>> Folder::create_file(QString const& name, int64_t size)
-{
-    return dynamic_cast<FolderBase*>(p_.get())->create_file(name, size);
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/Item.cpp'
--- src/qt/client/Item.cpp	2016-07-25 03:45:41 +0000
+++ src/qt/client/Item.cpp	1970-01-01 00:00:00 +0000
@@ -1,121 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Item.h>
-
-#include <unity/storage/qt/client/internal/ItemBase.h>
-
-#include <cassert>
-
-using namespace std;
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-Item::Item(internal::ItemBase* p)
-    : p_(p)
-{
-    assert(p != nullptr);
-}
-
-Item::~Item() = default;
-
-QString Item::native_identity() const
-{
-    return p_->native_identity();
-}
-
-QString Item::name() const
-{
-    return p_->name();
-}
-
-shared_ptr<Root> Item::root() const
-{
-    return p_->root();
-}
-
-ItemType Item::type() const
-{
-    return p_->type();
-}
-
-QString Item::etag() const
-{
-    return p_->etag();
-}
-
-QVariantMap Item::metadata() const
-{
-    return p_->metadata();
-}
-
-QDateTime Item::last_modified_time() const
-{
-    return p_->last_modified_time();
-}
-
-QFuture<QVector<std::shared_ptr<Folder>>> Item::parents() const
-{
-    return p_->parents();
-}
-
-QVector<QString> Item::parent_ids() const
-{
-    return p_->parent_ids();
-}
-
-QFuture<Item::SPtr> Item::copy(std::shared_ptr<Folder> const& new_parent, QString const& new_name)
-{
-    return p_->copy(new_parent, new_name);
-}
-QFuture<Item::SPtr> Item::move(std::shared_ptr<Folder> const& new_parent, QString const& new_name)
-{
-    return p_->move(new_parent, new_name);
-}
-
-QFuture<void> Item::delete_item()
-{
-    return p_->delete_item();
-}
-
-QDateTime Item::creation_time() const
-{
-    return p_->creation_time();
-}
-
-MetadataMap Item::native_metadata() const
-{
-    return p_->native_metadata();
-}
-
-bool Item::equal_to(Item::SPtr const& other) const noexcept
-{
-    return p_->equal_to(*other->p_);
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/Root.cpp'
--- src/qt/client/Root.cpp	2016-07-20 06:58:30 +0000
+++ src/qt/client/Root.cpp	1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Root.h>
-
-#include <unity/storage/qt/client/internal/RootBase.h>
-
-namespace unity
-{
-namespace storage
-{
-namespace qt
-{
-namespace client
-{
-
-using namespace internal;
-using namespace std;
-
-Root::Root(RootBase* p)
-    : Folder(p)
-{
-}
-
-Root::~Root() = default;
-
-shared_ptr<Account> Root::account() const
-{
-    return dynamic_cast<RootBase*>(p_.get())->account();
-}
-
-QFuture<int64_t> Root::free_space_bytes() const
-{
-    return dynamic_cast<RootBase*>(p_.get())->free_space_bytes();
-}
-
-QFuture<int64_t> Root::used_space_bytes() const
-{
-    return dynamic_cast<RootBase*>(p_.get())->used_space_bytes();
-}
-
-QFuture<Item::SPtr> Root::get(QString native_identity) const
-{
-    return dynamic_cast<RootBase*>(p_.get())->get(native_identity);
-}
-
-}  // namespace client
-}  // namespace qt
-}  // namespace storage
-}  // namespace unity

=== removed file 'src/qt/client/Runtime.cpp'
--- src/qt/client/Runtime.cpp	2016-08-11 23:55:40 +0000
+++ src/qt/client/Runtime.cpp	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-/*
- * Copyright (C) 2016 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/>.
- *
- * Authors: Michi Henning <[e-mail]>
- */
-
-#include <unity/storage/qt/client/Runtime.h>