AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove QTextCodec dependency from qfilesystemiterator

Browse Source 
Assume Unix systems are utf-8 based nowadays. glib has been
assuming this for quite some time already, and all Linux and BSD
systems shipped in the last 10 years assume utf-8 for 8-bit strings.

Utf-8 is also the encoding used by macOS and QNX since a very long time.

File systems where file names are not encoded in utf-8 can usually be
translated transparently to utf8 by specifying appropriate mount
options.

Change-Id: I1970496db24e59dee8efb79ba025355a3ce87387
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Lars Knoll 2020-04-17 19:24:30 +02:00
parent d9870dc233
commit 9ada6e5719
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/corelib/io/qfilesystemiterator_unix.cpp
View File

@ -40,10 +40,7 @@
#include "qplatformdefs.h" #include "qplatformdefs.h"
#include "qfilesystemiterator_p.h" #include "qfilesystemiterator_p.h"
#if QT_CONFIG(textcodec) #include <private/qstringconverter_p.h>
# include <qtextcodec.h>
# include <private/qstringconverter_p.h>
#endif
#ifndef QT_NO_FILESYSTEMITERATOR #ifndef QT_NO_FILESYSTEMITERATOR
@ -59,39 +56,7 @@ static bool checkNameDecodable(const char *d_name, qsizetype len)
// This function is called in a loop from advance() below, but the loop is // This function is called in a loop from advance() below, but the loop is
// usually run only once. // usually run only once.
#if QT_CONFIG(textcodec)
// We identify the codecs by their RFC 2978 MIBenum values. In this
// function:
// 3 US-ASCII (ANSI X3.4-1986)
// 4 Latin1 (ISO-8859-1)
// 106 UTF-8
QTextCodec *codec = QTextCodec::codecForLocale();
# ifdef QT_LOCALE_IS_UTF8
int mibEnum = 106;
# else
int mibEnum = 4; // Latin 1
if (codec)
mibEnum = codec->mibEnum();
# endif
if (Q_LIKELY(mibEnum == 106)) // UTF-8
return QUtf8::isValidUtf8(d_name, len).isValidUtf8; return QUtf8::isValidUtf8(d_name, len).isValidUtf8;
if (mibEnum == 3) // US-ASCII
return QtPrivate::isAscii(QLatin1String(d_name, len));
if (mibEnum == 4) // Latin 1
return true;
// fall back to generic QTextCodec
QTextCodec::ConverterState cs(QTextCodec::IgnoreHeader);
codec->toUnicode(d_name, len, &cs);
return cs.invalidChars == 0 && cs.remainingChars == 0;
#else
Q_UNUSED(d_name);
Q_UNUSED(len);
// if we have no text codecs, then QString::fromLocal8Bit is fromLatin1
Q_UNUSED(d_name)
Q_UNUSED(len)
return true;
#endif
} }
QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters, QFileSystemIterator::QFileSystemIterator(const QFileSystemEntry &entry, QDir::Filters filters,