← Back to branch summary

~stolowski/thumbnailer/more-debug

~stolowski/thumbnailer/more-debug

« back to all changes in this revision

Viewing changes to include/internal/ubuntuserverdownloader.h

Committer: CI Train Bot
Author(s): Michi Henning
Date: 2016-01-07 04:36:36 UTC
mfrom: (129.1.22 landing-12.15)
Revision ID: ci-train-bot@canonical.com-20160107043636-xbao3rktj4uf3u0f

Merge changes from devel to trunk for landing.
Approved by: Michi Henning, PS Jenkins bot

files added:
include/internal/backoff_adjuster.h

include/internal/env_vars.h

include/internal/file_lock.h

src/backoff_adjuster.cpp

src/file_lock.cpp

tests/backoff_adjuster

tests/backoff_adjuster/CMakeLists.txt

tests/backoff_adjuster/backoff_adjuster_test.cpp

tests/file_lock

tests/file_lock/CMakeLists.txt

tests/file_lock/file_lock_test.cpp

tests/file_lock/hold_lock.cpp

tests/image-provider

tests/image-provider/CMakeLists.txt

tests/image-provider/image-provider_test.cpp

tests/media/horizontal-strip.jpg

tests/media/vertical-strip.jpg

tests/utils/env_var_guard.h

tests/utils/testutils.cpp

tests/utils/testutils.h

tools/run-xvfb.sh

files removed:
src/artgeneratorcommon.cpp

files modified:
CMakeLists.txt

data/com.canonical.Unity.Thumbnailer.gschema.xml

debian/changelog

debian/control

debian/copyright

debian/rules

doc/libthumbnailer-qt/CMakeLists.txt

doc/libthumbnailer-qt/examples/qt_example_test.cpp

include/internal/artreply.h

include/internal/file_io.h

include/internal/image.h

include/internal/imageextractor.h

include/internal/thumbnailer.h

include/internal/ubuntuserverdownloader.h

include/ratelimiter.h

include/settings.h

include/unity/thumbnailer/qt/thumbnailer-qt.h

man/thumbnailer-admin.1

man/thumbnailer-service.1

man/thumbnailer-settings.5

plugins/Ubuntu/Thumbnailer.0.1/CMakeLists.txt

plugins/Ubuntu/Thumbnailer.0.1/albumartgenerator.cpp

plugins/Ubuntu/Thumbnailer.0.1/artistartgenerator.cpp

plugins/Ubuntu/Thumbnailer.0.1/thumbnailerimageresponse.cpp

plugins/Ubuntu/Thumbnailer.0.1/thumbnailgenerator.cpp

src/CMakeLists.txt

src/file_io.cpp

src/image.cpp

src/imageextractor.cpp

src/libthumbnailer-qt/CMakeLists.txt

src/libthumbnailer-qt/libthumbnailer-qt.cpp

src/ratelimiter.cpp

src/service/admininterface.cpp

src/service/admininterface.h

src/service/dbusinterface.cpp

src/service/dbusinterface.h

src/service/dbusinterface.xml

src/service/handler.cpp

src/service/handler.h

src/service/inactivityhandler.cpp

src/service/main.cpp

src/settings.cpp

src/thumbnailer-admin/get_local_thumbnail.cpp

src/thumbnailer-admin/get_remote_thumbnail.cpp

src/thumbnailer.cpp

src/ubuntuserverdownloader.cpp

src/vs-thumb/thumbnailextractor.cpp

src/vs-thumb/thumbnailextractor.h

src/vs-thumb/vs-thumb.cpp

tests/CMakeLists.txt

tests/copyright/check_copyright.sh

tests/dbus/dbus_test.cpp

tests/download/download_test.cpp

tests/file_io/file_io_test.cpp

tests/gobj_ptr/gobj_ptr_test.cpp

tests/headers/compile_headers.py

tests/image/image_test.cpp

tests/libthumbnailer-qt/libthumbnailer-qt_test.cpp

tests/qml/CMakeLists.txt

tests/qml/Fixture.qml

tests/qml/qml_test.cpp

tests/qml/tst_albumart.qml

tests/qml/tst_embedded_albumart.qml

tests/qml/tst_photo.qml

tests/safe_strerror/safe_strerror_test.cpp

tests/settings/settings_test.cpp

tests/slow-vs-thumb/slow-vs-thumb_test.cpp

tests/stress/stress_test.cpp

tests/thumbnailer-admin/thumbnailer-admin_test.cpp

tests/thumbnailer/thumbnailer_test.cpp

tests/utils/CMakeLists.txt

tests/utils/artserver.cpp

tests/utils/artserver.h

tests/vs-thumb/vs-thumb_test.cpp

tests/whitespace/check_whitespace.py

valgrind-suppress

Show diffs side-by-side

added added

removed removed

include/internal/ubuntuserverdownloader.h

65

65

std::shared_ptr<QNetworkAccessManager> network_manager() const;

66

66

67

67

private:

68

void set_api_key();

69

68

std::shared_ptr<ArtReply> download_url(QUrl const& url, std::chrono::milliseconds timeout);

70

69

71

70

QString api_key_;

Older »