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

QskModule -> QskQml

Browse Source
This commit is contained in:
Uwe Rathmann 2018-10-04 10:34:44 +02:00
parent 6db5105fdc
commit 7713897497
9 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/buttons/main.cpp
View File

@ -7,7 +7,7 @@
#include <SkinnyShapeProvider.h> #include <SkinnyShapeProvider.h>
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -19,7 +19,7 @@ int main( int argc, char* argv[] )
QskObjectCounter counter( true ); QskObjectCounter counter( true );
#endif #endif
QskModule::registerTypes(); QskQml::registerTypes();
Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() ); Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() );
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );

4
examples/colorswitch/main.cpp
View File

@ -8,7 +8,7 @@
#include <SkinnyFont.h> #include <SkinnyFont.h>
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -23,7 +23,7 @@ int main( int argc, char* argv[] )
qputenv( "QT_IM_MODULE", "skinny" ); qputenv( "QT_IM_MODULE", "skinny" );
QskModule::registerTypes(); QskQml::registerTypes();
qmlRegisterType< Theme >( "Theme", 1, 0, "Theme" ); qmlRegisterType< Theme >( "Theme", 1, 0, "Theme" );
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );

4
examples/frames/main.cpp
View File

@ -6,7 +6,7 @@
#include "Frame.h" #include "Frame.h"
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -18,7 +18,7 @@ int main( int argc, char* argv[] )
QskObjectCounter counter( true ); QskObjectCounter counter( true );
#endif #endif
QskModule::registerTypes(); QskQml::registerTypes();
qmlRegisterType< Frame >( "Frames", 1, 0, "Frame" ); qmlRegisterType< Frame >( "Frames", 1, 0, "Frame" );
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );

4
examples/glabels/main.cpp
View File

@ -6,7 +6,7 @@
#include <SkinnyShapeProvider.h> #include <SkinnyShapeProvider.h>
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -18,7 +18,7 @@ int main( int argc, char* argv[] )
QskObjectCounter counter( true ); QskObjectCounter counter( true );
#endif #endif
QskModule::registerTypes(); QskQml::registerTypes();
Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() ); Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() );
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );

4
examples/messageboxQml/main.cpp
View File

@ -6,7 +6,7 @@
#include <SkinnyFont.h> #include <SkinnyFont.h>
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -18,7 +18,7 @@ int main( int argc, char* argv[] )
QskObjectCounter counter( true ); QskObjectCounter counter( true );
#endif #endif
QskModule::registerTypes(); QskQml::registerTypes();
QGuiApplication app( argc, argv ); QGuiApplication app( argc, argv );

4
playground/images/main.cpp
View File

@ -9,7 +9,7 @@
#include <SkinnyShortcut.h> #include <SkinnyShortcut.h>
#include <QskGraphicImageProvider.h> #include <QskGraphicImageProvider.h>
#include <QskModule.h> #include <QskQml.h>
#include <QskObjectCounter.h> #include <QskObjectCounter.h>
#include <QGuiApplication> #include <QGuiApplication>
@ -23,7 +23,7 @@ int main( int argc, char* argv[] )
const char providerId[] = "shapes"; const char providerId[] = "shapes";
QskModule::registerTypes(); QskQml::registerTypes();
qmlRegisterType< Image >( "Images", 1, 0, "Image" ); qmlRegisterType< Image >( "Images", 1, 0, "Image" );
Qsk::addGraphicProvider( providerId, new SkinnyShapeProvider() ); Qsk::addGraphicProvider( providerId, new SkinnyShapeProvider() );

6
qmlexport/QskModule.cpp → qmlexport/QskQml.cpp
View File

@ -3,7 +3,7 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#include "QskModule.h" #include "QskQml.h"
#include "QskCorner.h" #include "QskCorner.h"
#include "QskDialog.h" #include "QskDialog.h"
@ -224,7 +224,7 @@ class QskMain : public QObject
Q_DECLARE_METATYPE( QskSetupFlagsProvider ) Q_DECLARE_METATYPE( QskSetupFlagsProvider )
void QskModule::registerTypes() void QskQml::registerTypes()
{ {
qmlRegisterRevision< QQuickItem, 6 >( QSK_MODULE_NAME, 1, 0 ); qmlRegisterRevision< QQuickItem, 6 >( QSK_MODULE_NAME, 1, 0 );
@ -371,4 +371,4 @@ void QskModule::registerTypes()
); );
} }
#include "QskModule.moc" #include "QskQml.moc"

6
qmlexport/QskModule.h → qmlexport/QskQml.h
View File

@ -3,12 +3,12 @@
* This file may be used under the terms of the QSkinny License, Version 1.0 * This file may be used under the terms of the QSkinny License, Version 1.0
*****************************************************************************/ *****************************************************************************/
#ifndef QSK_MODULE_H #ifndef QSK_QML_EXPORT_H
#define QSK_MODULE_H #define QSK_QML_EXPORT_H
#include "QskGlobal.h" #include "QskGlobal.h"
namespace QskModule namespace QskQml
{ {
QSK_EXPORT void registerTypes(); QSK_EXPORT void registerTypes();
} }

6
qmlexport/qmlexport.pro
View File

@ -33,9 +33,9 @@ DEPENDPATH *= $${QSK_DIRS}
HEADERS += \ HEADERS += \
QskShortcut.h \ QskShortcut.h \
QskModule.h QskQml.h
SOURCES += \ SOURCES += \
QskModule.cpp \ QskShortcut.cpp \
QskShortcut.cpp QskQml.cpp