From 360131aba1d1b7cb9aa4c9a37d485b2d25e6e538 Mon Sep 17 00:00:00 2001
From: Volker Lanz <vl@fidra.de>
Date: Wed, 17 Feb 2010 10:27:42 +0000
Subject: [PATCH] don't format Byte with decimal digits

svn path=/trunk/extragear/sysadmin/partitionmanager/; revision=1091656
---
 src/util/capacity.cpp | 7 ++++---
 src/util/capacity.h   | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/util/capacity.cpp b/src/util/capacity.cpp
index 8974a5d..0227e85 100644
--- a/src/util/capacity.cpp
+++ b/src/util/capacity.cpp
@@ -74,7 +74,7 @@ QString Capacity::toString(Flags f) const
 	@return the Capacity as string */
 QString Capacity::toString(Unit u, Flags f) const
 {
-	QString s = toStringInternal(unitFactor(Byte, u));
+	QString s = toStringInternal(u);
 	if ((f & AppendUnit) && s != invalidString())
 		s += ' ' + unitName(u);
 	if ((f & AppendBytes) && s != invalidString())
@@ -179,11 +179,12 @@ bool Capacity::isValid() const
 	return m_Size >= 0;
 }
 
-QString Capacity::toStringInternal(qint64 unitSize) const
+QString Capacity::toStringInternal(Unit u) const
 {
 	if (m_Size < 0)
 		return invalidString();
 
+	qint64 unitSize = unitFactor(Byte, u);
 	const double num = static_cast<double>(m_Size) / static_cast<double>(unitSize);
-	return KGlobal::locale()->formatNumber(num);
+	return KGlobal::locale()->formatNumber(num, u == Byte ? 0 : -1);
 }
diff --git a/src/util/capacity.h b/src/util/capacity.h
index 6716b69..76ad8c5 100644
--- a/src/util/capacity.h
+++ b/src/util/capacity.h
@@ -72,7 +72,7 @@ class Capacity
 		static qint64 unitFactor(Unit from, Unit to);
 
 	protected:
-		QString toStringInternal(qint64 unitSize) const;
+		QString toStringInternal(Unit u) const;
 
 	private:
 		qint64 m_Size;