┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/panels
diff options
context:
space:
mode:
authorAlexander Lohnau <[email protected]>2020-10-23 19:51:33 +0200
committerElvis Angelaccio <[email protected]>2020-10-23 18:23:06 +0000
commit97415729c34851df75c77a67f27d6299c00bfbc4 (patch)
treeb7a344b54e226aee8db16f6f123a403d8f276aa9 /src/panels
parenta24327cd50ef17b953ecb908d260b73460158107 (diff)
Compile with QT_NO_KEYWORDS
Diffstat (limited to 'src/panels')
-rw-r--r--src/panels/folders/folderspanel.cpp8
-rw-r--r--src/panels/information/informationpanelcontent.cpp6
-rw-r--r--src/panels/information/phononwidget.cpp6
-rw-r--r--src/panels/places/placesitemmodel.cpp16
-rw-r--r--src/panels/places/placesitemsignalhandler.cpp2
-rw-r--r--src/panels/places/placespanel.cpp8
-rw-r--r--src/panels/terminal/terminalpanel.cpp8
7 files changed, 27 insertions, 27 deletions
diff --git a/src/panels/folders/folderspanel.cpp b/src/panels/folders/folderspanel.cpp
index 73c3137d3..88083e7a2 100644
--- a/src/panels/folders/folderspanel.cpp
+++ b/src/panels/folders/folderspanel.cpp
@@ -187,7 +187,7 @@ void FoldersPanel::slotItemActivated(int index)
{
const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit folderActivated(item.url());
+ Q_EMIT folderActivated(item.url());
}
}
@@ -195,7 +195,7 @@ void FoldersPanel::slotItemMiddleClicked(int index)
{
const KFileItem item = m_model->fileItem(index);
if (!item.isNull()) {
- emit folderMiddleClicked(item.url());
+ Q_EMIT folderMiddleClicked(item.url());
}
}
@@ -235,7 +235,7 @@ void FoldersPanel::slotItemDropEvent(int index, QGraphicsSceneDragDropEvent* eve
KIO::DropJob *job = DragAndDropHelper::dropUrls(destItem.mostLocalUrl(), &dropEvent, this);
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()); });
}
}
}
@@ -323,7 +323,7 @@ void FoldersPanel::loadTree(const QUrl& url, FoldersPanel::NavigationBehaviour n
const int index = m_model->index(url);
if (jumpHome) {
- emit folderActivated(baseUrl);
+ Q_EMIT folderActivated(baseUrl);
} else if (index >= 0) {
updateCurrentItem(index);
} else if (url == baseUrl) {
diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp
index ded88bd96..946bad720 100644
--- a/src/panels/information/informationpanelcontent.cpp
+++ b/src/panels/information/informationpanelcontent.cpp
@@ -119,14 +119,14 @@ InformationPanelContent::InformationPanelContent(QWidget* parent) :
m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Accept);
m_configureButtons->setVisible(false);
m_configureLabel->setVisible(false);
- emit configurationFinished();
+ Q_EMIT configurationFinished();
}
);
connect(m_configureButtons, &QDialogButtonBox::rejected, this, [this]() {
m_metaDataWidget->setConfigurationMode(Baloo::ConfigurationMode::Cancel);
m_configureButtons->setVisible(false);
m_configureLabel->setVisible(false);
- emit configurationFinished();
+ Q_EMIT configurationFinished();
}
);
@@ -362,7 +362,7 @@ bool InformationPanelContent::gestureEvent(QGestureEvent* event)
if (tap) {
if (tap->state() == Qt::GestureFinished) {
- emit contextMenuRequested(tap->position().toPoint());
+ Q_EMIT contextMenuRequested(tap->position().toPoint());
}
event->accept();
return true;
diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp
index fa4b9e226..c9ccaa86c 100644
--- a/src/panels/information/phononwidget.cpp
+++ b/src/panels/information/phononwidget.cpp
@@ -223,7 +223,7 @@ void PhononWidget::play()
}
if (m_isVideo) {
- emit hasVideoChanged(true);
+ Q_EMIT hasVideoChanged(true);
}
if (m_url != m_media->currentSource().url()) {
@@ -238,7 +238,7 @@ void PhononWidget::finished()
{
if (m_isVideo) {
m_videoPlayer->hide();
- emit hasVideoChanged(false);
+ Q_EMIT hasVideoChanged(false);
}
}
@@ -252,7 +252,7 @@ void PhononWidget::stop()
if (m_media) {
m_media->stop();
m_videoPlayer->hide();
- emit hasVideoChanged(false);
+ Q_EMIT hasVideoChanged(false);
}
}
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()
diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp
index f6eb2f28f..fdc6c64bb 100644
--- a/src/panels/terminal/terminalpanel.cpp
+++ b/src/panels/terminal/terminalpanel.cpp
@@ -68,7 +68,7 @@ QString TerminalPanel::currentWorkingDirectory()
void TerminalPanel::terminalExited()
{
m_terminal = nullptr;
- emit hideTerminalPanel();
+ Q_EMIT hideTerminalPanel();
}
bool TerminalPanel::isHiddenInVisibleWindow() const
@@ -286,7 +286,7 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
KMountPoint::Ptr mountPoint = KMountPoint::currentMountPoints().findByPath(m_konsolePartCurrentDirectory);
if (mountPoint && mountPoint->mountType() != QStringLiteral("fuse.kio-fuse")) {
// Not in KIOFUse mount, so just switch to the corresponding URL.
- emit changeUrl(url);
+ Q_EMIT changeUrl(url);
return;
}
@@ -296,11 +296,11 @@ void TerminalPanel::slotKonsolePartCurrentDirectoryChanged(const QString& dir)
watcher->deleteLater();
if (reply.isError()) {
// KIOFuse errored out... just show the normal URL
- emit changeUrl(url);
+ Q_EMIT changeUrl(url);
} else {
// Our location happens to be in a KIOFuse mount and is mounted.
// Let's change the DolphinView to point to the remote URL equivalent.
- emit changeUrl(QUrl::fromUserInput(reply.value()));
+ Q_EMIT changeUrl(QUrl::fromUserInput(reply.value()));
}
});
}