Fix build for Xcode.

This commit is contained in:
John Preston 2018-08-01 20:32:43 +03:00
parent 1c5e91c9a8
commit 6796204126

View File

@ -362,22 +362,22 @@ inline StorageKey storageKey(const WebFileLocation &location) {
class RemoteImage : public Image {
public:
void automaticLoad(const HistoryItem *item); // auto load photo
void automaticLoadSettingsChanged();
void automaticLoad(const HistoryItem *item) override; // auto load photo
void automaticLoadSettingsChanged() override;
bool loaded() const;
bool loading() const {
bool loaded() const override;
bool loading() const override {
return amLoading();
}
bool displayLoading() const;
void cancel();
float64 progress() const;
int32 loadOffset() const;
bool displayLoading() const override;
void cancel() override;
float64 progress() const override;
int32 loadOffset() const override;
void setData(QByteArray &bytes, const QByteArray &format = QByteArray());
void load(bool loadFirst = false, bool prior = true);
void loadEvenCancelled(bool loadFirst = false, bool prior = true);
void load(bool loadFirst = false, bool prior = true) override;
void loadEvenCancelled(bool loadFirst = false, bool prior = true) override;
~RemoteImage();
@ -469,17 +469,17 @@ public:
return this;
}
void automaticLoad(const HistoryItem *item); // auto load photo
void automaticLoadSettingsChanged();
void automaticLoad(const HistoryItem *item) override; // auto load photo
void automaticLoadSettingsChanged() override;
bool loading() const {
bool loading() const override {
return _location.isNull() ? _loadRequested : StorageImage::loading();
}
bool displayLoading() const;
void cancel();
bool displayLoading() const override;
void cancel() override;
void load(bool loadFirst = false, bool prior = true);
void loadEvenCancelled(bool loadFirst = false, bool prior = true);
void load(bool loadFirst = false, bool prior = true) override;
void loadEvenCancelled(bool loadFirst = false, bool prior = true) override;
private:
bool _loadRequested, _loadCancelled, _loadFromCloud;