diff options
Diffstat (limited to 'src/gui/image/qxpmhandler.cpp')
| -rw-r--r-- | src/gui/image/qxpmhandler.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gui/image/qxpmhandler.cpp b/src/gui/image/qxpmhandler.cpp index 650160ba46..be024d752d 100644 --- a/src/gui/image/qxpmhandler.cpp +++ b/src/gui/image/qxpmhandler.cpp @@ -15,13 +15,15 @@ #include <private/qcolor_p.h> #include <private/qduplicatetracker_p.h> // for easier std::pmr detection +#include <private/qtools_p.h> +#include <private/qimage_p.h> #include <algorithm> #include <array> QT_BEGIN_NAMESPACE -Q_DECLARE_LOGGING_CATEGORY(lcImageIo) +using namespace QtMiscUtils; static quint64 xpmHash(const QString &str) { @@ -736,15 +738,13 @@ static QString fbname(const QString &fileName) // get file basename (sort of) int i = qMax(s.lastIndexOf(u'/'), s.lastIndexOf(u'\\')); if (i < 0) i = 0; - auto isAsciiLetterOrNumber = [](QChar ch) -> bool { - return (ch.unicode() >= '0' && ch.unicode() <= '9') || - (ch.unicode() >= 'A' && ch.unicode() <= 'Z') || - (ch.unicode() >= 'a' && ch.unicode() <= 'z') || - ch.unicode() == '_'; + auto checkChar = [](QChar ch) -> bool { + uchar uc = ch.unicode(); + return isAsciiLetterOrNumber(uc) || uc == '_'; }; int start = -1; for (; i < s.size(); ++i) { - if (isAsciiLetterOrNumber(s.at(i))) { + if (checkChar(s.at(i))) { start = i; } else if (start > 0) break; |