Fix crash when expanding/closing a sub-tree

[dolphin.git] / src / panels / information / informationpanel.cpp

diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp
index 0fd67b2b6ee03fd40c8e22616ef00f12031d6627..d45ef8ea45195248d4c7615ab02bce6c5378e1ca 100644 (file)
--- a/src/panels/information/informationpanel.cpp
+++ b/src/panels/information/informationpanel.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2006-2009 by Peter Penz <peter.penz@gmx.at>             *
+ *   Copyright (C) 2006-2009 by Peter Penz <peter.penz19@gmail.com>        *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
@@ -20,8 +20,8 @@
 #include "informationpanel.h"
 
 #include "informationpanelcontent.h"
-#include <kio/job.h>
-#include <kdirnotify.h>
+#include <KIO/Job>
+#include <KDirNotify>
 #include <QApplication>
 #include <QShowEvent>
 #include <QVBoxLayout>
@@ -46,20 +46,13 @@ InformationPanel::~InformationPanel()
 {
 }
 
-QSize InformationPanel::sizeHint() const
-{
-    QSize size = Panel::sizeHint();
-    size.setWidth(minimumSizeHint().width());
-    return size;
-}
-
 void InformationPanel::setSelection(const KFileItemList& selection)
 {
     if (!isVisible()) {
         return;
     }
 
-    if ((selection.count() == 0) && (m_selection.count() == 0)) {
+    if (selection.isEmpty() && m_selection.isEmpty()) {
         // The selection has not really changed, only the current index.
         // QItemSelectionModel emits a signal in this case and it is less
         // expensive doing the check this way instead of patching
@@ -167,7 +160,8 @@ void InformationPanel::resizeEvent(QResizeEvent* event)
 
 void InformationPanel::contextMenuEvent(QContextMenuEvent* event)
 {
-    m_content->configureSettings();
+    // TODO: Move code from InformationPanelContent::configureSettings() here
+    m_content->configureSettings(customContextMenuActions());
     Panel::contextMenuEvent(event);
 }
 
@@ -352,7 +346,7 @@ void InformationPanel::init()
 
     org::kde::KDirNotify* dirNotify = new org::kde::KDirNotify(QString(), QString(),
                                                                QDBusConnection::sessionBus(), this);
-    connect(dirNotify, SIGNAL(FileRenamed(QString, QString)), SLOT(slotFileRenamed(QString, QString)));
+    connect(dirNotify, SIGNAL(FileRenamed(QString,QString)), SLOT(slotFileRenamed(QString,QString)));
     connect(dirNotify, SIGNAL(FilesAdded(QString)), SLOT(slotFilesAdded(QString)));
     connect(dirNotify, SIGNAL(FilesChanged(QStringList)), SLOT(slotFilesChanged(QStringList)));
     connect(dirNotify, SIGNAL(FilesRemoved(QStringList)), SLOT(slotFilesRemoved(QStringList)));