[vlc-commits] [Git][videolan/vlc][master] 4 commits: qt: do not provide empty error string in VLCAccessImageResponse

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
e59ced53 by Fatih Uzunoglu at 2024-06-27T08:51:08+00:00
qt: do not provide empty error string in VLCAccessImageResponse

- - - - -
d2289d77 by Fatih Uzunoglu at 2024-06-27T08:51:08+00:00
qt: do not provide empty error string in CustomCoverImageResponse

- - - - -
f1d8c76f by Fatih Uzunoglu at 2024-06-27T08:51:08+00:00
qt: do not provide empty error string in SVGColorImageResponse

- - - - -
8e6d1b66 by Fatih Uzunoglu at 2024-06-27T08:51:08+00:00
qt: do not provide empty error string in ImageResponseRadiusAdaptor

- - - - -


4 changed files:

- modules/gui/qt/medialibrary/mlcustomcover.cpp
- modules/gui/qt/util/color_svg_image_provider.cpp
- modules/gui/qt/util/vlcaccess_image_provider.cpp
- modules/gui/qt/widgets/native/roundimage.cpp


Changes:

=====================================
modules/gui/qt/medialibrary/mlcustomcover.cpp
=====================================
@@ -194,6 +194,12 @@ public:
         return !image.isNull() ? QQuickTextureFactory::textureFactoryForImage(image) : nullptr;
     }
 
+    QString errorString() const override
+    {
+        if (image.isNull())
+            return QStringLiteral("Unspecified error.");
+    }
+
 private:
     void start()
     {


=====================================
modules/gui/qt/util/color_svg_image_provider.cpp
=====================================
@@ -164,6 +164,8 @@ public:
 
     QString errorString() const override
     {
+        if (m_result.isNull() && m_error.isEmpty())
+            return QStringLiteral("Unspecified error.");
         return m_error;
     }
 


=====================================
modules/gui/qt/util/vlcaccess_image_provider.cpp
=====================================
@@ -122,6 +122,8 @@ public:
 
     QString errorString() const override
     {
+        if (result.isNull() && errorStr.isEmpty())
+            return QStringLiteral("Unspecified error.");
         return errorStr;
     }
 


=====================================
modules/gui/qt/widgets/native/roundimage.cpp
=====================================
@@ -111,7 +111,12 @@ namespace
                     , this, &ImageResponseRadiusAdaptor::handleResponseFinished);
         }
 
-        QString errorString() const override { return errStr; }
+        QString errorString() const override
+        {
+            if (result.isNull() && errStr.isEmpty())
+                return QStringLiteral("Unspecified error.");
+            return errStr;
+        }
 
         QQuickTextureFactory *textureFactory() const override
         {



View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a59d3f9dd511301b822bd3368ec1bdce9462b809...8e6d1b66613444d43e895e24fa4002d345f0a530

-- 
This project does not include diff previews in email notifications.
View it on GitLab: https://code.videolan.org/videolan/vlc/-/compare/a59d3f9dd511301b822bd3368ec1bdce9462b809...8e6d1b66613444d43e895e24fa4002d345f0a530
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance