Merge lp:~michihenning/storage-framework/api2 into lp:storage-framework/devel

[Michi Henning]

Started implementation of v2 API.

New API. Bulk of internal implementation is there. Need to flesh out the methods on Item mostly now. Also still a bunch of review comments to apply.

[Xavi Garcia (xavi-garcia-mena)]

As discussed in the standup, a couple of things I saw taking a quick look:

The following signals:
    void statusChanged(Status status) const;
    void error(StorageError const& e) const;
    void finished(Uploader const& uploader) const;
Can be found on the Uploader and UploadJob.

It's a bit confusing if we need to connect to both, or just connection to the one in the Job or the Uploader is just fine.

And the second one is about the signal declaration itself.
I had issues related to this a few weeks ago.

For example the signal:

enum class Status { Loading, Finished, Error };
void statusChanged(Status status) const;

should be:
void statusChanged(UploadJob::Status status) const;

and I should verify, but maybe Qt needs it to be:
void statusChanged(unity::storage::qt::UploadJob::Status status) const;

if not, when creating the moc code it does not understand the enum and we cannot access it from QML or, for example QSignalSpy. In fact the issue I've got was with QSignalSpy, when trying to convert from QVariant to the enum class.

[Michi Henning (michihenning)]

Thanks for the comments Xavi! I've ditched the upload and download job classes. The uploader and downloader will return a disconnected non-working socket and make it valid once the dbus reply with the file descriptor trickles in.

I've added qualified names to the headers where I think they are needed. Could you let me know whether that looks OK please?

[Albert Astals Cid (aacid)]

you seem to be missing lots of NOTIFY stuff in the properties
i.e.
 Q_PROPERTY(unity::Storage::qt::StorageError error READ error)
will change at some point i guess?

Other properties seem to be missing CONSTANT, e.g.
 Q_PROPERTY(QString READ description)

QML will complain if using properties that are read but don't have neither CONSTANT nor NOTIFY

[Lukáš Tinkl (lukas-kde)]

Apart from what Albert said above, I see a few high level problems:
- exposing private members in the public headers, that's asking for ABI breakage sooner or later; wrap them using the pimpl idiom and use QScopedPointer to manage them
- QDBus* stuff shouldn't be part of the API (not "consumable" from QML at all)
- if you use custom enums in the signals signatures, you need to Q_DECLARE_METATYPE on them, otherwise they won't work (http://doc.qt.io/qt-5/qmetatype.html#Q_DECLARE_METATYPE)
- a curious question, why do you combine different stuff from C++11, boost and Qt? (like boost::future when there's std::future or even QFuture; std::shared_ptr vs. QSharedPointer etc; or std::map together with QString, when using QMap<QString,QString> would be the logical solution)
- you are using Q_ENUM (http://doc.qt.io/qt-5/qobject.html#Q_ENUM) which is available only from Qt 5.5 -> won't work on vivid; same for Q_GADGET afaik
- for the hash() function, please see http://doc.qt.io/qt-5/qhash.html#the-qhash-hashing-function

[Michi Henning (michihenning)]

Hi Lukáš,

my apologies, I suspect the message got lost in translation. The *only* headers that matter for the v2 API are the ones in include/unity/storage/qt. Ignore any headers in subduers of this. (The new API does not use boost, does not use futures, etc.

We are not targeting Vivid, so Q_GADGET and Q_ENUM OK.

I'll check the hash function, thanks! The one that is there will do the job with std::unordered_map. I'll have to read up on how the equivalent is meant to work in Qt.

[Michi Henning (michihenning)]

Hi Lukáš,

my apologies, I suspect the message got lost in translation. The *only* headers that matter for the v2 API are the ones in include/unity/storage/qt. Ignore any headers in subduers of this. (The new API does not use boost, does not use futures, etc.

We are not targeting Vivid, so Q_GADGET and Q_ENUM OK.

I'll check the hash function, thanks! The one that is there will do the job with std::unordered_map. I just had a brief look, and it seems it'll be easy enough to have a Qt-compatible hash function as well, so that'll be easy to fix. Thanks for pointing this out!

[Michi Henning (michihenning)]

> Ignore any headers in subduers of this.

Bloody auto-correct :-(

That was meant to say "subdirs".

Here is the list of headers as they currently stand, all in include/unity/storage/qt:

Account.h
AccountsJob.h
ConflictPolicy.h
Downloader.h
Item.h
ItemJob.h
ItemListJob.h
Runtime.h
StorageError.h
Uploader.h
VoidJob.h

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

FAILED: Continuous integration, rev:69
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/110/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/685/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/691
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/504/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/504/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

70. By Michi Henning on 2016-09-20

Comment changes to mark review items.

71. By Michi Henning on 2016-09-20

Whitespace fixes. Trying qualified name for failing bus_path() call.

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

FAILED: Continuous integration, rev:70
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/111/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/688/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/694
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/507/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/507/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/507/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/507/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

72. By Michi Henning on 2016-09-20

Trying this->bus_path();

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

FAILED: Continuous integration, rev:71
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/112/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/689/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/695
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/508/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/508/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/508/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:72
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/113/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/690/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/696
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/509/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/509/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/509/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/509/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

73. By Michi Henning on 2016-09-20

bus_path() -> impossible_name() for testing.

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

FAILED: Continuous integration, rev:73
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/114/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/692/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/698/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:73
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/115/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/693/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/699/console

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:73
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~michihenning/storage-framework/api2/+merge/304599/+edit-commit-message

https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/116/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/694/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/700/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

74. By Michi Henning on 2016-09-20

impossible_name() -> object_path()

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

FAILED: Continuous integration, rev:74
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/117/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/697/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/703
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/512/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/512/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

75. By Michi Henning on 2016-09-20

Q_ENUM -> Q_ENUIMS for Vivid. Disabled check for connection
state when creating the runtime.

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

FAILED: Continuous integration, rev:75
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/118/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/707/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/713
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/521/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/521/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

76. By Michi Henning on 2016-09-21

Fixed compilation error on Vivid. More warning suppressions for Arm.

77. By Michi Henning on 2016-09-21

Fixed wrong location for installing pc file.

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

FAILED: Continuous integration, rev:76
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/119/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/708/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/714
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/522/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/522/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

78. By Michi Henning on 2016-09-21

Added missing Q_DECLARE_METATYPE

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

FAILED: Continuous integration, rev:77
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/120/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/709/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/715
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/523/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/523/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/523
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/523/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/523/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/523/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/523/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/523/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/523/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/523/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

79. By Michi Henning on 2016-09-21

Another missing Q_DECLARE_METATYPE

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

FAILED: Continuous integration, rev:78
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/121/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/710/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/716
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/524/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/524
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/524/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/524
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/524/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/524/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/524/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/524/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/524/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/524
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/524/artifact/output/*zip*/output.zip
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/524/console

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

review: Needs Fixing (continuous-integration)

[lp:~michihenning/storage-framework/api2]

80. By Michi Henning on 2016-09-21

More Q_DECLARE_METATYPE :-(

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

FAILED: Continuous integration, rev:79
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/122/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/711/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/717
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/525/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/525/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/525
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/525/artifact/output/*zip*/output.zip
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/525/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/525/console
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/525/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/525/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/525
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/525/artifact/output/*zip*/output.zip
    ABORTED: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/525/console

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

review: Needs Fixing (continuous-integration)

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

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

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

As discussed previously, we'll fix most of the issues from yesterday's review post merge.

Things I'd like you to fix before hand though are:

1. You've removed the logic to generate .pc files for the old v1 client libraries and instead used copies with /home/michi/src/storage-framework/api2/build/install/ substituted in as the install prefix. This will cause compile and link failures for any code trying to link to those libraries. Please switch back to generating them from a .pc.in file using configure_file().

2. Don't piggy back on the libstorage-framework-qt-client-1 binary package for the new library: add a new binary package, and add it as a dependency for storage-framework-client-dev. It's better to take the effort to do this now rather than have binary packages built against the new library break when we change things around in future.

2. The headers for the new and old client libraries are mixed together. Ideally they'd be separate, but it probably isn't worth spending time to change, given we want a fairly short change over.

review: Needs Fixing

[lp:~michihenning/storage-framework/api2]

81. By Michi Henning on 2016-09-21

Separated old and new header install location.
Added new binary package for v2 client API.
Fix broken pkgconfig files.
Bumped project version.
Updated changelog.

82. By Michi Henning on 2016-09-21

A few more packaging fixes.

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

PASSED: Continuous integration, rev:82
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/124/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/714
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/720
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/528/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/528
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/528/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[James Henstridge (jamesh)]

Looks good.

review: Approve

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

PASSED: Continuous integration, rev:84
https://jenkins.canonical.com/unity-api-1/job/lp-storage-framework-ci/125/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build/726
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/732
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=vivid+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=yakkety/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=vivid+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=yakkety/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=vivid+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/540/artifact/output/*zip*/output.zip
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/540
        deb: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=yakkety/540/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-09-03 00:53:43 +0000
+++ CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -5,13 +5,13 @@
 endif()
 
 cmake_minimum_required(VERSION 3.0.2)
-project(storage-framework VERSION "0.1" LANGUAGES C CXX)
+project(storage-framework VERSION "0.2" LANGUAGES C CXX)
 
 # These variables should be incremented when we wish to create a new
 # source incompatible version of the the library where users of the
-# old API could will not compile against the new one.  It is not
+# old API will not compile against the new one.  It is not
 # necessary to increment this for ABI breaks that are source compatible.
-set(SF_CLIENT_API_VERSION "1")
+set(SF_CLIENT_API_VERSION "2")
 set(SF_PROVIDER_API_VERSION "1")
 
 # These two should be incremented when the ABI changes.
@@ -132,6 +132,7 @@
         qt-client-lib-common
         storage-framework-common-internal
         storage-framework-qt-client
+        storage-framework-qt-client-v2
         storage-framework-qt-local-client
         sf-provider-objects
         storage-framework-provider

=== modified file 'debian/changelog'
--- debian/changelog	2016-08-04 07:20:09 +0000
+++ debian/changelog	2016-09-21 05:03:46 +0000
@@ -1,3 +1,10 @@
+storage-framework (0.2) UNRELEASED; urgency=medium
+
+  [ Michi Henning ]
+  * Added v2 of the client-side API.
+
+ -- Michi Henning <[e-mail]>  Wed, 21 Sep 2016 14:36:15 +1000
+
 storage-framework (0.1+16.10.20160804.1-0ubuntu1) yakkety; urgency=medium
 
   [ Michi Henning ]

=== modified file 'debian/control'
--- debian/control	2016-08-04 07:20:09 +0000
+++ debian/control	2016-09-21 05:03:46 +0000
@@ -49,6 +49,15 @@
 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: libstorage-framework-qt-client-2-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Client library for the Storage Framework
  Runtime support for storage framework clients.
 
@@ -70,6 +79,7 @@
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends},
 Depends: libstorage-framework-qt-client-1-0 (= ${binary:Version}),
+         libstorage-framework-qt-client-2-0 (= ${binary:Version}),
          libstorage-framework-qt-local-client-1-0 (= ${binary:Version}),
          qtbase5-dev,
          ${misc:Depends},

=== modified file 'debian/control.in'
--- debian/control.in	2016-08-02 03:36:58 +0000
+++ debian/control.in	2016-09-21 05:03:46 +0000
@@ -44,6 +44,15 @@
 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: libstorage-framework-qt-client-2-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends},
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
 Description: Client library for the Storage Framework
  Runtime support for storage framework clients.
 

=== modified file 'debian/libstorage-framework-qt-client-1-0.install'
--- debian/libstorage-framework-qt-client-1-0.install	2016-07-11 04:06:04 +0000
+++ debian/libstorage-framework-qt-client-1-0.install	2016-09-21 05:03:46 +0000
@@ -1,1 +1,1 @@
-usr/lib/*/libstorage-framework-qt-client-*.so.*
+usr/lib/*/libstorage-framework-qt-client-1.so.*

=== added file 'debian/libstorage-framework-qt-client-2-0.install'
--- debian/libstorage-framework-qt-client-2-0.install	1970-01-01 00:00:00 +0000
+++ debian/libstorage-framework-qt-client-2-0.install	2016-09-21 05:03:46 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/libstorage-framework-qt-client-2.so.*

=== modified file 'include/unity/storage/CMakeLists.txt'
--- include/unity/storage/CMakeLists.txt	2016-07-11 03:28:40 +0000
+++ include/unity/storage/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -7,5 +7,9 @@
 install(FILES ${common_headers}
   DESTINATION ${provider_base_includedir}/${includeprefix})
 
+# Deprecated client API v1 install
+install(FILES ${common_headers}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-1/${includeprefix})
+
 add_subdirectory(provider)
 add_subdirectory(qt)

=== modified file 'include/unity/storage/internal/ItemMetadata.h'
--- include/unity/storage/internal/ItemMetadata.h	2016-08-25 23:56:02 +0000
+++ include/unity/storage/internal/ItemMetadata.h	2016-09-21 05:03:46 +0000
@@ -49,3 +49,6 @@
 }  // namespace internal
 }  // namespace storage
 }  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata)
+Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>)

=== modified file 'include/unity/storage/internal/dbusmarshal.h'
--- include/unity/storage/internal/dbusmarshal.h	2016-08-11 06:53:25 +0000
+++ include/unity/storage/internal/dbusmarshal.h	2016-09-21 05:03:46 +0000
@@ -39,6 +39,3 @@
 }  // namespace internal
 }  // storage
 }  // unity
-
-Q_DECLARE_METATYPE(unity::storage::internal::ItemMetadata)
-Q_DECLARE_METATYPE(QList<unity::storage::internal::ItemMetadata>)

=== added file 'include/unity/storage/qt/Account.h'
--- include/unity/storage/qt/Account.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/Account.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,103 @@
+/*
+ * 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 <QMetaType>
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class AccountImpl;
+class ItemImpl;
+
+}
+
+class ItemJob;
+class ItemListJob;
+
+class Q_DECL_EXPORT Account final
+{
+    Q_GADGET
+    Q_PROPERTY(bool READ isValid CONSTANT FINAL)
+    Q_PROPERTY(QString READ owner CONSTANT FINAL)
+    Q_PROPERTY(QString READ ownerId CONSTANT FINAL)
+    Q_PROPERTY(QString READ description CONSTANT FINAL)
+
+public:
+    Account();
+    Account(Account const&);
+    Account(Account&&);
+    ~Account();
+    Account& operator=(Account const&);
+    Account& operator=(Account&&);
+
+    bool isValid() const;
+    QString owner() const;
+    QString ownerId() const;
+    QString description() const;
+
+    Q_INVOKABLE ItemListJob* roots() const;
+    Q_INVOKABLE ItemJob* get(QString const& itemId) const;
+
+    bool operator==(Account const&) const;
+    bool operator!=(Account const&) const;
+    bool operator<(Account const&) const;
+    bool operator<=(Account const&) const;
+    bool operator>(Account const&) const;
+    bool operator>=(Account const&) const;
+
+    size_t hash() const;
+
+private:
+    Account(std::shared_ptr<internal::AccountImpl> const& p);
+
+    std::shared_ptr<internal::AccountImpl> p_;
+
+    friend class internal::AccountImpl;
+    friend class internal::ItemImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+namespace std
+{
+
+template<> struct Q_DECL_EXPORT hash<unity::storage::qt::Account>
+{
+    std::size_t operator()(unity::storage::qt::Account const& a)
+    {
+        return a.hash();
+    }
+};
+
+}  // namespace std
+
+// Note: qHash(Account) does *not* return the same hash value is std::hash<Account> because
+//       std:hash() returns size_t (typically 64 bits), but qHash() returns uint (typically 32 bits).
+uint Q_DECL_EXPORT qHash(unity::storage::qt::Account const& acc);

=== added file 'include/unity/storage/qt/AccountsJob.h'
--- include/unity/storage/qt/AccountsJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/AccountsJob.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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/Account.h>
+#include <unity/storage/qt/StorageError.h>
+
+#include <QMetaType>
+#include <QObject>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class AccountsJobImpl;
+class RuntimeImpl;
+
+}  // namespace internal
+
+class Account;
+class Runtime;
+class StorageError;
+
+class Q_DECL_EXPORT AccountsJob final : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isValid READ isValid FINAL)
+    Q_PROPERTY(unity::storage::qt::AccountsJob::Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
+    Q_PROPERTY(QList<unity::storage::qt::Account> accounts READ accounts FINAL)
+
+public:
+    enum Status { Loading, Finished, Error };
+    Q_ENUMS(Status)
+
+    virtual ~AccountsJob();
+
+    bool isValid() const;
+    Status status() const;
+    StorageError error() const;
+    QList<Account> accounts() const;
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::AccountsJob::Status status) const;
+
+private:
+    AccountsJob(std::shared_ptr<internal::RuntimeImpl> const& runtime);
+    AccountsJob(StorageError const& error);
+
+    std::unique_ptr<internal::AccountsJobImpl> const p_;
+
+    friend class internal::RuntimeImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::qt::AccountsJob::Status)

=== modified file 'include/unity/storage/qt/CMakeLists.txt'
--- include/unity/storage/qt/CMakeLists.txt	2016-05-23 02:27:16 +0000
+++ include/unity/storage/qt/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -1,1 +1,17 @@
-add_subdirectory(client)
+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)
+
+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 ALL DEPENDS ${convenience_hdr})
+
+install(
+    FILES ${public_hdrs} ${convenience_hdr}
+    DESTINATION ${client_base_includedir}/${includeprefix})

=== added file 'include/unity/storage/qt/ConflictPolicy.h'
--- include/unity/storage/qt/ConflictPolicy.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/ConflictPolicy.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,32 @@
+/*
+ * 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
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+enum class ConflictPolicy { ErrorIfConflict, Overwrite };
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/Downloader.h'
--- include/unity/storage/qt/Downloader.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/Downloader.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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 <QIODevice>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+class Item;
+class StorageError;
+
+class Q_DECL_EXPORT Downloader final : public QIODevice
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isValid READ isValid FINAL) // TODO: Need notify and constant where appropriate
+    Q_PROPERTY(unity::Storage::qt::Downloader::Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(unity::Storage::qt::StorageError error READ error FINAL)
+    Q_PROPERTY(unity::Storage::qt::Item item READ item FINAL)
+
+public:
+    enum Status { Loading, Ready, Cancelled, Finished, Error };
+    Q_ENUMS(Status)
+
+    Downloader();
+    virtual ~Downloader();
+
+    bool isValid();
+    Status status() const;
+    StorageError error() const;
+    Item item() const;
+
+    Q_INVOKABLE void finishDownload(); // TODO: finish()
+    Q_INVOKABLE void cancel();
+
+    // TODO: will probably need QML invokable methods for reading and writing to/from QIODevice
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::Downloader::Status status) const;
+
+protected:
+    virtual qint64 readData(char* data, qint64 maxSize) override;
+    virtual qint64 writeData(char const* data, qint64 maxSize) override;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/Item.h'
--- include/unity/storage/qt/Item.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/Item.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,142 @@
+/*
+ * 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/ConflictPolicy.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDateTime>
+#include <QVariantMap>
+#pragma GCC diagnostic pop
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class ItemImpl;
+
+}  // namespace internal
+
+class Account;
+class Downloader;
+class IntJob;
+class ItemJob;
+class ItemListJob;
+class Uploader;
+class VoidJob;
+
+class Q_DECL_EXPORT Item final
+{
+    Q_GADGET
+    Q_PROPERTY(QString itemId READ itemId CONSTANT FINAL)
+    Q_PROPERTY(QString name READ name CONSTANT FINAL)
+    Q_PROPERTY(unity::storage::qt::Account account READ account CONSTANT FINAL)
+    Q_PROPERTY(QString etag READ etag CONSTANT FINAL)
+    Q_PROPERTY(unity::storage::qt::Item::Type type READ type CONSTANT FINAL)
+    Q_PROPERTY(QVariantMap metadata READ metadata CONSTANT FINAL)
+    Q_PROPERTY(QDateTime lastModifiedTime READ lastModifiedTime CONSTANT FINAL)
+    Q_PROPERTY(QVector<QString> parentIds READ parentIds CONSTANT FINAL)
+
+public:
+    Item();
+    Item(Item const&);
+    Item(Item&&);
+    ~Item();
+    Item& operator=(Item const&);
+    Item& operator=(Item&&);
+
+    enum Type { File, Folder, Root };
+    Q_ENUMS(Type)
+
+    bool isValid() const;
+    QString itemId() const;
+    QString name() const;
+    Account account() const;
+    QString etag() const;
+    Type type() const;
+    QVariantMap metadata() const;
+    QDateTime lastModifiedTime() const;
+    QVector<QString> parentIds() const;  // TODO: should be QList
+
+    Q_INVOKABLE ItemListJob* parents() const;
+    Q_INVOKABLE ItemJob* copy(Item const& newParent, QString const& newName) const;
+    Q_INVOKABLE ItemJob* move(Item const& newParent, QString const& newName) const;
+    Q_INVOKABLE VoidJob* deleteItem() const;
+
+    Q_INVOKABLE Uploader* createUploader(ConflictPolicy policy, qint64 sizeInBytes) const;
+    Q_INVOKABLE Downloader* createDownloader() const;
+
+    Q_INVOKABLE ItemListJob* list() const;
+    Q_INVOKABLE ItemListJob* lookup(QString const& name) const;
+    Q_INVOKABLE ItemJob* createFolder(QString const& name) const;
+    Q_INVOKABLE Uploader* createFile(QString const& name) const;
+
+    Q_INVOKABLE IntJob* freeSpaceBytes() const;
+    Q_INVOKABLE IntJob* usedSpaceBytes() const;
+
+    bool operator==(Item const&) const;
+    bool operator!=(Item const&) const;
+    bool operator<(Item const&) const;
+    bool operator<=(Item const&) const;
+    bool operator>(Item const&) const;
+    bool operator>=(Item const&) const;
+
+    size_t hash() const;
+
+private:
+    Item(std::shared_ptr<internal::ItemImpl> const&);
+
+    std::shared_ptr<internal::ItemImpl> p_;
+
+    friend class internal::ItemImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::qt::Item)
+Q_DECLARE_METATYPE(QList<unity::storage::qt::Item>)
+Q_DECLARE_METATYPE(unity::storage::qt::Item::Type)
+
+namespace std
+{
+
+template<> struct Q_DECL_EXPORT hash<unity::storage::qt::Item>
+{
+    std::size_t operator()(unity::storage::qt::Item const& i)
+    {
+        return i.hash();
+    }
+};
+
+}  // namespace std
+
+// Note: qHash(Item) does *not* return the same hash value is std::hash<Item> because
+//       std:hash() returns size_t (typically 64 bits), but qHash() returns uint (typically 32 bits).
+uint Q_DECL_EXPORT qHash(unity::storage::qt::Item const& i);

=== added file 'include/unity/storage/qt/ItemJob.h'
--- include/unity/storage/qt/ItemJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/ItemJob.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,75 @@
+/*
+ * 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/Item.h>
+
+#include <QObject>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class ItemJobImpl;
+
+}  // namespace internal
+
+class Item;
+class StorageError;
+
+class Q_DECL_EXPORT ItemJob final : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isValid READ isValid FINAL)
+    Q_PROPERTY(unity::storage::qt::ItemJob::Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
+    Q_PROPERTY(unity::storage::qt::Item item READ item FINAL)
+
+public:
+    virtual ~ItemJob();
+
+    enum Status { Loading, Finished, Error };
+    Q_ENUMS(Status)
+
+    bool isValid() const;
+    Status status() const;
+    StorageError error() const;
+    Item item() const;
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::ItemJob::Status status) const;
+
+private:
+    ItemJob(std::unique_ptr<internal::ItemJobImpl> p);
+
+    std::unique_ptr<internal::ItemJobImpl> const p_;
+
+    friend class internal::ItemJobImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::qt::ItemJob::Status)

=== added file 'include/unity/storage/qt/ItemListJob.h'
--- include/unity/storage/qt/ItemListJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/ItemListJob.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,77 @@
+/*
+ * 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"
+#include <QObject>
+#pragma GCC diagnostic pop
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class ItemListJobImpl;
+
+}  // namespace internal
+
+class Item;
+class StorageError;
+
+class Q_DECL_EXPORT ItemListJob final : public QObject
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isValid READ isValid FINAL)
+    Q_PROPERTY(unity::storage::qt::ItemListJob::Status status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(unity::storage::qt::StorageError error READ error FINAL)
+
+public:
+    virtual ~ItemListJob();
+
+    enum Status { Loading, Finished, Error };
+    Q_ENUMS(Status)
+
+    bool isValid() const;
+    Status status() const;
+    StorageError error() const;
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::ItemListJob::Status status) const;
+    void itemsReady(QList<unity::storage::qt::Item> const& items) const;
+
+private:
+    ItemListJob(std::unique_ptr<internal::ItemListJobImpl> p);
+
+    std::unique_ptr<internal::ItemListJobImpl> const p_;
+
+    friend class internal::ItemListJobImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+Q_DECLARE_METATYPE(unity::storage::qt::ItemListJob::Status)

=== added file 'include/unity/storage/qt/Runtime.h'
--- include/unity/storage/qt/Runtime.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/Runtime.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,80 @@
+/*
+ * 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/Account.h>
+#include <unity/storage/qt/StorageError.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusConnection>
+#pragma GCC diagnostic pop
+
+#include <memory>
+
+class QDBusConnection;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class RuntimeImpl;
+
+}  // namespace internal
+
+class AccountsJob;
+
+class Q_DECL_EXPORT Runtime final : public QObject
+{
+    Q_PROPERTY(bool isValid READ isValid FINAL)
+    Q_PROPERTY(unity::storage::StorageError error READ FINAL)
+    Q_PROPERTY(QDBusConnection connection READ connection FINAL)
+public:
+    Runtime(QObject* parent = nullptr);
+    Runtime(QDBusConnection const& bus, QObject* parent = nullptr);
+    virtual ~Runtime();
+
+    bool isValid() const;
+    StorageError error() const;
+    QDBusConnection connection() const;
+    StorageError shutdown();
+    Q_INVOKABLE AccountsJob* accounts() const;
+
+    // TODO: Get rid of two-argument version and default trailing params.
+    // TODO: can be const methods.
+    Account make_test_account(QString const& bus_name, QString const& object_path);
+    Account make_test_account(QString const& bus_name,
+                              QString const& object_path,
+                              QString const& owner_id,
+                              QString const& owner,
+                              QString const& description);
+
+private:
+    std::shared_ptr<internal::RuntimeImpl> p_;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/StorageError.h'
--- include/unity/storage/qt/StorageError.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/StorageError.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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 <QMetaType>
+#include <QString>
+
+#include <memory>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class StorageErrorImpl;
+
+}
+
+class Q_DECL_EXPORT StorageError final
+{
+    Q_GADGET
+    Q_PROPERTY(unity::storage::qt::StorageError::Type type READ type FINAL)
+    Q_PROPERTY(QString name READ name FINAL)
+    Q_PROPERTY(QString message READ message FINAL)
+    Q_PROPERTY(QString errorString READ errorString FINAL)
+
+    Q_PROPERTY(QString itemId READ itemId FINAL)
+    Q_PROPERTY(QString itemName READ itemName FINAL)
+    Q_PROPERTY(int errorCode READ errorCode FINAL)
+
+public:
+    StorageError();
+    StorageError(StorageError const&);
+    StorageError(StorageError&&);
+    ~StorageError();
+    StorageError& operator=(StorageError const&);
+    StorageError& operator=(StorageError&&);
+
+    enum Type
+    {
+        NoError, LocalCommsError, RemoteCommsError, Deleted, RuntimeDestroyed, NotExists,
+        Exists, Conflict, PermissionDenied, Cancelled, LogicError, InvalidArgument, ResourceError,
+        QuotaExceeded,
+        __LAST_STORAGE_ERROR
+    };
+    Q_ENUMS(Type)
+
+    Type type() const;
+    QString name() const;
+    QString message() const;
+    QString errorString() const;
+
+    QString itemId() const;
+    QString itemName() const;
+    int errorCode() const;
+
+private:
+    StorageError(std::unique_ptr<internal::StorageErrorImpl>);
+
+    std::unique_ptr<internal::StorageErrorImpl> p_;
+
+    friend class internal::StorageErrorImpl;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/Uploader.h'
--- include/unity/storage/qt/Uploader.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/Uploader.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,72 @@
+/*
+ * 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 <QIODevice>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+class Item;
+class StorageError;
+
+class Q_DECL_EXPORT Uploader final : public QIODevice
+{
+    Q_OBJECT
+    Q_PROPERTY(bool isValid READ isValid FINAL) // TODO: Need notify
+    Q_PROPERTY(unity::storage::qt::Uploader::Status status READ status FINAL)
+    Q_PROPERTY(unity::storage::qt::StorageError READ error FINAL)
+    Q_PROPERTY(unity::storage::qt::ConflictPolicy policy READ policy FINAL)
+    Q_PROPERTY(qint64 sizeInBytes READ sizeInBytes FINAL)
+    Q_PROPERTY(unity::storage::qt::Item item READ item FINAL)
+
+public:
+    enum Status { Loading, Cancelled, Finished, Error };
+    Q_ENUMS(Status)
+
+    Uploader();
+    virtual ~Uploader();
+
+    bool isValid() const;
+    Status status() const;
+    StorageError error() const;
+    ConflictPolicy policy() const;
+    qint64 sizeInBytes() const;
+    Item item() const;
+
+    Q_INVOKABLE void finishUpload();
+    Q_INVOKABLE void cancel();
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::Uploader::Status status) const;
+
+protected:
+    virtual qint64 readData(char* data, qint64 maxSize) override;
+    virtual qint64 writeData(char const* data, qint64 maxSize) override;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/VoidJob.h'
--- include/unity/storage/qt/VoidJob.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/VoidJob.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,56 @@
+/*
+ * 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 <QObject>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+class StorageError;
+
+class Q_DECL_EXPORT VoidJob final : public QObject
+{
+    // TODO: notify, CONSTANT where needed
+    Q_OBJECT
+    Q_PROPERTY(bool READ isValid FINAL)
+    Q_PROPERTY(unity::storage::qt::VoidJob::Status READ status NOTIFY statusChanged FINAL)
+    Q_PROPERTY(unity::storage::qt::StorageError READ error FINAL)
+
+public:
+    virtual ~VoidJob();
+
+    enum Status { Loading, Finished, Error };
+    Q_ENUMS(Status)
+
+    bool isValid() const;
+    Status status() const;
+    StorageError error() const;
+
+Q_SIGNALS:
+    void statusChanged(unity::storage::qt::VoidJob::Status status) const;
+};
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== modified file 'include/unity/storage/qt/client/CMakeLists.txt'
--- include/unity/storage/qt/client/CMakeLists.txt	2016-07-11 03:28:40 +0000
+++ include/unity/storage/qt/client/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -8,8 +8,7 @@
         ${convenience_hdr} ${includeprefix} ${CMAKE_CURRENT_SOURCE_DIR}
     DEPENDS ${public_hdrs})
 
-add_custom_target(qt-client-all-headers ALL DEPENDS ${convenience_hdr})
+add_custom_target(qt-client-all-headers-v1 ALL DEPENDS ${convenience_hdr})
 
-install(
-    FILES ${public_hdrs} ${convenience_hdr}
-    DESTINATION ${client_base_includedir}/${includeprefix})
+install(FILES ${public_hdrs} ${convenience_hdr}
+  DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/storage-framework-client-1/${includeprefix})

=== added directory 'include/unity/storage/qt/internal'
=== added file 'include/unity/storage/qt/internal/AccountImpl.h'
--- include/unity/storage/qt/internal/AccountImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/AccountImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,99 @@
+/*
+ * 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/Item.h>
+
+#include <QString>
+
+#include <memory>
+
+class ProviderInterface;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class RuntimeImpl;
+
+class AccountImpl : public std::enable_shared_from_this<AccountImpl>
+{
+public:
+    AccountImpl();
+    AccountImpl(AccountImpl const&) = default;
+    AccountImpl(AccountImpl&&) = default;
+    ~AccountImpl() = default;
+    AccountImpl& operator=(AccountImpl const&) = default;
+    AccountImpl& operator=(AccountImpl&&) = default;
+
+    QString ownerId() const;
+    QString owner() const;
+    QString description() const;
+
+    ItemListJob* roots() const;
+    ItemJob* get(QString const& itemId) const;
+
+    bool operator==(AccountImpl const&) const;
+    bool operator!=(AccountImpl const&) const;
+    bool operator<(AccountImpl const&) const;
+    bool operator<=(AccountImpl const&) const;
+    bool operator>(AccountImpl const&) const;
+    bool operator>=(AccountImpl const&) const;
+
+    size_t hash() const;
+
+    //std::shared_ptr<RuntimeImpl> runtime() const;
+    std::shared_ptr<ProviderInterface> provider() const;
+
+    static Account make_account(std::shared_ptr<RuntimeImpl> const& runtime,
+                                QString const& bus_name,
+                                QString const& object_path,
+                                QString const& owner_id,
+                                QString const& owner,
+                                QString const& description);
+
+private:
+    AccountImpl(std::shared_ptr<RuntimeImpl> const& runtime,
+                QString const& bus_name,
+                QString const& object_path,
+                QString const& owner_id,
+                QString const& owner,
+                QString const& description);
+
+    bool is_valid_;
+    QString bus_name_;
+    QString object_path_;
+    QString owner_id_;
+    QString owner_;
+    QString description_;
+    std::weak_ptr<RuntimeImpl> runtime_;
+    std::shared_ptr<ProviderInterface> provider_;
+
+    friend class unity::storage::qt::Account;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/AccountsJobImpl.h'
--- include/unity/storage/qt/internal/AccountsJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/AccountsJobImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,70 @@
+/*
+ * 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/AccountsJob.h>
+
+#include <QTimer>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class AccountsJobImpl : public QObject
+{
+    Q_OBJECT
+public:
+    AccountsJobImpl(AccountsJob* public_instance, std::shared_ptr<RuntimeImpl> const& runtime);
+    AccountsJobImpl(AccountsJob* public_instance, StorageError const& error);
+    virtual ~AccountsJobImpl() = default;
+
+    bool isValid() const;
+    AccountsJob::Status status() const;
+    StorageError error() const;
+    QList<Account> accounts() const;
+
+private Q_SLOTS:
+    void manager_ready();
+    void timeout();
+
+private:
+    std::shared_ptr<RuntimeImpl> get_runtime(QString const& method) const;
+    void initialize_accounts();
+    AccountsJob::Status emit_status_changed(AccountsJob::Status new_status) const;
+
+    AccountsJob* const public_instance_;
+
+    AccountsJob::Status status_;
+    StorageError error_;
+    QList<unity::storage::qt::Account> accounts_;
+    std::weak_ptr<RuntimeImpl> const runtime_;
+    QTimer timer_;
+
+    friend class unity::storage::qt::AccountsJob;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/Handler.h'
--- include/unity/storage/qt/internal/Handler.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/Handler.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,93 @@
+/*
+ * 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/internal/HandlerBase.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+#include <unity/storage/qt/internal/unmarshal_error.h>
+
+#include <QDBusPendingReply>
+#include <QDebug>
+
+#include <cassert>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+template<typename T>
+class Handler : public HandlerBase
+{
+public:
+    template<typename ... DBusArgs>
+    Handler(QObject* parent,
+            QDBusPendingReply<DBusArgs...> const& reply,
+            std::function<void(decltype(reply)&)> const& success_closure,
+            std::function<void(StorageError const&)> const& error_closure)
+        : HandlerBase(parent,
+                      reply,
+                      [this, success_closure, error_closure](QDBusPendingCallWatcher& call)
+                          {
+                              if (call.isError())
+                              {
+                                  auto e = unmarshal_error(call);
+                                  switch (e.type())
+                                  {
+                                      case StorageError::NoError:
+                                      {
+                                          // LCOV_EXCL_START
+                                          QString msg = "impossible provider exception: " + e.errorString();
+                                          qCritical() << msg;
+                                          e = StorageErrorImpl::local_comms_error(msg);
+                                          break;
+                                          // LCOV_EXCL_STOP
+                                      }
+                                      case StorageError::LocalCommsError:
+                                      case StorageError::RemoteCommsError:
+                                      case StorageError::ResourceError:
+                                      {
+                                          // Log these errors because they are unexpected.
+                                          qCritical() << "provider exception:" << e.errorString();
+                                          break;
+                                      }
+                                      default:
+                                      {
+                                          // All other errors are not logged.
+                                          break;
+                                      }
+                                  }
+                                  error_closure(e);
+                                  return;
+                              }
+                              QDBusPendingReply<DBusArgs...> r = call;
+                              success_closure(call);
+                          })
+    {
+    }
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/HandlerBase.h'
--- include/unity/storage/qt/internal/HandlerBase.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/HandlerBase.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,64 @@
+/*
+ * 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>
+#include <QObject>
+#pragma GCC diagnostic pop
+
+#include <functional>
+
+class QDBusPendingCall;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class HandlerBase : public QObject
+{
+    Q_OBJECT
+
+public:
+    HandlerBase(QObject* parent,
+                QDBusPendingCall const& call,
+                std::function<void(QDBusPendingCallWatcher&)> const& closure);
+
+public Q_SLOTS:
+    void finished(QDBusPendingCallWatcher* call);
+
+protected:
+    QDBusPendingCallWatcher watcher_;
+
+private:
+    std::function<void(QDBusPendingCallWatcher&)> closure_;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/ItemImpl.h'
--- include/unity/storage/qt/internal/ItemImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/ItemImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,99 @@
+/*
+ * 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/Account.h>
+#include <unity/storage/qt/Item.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class AccountImpl;
+class RuntimeImpl;
+
+class ItemImpl : public std::enable_shared_from_this<ItemImpl>
+{
+public:
+    ItemImpl();
+    ItemImpl(storage::internal::ItemMetadata const& md,
+             std::shared_ptr<AccountImpl> const& account);
+    ItemImpl(ItemImpl const&) = default;
+    ItemImpl(ItemImpl&&) = delete;
+    ~ItemImpl() = default;
+    ItemImpl& operator=(ItemImpl const&) = default;
+    ItemImpl& operator=(ItemImpl&&) = delete;
+
+    QString itemId() const;
+    QString name() const;
+    Account account() const;
+    //Item root() const;
+    QString etag() const;
+    Item::Type type() const;
+    QVariantMap metadata() const;
+    QDateTime lastModifiedTime() const;
+    QVector<QString> parentIds() const;
+
+    ItemListJob* parents() const;
+    ItemJob* copy(Item const& newParent, QString const& newName) const;
+    ItemJob* move(Item const& newParent, QString const& newName) const;
+    VoidJob* deleteItem() const;
+    Uploader* createUploader(ConflictPolicy policy, qint64 sizeInBytes) const;
+    Downloader* createDownloader() const;
+    ItemListJob* list() const;
+    ItemListJob* lookup(QString const& name) const;
+    ItemJob* createFolder(QString const& name) const;
+    Uploader* createFile(QString const& name) const;
+    IntJob* freeSpaceBytes() const;
+    IntJob* usedSpaceBytes() const;
+
+    bool operator==(ItemImpl const&) const;
+    bool operator!=(ItemImpl const&) const;
+    bool operator<(ItemImpl const&) const;
+    bool operator<=(ItemImpl const&) const;
+    bool operator>(ItemImpl const&) const;
+    bool operator>=(ItemImpl const&) const;
+
+    size_t hash() const;
+
+    static Item make_item(QString const& method,
+                          storage::internal::ItemMetadata const& md,
+                          std::shared_ptr<AccountImpl> const& account);
+
+private:
+    //std::shared_ptr<RuntimeImpl> get_runtime(QString const& method) const;
+
+    bool is_valid_;
+    storage::internal::ItemMetadata md_;
+    std::shared_ptr<AccountImpl> account_;
+    //std::shared_ptr<RootImpl> root_;
+
+    friend class unity::storage::qt::Item;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/ItemJobImpl.h'
--- include/unity/storage/qt/internal/ItemJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/ItemJobImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,84 @@
+/*
+ * 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/ItemJob.h>
+
+#include <unity/storage/qt/Account.h>
+#include <unity/storage/qt/internal/Handler.h>
+#include <unity/storage/qt/StorageError.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+class ItemMetadata;
+
+}
+
+namespace qt
+{
+namespace internal
+{
+
+class RuntimeImpl;
+
+class ItemJobImpl : public QObject
+{
+    Q_OBJECT
+public:
+    virtual ~ItemJobImpl() = default;
+
+    bool isValid() const;
+    ItemJob::Status status() const;
+    StorageError error() const;
+    Item item() const;
+
+    static ItemJob* make_item_job(std::shared_ptr<AccountImpl> const& account,
+                                  QString const& method,
+                                  QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
+                                  std::function<void(storage::internal::ItemMetadata const&)> const& validate);
+    static ItemJob* make_item_job(StorageError const& e);
+
+private:
+    ItemJobImpl(std::shared_ptr<AccountImpl> const& account,
+                QString const& method,
+                QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
+                std::function<void(storage::internal::ItemMetadata const&)> const& validate);
+    ItemJobImpl(StorageError const& e);
+
+    ItemJob::Status emit_status_changed(ItemJob::Status new_status) const;
+
+    ItemJob* public_instance_;
+
+    ItemJob::Status status_;
+    StorageError error_;
+    QString method_;
+    std::shared_ptr<AccountImpl> account_;
+    std::function<void(storage::internal::ItemMetadata const&)> validate_;
+    Item item_;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/ItemListJobImpl.h'
--- include/unity/storage/qt/internal/ItemListJobImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/ItemListJobImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,83 @@
+/*
+ * 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/ItemListJob.h>
+
+#include <unity/storage/qt/Account.h>
+#include <unity/storage/qt/internal/Handler.h>
+#include <unity/storage/qt/StorageError.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace internal
+{
+
+class ItemMetadata;
+
+}
+
+namespace qt
+{
+namespace internal
+{
+
+class RuntimeImpl;
+
+class ItemListJobImpl : public QObject
+{
+    Q_OBJECT
+public:
+    virtual ~ItemListJobImpl() = default;
+
+    bool isValid() const;
+    ItemListJob::Status status() const;
+    StorageError error() const;
+
+    static ItemListJob* make_item_list_job(std::shared_ptr<AccountImpl> const& account,
+                                           QString const& method,
+                                           QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
+                                           std::function<void(storage::internal::ItemMetadata const&)> const& validate);
+    static ItemListJob* make_item_list_job(StorageError const& error);
+
+private:
+    ItemListJobImpl(std::shared_ptr<AccountImpl> const& account,
+                    QString const& method,
+                    QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
+                    std::function<void(storage::internal::ItemMetadata const&)> const& validate);
+    ItemListJobImpl(StorageError const& error);
+
+    ItemListJob::Status emit_status_changed(ItemListJob::Status new_status) const;
+    void emit_items_ready(QList<unity::storage::qt::Item> const& items) const;
+
+    ItemListJob* public_instance_;
+
+    ItemListJob::Status status_;
+    StorageError error_;
+    QString method_;
+    std::shared_ptr<AccountImpl> account_;
+    std::function<void(storage::internal::ItemMetadata const&)> validate_;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/RuntimeImpl.h'
--- include/unity/storage/qt/internal/RuntimeImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/RuntimeImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,85 @@
+/*
+ * 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/Account.h>
+#include <unity/storage/qt/StorageError.h>
+
+#include <OnlineAccounts/Manager>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-align"
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QDBusConnection>
+#pragma GCC diagnostic pop
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+class AccountsJob;
+class Runtime;
+
+namespace internal
+{
+
+class RuntimeImpl : public std::enable_shared_from_this<RuntimeImpl>
+{
+public:
+    RuntimeImpl();
+    RuntimeImpl(QDBusConnection const& bus);
+    RuntimeImpl(RuntimeImpl const&) = delete;
+    RuntimeImpl(RuntimeImpl&&) = delete;
+    ~RuntimeImpl();
+    RuntimeImpl& operator=(RuntimeImpl const&) = delete;
+    RuntimeImpl& operator=(RuntimeImpl&&) = delete;
+
+    bool isValid() const;
+    StorageError error() const;
+    QDBusConnection connection() const;
+    AccountsJob* accounts() const;
+    StorageError shutdown();
+
+    std::shared_ptr<OnlineAccounts::Manager> accounts_manager() const;
+
+    Account make_test_account(QString const& bus_name,
+                              QString const& object_path);
+
+    Account make_test_account(QString const& bus_name,
+                              QString const& object_path,
+                              QString const& owner_id,
+                              QString const& owner,
+                              QString const& description);
+
+private:
+    bool is_valid_;
+    StorageError error_;
+    QDBusConnection conn_;
+    std::shared_ptr<OnlineAccounts::Manager> accounts_manager_;
+
+    friend class unity::storage::qt::Runtime;
+};
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/StorageErrorImpl.h'
--- include/unity/storage/qt/internal/StorageErrorImpl.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/StorageErrorImpl.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,85 @@
+/*
+ * 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/StorageError.h>
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+class StorageErrorImpl
+{
+public:
+    StorageErrorImpl();
+    StorageErrorImpl(StorageError::Type type, QString const& msg);
+    StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& item_id);
+    StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& item_id, QString const& item_name);
+    StorageErrorImpl(StorageError::Type type, QString const& msg, int error_code);
+    StorageErrorImpl(StorageErrorImpl const&) = default;
+    StorageErrorImpl(StorageErrorImpl&&) = default;
+    ~StorageErrorImpl() = default;
+    StorageErrorImpl& operator=(StorageErrorImpl const&) = default;
+    StorageErrorImpl& operator=(StorageErrorImpl&&) = default;
+
+    StorageError::Type type() const;
+    QString name() const;
+    QString message() const;
+    QString errorString() const;
+
+    QString itemId() const;
+    QString itemName() const;
+    int errorCode() const;
+
+    // Generic factory for errors that don't require extra arguments.
+    static StorageError make_error(StorageError::Type, QString const& msg);
+
+    // Factories to make things more convenient and ensure consistency.
+    static StorageError local_comms_error(QString const& msg);
+    static StorageError remote_comms_error(QString const& msg);
+    static StorageError deleted_error(QString const& msg, QString const& item_id);
+    static StorageError runtime_destroyed_error(QString const& msg);
+    static StorageError not_exists_error(QString const& msg, QString const& key);
+    static StorageError exists_error(QString const& msg, QString const& item_id, QString const& item_name);
+    static StorageError conflict_error(QString const& msg);
+    static StorageError permission_error(QString const& msg);
+    static StorageError cancelled_error(QString const& msg);
+    static StorageError logic_error(QString const& msg);
+    static StorageError invalid_argument_error(QString const& msg);
+    static StorageError resource_error(QString const& msg, int error_code);
+
+private:
+    StorageError::Type type_;
+    QString name_;
+    QString message_;
+    QString item_id_;
+    QString item_name_;
+    int error_code_;
+};
+
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'include/unity/storage/qt/internal/unmarshal_error.h'
--- include/unity/storage/qt/internal/unmarshal_error.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/unmarshal_error.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,39 @@
+/*
+ * 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/StorageError.h>
+
+class QDBusPendingCallWatcher;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+StorageError unmarshal_error(QDBusPendingCallWatcher const& call);
+
+}  // namespace internal
+}  // namespace qt
+}  // storage
+}  // unity

=== added file 'include/unity/storage/qt/internal/validate.h'
--- include/unity/storage/qt/internal/validate.h	1970-01-01 00:00:00 +0000
+++ include/unity/storage/qt/internal/validate.h	2016-09-21 05:03:46 +0000
@@ -0,0 +1,44 @@
+/*
+ * 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 internal
+{
+
+void validate(QString const& method, unity::storage::internal::ItemMetadata const& md);
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/Account.cpp'
--- src/qt/Account.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/Account.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,148 @@
+/*
+ * 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/Account.h>
+
+#include <unity/storage/qt/internal/AccountImpl.h>
+
+#include <cassert>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+Account::Account()
+    : p_(make_shared<internal::AccountImpl>())
+{
+}
+
+Account::Account(shared_ptr<internal::AccountImpl> const& p)
+    : p_(p)
+{
+    assert(p);
+}
+
+Account::Account(Account const& other)
+    : p_(other.p_)
+{
+}
+
+Account::Account(Account&& other)
+    : p_(make_shared<internal::AccountImpl>())
+{
+    p_->is_valid_ = false;
+    swap(p_, other.p_);
+}
+
+Account::~Account() = default;
+
+Account& Account::operator=(Account const& other)
+{
+    if (this == &other)
+    {
+        return *this;
+    }
+    p_ = other.p_;
+    return *this;
+}
+
+Account& Account::operator=(Account&& other)
+{
+    p_->is_valid_ = false;
+    swap(p_, other.p_);
+    return *this;
+}
+
+bool Account::isValid() const
+{
+    return p_->is_valid_;
+}
+
+QString Account::owner() const
+{
+    return p_->owner();
+}
+
+QString Account::ownerId() const
+{
+    return p_->ownerId();
+}
+
+QString Account::description() const
+{
+    return p_->description();
+}
+
+ItemListJob* Account::roots() const
+{
+    return p_->roots();
+}
+
+ItemJob* Account::get(QString const& itemId) const
+{
+    return p_->get(itemId);
+}
+
+bool Account::operator==(Account const& other) const
+{
+    return p_->operator==(*other.p_);
+}
+
+bool Account::operator!=(Account const& other) const
+{
+    return p_->operator!=(*other.p_);
+}
+
+bool Account::operator<(Account const& other) const
+{
+    return p_->operator<(*other.p_);
+}
+
+bool Account::operator<=(Account const& other) const
+{
+    return p_->operator<=(*other.p_);
+}
+
+bool Account::operator>(Account const& other) const
+{
+    return p_->operator>(*other.p_);
+}
+
+bool Account::operator>=(Account const& other) const
+{
+    return p_->operator>=(*other.p_);
+}
+
+size_t Account::hash() const
+{
+    return p_->hash();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+uint qHash(unity::storage::qt::Account const& acc)
+{
+    return acc.hash();
+}

=== added file 'src/qt/AccountsJob.cpp'
--- src/qt/AccountsJob.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/AccountsJob.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,68 @@
+/*
+ * 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/AccountsJob.h>
+
+#include <unity/storage/qt/Account.h>
+#include <unity/storage/qt/internal/AccountsJobImpl.h>
+
+using namespace unity::storage::qt;
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+AccountsJob::AccountsJob(shared_ptr<internal::RuntimeImpl> const& runtime)
+    : p_(new internal::AccountsJobImpl(this, runtime))
+{
+}
+
+AccountsJob::AccountsJob(StorageError const& error)
+    : p_(new internal::AccountsJobImpl(this, error))
+{
+}
+
+AccountsJob::~AccountsJob() = default;
+
+bool AccountsJob::isValid() const
+{
+    return p_->isValid();
+}
+
+AccountsJob::Status AccountsJob::status() const
+{
+    return p_->status();
+}
+
+StorageError AccountsJob::error() const
+{
+    return p_->error();
+}
+
+QList<Account> AccountsJob::accounts() const
+{
+    return p_->accounts();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== modified file 'src/qt/CMakeLists.txt'
--- src/qt/CMakeLists.txt	2016-06-08 03:57:50 +0000
+++ src/qt/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -1,1 +1,83 @@
 add_subdirectory(client)
+
+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 -Wmissing-field-initializers"
+    GENERATED TRUE
+)
+
+# Sources for remote client V2 library.
+set(QT_CLIENT_LIB_V2_SRC
+    Account.cpp
+    AccountsJob.cpp
+    Item.cpp
+    ItemJob.cpp
+    ItemListJob.cpp
+    Runtime.cpp
+    StorageError.cpp
+    internal/AccountImpl.cpp
+    internal/AccountsJobImpl.cpp
+    internal/HandlerBase.cpp
+    internal/ItemImpl.cpp
+    internal/ItemJobImpl.cpp
+    internal/ItemListJobImpl.cpp
+    internal/RuntimeImpl.cpp
+    internal/StorageErrorImpl.cpp
+    internal/unmarshal_error.cpp
+    internal/validate.cpp
+    ${generated_files}
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/AccountsJob.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Item.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemJob.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/ItemListJob.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/Runtime.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/AccountsJobImpl.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/HandlerBase.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ItemJobImpl.h
+    ${CMAKE_SOURCE_DIR}/include/unity/storage/qt/internal/ItemListJobImpl.h
+)
+
+add_library(storage-framework-qt-client-v2 SHARED
+    ${QT_CLIENT_LIB_V2_SRC}
+    ${generated_files}
+)
+target_include_directories(storage-framework-qt-client-v2 PRIVATE
+    ${Qt5DBus_INCLUDE_DIRS}
+    ${Qt5Network_INCLUDE_DIRS}
+    ${ONLINEACCOUNTS_DEPS_INCLUDE_DIRS}
+)
+set_target_properties(storage-framework-qt-client-v2 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
+    storage-framework-common-internal
+    Qt5::Core
+    Qt5::DBus
+    Qt5::Network
+    ${ONLINEACCOUNTS_DEPS_LDFLAGS}
+)
+install(
+    TARGETS storage-framework-qt-client-v2
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+
+configure_file(
+    storage-framework-qt-client.pc.in
+    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+)
+install(
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
+)

=== added file 'src/qt/Item.cpp'
--- src/qt/Item.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/Item.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,230 @@
+/*
+ * 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/Item.h>
+#include <unity/storage/qt/internal/ItemImpl.h>
+
+#include <cassert>
+#include <QDebug> // TODO: remove this
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+Item::Item()
+    : p_(make_shared<internal::ItemImpl>())
+{
+}
+
+Item::Item(shared_ptr<internal::ItemImpl> const& p)
+    : p_(p)
+{
+    assert(p);
+}
+
+Item::Item(Item const& other)
+    : p_(other.p_)
+{
+}
+
+Item::Item(Item&& other)
+{
+    p_->is_valid_ = false;
+    swap(p_, other.p_);
+}
+
+Item::~Item() = default;
+
+Item& Item::operator=(Item const& other)
+{
+    if (this == &other)
+    {
+        return *this;
+    }
+    p_ = other.p_;
+    return *this;
+}
+
+Item& Item::operator=(Item&& other)
+{
+    p_->is_valid_ = false;
+    swap(p_, other.p_);
+    return *this;
+}
+
+bool Item::isValid() const
+{
+    return p_->is_valid_;
+}
+
+QString Item::itemId() const
+{
+    return p_->itemId();
+}
+
+QString Item::name() const
+{
+    return p_->name();
+}
+
+Account Item::account() const
+{
+    return p_->account();
+}
+
+#if 0
+Item Item::root() const
+{
+
+    return p_->root();
+}
+#endif
+
+QString Item::etag() const
+{
+    return p_->etag();
+}
+
+Item::Type Item::type() const
+{
+    return p_->type();
+}
+
+QVariantMap Item::metadata() const
+{
+    return p_->metadata();
+}
+
+QDateTime Item::lastModifiedTime() const
+{
+    return p_->lastModifiedTime();
+}
+
+QVector<QString> Item::parentIds() const
+{
+    return p_->parentIds();
+}
+
+ItemListJob* Item::parents() const
+{
+    return p_->parents();
+}
+
+ItemJob* Item::copy(Item const& newParent, QString const& newName) const
+{
+    return p_->copy(newParent, newName);
+}
+
+ItemJob* Item::move(Item const& newParent, QString const& newName) const
+{
+    return p_->move(newParent, newName);
+}
+
+VoidJob* Item::deleteItem() const
+{
+    return p_->deleteItem();
+}
+
+Uploader* Item::createUploader(ConflictPolicy policy, qint64 sizeInBytes) const
+{
+    return p_->createUploader(policy, sizeInBytes);
+}
+
+Downloader* Item::createDownloader() const
+{
+    return p_->createDownloader();
+}
+
+ItemListJob* Item::list() const
+{
+    return p_->list();
+}
+
+ItemListJob* Item::lookup(QString const& name) const
+{
+    return p_->lookup(name);
+}
+
+ItemJob* Item::createFolder(QString const& name) const
+{
+    return p_->createFolder(name);
+}
+
+Uploader* Item::createFile(QString const& name) const
+{
+    return p_->createFile(name);
+}
+
+IntJob* Item::freeSpaceBytes() const
+{
+    return p_->freeSpaceBytes();
+}
+
+IntJob* Item::usedSpaceBytes() const
+{
+    return p_->usedSpaceBytes();
+}
+
+bool Item::operator==(Item const& other) const
+{
+    return p_->operator==(*other.p_);
+}
+
+bool Item::operator!=(Item const& other) const
+{
+    return p_->operator!=(*other.p_);
+}
+
+bool Item::operator<(Item const& other) const
+{
+    return p_->operator<(*other.p_);
+}
+
+bool Item::operator<=(Item const& other) const
+{
+    return p_->operator<=(*other.p_);
+}
+
+bool Item::operator>(Item const& other) const
+{
+    return p_->operator>(*other.p_);
+}
+
+bool Item::operator>=(Item const& other) const
+{
+    return p_->operator>=(*other.p_);
+}
+
+size_t Item::hash() const
+{
+    return p_->hash();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity
+
+uint qHash(unity::storage::qt::Item const& i)
+{
+    return i.hash();
+}

=== added file 'src/qt/ItemJob.cpp'
--- src/qt/ItemJob.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/ItemJob.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,62 @@
+/*
+ * 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/ItemJob.h>
+
+#include <unity/storage/qt/internal/ItemJobImpl.h>
+
+using namespace unity::storage::qt;
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+ItemJob::ItemJob(unique_ptr<internal::ItemJobImpl> p)
+    : p_(move(p))
+{
+}
+
+ItemJob::~ItemJob() = default;
+
+bool ItemJob::isValid() const
+{
+    return p_->isValid();
+}
+
+ItemJob::Status ItemJob::status() const
+{
+    return p_->status();
+}
+
+StorageError ItemJob::error() const
+{
+    return p_->error();
+}
+
+Item ItemJob::item() const
+{
+    return p_->item();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/ItemListJob.cpp'
--- src/qt/ItemListJob.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/ItemListJob.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,57 @@
+/*
+ * 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/ItemListJob.h>
+
+#include <unity/storage/qt/internal/ItemListJobImpl.h>
+
+using namespace unity::storage::qt;
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+ItemListJob::ItemListJob(unique_ptr<internal::ItemListJobImpl> p)
+    : p_(move(p))
+{
+}
+
+ItemListJob::~ItemListJob() = default;
+
+bool ItemListJob::isValid() const
+{
+    return p_->isValid();
+}
+
+ItemListJob::Status ItemListJob::status() const
+{
+    return p_->status();
+}
+
+StorageError ItemListJob::error() const
+{
+    return p_->error();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/Runtime.cpp'
--- src/qt/Runtime.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/Runtime.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,87 @@
+/*
+ * 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/Runtime.h>
+
+#include <unity/storage/qt/internal/RuntimeImpl.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+Runtime::Runtime(QObject* parent)
+    : QObject(parent)
+    , p_(new internal::RuntimeImpl)
+{
+}
+
+Runtime::Runtime(QDBusConnection const& bus, QObject* parent)
+    : QObject(parent)
+    , p_(new internal::RuntimeImpl(bus))
+{
+}
+
+Runtime::~Runtime() = default;
+
+bool Runtime::isValid() const
+{
+    return p_->isValid();
+}
+
+StorageError Runtime::error() const
+{
+    return p_->error();
+}
+
+QDBusConnection Runtime::connection() const
+{
+    return p_->connection();
+}
+
+StorageError Runtime::shutdown()
+{
+    return p_->shutdown();
+}
+
+AccountsJob* Runtime::accounts() const
+{
+    return p_->accounts();
+}
+
+Account Runtime::make_test_account(QString const& bus_name, QString const& object_path)
+{
+    return p_->make_test_account(bus_name, object_path);
+}
+
+Account Runtime::make_test_account(QString const& bus_name,
+                                   QString const& object_path,
+                                   QString const& owner_id,
+                                   QString const& owner,
+                                   QString const& description)
+{
+    return p_->make_test_account(bus_name, object_path, owner_id, owner, description);
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/StorageError.cpp'
--- src/qt/StorageError.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/StorageError.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,98 @@
+/*
+ * 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/StorageError.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+
+#include <cassert>
+#include <memory>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+
+StorageError::StorageError()
+    : p_(new internal::StorageErrorImpl)
+{
+}
+
+StorageError::StorageError(StorageError const& other)
+    : p_(new internal::StorageErrorImpl(*other.p_))
+{
+}
+
+StorageError::StorageError(StorageError&&) = default;
+
+StorageError::StorageError(unique_ptr<internal::StorageErrorImpl> p)
+    : p_(move(p))
+{
+}
+
+StorageError::~StorageError() = default;
+
+StorageError& StorageError::operator=(StorageError const& other)
+{
+    *p_ = *other.p_;
+    return *this;
+}
+
+StorageError& StorageError::operator=(StorageError&&) = default;
+
+StorageError::Type StorageError::type() const
+{
+    return p_->type();
+}
+
+QString StorageError::name() const
+{
+    return p_->name();
+}
+
+QString StorageError::message() const
+{
+    return p_->message();
+}
+
+QString StorageError::errorString() const
+{
+    return p_->errorString();
+}
+
+QString StorageError::itemId() const
+{
+    return p_->itemId();
+}
+
+QString StorageError::itemName() const
+{
+    return p_->itemName();
+}
+
+int StorageError::errorCode() const
+{
+    return p_->errorCode();
+}
+
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== modified file 'src/qt/client/CMakeLists.txt'
--- src/qt/client/CMakeLists.txt	2016-08-11 06:53:25 +0000
+++ src/qt/client/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -50,9 +50,9 @@
 set_target_properties(storage-framework-qt-local-client PROPERTIES
     AUTOMOC TRUE
     LINK_FLAGS "-Wl,--no-undefined"
-    OUTPUT_NAME "storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}"
-    SOVERSION ${SF_CLIENT_SOVERSION}
-    VERSION ${SF_CLIENT_LIBVERSION}
+    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
@@ -70,10 +70,10 @@
 
 configure_file(
     storage-framework-qt-local-client.pc.in
-    storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
+    storage-framework-qt-local-client-1.pc
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-${SF_CLIENT_API_VERSION}.pc
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-local-client-1.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
@@ -104,9 +104,9 @@
 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}
+    OUTPUT_NAME "storage-framework-qt-client-1"
+    SOVERSION 0
+    VERSION 0.0.1
 )
 target_link_libraries(storage-framework-qt-client
     storage-framework-common-internal
@@ -122,10 +122,10 @@
 )
 
 configure_file(
-    storage-framework-qt-client.pc.in
-    storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+    storage-framework-qt-client-1.pc.in
+    storage-framework-qt-client-1.pc
 )
 install(
-    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-${SF_CLIENT_API_VERSION}.pc
+    FILES ${CMAKE_CURRENT_BINARY_DIR}/storage-framework-qt-client-1.pc
     DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )

=== added file 'src/qt/client/storage-framework-qt-client-1.pc.in'
--- src/qt/client/storage-framework-qt-client-1.pc.in	1970-01-01 00:00:00 +0000
+++ src/qt/client/storage-framework-qt-client-1.pc.in	2016-09-21 05:03:46 +0000
@@ -0,0 +1,6 @@
+Name: storage-framework-qt-client-1
+Description: A Qt client library for the storage framework (soon to be deprecated)
+Version: 0.1
+Requires.private: Qt5Core Qt5Network
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-1
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-client-1

=== added file 'src/qt/client/storage-framework-qt-local-client.pc.in'
--- src/qt/client/storage-framework-qt-local-client.pc.in	1970-01-01 00:00:00 +0000
+++ src/qt/client/storage-framework-qt-local-client.pc.in	2016-09-21 05:03:46 +0000
@@ -0,0 +1,6 @@
+Name: storage-framework-qt-local-client-1
+Description: A Qt client library for the storage framework (soon to be deprecated)
+Version: @PROJECT_VERSION@
+Requires.private: Qt5Core Qt5Network
+Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-1
+Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-local-client-1

=== removed file 'src/qt/client/storage-framework-qt-local-client.pc.in'
--- src/qt/client/storage-framework-qt-local-client.pc.in	2016-07-11 03:28:40 +0000
+++ src/qt/client/storage-framework-qt-local-client.pc.in	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-Name: storage-framework-qt-local-client-@SF_CLIENT_API_VERSION@
-Description: A Qt client library for the storage framework
-Version: @PROJECT_VERSION@
-Requires.private: Qt5Core Qt5Network
-Cflags: -I@CMAKE_INSTALL_FULL_INCLUDEDIR@/storage-framework-client-@SF_CLIENT_API_VERSION@
-Libs: -L@CMAKE_INSTALL_FULL_LIBDIR@ -lstorage-framework-qt-local-client-@SF_CLIENT_API_VERSION@

=== added directory 'src/qt/internal'
=== added file 'src/qt/internal/AccountImpl.cpp'
--- src/qt/internal/AccountImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/AccountImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,226 @@
+/*
+ * 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/internal/AccountImpl.h>
+
+#include "ProviderInterface.h"
+#include <unity/storage/qt/Account.h>
+#include <unity/storage/qt/internal/ItemImpl.h>
+#include <unity/storage/qt/internal/ItemJobImpl.h>
+#include <unity/storage/qt/internal/ItemListJobImpl.h>
+#include <unity/storage/qt/internal/RuntimeImpl.h>
+#include <unity/storage/qt/Runtime.h>
+
+#include <boost/functional/hash.hpp>
+
+#include <cassert>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+AccountImpl::AccountImpl()
+    : is_valid_(false)
+{
+}
+
+AccountImpl::AccountImpl(shared_ptr<RuntimeImpl> const& runtime,
+                         QString const& bus_name,
+                         QString const& object_path,
+                         QString const& owner_id,
+                         QString const& owner,
+                         QString const& description)
+    : is_valid_(true)
+    , bus_name_(bus_name)
+    , object_path_(object_path)
+    , owner_id_(owner_id)
+    , owner_(owner)
+    , description_(description)
+    , runtime_(runtime)
+    , provider_(new ProviderInterface(bus_name, object_path, runtime->connection()))
+{
+    assert(!bus_name.isEmpty());
+    assert(!object_path.isEmpty());
+}
+
+QString AccountImpl::owner() const
+{
+    return is_valid_ ? owner_ : "";
+}
+
+QString AccountImpl::ownerId() const
+{
+    return is_valid_ ? owner_id_ : "";
+}
+
+QString AccountImpl::description() const
+{
+    return is_valid_ ? description_ : "";
+}
+
+ItemListJob* AccountImpl::roots() const
+{
+    auto runtime = runtime_.lock();
+    if (!runtime || !runtime->isValid())
+    {
+        auto e = StorageErrorImpl::runtime_destroyed_error("Account::roots(): Runtime was destroyed previously");
+        return ItemListJobImpl::make_item_list_job(e);
+    }
+
+    auto validate = [](storage::internal::ItemMetadata const& md)
+    {
+        if (md.type != ItemType::root)
+        {
+            QString msg = "provider returned non-root item type: " + QString::number(int(md.type));
+            qCritical() << msg;
+            throw StorageErrorImpl::local_comms_error(msg);
+        }
+    };
+
+    QString method = "Account::roots()";
+    auto reply = provider_->Roots();
+    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
+    return ItemListJobImpl::make_item_list_job(This, method, reply, validate);
+}
+
+ItemJob* AccountImpl::get(QString const& itemId) const
+{
+    auto runtime = runtime_.lock();
+    if (!runtime || !runtime->isValid())
+    {
+        auto e = StorageErrorImpl::runtime_destroyed_error("Account::get(): Runtime was destroyed previously");
+        return ItemJobImpl::make_item_job(e);
+    }
+
+    // TODO: use defaulted param?
+    auto validate = [](storage::internal::ItemMetadata const&)
+    {
+    };
+
+    QString method = "Item::get()";
+    auto reply = provider_->Metadata(itemId);
+    auto This = const_pointer_cast<AccountImpl>(shared_from_this());
+    return ItemJobImpl::make_item_job(This, method, reply, validate);
+}
+
+bool AccountImpl::operator==(AccountImpl const& other) const
+{
+    if (is_valid_)
+    {
+        return    other.is_valid_
+               && owner_ == other.owner_
+               && owner_id_ == other.owner_id_
+               && description_ == other.description_;
+    }
+    return !other.is_valid_;
+}
+
+bool AccountImpl::operator!=(AccountImpl const& other) const
+{
+    return !operator==(other);
+}
+
+bool AccountImpl::operator<(AccountImpl const& other) const
+{
+    if (!is_valid_)
+    {
+        return other.is_valid_;
+    }
+    if (is_valid_ && !other.is_valid_)
+    {
+        return false;
+    }
+    assert(is_valid_ && other.is_valid_);
+    if (owner_id_ < other.owner_id_)
+    {
+        return true;
+    }
+    if (owner_id_ > other.owner_id_)
+    {
+        return false;
+    }
+    if (owner_ < other.owner_)
+    {
+        return true;
+    }
+    if (owner_ > other.owner_)
+    {
+        return false;
+    }
+    if (description_ < other.description_)
+    {
+        return true;
+    }
+    return false;
+}
+
+bool AccountImpl::operator<=(AccountImpl const& other) const
+{
+    return operator<(other) || operator==(other);
+}
+
+bool AccountImpl::operator>(AccountImpl const& other) const
+{
+    return !operator<=(other);
+}
+
+bool AccountImpl::operator>=(AccountImpl const& other) const
+{
+    return !operator<(other);
+}
+
+shared_ptr<ProviderInterface> AccountImpl::provider() const
+{
+    return provider_;
+}
+
+size_t AccountImpl::hash() const
+{
+    if (!is_valid_)
+    {
+        return 0;
+    }
+    size_t hash = 0;
+    boost::hash_combine(hash, qHash(owner_));
+    boost::hash_combine(hash, qHash(owner_id_));
+    boost::hash_combine(hash, qHash(description_));
+    return hash;
+}
+
+Account AccountImpl::make_account(shared_ptr<RuntimeImpl> const& runtime,
+                                  QString const& bus_name,
+                                  QString const& object_path,
+                                  QString const& owner_id,
+                                  QString const& owner,
+                                  QString const& description)
+{
+    shared_ptr<AccountImpl> p(new AccountImpl(runtime, bus_name, object_path, owner_id, owner, description));
+    return Account(p);
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/AccountsJobImpl.cpp'
--- src/qt/internal/AccountsJobImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/AccountsJobImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,183 @@
+/*
+ * 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/internal/AccountsJobImpl.h>
+
+#include <unity/storage/qt/internal/AccountImpl.h>
+#include <unity/storage/qt/internal/RuntimeImpl.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+
+#include <OnlineAccounts/Account>
+
+#include <cassert>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+namespace
+{
+
+// TODO: We retrieve the accounts directly from online accounts until we have a working registry.
+
+static map<QString, QString> const BUS_NAMES =
+{
+    { "google-drive-scope", "com.canonical.StorageFramework.Provider.ProviderTest" },
+    { "com.canonical.scopes.mcloud_mcloud_mcloud", "com.canonical.StorageFramework.Provider.McloudProvider" }
+};
+
+}  // namespace
+
+AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, shared_ptr<RuntimeImpl> const& runtime)
+    : public_instance_(public_instance)
+    , status_(AccountsJob::Loading)
+    , runtime_(runtime)
+{
+    assert(public_instance);
+    assert(runtime);
+
+    initialize_accounts();
+}
+
+AccountsJobImpl::AccountsJobImpl(AccountsJob* public_instance, StorageError const& error)
+    : public_instance_(public_instance)
+    , status_(AccountsJob::Loading)
+    , error_(error)
+{
+    assert(public_instance);
+    assert(error.type() != StorageError::NoError);
+
+    status_ = emit_status_changed(AccountsJob::Error);
+}
+
+bool AccountsJobImpl::isValid() const
+{
+    return status_ != AccountsJob::Status::Error;
+}
+
+AccountsJob::Status AccountsJobImpl::status() const
+{
+    return status_;
+}
+
+StorageError AccountsJobImpl::error() const
+{
+    return error_;
+}
+
+QList<Account> AccountsJobImpl::accounts() const
+{
+    auto runtime = get_runtime("AccountsJob::accounts()");
+    if (!runtime)
+    {
+        return QList<Account>();
+    }
+    if (status_ != AccountsJob::Finished)
+    {
+        return QList<Account>();
+    }
+    return accounts_;
+}
+
+void AccountsJobImpl::manager_ready()
+{
+    timer_.stop();
+    disconnect(this);
+    initialize_accounts();
+}
+
+// LCOV_EXCL_START
+void AccountsJobImpl::timeout()
+{
+    disconnect(this);
+    error_ = StorageErrorImpl::local_comms_error("AccountsJob(): timeout retrieving Online accounts");
+    status_ = emit_status_changed(AccountsJob::Error);
+}
+// LCOV_EXCL_STOP
+
+AccountsJob::Status AccountsJobImpl::emit_status_changed(AccountsJob::Status new_status) const
+{
+    if (status_ == AccountsJob::Loading)  // Once in a final state, we don't emit the signal again.
+    {
+        // We defer emission of the signal so the client gets a chance to connect to the signal
+        // in case we emit the signal from the constructor.
+        QMetaObject::invokeMethod(public_instance_,
+                                  "statusChanged",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(unity::storage::qt::AccountsJob::Status, new_status));
+    }
+    return new_status;
+}
+
+shared_ptr<RuntimeImpl> AccountsJobImpl::get_runtime(QString const& method) const
+{
+    auto runtime = runtime_.lock();
+    if (!runtime || !runtime->isValid())
+    {
+        QString msg = method + ": Runtime was destroyed previously";
+        auto This = const_cast<AccountsJobImpl*>(this);
+        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
+        This->status_ = emit_status_changed(AccountsJob::Error);
+    }
+    return runtime;
+}
+
+void AccountsJobImpl::initialize_accounts()
+{
+    auto runtime = get_runtime("AccountsJob()");
+    assert(runtime);
+
+    auto manager = runtime->accounts_manager();
+    if (!manager->isReady())
+    {
+        connect(manager.get(), &OnlineAccounts::Manager::ready, this, &AccountsJobImpl::manager_ready);
+        connect(&timer_, &QTimer::timeout, this, &AccountsJobImpl::timeout);
+        timer_.setSingleShot(true);
+        timer_.start(30000);  // TODO: Need config for this eventually.
+        return;
+    }
+
+    for (auto const map_entry : BUS_NAMES)
+    {
+        auto service_id = map_entry.first;
+        for (auto const& a : manager->availableAccounts(service_id))
+        {
+            auto object_path = QStringLiteral("/provider/%1").arg(a->id());
+            auto bus_name = map_entry.second;
+            accounts_.append(AccountImpl::make_account(runtime,
+                                                       bus_name,
+                                                       object_path,
+                                                       a->serviceId(),
+                                                       "",
+                                                       a->displayName()));
+        }
+    }
+    status_ = emit_status_changed(AccountsJob::Finished);
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/HandlerBase.cpp'
--- src/qt/internal/HandlerBase.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/HandlerBase.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,59 @@
+/*
+ * 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/internal/HandlerBase.h>
+
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wctor-dtor-privacy"
+#include <QFuture>
+#pragma GCC diagnostic pop
+
+#include <cassert>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+HandlerBase::HandlerBase(QObject* parent,
+                         QDBusPendingCall const& call,
+                         function<void(QDBusPendingCallWatcher&)> const& closure)
+    : QObject(parent)
+    , watcher_(call)
+    , closure_(closure)
+{
+    assert(closure);
+    connect(&watcher_, &QDBusPendingCallWatcher::finished, this, &HandlerBase::finished);
+}
+
+void HandlerBase::finished(QDBusPendingCallWatcher* call)
+{
+    deleteLater();
+    closure_(*call);
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/ItemImpl.cpp'
--- src/qt/internal/ItemImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/ItemImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,248 @@
+/*
+ * 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/internal/ItemImpl.h>
+
+#include "ProviderInterface.h"
+#include <unity/storage/provider/metadata_keys.h>
+#include <unity/storage/qt/internal/AccountImpl.h>
+#include <unity/storage/qt/internal/ItemJobImpl.h>
+#include <unity/storage/qt/internal/RuntimeImpl.h>
+#include <unity/storage/qt/internal/validate.h>
+
+#include <cassert>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+ItemImpl::ItemImpl()
+    : is_valid_(false)
+{
+    md_.type = storage::ItemType::file;
+}
+
+ItemImpl::ItemImpl(storage::internal::ItemMetadata const& md,
+                   std::shared_ptr<AccountImpl> const& account)
+    : is_valid_(true)
+    , md_(md)
+    , account_(account)
+{
+    assert(account);
+}
+
+QString ItemImpl::itemId() const
+{
+    return is_valid_ ? md_.item_id : "";
+}
+
+QString ItemImpl::name() const
+{
+    return is_valid_ ? md_.name : "";
+}
+
+Account ItemImpl::account() const
+{
+    return is_valid_ ? account_ : Account();
+}
+
+#if 0
+Item ItemImpl::root() const
+{
+    return is_valid_ ? root_ : Item();
+}
+#endif
+
+QString ItemImpl::etag() const
+{
+    return is_valid_ ? md_.etag : "";
+}
+
+Item::Type ItemImpl::type() const
+{
+    switch (md_.type)
+    {
+        case storage::ItemType::file:
+            return Item::File;
+        case storage::ItemType::folder:
+            return Item::Folder;
+        case storage::ItemType::root:
+            return Item::Root;
+        default:
+            abort();  // LCOV_EXCL_LINE // Impossible
+    }
+}
+
+QVariantMap ItemImpl::metadata() const
+{
+    // TODO: Need to agree on metadata representation.
+    return is_valid_ ? QVariantMap() : QVariantMap();
+}
+
+QDateTime ItemImpl::lastModifiedTime() const
+{
+    return is_valid_ ? QDateTime::fromString(md_.metadata.value(provider::LAST_MODIFIED_TIME).toString(), Qt::ISODate)
+                     : QDateTime();
+}
+
+QVector<QString> ItemImpl::parentIds() const
+{
+    return is_valid_ ? md_.parent_ids : QVector<QString>();
+}
+
+ItemListJob* ItemImpl::parents() const
+{
+    return nullptr;  // TODO
+}
+
+ItemJob* ItemImpl::copy(Item const& newParent, QString const& newName) const
+{
+    return nullptr;  // TODO
+}
+
+ItemJob* ItemImpl::move(Item const& newParent, QString const& newName) const
+{
+    return nullptr;  // TODO
+}
+
+VoidJob* ItemImpl::deleteItem() const
+{
+    return nullptr;  // TODO
+}
+
+Uploader* ItemImpl::createUploader(ConflictPolicy policy, qint64 sizeInBytes) const
+{
+    return nullptr;  // TODO
+}
+
+Downloader* ItemImpl::createDownloader() const
+{
+    return nullptr;  // TODO
+}
+
+ItemListJob* ItemImpl::list() const
+{
+    return nullptr;  // TODO
+}
+
+ItemListJob* ItemImpl::lookup(QString const& name) const
+{
+    return nullptr;  // TODO
+}
+
+ItemJob* ItemImpl::createFolder(QString const& name) const
+{
+    return nullptr;  // TODO
+}
+
+Uploader* ItemImpl::createFile(QString const& name) const
+{
+    return nullptr;  // TODO
+}
+
+IntJob* ItemImpl::freeSpaceBytes() const
+{
+    return nullptr;  // TODO
+}
+
+IntJob* ItemImpl::usedSpaceBytes() const
+{
+    return nullptr;  // TODO
+}
+
+bool ItemImpl::operator==(ItemImpl const& other) const
+{
+    if (is_valid_)
+    {
+        return other.is_valid_ && md_.item_id == other.md_.item_id;
+    }
+    return !other.is_valid_;
+}
+
+bool ItemImpl::operator!=(ItemImpl const& other) const
+{
+    return !operator==(other);
+}
+
+bool ItemImpl::operator<(ItemImpl const& other) const
+{
+    if (is_valid_)
+    {
+        return other.is_valid_ && md_.item_id < other.md_.item_id;
+    }
+    return other.is_valid_;
+}
+
+bool ItemImpl::operator<=(ItemImpl const& other) const
+{
+    return operator<(other) or operator==(other);
+}
+
+bool ItemImpl::operator>(ItemImpl const& other) const
+{
+    return !operator<=(other);
+}
+
+bool ItemImpl::operator>=(ItemImpl const& other) const
+{
+    return !operator<(other);
+}
+
+size_t ItemImpl::hash() const
+{
+    if (!is_valid_)
+    {
+        return 0;
+    }
+    return qHash(md_.item_id);
+}
+
+Item ItemImpl::make_item(QString const& method,
+                         storage::internal::ItemMetadata const& md,
+                         std::shared_ptr<AccountImpl> const& account)
+{
+    validate(method, md);  // Throws if no good.
+    auto p = make_shared<ItemImpl>(md, account);
+    return Item(p);
+}
+
+#if 0
+shared_ptr<RuntimeImpl> ItemImpl::get_runtime(QString const& method) const
+{
+    auto runtime = account_->runtime_.lock();
+    if (!runtime || !runtime->isValid())
+    {
+        QString msg = method + ": Runtime was destroyed previously";
+        auto This = const_cast<ItemImpl*>(this);
+        This->error_ = StorageErrorImpl::runtime_destroyed_error(msg);
+    }
+    return runtime;
+}
+#endif
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/ItemJobImpl.cpp'
--- src/qt/internal/ItemJobImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/ItemJobImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,138 @@
+/*
+ * 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/internal/ItemJobImpl.h>
+
+#include <unity/storage/internal/dbusmarshal.h>
+#include <unity/storage/internal/ItemMetadata.h>
+#include <unity/storage/qt/internal/Handler.h>
+#include <unity/storage/qt/internal/ItemImpl.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+ItemJobImpl::ItemJobImpl(shared_ptr<AccountImpl> const& account,
+                         QString const& method,
+                         QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
+                         std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+    : status_(ItemJob::Loading)
+    , method_(method)
+    , account_(account)
+    , validate_(validate)
+{
+    assert(!method.isEmpty());
+    assert(account);
+    assert(validate);
+
+    auto process_reply = [this](decltype(reply)& r)
+    {
+        auto metadata = r.value();
+        try
+        {
+            validate_(metadata);
+            item_ = ItemImpl::make_item(method_, metadata, account_);
+            status_ = emit_status_changed(ItemJob::Finished);
+        }
+        catch (StorageError const& e)
+        {
+            // Bad metadata received from provider, validate_() or make_item() have logged it.
+            error_ = e;
+            status_ = emit_status_changed(ItemJob::Error);
+        }
+    };
+
+    auto process_error = [this](StorageError const& error)
+    {
+        error_ = error;
+        status_ = emit_status_changed(ItemJob::Error);
+    };
+
+    new Handler<storage::internal::ItemMetadata>(this, reply, process_reply, process_error);
+}
+
+ItemJobImpl::ItemJobImpl(StorageError const& error)
+    : status_(ItemJob::Loading)
+    , error_(error)
+{
+}
+
+bool ItemJobImpl::isValid() const
+{
+    return status_ != ItemJob::Status::Error;
+}
+
+ItemJob::Status ItemJobImpl::status() const
+{
+    return status_;
+}
+
+StorageError ItemJobImpl::error() const
+{
+    return error_;
+}
+
+Item ItemJobImpl::item() const
+{
+    return Item();  // TODO
+}
+
+ItemJob* ItemJobImpl::make_item_job(shared_ptr<AccountImpl> const& account,
+                                    QString const& method,
+                                    QDBusPendingReply<storage::internal::ItemMetadata> const& reply,
+                                    std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+{
+    unique_ptr<ItemJobImpl> impl(new ItemJobImpl(account, method, reply, validate));
+    auto job = new ItemJob(move(impl));
+    job->p_->public_instance_ = job;
+    return job;
+}
+
+ItemJob* ItemJobImpl::make_item_job(StorageError const& error)
+{
+    unique_ptr<ItemJobImpl> impl(new ItemJobImpl(error));
+    auto job = new ItemJob(move(impl));
+    job->p_->public_instance_ = job;
+    job->p_->status_ = job->p_->emit_status_changed(ItemJob::Error);
+    return job;
+}
+
+ItemJob::Status ItemJobImpl::emit_status_changed(ItemJob::Status new_status) const
+{
+    // TODO: should be an assert!
+    if (status_ == ItemJob::Loading)  // Once in a final state, we don't emit the signal again.
+    {
+        QMetaObject::invokeMethod(public_instance_,
+                                  "statusChanged",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(unity::storage::qt::ItemJob::Status, new_status));
+    }
+    return new_status;
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/ItemListJobImpl.cpp'
--- src/qt/internal/ItemListJobImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/ItemListJobImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,148 @@
+/*
+ * 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/internal/ItemListJobImpl.h>
+
+#include <unity/storage/internal/dbusmarshal.h>
+#include <unity/storage/internal/ItemMetadata.h>
+#include <unity/storage/qt/internal/Handler.h>
+#include <unity/storage/qt/internal/ItemImpl.h>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+ItemListJobImpl::ItemListJobImpl(shared_ptr<AccountImpl> const& account,
+                                 QString const& method,
+                                 QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
+                                 std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+    : status_(ItemListJob::Loading)
+    , method_(method)
+    , account_(account)
+    , validate_(validate)
+{
+    assert(!method.isEmpty());
+    assert(account);
+    assert(validate);
+
+    auto process_reply = [this](decltype(reply)& r)
+    {
+        QList<Item> items;
+        auto metadata = r.value();
+        for (auto const& md : metadata)
+        {
+            try
+            {
+                validate_(md);
+                auto item = ItemImpl::make_item(method_, md, account_);
+                items.append(item);
+            }
+            catch (StorageError const&)
+            {
+                // Bad metadata received from provider, validate_() or make_item() have logged it.
+            }
+        }
+        emit_items_ready(items);
+        status_ = emit_status_changed(ItemListJob::Finished);
+    };
+
+    auto process_error = [this](StorageError const& error)
+    {
+        error_ = error;
+        status_ = emit_status_changed(ItemListJob::Error);
+    };
+
+    new Handler<QList<storage::internal::ItemMetadata>>(this, reply, process_reply, process_error);
+}
+
+ItemListJobImpl::ItemListJobImpl(StorageError const& error)
+    : status_(ItemListJob::Loading)
+    , error_(error)
+{
+}
+
+bool ItemListJobImpl::isValid() const
+{
+    return status_ != ItemListJob::Status::Error;
+}
+
+ItemListJob::Status ItemListJobImpl::status() const
+{
+    return status_;
+}
+
+StorageError ItemListJobImpl::error() const
+{
+    return error_;
+}
+
+ItemListJob* ItemListJobImpl::make_item_list_job(
+                                shared_ptr<AccountImpl> const& account,
+                                QString const& method,
+                                QDBusPendingReply<QList<storage::internal::ItemMetadata>> const& reply,
+                                std::function<void(storage::internal::ItemMetadata const&)> const& validate)
+{
+    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(account, method, reply, validate));
+    auto job = new ItemListJob(move(impl));
+    job->p_->public_instance_ = job;
+    return job;
+}
+
+ItemListJob* ItemListJobImpl::make_item_list_job(StorageError const& error)
+{
+    unique_ptr<ItemListJobImpl> impl(new ItemListJobImpl(error));
+    auto job = new ItemListJob(move(impl));
+    job->p_->public_instance_ = job;
+    job->p_->status_ = job->p_->emit_status_changed(ItemListJob::Error);
+    return job;
+}
+
+ItemListJob::Status ItemListJobImpl::emit_status_changed(ItemListJob::Status new_status) const
+{
+    // TODO: use assert
+    if (status_ == ItemListJob::Loading)  // Once in a final state, we don't emit the signal again.
+    {
+        // We defer emission of the signal so the client gets a chance to connect to the signal
+        // in case we emit the signal from the constructor.
+        QMetaObject::invokeMethod(public_instance_,
+                                  "statusChanged",
+                                  Qt::QueuedConnection,
+                                  Q_ARG(unity::storage::qt::ItemListJob::Status, new_status));
+    }
+    return new_status;
+}
+
+void ItemListJobImpl::emit_items_ready(QList<Item> const& items) const
+{
+    QMetaObject::invokeMethod(public_instance_,
+                              "itemsReady",
+                              Qt::QueuedConnection,
+                              Q_ARG(QList<unity::storage::qt::Item>, items));
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/RuntimeImpl.cpp'
--- src/qt/internal/RuntimeImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/RuntimeImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,168 @@
+/*
+ * 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/internal/RuntimeImpl.h>
+
+#include <unity/storage/internal/dbusmarshal.h>
+#include <unity/storage/qt/AccountsJob.h>
+#include <unity/storage/qt/internal/AccountImpl.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+#include <unity/storage/qt/Item.h>
+#include <unity/storage/qt/ItemJob.h>
+#include <unity/storage/qt/ItemListJob.h>
+#include <unity/storage/qt/Runtime.h>
+
+#include <QDBusError>
+#include <QDBusMetaType>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+namespace
+{
+
+void register_meta_types()
+{
+    qRegisterMetaType<unity::storage::qt::AccountsJob::Status>();
+    qRegisterMetaType<unity::storage::qt::Item>();
+    qRegisterMetaType<QList<unity::storage::qt::Item>>();
+    qRegisterMetaType<unity::storage::qt::ItemJob::Status>();
+    qRegisterMetaType<unity::storage::qt::ItemListJob::Status>();
+
+    qDBusRegisterMetaType<unity::storage::internal::ItemMetadata>();
+    qDBusRegisterMetaType<QList<unity::storage::internal::ItemMetadata>>();
+}
+
+}
+
+// TODO: chain the two constructors.
+RuntimeImpl::RuntimeImpl()
+    : is_valid_(true)
+    , conn_(QDBusConnection::sessionBus())
+    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
+{
+    register_meta_types();
+
+#if 0
+    if (!conn_.isConnected())
+    {
+        // LCOV_EXCL_START
+        is_valid_ = false;
+        QString msg = "Runtime(): cannot connect to session bus: " + conn_.lastError().message();
+        error_ = StorageErrorImpl::local_comms_error(msg);
+        // LCOV_EXCL_STOP
+    }
+#endif
+}
+
+RuntimeImpl::RuntimeImpl(QDBusConnection const& bus)
+    : is_valid_(true)
+    , conn_(bus)
+    , accounts_manager_(new OnlineAccounts::Manager("", conn_))
+{
+    register_meta_types();
+
+#if 0
+    if (!conn_.isConnected())
+    {
+        is_valid_ = false;
+        QString msg = "Runtime(): DBus connection is not connected";
+        error_ = StorageErrorImpl::local_comms_error(msg);
+    }
+#endif
+}
+
+RuntimeImpl::~RuntimeImpl()
+{
+    shutdown();
+}
+
+bool RuntimeImpl::isValid() const
+{
+    return is_valid_;
+}
+
+StorageError RuntimeImpl::error() const
+{
+    return error_;
+}
+
+QDBusConnection RuntimeImpl::connection() const
+{
+    return conn_;
+}
+
+AccountsJob* RuntimeImpl::accounts() const
+{
+    if (!is_valid_)
+    {
+        QString msg = "Runtime::accounts(): Runtime was destroyed previously";
+        return new AccountsJob(StorageErrorImpl::runtime_destroyed_error(msg));
+    }
+    auto This = const_cast<RuntimeImpl*>(this);
+    return new AccountsJob(This->shared_from_this());
+}
+
+StorageError RuntimeImpl::shutdown()
+{
+    if (is_valid_)
+    {
+        conn_.disconnectFromBus(conn_.name());
+        is_valid_ = false;
+        return StorageError();
+    }
+    error_ = StorageErrorImpl::runtime_destroyed_error("Runtime::shutdown(): Runtime was destroyed previously");
+    return error_;
+}
+
+shared_ptr<OnlineAccounts::Manager> RuntimeImpl::accounts_manager() const
+{
+    return accounts_manager_;
+}
+
+Account RuntimeImpl::make_test_account(QString const& bus_name,
+                                       QString const& object_path)
+{
+    return make_test_account(bus_name, object_path, "", "", "");
+}
+
+Account RuntimeImpl::make_test_account(QString const& bus_name,
+                                       QString const& object_path,
+                                       QString const& owner_id,
+                                       QString const& owner,
+                                       QString const& description)
+{
+    return AccountImpl::make_account(shared_from_this(),
+                                     bus_name,
+                                     object_path,
+                                     owner_id,
+                                     owner,
+                                     description);
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/StorageErrorImpl.cpp'
--- src/qt/internal/StorageErrorImpl.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/StorageErrorImpl.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,230 @@
+/*
+ * 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/internal/StorageErrorImpl.h>
+
+#include <cassert>
+#include <memory>
+
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+namespace
+{
+
+static char const * const ERROR_NAMES[StorageError::__LAST_STORAGE_ERROR] =
+{
+    "NoError", "LocalCommsError", "RemoteCommsError", "Deleted", "RuntimeDestroyed", "NotExists",
+    "Exists", "Conflict", "PermissionDenied", "Cancelled", "LogicError", "InvalidArgument", "ResourceError"
+};
+
+}  // namespace
+
+StorageErrorImpl::StorageErrorImpl()
+    : type_(StorageError::Type::NoError)
+    , name_(ERROR_NAMES[type_])
+    , message_("No error")
+    , error_code_(0)
+{
+}
+
+StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg)
+    : type_(type)
+    , name_(ERROR_NAMES[type_])
+    , message_(msg)
+    , error_code_(0)
+{
+    assert(   type == StorageError::Type::LocalCommsError
+           || type == StorageError::Type::RemoteCommsError
+           || type == StorageError::Type::RuntimeDestroyed
+           || type == StorageError::Type::Conflict
+           || type == StorageError::Type::PermissionDenied
+           || type == StorageError::Type::Cancelled
+           || type == StorageError::Type::LogicError
+           || type == StorageError::Type::InvalidArgument);
+    assert(!msg.isEmpty());
+}
+
+StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg, QString const& key)
+    : type_(type)
+    , name_(ERROR_NAMES[type_])
+    , message_(msg)
+    , error_code_(0)
+{
+    assert(   type == StorageError::Type::Deleted
+           || type == StorageError::Type::NotExists);
+    assert(!msg.isEmpty());
+
+    item_id_ = key;
+    if (type == StorageError::Type::NotExists)
+    {
+        item_name_ = key;
+    }
+}
+
+StorageErrorImpl::StorageErrorImpl(StorageError::Type type,
+                                   QString const& msg,
+                                   QString const& item_id,
+                                   QString const& item_name)
+    : type_(type)
+    , name_(ERROR_NAMES[type_])
+    , message_(msg)
+    , item_id_(item_id)
+    , item_name_(item_name)
+    , error_code_(0)
+{
+    assert(type == StorageError::Type::Exists);
+    assert(!msg.isEmpty());
+    assert(!item_id.isEmpty());
+    assert(!item_name.isEmpty());
+}
+
+StorageErrorImpl::StorageErrorImpl(StorageError::Type type, QString const& msg, int error_code)
+    : type_(type)
+    , message_(msg)
+    , error_code_(error_code)
+{
+    assert(type == StorageError::Type::ResourceError);
+    assert(!msg.isEmpty());
+}
+
+StorageError::Type StorageErrorImpl::type() const
+{
+    return type_;
+}
+
+QString StorageErrorImpl::name() const
+{
+    return name_;
+}
+
+QString StorageErrorImpl::message() const
+{
+    return message_;
+}
+
+QString StorageErrorImpl::errorString() const
+{
+    return name_ + ": " + message_;
+}
+
+QString StorageErrorImpl::itemId() const
+{
+    return item_id_;
+}
+
+QString StorageErrorImpl::itemName() const
+{
+    return item_name_;
+}
+
+int StorageErrorImpl::errorCode() const
+{
+    return error_code_;
+}
+
+StorageError StorageErrorImpl::make_error(StorageError::Type type, QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(type, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::local_comms_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::LocalCommsError, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::remote_comms_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::RemoteCommsError, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::deleted_error(QString const& msg, QString const& item_id)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Deleted, msg, item_id));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::runtime_destroyed_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::RuntimeDestroyed, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::not_exists_error(QString const& msg, QString const& key)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::NotExists, msg, key));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::exists_error(QString const& msg, QString const& item_id, QString const& item_name)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Exists, msg, item_id, item_name));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::conflict_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Conflict, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::permission_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::PermissionDenied, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::cancelled_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::Cancelled, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::logic_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::LogicError, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::invalid_argument_error(QString const& msg)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::InvalidArgument, msg));
+    return StorageError(move(p));
+}
+
+StorageError StorageErrorImpl::resource_error(QString const& msg, int error_code)
+{
+    unique_ptr<StorageErrorImpl> p(new StorageErrorImpl(StorageError::Type::ResourceError, msg, error_code));
+    return StorageError(move(p));
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/unmarshal_error.cpp'
--- src/qt/internal/unmarshal_error.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/unmarshal_error.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,131 @@
+/*
+ * 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/internal/unmarshal_error.h>
+
+#include <unity/storage/internal/dbus_error.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+
+#include <QDBusPendingReply>
+
+#include <cassert>
+#include <map>
+
+using namespace unity::storage::internal;
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+namespace
+{
+
+template<StorageError::Type T>
+StorageError make_error(QDBusPendingCallWatcher const& call)
+{
+    QDBusPendingReply<QString> reply = call;
+    auto msg = reply.argumentAt<0>();
+    return StorageErrorImpl::make_error(T, msg);
+}
+
+template<>
+StorageError make_error<StorageError::NotExists>(QDBusPendingCallWatcher const& call)
+{
+    QDBusPendingReply<QString, QString> reply = call;
+    auto msg = reply.argumentAt<0>();
+    auto key = reply.argumentAt<1>();
+    return StorageErrorImpl::not_exists_error(msg, key);
+}
+
+template<>
+StorageError make_error<StorageError::Exists>(QDBusPendingCallWatcher const& call)
+{
+    QDBusPendingReply<QString, QString, QString> reply = call;
+    auto msg = reply.argumentAt<0>();
+    auto id = reply.argumentAt<1>();
+    auto name = reply.argumentAt<2>();
+    return StorageErrorImpl::exists_error(msg, id, name);
+}
+
+template<>
+StorageError make_error<StorageError::ResourceError>(QDBusPendingCallWatcher const& call)
+{
+    QDBusPendingReply<QString, int> reply = call;
+    auto msg = reply.argumentAt<0>();
+    auto error_code = reply.argumentAt<1>();
+    return StorageErrorImpl::resource_error(msg, error_code);
+}
+
+static const map<QString, function<StorageError(QDBusPendingCallWatcher const& call)>> exception_factories =
+{
+    { "RemoteCommsException",     make_error<StorageError::RemoteCommsError> },
+    { "NotExistsException",       make_error<StorageError::NotExists> },
+    { "ExistsException",          make_error<StorageError::Exists> },
+    { "ConflictException",        make_error<StorageError::Conflict> },
+    { "PermissionException",      make_error<StorageError::PermissionDenied> },
+    { "CancelledException",       make_error<StorageError::Cancelled> },
+    { "LogicException",           make_error<StorageError::LogicError> },
+    { "InvalidArgumentException", make_error<StorageError::InvalidArgument> },
+    { "ResourceException",        make_error<StorageError::ResourceError> },
+    { "QuotaException",           make_error<StorageError::QuotaExceeded> },
+    { "UnknownException",         make_error<StorageError::LocalCommsError> }  // Yes, LocalCommsError is intentional
+};
+
+}  // namespace
+
+StorageError unmarshal_error(QDBusPendingCallWatcher const& call)
+{
+    assert(call.isError());
+
+    int err = call.error().type();
+    if (err != QDBusError::Other)
+    {
+        // Some DBus error that doesn't represent a StorageError.
+        return StorageErrorImpl::local_comms_error(call.error().message());
+    }
+
+    auto exception_type = call.error().name();
+    if (!exception_type.startsWith(DBUS_ERROR_PREFIX))
+    {
+        // Some error with the wrong prefix (should never happen unless the server is broken).
+        QString msg = "unmarshal_exception(): unknown exception type received from server: " + exception_type
+                      + ": " + call.error().message();
+        return StorageErrorImpl::local_comms_error(msg);
+    }
+    exception_type = exception_type.remove(0, strlen(DBUS_ERROR_PREFIX));
+
+    auto factory_it = exception_factories.find(exception_type);
+    if (factory_it == exception_factories.end())
+    {
+        // Some StorageError that we don't recognize.
+        QString msg = "unmarshal_exception(): unknown exception type received from server: " + exception_type
+                      + ": " + call.error().message();
+        return StorageErrorImpl::local_comms_error(msg);
+    }
+    return factory_it->second(call);
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== added file 'src/qt/internal/validate.cpp'
--- src/qt/internal/validate.cpp	1970-01-01 00:00:00 +0000
+++ src/qt/internal/validate.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,170 @@
+/*
+ * 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/internal/validate.h>
+
+#include <unity/storage/internal/ItemMetadata.h>
+#include <unity/storage/provider/metadata_keys.h>
+#include <unity/storage/qt/internal/StorageErrorImpl.h>
+
+#include <QDateTime>
+#include <QDebug>
+#include <QString>
+
+using namespace unity::storage::internal;
+using namespace std;
+
+namespace unity
+{
+namespace storage
+{
+namespace qt
+{
+namespace internal
+{
+
+namespace
+{
+
+// Check that actual type and value match the expect type and value for a particular metadata entry.
+
+void validate_type_and_value(QString const& prefix,
+                             QMapIterator<QString, QVariant> actual,
+                             unordered_map<string, provider::MetadataType>::const_iterator known)
+{
+    using namespace unity::storage::provider;
+
+    switch (known->second)
+    {
+        case MetadataType::iso_8601_date_time:
+        {
+            if (actual.value().type() != QVariant::String)
+            {
+                QString msg = prefix + actual.key() + ": expected value of type String, but received value of type "
+                              + actual.value().typeName();
+                throw StorageErrorImpl::local_comms_error(msg);
+            }
+            QDateTime dt = QDateTime::fromString(actual.value().toString(), Qt::ISODate);
+            if (!dt.isValid())
+            {
+                QString msg = prefix + actual.key() + ": value \"" + actual.value().toString()
+                              + "\" does not parse as ISO-8601 date";
+                throw StorageErrorImpl::local_comms_error(msg);
+            }
+            auto timespec = dt.timeSpec();
+            if (timespec == Qt::LocalTime)
+            {
+                QString msg = prefix + actual.key() + ": value \"" + actual.value().toString()
+                              + "\" lacks a time zone specification";
+                throw StorageErrorImpl::local_comms_error(msg);
+            }
+            break;
+        }
+        case MetadataType::int64:
+        {
+            if (actual.value().type() != QVariant::LongLong)
+            {
+                QString msg = prefix + actual.key() + ": expected value of type LongLong, but received value of type "
+                              + actual.value().typeName();
+                throw StorageErrorImpl::local_comms_error(msg);
+            }
+            break;
+        }
+        default:
+        {
+            abort();  // Impossible.  // LCOV_EXCL_LINE
+        }
+    }
+}
+
+}  // namespace
+
+void validate(QString const& method, ItemMetadata const& md)
+{
+    using namespace unity::storage::provider;
+
+    QString prefix = method + ": received invalid metadata from provider: ";
+
+    // Basic sanity checks for mandatory fields.
+    if (md.item_id.isEmpty())
+    {
+        throw StorageErrorImpl::local_comms_error(prefix + "item_id cannot be empty");
+    }
+    if (md.type != ItemType::root)
+    {
+        if (md.parent_ids.isEmpty())
+        {
+            throw StorageErrorImpl::local_comms_error(prefix + "file or folder must have at least one parent ID");
+        }
+        for (int i = 0; i < md.parent_ids.size(); ++i)
+        {
+            if (md.parent_ids.at(i).isEmpty())
+            {
+                throw StorageErrorImpl::local_comms_error(prefix + "parent_id of file or folder cannot be empty");
+            }
+        }
+    }
+    if (md.type == ItemType::root && !md.parent_ids.isEmpty())
+    {
+        throw StorageErrorImpl::local_comms_error(prefix + "metadata: parent_ids of root must be empty");
+    }
+    if (md.name.isEmpty())
+    {
+        throw StorageErrorImpl::local_comms_error(prefix + "name cannot be empty");
+    }
+    if (md.etag.isEmpty())
+    {
+        throw StorageErrorImpl::local_comms_error(prefix + "etag cannot be empty");
+    }
+
+    // Sanity check metadata to make sure only known metadata keys appear.
+    QMapIterator<QString, QVariant> actual(md.metadata);
+    while (actual.hasNext())
+    {
+        actual.next();
+        auto known = known_metadata.find(actual.key().toStdString());
+        if (known == known_metadata.end())
+        {
+            qWarning() << prefix << "unknown metadata key:" << actual.key();
+        }
+        else
+        {
+            validate_type_and_value(prefix, actual, known);
+        }
+    }
+
+    // Sanity check metadata to make sure that mandatory fields are present.
+    if (md.type == ItemType::file)
+    {
+        if (!md.metadata.contains(SIZE_IN_BYTES))
+        {
+            QString msg = prefix + "missing key " + SIZE_IN_BYTES + " in metadata for " + md.item_id;
+            throw StorageErrorImpl::local_comms_error(msg);
+        }
+        if (!md.metadata.contains(LAST_MODIFIED_TIME))
+        {
+            QString msg = prefix + "missing key " + LAST_MODIFIED_TIME + " in metadata for " + md.item_id;
+            throw StorageErrorImpl::local_comms_error(msg);
+        }
+    }
+}
+
+}  // namespace internal
+}  // namespace qt
+}  // namespace storage
+}  // namespace unity

=== renamed file 'src/qt/client/storage-framework-qt-client.pc.in' => 'src/qt/storage-framework-qt-client.pc.in'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2016-08-11 04:20:06 +0000
+++ tests/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -14,6 +14,7 @@
 set(unit_test_dirs
     local-client
     remote-client
+    remote-client-v1
     provider-AccountData
     provider-DBusPeerCache
     provider-ProviderInterface

=== modified file 'tests/headers/CMakeLists.txt'
--- tests/headers/CMakeLists.txt	2016-08-22 04:35:33 +0000
+++ tests/headers/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -7,6 +7,7 @@
 set(subdirs
     unity/storage
     unity/storage/provider
+    unity/storage/qt
     unity/storage/qt/client
     unity/storage/qt/client/internal/local_client
     unity/storage/qt/client/internal/remote_client

=== added directory 'tests/remote-client'
=== renamed directory 'tests/remote-client' => 'tests/remote-client-v1'
=== modified file 'tests/remote-client-v1/CMakeLists.txt'
--- tests/remote-client/CMakeLists.txt	2016-08-18 04:54:24 +0000
+++ tests/remote-client-v1/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -1,10 +1,10 @@
-add_executable(remote-client_test remote-client_test.cpp MockProvider.cpp)
-set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
+add_executable(remote-client-v1_test remote-client-v1_test.cpp MockProvider.cpp)
+set_target_properties(remote-client-v1_test PROPERTIES AUTOMOC TRUE)
 
 add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
 include_directories(${GLIB_DEPS_INCLUDE_DIRS})
 
-target_link_libraries(remote-client_test
+target_link_libraries(remote-client-v1_test
     storage-framework-provider
     storage-framework-qt-client
     Qt5::Network
@@ -14,7 +14,7 @@
     testutils
     gtest
 )
-add_test(remote-client remote-client_test)
-add_dependencies(remote-client_test qt-client-all-headers provider-test)
+add_test(remote-client-v1 remote-client-v1_test)
+add_dependencies(remote-client-v1_test qt-client-all-headers provider-test)
 
 set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)

=== renamed file 'tests/remote-client/remote-client_test.cpp' => 'tests/remote-client-v1/remote-client-v1_test.cpp'
--- tests/remote-client/remote-client_test.cpp	2016-09-02 02:56:52 +0000
+++ tests/remote-client-v1/remote-client-v1_test.cpp	2016-09-21 05:03:46 +0000
@@ -81,6 +81,7 @@
     void SetUp() override
     {
         runtime_ = Runtime::create(connection());
+        //acc_ = runtime_->make_test_account(service_connection_->baseService(), impossible_name());
         acc_ = runtime_->make_test_account(bus_name(), object_path());
     }
 

=== added file 'tests/remote-client/CMakeLists.txt'
--- tests/remote-client/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ tests/remote-client/CMakeLists.txt	2016-09-21 05:03:46 +0000
@@ -0,0 +1,20 @@
+add_executable(remote-client_test remote-client_test.cpp MockProvider.cpp)
+set_target_properties(remote-client_test PROPERTIES AUTOMOC TRUE)
+
+add_definitions(-DTEST_DIR="${CMAKE_CURRENT_BINARY_DIR}" -DBOOST_THREAD_VERSION=4)
+include_directories(${GLIB_DEPS_INCLUDE_DIRS})
+
+target_link_libraries(remote-client_test
+    storage-framework-provider
+    storage-framework-qt-client-v2
+    Qt5::Network
+    Qt5::Test
+    ${Boost_LIBRARIES}
+    ${GLIB_DEPS_LIBRARIES}
+    testutils
+    gtest
+)
+add_test(remote-client remote-client_test)
+add_dependencies(remote-client_test qt-client-all-headers provider-test)
+
+set(UNIT_TEST_TARGETS ${UNIT_TEST_TARGETS} PARENT_SCOPE)

=== added file 'tests/remote-client/MockProvider.cpp'
--- tests/remote-client/MockProvider.cpp	1970-01-01 00:00:00 +0000
+++ tests/remote-client/MockProvider.cpp	2016-09-21 05:03:46 +0000
@@ -0,0 +1,237 @@
+/*
+ * 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 "MockProvider.h"
+
+#include <unity/storage/provider/Exceptions.h>
+#include <unity/storage/provider/metadata_keys.h>
+
+#include <boost/thread.hpp>
+#include <boost/thread/future.hpp>
+
+#include <chrono>
+#include <thread>
+#include <inttypes.h>
+
+using namespace unity::storage;
+using namespace unity::storage::provider;
+using namespace std;
+
+using boost::make_exceptional_future;
+using boost::make_ready_future;
+
+MockProvider::MockProvider()
+{
+}
+
+MockProvider::MockProvider(string const& cmd)
+    : cmd_(cmd)
+{
+}
+
+boost::future<ItemList> MockProvider::roots(Context const&)
+{
+    cerr << "roots CALLED" << endl;
+    ItemList roots =
+    {
+        {"root_id", {}, "Root", "etag", ItemType::root, {}}
+    };
+    return make_ready_future<ItemList>(roots);
+}
+
+boost::future<tuple<ItemList,string>> MockProvider::list(
+    string const& item_id, string const& page_token,
+    Context const&)
+{
+    if (item_id != "root_id")
+    {
+        string msg = string("Item::list(): no such item: \"") + item_id + "\"";
+        return make_exceptional_future<tuple<ItemList,string>>(NotExistsException(msg, item_id));
+    }
+    if (page_token != "")
+    {
+        string msg = string("Item::list(): invalid page token: \"") + page_token + "\"";
+        return make_exceptional_future<tuple<ItemList,string>>(LogicException("invalid page token"));
+    }
+    ItemList children =
+    {
+        {
+            "child_id", { "root_id" }, "Child", "etag", ItemType::file,
+            { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } }
+        }
+    };
+    boost::promise<tuple<ItemList,string>> p;
+    p.set_value(make_tuple(children, string()));
+    return p.get_future();
+}
+
+boost::future<ItemList> MockProvider::lookup(
+    string const& parent_id, string const& name, Context const&)
+{
+    if (parent_id != "root_id")
+    {
+        string msg = string("Folder::lookup(): no such item: \"") + parent_id + "\"";
+        return make_exceptional_future<ItemList>(NotExistsException(msg, parent_id));
+    }
+    if (name != "Child")
+    {
+        string msg = string("Folder::lookup(): no such item: \"") + name + "\"";
+        return make_exceptional_future<ItemList>(NotExistsException(msg, name));
+    }
+    ItemList children =
+    {
+        { "child_id", { "root_id" }, "Child", "etag", ItemType::file,
+          { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } } }
+    };
+    return make_ready_future<ItemList>(children);
+}
+
+boost::future<Item> MockProvider::metadata(string const& item_id, Context const&)
+{
+    if (item_id == "root_id")
+    {
+        Item metadata{"root_id", {}, "Root", "etag", ItemType::root, {}};
+        return make_ready_future<Item>(metadata);
+    }
+    else if (item_id == "child_id")
+    {
+        Item metadata
+        {
+            "child_id", { "root_id" }, "Child", "etag", ItemType::file,
+            { { SIZE_IN_BYTES, 0 }, { LAST_MODIFIED_TIME, "2007-04-05T14:30Z" } }
+        };
+        return make_ready_future<Item>(metadata);
+    }
+    else if (item_id == "child_folder_id")
+    {
+        Item metadata{"child_folder_id", { "root_id" }, "Child_Folder", "etag", ItemType::folder, {}};
+        return make_ready_future<Item>(metadata);
+    }
+    return make_exceptional_future<Item>(NotExistsException("metadata(): no such item: " + item_id, item_id));
+}
+
+boost::future<Item> MockProvider::create_folder(
+    string const& parent_id, string const& name,
+    Context const&)
+{
+    Item metadata{"new_folder_id", { parent_id }, name, "etag", ItemType::folder, {}};
+    return make_ready_future<Item>(metadata);
+}
+
+string make_job_id()
+{
+    static int last_job_id = 0;
+    return to_string(++last_job_id);
+}
+
+boost::future<unique_ptr<UploadJob>> MockProvider::create_file(
+    string const&, string const&,
+    int64_t, string const&, bool, Context const&)
+{
+    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
+}
+
+boost::future<unique_ptr<UploadJob>> MockProvider::update(
+    string const&, int64_t, string const&, Context const&)
+{
+    return make_ready_future<unique_ptr<UploadJob>>(new MockUploadJob(make_job_id()));
+}
+
+boost::future<unique_ptr<DownloadJob>> MockProvider::download(
+    string const&, Context const&)
+{
+    unique_ptr<DownloadJob> job(new MockDownloadJob(make_job_id()));
+    const char contents[] = "Hello world";
+    if (write(job->write_socket(), contents, sizeof(contents)) != sizeof(contents))
+    {
+        ResourceException e("download(): write failed", errno);
+        job->report_error(make_exception_ptr(e));
+        return make_exceptional_future<unique_ptr<DownloadJob>>(e);
+    }
+    job->report_complete();
+    return make_ready_future(std::move(job));
+}
+
+boost::future<void> MockProvider::delete_item(
+    string const&, Context const&)
+{
+    return make_ready_future();
+}
+
+boost::future<Item> MockProvider::move(
+    string const& item_id, string const& new_parent_id,
+    string const& new_name, Context const&)
+{
+    Item metadata{item_id, { new_parent_id }, new_name, "etag", ItemType::file, {}};
+    return make_ready_future(metadata);