┌   ┐
54
└   ┘

summaryrefslogtreecommitdiff
path: root/src/views
diff options
context:
space:
mode:
Diffstat (limited to 'src/views')
-rw-r--r--src/views/dolphinremoteencoding.cpp4
-rw-r--r--src/views/dolphinview.cpp7
-rw-r--r--src/views/dolphinviewactionhandler.cpp4
-rw-r--r--src/views/versioncontrol/versioncontrolobserver.cpp6
4 files changed, 9 insertions, 12 deletions
diff --git a/src/views/dolphinremoteencoding.cpp b/src/views/dolphinremoteencoding.cpp
index 2881915ac..32dd6bd29 100644
--- a/src/views/dolphinremoteencoding.cpp
+++ b/src/views/dolphinremoteencoding.cpp
@@ -87,7 +87,7 @@ void DolphinRemoteEncoding::fillMenu()
QMenu *menu = m_menu->menu();
menu->clear();
- menu->addAction(i18n("Default"), this, SLOT(slotDefault()), 0)->setCheckable(true);
+ menu->addAction(i18n("Default"), this, &DolphinRemoteEncoding::slotDefault)->setCheckable(true);
for (int i = 0; i < m_encodingDescriptions.size(); i++) {
QAction *action = new QAction(m_encodingDescriptions.at(i), this);
action->setCheckable(true);
@@ -96,7 +96,7 @@ void DolphinRemoteEncoding::fillMenu()
}
menu->addSeparator();
- menu->addAction(i18n("Reload"), this, SLOT(slotReload()), 0);
+ menu->addAction(i18n("Reload"), this, &DolphinRemoteEncoding::slotReload);
m_idDefault = m_encodingDescriptions.size() + 2;
connect(menu, &QMenu::triggered, this, &DolphinRemoteEncoding::slotItemSelected);
diff --git a/src/views/dolphinview.cpp b/src/views/dolphinview.cpp
index 21e23d5ac..e27f423f6 100644
--- a/src/views/dolphinview.cpp
+++ b/src/views/dolphinview.cpp
@@ -35,7 +35,7 @@
#include <KFileItemListProperties>
#include <KFormat>
#include <KIO/CopyJob>
-#include <KIO/DeleteJob>
+#include <KIO/DeleteOrTrashJob>
#include <KIO/DropJob>
#include <KIO/JobUiDelegate>
#include <KIO/Paste>
@@ -49,9 +49,6 @@
#include <kwidgetsaddons_version.h>
-#include <KIO/DeleteOrTrashJob>
-#include <kio_version.h>
-
#include <QAbstractItemView>
#include <QActionGroup>
#include <QApplication>
@@ -626,7 +623,7 @@ void DolphinView::requestStatusBarText()
return;
}
- m_statJobForStatusBarText = KIO::statDetails(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);
+ m_statJobForStatusBarText = KIO::stat(m_model->rootItem().url(), KIO::StatJob::SourceSide, KIO::StatRecursiveSize, KIO::HideProgressInfo);
connect(m_statJobForStatusBarText, &KJob::result, this, &DolphinView::slotStatJobResult);
m_statJobForStatusBarText->start();
}
diff --git a/src/views/dolphinviewactionhandler.cpp b/src/views/dolphinviewactionhandler.cpp
index 7117e9e1b..397ff5d5e 100644
--- a/src/views/dolphinviewactionhandler.cpp
+++ b/src/views/dolphinviewactionhandler.cpp
@@ -215,7 +215,7 @@ void DolphinViewActionHandler::createActions(SelectionMode::ActionTextHelper *ac
viewModeActions->addAction(compactAction);
viewModeActions->addAction(detailsAction);
viewModeActions->setToolBarMode(KSelectAction::MenuMode);
- connect(viewModeActions, &KSelectAction::triggered, this, &DolphinViewActionHandler::slotViewModeActionTriggered);
+ connect(viewModeActions, &KSelectAction::actionTriggered, this, &DolphinViewActionHandler::slotViewModeActionTriggered);
QAction *zoomInAction = KStandardAction::zoomIn(this, &DolphinViewActionHandler::zoomIn, m_actionCollection);
zoomInAction->setWhatsThis(i18nc("@info:whatsthis zoom in", "This increases the icon size."));
@@ -714,7 +714,7 @@ void DolphinViewActionHandler::slotSortTriggered(QAction *action)
// actions and the sub-menu-actions. If an action gets checked, it must
// be assured that all other actions get unchecked, except the ascending/
// descending actions
- for (QAction *groupAction : qAsConst(m_sortByActions)) {
+ for (QAction *groupAction : std::as_const(m_sortByActions)) {
KActionMenu *actionMenu = qobject_cast<KActionMenu *>(groupAction);
if (actionMenu) {
const auto actions = actionMenu->menu()->actions();
diff --git a/src/views/versioncontrol/versioncontrolobserver.cpp b/src/views/versioncontrol/versioncontrolobserver.cpp
index e3bd29390..64f8843d2 100644
--- a/src/views/versioncontrol/versioncontrolobserver.cpp
+++ b/src/views/versioncontrol/versioncontrolobserver.cpp
@@ -105,7 +105,7 @@ QList<QAction *> VersionControlObserver::actions(const KFileItemList &items) con
return m_plugin->versionControlActions(items);
} else {
QList<QAction *> actions;
- for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+ for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {
actions << plugin->outOfVersionControlActions(items);
}
return actions;
@@ -283,7 +283,7 @@ void VersionControlObserver::initPlugins()
}
}
- for (auto &plugin : qAsConst(m_plugins)) {
+ for (auto &plugin : std::as_const(m_plugins)) {
connect(plugin, &KVersionControlPlugin::itemVersionsChanged, this, &VersionControlObserver::silentDirectoryVerification);
connect(plugin, &KVersionControlPlugin::infoMessage, this, &VersionControlObserver::infoMessage);
connect(plugin, &KVersionControlPlugin::errorMessage, this, &VersionControlObserver::errorMessage);
@@ -299,7 +299,7 @@ KVersionControlPlugin *VersionControlObserver::searchPlugin(const QUrl &director
initPlugins();
// Verify whether the current directory is under a version system
- for (const QPointer<KVersionControlPlugin> &plugin : qAsConst(m_plugins)) {
+ for (const QPointer<KVersionControlPlugin> &plugin : std::as_const(m_plugins)) {
if (!plugin) {
continue;
}