diff --git a/examples/buttons/main.cpp b/examples/buttons/main.cpp index 24907a78..26ee773f 100644 --- a/examples/buttons/main.cpp +++ b/examples/buttons/main.cpp @@ -7,7 +7,7 @@ #include #include -#include +#include #include #include @@ -19,7 +19,7 @@ int main( int argc, char* argv[] ) QskObjectCounter counter( true ); #endif - QskModule::registerTypes(); + QskQml::registerTypes(); Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() ); QGuiApplication app( argc, argv ); diff --git a/examples/colorswitch/main.cpp b/examples/colorswitch/main.cpp index b1e00097..59a1361a 100644 --- a/examples/colorswitch/main.cpp +++ b/examples/colorswitch/main.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ int main( int argc, char* argv[] ) qputenv( "QT_IM_MODULE", "skinny" ); - QskModule::registerTypes(); + QskQml::registerTypes(); qmlRegisterType< Theme >( "Theme", 1, 0, "Theme" ); QGuiApplication app( argc, argv ); diff --git a/examples/frames/main.cpp b/examples/frames/main.cpp index 0c5e7101..506ed015 100644 --- a/examples/frames/main.cpp +++ b/examples/frames/main.cpp @@ -6,7 +6,7 @@ #include "Frame.h" #include -#include +#include #include #include @@ -18,7 +18,7 @@ int main( int argc, char* argv[] ) QskObjectCounter counter( true ); #endif - QskModule::registerTypes(); + QskQml::registerTypes(); qmlRegisterType< Frame >( "Frames", 1, 0, "Frame" ); QGuiApplication app( argc, argv ); diff --git a/examples/glabels/main.cpp b/examples/glabels/main.cpp index 725f9410..1a8ee708 100644 --- a/examples/glabels/main.cpp +++ b/examples/glabels/main.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -18,7 +18,7 @@ int main( int argc, char* argv[] ) QskObjectCounter counter( true ); #endif - QskModule::registerTypes(); + QskQml::registerTypes(); Qsk::addGraphicProvider( "shapes", new SkinnyShapeProvider() ); QGuiApplication app( argc, argv ); diff --git a/examples/messageboxQml/main.cpp b/examples/messageboxQml/main.cpp index b88fc3a4..58d084a6 100644 --- a/examples/messageboxQml/main.cpp +++ b/examples/messageboxQml/main.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include #include @@ -18,7 +18,7 @@ int main( int argc, char* argv[] ) QskObjectCounter counter( true ); #endif - QskModule::registerTypes(); + QskQml::registerTypes(); QGuiApplication app( argc, argv ); diff --git a/playground/images/main.cpp b/playground/images/main.cpp index af3c343f..d14d8a56 100644 --- a/playground/images/main.cpp +++ b/playground/images/main.cpp @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include @@ -23,7 +23,7 @@ int main( int argc, char* argv[] ) const char providerId[] = "shapes"; - QskModule::registerTypes(); + QskQml::registerTypes(); qmlRegisterType< Image >( "Images", 1, 0, "Image" ); Qsk::addGraphicProvider( providerId, new SkinnyShapeProvider() ); diff --git a/qmlexport/QskModule.cpp b/qmlexport/QskQml.cpp similarity index 99% rename from qmlexport/QskModule.cpp rename to qmlexport/QskQml.cpp index 7a613e16..59253301 100644 --- a/qmlexport/QskModule.cpp +++ b/qmlexport/QskQml.cpp @@ -3,7 +3,7 @@ * 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 "QskDialog.h" @@ -224,7 +224,7 @@ class QskMain : public QObject Q_DECLARE_METATYPE( QskSetupFlagsProvider ) -void QskModule::registerTypes() +void QskQml::registerTypes() { qmlRegisterRevision< QQuickItem, 6 >( QSK_MODULE_NAME, 1, 0 ); @@ -371,4 +371,4 @@ void QskModule::registerTypes() ); } -#include "QskModule.moc" +#include "QskQml.moc" diff --git a/qmlexport/QskModule.h b/qmlexport/QskQml.h similarity index 84% rename from qmlexport/QskModule.h rename to qmlexport/QskQml.h index b7e2fd48..dcc03b8f 100644 --- a/qmlexport/QskModule.h +++ b/qmlexport/QskQml.h @@ -3,12 +3,12 @@ * This file may be used under the terms of the QSkinny License, Version 1.0 *****************************************************************************/ -#ifndef QSK_MODULE_H -#define QSK_MODULE_H +#ifndef QSK_QML_EXPORT_H +#define QSK_QML_EXPORT_H #include "QskGlobal.h" -namespace QskModule +namespace QskQml { QSK_EXPORT void registerTypes(); } diff --git a/qmlexport/qmlexport.pro b/qmlexport/qmlexport.pro index 2c4b2413..929f3dd0 100644 --- a/qmlexport/qmlexport.pro +++ b/qmlexport/qmlexport.pro @@ -33,9 +33,9 @@ DEPENDPATH *= $${QSK_DIRS} HEADERS += \ QskShortcut.h \ - QskModule.h + QskQml.h SOURCES += \ - QskModule.cpp \ - QskShortcut.cpp + QskShortcut.cpp \ + QskQml.cpp