← Back to branch summary

~pete-woods/storage-framework/cmake-extras-compatibility

« back to all changes in this revision

Viewing changes to include/unity/storage/provider/Server.h

  • Committer: Bileto Bot
  • Date: 2016-11-04 12:21:58 UTC
  • mfrom: (12.1.1 merge-devel)
  • Revision ID: ci-train-bot@canonical.com-20161104122158-hu8h9qyg3vm129t5
* Added v2 of the client-side API.
* Updated server-side API to tell the provider which metadata to return.
* Update provider API to manager ProviderBase class as a shared_ptr.
* Update client to discover ownCloud/Nextcloud and OneDrive accounts.
* Add match_etag argument to Download() D-Bus method.

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/unity/storage/provider/Server.h
47
47
    void run();
48
48
 
49
49
protected:
50
 
    virtual std::unique_ptr<ProviderBase> make_provider() = 0;
 
50
    virtual std::shared_ptr<ProviderBase> make_provider() = 0;
51
51
private:
52
52
    std::unique_ptr<internal::ServerImpl> p_;
53
53
 
60
60
public:
61
61
    using ServerBase::ServerBase;
62
62
protected:
63
 
    std::unique_ptr<ProviderBase> make_provider() override {
64
 
        return std::unique_ptr<ProviderBase>(new T);
 
63
    std::shared_ptr<ProviderBase> make_provider() override {
 
64
        return std::make_shared<T>();
65
65
    }
66
66
};
67
67