summary refs log tree commit diff
path: root/src/timeline/TimelineViewManager.h
diff options
context:
space:
mode:
authorJoseph Donofry <joedonofry@gmail.com>2020-05-13 00:35:26 -0400
committerJoseph Donofry <joedonofry@gmail.com>2020-05-13 00:36:41 -0400
commitee4dcef90f285f49ee27fec13afb486d93781b8b (patch)
treee6e4313098ef2c2fa4841fa7d6310825b08c0c4b /src/timeline/TimelineViewManager.h
parentInitial support for sending reactions (diff)
downloadnheko-ee4dcef90f285f49ee27fec13afb486d93781b8b.tar.xz
Add new QML-based emoji picker (work in progress)
This is necessary to support having a picker within QML.
Eventually, this should replace the existing widget-based one.
Diffstat (limited to 'src/timeline/TimelineViewManager.h')
-rw-r--r--src/timeline/TimelineViewManager.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/timeline/TimelineViewManager.h b/src/timeline/TimelineViewManager.h

index eb2223e2..f5f57df4 100644 --- a/src/timeline/TimelineViewManager.h +++ b/src/timeline/TimelineViewManager.h
@@ -1,5 +1,6 @@ #pragma once +#include <QHash> #include <QQuickView> #include <QQuickWidget> #include <QSharedPointer> @@ -12,6 +13,8 @@ #include "Logging.h" #include "TimelineModel.h" #include "Utils.h" +#include "emoji/EmojiModel.h" +#include "emoji/Provider.h" class MxcImageProvider; class BlurhashProvider; @@ -102,7 +105,8 @@ private: QHash<QString, QSharedPointer<TimelineModel>> models; TimelineModel *timeline_ = nullptr; - bool isInitialSync_ = true; + + bool isInitialSync_ = true; QSharedPointer<UserSettings> settings; QHash<QString, QColor> userColors;