QskModule -> QskQml

examples/buttons/main.cpp

@@ -7,7 +7,7 @@
 #include <SkinnyShapeProvider.h>
 #include <SkinnyShortcut.h>
 
-#include <QskModule.h>
+#include <QskQml.h>
 #include <QskObjectCounter.h>
 
 #include <QGuiApplication>
@@ -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 );

examples/colorswitch/main.cpp

@@ -8,7 +8,7 @@
 #include <SkinnyFont.h>
 #include <SkinnyShortcut.h>
 
-#include <QskModule.h>
+#include <QskQml.h>
 #include <QskObjectCounter.h>
 
 #include <QGuiApplication>
@@ -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 );

examples/frames/main.cpp

@@ -6,7 +6,7 @@
 #include "Frame.h"
 #include <SkinnyShortcut.h>
 
-#include <QskModule.h>
+#include <QskQml.h>
 #include <QskObjectCounter.h>
 
 #include <QGuiApplication>
@@ -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 );

examples/glabels/main.cpp

@@ -6,7 +6,7 @@
 #include <SkinnyShapeProvider.h>
 #include <SkinnyShortcut.h>
 
-#include <QskModule.h>
+#include <QskQml.h>
 #include <QskObjectCounter.h>
 
 #include <QGuiApplication>
@@ -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 );

examples/messageboxQml/main.cpp

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

playground/images/main.cpp

@@ -9,7 +9,7 @@
 #include <SkinnyShortcut.h>
 
 #include <QskGraphicImageProvider.h>
-#include <QskModule.h>
+#include <QskQml.h>
 #include <QskObjectCounter.h>
 
 #include <QGuiApplication>
@@ -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() );

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"

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();
 }

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