]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Enable KIO error reporting when renaming with the dialog
authorFrank Reininghaus <frank78ac@googlemail.com>
Sat, 22 Jun 2013 07:19:27 +0000 (09:19 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Sat, 22 Jun 2013 07:19:27 +0000 (09:19 +0200)
The problem was that the KonqOperations object did not have the right
parent.

BUG: 299646
FIXED-IN: 4.11.0
REVIEW: 111111

src/views/renamedialog.cpp

index abb37b897de9738a85ac28b9217cd01ca2364ab1..d8dbd7749dc3eb7fd91b29a3dd68fb2a90f2d9cd 100644 (file)
@@ -146,7 +146,13 @@ void RenameDialog::slotButtonClicked(int button)
             const KUrl oldUrl = m_items.first().url();
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(m_newName));
             const KUrl oldUrl = m_items.first().url();
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(m_newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
+
+            QWidget* widget = parentWidget();
+            if (!widget) {
+                widget = this;
+            }
+
+            KonqOperations::rename(widget, oldUrl, newUrl);
         } else {
             renameItems();
         }
         } else {
             renameItems();
         }
@@ -191,7 +197,13 @@ void RenameDialog::renameItems()
         if (oldUrl.fileName() != newName) {
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(newName));
         if (oldUrl.fileName() != newName) {
             KUrl newUrl = oldUrl;
             newUrl.setFileName(KIO::encodeFileName(newName));
-            KonqOperations::rename(this, oldUrl, newUrl);
+
+            QWidget* widget = parentWidget();
+            if (!widget) {
+                widget = this;
+            }
+
+            KonqOperations::rename(widget, oldUrl, newUrl);
         }
     }
 }
         }
     }
 }