]> cloud.milkyroute.net Git - dolphin.git/commitdiff
FoldersPanel: Fix inline renaming
authorJan Paul Batrina <jpmbatrina01@gmail.com>
Thu, 19 Aug 2021 14:34:40 +0000 (22:34 +0800)
committerMéven Car <meven29@gmail.com>
Fri, 27 Aug 2021 07:29:29 +0000 (07:29 +0000)
Commit 5a0da4a9c8d10dc1921077d84bdabf05d20150b0 changed the value
for emitRoleEditingFinished() to a struct containing
the new name, but folderspanel was not updated.

BUG: 441124

src/panels/folders/folderspanel.cpp

index 82b2e1b126da03cec2f9491491feef6a67ddf7f4..19a05d2b69542fa58f49f1424f128a883f10cd05 100644 (file)
@@ -15,6 +15,7 @@
 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kitemlistcontroller.h"
 #include "kitemviews/kitemlistselectionmanager.h"
 #include "kitemviews/kitemlistcontainer.h"
 #include "kitemviews/kitemlistcontroller.h"
 #include "kitemviews/kitemlistselectionmanager.h"
+#include "kitemviews/private/kitemlistroleeditor.h"
 #include "treeviewcontextmenu.h"
 #include "views/draganddrophelper.h"
 
 #include "treeviewcontextmenu.h"
 #include "views/draganddrophelper.h"
 
@@ -245,7 +246,8 @@ void FoldersPanel::slotRoleEditingFinished(int index, const QByteArray& role, co
 {
     if (role == "text") {
         const KFileItem item = m_model->fileItem(index);
 {
     if (role == "text") {
         const KFileItem item = m_model->fileItem(index);
-        const QString newName = value.toString();
+        const EditResult retVal = value.value<EditResult>();
+        const QString newName = retVal.newName;
         if (!newName.isEmpty() && newName != item.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) {
             const QUrl oldUrl = item.url();
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);
         if (!newName.isEmpty() && newName != item.text() && newName != QLatin1Char('.') && newName != QLatin1String("..")) {
             const QUrl oldUrl = item.url();
             QUrl newUrl = oldUrl.adjusted(QUrl::RemoveFilename);