peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

obsolete qml bindings of QskSetup removed

Browse Source
This commit is contained in:
Uwe Rathmann 2024-01-30 10:09:14 +01:00
parent af2eb74ea1
commit 0aff128eec
6 changed files with 0 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qmlexport/CMakeLists.txt
View File

@ -7,13 +7,11 @@ set(HEADERS
QskQmlGlobal.h
QskShortcutQml.h
QskLayoutQml.h
QskMainQml.h
QskQml.h)
set(SOURCES
QskShortcutQml.cpp
QskLayoutQml.cpp
QskMainQml.cpp
QskQml.cpp)
set(target qskqmlexport)

69
qmlexport/QskMainQml.cpp
View File

@ -1,69 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#include "QskMainQml.h"
#include <QskSkinManager.h>
#include <QskSkin.h>
static void qskRegisterConverter()
{
QMetaType::registerConverter< int, QskSetupFlagsQml >();
}
Q_CONSTRUCTOR_FUNCTION( qskRegisterConverter )
QskMain::QskMain( QObject* parent )
: QObject( parent )
{
// how to supress warnings about a missing skinListChanged
// as we don't have it ??
connect( setup(), &QskSetup::skinChanged,
this, &QskMain::skinChanged, Qt::QueuedConnection );
connect( setup(), &QskSetup::itemUpdateFlagsChanged,
this, &QskMain::itemUpdateFlagsChanged, Qt::QueuedConnection );
}
QStringList QskMain::skinList() const
{
auto manager = QskSkinManager::instance();
return manager ? manager->skinNames() : QStringList();
}
QQmlListProperty< QObject > QskMain::data()
{
#if QT_VERSION >= QT_VERSION_CHECK( 6, 0, 0 )
using SizeType = qsizetype;
#else
using SizeType = int;
#endif
return QQmlListProperty< QObject >(
this, nullptr,
[]( QQmlListProperty< QObject >* property, QObject* value )
{
auto main = static_cast< QskMain* >( property->object );
main->m_data.append( value );
},
[]( QQmlListProperty< QObject >* property )
{
auto main = static_cast< const QskMain* >( property->object );
return static_cast< SizeType >( main->m_data.count() );
},
[]( QQmlListProperty< QObject >* property, SizeType index )
{
auto main = static_cast< const QskMain* >( property->object );
return main->m_data.at( index );
},
[]( QQmlListProperty< QObject >* property )
{
auto main = static_cast< QskMain* >( property->object );
main->m_data.clear();
}
);
}
#include "moc_QskMainQml.cpp"

66
qmlexport/QskMainQml.h
View File

@ -1,66 +0,0 @@
/******************************************************************************
* QSkinny - Copyright (C) The authors
* SPDX-License-Identifier: BSD-3-Clause
*****************************************************************************/
#ifndef QSK_SETUP_QML_H
#define QSK_SETUP_QML_H
#include "QskQmlGlobal.h"
#include <QskSetup.h>
#include <qobject.h>
#include <qqmllist.h>
class QskSetupFlagsQml : public QskQuickItem::UpdateFlags
{
Q_GADGET
public:
template< typename ... Args >
QskSetupFlagsQml( Args&&... args )
: QskQuickItem::UpdateFlags( std::forward< Args >( args ) ... )
{
}
Q_INVOKABLE int valueOf() const { return int( *this ); }
};
class QskMain : public QObject
{
public:
Q_OBJECT
Q_PRIVATE_PROPERTY( setup(), QString skin READ skinName
WRITE setSkin NOTIFY skinChanged )
Q_PROPERTY( QStringList skinList READ skinList NOTIFY skinListChanged )
Q_PRIVATE_PROPERTY( setup(), QskSetupFlagsQml itemUpdateFlags
READ itemUpdateFlags WRITE setItemUpdateFlags NOTIFY itemUpdateFlagsChanged )
Q_PROPERTY( QQmlListProperty< QObject > data READ data )
Q_CLASSINFO( "DefaultProperty", "data" )
public:
QskMain( QObject* parent = nullptr );
QStringList skinList() const;
QQmlListProperty< QObject > data();
Q_SIGNALS:
void skinListChanged(); // never emitted
void skinChanged();
void inputPanelChanged();
void itemUpdateFlagsChanged();
private:
static inline QskSetup* setup() { return QskSetup::instance(); }
QObjectList m_data;
};
Q_DECLARE_METATYPE( QskSetupFlagsQml )
#endif

2
qmlexport/QskQml.cpp
View File

@ -8,7 +8,6 @@
#include "QskLayoutQml.h"
#include "QskShortcutQml.h"
#include "QskMainQml.h"
#include <QskAspect.h>
#include <QskBoxBorderMetrics.h>
@ -196,7 +195,6 @@ void QskQml::registerTypes()
qmlRegisterUncreatableType< QskSkin >( QSK_MODULE_NAME, 1, 0, "Skin", QString() );
qRegisterMetaType< QskSkin* >();
registerObject< QskMain >();
registerObject< QskShortcutQml >( "Shortcut" );
registerObject< QskWindow >();

6
src/controls/QskSetup.cpp
View File

@ -285,10 +285,4 @@ bool QskSetup::eventFilter( QObject* object, QEvent* event )
return false;
}
QskSetup* QskSetup::qmlAttachedProperties( QObject* )
{
return QskSetup::instance();
}
Q_DECLARE_METATYPE( QskSkin* )
#include "moc_QskSetup.cpp"

2
src/controls/QskSetup.h
View File

@ -49,8 +49,6 @@ class QSK_EXPORT QskSetup : public QObject
static void setup();
static void cleanup();
static QskSetup* qmlAttachedProperties( QObject* );
Q_SIGNALS:
void skinChanged( QskSkin* );
void itemUpdateFlagsChanged();