diff options
Diffstat (limited to 'src/panels')
| -rw-r--r-- | src/panels/folders/treeviewcontextmenu.cpp | 5 | ||||
| -rw-r--r-- | src/panels/information/informationpanel.cpp | 2 | ||||
| -rw-r--r-- | src/panels/information/informationpanelcontent.cpp | 4 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.cpp | 8 | ||||
| -rw-r--r-- | src/panels/information/phononwidget.h | 2 | ||||
| -rw-r--r-- | src/panels/places/placespanel.cpp | 2 | ||||
| -rw-r--r-- | src/panels/terminal/terminalpanel.cpp | 2 |
7 files changed, 11 insertions, 14 deletions
diff --git a/src/panels/folders/treeviewcontextmenu.cpp b/src/panels/folders/treeviewcontextmenu.cpp index 45e146a2e..419d174e9 100644 --- a/src/panels/folders/treeviewcontextmenu.cpp +++ b/src/panels/folders/treeviewcontextmenu.cpp @@ -13,7 +13,7 @@ #include <KConfigGroup> #include <KFileItemListProperties> #include <KIO/CopyJob> -#include <KIO/DeleteJob> +#include <KIO/DeleteOrTrashJob> #include <KIO/Paste> #include <KIO/PasteJob> #include <KJobWidgets> @@ -22,9 +22,6 @@ #include <KSharedConfig> #include <KUrlMimeData> -#include <KIO/DeleteOrTrashJob> -#include <kio_version.h> - #include <QApplication> #include <QClipboard> #include <QMenu> diff --git a/src/panels/information/informationpanel.cpp b/src/panels/information/informationpanel.cpp index 7367f1d13..9d1e5b971 100644 --- a/src/panels/information/informationpanel.cpp +++ b/src/panels/information/informationpanel.cpp @@ -244,7 +244,7 @@ void InformationPanel::showItemInfo() // No item is hovered and no selection has been done: provide // an item for the currently shown directory. m_shownUrl = url(); - m_folderStatJob = KIO::statDetails(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo); + m_folderStatJob = KIO::stat(m_shownUrl, KIO::StatJob::SourceSide, KIO::StatDefaultDetails | KIO::StatRecursiveSize, KIO::HideProgressInfo); if (m_folderStatJob->uiDelegate()) { KJobWidgets::setWindow(m_folderStatJob, this); } diff --git a/src/panels/information/informationpanelcontent.cpp b/src/panels/information/informationpanelcontent.cpp index d93457b27..62f25b24b 100644 --- a/src/panels/information/informationpanelcontent.cpp +++ b/src/panels/information/informationpanelcontent.cpp @@ -23,8 +23,8 @@ #include <Baloo/FileMetaDataWidget> -#include <Phonon/BackendCapabilities> -#include <Phonon/MediaObject> +#include <phonon/BackendCapabilities> +#include <phonon/MediaObject> #include <QDialogButtonBox> #include <QGesture> diff --git a/src/panels/information/phononwidget.cpp b/src/panels/information/phononwidget.cpp index 77d55da8b..3365998f4 100644 --- a/src/panels/information/phononwidget.cpp +++ b/src/panels/information/phononwidget.cpp @@ -7,10 +7,10 @@ #include "phononwidget.h" #include <KLocalizedString> -#include <Phonon/AudioOutput> -#include <Phonon/MediaObject> -#include <Phonon/SeekSlider> -#include <Phonon/VideoWidget> +#include <phonon/AudioOutput> +#include <phonon/MediaObject> +#include <phonon/SeekSlider> +#include <phonon/VideoWidget> #include <QShowEvent> #include <QStyle> diff --git a/src/panels/information/phononwidget.h b/src/panels/information/phononwidget.h index 4662e47af..a0a913b4f 100644 --- a/src/panels/information/phononwidget.h +++ b/src/panels/information/phononwidget.h @@ -7,7 +7,7 @@ #ifndef PHONONWIDGET_H #define PHONONWIDGET_H -#include <Phonon/Global> +#include <phonon/Global> #include <QSize> #include <QUrl> diff --git a/src/panels/places/placespanel.cpp b/src/panels/places/placespanel.cpp index e3d133ff0..8bdb18ba2 100644 --- a/src/panels/places/placespanel.cpp +++ b/src/panels/places/placespanel.cpp @@ -150,7 +150,7 @@ static bool isInternalDrag(const QMimeData *mimeData) void PlacesPanel::dragMoveEvent(QDragMoveEvent *event) { - const QModelIndex index = indexAt(event->pos()); + const QModelIndex index = indexAt(event->position().toPoint()); if (index.isValid()) { auto *placesModel = static_cast<KFilePlacesModel *>(model()); diff --git a/src/panels/terminal/terminalpanel.cpp b/src/panels/terminal/terminalpanel.cpp index 72886c2e9..30c9e8409 100644 --- a/src/panels/terminal/terminalpanel.cpp +++ b/src/panels/terminal/terminalpanel.cpp @@ -144,7 +144,7 @@ void TerminalPanel::showEvent(QShowEvent *event) if (!m_terminal) { m_clearTerminal = true; - KPluginFactory *factory = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("konsolepart"))).plugin; + KPluginFactory *factory = KPluginFactory::loadFactory(KPluginMetaData(QStringLiteral("kf6/parts/konsolepart"))).plugin; m_konsolePart = factory ? (factory->create<KParts::ReadOnlyPart>(this)) : nullptr; if (m_konsolePart) { connect(m_konsolePart, &KParts::ReadOnlyPart::destroyed, this, &TerminalPanel::terminalExited); |
