From 2ebada68b534c2b118068068796f9322bbab3896 Mon Sep 17 00:00:00 2001 From: Filippo Cucchetto Date: Tue, 29 Dec 2015 11:17:18 +0100 Subject: [PATCH] Removed leftovers --- lib/CMakeLists.txt | 6 -- lib/include/DOtherSide/DynamicProperty.h | 40 -------- lib/include/DOtherSide/DynamicSignal.h | 32 ------- lib/include/DOtherSide/DynamicSlot.h | 41 --------- lib/src/DynamicProperty.cpp | 111 ----------------------- lib/src/DynamicSignal.cpp | 86 ------------------ lib/src/DynamicSlot.cpp | 96 -------------------- lib/src/OnSlotExecutedHandler.cpp | 1 - 8 files changed, 413 deletions(-) delete mode 100644 lib/include/DOtherSide/DynamicProperty.h delete mode 100644 lib/include/DOtherSide/DynamicSignal.h delete mode 100644 lib/include/DOtherSide/DynamicSlot.h delete mode 100644 lib/src/DynamicProperty.cpp delete mode 100644 lib/src/DynamicSignal.cpp delete mode 100644 lib/src/DynamicSlot.cpp diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 7473efe..64aa6dd 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -16,9 +16,6 @@ find_package(Qt5Widgets) set(HEADERS_LIST include/DOtherSide/DOtherSideTypes.h include/DOtherSide/DOtherSideTypesCpp.h - include/DOtherSide/DynamicSignal.h - include/DOtherSide/DynamicProperty.h - include/DOtherSide/DynamicSlot.h include/DOtherSide/DOtherSide.h include/DOtherSide/IDynamicQObject.h include/DOtherSide/OnSlotExecutedHandler.h @@ -30,9 +27,6 @@ set(HEADERS_LIST set(SRC_LIST src/DOtherSide.cpp src/OnSlotExecutedHandler.cpp - src/DynamicSlot.cpp - src/DynamicSignal.cpp - src/DynamicProperty.cpp src/DynamicQObjectFactory.cpp src/DynamicQObject.cpp src/DOtherSideTypesCpp.cpp diff --git a/lib/include/DOtherSide/DynamicProperty.h b/lib/include/DOtherSide/DynamicProperty.h deleted file mode 100644 index 12705b9..0000000 --- a/lib/include/DOtherSide/DynamicProperty.h +++ /dev/null @@ -1,40 +0,0 @@ -#pragma once - -// std -#include -// Qt -#include -#include - -class DynamicProperty final -{ -public: - DynamicProperty(); - DynamicProperty(const QString& name, - QMetaType::Type type, - const QString& readSlotName, - const QString& writeSlotName = QString(), - const QString& notifySignalName = QString()); - DynamicProperty(const DynamicProperty& other); - DynamicProperty& operator=(const DynamicProperty& other); - ~DynamicProperty(); - - QString name() const; - QMetaType::Type type() const; - - bool isValid() const { - return d != nullptr; - } - - bool isReadable() const; - bool isWriteable() const; - bool hasNotifySignal() const; - - QString readSlot() const; - QString writeSlot() const; - QString notifySignal() const; - -private: - struct PropertyData; - std::unique_ptr d; -}; diff --git a/lib/include/DOtherSide/DynamicSignal.h b/lib/include/DOtherSide/DynamicSignal.h deleted file mode 100644 index 875ff37..0000000 --- a/lib/include/DOtherSide/DynamicSignal.h +++ /dev/null @@ -1,32 +0,0 @@ -#pragma once - -// std -#include -// Qt -#include -#include -#include -#include - -class DynamicSignal final -{ -public: - DynamicSignal(); - DynamicSignal(const QString& name, const QList& arguments); - DynamicSignal(const DynamicSignal& signal); - DynamicSignal& operator=(const DynamicSignal& signal); - ~DynamicSignal(); - - bool isValid() const; - - QString name() const; - QByteArray signature() const; - - bool validate(const QVariantList& arguments); - -private: - void _initSignature(); - - struct SignalData; - std::unique_ptr d; -}; diff --git a/lib/include/DOtherSide/DynamicSlot.h b/lib/include/DOtherSide/DynamicSlot.h deleted file mode 100644 index 1286a43..0000000 --- a/lib/include/DOtherSide/DynamicSlot.h +++ /dev/null @@ -1,41 +0,0 @@ -#pragma once - -// std -#include -#include -// Qt -#include -#include -#include -#include -#include -#include -#include -#include "private/qmetaobjectbuilder_p.h" - -class QString; - -class DynamicSlot final -{ -public: - DynamicSlot(); - DynamicSlot(const QString& name, - QMetaType::Type returnType, - const QList& argumentsTypes); - DynamicSlot(const DynamicSlot& slot); - DynamicSlot& operator=(const DynamicSlot& slot); - ~DynamicSlot(); - - QString name() const; - bool isValid() const; - QByteArray signature() const; - QMetaType::Type returnType() const; - QList argumentsTypes() const; - QMetaType::Type argumentTypeAt(int i) const; - -private: - void _initSignature(); - - struct SlotData; - std::unique_ptr d; -}; diff --git a/lib/src/DynamicProperty.cpp b/lib/src/DynamicProperty.cpp deleted file mode 100644 index f343ba6..0000000 --- a/lib/src/DynamicProperty.cpp +++ /dev/null @@ -1,111 +0,0 @@ -#include "DOtherSide/DynamicProperty.h" - -struct DynamicProperty::PropertyData final -{ - PropertyData(const QString& name, - QMetaType::Type type, - const QString& readSlotName, - const QString& writeSlotName, - const QString& notifySignalName) - : name(name) - , type(type) - , readSlotName(readSlotName) - , writeSlotName(writeSlotName) - , notifySignalName(notifySignalName) - {} - - PropertyData(const PropertyData& other) - : name(other.name) - , type(other.type) - , readSlotName(other.readSlotName) - , writeSlotName(other.writeSlotName) - , notifySignalName(other.notifySignalName) - {} - - PropertyData& operator=(const PropertyData& other) - { - name = other.name; - type = other.type; - readSlotName = other.readSlotName; - writeSlotName = other.writeSlotName; - notifySignalName = other.notifySignalName; - return *this; - } - - QString name; - QMetaType::Type type; - QString readSlotName; - QString writeSlotName; - QString notifySignalName; -}; - -DynamicProperty::DynamicProperty() - : d(nullptr) -{} - -DynamicProperty::DynamicProperty(const QString& name, QMetaType::Type type, const QString& readSlotName, const QString& writeSlotName, const QString& notifySignalName) - : d(new PropertyData(name, type, readSlotName, writeSlotName, notifySignalName)) -{ -} - -DynamicProperty::DynamicProperty(const DynamicProperty& other) - : d(nullptr) -{ - if (other.d) - d.reset(new PropertyData(*other.d)); -} - -DynamicProperty& DynamicProperty::operator=(const DynamicProperty& other) -{ - if (!other.d && d) - d.reset(); - else if (other.d && !d) - d.reset(new PropertyData(*other.d)); - else if (other.d && d) - *d = *other.d; - - return *this; -} - -DynamicProperty::~DynamicProperty() -{} - -QString DynamicProperty::name() const -{ - return d->name; -} - -QMetaType::Type DynamicProperty::type() const -{ - return d->type; -} - -bool DynamicProperty::isReadable() const -{ - return !d->readSlotName.isEmpty(); -} - -bool DynamicProperty::isWriteable() const -{ - return !d->writeSlotName.isEmpty(); -} - -bool DynamicProperty::hasNotifySignal() const -{ - return !d->notifySignalName.isEmpty(); -} - -QString DynamicProperty::readSlot() const -{ - return d->readSlotName; -} - -QString DynamicProperty::writeSlot() const -{ - return d->writeSlotName; -} - -QString DynamicProperty::notifySignal() const -{ - return d->notifySignalName; -} diff --git a/lib/src/DynamicSignal.cpp b/lib/src/DynamicSignal.cpp deleted file mode 100644 index 67bdcdf..0000000 --- a/lib/src/DynamicSignal.cpp +++ /dev/null @@ -1,86 +0,0 @@ -#include "DOtherSide/DynamicSignal.h" - -struct DynamicSignal::SignalData -{ - QString name; - QList argumentsTypes; - QByteArray signature; -}; - -DynamicSignal::DynamicSignal() - : d(nullptr) -{} - -DynamicSignal::DynamicSignal(const QString& name, const QList& arguments) - : d(new SignalData()) -{ - d->name = name; - d->signature = QByteArray(); - d->argumentsTypes = arguments; - _initSignature(); -} - -DynamicSignal::DynamicSignal(const DynamicSignal& signal) -{ - if (signal.isValid()) - { - d.reset(new SignalData()); - *d = *signal.d; - } - else - d.reset(nullptr); -} - -DynamicSignal& DynamicSignal::operator=(const DynamicSignal& signal) -{ - if (signal.isValid()) - { - d.reset(new SignalData()); - *d = *signal.d; - } - else - d.reset(nullptr); - - return *this; -} - -DynamicSignal::~DynamicSignal() = default; - -bool DynamicSignal::isValid() const -{ - return d != nullptr; -} - -QString DynamicSignal::name() const -{ - return isValid() ? d->name : QString(); -} - -QByteArray DynamicSignal::signature() const -{ - return isValid() ? d->signature : QByteArray(); -} - -bool DynamicSignal::validate(const QVariantList& arguments) -{ - // TODO: here we should test if the given arguments - // match this signal signature - // This is important because a class could have multiple - // signals with the same name but different arguments - Q_UNUSED(arguments); - return true; -} - -void DynamicSignal::_initSignature() -{ - QString signature("%1(%2)"); - QString arguments; - for (int i = 0; i < d->argumentsTypes.size(); ++i) - { - if (i != 0) - arguments += ','; - arguments += QMetaType::typeName(d->argumentsTypes[i]); - } - - d->signature = signature.arg(d->name, arguments).toUtf8(); -} diff --git a/lib/src/DynamicSlot.cpp b/lib/src/DynamicSlot.cpp deleted file mode 100644 index cfb9dd3..0000000 --- a/lib/src/DynamicSlot.cpp +++ /dev/null @@ -1,96 +0,0 @@ -#include "DOtherSide/DynamicSlot.h" - -struct DynamicSlot::SlotData -{ - QString name; - QMetaType::Type returnType; - QList argumentsTypes; - QByteArray signature; -}; - -DynamicSlot::DynamicSlot() - : d(nullptr) -{} - -DynamicSlot::DynamicSlot(const QString& name, - QMetaType::Type returnType, - const QList& argumentsTypes) - : d(new SlotData()) -{ - d->name = name; - d->returnType = returnType; - d->argumentsTypes = argumentsTypes; - _initSignature(); -} - -DynamicSlot::DynamicSlot(const DynamicSlot& slot) -{ - if (slot.isValid()) - { - d.reset(new SlotData()); - *d = *slot.d; - } - else - d.reset(nullptr); -} - -DynamicSlot& DynamicSlot::operator=(const DynamicSlot& slot) -{ - if (slot.isValid()) - { - d.reset(new SlotData()); - *d = *slot.d; - } - else - d.reset(nullptr); - - return *this; -} - -DynamicSlot::~DynamicSlot() -{ -} - -QString DynamicSlot::name() const -{ - return isValid() ? d->name : QString(); -} - -bool DynamicSlot::isValid() const -{ - return d != nullptr; -} - -QByteArray DynamicSlot::signature() const -{ - return isValid() ? d->signature : QByteArray(); -} - -QMetaType::Type DynamicSlot::returnType() const -{ - return isValid() ? d->returnType : QMetaType::UnknownType; -} - -QList DynamicSlot::argumentsTypes() const -{ - return isValid() ? d->argumentsTypes : QList(); -} - -QMetaType::Type DynamicSlot::argumentTypeAt(int i) const -{ - return isValid() ? d->argumentsTypes.at(i) : QMetaType::UnknownType; -} - -void DynamicSlot::_initSignature() -{ - QString signature("%1(%2)"); - QString arguments = ""; - for (int i = 0; i < d->argumentsTypes.size(); ++i) - { - if (i != 0) - arguments += ','; - arguments += QMetaType::typeName(d->argumentsTypes[i]); - } - - d->signature = signature.arg(d->name, arguments).toUtf8(); -} diff --git a/lib/src/OnSlotExecutedHandler.cpp b/lib/src/OnSlotExecutedHandler.cpp index 63a22c0..4971071 100644 --- a/lib/src/OnSlotExecutedHandler.cpp +++ b/lib/src/OnSlotExecutedHandler.cpp @@ -1,5 +1,4 @@ #include "DOtherSide/OnSlotExecutedHandler.h" -#include "DOtherSide/DynamicSlot.h" OnSlotExecutedHandler::OnSlotExecutedHandler(void *dObjectPointer, Callback dObjectCallback)