Namespace everything properly and enable self-registration.

The namespacing here was not quite consistent so fix that and also make
the module register it's types automatically.

Author: jrbarron

collection.cpp

@@ -1,6 +1,8 @@
 #include "collection.h"
 #include "jsonlistmodel.h"
 
+namespace com { namespace cutehacks { namespace gel {
+
 Collection::Collection(QObject *parent) : QSortFilterProxyModel(parent)
 {
     sort(0);
@@ -112,3 +114,5 @@ void Collection::reSort()
     sort(0);
 }
 
+} } }
+

collection.h

@@ -4,7 +4,9 @@
 #include <QtCore/QSortFilterProxyModel>
 #include <QtQml/QJSValue>
 
-class JsonListModel;
+#include "jsonlistmodel.h"
+
+namespace com { namespace cutehacks { namespace gel {
 
 class Collection : public QSortFilterProxyModel
 {
@@ -99,4 +101,6 @@ private slots:
     mutable QJSValue m_filter;
 };
 
+} } }
+
 #endif // COLLECTION_H

com_cutehacks_gel.pri

@@ -7,4 +7,5 @@ HEADERS += \
 
 SOURCES += \
     $$PWD/jsonlistmodel.cpp \
-    $$PWD/collection.cpp
+    $$PWD/collection.cpp \
+    $$PWD/gel.cpp

gel.cpp

@@ -0,0 +1,24 @@
+// Copyright 2016 Cutehacks AS. All rights reserved.
+// License can be found in the LICENSE file.
+
+#include <QtCore/QCoreApplication>
+#include <QtQml/qqml.h>
+
+#include "gel.h"
+
+namespace com { namespace cutehacks { namespace gel {
+
+void registerEngine(QQmlEngine *)
+{
+    // deprecated and done autmatically below
+}
+
+static void registerTypes()
+{
+    qmlRegisterType<JsonListModel>("com.cutehacks.gel", 1, 0, "JsonListModel");
+    qmlRegisterType<Collection>("com.cutehacks.gel", 1, 0, "Collection");
+}
+
+Q_COREAPP_STARTUP_FUNCTION(registerTypes)
+
+} } }

gel.h

@@ -1,68 +1,16 @@
 #ifndef GEL_H
 #define GEL_H
 
-#ifdef QPM_USE_NS
-
-#undef _GET_OVERRIDE
-#undef _QPM_BEGIN_NAMESPACE_1
-#undef _QPM_BEGIN_NAMESPACE_2
-#undef _QPM_BEGIN_NAMESPACE_2
-#undef _QPM_BEGIN_NAMESPACE_4
-#undef QPM_BEGIN_NAMESPACE
-#undef _QPM_END_NAMESPACE_1
-#undef _QPM_END_NAMESPACE_2
-#undef _QPM_END_NAMESPACE_2
-#undef _QPM_END_NAMESPACE_4
-#undef QPM_END_NAMESPACE
-
-#define _GET_OVERRIDE(_1, _2, _3, _4, NAME, ...) NAME
-
-#define _QPM_BEGIN_NAMESPACE_1(a) \
-    namespace a {
-#define _QPM_BEGIN_NAMESPACE_2(a, b) \
-    _QPM_BEGIN_NAMESPACE_1(a) namespace b {
-#define _QPM_BEGIN_NAMESPACE_3(a, b, c) \
-    _QPM_BEGIN_NAMESPACE_2(a, b) namespace c {
-#define _QPM_BEGIN_NAMESPACE_4(a, b, c, d) \
-    _QPM_BEGIN_NAMESPACE_3(a, b, c) namespace d {
-
-#define QPM_BEGIN_NAMESPACE(...) _GET_OVERRIDE(__VA_ARGS__, \
-    _QPM_BEGIN_NAMESPACE_4, \
-    _QPM_BEGIN_NAMESPACE_3, \
-    _QPM_BEGIN_NAMESPACE_2, \
-    _QPM_BEGIN_NAMESPACE_1)(__VA_ARGS__)
-
-#define _QPM_END_NAMESPACE_1 };
-#define _QPM_END_NAMESPACE_2 } };
-#define _QPM_END_NAMESPACE_3 } } };
-#define _QPM_END_NAMESPACE_4 } } } };
-
-#define QPM_END_NAMESPACE(...) _GET_OVERRIDE(__VA_ARGS__, \
-    _QPM_END_NAMESPACE_4, \
-    _QPM_END_NAMESPACE_3, \
-    _QPM_END_NAMESPACE_2, \
-    _QPM_END_NAMESPACE_1)
-
-#else
-#define QPM_BEGIN_NAMESPACE(...)
-#define QPM_END_NAMESPACE(...)
-#endif // QPM_USE_NS
-
-#include <QtQml>
 #include "jsonlistmodel.h"
 #include "collection.h"
 
-// QPM_BEGIN_NAMESPACE(com, cutehacks, gel)
+class QQmlEngine;
+
 namespace com { namespace cutehacks { namespace gel {
 
-void registerEngine(QQmlEngine *)
-{
-    qmlRegisterType<JsonListModel>("com.cutehacks.gel", 1, 0, "JsonListModel");
-    qmlRegisterType<Collection>("com.cutehacks.gel", 1, 0, "Collection");
-}
+extern void registerEngine(QQmlEngine *);
 
-} } };
-//QPM_END_NAMESPACE(com, cutehacks, gel)
+} } }
 
 #endif // GEL_H
 

jsonlistmodel.cpp

@@ -11,6 +11,8 @@
 typedef QJSValueIterator JSValueIterator;
 #endif
 
+namespace com { namespace cutehacks { namespace gel {
+
 static const int BASE_ROLE = Qt::UserRole + 1;
 
 JsonListModel::JsonListModel(QObject *parent) :
@@ -390,3 +392,4 @@ bool JsonListModel::setData(const QModelIndex &, const QVariant &, int)
     return false;
 }
 
+} } }

jsonlistmodel.h

@@ -9,6 +9,8 @@
 class QReadWriteLock;
 class QQmlEngine;
 
+namespace com { namespace cutehacks { namespace gel {
+
 class JsonListModel : public QAbstractItemModel
 {
     Q_OBJECT
@@ -69,4 +71,6 @@ public slots:
     QJSValue m_attachedProperties;
 };
 
+} } }
+
 #endif // JSONLISTMODEL_H

jsvalueiterator.h

@@ -1,5 +1,7 @@
 #include <QtQml/QJSValue>
 
+namespace com { namespace cutehacks { namespace gel {
+
 class JSValueIterator
 {
 public:
@@ -45,3 +47,5 @@ class JSValueIterator
     QList<QString> m_keys;
 };
 
+} } }
+