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

diff --git a/src/statusbarspaceinfo.cpp b/src/statusbarspaceinfo.cpp
index a21f22c32..09976372a 100644
--- a/src/statusbarspaceinfo.cpp
+++ b/src/statusbarspaceinfo.cpp
@@ -20,9 +20,9 @@
 
 #include "statusbarspaceinfo.h"
 
-#include <QPainter>
-#include <QPaintEvent>
-#include <QTimer>
+#include <QtCore/QTimer>
+#include <QtGui/QPainter>
+#include <QtGui/QPaintEvent>
 
 #include <kglobalsettings.h>
 #include <kdiskfreesp.h>
@@ -30,10 +30,10 @@
 #include <kio/job.h>
 
 StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
-        QWidget(parent),
-        m_gettingSize(false),
-        m_kBSize(0),
-        m_kBAvailable(0)
+    QWidget(parent),
+    m_gettingSize(false),
+    m_kBSize(0),
+    m_kBAvailable(0)
 {
     setMinimumWidth(200);
 
@@ -45,7 +45,8 @@ StatusBarSpaceInfo::StatusBarSpaceInfo(QWidget* parent) :
 }
 
 StatusBarSpaceInfo::~StatusBarSpaceInfo()
-{}
+{
+}
 
 void StatusBarSpaceInfo::setUrl(const KUrl& url)
 {
@@ -90,7 +91,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
         }
         painter.drawRect(QRect(left, barTop + 2, right, barHeight - 1));
 
-        text = i18n("%1% of %2 used", 100 - (int)(100.0 * m_kBAvailable / m_kBSize), KIO::convertSizeFromKiB(m_kBSize));
+        text = i18n("%1 free", KIO::convertSizeFromKiB(m_kBAvailable));
     } else {
         if (m_gettingSize) {
             text = i18n("Getting size...");
@@ -100,7 +101,7 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
         }
     }
 
-    // draw text (usually 'X% of Y GB used')
+    // draw text
     painter.setPen(KGlobalSettings::textColor());
     painter.drawText(QRect(1, 1, barWidth - 2, barHeight + 6),
                      Qt::AlignCenter | Qt::TextWordWrap,
@@ -109,10 +110,13 @@ void StatusBarSpaceInfo::paintEvent(QPaintEvent* /* event */)
 
 
 void StatusBarSpaceInfo::slotFoundMountPoint(const unsigned long& kBSize,
-        const unsigned long& /* kBUsed */,
-        const unsigned long& kBAvailable,
-        const QString& /* mountPoint */)
+                                             const unsigned long& kBUsed,
+                                             const unsigned long& kBAvailable,
+                                             const QString& mountPoint)
 {
+    Q_UNUSED(kBUsed);
+    Q_UNUSED(mountPoint);
+
     m_gettingSize = false;
     m_kBSize = kBSize;
     m_kBAvailable = kBAvailable;