┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/kitemviews
diff options
context:
space:
mode:
Diffstat (limited to 'src/kitemviews')
-rw-r--r--src/kitemviews/kfileitemlistview.cpp2
-rw-r--r--src/kitemviews/kfileitemmodel.cpp21
-rw-r--r--src/kitemviews/kfileitemmodelrolesupdater.cpp18
-rw-r--r--src/kitemviews/kitemlistcontainer.cpp3
-rw-r--r--src/kitemviews/kitemlistselectionmanager.cpp6
-rw-r--r--src/kitemviews/kitemlistviewaccessible.cpp6
-rw-r--r--src/kitemviews/kitemlistwidget.h2
-rw-r--r--src/kitemviews/kitemset.h14
-rw-r--r--src/kitemviews/kstandarditemlistwidget.cpp12
-rw-r--r--src/kitemviews/kstandarditemlistwidget.h2
-rw-r--r--src/kitemviews/private/kbaloorolesprovider.cpp4
-rw-r--r--src/kitemviews/private/kfileitemclipboard.cpp2
-rw-r--r--src/kitemviews/private/kitemlistselectiontoggle.cpp2
13 files changed, 62 insertions, 32 deletions
diff --git a/src/kitemviews/kfileitemlistview.cpp b/src/kitemviews/kfileitemlistview.cpp
index a740a3a23..1b6071820 100644
--- a/src/kitemviews/kfileitemlistview.cpp
+++ b/src/kitemviews/kfileitemlistview.cpp
@@ -166,7 +166,7 @@ QPixmap KFileItemListView::createDragPixmap(const KItemSet& indexes) const
int x = 0;
int y = 0;
- foreach (int index, indexes) {
+ for (int index : indexes) {
QPixmap pixmap = model()->data(index).value("iconPixmap").value<QPixmap>();
if (pixmap.isNull()) {
QIcon icon = QIcon::fromTheme(model()->data(index).value("iconName").toString());
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp
index 8626f947d..1f94972c2 100644
--- a/src/kitemviews/kfileitemmodel.cpp
+++ b/src/kitemviews/kfileitemmodel.cpp
@@ -112,7 +112,7 @@ KFileItemModel::KFileItemModel(QObject* parent) :
KFileItemModel::~KFileItemModel()
{
qDeleteAll(m_itemData);
- qDeleteAll(m_filteredItems.values());
+ qDeleteAll(m_filteredItems);
qDeleteAll(m_pendingItemsToInsert);
}
@@ -249,7 +249,7 @@ QMimeData* KFileItemModel::createMimeData(const KItemSet& indexes) const
bool canUseMostLocalUrls = true;
const ItemData* lastAddedItem = 0;
- foreach (int index, indexes) {
+ for (int index : indexes) {
const ItemData* itemData = m_itemData.at(index);
const ItemData* parent = itemData->parent;
@@ -1102,7 +1102,7 @@ void KFileItemModel::slotClear()
qCDebug(DolphinDebug) << "Clearing all items";
#endif
- qDeleteAll(m_filteredItems.values());
+ qDeleteAll(m_filteredItems);
m_filteredItems.clear();
m_groups.clear();
@@ -1550,7 +1550,7 @@ QHash<QByteArray, QVariant> KFileItemModel::retrieveData(const KFileItem& item,
if (m_requestRole[DestinationRole]) {
QString destination = item.linkDest();
if (destination.isEmpty()) {
- destination = QLatin1String("-");
+ destination = QStringLiteral("-");
}
data.insert(sharedValue("destination"), destination);
}
@@ -1675,6 +1675,16 @@ public:
m_collator.setNumericMode(other.m_collator.numericMode());
}
+ ~KFileItemModelLessThan() = default;
+ //We do not delete m_model as the pointer was passed from outside ant it will be deleted elsewhere.
+
+ KFileItemModelLessThan& operator=(const KFileItemModelLessThan& other)
+ {
+ m_model = other.m_model;
+ m_collator = other.m_collator;
+ return *this;
+ }
+
bool operator()(const KFileItemModel::ItemData* a, const KFileItemModel::ItemData* b) const
{
return m_model->lessThan(a, b, m_collator);
@@ -1852,13 +1862,14 @@ QList<QPair<int, QVariant> > KFileItemModel::nameRoleGroups() const
if (newFirstChar.isLetter()) {
// Try to find a matching group in the range 'A' to 'Z'.
static std::vector<QChar> lettersAtoZ;
+ lettersAtoZ.reserve('Z' - 'A' + 1);
if (lettersAtoZ.empty()) {
for (char c = 'A'; c <= 'Z'; ++c) {
lettersAtoZ.push_back(QLatin1Char(c));
}
}
- auto localeAwareLessThan = [this](const QChar& c1, const QChar& c2) -> bool {
+ auto localeAwareLessThan = [this](QChar c1, QChar c2) -> bool {
return m_collator.compare(c1, c2) < 0;
};
diff --git a/src/kitemviews/kfileitemmodelrolesupdater.cpp b/src/kitemviews/kfileitemmodelrolesupdater.cpp
index 9f89de8e7..e5353dc2a 100644
--- a/src/kitemviews/kfileitemmodelrolesupdater.cpp
+++ b/src/kitemviews/kfileitemmodelrolesupdater.cpp
@@ -100,9 +100,9 @@ KFileItemModelRolesUpdater::KFileItemModelRolesUpdater(KFileItemModel* model, QO
const KConfigGroup globalConfig(KSharedConfig::openConfig(), "PreviewSettings");
m_enabledPlugins = globalConfig.readEntry("Plugins", QStringList()
- << "directorythumbnail"
- << "imagethumbnail"
- << "jpegthumbnail");
+ << QStringLiteral("directorythumbnail")
+ << QStringLiteral("imagethumbnail")
+ << QStringLiteral("jpegthumbnail"));
connect(m_model, &KFileItemModel::itemsInserted,
this, &KFileItemModelRolesUpdater::slotItemsInserted);
@@ -635,7 +635,7 @@ void KFileItemModelRolesUpdater::resolveNextSortRole()
if (!m_pendingSortRoleItems.isEmpty()) {
applySortProgressToModel();
- QTimer::singleShot(0, this, SLOT(resolveNextSortRole()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextSortRole);
} else {
m_state = Idle;
@@ -670,7 +670,7 @@ void KFileItemModelRolesUpdater::resolveNextPendingRoles()
}
if (!m_pendingIndexes.isEmpty()) {
- QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
} else {
m_state = Idle;
@@ -829,7 +829,7 @@ void KFileItemModelRolesUpdater::startUpdating()
m_pendingIndexes = indexes;
// Trigger the asynchronous resolving of all roles.
m_state = ResolvingAllRoles;
- QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
}
}
@@ -864,7 +864,7 @@ void KFileItemModelRolesUpdater::startPreviewJob()
m_state = PreviewJobRunning;
if (m_pendingPreviewItems.isEmpty()) {
- QTimer::singleShot(0, this, SLOT(slotPreviewJobFinished()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::slotPreviewJobFinished);
return;
}
@@ -941,7 +941,7 @@ void KFileItemModelRolesUpdater::updateChangedItems()
// asynchronous determination of the sort role.
killPreviewJob();
m_state = ResolvingSortRole;
- QTimer::singleShot(0, this, SLOT(resolveNextSortRole()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextSortRole);
}
return;
@@ -985,7 +985,7 @@ void KFileItemModelRolesUpdater::updateChangedItems()
if (!resolvingInProgress) {
// Trigger the asynchronous resolving of the changed roles.
m_state = ResolvingAllRoles;
- QTimer::singleShot(0, this, SLOT(resolveNextPendingRoles()));
+ QTimer::singleShot(0, this, &KFileItemModelRolesUpdater::resolveNextPendingRoles);
}
}
}
diff --git a/src/kitemviews/kitemlistcontainer.cpp b/src/kitemviews/kitemlistcontainer.cpp
index 94b49dbde..69a0a5f27 100644
--- a/src/kitemviews/kitemlistcontainer.cpp
+++ b/src/kitemviews/kitemlistcontainer.cpp
@@ -43,6 +43,8 @@
*/
class KItemListContainerViewport : public QGraphicsView
{
+ Q_OBJECT
+
public:
KItemListContainerViewport(QGraphicsScene* scene, QWidget* parent);
protected:
@@ -425,3 +427,4 @@ void KItemListContainer::updateScrollOffsetScrollBarPolicy()
}
}
+#include "kitemlistcontainer.moc"
diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp
index 46b77f7e4..46ffe7c13 100644
--- a/src/kitemviews/kitemlistselectionmanager.cpp
+++ b/src/kitemviews/kitemlistselectionmanager.cpp
@@ -259,7 +259,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges)
const KItemSet previous = m_selectedItems;
m_selectedItems.clear();
- foreach (int index, previous) {
+ for (int index: previous) {
int inc = 0;
foreach (const KItemRange& itemRange, itemRanges) {
if (index < itemRange.index) {
@@ -308,7 +308,7 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges)
const KItemSet previous = m_selectedItems;
m_selectedItems.clear();
- foreach (int oldIndex, previous) {
+ for (int oldIndex : previous) {
const int index = indexAfterRangesRemoving(oldIndex, itemRanges, DiscardRemovedIndex);
if (index >= 0) {
m_selectedItems.insert(index);
@@ -354,7 +354,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL
const KItemSet previous = m_selectedItems;
m_selectedItems.clear();
- foreach (int index, previous) {
+ for (int index : previous) {
if (index >= itemRange.index && index < itemRange.index + itemRange.count) {
m_selectedItems.insert(movedToIndexes.at(index - itemRange.index));
}
diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp
index 7b1605a0c..f8630218f 100644
--- a/src/kitemviews/kitemlistviewaccessible.cpp
+++ b/src/kitemviews/kitemlistviewaccessible.cpp
@@ -146,7 +146,9 @@ QString KItemListViewAccessible::rowDescription(int) const
QList<QAccessibleInterface*> KItemListViewAccessible::selectedCells() const
{
QList<QAccessibleInterface*> cells;
- Q_FOREACH (int index, view()->controller()->selectionManager()->selectedItems()) {
+ const auto items = view()->controller()->selectionManager()->selectedItems();
+ cells.reserve(items.count());
+ for (int index : items) {
cells.append(cell(index));
}
return cells;
@@ -248,7 +250,7 @@ QRect KItemListViewAccessible::rect() const
const QGraphicsScene* scene = view()->scene();
if (scene) {
- const QPoint origin = scene->views()[0]->mapToGlobal(QPoint(0, 0));
+ const QPoint origin = scene->views().at(0)->mapToGlobal(QPoint(0, 0));
const QRect viewRect = view()->geometry().toRect();
return viewRect.translated(origin);
} else {
diff --git a/src/kitemviews/kitemlistwidget.h b/src/kitemviews/kitemlistwidget.h
index ae99a1f29..d1ea7c9da 100644
--- a/src/kitemviews/kitemlistwidget.h
+++ b/src/kitemviews/kitemlistwidget.h
@@ -142,7 +142,7 @@ public:
* or KItemListWidget::expansionToggleRect().
* @reimp
*/
- virtual bool contains(const QPointF& point) const;
+ virtual bool contains(const QPointF& point) const override;
/**
* @return Rectangle for the area that shows the icon.
diff --git a/src/kitemviews/kitemset.h b/src/kitemviews/kitemset.h
index 385010f7d..31fe1d249 100644
--- a/src/kitemviews/kitemset.h
+++ b/src/kitemviews/kitemset.h
@@ -45,6 +45,8 @@ class KItemSet
public:
KItemSet();
KItemSet(const KItemSet& other);
+ ~KItemSet();
+ KItemSet& operator=(const KItemSet& other);
/**
* Returns the number of items in the set.
@@ -80,6 +82,8 @@ public:
return *this;
}
+ ~iterator() = default;
+
int operator*() const
{
return m_rangeIt->index + m_offset;
@@ -170,6 +174,8 @@ public:
return *this;
}
+ ~const_iterator() = default;
+
int operator*() const
{
return m_rangeIt->index + m_offset;
@@ -297,6 +303,14 @@ inline KItemSet::KItemSet(const KItemSet& other) :
{
}
+inline KItemSet::~KItemSet() = default;
+
+inline KItemSet& KItemSet::operator=(const KItemSet& other)
+{
+ m_itemRanges=other.m_itemRanges;
+ return *this;
+}
+
inline int KItemSet::count() const
{
int result = 0;
diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp
index 1112460a9..66131d5fa 100644
--- a/src/kitemviews/kstandarditemlistwidget.cpp
+++ b/src/kitemviews/kstandarditemlistwidget.cpp
@@ -684,7 +684,7 @@ void KStandardItemListWidget::dataChanged(const QHash<QByteArray, QVariant>& cur
// The URL might have changed (i.e., if the sort order of the items has
// been changed). Therefore, the "is cut" state must be updated.
KFileItemClipboard* clipboard = KFileItemClipboard::instance();
- const QUrl itemUrl = data().value("url").value<QUrl>();
+ const QUrl itemUrl = data().value("url").toUrl();
m_isCut = clipboard->isCut(itemUrl);
// The icon-state might depend from other roles and hence is
@@ -835,7 +835,7 @@ void KStandardItemListWidget::showEvent(QShowEvent* event)
// Listen to changes of the clipboard to mark the item as cut/uncut
KFileItemClipboard* clipboard = KFileItemClipboard::instance();
- const QUrl itemUrl = data().value("url").value<QUrl>();
+ const QUrl itemUrl = data().value("url").toUrl();
m_isCut = clipboard->isCut(itemUrl);
connect(clipboard, &KFileItemClipboard::cutItemsChanged,
@@ -852,7 +852,7 @@ void KStandardItemListWidget::hideEvent(QHideEvent* event)
void KStandardItemListWidget::slotCutItemsChanged()
{
- const QUrl itemUrl = data().value("url").value<QUrl>();
+ const QUrl itemUrl = data().value("url").toUrl();
const bool isCut = KFileItemClipboard::instance()->isCut(itemUrl);
if (m_isCut != isCut) {
m_isCut = isCut;
@@ -951,7 +951,7 @@ void KStandardItemListWidget::updatePixmapCache()
if (iconName.isEmpty()) {
// The icon-name has not been not resolved by KFileItemModelRolesUpdater,
// use a generic icon as fallback
- iconName = QLatin1String("unknown");
+ iconName = QStringLiteral("unknown");
}
const QStringList overlays = values["iconOverlays"].toStringList();
m_pixmap = pixmapForIcon(iconName, overlays, maxIconHeight);
@@ -1390,7 +1390,7 @@ void KStandardItemListWidget::drawSiblingsInformation(QPainter* painter)
if (m_isExpandable) {
option.state |= QStyle::State_Children;
}
- if (data()["isExpanded"].toBool()) {
+ if (data().value("isExpanded").toBool()) {
option.state |= QStyle::State_Open;
}
isItemSibling = false;
@@ -1441,7 +1441,7 @@ void KStandardItemListWidget::closeRoleEditor()
QPixmap KStandardItemListWidget::pixmapForIcon(const QString& name, const QStringList& overlays, int size)
{
size *= qApp->devicePixelRatio();
- const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(":") % ":" % QString::number(size);
+ const QString key = "KStandardItemListWidget:" % name % ":" % overlays.join(QStringLiteral(":")) % ":" % QString::number(size);
QPixmap pixmap;
if (!QPixmapCache::find(key, pixmap)) {
diff --git a/src/kitemviews/kstandarditemlistwidget.h b/src/kitemviews/kstandarditemlistwidget.h
index b47644172..9ab5d4c8f 100644
--- a/src/kitemviews/kstandarditemlistwidget.h
+++ b/src/kitemviews/kstandarditemlistwidget.h
@@ -104,7 +104,7 @@ public:
void setSupportsItemExpanding(bool supportsItemExpanding);
bool supportsItemExpanding() const;
- virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0);
+ virtual void paint(QPainter* painter, const QStyleOptionGraphicsItem* option, QWidget* widget = 0) override;
virtual QRectF iconRect() const Q_DECL_OVERRIDE;
virtual QRectF textRect() const Q_DECL_OVERRIDE;
diff --git a/src/kitemviews/private/kbaloorolesprovider.cpp b/src/kitemviews/private/kbaloorolesprovider.cpp
index b49499483..e0b889e6c 100644
--- a/src/kitemviews/private/kbaloorolesprovider.cpp
+++ b/src/kitemviews/private/kbaloorolesprovider.cpp
@@ -158,7 +158,7 @@ KBalooRolesProvider::KBalooRolesProvider() :
QString KBalooRolesProvider::tagsFromValues(const QStringList& values) const
{
- return values.join(", ");
+ return values.join(QStringLiteral(", "));
}
QString KBalooRolesProvider::orientationFromValue(int value) const
@@ -183,6 +183,6 @@ QString KBalooRolesProvider::durationFromValue(int value) const
{
QTime duration;
duration = duration.addSecs(value);
- return duration.toString("hh:mm:ss");
+ return duration.toString(QStringLiteral("hh:mm:ss"));
}
diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp
index e12767853..d27869dff 100644
--- a/src/kitemviews/private/kfileitemclipboard.cpp
+++ b/src/kitemviews/private/kfileitemclipboard.cpp
@@ -63,7 +63,7 @@ void KFileItemClipboard::updateCutItems()
return;
}
- const QByteArray data = mimeData->data("application/x-kde-cutselection");
+ const QByteArray data = mimeData->data(QStringLiteral("application/x-kde-cutselection"));
const bool isCutSelection = (!data.isEmpty() && data.at(0) == QLatin1Char('1'));
if (isCutSelection) {
m_cutItems = KUrlMimeData::urlsFromMimeData(mimeData).toSet();
diff --git a/src/kitemviews/private/kitemlistselectiontoggle.cpp b/src/kitemviews/private/kitemlistselectiontoggle.cpp
index d4081a690..1429cb9ef 100644
--- a/src/kitemviews/private/kitemlistselectiontoggle.cpp
+++ b/src/kitemviews/private/kitemlistselectiontoggle.cpp
@@ -89,7 +89,7 @@ void KItemListSelectionToggle::resizeEvent(QGraphicsSceneResizeEvent* event)
void KItemListSelectionToggle::updatePixmap()
{
- const QString icon = m_checked ? "list-remove" : "list-add";
+ const QString icon = m_checked ? QStringLiteral("list-remove") : QStringLiteral("list-add");
const KIconLoader::States state = m_hovered ? KIconLoader::ActiveState : KIconLoader::DisabledState;
m_pixmap = KIconLoader::global()->loadIcon(icon, KIconLoader::Desktop, iconSize(), state);
}
generated by cgit v1.3 (git 2.53.0) at 2026-04-18 07:36:59 +0000