summary refs log tree commit diff
path: root/src/timeline/TimelineModel.h
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2021-11-08 18:32:19 -0500
committerJoseph Donofry <joedonofry@gmail.com>2021-11-08 18:32:19 -0500
commitc93a7b24353a98b09949baf3ca4d8de8439cfa4a (patch)
tree53adf948d663566e198d00ad179acc4465e329c3 /src/timeline/TimelineModel.h
parentFix syntax issue (diff)
parentRemove appimage (diff)
downloadnheko-c93a7b24353a98b09949baf3ca4d8de8439cfa4a.tar.xz
Merge remote-tracking branch 'nheko-im/master' into video_player_enhancements
Diffstat (limited to 'src/timeline/TimelineModel.h')
-rw-r--r--src/timeline/TimelineModel.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/timeline/TimelineModel.h b/src/timeline/TimelineModel.h

index f16529e2..af067476 100644 --- a/src/timeline/TimelineModel.h +++ b/src/timeline/TimelineModel.h
@@ -367,9 +367,9 @@ private slots: void scrollTimerEvent(); signals: + void dataAtIdChanged(QString id); void currentIndexChanged(int index); void redactionFailed(QString id); - void eventRedacted(QString id); void mediaCached(QString mxcUrl, QString cacheUrl); void newEncryptedImage(mtx::crypto::EncryptedFile encryptionInfo); void typingUsersChanged(std::vector<QString> users);