summary refs log tree commit diff
path: root/src/timeline/TimelineViewManager.cpp
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2019-06-12 19:09:05 -0400
committerJoseph Donofry <joedonofry@gmail.com>2019-06-12 19:09:05 -0400
commit9f310fed09f3d5fd7f118cf0365e98ad402c4d99 (patch)
tree04dbeabb4007bcf5213bb65da5423370a1047eaf /src/timeline/TimelineViewManager.cpp
parentUpdate CHANGELOG (diff)
parentAdd style for reply popup. Fix ALL of the linting issues (diff)
downloadnheko-9f310fed09f3d5fd7f118cf0365e98ad402c4d99.tar.xz
Merge branch '0.7.0-dev' of ssh://github.com/Nheko-Reborn/nheko into 0.7.0-dev
Diffstat (limited to 'src/timeline/TimelineViewManager.cpp')
-rw-r--r--src/timeline/TimelineViewManager.cpp3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index 10c2d747..1ce3794f 100644 --- a/src/timeline/TimelineViewManager.cpp +++ b/src/timeline/TimelineViewManager.cpp
@@ -79,8 +79,7 @@ TimelineViewManager::queueEmoteMessage(const QString &msg) } void -TimelineViewManager::queueReplyMessage(const QString &reply, - const QString &related_event) +TimelineViewManager::queueReplyMessage(const QString &reply, const QString &related_event) { if (active_room_.isEmpty()) return;