1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QMimeData: de-duplicate some code

Browse Source 
- Fix integral narrowing conversion issues by using range-for
- Use QByteArrayView

Change-Id: Ib45c7d6d8ca27c347324b4b259f25282bc84ff3f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: David Faure <david.faure@kdab.com>
This commit is contained in:
Ahmad Samir 2023-06-05 17:11:10 +03:00
parent aa481854a9
commit 8d127c5737
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/corelib/kernel/qmimedata.cpp
View File

@ -76,6 +76,24 @@ QVariant QMimeDataPrivate::getData(const QString &format) const
return it->data; return it->data;
} }
static QList<QVariant> dataToUrls(QByteArrayView text)
{
QList<QVariant> list;
qsizetype newLineIndex = -1;
qsizetype from = 0;
const char *begin = text.data();
while ((newLineIndex = text.indexOf('\n', from)) != -1) {
QByteArrayView bav(begin + from, begin + newLineIndex);
bav = bav.trimmed();
if (!bav.isEmpty())
list.push_back(QUrl::fromEncoded(bav));
from = newLineIndex + 1;
if (from >= text.size())
break;
}
return list;
}
QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType type) const QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType type) const
{ {
Q_Q(const QMimeData); Q_Q(const QMimeData);
@ -146,21 +164,13 @@ QVariant QMimeDataPrivate::retrieveTypedData(const QString &format, QMetaType ty
Q_FALLTHROUGH(); Q_FALLTHROUGH();
} }
case QMetaType::QUrl: { case QMetaType::QUrl: {
QByteArray ba = data.toByteArray(); auto bav = data.view<QByteArrayView>();
// Qt 3.x will send text/uri-list with a trailing // Qt 3.x will send text/uri-list with a trailing
// null-terminator (that is *not* sent for any other // null-terminator (that is *not* sent for any other
// text/* mime-type), so chop it off // text/* mime-type), so chop it off
if (ba.endsWith('\0')) if (bav.endsWith('\0'))
ba.chop(1); bav.chop(1);
return dataToUrls(bav);
QList<QByteArray> urls = ba.split('\n');
QList<QVariant> list;
for (int i = 0; i < urls.size(); ++i) {
QByteArray ba = urls.at(i).trimmed();
if (!ba.isEmpty())
list.append(QUrl::fromEncoded(ba));
}
return list;
} }
default: default:
break; break;
@ -557,14 +567,7 @@ void QMimeData::setData(const QString &mimeType, const QByteArray &data)
QByteArray ba = data; QByteArray ba = data;
if (ba.endsWith('\0')) if (ba.endsWith('\0'))
ba.chop(1); ba.chop(1);
QList<QByteArray> urls = ba.split('\n'); d->setData(mimeType, dataToUrls(ba));
QList<QVariant> list;
for (int i = 0; i < urls.size(); ++i) {
QByteArray ba = urls.at(i).trimmed();
if (!ba.isEmpty())
list.append(QUrl::fromEncoded(ba));
}
d->setData(mimeType, list);
} else { } else {
d->setData(mimeType, QVariant(data)); d->setData(mimeType, QVariant(data));
} }