diff options
| author | Alexander Lohnau <[email protected]> | 2020-10-23 19:51:33 +0200 |
|---|---|---|
| committer | Elvis Angelaccio <[email protected]> | 2020-10-23 18:23:06 +0000 |
| commit | 97415729c34851df75c77a67f27d6299c00bfbc4 (patch) | |
| tree | b7a344b54e226aee8db16f6f123a403d8f276aa9 /src/kitemviews | |
| parent | a24327cd50ef17b953ecb908d260b73460158107 (diff) | |
Compile with QT_NO_KEYWORDS
Diffstat (limited to 'src/kitemviews')
| -rw-r--r-- | src/kitemviews/kfileitemmodel.cpp | 22 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistcontroller.cpp | 76 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistselectionmanager.cpp | 24 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistview.cpp | 18 | ||||
| -rw-r--r-- | src/kitemviews/kitemmodelbase.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditem.cpp | 2 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemlistwidget.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/kstandarditemmodel.cpp | 8 | ||||
| -rw-r--r-- | src/kitemviews/private/kdirectorycontentscounter.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/private/kdirectorycontentscounterworker.cpp | 2 | ||||
| -rw-r--r-- | src/kitemviews/private/kfileitemclipboard.cpp | 4 | ||||
| -rw-r--r-- | src/kitemviews/private/kfileitemmodeldirlister.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistheaderwidget.cpp | 16 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp | 2 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistroleeditor.cpp | 4 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistrubberband.cpp | 6 | ||||
| -rw-r--r-- | src/kitemviews/private/kitemlistviewanimation.cpp | 4 |
17 files changed, 106 insertions, 106 deletions
diff --git a/src/kitemviews/kfileitemmodel.cpp b/src/kitemviews/kfileitemmodel.cpp index e8cd8f393..b89fe4f58 100644 --- a/src/kitemviews/kfileitemmodel.cpp +++ b/src/kitemviews/kfileitemmodel.cpp @@ -487,7 +487,7 @@ void KFileItemModel::setRoles(const QSet<QByteArray>& roles) m_itemData[i]->values = retrieveData(m_itemData.at(i)->item, m_itemData.at(i)->parent); } - emit itemsChanged(KItemRangeList() << KItemRange(0, count()), changedRoles); + Q_EMIT itemsChanged(KItemRangeList() << KItemRange(0, count()), changedRoles); } // Clear the 'values' of all filtered items. They will be re-populated with the @@ -892,13 +892,13 @@ void KFileItemModel::resortAllItems() movedToIndexes.append(newIndex); } - emit itemsMoved(KItemRange(firstMovedIndex, movedItemsCount), movedToIndexes); + Q_EMIT itemsMoved(KItemRange(firstMovedIndex, movedItemsCount), movedToIndexes); } else if (groupedSorting()) { // The groups might have changed even if the order of the items has not. const QList<QPair<int, QVariant> > oldGroups = m_groups; m_groups.clear(); if (groups() != oldGroups) { - emit groupsChanged(); + Q_EMIT groupsChanged(); } } @@ -934,7 +934,7 @@ void KFileItemModel::slotCompleted() m_urlsToExpand.clear(); } - emit directoryLoadingCompleted(); + Q_EMIT directoryLoadingCompleted(); } void KFileItemModel::slotCanceled() @@ -942,7 +942,7 @@ void KFileItemModel::slotCanceled() m_maximumUpdateIntervalTimer->stop(); dispatchPendingItemsToInsert(); - emit directoryLoadingCanceled(); + Q_EMIT directoryLoadingCanceled(); } void KFileItemModel::slotItemsAdded(const QUrl &directoryUrl, const KFileItemList& items) @@ -1143,7 +1143,7 @@ void KFileItemModel::slotClear() qDeleteAll(m_itemData); m_itemData.clear(); m_items.clear(); - emit itemsRemoved(KItemRangeList() << KItemRange(0, removedCount)); + Q_EMIT itemsRemoved(KItemRangeList() << KItemRange(0, removedCount)); } m_expandedDirs.clear(); @@ -1259,7 +1259,7 @@ void KFileItemModel::insertItems(QList<ItemData*>& newItems) // It will be re-populated with the updated indices if index(const QUrl&) is called. m_items.clear(); - emit itemsInserted(itemRanges); + Q_EMIT itemsInserted(itemRanges); #ifdef KFILEITEMMODEL_DEBUG qCDebug(DolphinDebug) << "[TIME] Inserting of" << newItems.count() << "items:" << timer.elapsed(); @@ -1312,7 +1312,7 @@ void KFileItemModel::removeItems(const KItemRangeList& itemRanges, RemoveItemsBe // It will be re-populated with the updated indices if index(const QUrl&) is called. m_items.clear(); - emit itemsRemoved(itemRanges); + Q_EMIT itemsRemoved(itemRanges); } QList<KFileItemModel::ItemData*> KFileItemModel::createItemDataList(const QUrl& parentUrl, const KFileItemList& items) const @@ -1428,7 +1428,7 @@ void KFileItemModel::removeExpandedItems() void KFileItemModel::emitItemsChangedAndTriggerResorting(const KItemRangeList& itemRanges, const QSet<QByteArray>& changedRoles) { - emit itemsChanged(itemRanges, changedRoles); + Q_EMIT itemsChanged(itemRanges, changedRoles); // Trigger a resorting if necessary. Note that this can happen even if the sort // role has not changed at all because the file name can be used as a fallback. @@ -2307,14 +2307,14 @@ void KFileItemModel::emitSortProgress(int resolvedCount) resortAllItems(); } - emit directorySortingProgress(100); + Q_EMIT directorySortingProgress(100); } else if (itemCount > 0) { resolvedCount = qBound(0, resolvedCount, itemCount); const int progress = resolvedCount * 100 / itemCount; if (m_sortingProgressPercent != progress) { m_sortingProgressPercent = progress; - emit directorySortingProgress(progress); + Q_EMIT directorySortingProgress(progress); } } } diff --git a/src/kitemviews/kitemlistcontroller.cpp b/src/kitemviews/kitemlistcontroller.cpp index 0d48bb5e3..5c9a2bbdd 100644 --- a/src/kitemviews/kitemlistcontroller.cpp +++ b/src/kitemviews/kitemlistcontroller.cpp @@ -110,7 +110,7 @@ void KItemListController::setModel(KItemModelBase* model) m_selectionManager->setModel(m_model); - emit modelChanged(m_model, oldModel); + Q_EMIT modelChanged(m_model, oldModel); } KItemModelBase* KItemListController::model() const @@ -145,7 +145,7 @@ void KItemListController::setView(KItemListView* view) updateExtendedSelectionRegion(); } - emit viewChanged(m_view, oldView); + Q_EMIT viewChanged(m_view, oldView); } KItemListView* KItemListController::view() const @@ -373,11 +373,11 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) case Qt::Key_Return: { const KItemSet selectedItems = m_selectionManager->selectedItems(); if (selectedItems.count() >= 2) { - emit itemsActivated(selectedItems); + Q_EMIT itemsActivated(selectedItems); } else if (selectedItems.count() == 1) { - emit itemActivated(selectedItems.first()); + Q_EMIT itemActivated(selectedItems.first()); } else { - emit itemActivated(index); + Q_EMIT itemActivated(index); } break; } @@ -398,9 +398,9 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) if (index >= 0) { const QRectF contextRect = m_view->itemContextRect(index); const QPointF pos(m_view->scene()->views().first()->mapToGlobal(contextRect.bottomRight().toPoint())); - emit itemContextMenuRequested(index, pos); + Q_EMIT itemContextMenuRequested(index, pos); } else { - emit viewContextMenuRequested(QCursor::pos()); + Q_EMIT viewContextMenuRequested(QCursor::pos()); } break; } @@ -410,7 +410,7 @@ bool KItemListController::keyPressEvent(QKeyEvent* event) m_selectionManager->clearSelection(); } m_keyboardManager->cancelSearch(); - emit escapePressed(); + Q_EMIT escapePressed(); break; case Qt::Key_Space: @@ -524,7 +524,7 @@ void KItemListController::slotAutoActivationTimeout() const bool expanded = m_model->isExpanded(index); m_model->setExpanded(index, !expanded); } else if (m_autoActivationBehavior != ExpansionOnly) { - emit itemActivated(index); + Q_EMIT itemActivated(index); } } } @@ -642,7 +642,7 @@ bool KItemListController::mouseReleaseEvent(QGraphicsSceneMouseEvent* event, con return false; } - emit mouseButtonReleased(m_pressedIndex, event->buttons()); + Q_EMIT mouseButtonReleased(m_pressedIndex, event->buttons()); return onRelease(transform.map(event->pos()), event->modifiers(), event->button(), false); } @@ -664,13 +664,13 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, m_selectionManager->clearSelection(); if (index >= 0) { m_selectionManager->setSelected(index); - emit itemContextMenuRequested(index, event->screenPos()); + Q_EMIT itemContextMenuRequested(index, event->screenPos()); } else { const QRectF headerBounds = m_view->headerBoundaries(); if (headerBounds.contains(event->pos())) { - emit headerContextMenuRequested(event->screenPos()); + Q_EMIT headerContextMenuRequested(event->screenPos()); } else { - emit viewContextMenuRequested(event->screenPos()); + Q_EMIT viewContextMenuRequested(event->screenPos()); } } return true; @@ -680,7 +680,7 @@ bool KItemListController::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* event, (event->button() & Qt::LeftButton) && index >= 0 && index < m_model->count(); if (emitItemActivated) { - emit itemActivated(index); + Q_EMIT itemActivated(index); } return false; } @@ -707,7 +707,7 @@ bool KItemListController::dragLeaveEvent(QGraphicsSceneDragDropEvent* event, con KItemListWidget* widget = hoveredWidget(); if (widget) { widget->setHovered(false); - emit itemUnhovered(widget->index()); + Q_EMIT itemUnhovered(widget->index()); } return false; } @@ -730,7 +730,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons if (oldHoveredWidget) { oldHoveredWidget->setHovered(false); - emit itemUnhovered(oldHoveredWidget->index()); + Q_EMIT itemUnhovered(oldHoveredWidget->index()); } } @@ -753,7 +753,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons m_view->hideDropIndicator(); if (!newHoveredWidget->isHovered()) { newHoveredWidget->setHovered(true); - emit itemHovered(index); + Q_EMIT itemHovered(index); } if (!m_autoActivationTimer->isActive() && m_autoActivationTimer->interval() >= 0) { @@ -765,7 +765,7 @@ bool KItemListController::dragMoveEvent(QGraphicsSceneDragDropEvent* event, cons m_autoActivationTimer->stop(); if (newHoveredWidget && newHoveredWidget->isHovered()) { newHoveredWidget->setHovered(false); - emit itemUnhovered(index); + Q_EMIT itemUnhovered(index); } } } else { @@ -802,10 +802,10 @@ bool KItemListController::dropEvent(QGraphicsSceneDragDropEvent* event, const QT if (dropAboveIndex >= 0) { // Something has been dropped between two items. m_view->hideDropIndicator(); - emit aboveItemDropEvent(dropAboveIndex, event); + Q_EMIT aboveItemDropEvent(dropAboveIndex, event); } else if (!event->mimeData()->hasFormat(m_model->blacklistItemDropEventMimeType())) { // Something has been dropped on an item or on an empty part of the view. - emit itemDropEvent(m_view->itemAt(pos), event); + Q_EMIT itemDropEvent(m_view->itemAt(pos), event); } QAccessibleEvent accessibilityEvent(view(), QAccessible::DragDropEnd); @@ -835,14 +835,14 @@ bool KItemListController::hoverMoveEvent(QGraphicsSceneHoverEvent* event, const if (oldHoveredWidget != newHoveredWidget) { if (oldHoveredWidget) { oldHoveredWidget->setHovered(false); - emit itemUnhovered(oldHoveredWidget->index()); + Q_EMIT itemUnhovered(oldHoveredWidget->index()); } if (newHoveredWidget) { newHoveredWidget->setHovered(true); const QPointF mappedPos = newHoveredWidget->mapFromItem(m_view, pos); newHoveredWidget->setHoverPosition(mappedPos); - emit itemHovered(newHoveredWidget->index()); + Q_EMIT itemHovered(newHoveredWidget->index()); } } else if (oldHoveredWidget) { const QPointF mappedPos = oldHoveredWidget->mapFromItem(m_view, pos); @@ -868,7 +868,7 @@ bool KItemListController::hoverLeaveEvent(QGraphicsSceneHoverEvent* event, const for (KItemListWidget* widget : widgets) { if (widget->isHovered()) { widget->setHovered(false); - emit itemUnhovered(widget->index()); + Q_EMIT itemUnhovered(widget->index()); } } return false; @@ -1006,7 +1006,7 @@ void KItemListController::tapAndHoldTriggered(QGestureEvent* event, const QTrans startRubberBand(); } - emit scrollerStop(); + Q_EMIT scrollerStop(); m_view->m_tapAndHoldIndicator->setStartPosition(m_pressedMousePos); m_view->m_tapAndHoldIndicator->setActive(true); @@ -1034,10 +1034,10 @@ void KItemListController::pinchTriggered(QGestureEvent* event, const QTransform& } counter = counter + (pinch->scaleFactor() - 1); if (counter >= sensitivityModifier) { - emit increaseZoom(); + Q_EMIT increaseZoom(); counter = 0; } else if (counter <= -sensitivityModifier) { - emit decreaseZoom(); + Q_EMIT decreaseZoom(); counter = 0; } } @@ -1061,14 +1061,14 @@ void KItemListController::swipeTriggered(QGestureEvent* event, const QTransform& } if (swipe->state() == Qt::GestureFinished) { - emit scrollerStop(); + Q_EMIT scrollerStop(); if (swipe->swipeAngle() <= 20 || swipe->swipeAngle() >= 340) { - emit mouseButtonPressed(m_pressedIndex, Qt::BackButton); + Q_EMIT mouseButtonPressed(m_pressedIndex, Qt::BackButton); } else if (swipe->swipeAngle() <= 200 && swipe->swipeAngle() >= 160) { - emit mouseButtonPressed(m_pressedIndex, Qt::ForwardButton); + Q_EMIT mouseButtonPressed(m_pressedIndex, Qt::ForwardButton); } else if (swipe->swipeAngle() <= 110 && swipe->swipeAngle() >= 60) { - emit swipeUp(); + Q_EMIT swipeUp(); } m_isSwipeGesture = true; } @@ -1419,7 +1419,7 @@ void KItemListController::updateExtendedSelectionRegion() bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, const Qt::KeyboardModifiers modifiers, const Qt::MouseButtons buttons) { - emit mouseButtonPressed(m_pressedIndex, buttons); + Q_EMIT mouseButtonPressed(m_pressedIndex, buttons); if (buttons & (Qt::BackButton | Qt::ForwardButton)) { // Do not select items when clicking the back/forward buttons, see @@ -1470,7 +1470,7 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c m_clearSelectionIfItemsAreNotDragged = true; if (m_selectionManager->selectedItems().count() == 1 && m_view->isAboveText(m_pressedIndex, m_pressedMousePos)) { - emit selectedItemTextPressed(m_pressedIndex); + Q_EMIT selectedItemTextPressed(m_pressedIndex); } } @@ -1517,7 +1517,7 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c } if (buttons & Qt::RightButton) { - emit itemContextMenuRequested(m_pressedIndex, screenPos); + Q_EMIT itemContextMenuRequested(m_pressedIndex, screenPos); } return true; @@ -1526,9 +1526,9 @@ bool KItemListController::onPress(const QPoint& screenPos, const QPointF& pos, c if (buttons & Qt::RightButton) { const QRectF headerBounds = m_view->headerBoundaries(); if (headerBounds.contains(pos)) { - emit headerContextMenuRequested(screenPos); + Q_EMIT headerContextMenuRequested(screenPos); } else { - emit viewContextMenuRequested(screenPos); + Q_EMIT viewContextMenuRequested(screenPos); } return true; } @@ -1580,7 +1580,7 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi const bool expanded = m_model->isExpanded(index); m_model->setExpanded(index, !expanded); - emit itemExpansionToggleClicked(index); + Q_EMIT itemExpansionToggleClicked(index); emitItemActivated = false; } else if (shiftOrControlPressed) { // The mouse click should only update the selection, not trigger the item @@ -1593,10 +1593,10 @@ bool KItemListController::onRelease(const QPointF& pos, const Qt::KeyboardModifi } } if (emitItemActivated) { - emit itemActivated(index); + Q_EMIT itemActivated(index); } } else if (buttons & Qt::MiddleButton) { - emit itemMiddleClicked(index); + Q_EMIT itemMiddleClicked(index); } } diff --git a/src/kitemviews/kitemlistselectionmanager.cpp b/src/kitemviews/kitemlistselectionmanager.cpp index e5f450a7c..ce0dc06de 100644 --- a/src/kitemviews/kitemlistselectionmanager.cpp +++ b/src/kitemviews/kitemlistselectionmanager.cpp @@ -35,12 +35,12 @@ void KItemListSelectionManager::setCurrentItem(int current) } if (m_currentItem != previous) { - emit currentChanged(m_currentItem, previous); + Q_EMIT currentChanged(m_currentItem, previous); if (m_isAnchoredSelectionActive) { const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } } @@ -56,7 +56,7 @@ void KItemListSelectionManager::setSelectedItems(const KItemSet& items) if (m_selectedItems != items) { const KItemSet previous = m_selectedItems; m_selectedItems = items; - emit selectionChanged(m_selectedItems, previous); + Q_EMIT selectionChanged(m_selectedItems, previous); } } @@ -145,7 +145,7 @@ void KItemListSelectionManager::setSelected(int index, int count, SelectionMode const KItemSet selection = selectedItems(); if (selection != previous) { - emit selectionChanged(selection, previous); + Q_EMIT selectionChanged(selection, previous); } } @@ -155,7 +155,7 @@ void KItemListSelectionManager::clearSelection() if (!previous.isEmpty()) { m_selectedItems.clear(); m_isAnchoredSelectionActive = false; - emit selectionChanged(KItemSet(), previous); + Q_EMIT selectionChanged(KItemSet(), previous); } } @@ -234,7 +234,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) if (m_currentItem >= m_model->count()) { m_currentItem = -1; } - emit currentChanged(m_currentItem, previousCurrent); + Q_EMIT currentChanged(m_currentItem, previousCurrent); } // Update the anchor item @@ -270,7 +270,7 @@ void KItemListSelectionManager::itemsInserted(const KItemRangeList& itemRanges) const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } @@ -283,12 +283,12 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) // Update the current item m_currentItem = indexAfterRangesRemoving(m_currentItem, itemRanges, DiscardRemovedIndex); if (m_currentItem != previousCurrent) { - emit currentChanged(m_currentItem, previousCurrent); + Q_EMIT currentChanged(m_currentItem, previousCurrent); if (m_currentItem < 0) { // Calling setCurrentItem() would trigger the selectionChanged signal, but we want to // emit it only once in this function -> change the current item manually and emit currentChanged m_currentItem = indexAfterRangesRemoving(previousCurrent, itemRanges, AdjustRemovedIndex); - emit currentChanged(m_currentItem, -1); + Q_EMIT currentChanged(m_currentItem, -1); } } @@ -315,7 +315,7 @@ void KItemListSelectionManager::itemsRemoved(const KItemRangeList& itemRanges) const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } Q_ASSERT(m_currentItem < m_model->count()); @@ -343,7 +343,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL // Calling setCurrentItem would trigger the selectionChanged signal, but we want to // emit it only once in this function -> change the current item manually and emit currentChanged m_currentItem = newCurrentItem; - emit currentChanged(newCurrentItem, previousCurrentItem); + Q_EMIT currentChanged(newCurrentItem, previousCurrentItem); } // Start a new anchored selection. @@ -368,7 +368,7 @@ void KItemListSelectionManager::itemsMoved(const KItemRange& itemRange, const QL const KItemSet selection = selectedItems(); if (selection != previousSelection) { - emit selectionChanged(selection, previousSelection); + Q_EMIT selectionChanged(selection, previousSelection); } } diff --git a/src/kitemviews/kitemlistview.cpp b/src/kitemviews/kitemlistview.cpp index 5bbc73d90..3103012a9 100644 --- a/src/kitemviews/kitemlistview.cpp +++ b/src/kitemviews/kitemlistview.cpp @@ -536,7 +536,7 @@ void KItemListView::scrollToItem(int index) } if (newOffset != scrollOffset()) { - emit scrollTo(newOffset); + Q_EMIT scrollTo(newOffset); } } } @@ -837,7 +837,7 @@ void KItemListView::setScrollOrientation(Qt::Orientation orientation) doLayout(NoAnimation); onScrollOrientationChanged(orientation, previousOrientation); - emit scrollOrientationChanged(orientation, previousOrientation); + Q_EMIT scrollOrientationChanged(orientation, previousOrientation); } Qt::Orientation KItemListView::scrollOrientation() const @@ -1487,7 +1487,7 @@ void KItemListView::slotHeaderColumnMoved(const QByteArray& role, setVisibleRoles(current); - emit visibleRolesChanged(current, previous); + Q_EMIT visibleRolesChanged(current, previous); } void KItemListView::triggerAutoScrolling() @@ -1562,7 +1562,7 @@ void KItemListView::slotRoleEditingCanceled(int index, const QByteArray& role, c { disconnectRoleEditingSignals(index); - emit roleEditingCanceled(index, role, value); + Q_EMIT roleEditingCanceled(index, role, value); m_editingRole = false; } @@ -1570,7 +1570,7 @@ void KItemListView::slotRoleEditingFinished(int index, const QByteArray& role, c { disconnectRoleEditingSignals(index); - emit roleEditingFinished(index, role, value); + Q_EMIT roleEditingFinished(index, role, value); m_editingRole = false; } @@ -1926,25 +1926,25 @@ void KItemListView::emitOffsetChanges() { const qreal newScrollOffset = m_layouter->scrollOffset(); if (m_oldScrollOffset != newScrollOffset) { - emit scrollOffsetChanged(newScrollOffset, m_oldScrollOffset); + Q_EMIT scrollOffsetChanged(newScrollOffset, m_oldScrollOffset); m_oldScrollOffset = newScrollOffset; } const qreal newMaximumScrollOffset = m_layouter->maximumScrollOffset(); if (m_oldMaximumScrollOffset != newMaximumScrollOffset) { - emit maximumScrollOffsetChanged(newMaximumScrollOffset, m_oldMaximumScrollOffset); + Q_EMIT maximumScrollOffsetChanged(newMaximumScrollOffset, m_oldMaximumScrollOffset); m_oldMaximumScrollOffset = newMaximumScrollOffset; } const qreal newItemOffset = m_layouter->itemOffset(); if (m_oldItemOffset != newItemOffset) { - emit itemOffsetChanged(newItemOffset, m_oldItemOffset); + Q_EMIT itemOffsetChanged(newItemOffset, m_oldItemOffset); m_oldItemOffset = newItemOffset; } const qreal newMaximumItemOffset = m_layouter->maximumItemOffset(); if (m_oldMaximumItemOffset != newMaximumItemOffset) { - emit maximumItemOffsetChanged(newMaximumItemOffset, m_oldMaximumItemOffset); + Q_EMIT maximumItemOffsetChanged(newMaximumItemOffset, m_oldMaximumItemOffset); m_oldMaximumItemOffset = newMaximumItemOffset; } } diff --git a/src/kitemviews/kitemmodelbase.cpp b/src/kitemviews/kitemmodelbase.cpp index 795a1a2f5..5c6141ce2 100644 --- a/src/kitemviews/kitemmodelbase.cpp +++ b/src/kitemviews/kitemmodelbase.cpp @@ -40,7 +40,7 @@ void KItemModelBase::setGroupedSorting(bool grouped) if (m_groupedSorting != grouped) { m_groupedSorting = grouped; onGroupedSortingChanged(grouped); - emit groupedSortingChanged(grouped); + Q_EMIT groupedSortingChanged(grouped); } } @@ -55,7 +55,7 @@ void KItemModelBase::setSortRole(const QByteArray& role, bool resortItems) const QByteArray previous = m_sortRole; m_sortRole = role; onSortRoleChanged(role, previous, resortItems); - emit sortRoleChanged(role, previous); + Q_EMIT sortRoleChanged(role, previous); } } @@ -70,7 +70,7 @@ void KItemModelBase::setSortOrder(Qt::SortOrder order) const Qt::SortOrder previous = m_sortOrder; m_sortOrder = order; onSortOrderChanged(order, previous); - emit sortOrderChanged(order, previous); + Q_EMIT sortOrderChanged(order, previous); } } diff --git a/src/kitemviews/kstandarditem.cpp b/src/kitemviews/kstandarditem.cpp index 39121ab31..fcaa50b9d 100644 --- a/src/kitemviews/kstandarditem.cpp +++ b/src/kitemviews/kstandarditem.cpp @@ -90,7 +90,7 @@ void KStandardItem::setDataValue(const QByteArray& role, const QVariant& value) QSet<QByteArray> changedRoles; changedRoles.insert(role); m_model->onItemChanged(index, changedRoles); - emit m_model->itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); + Q_EMIT m_model->itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); } } diff --git a/src/kitemviews/kstandarditemlistwidget.cpp b/src/kitemviews/kstandarditemlistwidget.cpp index 032a949c1..f2fc21332 100644 --- a/src/kitemviews/kstandarditemlistwidget.cpp +++ b/src/kitemviews/kstandarditemlistwidget.cpp @@ -741,7 +741,7 @@ void KStandardItemListWidget::editedRoleChanged(const QByteArray& current, const QGraphicsView* parent = scene()->views()[0]; if (current.isEmpty() || !parent || current != "text") { if (m_roleEditor) { - emit roleEditingCanceled(index(), current, data().value(current)); + Q_EMIT roleEditingCanceled(index(), current, data().value(current)); disconnect(m_roleEditor, &KItemListRoleEditor::roleEditingCanceled, this, &KStandardItemListWidget::slotRoleEditingCanceled); @@ -866,7 +866,7 @@ void KStandardItemListWidget::slotRoleEditingCanceled(const QByteArray& role, const QVariant& value) { closeRoleEditor(); - emit roleEditingCanceled(index(), role, value); + Q_EMIT roleEditingCanceled(index(), role, value); setEditedRole(QByteArray()); } @@ -874,7 +874,7 @@ void KStandardItemListWidget::slotRoleEditingFinished(const QByteArray& role, const QVariant& value) { closeRoleEditor(); - emit roleEditingFinished(index(), role, value); + Q_EMIT roleEditingFinished(index(), role, value); setEditedRole(QByteArray()); } diff --git a/src/kitemviews/kstandarditemmodel.cpp b/src/kitemviews/kstandarditemmodel.cpp index ceadff257..128841ca8 100644 --- a/src/kitemviews/kstandarditemmodel.cpp +++ b/src/kitemviews/kstandarditemmodel.cpp @@ -43,7 +43,7 @@ void KStandardItemModel::insertItem(int index, KStandardItem* item) // TODO: no hierarchical items are handled yet onItemInserted(index); - emit itemsInserted(KItemRangeList() << KItemRange(index, 1)); + Q_EMIT itemsInserted(KItemRangeList() << KItemRange(index, 1)); } } @@ -81,7 +81,7 @@ void KStandardItemModel::changeItem(int index, KStandardItem* item) m_indexesForItems.insert(item, index); onItemChanged(index, changedRoles); - emit itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); + Q_EMIT itemsChanged(KItemRangeList() << KItemRange(index, 1), changedRoles); } void KStandardItemModel::removeItem(int index) @@ -102,7 +102,7 @@ void KStandardItemModel::removeItem(int index) item->deleteLater(); item = nullptr; - emit itemsRemoved(KItemRangeList() << KItemRange(index, 1)); + Q_EMIT itemsRemoved(KItemRangeList() << KItemRange(index, 1)); // TODO: no hierarchical items are handled yet } @@ -114,7 +114,7 @@ void KStandardItemModel::clear() m_items.clear(); m_indexesForItems.clear(); - emit itemsRemoved(KItemRangeList() << KItemRange(0, size)); + Q_EMIT itemsRemoved(KItemRangeList() << KItemRange(0, size)); } KStandardItem* KStandardItemModel::item(int index) const diff --git a/src/kitemviews/private/kdirectorycontentscounter.cpp b/src/kitemviews/private/kdirectorycontentscounter.cpp index df45c4173..d33277a3b 100644 --- a/src/kitemviews/private/kdirectorycontentscounter.cpp +++ b/src/kitemviews/private/kdirectorycontentscounter.cpp @@ -115,7 +115,7 @@ void KDirectoryContentsCounter::slotResult(const QString& path, int count, long } // sends the results - emit result(resolvedPath, count, size); + Q_EMIT result(resolvedPath, count, size); } void KDirectoryContentsCounter::slotDirWatchDirty(const QString& path) @@ -165,7 +165,7 @@ void KDirectoryContentsCounter::startWorker(const QString& path) // fast path when in cache // will be updated later if result has changed const auto pair = s_cache->value(path); - emit result(path, pair.first, pair.second); + Q_EMIT result(path, pair.first, pair.second); } if (m_workerIsBusy) { @@ -189,7 +189,7 @@ void KDirectoryContentsCounter::startWorker(const QString& path) options |= KDirectoryContentsCounterWorker::CountDirectoriesOnly; } - emit requestDirectoryContentsCount(path, options); + Q_EMIT requestDirectoryContentsCount(path, options); m_workerIsBusy = true; } } diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp index 59ff471ae..abe2ad757 100644 --- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp +++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp @@ -118,5 +118,5 @@ KDirectoryContentsCounterWorker::CountResult KDirectoryContentsCounterWorker::su void KDirectoryContentsCounterWorker::countDirectoryContents(const QString& path, Options options) { auto res = subItemsCount(path, options); - emit result(path, res.count, res.size); + Q_EMIT result(path, res.count, res.size); } diff --git a/src/kitemviews/private/kfileitemclipboard.cpp b/src/kitemviews/private/kfileitemclipboard.cpp index c12b4b7b1..ec31068e7 100644 --- a/src/kitemviews/private/kfileitemclipboard.cpp +++ b/src/kitemviews/private/kfileitemclipboard.cpp @@ -47,7 +47,7 @@ void KFileItemClipboard::updateCutItems() // mimeData can be 0 according to https://bugs.kde.org/show_bug.cgi?id=335053 if (!mimeData) { m_cutItems.clear(); - emit cutItemsChanged(); + Q_EMIT cutItemsChanged(); return; } @@ -59,7 +59,7 @@ void KFileItemClipboard::updateCutItems() } else { m_cutItems.clear(); } - emit cutItemsChanged(); + Q_EMIT cutItemsChanged(); } KFileItemClipboard::KFileItemClipboard() : diff --git a/src/kitemviews/private/kfileitemmodeldirlister.cpp b/src/kitemviews/private/kfileitemmodeldirlister.cpp index accd200ef..90c970874 100644 --- a/src/kitemviews/private/kfileitemmodeldirlister.cpp +++ b/src/kitemviews/private/kfileitemmodeldirlister.cpp @@ -22,13 +22,13 @@ KFileItemModelDirLister::~KFileItemModelDirLister() void KFileItemModelDirLister::handleError(KIO::Job* job) { if (job->error() == KIO::ERR_IS_FILE) { - emit urlIsFileError(url()); + Q_EMIT urlIsFileError(url()); } else { const QString errorString = job->errorString(); if (errorString.isEmpty()) { - emit errorMessage(i18nc("@info:status", "Unknown error.")); + Q_EMIT errorMessage(i18nc("@info:status", "Unknown error.")); } else { - emit errorMessage(errorString); + Q_EMIT errorMessage(errorString); } } } diff --git a/src/kitemviews/private/kitemlistheaderwidget.cpp b/src/kitemviews/private/kitemlistheaderwidget.cpp index 05883b93e..e5cbc602f 100644 --- a/src/kitemviews/private/kitemlistheaderwidget.cpp +++ b/src/kitemviews/private/kitemlistheaderwidget.cpp @@ -201,18 +201,18 @@ void KItemListHeaderWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) const Qt::SortOrder current = (m_model->sortOrder() == Qt::AscendingOrder) ? Qt::DescendingOrder : Qt::AscendingOrder; m_model->setSortOrder(current); - emit sortOrderChanged(current, previous); + Q_EMIT sortOrderChanged(current, previous); } else { // Change the sort role and reset to the ascending order const QByteArray previous = m_model->sortRole(); const QByteArray current = m_columns[m_pressedRoleIndex]; const bool resetSortOrder = m_model->sortOrder() == Qt::DescendingOrder; m_model->setSortRole(current, !resetSortOrder); - emit sortRoleChanged(current, previous); + Q_EMIT sortRoleChanged(current, previous); if (resetSortOrder) { m_model->setSortOrder(Qt::AscendingOrder); - emit sortOrderChanged(Qt::AscendingOrder, Qt::DescendingOrder); + Q_EMIT sortOrderChanged(Qt::AscendingOrder, Qt::DescendingOrder); } } break; @@ -221,7 +221,7 @@ void KItemListHeaderWidget::mouseReleaseEvent(QGraphicsSceneMouseEvent* event) case ResizeRoleOperation: { const QByteArray pressedRole = m_columns[m_pressedRoleIndex]; const qreal currentWidth = m_columnWidths.value(pressedRole); - emit columnWidthChangeFinished(pressedRole, currentWidth); + Q_EMIT columnWidthChangeFinished(pressedRole, currentWidth); break; } @@ -287,7 +287,7 @@ void KItemListHeaderWidget::mouseMoveEvent(QGraphicsSceneMouseEvent* event) m_columnWidths.insert(pressedRole, currentWidth); update(); - emit columnWidthChanged(pressedRole, currentWidth, previousWidth); + Q_EMIT columnWidthChanged(pressedRole, currentWidth, previousWidth); break; } @@ -304,7 +304,7 @@ void KItemListHeaderWidget::mouseMoveEvent(QGraphicsSceneMouseEvent* event) const QByteArray role = m_columns[m_movingRole.index]; const int previousIndex = m_movingRole.index; m_movingRole.index = targetIndex; - emit columnMoved(role, targetIndex, previousIndex); + Q_EMIT columnMoved(role, targetIndex, previousIndex); m_movingRole.xDec = event->pos().x() - roleXPosition(role); } @@ -329,8 +329,8 @@ void KItemListHeaderWidget::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* even setColumnWidth(role, preferredColumnWidth(role)); qreal currentWidth = columnWidth(role); - emit columnWidthChanged(role, currentWidth, previousWidth); - emit columnWidthChangeFinished(role, currentWidth); + Q_EMIT columnWidthChanged(role, currentWidth, previousWidth); + Q_EMIT columnWidthChangeFinished(role, currentWidth); } } diff --git a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp index 97e2b0b32..57a954adf 100644 --- a/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp +++ b/src/kitemviews/private/kitemlistkeyboardsearchmanager.cpp @@ -58,7 +58,7 @@ void KItemListKeyboardSearchManager::addKeys(const QString& keys) // loosing keyboard search context basically m_isSearchRestarted = false; - emit changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem); + Q_EMIT changeCurrentItem(sameKey ? firstKey : m_searchedString, searchFromNextItem); } m_keyboardInputTime.start(); } diff --git a/src/kitemviews/private/kitemlistroleeditor.cpp b/src/kitemviews/private/kitemlistroleeditor.cpp index 75fd6a0c7..df142a456 100644 --- a/src/kitemviews/private/kitemlistroleeditor.cpp +++ b/src/kitemviews/private/kitemlistroleeditor.cpp @@ -69,7 +69,7 @@ void KItemListRoleEditor::keyPressEvent(QKeyEvent* event) // a roleEditingFinished signal (see KItemListRoleEditor::event), // which is not wanted in this case. m_blockFinishedSignal = true; - emit roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText())); + Q_EMIT roleEditingCanceled(m_role, KIO::encodeFileName(toPlainText())); m_blockFinishedSignal = false; event->accept(); return; @@ -146,7 +146,7 @@ void KItemListRoleEditor::autoAdjustSize() void KItemListRoleEditor::emitRoleEditingFinished() { if (!m_blockFinishedSignal) { - emit roleEditingFinished(m_role, KIO::encodeFileName(toPlainText())); + Q_EMIT roleEditingFinished(m_role, KIO::encodeFileName(toPlainText())); } } diff --git a/src/kitemviews/private/kitemlistrubberband.cpp b/src/kitemviews/private/kitemlistrubberband.cpp index 309a82833..646139a33 100644 --- a/src/kitemviews/private/kitemlistrubberband.cpp +++ b/src/kitemviews/private/kitemlistrubberband.cpp @@ -23,7 +23,7 @@ void KItemListRubberBand::setStartPosition(const QPointF& pos) if (m_startPos != pos) { const QPointF previous = m_startPos; m_startPos = pos; - emit startPositionChanged(m_startPos, previous); + Q_EMIT startPositionChanged(m_startPos, previous); } } @@ -53,7 +53,7 @@ void KItemListRubberBand::setEndPosition(const QPointF& pos) } } - emit endPositionChanged(m_endPos, previous); + Q_EMIT endPositionChanged(m_endPos, previous); } } @@ -66,7 +66,7 @@ void KItemListRubberBand::setActive(bool active) { if (m_active != active) { m_active = active; - emit activationChanged(active); + Q_EMIT activationChanged(active); } } diff --git a/src/kitemviews/private/kitemlistviewanimation.cpp b/src/kitemviews/private/kitemlistviewanimation.cpp index 67b9cc113..9dc5fbada 100644 --- a/src/kitemviews/private/kitemlistviewanimation.cpp +++ b/src/kitemviews/private/kitemlistviewanimation.cpp @@ -174,7 +174,7 @@ void KItemListViewAnimation::stop(QGraphicsWidget* widget, AnimationType type) m_animation[type].remove(widget); delete propertyAnim; - emit finished(widget, type); + Q_EMIT finished(widget, type); } } @@ -213,7 +213,7 @@ void KItemListViewAnimation::slotFinished() it.remove(); finishedAnim->deleteLater(); - emit finished(widget, static_cast<AnimationType>(type)); + Q_EMIT finished(widget, static_cast<AnimationType>(type)); return; } } |
