mirror of
https://gitlab.com/kelteseth/ScreenPlay.git
synced 2024-10-06 09:17:07 +02:00
Remove unused util classes
This commit is contained in:
Elias Steurer
parent
d15e670cb3
commit
9e01dbac54
@ -40,7 +40,7 @@ set(QML
|
||||
|
||||
set(SOURCES
|
||||
# cmake-format: sort
|
||||
inc/public/ScreenPlayUtil/httpfileserver.cpp
|
||||
src/httpfileserver.cpp
|
||||
src/contenttypes.cpp
|
||||
src/logginghandler.cpp
|
||||
src/projectfile.cpp
|
||||
@ -49,18 +49,14 @@ set(SOURCES
|
||||
|
||||
set(HEADER
|
||||
# cmake-format: sort
|
||||
inc/public/ScreenPlayUtil/AutoPropertyHelpers.h
|
||||
inc/public/ScreenPlayUtil/ConstRefPropertyHelpers.h
|
||||
inc/public/ScreenPlayUtil/contenttypes.h
|
||||
inc/public/ScreenPlayUtil/exitcodes.h
|
||||
inc/public/ScreenPlayUtil/HelpersCommon.h
|
||||
inc/public/ScreenPlayUtil/httpfileserver.h
|
||||
inc/public/ScreenPlayUtil/ListPropertyHelper.h
|
||||
inc/public/ScreenPlayUtil/logginghandler.h
|
||||
inc/public/ScreenPlayUtil/projectfile.h
|
||||
inc/public/ScreenPlayUtil/PropertyHelpers.h
|
||||
inc/public/ScreenPlayUtil/PtrPropertyHelpers.h
|
||||
inc/public/ScreenPlayUtil/SingletonHelper.h
|
||||
inc/public/ScreenPlayUtil/ListPropertyHelper.h
|
||||
inc/public/ScreenPlayUtil/HelpersCommon.h
|
||||
inc/public/ScreenPlayUtil/util.h)
|
||||
|
||||
if(APPLE)
|
||||
|
||||
@ -1,79 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "HelpersCommon.h"
|
||||
|
||||
#define AUTO_GETTER(type, name) \
|
||||
public: \
|
||||
CheapestType<type>::type_def MAKE_GETTER_NAME(name)() const \
|
||||
{ \
|
||||
return m_##name; \
|
||||
}
|
||||
|
||||
#define AUTO_SETTER(type, name) \
|
||||
public: \
|
||||
void set_##name(CheapestType<type>::type_def name) \
|
||||
{ \
|
||||
if (m_##name != name) { \
|
||||
m_##name = name; \
|
||||
Q_EMIT name##Changed(); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define W_AUTO_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(type, name) \
|
||||
AUTO_GETTER(type, name) \
|
||||
AUTO_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define R_AUTO_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(type, name) \
|
||||
AUTO_GETTER(type, name) \
|
||||
AUTO_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define C_AUTO_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) CONSTANT) \
|
||||
\
|
||||
MEMBER(type, name) \
|
||||
AUTO_GETTER(type, name) \
|
||||
private:
|
||||
|
||||
#define W_AUTO_PROPERTY_DEFAULT(type, name, defaultValue) \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER_DEFAULT(type, name, defaultValue) \
|
||||
AUTO_GETTER(type, name) \
|
||||
AUTO_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
// NOTE : test class for all cases
|
||||
|
||||
class _Test_QmlAutoProperty_ : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
W_AUTO_PROPERTY(bool, var1)
|
||||
W_AUTO_PROPERTY(QString, var2)
|
||||
W_AUTO_PROPERTY(QObject*, var3)
|
||||
|
||||
R_AUTO_PROPERTY(bool, var4)
|
||||
R_AUTO_PROPERTY(QString, var5)
|
||||
R_AUTO_PROPERTY(QObject*, var6)
|
||||
|
||||
C_AUTO_PROPERTY(bool, var7)
|
||||
C_AUTO_PROPERTY(QString, var8)
|
||||
C_AUTO_PROPERTY(QObject*, var9)
|
||||
|
||||
W_AUTO_PROPERTY_DEFAULT(bool, var10, true)
|
||||
};
|
||||
@ -1,66 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
|
||||
#include "HelpersCommon.h"
|
||||
|
||||
#define CONST_SETTER(type, name) \
|
||||
public: \
|
||||
void set_##name(const type& name) \
|
||||
{ \
|
||||
if (m_##name != name) { \
|
||||
m_##name = name; \
|
||||
Q_EMIT name##Changed(); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define CONST_GETTER(type, name) \
|
||||
public: \
|
||||
const type& MAKE_GETTER_NAME(name)() const \
|
||||
{ \
|
||||
return m_##name; \
|
||||
}
|
||||
|
||||
#define W_CREF_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
private: \
|
||||
MEMBER(type, name) \
|
||||
CONST_GETTER(type, name) \
|
||||
CONST_SETTER(type, name) \
|
||||
NOTIFIER(name)
|
||||
|
||||
#define R_CREF_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) NOTIFY name##Changed) \
|
||||
MEMBER(type, name) \
|
||||
CONST_GETTER(type, name) \
|
||||
CONST_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define C_CREF_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) CONSTANT) \
|
||||
MEMBER(type, name) \
|
||||
CONST_GETTER(type, name) \
|
||||
private:
|
||||
|
||||
#define W_CREF_PROPERTY_DEFAULT(type, name, defaultValue) \
|
||||
protected: \
|
||||
Q_PROPERTY(type name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
private: \
|
||||
MEMBER_DEFAULT(type, name, defaultValue) \
|
||||
CONST_GETTER(type, name) \
|
||||
CONST_SETTER(type, name) \
|
||||
NOTIFIER(name)
|
||||
|
||||
class Test : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
W_CREF_PROPERTY(QString, var1)
|
||||
R_CREF_PROPERTY(QString, var2)
|
||||
C_CREF_PROPERTY(QString, var3)
|
||||
|
||||
W_CREF_PROPERTY_DEFAULT(QString, var4, QStringLiteral("test"))
|
||||
};
|
||||
@ -1,132 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <QObject>
|
||||
#include <memory>
|
||||
|
||||
#include "HelpersCommon.h"
|
||||
|
||||
#define PTR_GETTER(type, name) \
|
||||
public: \
|
||||
type* MAKE_GETTER_NAME(name)() const \
|
||||
{ \
|
||||
return m_##name; \
|
||||
}
|
||||
|
||||
#define PTR_SETTER(type, name) \
|
||||
public: \
|
||||
void set_##name(type* name) \
|
||||
{ \
|
||||
if (m_##name != name) { \
|
||||
m_##name = name; \
|
||||
Q_EMIT name##Changed(); \
|
||||
} \
|
||||
}
|
||||
|
||||
#define SMART_PTR_GETTER(type, name) \
|
||||
public: \
|
||||
type* MAKE_GETTER_NAME(name)() const \
|
||||
{ \
|
||||
return m_##name.get(); \
|
||||
}
|
||||
|
||||
#define SMART_PTR_SETTER(type, name) \
|
||||
public: \
|
||||
void set_##name(type name) \
|
||||
{ \
|
||||
m_##name = std::move(name); \
|
||||
Q_EMIT name##Changed(); \
|
||||
}
|
||||
|
||||
#define W_PTR_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(type*, name) \
|
||||
PTR_GETTER(type, name) \
|
||||
PTR_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define R_PTR_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ MAKE_GETTER_NAME(name) NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(type*, name) \
|
||||
PTR_GETTER(type, name) \
|
||||
PTR_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define C_PTR_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ MAKE_GETTER_NAME(name) CONSTANT) \
|
||||
\
|
||||
MEMBER(type*, name) \
|
||||
PTR_GETTER(type, name) \
|
||||
private:
|
||||
|
||||
#define W_PTR_PROPERTY_DEFAULT(type, name, defaultValue) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ MAKE_GETTER_NAME(name) WRITE set_##name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER_DEFAULT(type*, name, defaultValue) \
|
||||
PTR_GETTER(type, name) \
|
||||
PTR_SETTER(type, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define UNIQUE_PTR_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(std::unique_ptr<type>, name) \
|
||||
SMART_PTR_GETTER(type, name) \
|
||||
SMART_PTR_SETTER(std::unique_ptr<type>&, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define UNIQUE_PTR_PROPERTY_INIT(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER_DEFAULT(std::unique_ptr<type>, name, std::make_unique<type>()) \
|
||||
SMART_PTR_GETTER(type, name) \
|
||||
SMART_PTR_SETTER(std::unique_ptr<type>&, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define SHARED_PTR_PROPERTY(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER(std::shared_ptr<type>, name) \
|
||||
SMART_PTR_GETTER(type, name) \
|
||||
SMART_PTR_SETTER(std::unique_ptr<type>&, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
#define SHARED_PTR_PROPERTY_INIT(type, name) \
|
||||
protected: \
|
||||
Q_PROPERTY(type* name READ name NOTIFY name##Changed) \
|
||||
\
|
||||
MEMBER_DEFAULT(std::shared_ptr<type>, name, std::make_shared<type>()) \
|
||||
SMART_PTR_GETTER(type, name) \
|
||||
SMART_PTR_SETTER(std::shared_ptr<type>, name) \
|
||||
NOTIFIER(name) \
|
||||
private:
|
||||
|
||||
class _QmlPtrProperty_ : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
W_PTR_PROPERTY(int, var1)
|
||||
R_PTR_PROPERTY(bool, var2)
|
||||
C_PTR_PROPERTY(QString, test)
|
||||
|
||||
// W_PTR_PROPERTY_DEFAULT(QString, var4, nullptr)
|
||||
|
||||
// UNIQUE_PTR_PROPERTY(QString, test2)
|
||||
// UNIQUE_PTR_PROPERTY_INIT(QString, test3)
|
||||
|
||||
// SHARED_PTR_PROPERTY(QString, test4)
|
||||
// SHARED_PTR_PROPERTY_INIT(QString, test5)
|
||||
};
|
||||
@ -1,31 +0,0 @@
|
||||
#pragma once
|
||||
|
||||
#include <QJSEngine>
|
||||
#include <QObject>
|
||||
#include <QQmlEngine>
|
||||
#include <qqml.h>
|
||||
|
||||
#define QML_SINGLETON_IMPL(CLASS) \
|
||||
public: \
|
||||
static CLASS& instance() \
|
||||
{ \
|
||||
static CLASS ret; \
|
||||
return ret; \
|
||||
} \
|
||||
static QObject* qmlSingletonFactory(QQmlEngine* qmlEngine, QJSEngine* jsEngine) \
|
||||
{ \
|
||||
Q_UNUSED(jsEngine) \
|
||||
Q_UNUSED(qmlEngine) \
|
||||
QObject* ret = &instance(); \
|
||||
QQmlEngine::setObjectOwnership(ret, QQmlEngine::CppOwnership); \
|
||||
return ret; \
|
||||
} \
|
||||
static void registerQmlModule(const char* uri, const int majorVersion, const int minorVersion, const char* name) \
|
||||
{ \
|
||||
qmlRegisterSingletonType<CLASS>(uri, majorVersion, minorVersion, name, &CLASS::qmlSingletonFactory); \
|
||||
}
|
||||
|
||||
class _test_QmlSingleton_ : public QObject {
|
||||
Q_OBJECT
|
||||
QML_SINGLETON_IMPL(_test_QmlSingleton_)
|
||||
};
|
||||
Loading…
Reference in New Issue
Block a user