Rename loadPixmapFromUrl{Lazy,}

Chatterino · May 1, 2024 · d59967c · d59967c
1 parent f511abb
commit d59967c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -500,8 +500,8 @@ set(SOURCE_FILES
         util/IpcQueue.hpp
         util/LayoutHelper.cpp
         util/LayoutHelper.hpp
-        util/LoadPixmapLazy.cpp
-        util/LoadPixmapLazy.hpp
+        util/LoadPixmap.cpp
+        util/LoadPixmap.hpp
         util/RapidjsonHelpers.cpp
         util/RapidjsonHelpers.hpp
         util/RatelimitBucket.cpp

diff --git a/src/controllers/moderationactions/ModerationActionModel.cpp b/src/controllers/moderationactions/ModerationActionModel.cpp
@@ -2,7 +2,7 @@
 
 #include "controllers/moderationactions/ModerationAction.hpp"
 #include "messages/Image.hpp"
-#include "util/LoadPixmapLazy.hpp"
+#include "util/LoadPixmap.hpp"
 #include "util/PostToThread.hpp"
 #include "util/StandardItemHelper.hpp"
 
@@ -34,7 +34,7 @@ void ModerationActionModel::getRowFromItem(const ModerationAction &item,
     setFilePathItem(row[Column::Icon], item.iconPath());
     if (!item.iconPath().isEmpty())
     {
-        loadPixmapFromUrlLazy(
+        loadPixmapFromUrl(
             (*item.getImage())->url(), [row](const QPixmap &pixmap) {
                 postToThread([row, pixmap]() {
                     row[Column::Icon]->setData(pixmap, Qt::DecorationRole);

diff --git a/src/providers/twitch/TwitchBadges.cpp b/src/providers/twitch/TwitchBadges.cpp
@@ -7,7 +7,7 @@
 #include "messages/Image.hpp"
 #include "providers/twitch/api/Helix.hpp"
 #include "util/DisplayBadge.hpp"
-#include "util/LoadPixmapLazy.hpp"
+#include "util/LoadPixmap.hpp"
 
 #include <QBuffer>
 #include <QFile>
@@ -244,7 +244,7 @@ void TwitchBadges::loadEmoteImage(const QString &name, ImagePtr image,
                                   BadgeIconCallback &&callback)
 {
     auto url = image->url().string;
-    loadPixmapFromUrlLazy({url}, [this, name, callback, url](auto pixmap) {
+    loadPixmapFromUrl({url}, [this, name, callback, url](auto pixmap) {
         auto icon = std::make_shared<QIcon>(pixmap);
 
         {

diff --git a/src/util/LoadPixmapLazy.cpp → src/util/LoadPixmap.cpp b/src/util/LoadPixmapLazy.cpp → src/util/LoadPixmap.cpp
@@ -10,8 +10,7 @@
 
 namespace chatterino {
 
-void loadPixmapFromUrlLazy(const Url &url,
-                           std::function<void(QPixmap)> &&callback)
+void loadPixmapFromUrl(const Url &url, std::function<void(QPixmap)> &&callback)
 {
     NetworkRequest(url.string)
         .concurrent()

diff --git a/src/util/LoadPixmapLazy.hpp → src/util/LoadPixmap.hpp b/src/util/LoadPixmapLazy.hpp → src/util/LoadPixmap.hpp
@@ -8,6 +8,5 @@ namespace chatterino {
 /**
  * Loads an image from url into a QPixmap. Allows for file:// protocol links. Uses cacheing.
  */
-void loadPixmapFromUrlLazy(const Url &url,
-                           std::function<void(QPixmap)> &&callback);
+void loadPixmapFromUrl(const Url &url, std::function<void(QPixmap)> &&callback);
 }  // namespace chatterino
diff --git a/src/widgets/settingspages/ModerationPage.cpp b/src/widgets/settingspages/ModerationPage.cpp
@@ -233,7 +233,7 @@ ModerationPage::ModerationPage()
                     }
                     else
                     {
-                        loadPixmapFromUrlLazy(
+                        loadPixmapFromUrl(
                             {fileUrl.toString()},
                             [clicked, view](const QPixmap &pixmap) {
                                 view->getModel()->setData(clicked, pixmap,