Fix parentless dialogs

svn path=/trunk/KDE/kdebase/apps/; revision=734288

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 89e78b9e1e19ad756739117cea7fa81622831533..9a28f5d73c3780c28145bc212ee32a8d95e244d5 100644 (file)
--- a/src/dolphinsettingsdialog.cpp
+++ b/src/dolphinsettingsdialog.cpp
@@ -30,8 +30,7 @@
 #include <kicon.h>
 
 DolphinSettingsDialog::DolphinSettingsDialog(DolphinMainWindow* mainWindow) :
-    KPageDialog(),
-    m_mainWindow(mainWindow)
+    KPageDialog(mainWindow)
 {
     const QSize minSize = minimumSize();
     setMinimumSize(QSize(512, minSize.height()));

diff --git a/src/dolphinsettingsdialog.h b/src/dolphinsettingsdialog.h
index d7bc4ddfb79a8802938dc6d34207bedbcd238ea7..e68d8279892e20362b60ed84602f02548a26014c 100644 (file)
--- a/src/dolphinsettingsdialog.h
+++ b/src/dolphinsettingsdialog.h
@@ -50,7 +50,6 @@ private:
     void restoreDefaults();
 
 private:
-    DolphinMainWindow* m_mainWindow;
     GeneralSettingsPage* m_generalSettingsPage;
     ViewSettingsPage* m_viewSettingsPage;
 };

diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp
index 1f419d099387669dde773e679b3aa33fe573b6fc..f3a836b7336be7f7d690f288fbf6c34cc7d5363c 100644 (file)
--- a/src/dolphinviewcontainer.cpp
+++ b/src/dolphinviewcontainer.cpp
@@ -191,7 +191,7 @@ void DolphinViewContainer::renameSelectedItems()
     if (items.count() > 1) {
         // More than one item has been selected for renaming. Open
         // a rename dialog and rename all items afterwards.
-        RenameDialog dialog(items);
+        RenameDialog dialog(this, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }
@@ -236,7 +236,7 @@ void DolphinViewContainer::renameSelectedItems()
         // TODO: Think about using KFileItemDelegate as soon as it supports editing.
         // Currently the RenameDialog is used, but I'm not sure whether inline renaming
         // is a benefit for the user at all -> let's wait for some input first...
-        RenameDialog dialog(items);
+        RenameDialog dialog(this, items);
         if (dialog.exec() == QDialog::Rejected) {
             return;
         }

diff --git a/src/renamedialog.cpp b/src/renamedialog.cpp
index fc095c0f36a8a7fdc1a6f5067929899611c0f342..4a72fda1612f2036d638b0c99ac2ebbe1bce804e 100644 (file)
--- a/src/renamedialog.cpp
+++ b/src/renamedialog.cpp
@@ -26,8 +26,8 @@
 #include <QtGui/QLabel>
 #include <QtGui/QBoxLayout>
 
-RenameDialog::RenameDialog(const KFileItemList& items) :
-    KDialog(),
+RenameDialog::RenameDialog(QWidget *parent, const KFileItemList& items) :
+    KDialog(parent),
     m_renameOneItem(false)
 {
     const QSize minSize = minimumSize();

diff --git a/src/renamedialog.h b/src/renamedialog.h
index f996e56cb65d3c8fc373c023e9399458a10c9cd8..9984757337d676577db1a188dd85f1c3d83b0f8a 100644 (file)
--- a/src/renamedialog.h
+++ b/src/renamedialog.h
@@ -53,7 +53,7 @@ class LIBDOLPHINPRIVATE_EXPORT RenameDialog : public KDialog
     Q_OBJECT
 
 public:
-    explicit RenameDialog(const KFileItemList& items);
+    explicit RenameDialog(QWidget *parent, const KFileItemList& items);
     virtual ~RenameDialog();
 
     /**

diff --git a/src/treeviewcontextmenu.cpp b/src/treeviewcontextmenu.cpp
index 73d228c2c48a92ae28cfcc4e8fe95a3b177a1dd5..f73b50481891143c2507c522b6710db7c2257916 100644 (file)
--- a/src/treeviewcontextmenu.cpp
+++ b/src/treeviewcontextmenu.cpp
@@ -141,7 +141,7 @@ void TreeViewContextMenu::rename()
 {
     KFileItemList item;
     item.append(m_fileInfo);
-    RenameDialog dialog(item);
+    RenameDialog dialog(m_parent, item);
     if (dialog.exec() == QDialog::Accepted) {
         const QString& newName = dialog.newName();
         if (!newName.isEmpty()) {