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/private | |
| parent | a24327cd50ef17b953ecb908d260b73460158107 (diff) | |
Compile with QT_NO_KEYWORDS
Diffstat (limited to 'src/kitemviews/private')
9 files changed, 25 insertions, 25 deletions
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; } } |
