review comments

[dolphin.git] / src / kitemviews / kfileitemlistview.cpp

diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index 8950c9a1ee4f65ce364f07ff7d5d33bfce938f62..5efb820b0b9b2f5d41d84c92c973f9dc3b9114fb 100644 (file)
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -22,17 +22,15 @@
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"
 #include "kfileitemmodelrolesupdater.h"
 #include "kfileitemlistwidget.h"
 #include "kfileitemmodel.h"

-#include <KLocale>
-#include <KStringHandler>

 #include "private/kpixmapmodifier.h"
 
 #include "private/kpixmapmodifier.h"
 

-#include <KDebug>
-#include <KIcon>
-#include <KTextEdit>
+#include <QIcon>
+#include <KIconLoader>

 
 #include <QPainter>
 
 #include <QPainter>

-#include <QTextLine>

 #include <QTimer>
 #include <QTimer>

+#include <QGraphicsScene>
+#include <QGraphicsView>

 
 // #define KFILEITEMLISTVIEW_DEBUG
 
 
 // #define KFILEITEMLISTVIEW_DEBUG
 


@@ -62,14 +60,14 @@ KFileItemListView::KFileItemListView(QGraphicsWidget* parent) :
     m_updateVisibleIndexRangeTimer = new QTimer(this);
     m_updateVisibleIndexRangeTimer->setSingleShot(true);
     m_updateVisibleIndexRangeTimer->setInterval(ShortInterval);
     m_updateVisibleIndexRangeTimer = new QTimer(this);
     m_updateVisibleIndexRangeTimer->setSingleShot(true);
     m_updateVisibleIndexRangeTimer->setInterval(ShortInterval);

-    connect(m_updateVisibleIndexRangeTimer, SIGNAL(timeout()), this, SLOT(updateVisibleIndexRange()));
+    connect(m_updateVisibleIndexRangeTimer, &QTimer::timeout, this, &KFileItemListView::updateVisibleIndexRange);

 
     m_updateIconSizeTimer = new QTimer(this);
     m_updateIconSizeTimer->setSingleShot(true);
     m_updateIconSizeTimer->setInterval(LongInterval);
 
     m_updateIconSizeTimer = new QTimer(this);
     m_updateIconSizeTimer->setSingleShot(true);
     m_updateIconSizeTimer->setInterval(LongInterval);

-    connect(m_updateIconSizeTimer, SIGNAL(timeout()), this, SLOT(updateIconSize()));
+    connect(m_updateIconSizeTimer, &QTimer::timeout, this, &KFileItemListView::updateIconSize);

 
 

-    setVisibleRoles(QList<QByteArray>() << "text");
+    setVisibleRoles({"text"});

 }
 
 KFileItemListView::~KFileItemListView()
 }
 
 KFileItemListView::~KFileItemListView()


@@ -119,7 +117,7 @@ QStringList KFileItemListView::enabledPlugins() const
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 
     return m_modelRolesUpdater ? m_modelRolesUpdater->enabledPlugins() : QStringList();
 }
 

-QPixmap KFileItemListView::createDragPixmap(const QSet<int>& indexes) const
+QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const

 {
     if (!model()) {
         return QPixmap();
 {
     if (!model()) {
         return QPixmap();


@@ -158,23 +156,23 @@ QPixmap KFileItemListView::createDragPixmap(const QSet<int>& indexes) const
         yCount = xCount;
     }
 
         yCount = xCount;
     }
 

+    const qreal dpr = scene()->views()[0]->devicePixelRatio();

     // Draw the selected items into the grid cells.
     // Draw the selected items into the grid cells.

-    QPixmap dragPixmap(xCount * size + xCount, yCount * size + yCount);
+    QPixmap dragPixmap(QSize(xCount * size + xCount, yCount * size + yCount) * dpr);
+    dragPixmap.setDevicePixelRatio(dpr);

     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;
     dragPixmap.fill(Qt::transparent);
 
     QPainter painter(&dragPixmap);
     int x = 0;
     int y = 0;

-    QSetIterator<int> it(indexes);
-    while (it.hasNext()) {
-        const int index = it.next();

 
 

+    foreach (int index, indexes) {

         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {
         QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
         if (pixmap.isNull()) {

-            KIcon icon(model()->data(index).value("iconName").toString());
+            QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());

             pixmap = icon.pixmap(size, size);
         } else {
             pixmap = icon.pixmap(size, size);
         } else {

-            KPixmapModifier::scale(pixmap, QSize(size, size));
+            KPixmapModifier::scale(pixmap, QSize(size, size) * dpr);

         }
 
         painter.drawPixmap(x, y, pixmap);
         }
 
         painter.drawPixmap(x, y, pixmap);


@@ -210,7 +208,7 @@ void KFileItemListView::initializeItemListWidget(KItemListWidget* item)
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());
 
         const KFileItem fileItem = fileItemModel->fileItem(item->index());
         data.insert("iconName", fileItem.iconName());

-        item->setData(data, QSet<QByteArray>() << "iconName");
+        item->setData(data, {"iconName"});

     }
 }
 
     }
 }
 


@@ -423,4 +421,3 @@ QSize KFileItemListView::availableIconSize() const
     return QSize(iconSize, iconSize);
 }
 
     return QSize(iconSize, iconSize);
 }
 

-#include "kfileitemlistview.moc"