diff --git a/lib/previewplugin.cpp b/lib/previewplugin.cpp index 41ad086..1698513 100644 --- a/lib/previewplugin.cpp +++ b/lib/previewplugin.cpp @@ -1,110 +1,105 @@ /* * This file is part of the KDE Milou Project * Copyright (C) 2013 Vishesh Handa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ #include "previewplugin.h" #include #include -#include using namespace Milou; PreviewPlugin::PreviewPlugin(QObject* parent) : QObject(parent) , m_context(nullptr) { -#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) - qmlRegisterAnonymousType("org.kde.milou", 1); -#else - qmlRegisterType(); -#endif + } PreviewPlugin::~PreviewPlugin() { } void PreviewPlugin::setUrl(const QUrl& url) { m_url = url; } QUrl PreviewPlugin::url() const { return m_url; } void PreviewPlugin::setMimetype(const QString& mimetype) { m_mimetype = mimetype; } QString PreviewPlugin::mimetype() const { return m_mimetype; } void PreviewPlugin::setHighlight(const QString& term) { m_highlight = term; } QString PreviewPlugin::highlight() const { return m_highlight; } void PreviewPlugin::setContext(QQmlContext* context) { m_context = context; } QQmlContext* PreviewPlugin::context() { Q_ASSERT(m_context); return m_context; } void PreviewPlugin::highlight(const QTextDocument* doc) const { QTextCursor cursor; Q_FOREACH (const QString& text, highlight().split(QLatin1Char(' '), QString::SkipEmptyParts)) { while (1) { cursor = doc->find(text, cursor); if (cursor.isNull()) break; QString selection = cursor.selectedText(); QTextCharFormat format = cursor.charFormat(); format.setBackground(QBrush(Qt::yellow)); cursor.removeSelectedText(); cursor.insertText(selection, format); } } } bool PreviewPlugin::onHighDPI() const { return true; } diff --git a/lib/qml/qmlplugins.cpp b/lib/qml/qmlplugins.cpp index 49f1cae..44e0d54 100644 --- a/lib/qml/qmlplugins.cpp +++ b/lib/qml/qmlplugins.cpp @@ -1,48 +1,54 @@ /* * This file is part of the KDE Milou Project * Copyright (C) 2013 Vishesh Handa * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either * version 2.1 of the License, or (at your option) version 3, or any * later version accepted by the membership of KDE e.V. (or its * successor approved by the membership of KDE e.V.), which shall * act as a proxy defined in Section 6 of version 3 of the license. * * This library is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General Public License for more details. * * You should have received a copy of the GNU Lesser General Public * License along with this library. If not, see . * */ #include "qmlplugins.h" #include "sourcesmodel.h" #include "resultsmodel.h" #include "preview.h" #include "draghelper.h" #include "mousehelper.h" #include +#include void QmlPlugins::initializeEngine(QQmlEngine *, const char *) { } void QmlPlugins::registerTypes(const char *uri) { qmlRegisterType (uri, 0, 1, "SourcesModel"); qmlRegisterType(uri, 0, 3, "ResultsModel"); qmlRegisterType (uri, 0, 1, "Preview"); qmlRegisterType (uri, 0, 2, "DragHelper"); qmlRegisterSingletonType (uri, 0, 1, "MouseHelper", [](QQmlEngine*, QJSEngine*) -> QObject* { return new Milou::MouseHelper(); }); +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + qmlRegisterAnonymousType(uri, 0); +#else + qmlRegisterType(); +#endif }