From: Ivailo Monev <xakepa10@gmail.com>
Date: Wed, 6 Jan 2021 10:04:45 +0000 (+0200)
Subject: rename qt_read_xpm_image_or_array() so that the function name implies what it does
X-Git-Tag: 4.12.0~2820
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d3d7ce053ae86bbbde315f5b4de4f90771566b36;p=kde%2FKatie.git

rename qt_read_xpm_image_or_array() so that the function name implies what it does

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---

diff --git a/src/gui/image/qimage.cpp b/src/gui/image/qimage.cpp
index ba3bf0c8c..7fe47ab84 100644
--- a/src/gui/image/qimage.cpp
+++ b/src/gui/image/qimage.cpp
@@ -810,7 +810,7 @@ QImage::QImage(const char *fileName, const char *format)
 #endif
 
 #ifndef QT_NO_IMAGEFORMAT_XPM
-extern bool qt_read_xpm_image_or_array(const char * const *source, QImage &image);
+extern bool qt_read_xpm_array(const char * const *source, QImage &image);
 
 /*!
     Constructs an image from the given \a xpm image.
@@ -834,7 +834,7 @@ QImage::QImage(const char * const xpm[])
 {
     if (Q_UNLIKELY(!xpm))
         return;
-    if (Q_UNLIKELY(!qt_read_xpm_image_or_array(xpm, *this)))
+    if (Q_UNLIKELY(!qt_read_xpm_array(xpm, *this)))
         // Issue: Warning because the constructor may be ambigious
         qWarning("QImage::QImage(), XPM is not supported");
 }
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp
index 23d1aa3f6..b67c677b2 100644
--- a/src/gui/image/qxpmhandler.cpp
+++ b/src/gui/image/qxpmhandler.cpp
@@ -977,11 +977,10 @@ static bool read_xpm_body(
 //
 // INTERNAL
 //
-// Reads an .xpm from either the QImageIO or from the QString *.
-// One of the two HAS to be 0, the other one is used.
+// Reads an .xpm from characters array
 //
 
-bool qt_read_xpm_image_or_array(const char * const * source, QImage &image)
+bool qt_read_xpm_array(const char * const * source, QImage &image)
 {
     if (!source)
         return true;