From b2defa2f98468fcb9491ef7c3b96e340bb6bfa92 Mon Sep 17 00:00:00 2001 From: Marius P Date: Sun, 24 Dec 2023 08:20:40 +0200 Subject: Fix issues if QT_NO_CAST_FROM_ASCII is defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fix issues e.g. "error: ‘QString::QString(const QByteArray&)’ is private within this context". --- src/kitemviews/kfileitemlistwidget.cpp | 2 +- src/kitemviews/kitemmodelbase.cpp | 2 +- src/kitemviews/private/kfileitemmodelfilter.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/kitemviews') diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp index 9802ca7d1..d94117e4c 100644 --- a/src/kitemviews/kfileitemlistwidget.cpp +++ b/src/kitemviews/kfileitemlistwidget.cpp @@ -109,7 +109,7 @@ QString KFileItemListWidgetInformant::roleText(const QByteArray &role, const QHa text = QString::number(permissions.at(1).toInt(), 8); break; case ContentDisplaySettings::EnumUsePermissionsFormat::CombinedFormat: - text = QString("%1 (%2)").arg(permissions.at(0).toString()).arg(permissions.at(1).toInt(), 0, 8); + text = QLatin1String("%1 (%2)").arg(permissions.at(0).toString()).arg(permissions.at(1).toInt(), 0, 8); break; } } else { diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp index 566caefaa..b49d4ebb1 100644 --- a/src/kitemviews/kitemmodelbase.cpp +++ b/src/kitemviews/kitemmodelbase.cpp @@ -76,7 +76,7 @@ void KItemModelBase::setSortOrder(Qt::SortOrder order) QString KItemModelBase::roleDescription(const QByteArray &role) const { - return role; + return QString::fromLatin1(role); } QList> KItemModelBase::groups() const diff --git a/src/kitemviews/private/kfileitemmodelfilter.cpp b/src/kitemviews/private/kfileitemmodelfilter.cpp index 0f9530801..11debeab7 100644 --- a/src/kitemviews/private/kfileitemmodelfilter.cpp +++ b/src/kitemviews/private/kfileitemmodelfilter.cpp @@ -31,7 +31,7 @@ void KFileItemModelFilter::setPattern(const QString &filter) m_pattern = filter; m_lowerCasePattern = filter.toLower(); - if (filter.contains('*') || filter.contains('?') || filter.contains('[')) { + if (filter.contains(QLatin1Char('*')) || filter.contains(QLatin1Char('?')) || filter.contains(QLatin1Char('['))) { if (!m_regExp) { m_regExp = new QRegularExpression(); m_regExp->setPatternOptions(QRegularExpression::CaseInsensitiveOption); -- cgit v1.3