From 9872a603705e08c7cb9deda61b1890fbd13da62b Mon Sep 17 00:00:00 2001 From: Denis Kozadaev Date: Thu, 1 Jan 2026 15:09:37 +0300 Subject: Modern size cannot fit into int Signed-off-by: Denis Kozadaev (cherry picked from commit 1dbf304d3b6ff07b17dfc6163c2d5046a8b13e47) --- kdf/disklist.cpp | 6 +++--- kdf/disks.cpp | 6 +++--- kdf/disks.h | 14 +++++++------- kdf/kdfwidget.cpp | 2 +- kdf/kdfwidget.h | 6 +++--- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/kdf/disklist.cpp b/kdf/disklist.cpp index 8927f0a..66f25a2 100644 --- a/kdf/disklist.cpp +++ b/kdf/disklist.cpp @@ -321,17 +321,17 @@ void DiskList::dfDone() //kdDebug() << " Icon: [" << disk->iconName() << "]" << endl; u=s.left(s.find(BLANK)); - disk->setKBSize(u.toInt() ); + disk->setKBSize(u.toULongLong() ); s=s.remove(0,s.find(BLANK)+1 ); //kdDebug() << " Size: [" << disk->kBSize() << "]" << endl; u=s.left(s.find(BLANK)); - disk->setKBUsed(u.toInt() ); + disk->setKBUsed(u.toULongLong() ); s=s.remove(0,s.find(BLANK)+1 ); //kdDebug() << " Used: [" << disk->kBUsed() << "]" << endl; u=s.left(s.find(BLANK)); - disk->setKBAvail(u.toInt() ); + disk->setKBAvail(u.toULongLong() ); s=s.remove(0,s.find(BLANK)+1 ); //kdDebug() << " Avail: [" << disk->kBAvail() << "]" << endl; diff --git a/kdf/disks.cpp b/kdf/disks.cpp index 391b5d9..1f7acba 100644 --- a/kdf/disks.cpp +++ b/kdf/disks.cpp @@ -306,13 +306,13 @@ void DiskEntry::setMounted(bool nowMounted) emit mountedChanged(); } -void DiskEntry::setKBSize(int kb_size) +void DiskEntry::setKBSize(TDEIO::filesize_t kb_size) { size=kb_size; emit kBSizeChanged(); } -void DiskEntry::setKBUsed(int kb_used) +void DiskEntry::setKBUsed(TDEIO::filesize_t kb_used) { used=kb_used; if ( size < (used+avail) ) { //adjust kBAvail @@ -322,7 +322,7 @@ void DiskEntry::setKBUsed(int kb_used) emit kBUsedChanged(); } -void DiskEntry::setKBAvail(int kb_avail) +void DiskEntry::setKBAvail(TDEIO::filesize_t kb_avail) { avail=kb_avail; if ( size < (used+avail) ) { //adjust kBUsed diff --git a/kdf/disks.h b/kdf/disks.h index 2ca286d..9a15783 100644 --- a/kdf/disks.h +++ b/kdf/disks.h @@ -77,13 +77,13 @@ public: TQString umountCommand() const { return umntcmd; } TQString fsType() const { return type; } bool mounted() const { return isMounted; } - int kBSize() const { return size; } + TDEIO::filesize_t kBSize() const { return size; } TQString iconName(); TQString realIconName() { return icoName; } TQString prettyKBSize() const { return TDEIO::convertSizeFromKB(size); } - int kBUsed() const { return used; } + TDEIO::filesize_t kBUsed() const { return used; } TQString prettyKBUsed() const { return TDEIO::convertSizeFromKB(used); } - int kBAvail() const { return avail; } + TDEIO::filesize_t kBAvail() const { return avail; } TQString prettyKBAvail() const { return TDEIO::convertSizeFromKB(avail); } float percentFull() const; @@ -113,9 +113,9 @@ public slots: void setMountOptions(const TQString & mountOptions); void setFsType(const TQString & fsType); void setMounted(bool nowMounted); - void setKBSize(int kb_size); - void setKBUsed(int kb_used); - void setKBAvail(int kb_avail); + void setKBSize(TDEIO::filesize_t kb_size); + void setKBUsed(TDEIO::filesize_t kb_used); + void setKBAvail(TDEIO::filesize_t kb_avail); TQString guessIconName(); private slots: @@ -138,7 +138,7 @@ private: mntcmd, umntcmd; - int size, + TDEIO::filesize_t size, used, avail; // ATTENTION: used+avail != size (clustersize!) diff --git a/kdf/kdfwidget.cpp b/kdf/kdfwidget.cpp index 0c8a08e..54b592c 100644 --- a/kdf/kdfwidget.cpp +++ b/kdf/kdfwidget.cpp @@ -82,7 +82,7 @@ int CListViewItem::compare ( TQListViewItem *i, int column, bool ) const } } -void CListViewItem::setKeys (int kb_size, int kb_avail, float percent_full) +void CListViewItem::setKeys (TDEIO::filesize_t kb_size, TDEIO::filesize_t kb_avail, float percent_full) { size = kb_size; avail = kb_avail; diff --git a/kdf/kdfwidget.h b/kdf/kdfwidget.h index 057761f..c63cde6 100644 --- a/kdf/kdfwidget.h +++ b/kdf/kdfwidget.h @@ -79,11 +79,11 @@ class CListViewItem : public TQListViewItem virtual int compare ( TQListViewItem* i, int col, bool) const; - void setKeys ( int kb_size, int kb_avail, float percent_full ) ; + void setKeys ( TDEIO::filesize_t kb_size, TDEIO::filesize_t kb_avail, float percent_full ) ; private: - int size; - int avail; + TDEIO::filesize_t size; + TDEIO::filesize_t avail; float full; }; -- cgit v1.2.3