kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-04 17:30:55 +00:00
Code Issues Projects Releases Wiki Activity

Fix issues if QT_NO_CAST_FROM_ASCII is defined

Browse Source 
Fix issues e.g. "error: ‘QString::QString(const QByteArray&)’
is private within this context".
This commit is contained in:
Marius P 2023-12-24 08:20:40 +02:00 committed by Méven Car
parent 2ba33b9220
commit b2defa2f98
7 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/kitemviews/kfileitemlistwidget.cpp
View File

@ -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 {

2
src/kitemviews/kitemmodelbase.cpp
View File

@ -76,7 +76,7 @@ void KItemModelBase::setSortOrder(Qt::SortOrder order)
QString KItemModelBase::roleDescription(const QByteArray &role) const
{
return role;
return QString::fromLatin1(role);
}
QList<QPair<int, QVariant>> KItemModelBase::groups() const

2
src/kitemviews/private/kfileitemmodelfilter.cpp
View File

@ -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);

2
src/settings/applyviewpropsjob.cpp
View File

@ -44,7 +44,7 @@ void ApplyViewPropsJob::slotEntries(KIO::Job *, const KIO::UDSEntryList &list)
QUrl url(m_dir);
url = url.adjusted(QUrl::StripTrailingSlash);
url.setPath(url.path() + '/' + name);
url.setPath(url.path() + QLatin1Char('/') + name);
Q_ASSERT(m_viewProps);

6
src/views/dolphinremoteencoding.cpp
View File

@ -151,7 +151,7 @@ void DolphinRemoteEncoding::slotItemSelected(QAction *action)
if (action) {
int id = action->data().toInt();
KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1());
KConfig config(QLatin1String("kio_%1rc").arg(m_currentURL.scheme()));
QString host = m_currentURL.host();
if (m_menu->menu()->actions().at(id)->isChecked()) {
QString charset = KCharsets::charsets()->encodingForName(m_encodingDescriptions.at(id));
@ -169,9 +169,9 @@ void DolphinRemoteEncoding::slotDefault()
{
// We have no choice but delete all higher domain level
// settings here since it affects what will be matched.
KConfig config(("kio_" + m_currentURL.scheme() + "rc").toLatin1());
KConfig config(QLatin1String("kio_%1rc").arg(m_currentURL.scheme()));
QStringList partList = m_currentURL.host().split('.', Qt::SkipEmptyParts);
QStringList partList = m_currentURL.host().split(QLatin1Char('.'), Qt::SkipEmptyParts);
if (!partList.isEmpty()) {
partList.erase(partList.begin());

4
src/views/draganddrophelper.cpp
View File

@ -38,8 +38,8 @@ KIO::DropJob *DragAndDropHelper::dropUrls(const QUrl &destUrl, QDropEvent *event
{
const QMimeData *mimeData = event->mimeData();
if (isArkDndMimeType(mimeData)) {
const QString remoteDBusClient = mimeData->data(arkDndServiceMimeType());
const QString remoteDBusPath = mimeData->data(arkDndPathMimeType());
const QString remoteDBusClient = QString::fromUtf8(mimeData->data(arkDndServiceMimeType()));
const QString remoteDBusPath = QString::fromUtf8(mimeData->data(arkDndPathMimeType()));
QDBusMessage message = QDBusMessage::createMethodCall(remoteDBusClient,
remoteDBusPath,

2
src/views/tooltips/tooltipmanager.cpp
View File

@ -133,7 +133,7 @@ void ToolTipManager::startContentRetrieval()
// Request a preview of the item
m_fileMetaDataWidget->setPreview(QPixmap());
const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
const KConfigGroup globalConfig(KSharedConfig::openConfig(), QLatin1String("PreviewSettings"));
const QStringList plugins = globalConfig.readEntry("Plugins", KIO::PreviewJob::defaultPlugins());
KIO::PreviewJob *job = new KIO::PreviewJob(KFileItemList() << m_item, QSize(256, 256), &plugins);
job->setIgnoreMaximumSize(m_item.isLocalFile() && !m_item.isSlow());