diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h index 816d4e37f09c61bb0efae315a3699b28403f003e..8590d84fb287bb6dbf2fd4cb75b14b1ad5d17755 100644 --- a/src/timeline/InputBar.h +++ b/src/timeline/InputBar.h @@ -25,6 +25,15 @@ class CombinedImagePackModel; class QMimeData; class QDropEvent; +struct DeleteLaterDeleter +{ + void operator()(QObject *p) + { + if (p) + p->deleteLater(); + } +}; + enum class MarkdownOverride { NOT_SPECIFIED, // no override set @@ -278,14 +287,6 @@ private: bool uploading_ = false; bool containsAtRoom_ = false; - struct DeleteLaterDeleter - { - void operator()(QObject *p) - { - if (p) - p->deleteLater(); - } - }; using UploadHandle = std::unique_ptr<MediaUpload, DeleteLaterDeleter>; std::vector<UploadHandle> unconfirmedUploads; std::vector<UploadHandle> runningUploads; diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h index ea6daa343cf74f06d7eb4104307bd4851f0ed237..a098f1bd5bb962e86ddf18b4acd75de06ce6e5e2 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h @@ -493,8 +493,8 @@ private: std::string last_event_id; std::string fullyReadEventId_; - std::unique_ptr<RoomSummary> parentSummary = nullptr; - bool parentChecked = false; + std::unique_ptr<RoomSummary, DeleteLaterDeleter> parentSummary = nullptr; + bool parentChecked = false; }; template<class T>