X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/b610ce5913ef3172f3cf15c0a1d93c255ea0da4f..f7c2bd34104c592e4111255821432ef83ed4242c:/src/views/dolphinview.cpp

diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 48f41bb0e..3e966792d 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -1120,7 +1120,7 @@ void DolphinView::slotMouseButtonPressed(int itemIndex, Qt::MouseButtons buttons
 
 void DolphinView::slotSelectedItemTextPressed(int index)
 {
-    if (GeneralSettings::renameInline()) {
+    if (GeneralSettings::renameInline() && !m_view->style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick)) {
         const KFileItem item = m_model->fileItem(index);
         const KFileItemListProperties capabilities(KFileItemList() << item);
         if (capabilities.supportsMoving()) {
@@ -1488,7 +1488,7 @@ void DolphinView::slotRenamingResult(KJob* job)
 void DolphinView::slotDirectoryLoadingStarted()
 {
     // Disable the writestate temporary until it can be determined in a fast way
-    // in DolphinView::slotLoadingCompleted()
+    // in DolphinView::slotDirectoryLoadingCompleted()
     if (m_isFolderWritable) {
         m_isFolderWritable = false;
         emit writeStateChanged(m_isFolderWritable);
@@ -1569,7 +1569,7 @@ void DolphinView::slotRoleEditingFinished(int index, const QByteArray& role, con
     if (role == "text") {
         const KFileItem oldItem = m_model->fileItem(index);
         const QString newName = value.toString();
-        if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1String(".") && newName != QLatin1String("..")) {
+        if (!newName.isEmpty() && newName != oldItem.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) {
             const QUrl oldUrl = oldItem.url();
 
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);