Members of the KDE Community are recommended to subscribe to the kde-community mailing list at https://mail.kde.org/mailman/listinfo/kde-community to allow them to participate in important discussions and receive other important announcements

Commit e812a31c authored by Albert Vaca Cintora's avatar Albert Vaca Cintora

Remove the need to use qt5_wrap_cpp for moc generation

parent 607b9a65
......@@ -6,6 +6,7 @@ include_directories(${CMAKE_CURRENT_BINARY_DIR}
set(kdeconnectdeclarativeplugin_SRC
kdeconnectdeclarativeplugin.cpp
responsewaiter.cpp
objectfactory.cpp
)
set(qml_SRC
......@@ -14,12 +15,6 @@ set(qml_SRC
qml/DBusProperty.qml
)
set(kdeconnectdeclarativeplugin_MOC
objectfactory.h
)
qt5_wrap_cpp(kdeconnectdeclarativeplugin_SRC ${kdeconnectdeclarativeplugin_MOC})
add_library(kdeconnectdeclarativeplugin SHARED ${kdeconnectdeclarativeplugin_SRC})
target_link_libraries(kdeconnectdeclarativeplugin
Qt5::Qml
......
/**
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 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 14 of version 3 of the license.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#include "objectfactory.h"
QObject* ObjectFactory::create() {
if (m_f0) return m_f0();
return nullptr;
}
QObject* ObjectFactory::create(const QVariant& arg1) {
if (m_f1) return m_f1(arg1);
return nullptr;
}
QObject* ObjectFactory::create(const QVariant& arg1, const QVariant& arg2) {
if (m_f2) return m_f2(arg1, arg2);
return nullptr;
}
/**
* Copyright 2013 Albert Vaca <albertvaka@gmail.com>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License as
* published by the Free Software Foundation; either version 2 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 14 of version 3 of the license.
*
* This program 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 General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
#ifndef QOBJECT_FACTORY_H
#define QOBJECT_FACTORY_H
......@@ -9,33 +29,23 @@
class ObjectFactory : public QObject
{
Q_OBJECT
typedef QObject* (*Func0)();
typedef QObject* (*Func1)(const QVariant&);
typedef QObject* (*Func2)(const QVariant&, const QVariant&);
public:
ObjectFactory(QObject* parent, Func0 f0) : QObject(parent), m_f0(f0), m_f1(nullptr), m_f2(nullptr) {}
ObjectFactory(QObject* parent, Func1 f1) : QObject(parent), m_f0(nullptr), m_f1(f1), m_f2(nullptr) {}
ObjectFactory(QObject* parent, Func2 f2) : QObject(parent), m_f0(nullptr), m_f1(nullptr), m_f2(f2) {}
~ObjectFactory() override = default;
Q_INVOKABLE QObject* create() {
if (m_f0) return m_f0();
return nullptr;
}
Q_INVOKABLE QObject* create(const QVariant& arg1) {
if (m_f1) return m_f1(arg1);
return nullptr;
}
Q_INVOKABLE QObject* create(const QVariant& arg1, const QVariant& arg2) {
if (m_f2) return m_f2(arg1, arg2);
return nullptr;
}
Q_INVOKABLE QObject* create();
Q_INVOKABLE QObject* create(const QVariant& arg1);
Q_INVOKABLE QObject* create(const QVariant& arg1, const QVariant& arg2);
private:
Func0 m_f0;
Func1 m_f1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment