← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/qt/client/Uploader.cpp

Committer: Bileto Bot
Date: 2016-09-09 02:35:47 UTC
mfrom: (8.1.57 merge-devel)
Revision ID: ci-train-bot@canonical.com-20160909023547-tfs5josfqweueja1

Merged devel at revision 64.

files added:
include/unity/storage/internal/TraceMessageHandler.h

include/unity/storage/internal/dbus_error.h

include/unity/storage/internal/dbusmarshal.h

include/unity/storage/provider/Exceptions.h

include/unity/storage/provider/internal/TestServerImpl.h

include/unity/storage/provider/testing

include/unity/storage/provider/testing/CMakeLists.txt

include/unity/storage/provider/testing/TestServer.h

include/unity/storage/qt/client/internal/local_client/storage_exception.h

include/unity/storage/qt/client/internal/remote_client/validate.h

src/internal/TraceMessageHandler.cpp

src/internal/dbusmarshal.cpp

src/provider/Exceptions.cpp

src/provider/internal/TestServerImpl.cpp

src/provider/testing

src/provider/testing/TestServer.cpp

src/qt/client/internal/local_client/storage_exception.cpp

src/qt/client/internal/remote_client/validate.cpp

tests/provider-AccountData

tests/provider-AccountData/AccountData_test.cpp

tests/provider-AccountData/CMakeLists.txt

tests/provider-DBusPeerCache

tests/provider-DBusPeerCache/CMakeLists.txt

tests/provider-DBusPeerCache/DBusPeerCache_test.cpp

tests/provider-ProviderInterface

tests/provider-ProviderInterface/CMakeLists.txt

tests/provider-ProviderInterface/ProviderInterface_test.cpp

tests/provider-ProviderInterface/TestProvider.cpp

tests/provider-ProviderInterface/TestProvider.h

tests/remote-client/MockProvider.cpp

tests/remote-client/MockProvider.h

tests/utils/ProviderFixture.cpp

tests/utils/ProviderFixture.h

files renamed:
include/unity/storage/internal/MetadataKeys.h => include/unity/storage/provider/metadata_keys.h

include/unity/storage/qt/client/internal/local_client/tmpfile-prefix.h => include/unity/storage/qt/client/internal/local_client/tmpfile_prefix.h

get-provider-soversion.sh => tools/get-provider-soversion.sh

files modified:
CMakeLists.txt

data/provider.xml

debian/bileto_pre_release_hook

debian/changelog

demo/provider_test/CMakeLists.txt

demo/provider_test/provider-test.cpp

include/unity/storage/internal/ItemMetadata.h

include/unity/storage/provider/CMakeLists.txt

include/unity/storage/provider/ProviderBase.h

include/unity/storage/provider/TempfileUploadJob.h

include/unity/storage/provider/internal/AccountData.h

include/unity/storage/provider/internal/DBusPeerCache.h

include/unity/storage/provider/internal/DownloadJobImpl.h

include/unity/storage/provider/internal/Handler.h

include/unity/storage/provider/internal/MainLoopExecutor.h

include/unity/storage/provider/internal/PendingJobs.h

include/unity/storage/provider/internal/ProviderInterface.h

include/unity/storage/provider/internal/ServerImpl.h

include/unity/storage/provider/internal/TempfileUploadJobImpl.h

include/unity/storage/provider/internal/UploadJobImpl.h

include/unity/storage/provider/internal/dbusmarshal.h

include/unity/storage/qt/client/Account.h

include/unity/storage/qt/client/Exceptions.h

include/unity/storage/qt/client/Item.h

include/unity/storage/qt/client/Root.h

include/unity/storage/qt/client/Runtime.h

include/unity/storage/qt/client/Uploader.h

include/unity/storage/qt/client/internal/AccountBase.h

include/unity/storage/qt/client/internal/ItemBase.h

include/unity/storage/qt/client/internal/RootBase.h

include/unity/storage/qt/client/internal/RuntimeBase.h

include/unity/storage/qt/client/internal/UploaderBase.h

include/unity/storage/qt/client/internal/local_client/DownloaderImpl.h

include/unity/storage/qt/client/internal/local_client/FolderImpl.h

include/unity/storage/qt/client/internal/local_client/ItemImpl.h

include/unity/storage/qt/client/internal/local_client/RuntimeImpl.h

include/unity/storage/qt/client/internal/local_client/UploaderImpl.h

include/unity/storage/qt/client/internal/make_future.h

include/unity/storage/qt/client/internal/remote_client/AccountImpl.h

include/unity/storage/qt/client/internal/remote_client/Handler.h

include/unity/storage/qt/client/internal/remote_client/ItemImpl.h

include/unity/storage/qt/client/internal/remote_client/RuntimeImpl.h

include/unity/storage/qt/client/internal/remote_client/UploaderImpl.h

include/unity/storage/qt/client/internal/remote_client/dbusmarshal.h

src/internal/CMakeLists.txt

src/provider/CMakeLists.txt

src/provider/TempfileUploadJob.cpp

src/provider/internal/DownloadJobImpl.cpp

src/provider/internal/Handler.cpp

src/provider/internal/MainLoopExecutor.cpp

src/provider/internal/PendingJobs.cpp

src/provider/internal/ProviderInterface.cpp

src/provider/internal/ServerImpl.cpp

src/provider/internal/TempfileUploadJobImpl.cpp

src/provider/internal/UploadJobImpl.cpp

src/provider/internal/dbusmarshal.cpp

src/qt/client/Account.cpp

src/qt/client/CMakeLists.txt

src/qt/client/Exceptions.cpp

src/qt/client/Item.cpp

src/qt/client/Root.cpp

src/qt/client/Runtime.cpp

src/qt/client/Uploader.cpp

src/qt/client/internal/AccountBase.cpp

src/qt/client/internal/ItemBase.cpp

src/qt/client/internal/RootBase.cpp

src/qt/client/internal/RuntimeBase.cpp

src/qt/client/internal/UploaderBase.cpp

src/qt/client/internal/local_client/AccountImpl.cpp

src/qt/client/internal/local_client/CMakeLists.txt

src/qt/client/internal/local_client/DownloaderImpl.cpp

src/qt/client/internal/local_client/FileImpl.cpp

src/qt/client/internal/local_client/FolderImpl.cpp

src/qt/client/internal/local_client/ItemImpl.cpp

src/qt/client/internal/local_client/RootImpl.cpp

src/qt/client/internal/local_client/RuntimeImpl.cpp

src/qt/client/internal/local_client/UploaderImpl.cpp

src/qt/client/internal/remote_client/AccountImpl.cpp

src/qt/client/internal/remote_client/CMakeLists.txt

src/qt/client/internal/remote_client/DownloaderImpl.cpp

src/qt/client/internal/remote_client/FileImpl.cpp

src/qt/client/internal/remote_client/FolderImpl.cpp

src/qt/client/internal/remote_client/ItemImpl.cpp

src/qt/client/internal/remote_client/RootImpl.cpp

src/qt/client/internal/remote_client/RuntimeImpl.cpp

src/qt/client/internal/remote_client/UploaderImpl.cpp

src/qt/client/internal/remote_client/dbusmarshal.cpp

tests/CMakeLists.txt

tests/headers/CMakeLists.txt

tests/headers/compile_headers.py

tests/local-client/local-client_test.cpp

tests/remote-client/CMakeLists.txt

tests/remote-client/remote-client_test.cpp

tests/utils/CMakeLists.txt

tests/utils/DBusEnvironment.cpp

tests/utils/DBusEnvironment.h

tests/utils/fake-online-accounts-daemon.py

Show diffs side-by-side

added added

removed removed

src/qt/client/Uploader.cpp

46

46

return p_->socket();

47

47

}

48

48

49

int64_t Uploader::size() const

50

{

51

return p_->size();

52

}

53

49

54

QFuture<shared_ptr<File>> Uploader::finish_upload()

50

55

{

51

56

return p_->finish_upload();

Older »