Rename image pack model

3 files changed, 7 insertions, 7 deletions

diff --git a/src/timeline/InputBar.cpp b/src/timeline/InputBar.cpp

index 56d0d1ce..f17081e5 100644
--- a/src/timeline/InputBar.cpp
+++ b/src/timeline/InputBar.cpp
@@ -19,9 +19,9 @@
 
 #include "Cache.h"
 #include "ChatPage.h"
+#include "CombinedImagePackModel.h"
 #include "CompletionProxyModel.h"
 #include "Config.h"
-#include "ImagePackModel.h"
 #include "Logging.h"
 #include "MainWindow.h"
 #include "MatrixClient.h"
@@ -503,7 +503,7 @@ InputBar::video(const QString &filename,
 }
 
 void
-InputBar::sticker(ImagePackModel *model, int row)
+InputBar::sticker(CombinedImagePackModel *model, int row)
 {
         if (!model || row < 0)
                 return;
diff --git a/src/timeline/InputBar.h b/src/timeline/InputBar.h

index acedceb7..2e6fb5c0 100644
--- a/src/timeline/InputBar.h
+++ b/src/timeline/InputBar.h
@@ -12,7 +12,7 @@
 #include <mtx/responses/messages.hpp>
 
 class TimelineModel;
-class ImagePackModel;
+class CombinedImagePackModel;
 class QMimeData;
 class QDropEvent;
 class QStringList;
@@ -58,7 +58,7 @@ public slots:
                      MarkdownOverride useMarkdown = MarkdownOverride::NOT_SPECIFIED,
                      bool rainbowify              = false);
         void reaction(const QString &reactedEvent, const QString &reactionKey);
-        void sticker(ImagePackModel *model, int row);
+        void sticker(CombinedImagePackModel *model, int row);
 
 private slots:
         void startTyping();
diff --git a/src/timeline/TimelineViewManager.cpp b/src/timeline/TimelineViewManager.cpp

index b1643798..2da7d789 100644
--- a/src/timeline/TimelineViewManager.cpp
+++ b/src/timeline/TimelineViewManager.cpp
@@ -15,11 +15,11 @@
 #include "ChatPage.h"
 #include "Clipboard.h"
 #include "ColorImageProvider.h"
+#include "CombinedImagePackModel.h"
 #include "CompletionProxyModel.h"
 #include "DelegateChooser.h"
 #include "DeviceVerificationFlow.h"
 #include "EventAccessors.h"
-#include "ImagePackModel.h"
 #include "InviteesModel.h"
 #include "Logging.h"
 #include "MainWindow.h"
@@ -146,7 +146,7 @@ TimelineViewManager::TimelineViewManager(CallManager *callManager, ChatPage *par
         qRegisterMetaType<mtx::events::msg::KeyVerificationReady>();
         qRegisterMetaType<mtx::events::msg::KeyVerificationRequest>();
         qRegisterMetaType<mtx::events::msg::KeyVerificationStart>();
-        qRegisterMetaType<ImagePackModel *>();
+        qRegisterMetaType<CombinedImagePackModel *>();
 
         qmlRegisterUncreatableMetaObject(qml_mtx_events::staticMetaObject,
                                          "im.nheko",
@@ -622,7 +622,7 @@ TimelineViewManager::completerFor(QString completerName, QString roomId)
                 roomModel->setParent(proxy);
                 return proxy;
         } else if (completerName == "stickers") {
-                auto stickerModel = new ImagePackModel(roomId.toStdString(), true);
+                auto stickerModel = new CombinedImagePackModel(roomId.toStdString(), true);
                 auto proxy = new CompletionProxyModel(stickerModel, 1, static_cast<size_t>(-1) / 4);
                 stickerModel->setParent(proxy);
                 return proxy;