X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/c8a4f1fd8d3c9b50e51b7234123b3fbe0b979552..ec00f379dc42b00a64ab1af25bb4bb1a06bd7449:/src/dolphinstatusbar.cpp

diff --git a/src/dolphinstatusbar.cpp b/src/dolphinstatusbar.cpp
index 1f6859a8f..a6bc03224 100644
--- a/src/dolphinstatusbar.cpp
+++ b/src/dolphinstatusbar.cpp
@@ -23,19 +23,19 @@
 #include "statusbarmessagelabel.h"
 #include "statusbarspaceinfo.h"
 
-#include <QLabel>
-#include <QProgressBar>
-#include <QTimer>
+#include <QtGui/QLabel>
+#include <QtGui/QProgressBar>
+#include <QtCore/QTimer>
 
 #include <kiconloader.h>
 #include <kvbox.h>
 
-DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
-        KHBox(parent),
-        m_messageLabel(0),
-        m_spaceInfo(0),
-        m_progressBar(0),
-        m_progress(100)
+DolphinStatusBar::DolphinStatusBar(QWidget* parent, const KUrl& url) :
+    KHBox(parent),
+    m_messageLabel(0),
+    m_spaceInfo(0),
+    m_progressBar(0),
+    m_progress(100)
 {
     setSpacing(4);
 
@@ -43,7 +43,7 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     m_messageLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
 
     m_spaceInfo = new StatusBarSpaceInfo(this);
-    m_spaceInfo->setUrl(parent->url());
+    m_spaceInfo->setUrl(url);
 
     m_progressText = new QLabel(this);
     m_progressText->hide();
@@ -58,9 +58,6 @@ DolphinStatusBar::DolphinStatusBar(DolphinView* parent) :
     setMinimumHeight(barHeight);
     m_messageLabel->setMinimumTextHeight(barHeight);
     m_spaceInfo->setFixedHeight(barHeight);
-
-    connect(parent, SIGNAL(urlChanged(const KUrl&)),
-            this, SLOT(updateSpaceInfoContent(const KUrl&)));
 }
 
 
@@ -147,7 +144,7 @@ const QString& DolphinStatusBar::defaultText() const
 void DolphinStatusBar::resizeEvent(QResizeEvent* event)
 {
     QWidget::resizeEvent(event);
-    QTimer::singleShot(0, this, SLOT(showSpaceInfo()));
+    QMetaObject::invokeMethod(this, "showSpaceInfo", Qt::QueuedConnection);
 }
 
 void DolphinStatusBar::updateProgressInfo()