From kde-commits  Mon Apr 30 22:28:01 2007
From: David Faure <faure () kde ! org>
Date: Mon, 30 Apr 2007 22:28:01 +0000
To: kde-commits
Subject: KDE/kdelibs/kio
Message-Id: <1177972081.496842.31455.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=117797209619640

SVN commit 659858 by dfaure:

Port KIO::directorySize to QList<KFileItem>. The conversion code can be removed once KPropertiesDialog is ported to QList<KFileItem> too...


 M  +7 -1      kfile/kpropertiesdialog.cpp  
 M  +7 -7      kio/directorysizejob.cpp  
 M  +3 -3      kio/directorysizejob.h  


--- trunk/KDE/kdelibs/kio/kfile/kpropertiesdialog.cpp #659857:659858
@@ -1266,7 +1266,13 @@
   m_sizeLabel->setText( i18n("Calculating...") );
   kDebug(250) << " KFilePropsPlugin::slotSizeDetermine() properties->item()=" <<  properties->item() << endl;
   kDebug(250) << " URL=" << properties->item()->url().url() << endl;
-  d->dirSizeJob = KIO::directorySize( properties->items() );
+
+  // Must turn QList<KFileItem *> to QList<KFileItem>... # TODO port KPropertiesDialog to QList<KFileItem>
+  QList<KFileItem> itemList;
+  foreach( KFileItem* it, properties->items() )
+      itemList.append( *it );
+
+  d->dirSizeJob = KIO::directorySize( itemList );
   d->dirSizeUpdateTimer = new QTimer(this);
   connect( d->dirSizeUpdateTimer, SIGNAL( timeout() ),
            SLOT( slotDirSizeUpdate() ) );
--- trunk/KDE/kdelibs/kio/kio/directorysizejob.cpp #659857:659858
@@ -31,7 +31,7 @@
     startNextJob( directory );
 }
 
-DirectorySizeJob::DirectorySizeJob( const KFileItemList & lstItems )
+DirectorySizeJob::DirectorySizeJob( const QList<KFileItem> & lstItems )
     : KIO::Job(), m_totalSize(0L), m_totalFiles(0L), m_totalSubdirs(0L), m_lstItems(lstItems), m_currentItem(0)
 {
     QTimer::singleShot( 0, this, SLOT(processNextItem()) );
@@ -46,19 +46,19 @@
 {
     while (m_currentItem < m_lstItems.count())
     {
-        KFileItem * item = m_lstItems[m_currentItem++];
-	if ( !item->isLink() )
+        const KFileItem item = m_lstItems[m_currentItem++];
+	if ( !item.isLink() )
 	{
-            if ( item->isDir() )
+            if ( item.isDir() )
             {
                 kDebug(7007) << "DirectorySizeJob::processNextItem dir -> listing" << endl;
-                KUrl url = item->url();
+                KUrl url = item.url();
                 startNextJob( url );
                 return; // we'll come back later, when this one's finished
             }
             else
             {
-                m_totalSize += item->size();
+                m_totalSize += item.size();
                 kDebug(7007) << "DirectorySizeJob::processNextItem file -> " << m_totalSize << endl;
             }
 	}
@@ -129,7 +129,7 @@
 }
 
 //static
-DirectorySizeJob * KIO::directorySize( const KFileItemList & lstItems )
+DirectorySizeJob * KIO::directorySize( const QList<KFileItem> & lstItems )
 {
     DirectorySizeJob *job = new DirectorySizeJob(lstItems);
     job->setUiDelegate(new JobUiDelegate());
--- trunk/KDE/kdelibs/kio/kio/directorysizejob.h #659857:659858
@@ -43,7 +43,7 @@
      * Do not create a DirectorySizeJob directly. Use KIO::directorySize() instead.
      * instead.
      */
-    DirectorySizeJob( const KFileItemList & lstItems );
+    DirectorySizeJob( const QList<KFileItem> & lstItems );
 
     ~DirectorySizeJob();
 
@@ -78,7 +78,7 @@
     KIO::filesize_t m_totalSize;
     KIO::filesize_t m_totalFiles;
     KIO::filesize_t m_totalSubdirs;
-    KFileItemList m_lstItems;
+    QList<KFileItem> m_lstItems;
     int m_currentItem;
 private:
     class DirectorySizeJobPrivate* d;
@@ -101,7 +101,7 @@
  * we directly know if the item is a file or a directory,
  * and in case of a file, we already have its size.
  */
-KIO_EXPORT DirectorySizeJob * directorySize( const KFileItemList & lstItems );
+KIO_EXPORT DirectorySizeJob * directorySize( const QList<KFileItem> & lstItems );
 
 }