From 335968619248fc6eef7905ca77b084dba34e711d Mon Sep 17 00:00:00 2001
From: uwolfer <uwolfer@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Mon, 26 Nov 2007 20:36:44 +0000
Subject: [PATCH] Use KIO::filesize_t to be able to handle big filesizes (now
 4GB DVD image filesizes are displayed correctly).

git-svn-id: svn://anonsvn.kde.org/home/kde/trunk/KDE/kdenetwork@741965 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kget/core/transfer.cpp        | 8 ++++----
 kget/core/transfer.h          | 9 +++++----
 kget/core/transferhandler.cpp | 8 ++++----
 kget/core/transferhandler.h   | 4 ++--
 4 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/kget/core/transfer.cpp b/kget/core/transfer.cpp
index 664b52ad8..94d5565fe 100644
--- a/kget/core/transfer.cpp
+++ b/kget/core/transfer.cpp
@@ -97,8 +97,8 @@ void Transfer::save(const QDomElement &element)
     QDomElement e = element;
     e.setAttribute("Source", m_source.url());
     e.setAttribute("Dest", m_dest.url());
-    e.setAttribute("TotalSize", (qulonglong) m_totalSize);
-    e.setAttribute("ProcessedSize", (qulonglong) m_processedSize);
+    e.setAttribute("TotalSize", m_totalSize);
+    e.setAttribute("ProcessedSize", m_processedSize);
 }
 
 void Transfer::load(const QDomElement &e)
@@ -106,8 +106,8 @@ void Transfer::load(const QDomElement &e)
     m_source = KUrl(e.attribute("Source"));
     m_dest = KUrl(e.attribute("Dest"));
 
-    m_totalSize = e.attribute("TotalSize").toInt();
-    m_processedSize = e.attribute("ProcessedSize").toInt();
+    m_totalSize = e.attribute("TotalSize").toULongLong();
+    m_processedSize = e.attribute("ProcessedSize").toULongLong();
 
     if( m_totalSize != 0)
         m_percent = (int)((100.0 * m_processedSize) / m_totalSize);
diff --git a/kget/core/transfer.h b/kget/core/transfer.h
index 7dfc52f03..4f95d366c 100644
--- a/kget/core/transfer.h
+++ b/kget/core/transfer.h
@@ -15,6 +15,7 @@
 #include <QPixmap>
 
 #include <kurl.h>
+#include <kio/global.h>
 
 #include "job.h"
 #include "kget_export.h"
@@ -70,8 +71,8 @@ class KGET_EXPORT Transfer : public Job
         const KUrl & dest() const           {return m_dest;}
 
         //Transfer status
-        unsigned long totalSize() const     {return m_totalSize;}
-        unsigned long processedSize() const {return m_processedSize;}
+        KIO::filesize_t totalSize() const     {return m_totalSize;}
+        KIO::filesize_t processedSize() const {return m_processedSize;}
         QString statusText() const          {return m_statusText;}
         QPixmap statusPixmap() const        {return m_statusPixmap;}
 
@@ -151,8 +152,8 @@ class KGET_EXPORT Transfer : public Job
         KUrl m_dest;
 
         QStringList   m_log;
-        unsigned long m_totalSize;
-        unsigned long m_processedSize;
+        KIO::filesize_t m_totalSize;
+        KIO::filesize_t m_processedSize;
         int           m_percent;
         int           m_speed;
 
diff --git a/kget/core/transferhandler.cpp b/kget/core/transferhandler.cpp
index 5f074407c..db8e22793 100644
--- a/kget/core/transferhandler.cpp
+++ b/kget/core/transferhandler.cpp
@@ -51,7 +51,7 @@ void TransferHandler::start()
 {
     if(m_transfer->group()->status() == JobQueue::Running)
     {
-	m_transfer->setPolicy(Job::None);
+        m_transfer->setPolicy(Job::None);
         m_transfer->group()->move(m_transfer, 0);
     }
     else
@@ -68,7 +68,7 @@ void TransferHandler::stop()
     }
     else
     {
-	m_transfer->setPolicy(Job::Stop);
+        m_transfer->setPolicy(Job::Stop);
     }
 }
 
@@ -87,12 +87,12 @@ bool TransferHandler::isResumable() const
     return m_transfer->isResumable();
 }
 
-unsigned long TransferHandler::totalSize() const
+KIO::filesize_t TransferHandler::totalSize() const
 {
     return m_transfer->totalSize();
 }
 
-unsigned long TransferHandler::processedSize() const
+KIO::filesize_t TransferHandler::processedSize() const
 {
     return m_transfer->processedSize();
 }
diff --git a/kget/core/transferhandler.h b/kget/core/transferhandler.h
index 430e2bdcc..17c20b501 100644
--- a/kget/core/transferhandler.h
+++ b/kget/core/transferhandler.h
@@ -113,12 +113,12 @@ class KGET_EXPORT TransferHandler
         /**
          * @return the total size of the transfer in bytes
          */
-        unsigned long totalSize() const;
+        KIO::filesize_t totalSize() const;
 
         /**
          * @return the downloaded size of the transfer in bytes
          */
-        unsigned long processedSize() const;
+        KIO::filesize_t processedSize() const;
 
         /**
          * @return the progress percentage of the transfer
-- 
2.11.4.GIT