summaryrefslogtreecommitdiffstats
path: root/scripts/templates
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/templates')
-rw-r--r--scripts/templates/class.cpp52
-rw-r--r--scripts/templates/class.h16
-rw-r--r--scripts/templates/class_p.h5
-rw-r--r--scripts/templates/namespace.pri8
-rw-r--r--scripts/templates/project.pri0
-rw-r--r--scripts/templates/project.pro6
6 files changed, 43 insertions, 44 deletions
diff --git a/scripts/templates/class.cpp b/scripts/templates/class.cpp
index d535db58..833ffdde 100644
--- a/scripts/templates/class.cpp
+++ b/scripts/templates/class.cpp
@@ -34,12 +34,12 @@
if (${accessor.parameter.0.name}) {
[%- END %]
[%- IF property.isReadOnly == subsettedPropertyItem.isReadOnly %]
- [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qmofobject_cast<${subsettedClass}[% IF subsettedPropertyItem.isReadOnly == 'true' %]Private[% END %] *>(this))->${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
+ [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qwrappedobject_cast<${subsettedClass}[% IF subsettedPropertyItem.isReadOnly == 'true' %]Private[% END %] *>(this))->${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
[%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'true' %]
- [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qmofobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
+ [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %](qwrappedobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
[%- ELSE %]
[% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]Q_Q(${class.name});
- [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]q->${subsettedClass}::${subsettedPropertyItem.accessor.1.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
+ [% IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %] [% END %]q->${subsettedClass}::${subsettedPropertyItem.accessor.1.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>(${accessor.parameter.0.name}));
[%- END %]
[%- IF property.accessor.size == 2 and subsettedPropertyItem.accessor.size > 2 %]
}
@@ -53,14 +53,14 @@
[%- found = 'true' -%]
[%- END %]
[%- IF property.isReadOnly == 'true' and subsettedPropertyItem.isReadOnly == 'true' %]
- (qmofobject_cast<${subsettedClass}Private *>(this))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name}));
+ (qwrappedobject_cast<${subsettedClass}Private *>(this))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name}));
[%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'false' %]
- (qmofobject_cast<${subsettedClass} *>(this))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name}));
+ (qwrappedobject_cast<${subsettedClass} *>(this))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name}));
[%- ELSIF property.isReadOnly == 'false' and subsettedPropertyItem.isReadOnly == 'true' %]
- (qmofobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name}));
+ (qwrappedobject_cast<${subsettedClass}Private *>(d))->${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]d->[% END %]${accessor.parameter.0.name}));
[%- ELSE %]
Q_Q(${class.name});
- q->${subsettedClass}::${subsettedPropertyItem.accessor.2.name}(qmofobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name}));
+ q->${subsettedClass}::${subsettedPropertyItem.accessor.2.name}(qwrappedobject_cast<${subsettedPropertyItem.accessor.1.parameter.0.type}>([% IF singlevalued == 'true' %]this->[% END %]${accessor.parameter.0.name}));
[%- END %]
[%- END -%]
[%- END -%]
@@ -87,7 +87,7 @@
[%- IF opposite.isReadOnly == 'false' %]
[% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %]${accessor.parameter.0.name}->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
[%- ELSE %]
- [% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %](qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
+ [% IF property.accessor.size == 2 and opposite.accessor.size > 2 %] [% END %](qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
[%- END -%]
[%- ELSE -%][%- IF operation == 2 and opposite.accessor.size > 2 %]
[%- IF opposite.isReadOnly == 'false' %]
@@ -95,13 +95,13 @@
[% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
[%- ELSE %]
if ([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name})
- (qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->d_func()))->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
+ (qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>([% IF singlevalued == 'true' %][% IF property.isReadOnly == 'true' %]this[% ELSE %]d[% END %]->[% END %]${accessor.parameter.0.name}->d_func()))->${opposite.accessor.2.name}([% IF property.isReadOnly == 'true' %]q[% ELSE %]this[% END %]);
[%- END %]
[%- ELSIF singlevalued == 'false' %]
[%- IF opposite.isReadOnly == 'false' %]
${accessor.parameter.0.name}->${opposite.accessor.1.name}(0);
[%- ELSE %]
- (qmofobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}(0);
+ (qwrappedobject_cast<${accessor.parameter.0.type.replace(' \*$', '').replace('$', 'Private *')}>(${accessor.parameter.0.name}->d_func()))->${opposite.accessor.1.name}(0);
[%- END %]
[%- END -%][%- END -%]
[%- IF operation == 2 and singlevalued == 'true' %]
@@ -182,14 +182,14 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces
[%- IF accessor.name.search('^add') %]
d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name});
[%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(this));
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this));
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%]
[%- END -%]
[%- IF accessor.name.search('^remove') %]
d->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name});
[%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0);
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0);
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(attribute, 2, 'false') -%]
[%- END -%]
@@ -235,7 +235,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces
[%- END -%]
[%- END %]
[%- ELSE %]
- [% IF accessor.return != 'void ' %]return [% END %](qmofobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]);
+ [% IF accessor.return != 'void ' %]return [% END %](qwrappedobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]);
[%- END %]
}
@@ -287,7 +287,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces
[%- IF accessor.name.search('^add') %]
d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name});
[%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(this));
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(this));
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(associationend, 1, 'false') -%]
[%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%]
@@ -295,7 +295,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces
[%- IF accessor.name.search('^remove') %]
d->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name});
[%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0);
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0);
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(associationend, 2, 'false') -%]
[%- HANDLEOPPOSITEEND(associationend, accessor, 2, 'false') -%]
@@ -347,7 +347,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN acces
}
[%- END %]
[%- ELSE %]
- [% IF accessor.return != 'void ' %]return [% END %](qmofobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]);
+ [% IF accessor.return != 'void ' %]return [% END %](qwrappedobject_cast<[% IF accessor.constness == ' const' %]const [% END %]${parent.name} *>(this))->${accessor.name}([%- FOREACH parameter IN accessor.parameter -%]${parameter.name}[% IF !loop.last %], [% END %][%- END -%]);
[%- END %]
}
@@ -536,14 +536,14 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I
this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name});
[%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %]
Q_Q(${class.name});
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(q));
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q));
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(attribute, 1, 'false') -%]
[%- END -%]
[%- IF accessor.name.search('^remove') %]
this->${attribute.accessor.0.name}->[% IF attribute.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name});
[%- IF attribute.aggregation == 'composite' and attribute.accessor.0.return.search('<') and attribute.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0);
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0);
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(attribute, 2, 'false') -%]
[%- END -%]
@@ -607,7 +607,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I
this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]insert[% ELSE %]append[% END %](${accessor.parameter.0.name});
[%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %]
Q_Q(${class.name});
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(qmof_topLevelWrapper(q));
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(qTopLevelWrapper(q));
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(associationend, 1, 'false') -%]
[%- HANDLEOPPOSITEEND(associationend, accessor, 1, 'false') -%]
@@ -615,7 +615,7 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I
[%- IF accessor.name.search('^remove') %]
this->${associationend.accessor.0.name}->[% IF associationend.accessor.0.return.search('QSet') %]remove[% ELSE %]removeAll[% END %](${accessor.parameter.0.name});
[%- IF associationend.aggregation == 'composite' and associationend.accessor.0.return.search('<') and associationend.subsettedProperty == '' %]
- qmof_topLevelWrapper(${accessor.parameter.0.name})->setParent(0);
+ qTopLevelWrapper(${accessor.parameter.0.name})->setParent(0);
[%- END %]
[%- HANDLESUBSETTEDPROPERTY(associationend, 2, 'false') -%]
[%- HANDLEOPPOSITEEND(associationend, accessor, 2, 'false') -%]
@@ -669,8 +669,8 @@ ${accessor.return}${class.name}Private::${accessor.name}([%- FOREACH parameter I
*/
[%- END %]
-${class.name}::${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper) :
-[% IF class.superclass.size == 1-%] ${class.superclass.0.name}[%- ELSE -%] [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject[% END %](*new ${class.name}Private, parent, wrapper)
+${class.name}::${class.name}(QWrappedObject *parent, QWrappedObject *wrapper) :
+[% IF class.superclass.size == 1-%] ${class.superclass.0.name}[%- ELSE -%] QWrappedObject[% END %](*new ${class.name}Private, parent, wrapper)
[%- IF class.superclass and class.superclass.size > 1 -%]
[%- FOREACH parentClass IN class.superclass -%]
,
@@ -680,8 +680,8 @@ ${class.name}::${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofOb
{
}
-${class.name}::${class.name}(${class.name}Private &dd, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper) :
-[% IF class.superclass.size == 1-%] ${class.superclass.0.name}(dd, parent, wrapper)[%- ELSE -%] [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject(dd, parent, wrapper)[%- END -%]
+${class.name}::${class.name}(${class.name}Private &dd, QWrappedObject *parent, QWrappedObject *wrapper) :
+[% IF class.superclass.size == 1-%] ${class.superclass.0.name}(dd, parent, wrapper)[%- ELSE -%] QWrappedObject(dd, parent, wrapper)[%- END -%]
[%- IF class.superclass and class.superclass.size > 1 -%]
[%- FOREACH parentClass IN class.superclass -%]
,
@@ -738,7 +738,7 @@ ${operation.return}${class.name}::${operation.name}([%- FOREACH parameter IN ope
[%- END -%]
[%- FOREACH accessor IN property.accessor -%]
[%- NEXT IF loop.first %]
-${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}
+${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}
{
[%- IF loop.count == 2 %]
${parameter.accessor.1.name}(${attribute.accessor.1.parameter.0.name});
@@ -777,7 +777,7 @@ ${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN attri
[%- END -%]
[%- FOREACH accessor IN property.accessor -%]
[%- NEXT IF loop.first %]
-${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}
+${accessor.return}${class.name}::${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness}
{
[%- IF loop.count == 2 %]
${associationend.accessor.1.name}(${associationend.accessor.1.parameter.0.name});
diff --git a/scripts/templates/class.h b/scripts/templates/class.h
index 1080eb61..7158277f 100644
--- a/scripts/templates/class.h
+++ b/scripts/templates/class.h
@@ -173,7 +173,8 @@
// Base class includes
[%- IF !class.superclass || class.superclass.size > 1 %]
-#include <QtMof/QMofObject>
+#include <QtWrappedObjects/QWrappedObject>
+using QtWrappedObjects::QWrappedObject;
[%- END -%]
[%- FOREACH superClass IN class.superclass %]
#include <${superClass.include}>
@@ -233,7 +234,8 @@
[%- END %]
[%- IF found == 'true' %]
-#include <QtMof/QMofPointer>
+#include <QtWrappedObjects/QWrappedObjectPointer>
+using QtWrappedObjects::QWrappedObjectPointer;
[%- END %]
QT_BEGIN_HEADER
@@ -276,7 +278,7 @@ class ${forwarddecl.content};
class ${class.name}Private;
-class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}[% ELSE %]public [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject[% END %]
+class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}[% ELSE %]public QWrappedObject[% END %]
{
Q_OBJECT
[%- GENERATEPROPERTIES(class, 'false') %]
@@ -285,7 +287,7 @@ class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name} : [% I
Q_DECLARE_PRIVATE(${class.name})
public:
- Q_INVOKABLE explicit ${class.name}([% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent = 0, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper = 0);
+ Q_INVOKABLE explicit ${class.name}(QWrappedObject *parent = 0, QWrappedObject *wrapper = 0);
virtual ~${class.name}();
[%- IF class.superclass and class.superclass.size > 1 -%]
[%- GENERATEFUNCTIONS(class, 'true') -%]
@@ -316,7 +318,7 @@ public:
[%- END -%]
[%- FOREACH accessor IN property.accessor -%]
[%- NEXT IF loop.first %]
- Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness};
+ Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN attribute.accessor.1.parameter -%]<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness};
[%- END -%]
[%- END -%]
[%- END -%]
@@ -340,7 +342,7 @@ public:
[%- END -%]
[%- FOREACH accessor IN property.accessor -%]
[%- NEXT IF loop.first %]
- Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%][% IF namespace != "QtMof" %]QtMof::[% END %]QMofPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness};
+ Q_INVOKABLE ${accessor.return}${accessor.name}([%- FOREACH parameter IN associationend.accessor.1.parameter -%]QWrappedObjectPointer<${parameter.type.remove(' \*$')}> ${parameter.name}[% IF !loop.last %], [% END %][%- END -%])${accessor.constness};
[%- END -%]
[%- END -%]
[%- END -%]
@@ -371,7 +373,7 @@ public:
[%- END %]
protected:
- explicit ${class.name}(${class.name}Private &dd, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *parent = 0, [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObject *wrapper = 0);
+ explicit ${class.name}(${class.name}Private &dd, QWrappedObject *parent = 0, QWrappedObject *wrapper = 0);
[%- IF class.superclass and class.superclass.size > 1 %]
private:
diff --git a/scripts/templates/class_p.h b/scripts/templates/class_p.h
index 5a436148..a64cd762 100644
--- a/scripts/templates/class_p.h
+++ b/scripts/templates/class_p.h
@@ -44,7 +44,8 @@
// Base class includes
[%- IF !class.superclass || class.superclass.size > 1 -%]
-#include "private/qmofobject_p.h"
+#include "private/qwrappedobject_p.h"
+using QtWrappedObjects::QWrappedObjectPrivate;
[%- END -%]
[%- FOREACH superclass IN class.superclass -%]
@@ -114,7 +115,7 @@ class ${forwarddecl.content};
class ${class.name};
[%- END %]
-class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name}Private : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}Private[% ELSE %]public [% IF namespace != "QtMof" %]QtMof::[% END %]QMofObjectPrivate[% END %]
+class Q_[% namespace.split('/').0.substr(2).upper %]_EXPORT ${class.name}Private : [% IF class.superclass.size == 1 %]public ${class.superclass.0.name.split('/').last}Private[% ELSE %]public QWrappedObjectPrivate[% END %]
{
Q_DECLARE_PUBLIC(${class.name})
diff --git a/scripts/templates/namespace.pri b/scripts/templates/namespace.pri
index 3284c767..7ae6e731 100644
--- a/scripts/templates/namespace.pri
+++ b/scripts/templates/namespace.pri
@@ -1,7 +1,5 @@
-PUBLIC_HEADERS +=
- ${namespace.path}/qtumlglobal.h
- ${namespace.path}/qumlobject.h
- ${namespace.path}/qumlpointer.h
+PUBLIC_HEADERS += \
+ ${namespace.path}/${namespace.path.split('/').0.lower}global.h
[%- IF namespace.item('enumeration') -%][% ' \\' %]
${namespace.path}/${namespace.path.split('/').0.lower}enumerations.h
[%- END %]
@@ -10,13 +8,11 @@ PUBLIC_HEADERS +=
[%- END %]
PRIVATE_HEADERS +=
- ${namespace.path}/qumlobject_p.h
[%- FOREACH class IN namespace.class.values -%][% ' \\' %]
${namespace.path}/${class.name.lower}_p.h
[%- END %]
SOURCES +=
- ${namespace.path}/qumlobject.cpp
[%- IF namespace.item('enumeration') -%][% ' \\' %]
${namespace.path}/${namespace.path.split('/').0.lower}enumerations.cpp
[%- END -%]
diff --git a/scripts/templates/project.pri b/scripts/templates/project.pri
new file mode 100644
index 00000000..e69de29b
--- /dev/null
+++ b/scripts/templates/project.pri
diff --git a/scripts/templates/project.pro b/scripts/templates/project.pro
index 0e176e33..1f414102 100644
--- a/scripts/templates/project.pro
+++ b/scripts/templates/project.pro
@@ -1,12 +1,12 @@
load(qt_build_config)
TARGET = [% namespace.split('/').0 %]
-QT = core-private
+QT = wrappedobjects-private
load(qt_module)
[%- FOREACH namespace IN namespaces %]
-include(${namespace.path}/${namespace.path.replace('/','-').lower}.pri)
+include(${namespace.path.replace('/','-').lower}.pri)
[%- END %]
-HEADERS += [%- GET '$$PUBLIC_HEADERS' -%]
+HEADERS += [%- GET '$$PUBLIC_HEADERS' -%] [% GET '$$PRIVATE_HEADERS' -%]
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-11 10:13:01 +0000