From fe5c03fb588792a454552bf805b15300768f16f8 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Wed, 12 Dec 2012 22:57:20 +0100 Subject: [PATCH] Fix Bug 240820 - [Usability Bug] Handling Bad Filenames, dolphin gives unclear error message Fix Bug 308597 - Regression: Renaming a file/folder to something that contains a "/" will result in several message boxes Uses the same solution as Dolphin-Rename-Dialog does. (KIO::encodeFileName) BUG: 240820 BUG: 308597 REVIEW: 107681 FIXED-IN: 4.9.5 --- src/kitemviews/private/kitemlistroleeditor.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 1e4b5fd4e..4f4006010 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -20,6 +20,7 @@ #include "kitemlistroleeditor.h" #include +#include #include KItemListRoleEditor::KItemListRoleEditor(QWidget *parent) : @@ -93,7 +94,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) // a roleEditingFinished signal (see KItemListRoleEditor::event), // which is not wanted in this case. m_blockFinishedSignal = true; - emit roleEditingCanceled(m_index, m_role, toPlainText()); + emit roleEditingCanceled(m_index, m_role, KIO::encodeFileName(toPlainText())); m_blockFinishedSignal = false; event->accept(); return; @@ -137,7 +138,7 @@ void KItemListRoleEditor::autoAdjustSize() void KItemListRoleEditor::emitRoleEditingFinished() { if (!m_blockFinishedSignal) { - emit roleEditingFinished(m_index, m_role, toPlainText()); + emit roleEditingFinished(m_index, m_role, KIO::encodeFileName(toPlainText())); } } -- 2.47.3