From ad74c99bbc4b4907a0cec0b7c5e3b9b37e5bad5b Mon Sep 17 00:00:00 2001
From: Craig Drummond <craig@kde.org>
Date: Thu, 8 Nov 2007 13:29:44 +0000
Subject: [PATCH] Fix parentless dialogs

svn path=/trunk/KDE/kdebase/apps/; revision=734288
---
 src/dolphinsettingsdialog.cpp | 3 +--
 src/dolphinsettingsdialog.h   | 1 -
 src/dolphinviewcontainer.cpp  | 4 ++--
 src/renamedialog.cpp          | 4 ++--
 src/renamedialog.h            | 2 +-
 src/treeviewcontextmenu.cpp   | 2 +-
 6 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/dolphinsettingsdialog.cpp b/src/dolphinsettingsdialog.cpp
index 89e78b9e1..9a28f5d73 100644
--- 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 d7bc4ddfb..e68d82798 100644
--- 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 1f419d099..f3a836b73 100644
--- 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 fc095c0f3..4a72fda16 100644
--- 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 f996e56cb..998475733 100644
--- 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 73d228c2c..f73b50481 100644
--- 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()) {
-- 
2.47.3