Fix issues if QT_NO_CAST_FROM_ASCII is defined

Fix issues e.g. "error: ‘QString::QString(const QByteArray&)’
is private within this context".

diff --git a/src/kitemviews/kfileitemlistwidget.cpp b/src/kitemviews/kfileitemlistwidget.cpp
index 9802ca7d1607c98e14ba5404d690c2011ca9092d..d94117e4c33198f6341f647307f1314aff812a59 100644 (file)
--- 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 566caefaaf35ffbd232506f501c4a3e945cc4435..b49d4ebb1d4e7df655c709942a3ba7417f4d3f01 100644 (file)
--- 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<QPair<int, QVariant>> KItemModelBase::groups() const

diff --git a/src/kitemviews/private/kfileitemmodelfilter.cpp b/src/kitemviews/private/kfileitemmodelfilter.cpp
index 0f953080179d1ff7ce7ad88baaa0336e546b0e36..11debeab7b180461a4b16962e20a19a7d2e1ecbd 100644 (file)
--- 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);

diff --git a/src/settings/applyviewpropsjob.cpp b/src/settings/applyviewpropsjob.cpp
index 250f13c1028b5aed981c55ba790c6e83b34674ed..9460377f228789ca7fe7d7c1e2081adc3fcfda19 100644 (file)
--- a/src/settings/applyviewpropsjob.cpp
+++ b/src/settings/applyviewpropsjob.cpp
@@ -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);
 

diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index c9e973987af482610e6b181fe4d2e12e10a8fefe..33c5868d660df6df55beae52a4b80c1d3d1617b8 100644 (file)
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -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());
 

diff --git a/src/views/draganddrophelper.cpp b/src/views/draganddrophelper.cpp
index aaf2baa383501f89e79258e5d9df396f1eb74efd..2953233d0d08a18af50f9279b41da802788f4cb0 100644 (file)
--- a/src/views/draganddrophelper.cpp
+++ b/src/views/draganddrophelper.cpp
@@ -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,

diff --git a/src/views/tooltips/tooltipmanager.cpp b/src/views/tooltips/tooltipmanager.cpp
index b8c93b05126c778fc9229db9426e406c4aebf031..94a4bdd80cc605af100ebf46fd5de6739e9b179f 100644 (file)
--- a/src/views/tooltips/tooltipmanager.cpp
+++ b/src/views/tooltips/tooltipmanager.cpp
@@ -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());