[PlacesItemModelTest] Check whether Desktop and Download folders exist

[dolphin.git] / src / kitemviews / private / kitemlistviewlayouter.cpp

diff --git a/src/kitemviews/private/kitemlistviewlayouter.cpp b/src/kitemviews/private/kitemlistviewlayouter.cpp
index 04325c7d0bc3c74bb8fa21b3d82bc2a19c7439b3..c765cdcfe9c787b5cb5cdba037075eb62e5ca8e9 100644 (file)
--- a/src/kitemviews/private/kitemlistviewlayouter.cpp
+++ b/src/kitemviews/private/kitemlistviewlayouter.cpp
@@ -17,12 +17,10 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 
  *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
  ***************************************************************************/
 

-#include "kitemlistviewlayouter.h"
-
-#include <kitemviews/kitemmodelbase.h>
+#include "dolphindebug.h"

 #include "kitemlistsizehintresolver.h"
 #include "kitemlistsizehintresolver.h"

-
-#include <KDebug>
+#include "kitemlistviewlayouter.h"
+#include "kitemviews/kitemmodelbase.h"

 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 
 
 // #define KITEMLISTVIEWLAYOUTER_DEBUG
 


@@ -35,7 +33,7 @@ KItemListViewLayouter::KItemListViewLayouter(KItemListSizeHintResolver* sizeHint
     m_itemSize(128, 128),
     m_itemMargin(),
     m_headerHeight(0),
     m_itemSize(128, 128),
     m_itemMargin(),
     m_headerHeight(0),

-    m_model(0),
+    m_model(nullptr),

     m_sizeHintResolver(sizeHintResolver),
     m_scrollOffset(0),
     m_maximumScrollOffset(0),
     m_sizeHintResolver(sizeHintResolver),
     m_scrollOffset(0),
     m_maximumScrollOffset(0),


@@ -516,7 +514,7 @@ void KItemListViewLayouter::doLayout()
         }
 
 #ifdef KITEMLISTVIEWLAYOUTER_DEBUG
         }
 
 #ifdef KITEMLISTVIEWLAYOUTER_DEBUG

-        kDebug() << "[TIME] doLayout() for " << m_model->count() << "items:" << timer.elapsed();
+        qCDebug(DolphinDebug) << "[TIME] doLayout() for " << m_model->count() << "items:" << timer.elapsed();

 #endif
         m_dirty = false;
     }
 #endif
         m_dirty = false;
     }


@@ -621,4 +619,3 @@ qreal KItemListViewLayouter::minimumGroupHeaderWidth() const
     return 100;
 }
 
     return 100;
 }
 

-#include "kitemlistviewlayouter.moc"