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/panels/places | |
| parent | a24327cd50ef17b953ecb908d260b73460158107 (diff) | |
Compile with QT_NO_KEYWORDS
Diffstat (limited to 'src/panels/places')
| -rw-r--r-- | src/panels/places/placesitemmodel.cpp | 16 | ||||
| -rw-r--r-- | src/panels/places/placesitemsignalhandler.cpp | 2 | ||||
| -rw-r--r-- | src/panels/places/placespanel.cpp | 8 |
3 files changed, 13 insertions, 13 deletions
diff --git a/src/panels/places/placesitemmodel.cpp b/src/panels/places/placesitemmodel.cpp index c9f1c8365..8ac6b46a8 100644 --- a/src/panels/places/placesitemmodel.cpp +++ b/src/panels/places/placesitemmodel.cpp @@ -237,7 +237,7 @@ void PlacesItemModel::requestEject(int index) } else { const QString label = item->text(); const QString message = i18nc("@info", "The device '%1' is not a disk and cannot be ejected.", label); - emit errorMessage(message); + Q_EMIT errorMessage(message); } } } @@ -254,7 +254,7 @@ void PlacesItemModel::requestTearDown(int index) // after we have emitted PlacesItemModel::storageTearDownRequested disconnect(tmp, &Solid::StorageAccess::teardownRequested, item->signalHandler(), &PlacesItemSignalHandler::onTearDownRequested); - emit storageTearDownRequested(tmp->filePath()); + Q_EMIT storageTearDownRequested(tmp->filePath()); } } } @@ -467,11 +467,11 @@ void PlacesItemModel::slotStorageTearDownDone(Solid::ErrorType error, const QVar "One or more files on this device are opened in following applications: <application>%2</application>.", blockingApps.count(), blockingApps.join(i18nc("separator in list of apps blocking device unmount", ", "))); } - emit errorMessage(errorString); + Q_EMIT errorMessage(errorString); }); listOpenFilesJob->start(); } else { - emit errorMessage(errorData.toString()); + Q_EMIT errorMessage(errorData.toString()); } } else { // No error; it must have been unmounted successfully @@ -496,16 +496,16 @@ void PlacesItemModel::slotStorageSetupDone(Solid::ErrorType error, if (error != Solid::NoError) { if (errorData.isValid()) { - emit errorMessage(i18nc("@info", "An error occurred while accessing '%1', the system responded: %2", + Q_EMIT errorMessage(i18nc("@info", "An error occurred while accessing '%1', the system responded: %2", item->text(), errorData.toString())); } else { - emit errorMessage(i18nc("@info", "An error occurred while accessing '%1'", + Q_EMIT errorMessage(i18nc("@info", "An error occurred while accessing '%1'", item->text())); } - emit storageSetupDone(index, false); + Q_EMIT storageSetupDone(index, false); } else { - emit storageSetupDone(index, true); + Q_EMIT storageSetupDone(index, true); } } diff --git a/src/panels/places/placesitemsignalhandler.cpp b/src/panels/places/placesitemsignalhandler.cpp index b5c7ebcec..19f16c7b5 100644 --- a/src/panels/places/placesitemsignalhandler.cpp +++ b/src/panels/places/placesitemsignalhandler.cpp @@ -32,7 +32,7 @@ void PlacesItemSignalHandler::onTearDownRequested(const QString& udi) if (m_item) { Solid::StorageAccess *tmp = m_item->device().as<Solid::StorageAccess>(); if (tmp) { - emit tearDownExternallyRequested(tmp->filePath()); + Q_EMIT tearDownExternallyRequested(tmp->filePath()); } } } diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index 03cf628b4..336b9deb8 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -437,7 +437,7 @@ void PlacesPanel::slotUrlsDropped(const QUrl& dest, QDropEvent* event, QWidget* { KIO::DropJob *job = DragAndDropHelper::dropUrls(dest, event, parent); if (job) { - connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) emit errorMessage(job->errorString()); }); + connect(job, &KIO::DropJob::result, this, [this](KJob *job) { if (job->error()) Q_EMIT errorMessage(job->errorString()); }); } } @@ -529,9 +529,9 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button) const QUrl url = m_model->data(index).value("url").toUrl(); if (!url.isEmpty()) { if (button == Qt::MiddleButton) { - emit placeMiddleClicked(KFilePlacesModel::convertedUrl(url)); + Q_EMIT placeMiddleClicked(KFilePlacesModel::convertedUrl(url)); } else { - emit placeActivated(KFilePlacesModel::convertedUrl(url)); + Q_EMIT placeActivated(KFilePlacesModel::convertedUrl(url)); } } } @@ -540,7 +540,7 @@ void PlacesPanel::triggerItem(int index, Qt::MouseButton button) void PlacesPanel::showHiddenEntries(bool shown) { m_model->setHiddenItemsShown(shown); - emit showHiddenEntriesChanged(shown); + Q_EMIT showHiddenEntriesChanged(shown); } int PlacesPanel::hiddenListCount() |
