From 7ee3a698b0f8c21dcd75d906a5efb5e10e6040e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Sat, 5 Oct 2013 01:21:40 +0200 Subject: [PATCH] No more kde4support for dirmodel plugin --- src/declarativeimports/dirmodel/CMakeLists.txt | 5 ++--- src/declarativeimports/dirmodel/dirmodel.cpp | 17 +++++++++-------- src/declarativeimports/dirmodel/dirmodel.h | 6 +++--- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/declarativeimports/dirmodel/CMakeLists.txt b/src/declarativeimports/dirmodel/CMakeLists.txt index 330cbab10..8fa72a4d6 100644 --- a/src/declarativeimports/dirmodel/CMakeLists.txt +++ b/src/declarativeimports/dirmodel/CMakeLists.txt @@ -8,11 +8,10 @@ set(dirmodel_SRCS add_library(dirmodelplugin SHARED ${dirmodel_SRCS}) target_link_libraries(dirmodelplugin - ${QT_QTCORE_LIBRARY} - ${Qt5Qml_LIBRARIES} + Qt5::Core + Qt5::Qml KF5::KIOCore KF5::KIOWidgets - ${KDE4Support_LIBRARIES} KF5::KGuiAddons ) diff --git a/src/declarativeimports/dirmodel/dirmodel.cpp b/src/declarativeimports/dirmodel/dirmodel.cpp index 28b4a9d45..55e55e034 100644 --- a/src/declarativeimports/dirmodel/dirmodel.cpp +++ b/src/declarativeimports/dirmodel/dirmodel.cpp @@ -22,23 +22,24 @@ #include #include -#include +#include #include -#include -#include -#include +#include +#include +#include DirModel::DirModel(QObject *parent) : KDirModel(parent), m_screenshotSize(180, 120) { - KMimeType::List mimeList = KMimeType::allMimeTypes(); + QMimeDatabase db; + QList mimeList = db.allMimeTypes(); m_mimeTypes << "inode/directory"; - foreach (KMimeType::Ptr mime, mimeList) { - if (mime->name().startsWith(QLatin1String("image/"))) { - m_mimeTypes << mime->name(); + foreach (const QMimeType &mime, mimeList) { + if (mime.name().startsWith(QStringLiteral("image/"))) { + m_mimeTypes << mime.name(); } } diff --git a/src/declarativeimports/dirmodel/dirmodel.h b/src/declarativeimports/dirmodel/dirmodel.h index 032afc455..9eccdf977 100644 --- a/src/declarativeimports/dirmodel/dirmodel.h +++ b/src/declarativeimports/dirmodel/dirmodel.h @@ -21,10 +21,10 @@ #define DIRMODEL_H #include -#include +#include #include -#include -#include +#include +#include class QTimer;