From af37efda77571ccdef5a972e210c0afd1f7f3394 Mon Sep 17 00:00:00 2001 From: Matthias Fuchs Date: Tue, 31 May 2011 23:42:46 +0200 Subject: Improves 79ccd0202d106a9c16b79a20cd79831a60dc5393 by allowing "/" in file names. Though here "/" is not the ascii char '/' but the "unicode fraction slash" one, thus it is not taken as directory command. CCBUG:211751 REVIEW:101454 --- src/views/renamedialog.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/views/renamedialog.cpp b/src/views/renamedialog.cpp index a14ba77b7..c0c6ad58c 100644 --- a/src/views/renamedialog.cpp +++ b/src/views/renamedialog.cpp @@ -136,7 +136,7 @@ void RenameDialog::slotButtonClicked(int button) Q_ASSERT(m_items.count() == 1); const KUrl oldUrl = m_items.first().url(); KUrl newUrl = oldUrl; - newUrl.setFileName(m_newName); + newUrl.setFileName(KIO::encodeFileName(m_newName)); KonqOperations::rename(this, oldUrl, newUrl); } else { renameItems(); @@ -148,7 +148,7 @@ void RenameDialog::slotButtonClicked(int button) void RenameDialog::slotTextChanged(const QString& newName) { - bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String(".")) && !newName.contains('/'); + bool enable = !newName.isEmpty() && (newName != QLatin1String("..")) && (newName != QLatin1String(".")); if (enable) { if (m_renameOneItem) { enable = enable && (newName != m_newName); @@ -185,7 +185,7 @@ void RenameDialog::renameItems() const KUrl oldUrl = item.url(); if (oldUrl.fileName() != newName) { KUrl newUrl = oldUrl; - newUrl.setFileName(newName); + newUrl.setFileName(KIO::encodeFileName(newName)); KonqOperations::rename(this, oldUrl, newUrl); } } -- cgit v1.3